[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - 2 commits - help3xsl/online_transform.xsl source/text

Olivier Hallot olivier.hallot at libreoffice.org
Fri Jun 29 18:42:01 UTC 2018 

 help3xsl/online_transform.xsl          |    3 ++
 source/text/sbasic/shared/03090201.xhp |   36 ++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

New commits:
commit f1da8711f724c5f72b17533d48a0f8939929eebf
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Fri Jun 29 15:04:30 2018 -0300

    Add mode="embed" for bascode
    
    Embeded <bascode> was not properly rendered because it had
    no embed mode
    
    Change-Id: Icdc91c5b00b165d7963248f9083837b899d382f2
    Reviewed-on: https://gerrit.libreoffice.org/56729
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index ccfa94ae5..8bfd5d31b 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -868,6 +868,9 @@
 <xsl:template match="bascode">
     <div class="bascode" itemscope="true" itemtype="http://schema.org/SoftwareSourceCode" itemprop="codeSampleType" content="snippet"><xsl:apply-templates /></div>
 </xsl:template>
+<xsl:template match="bascode" mode="embedded">
+    <div class="bascode" itemscope="true" itemtype="http://schema.org/SoftwareSourceCode" itemprop="codeSampleType" content="snippet"><xsl:apply-templates /></div>
+</xsl:template>
 
 <!-- Insert Basic code snippet  -->
 <xsl:template name="insertbascode">
commit 449352832e33a1bd9f17aab8039fc6f199917450
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Fri Jun 29 15:37:09 2018 -0300

    Improve readability of page for do-loops
    
    Highlight statements in syntax sections
    
    Change-Id: I755ca4f7bd9aaeb1ee7183640523b8a790e560ac
    Reviewed-on: https://gerrit.libreoffice.org/56728
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/sbasic/shared/03090201.xhp b/source/text/sbasic/shared/03090201.xhp
index d0d17ce90..9606ac66b 100644
--- a/source/text/sbasic/shared/03090201.xhp
+++ b/source/text/sbasic/shared/03090201.xhp
@@ -42,17 +42,17 @@
 </section>
 
 <paragraph id="hd_id3149119" role="heading" level="2" xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id3155150" role="paragraph" xml-lang="en-US">Do [{While | Until} condition = True]</paragraph>
+<paragraph id="par_id3155150" role="bascode" xml-lang="en-US">Do [{While | Until} condition = True]</paragraph>
 <paragraph id="par_id3154422" role="paragraph" xml-lang="en-US">statement block</paragraph>
-<paragraph id="par_id3150789" role="paragraph" xml-lang="en-US">[Exit Do]</paragraph>
+<paragraph id="par_id3150789" role="bascode" xml-lang="en-US">[Exit Do]</paragraph>
 <paragraph id="par_id3155805" role="paragraph" xml-lang="en-US">statement block</paragraph>
-<paragraph id="par_id3145090" role="paragraph" xml-lang="en-US">Loop</paragraph>
+<paragraph id="par_id3145090" role="bascode" xml-lang="en-US">Loop</paragraph>
 <paragraph id="par_id3154749" role="paragraph" xml-lang="en-US">or</paragraph>
-<paragraph id="par_id3150503" role="paragraph" xml-lang="en-US">Do</paragraph>
+<paragraph id="par_id3150503" role="bascode" xml-lang="en-US">Do</paragraph>
 <paragraph id="par_id3149762" role="paragraph" xml-lang="en-US">statement block</paragraph>
-<paragraph id="par_id3150984" role="paragraph" xml-lang="en-US">[Exit Do]</paragraph>
+<paragraph id="par_id3150984" role="bascode" xml-lang="en-US">[Exit Do]</paragraph>
 <paragraph id="par_id3143228" role="paragraph" xml-lang="en-US">statement block</paragraph>
-<paragraph id="par_id3149235" role="paragraph" xml-lang="en-US">Loop [{While | Until} condition = True]</paragraph>
+<paragraph id="par_id3149235" role="bascode" xml-lang="en-US">Loop [{While | Until} condition = True]</paragraph>
 
 <paragraph id="hd_id3156024" role="heading" level="2" xml-lang="en-US">Parameters/Elements</paragraph>
 <paragraph id="par_id3156344" role="paragraph" xml-lang="en-US"> <emph>Condition:</emph> A comparison, numeric or string expression, that evaluates either True or False.</paragraph>
@@ -60,28 +60,28 @@
 <paragraph id="par_id3150791" role="paragraph" xml-lang="en-US">The <emph>Do...Loop</emph> statement executes a loop as long as, or until, a certain condition is True. The condition for exiting the loop must be entered following either the <emph>Do</emph> or the <emph>Loop</emph> statement. The following examples are valid combinations:</paragraph>
 
 <paragraph id="hd_id3154366" role="heading" level="2" xml-lang="en-US">Syntax</paragraph>
-<paragraph id="par_id3145171" role="paragraph" xml-lang="en-US">Do While condition = True</paragraph>
+<paragraph id="par_id3145171" role="bascode" xml-lang="en-US">Do While condition = True</paragraph>
 <paragraph id="par_id3149203" role="paragraph" xml-lang="en-US">...statement block</paragraph>
-<paragraph id="par_id3125864" role="paragraph" xml-lang="en-US">Loop</paragraph>
+<paragraph id="par_id3125864" role="bascode" xml-lang="en-US">Loop</paragraph>
 <paragraph id="par_id3154124" role="paragraph" xml-lang="en-US">The statement block between the Do While and the Loop statements is repeated so long as the condition is true.</paragraph>
-<paragraph id="par_id3153968" role="paragraph" xml-lang="en-US">Do Until condition = True</paragraph>
+<paragraph id="par_id3153968" role="bascode" xml-lang="en-US">Do Until condition = True</paragraph>
 <paragraph id="par_id3154909" role="paragraph" xml-lang="en-US">...statement block</paragraph>
-<paragraph id="par_id3159151" role="paragraph" xml-lang="en-US">Loop</paragraph>
+<paragraph id="par_id3159151" role="bascode" xml-lang="en-US">Loop</paragraph>
 <paragraph id="par_id3150440" role="paragraph" xml-lang="en-US">The statement block between the Do Until and the Loop statements is repeated if the condition so long as the condition is false.</paragraph>
-<paragraph id="par_id3153952" role="paragraph" xml-lang="en-US">Do</paragraph>
+<paragraph id="par_id3153952" role="bascode" xml-lang="en-US">Do</paragraph>
 <paragraph id="par_id3147349" role="paragraph" xml-lang="en-US">...statement block</paragraph>
-<paragraph id="par_id3159153" role="paragraph" xml-lang="en-US">Loop While condition = True</paragraph>
+<paragraph id="par_id3159153" role="bascode" xml-lang="en-US">Loop While condition = True</paragraph>
 <paragraph id="par_id3146985" role="paragraph" xml-lang="en-US">The statement block between the Do and the Loop statements repeats so long as the condition is true.</paragraph>
-<paragraph id="par_id3150488" role="paragraph" xml-lang="en-US">Do</paragraph>
+<paragraph id="par_id3150488" role="bascode" xml-lang="en-US">Do</paragraph>
 <paragraph id="par_id3153189" role="paragraph" xml-lang="en-US">...statement block</paragraph>
-<paragraph id="par_id3155411" role="paragraph" xml-lang="en-US">Loop Until condition = True</paragraph>
+<paragraph id="par_id3155411" role="bascode" xml-lang="en-US">Loop Until condition = True</paragraph>
 <paragraph id="par_id3151117" role="paragraph" xml-lang="en-US">The statement block between the Do and the Loop statements repeats until the condition is true.</paragraph>
 <paragraph id="par_id3149484" role="paragraph" xml-lang="en-US">Use the <emph>Exit Do</emph> statement to unconditionally end the loop. You can add this statement anywhere in a <emph>Do</emph>...<emph>Loop</emph> statement. You can also define an exit condition using the <emph>If...Then</emph> structure as follows:</paragraph>
-<paragraph id="par_id3149262" role="paragraph" xml-lang="en-US">Do...</paragraph>
+<paragraph id="par_id3149262" role="bascode" xml-lang="en-US">Do...</paragraph>
 <paragraph id="par_id3149298" role="paragraph" xml-lang="en-US">statements</paragraph>
-<paragraph id="par_id3145646" role="paragraph" xml-lang="en-US">If condition = True Then Exit Do</paragraph>
+<paragraph id="par_id3145646" role="bascode" xml-lang="en-US">If condition = True Then Exit Do</paragraph>
 <paragraph id="par_id3154490" role="paragraph" xml-lang="en-US">statements</paragraph>
-<paragraph id="par_id3153159" role="paragraph" xml-lang="en-US">Loop...</paragraph>
+<paragraph id="par_id3153159" role="bascode" xml-lang="en-US">Loop...</paragraph>
 
 <paragraph id="hd_id3147396" role="heading" level="2" xml-lang="en-US">Example</paragraph>
 <bascode>
@@ -100,4 +100,4 @@
 </bascode>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>

More information about the Libreoffice-commits mailing list