Support “comment” paragraphs

[LesML] / parser.xslt

diff --git a/parser.xslt b/parser.xslt
index 6f312626aad1d7edf57e35c8d22cf2260b42d288..a93f42558110a632c34d80be2c1898a7ac5e7e70 100644 (file)
--- a/parser.xslt
+++ b/parser.xslt
@@ -11,6 +11,9 @@ SPDX-License-Identifier: MPL-2.0
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
 -->
 This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
 -->

+<!DOCTYPE transform [
+       <!ENTITY section-break '*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'>
+]>

 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
        xmlns:LesML="urn:fdc:ladys.computer:20240512:LesML"
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
        xmlns:LesML="urn:fdc:ladys.computer:20240512:LesML"


@@ -118,110 +121,185 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                </choose>
        </template>
        <template name="LesML:parse">
                </choose>
        </template>
        <template name="LesML:parse">

-               <param name="source"/>
-               <variable name="noshebang">
-                       <text>&#xA;</text>
+               <param name="lines" select="/.."/>
+               <param name="parent-params" select="/.."/>
+               <variable name="first-line" select="$lines[1]"/>
+               <variable name="shebang">
+                       <if test="starts-with($first-line, '#!lesml')">
+                               <value-of select="$first-line"/>
+                       </if>
+               </variable>
+               <variable name="params-string">

                        <choose>
                        <choose>

-                               <when test="starts-with($source, '#!')">
-                                       <value-of select="substring-after($source, '&#xA;')"/>
+                               <when test="starts-with($shebang, '#!lesml@')">
+                                       <value-of select="substring-after($shebang, '$')"/>

                                </when>
                                <otherwise>
                                </when>
                                <otherwise>

-                                       <value-of select="$source"/>
+                                       <value-of select="substring-after($shebang, '#!lesml')"/>

                                </otherwise>
                        </choose>
                </variable>
                                </otherwise>
                        </choose>
                </variable>

-               <variable name="records">
-                       <call-template name="LesML:split">
-                               <with-param name="source" select="$noshebang"/>
-                               <with-param name="separator" select="'&#xA;%%'"/>
-                       </call-template>
+               <variable name="params-fragment">
+                       <choose>
+                               <when test="$shebang!=''">
+                                       <html:dl>
+                                               <if test="starts-with($shebang, '#!lesml@') and contains($shebang, '$')">
+                                                       <html:div>
+                                                               <html:dt>
+                                                                       <text> LANG </text>
+                                                               </html:dt>
+                                                               <html:dd>
+                                                                       <value-of select="substring-before(substring-after($shebang, '#!lesml@'), '$')"/>
+                                                               </html:dd>
+                                                       </html:div>
+                                               </if>
+                                               <for-each select="exslstr:tokenize($params-string)">
+                                                       <choose>
+                                                               <when test="contains(., '=')">
+                                                                       <html:div>
+                                                                               <html:dt>
+                                                                                       <value-of select="substring-before(., '=')"/>
+                                                                               </html:dt>
+                                                                               <html:dd>
+                                                                                       <value-of select="substring-after(., '=')"/>
+                                                                               </html:dd>
+                                                                       </html:div>
+                                                               </when>
+                                                               <otherwise>
+                                                                       <html:div>
+                                                                               <html:dt>
+                                                                                       <value-of select="."/>
+                                                                               </html:dt>
+                                                                               <html:dd/>
+                                                                       </html:div>
+                                                               </otherwise>
+                                                       </choose>
+                                               </for-each>
+                                       </html:dl>
+                               </when>
+                               <when test="$parent-params">
+                                       <copy-of select="$parent-params"/>
+                               </when>
+                               <otherwise>
+                                       <html:dl/>
+                               </otherwise>
+                       </choose>

                </variable>
                </variable>

-               <variable name="record-nodes" select="exsl:node-set($records)/*"/>
-               <html:article>
-                       <if test="count($record-nodes)>1">
-                               <html:footer class="head">
-                                       <for-each select="$record-nodes[not(position()=last() or normalize-space(.)='')]">
-                                               <variable name="fields" select="exslstr:tokenize(., '&#xA;')"/>
-                                               <html:dl>
-                                                       <for-each select="$fields">
-                                                               <choose>
-                                                                       <when test="starts-with(., ' ') and $fields[generate-id()=generate-id(current()/preceding-sibling::*[1])]"/>
-                                                                       <otherwise>
-                                                                               <variable name="next" select="following-sibling::*[not(starts-with(., ' '))]"/>
-                                                                               <html:div>
-                                                                                       <html:dt>
-                                                                                               <value-of select="normalize-space(substring-before(., ':'))"/>
-                                                                                       </html:dt>
-                                                                                       <html:dd>
-                                                                                               <variable name="firstline">
-                                                                                                       <choose>
-                                                                                                               <when test="contains(., ':')">
-                                                                                                                       <value-of select="normalize-space(substring-after(., ':'))"/>
-                                                                                                               </when>
-                                                                                                               <otherwise>
-                                                                                                                       <value-of select="normalize-space(.)"/>
-                                                                                                               </otherwise>
-                                                                                                       </choose>
-                                                                                               </variable>
-                                                                                               <choose>
-                                                                                                       <when test="substring($firstline, string-length($firstline))='\' and following-sibling::*[position()=1 and starts-with(., ' ')]">
-                                                                                                               <value-of select="substring($firstline, 1, string-length($firstline)-1)"/>
-                                                                                                       </when>
-                                                                                                       <otherwise>
-                                                                                                               <value-of select="$firstline"/>
-                                                                                                       </otherwise>
-                                                                                               </choose>
-                                                                                               <for-each select="following-sibling::*[starts-with(., ' ') and not(preceding-sibling::*[generate-id()=generate-id($next)])]">
-                                                                                                       <variable name="nextline" select="normalize-space(.)"/>
-                                                                                                       <choose>
-                                                                                                               <when test="substring($nextline, string-length($nextline))='\' and following-sibling::*[position()=1 and starts-with(., ' ')]">
-                                                                                                                       <value-of select="substring($nextline, 1, string-length($nextline)-1)"/>
-                                                                                                               </when>
-                                                                                                               <otherwise>
-                                                                                                                       <value-of select="$nextline"/>
-                                                                                                               </otherwise>
-                                                                                                       </choose>
-                                                                                               </for-each>
-                                                                                       </html:dd>
-                                                                               </html:div>
-                                                                       </otherwise>
-                                                               </choose>
-                                                       </for-each>
-                                               </html:dl>
-                                       </for-each>
-                               </html:footer>
-                       </if>
-                       <html:div class="body">
-                               <call-template name="LesML:paragraphize">
-                                       <with-param name="source" select="string($record-nodes[last()])"/>
-                               </call-template>
-                       </html:div>
-               </html:article>
+               <variable name="params" select="exsl:node-set($params-fragment)/*"/>
+               <variable name="noshebang" select="$lines[position()>1 or not(starts-with(., '#!lesml') or starts-with(., '##'))]"/>
+               <variable name="docsep" select="$noshebang[starts-with(., '#!lesml') or starts-with(., '##')][1]"/>
+               <variable name="doclines" select="$noshebang[not($docsep) or following-sibling::*[generate-id()=generate-id($docsep)]]"/>
+               <if test="starts-with($first-line, '##') and $first-line!='##'">
+                       <comment>
+                               <value-of select="substring-after($first-line, '##')"/>
+                       </comment>
+               </if>
+               <if test="$shebang!='' or $doclines[normalize-space()!='']">
+                       <variable name="record-separators" select="$doclines[starts-with(., '%%')]"/>
+                       <html:article>
+                               <for-each select="$params/html:div/html:dt[string()=' LANG ']">
+                                       <attribute name="lang">
+                                               <value-of select="following-sibling::html:dd"/>
+                                       </attribute>
+                                       <attribute name="xml:lang">
+                                               <value-of select="following-sibling::html:dd"/>
+                                       </attribute>
+                               </for-each>
+                               <for-each select="$params/html:div/html:dt[string()='profile']">
+                                       <attribute name="data-lesml-profile">
+                                               <value-of select="following-sibling::html:dd"/>
+                                       </attribute>
+                               </for-each>
+                               <if test="$record-separators[preceding-sibling::*[normalize-space()!='']]">
+                                       <html:footer class="head">
+                                               <for-each select="$record-separators">
+                                                       <variable name="position" select="position()"/>
+                                                       <variable name="prev-separator" select="$record-separators[($position)-1]"/>
+                                                       <variable name="fields" select="$noshebang[following-sibling::*[generate-id()=generate-id(current())] and (not($prev-separator) or preceding-sibling::*[generate-id()=generate-id($prev-separator)])]"/>
+                                                       <if test="$fields">
+                                                               <html:dl>
+                                                                       <for-each select="$fields">
+                                                                               <choose>
+                                                                                       <when test="starts-with(., ' ') and $fields[generate-id()=generate-id(current()/preceding-sibling::*[1])]"/>
+                                                                                       <otherwise>
+                                                                                               <variable name="next" select="following-sibling::*[not(starts-with(., ' '))]"/>
+                                                                                               <html:div>
+                                                                                                       <html:dt>
+                                                                                                               <value-of select="normalize-space(substring-before(., ':'))"/>
+                                                                                                       </html:dt>
+                                                                                                       <html:dd>
+                                                                                                               <variable name="firstline">
+                                                                                                                       <choose>
+                                                                                                                               <when test="contains(., ':')">
+                                                                                                                                       <value-of select="normalize-space(substring-after(., ':'))"/>
+                                                                                                                               </when>
+                                                                                                                               <otherwise>
+                                                                                                                                       <value-of select="normalize-space(.)"/>
+                                                                                                                               </otherwise>
+                                                                                                                       </choose>
+                                                                                                               </variable>
+                                                                                                               <choose>
+                                                                                                                       <when test="substring($firstline, string-length($firstline))='\' and following-sibling::*[position()=1 and starts-with(., ' ')]">
+                                                                                                                               <value-of select="substring($firstline, 1, string-length($firstline)-1)"/>
+                                                                                                                       </when>
+                                                                                                                       <otherwise>
+                                                                                                                               <value-of select="$firstline"/>
+                                                                                                                       </otherwise>
+                                                                                                               </choose>
+                                                                                                               <for-each select="following-sibling::*[starts-with(., ' ') and not(preceding-sibling::*[generate-id()=generate-id($next)])]">
+                                                                                                                       <variable name="nextline" select="normalize-space(.)"/>
+                                                                                                                       <choose>
+                                                                                                                               <when test="substring($nextline, string-length($nextline))='\' and following-sibling::*[position()=1 and starts-with(., ' ')]">
+                                                                                                                                       <value-of select="substring($nextline, 1, string-length($nextline)-1)"/>
+                                                                                                                               </when>
+                                                                                                                               <otherwise>
+                                                                                                                                       <value-of select="$nextline"/>
+                                                                                                                               </otherwise>
+                                                                                                                       </choose>
+                                                                                                               </for-each>
+                                                                                                       </html:dd>
+                                                                                               </html:div>
+                                                                                       </otherwise>
+                                                                               </choose>
+                                                                       </for-each>
+                                                               </html:dl>
+                                                       </if>
+                                                       <if test=".!='%%'">
+                                                               <comment>
+                                                                       <value-of select="substring-after(., '%%')"/>
+                                                               </comment>
+                                                       </if>
+                                               </for-each>
+                                       </html:footer>
+                               </if>
+                               <html:div class="body">
+                                       <call-template name="LesML:paragraphize">
+                                               <with-param name="lines" select="$doclines[not($record-separators) or preceding-sibling::*[generate-id()=generate-id($record-separators[last()])]]"/>
+                                       </call-template>
+                               </html:div>
+                       </html:article>
+               </if>
+               <if test="$docsep">
+                       <call-template name="LesML:parse">
+                               <with-param name="lines" select="$docsep|$lines[preceding-sibling::*[generate-id()=generate-id($docsep)]]"/>
+                               <with-param name="parent-params" select="$params"/>
+                       </call-template>
+               </if>

        </template>
        <template name="LesML:paragraphize">
        </template>
        <template name="LesML:paragraphize">

-               <param name="source"/>
-               <variable name="paragraphs">
-                       <call-template name="LesML:split">
-                               <with-param name="source" select="$source"/>
-                               <with-param name="separator" select="'&#xA;&#xA;'"/>
-                       </call-template>
-               </variable>
+               <param name="lines" select="/.."/>
+               <variable name="last-lines" select="$lines[normalize-space()!='' and normalize-space(following-sibling::*[1])='']|$lines[last()]"/>

                <variable name="blocked">
                <variable name="blocked">

-                       <for-each select="exsl:node-set($paragraphs)/*">
-                               <variable name="lines">
-                                       <call-template name="LesML:split">
-                                               <with-param name="source" select="string()"/>
-                                       </call-template>
-                               </variable>
-                               <variable name="linespans" select="exsl:node-set($lines)/*"/>
+                       <for-each select="$last-lines">
+                               <variable name="position" select="position()"/>
+                               <variable name="prev-last" select="$last-lines[($position)-1]"/>
+                               <variable name="linespans" select="$lines[following-sibling::*[generate-id()=generate-id(current())] and (not($prev-last) or preceding-sibling::*[generate-id()=generate-id($prev-last)]) and normalize-space()!='']|."/>

                                <variable name="quoted" select="not($linespans[not(starts-with(., ' ') or starts-with(., '&#x9;'))])"/>
                                <variable name="text">
                                        <for-each select="$linespans">
                                <variable name="quoted" select="not($linespans[not(starts-with(., ' ') or starts-with(., '&#x9;'))])"/>
                                <variable name="text">
                                        <for-each select="$linespans">

-                                               <if test="normalize-space()!=''">
-                                                       <value-of select="normalize-space()"/>
-                                                       <if test="following-sibling::*[normalize-space()!='']">
-                                                               <text> </text>
-                                                       </if>
+                                               <value-of select="normalize-space()"/>
+                                               <if test="position()!=count($linespans)">
+                                                       <text> </text>

                                                </if>
                                        </for-each>
                                </variable>
                                                </if>
                                        </for-each>
                                </variable>


@@ -382,6 +460,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        </html:p>
                                                                </html:div>
                                                        </when>
                                                                        </html:p>
                                                                </html:div>
                                                        </when>

+                                                       <when test="starts-with($text, '# ')">
+                                                               <comment>
+                                                                       <value-of select="substring-after($text, '# ')"/>
+                                                               </comment>
+                                                       </when>

                                                        <otherwise>
                                                                <html:p>
                                                                        <call-template name="LesML:id-and-contents">
                                                        <otherwise>
                                                                <html:p>
                                                                        <call-template name="LesML:id-and-contents">


@@ -392,7 +475,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </choose>
                                        </variable>
                                        <choose>
                                                </choose>
                                        </variable>
                                        <choose>

-                                               <when test="translate(string($text), '#*-=_~⁂─━┄┅┈┉╌╍═╴╶╸╺☙❧ ', '')=''">
+                                               <when test="translate(string($text), '&section-break; ', '')=''">

                                                        <html:hr/>
                                                </when>
                                                <when test="$quoted">
                                                        <html:hr/>
                                                </when>
                                                <when test="$quoted">


@@ -413,13 +496,17 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                <apply-templates select="exsl:node-set($inlined)/node()" mode="LesML:finalize-tree"/>
        </template>
        <template match="html:script[@type='text/lesml']">
                <apply-templates select="exsl:node-set($inlined)/node()" mode="LesML:finalize-tree"/>
        </template>
        <template match="html:script[@type='text/lesml']">

-               <variable name="source">
-                       <for-each select=".//text()">
-                               <value-of select="."/>
-                       </for-each>
+               <variable name="lines-fragment">
+                       <call-template name="LesML:split">
+                               <with-param name="source">
+                                       <for-each select=".//text()">
+                                               <value-of select="."/>
+                                       </for-each>
+                               </with-param>
+                       </call-template>

                </variable>
                <call-template name="LesML:parse">
                </variable>
                <call-template name="LesML:parse">

-                       <with-param name="source" select="string($source)"/>
+                       <with-param name="lines" select="exsl:node-set($lines-fragment)/*"/>

                </call-template>
        </template>
        <template match="@*|node()" mode="LesML:finalize-tree" priority="-1">
                </call-template>
        </template>
        <template match="@*|node()" mode="LesML:finalize-tree" priority="-1">