Quotes and brackets as multiparagraph divisions

[LesML] / parser.xslt

diff --git a/parser.xslt b/parser.xslt
index 8f80c393e9ffefabfb2ee42991439ee830e9d6e6..99ee7434f534aec464594df038b17656e7ccf157 100644 (file)
--- a/parser.xslt
+++ b/parser.xslt
@@ -13,7 +13,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 -->
 <!DOCTYPE transform [
        <!ENTITY LesML "urn:fdc:ladys.computer:20240512:LesML">
 -->
 <!DOCTYPE transform [
        <!ENTITY LesML "urn:fdc:ladys.computer:20240512:LesML">

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

        <!ENTITY sigiled-text "(string-length($text)=1 or substring($text, 2, 1)=' ' or substring($text, 2, 1)='¶')">
        <!ENTITY unsigiled-text "concat(translate(substring($text, 2, 1), ' ', ''), substring($text, 3, string-length($text)-2))">
        <!ENTITY xhtml "http://www.w3.org/1999/xhtml">
        <!ENTITY sigiled-text "(string-length($text)=1 or substring($text, 2, 1)=' ' or substring($text, 2, 1)='¶')">
        <!ENTITY unsigiled-text "concat(translate(substring($text, 2, 1), ' ', ''), substring($text, 3, string-length($text)-2))">
        <!ENTITY xhtml "http://www.w3.org/1999/xhtml">


@@ -32,6 +32,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        version="1.0"
 >
        <书社:id>urn:fdc:ladys.computer:20240512:LesML:parser.xslt</书社:id>
        version="1.0"
 >
        <书社:id>urn:fdc:ladys.computer:20240512:LesML:parser.xslt</书社:id>

+       <param name="LESML_SECTION_BREAK_CHARS" select="'*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'"/>

        <template name="LesML:split">
                <param name="source"/>
                <param name="separator" select="'&#xA;'"/>
        <template name="LesML:split">
                <param name="source"/>
                <param name="separator" select="'&#xA;'"/>


@@ -121,6 +122,31 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </otherwise>
                </choose>
        </template>
                        </otherwise>
                </choose>
        </template>

+       <template name="LesML:comment-out">
+               <param name="source"/>
+               <variable name="comment-split-fragment">
+                       <call-template name="LesML:split">
+                               <with-param name="source" select="$source"/>
+                               <with-param name="separator" select="'--'"/>
+                       </call-template>
+               </variable>
+               <comment>
+                       <for-each select="exsl:node-set($comment-split-fragment)/*">
+                               <if test="string()='' or starts-with(., '‐')">
+                                       <text>&#x034F;</text>
+                               </if>
+                               <value-of select="."/>
+                               <if test="substring(., string-length(.), 1)='‐'">
+                                       <text>&#x034F;</text>
+                               </if>
+                               <choose>
+                                       <when test="position()!=last()">
+                                               <text>-&#x034F;-</text>
+                                       </when>
+                               </choose>
+                       </for-each>
+               </comment>
+       </template>

        <template name="LesML:id-and-contents">
                <param name="source"/>
                <variable name="id-and-lang">
        <template name="LesML:id-and-contents">
                <param name="source"/>
                <variable name="id-and-lang">


@@ -257,9 +283,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                <variable name="docsep" select="$noshebang[starts-with(., '#!lesml') or starts-with(., '##')][1]"/>
                <variable name="doclines" select="exslset:leading($noshebang, $docsep)"/>
                <if test="starts-with($first-line, '##') and $first-line!='##'">
                <variable name="docsep" select="$noshebang[starts-with(., '#!lesml') or starts-with(., '##')][1]"/>
                <variable name="doclines" select="exslset:leading($noshebang, $docsep)"/>
                <if test="starts-with($first-line, '##') and $first-line!='##'">

-                       <comment>
-                               <value-of select="substring-after($first-line, '##')"/>
-                       </comment>
+                       <call-template name="LesML:comment-out">
+                               <with-param name="source" select="substring-after($first-line, '##')"/>
+                       </call-template>

                </if>
                <if test="$doclines[normalize-space()!='']">
                        <variable name="record-separators" select="$doclines[starts-with(., '%%')]"/>
                </if>
                <if test="$doclines[normalize-space()!='']">
                        <variable name="record-separators" select="$doclines[starts-with(., '%%')]"/>


@@ -335,9 +361,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </if>
                                                        <if test=".!='%%'">
                                                                </element>
                                                        </if>
                                                        <if test=".!='%%'">

-                                                               <comment>
-                                                                       <value-of select="substring-after(., '%%')"/>
-                                                               </comment>
+                                                               <call-template name="LesML:comment-out">
+                                                                       <with-param name="source" select="substring-after(., '%%')"/>
+                                                               </call-template>

                                                        </if>
                                                </for-each>
                                        </element>
                                                        </if>
                                                </for-each>
                                        </element>


@@ -359,317 +385,364 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </call-template>
                </if>
        </template>
                        </call-template>
                </if>
        </template>

-       <template name="LesML:paragraphize">
+       <template name="LesML:block">

                <param name="lines" select="/.."/>
                <param name="lines" select="/.."/>

-               <variable name="last-lines" select="$lines[normalize-space()!='' and normalize-space(following-sibling::*[1])='']|$lines[last()]"/>
-               <variable name="blocked">
-                       <for-each select="$last-lines">
-                               <variable name="position" select="position()"/>
-                               <variable name="prev-last" select="$last-lines[($position)-1]"/>
-                               <variable name="linespans" select="(exslset:intersection(exslset:trailing($lines, $prev-last), exslset:leading($lines, .))|.)[normalize-space()!='']"/>
-                               <variable name="quoted" select="not($linespans[not(starts-with(., ' ') or starts-with(., '&#x9;'))])"/>
-                               <variable name="preformatted" select="not($linespans[not(starts-with(normalize-space(), '|'))])"/>
-                               <variable name="text">
-                                       <for-each select="$linespans">
-                                               <choose>
-                                                       <when test="$preformatted">
-                                                               <value-of select="substring-after(., '|')"/>
-                                                       </when>
-                                                       <otherwise>
-                                                               <value-of select="normalize-space()"/>
-                                                       </otherwise>
-                                               </choose>
-                                               <if test="position()!=count($linespans)">
+               <variable name="last-lines" select="$lines[normalize-space()!='' and (normalize-space(following-sibling::*[1])='' or position()=last())]"/>
+               <for-each select="$last-lines">
+                       <variable name="position" select="position()"/>
+                       <variable name="prev-last" select="$last-lines[($position)-1]"/>
+                       <variable name="linespans" select="(exslset:intersection(exslset:trailing($lines, $prev-last), exslset:leading($lines, .))|.)[normalize-space()!='']"/>
+                       <variable name="prefix" select="substring(translate(., ' &#x9;', ''), 1, 1)"/>
+                       <variable name="all-prefixed" select="not($linespans[not(starts-with(translate(., ' &#x9;', ''), $prefix))])"/>
+                       <variable name="quoted" select="$all-prefixed and $prefix='»'"/>
+                       <variable name="bracketed" select="$all-prefixed and $prefix=']'"/>
+                       <choose>
+                               <when test="count($linespans)=1 and translate(., concat($LESML_SECTION_BREAK_CHARS, ' &#x9;'), '')=''">
+                                       <element name="hr" namespace="&xhtml;"/>
+                               </when>
+                               <when test="$quoted or $bracketed">
+                                       <variable name="innerlines-fragment">
+                                               <for-each select="$linespans">
+                                                       <variable name="inner">
+                                                               <value-of select="substring-after(., $prefix)"/>
+                                                       </variable>
+                                                       <copy>
+                                                               <choose>
+                                                                       <when test="starts-with($inner, ' ') or starts-with($inner, '&#x9;')">
+                                                                               <value-of select="substring($inner, 1+count(exslstr:tokenize($inner, '')[normalize-space()='' and not(preceding-sibling::*[normalize-space()!=''])]))"/>
+                                                                       </when>
+                                                                       <otherwise>
+                                                                               <value-of select="$inner"/>
+                                                                       </otherwise>
+                                                               </choose>
+                                                       </copy>
+                                               </for-each>
+                                       </variable>
+                                       <variable name="blocked-fragment">
+                                               <call-template name="LesML:block">
+                                                       <with-param name="lines" select="exsl:node-set($innerlines-fragment)/*"/>
+                                               </call-template>
+                                       </variable>
+                                       <variable name="innerpars" select="exsl:node-set($blocked-fragment)/node()"/>
+                                       <choose>
+                                               <when test="$quoted and $innerpars[position()=last() and self::html:footer]">
+                                                       <element name="figure" namespace="&xhtml;">
+                                                               <element name="blockquote" namespace="&xhtml;">
+                                                                       <copy-of select="$innerpars[position()!=last()]"/>
+                                                               </element>
+                                                               <element name="figcaption" namespace="&xhtml;">
+                                                                       <copy-of select="$innerpars[last()]/node()"/>
+                                                               </element>
+                                                       </element>
+                                               </when>
+                                               <when test="$quoted">
+                                                       <element name="blockquote" namespace="&xhtml;">
+                                                               <copy-of select="$innerpars"/>
+                                                       </element>
+                                               </when>
+                                               <when test="$bracketed">
+                                                       <element name="footer" namespace="&xhtml;">
+                                                               <copy-of select="$innerpars"/>
+                                                       </element>
+                                               </when>
+                                       </choose>
+                               </when>
+                               <otherwise>
+                                       <variable name="preformatted" select="$all-prefixed and $prefix='|'"/>
+                                       <variable name="text">
+                                               <for-each select="$linespans">

                                                        <choose>
                                                                <when test="$preformatted">
                                                        <choose>
                                                                <when test="$preformatted">

-                                                                       <text>&#xA;</text>
+                                                                       <value-of select="substring-after(., '|')"/>

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

-                                                                       <text> </text>
+                                                                       <value-of select="normalize-space()"/>

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

-                                               </if>
-                                       </for-each>
-                               </variable>
-                               <if test="string($text)!=''">
-                                       <variable name="par">
-                                               <choose>
-                                                       <when test="$preformatted">
-                                                               <element name="pre" namespace="&xhtml;">
+                                                       <if test="position()!=count($linespans)">
+                                                               <choose>
+                                                                       <when test="$preformatted">
+                                                                               <text>&#xA;</text>
+                                                                       </when>
+                                                                       <otherwise>
+                                                                               <text> </text>
+                                                                       </otherwise>
+                                                               </choose>
+                                                       </if>
+                                               </for-each>
+                                       </variable>
+                                       <choose>
+                                               <when test="$preformatted">
+                                                       <element name="pre" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="$text"/>
+                                                               </call-template>
+                                                       </element>
+                                               </when>
+                                               <when test="string($text)=''"/>
+                                               <when test="starts-with($text, '⁌') and &sigiled-text;">
+                                                       <element name="h1" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="&unsigiled-text;"/>
+                                                               </call-template>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '§') and &sigiled-text;">
+                                                       <element name="h2" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="&unsigiled-text;"/>
+                                                               </call-template>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '❦') and &sigiled-text;">
+                                                       <element name="h3" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="&unsigiled-text;"/>
+                                                               </call-template>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '✠') and &sigiled-text;">
+                                                       <element name="h4" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="&unsigiled-text;"/>
+                                                               </call-template>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '•') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>unordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>1</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">

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

-                                                                               <with-param name="source" select="$text"/>
+                                                                               <with-param name="source" select="&unsigiled-text;"/>

                                                                        </call-template>
                                                                </element>
                                                                        </call-template>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '⁌') and &sigiled-text;">
-                                                               <element name="h1" namespace="&xhtml;">
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '🔢') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>ordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>1</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">

                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>
                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '§') and &sigiled-text;">
-                                                               <element name="h2" namespace="&xhtml;">
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '◦') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>unordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>2</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">

                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>
                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '❦') and &sigiled-text;">
-                                                               <element name="h3" namespace="&xhtml;">
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '🔠') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>ordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>2</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">

                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>
                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '✠') and &sigiled-text;">
-                                                               <element name="h4" namespace="&xhtml;">
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '▪') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>unordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>3</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">

                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>
                                                                        <call-template name="LesML:id-and-contents">
                                                                                <with-param name="source" select="&unsigiled-text;"/>
                                                                        </call-template>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '•') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>unordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>1</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '🔢') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>ordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>1</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '◦') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>unordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>2</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '🔠') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>ordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>2</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '▪') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>unordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>3</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '🔡') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>ordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>3</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '⁃') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>unordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>4</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
-                                                               </element>
-                                                       </when>
-                                                       <when test="starts-with($text, '🔣') and &sigiled-text;">
-                                                               <element name="li" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>ordered</text>
-                                                                       </attribute>
-                                                                       <attribute name="data-level">
-                                                                               <text>4</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '🔡') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>ordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>3</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '🛈') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="role">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <attribute name="class">
-                                                                               <text>info</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '⁃') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>unordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>4</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '⯑') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="role">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <attribute name="class">
-                                                                               <text>query</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '🔣') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>ordered</text>
+                                                               </attribute>
+                                                               <attribute name="data-level">
+                                                                       <text>4</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '⚠︎') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="role">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <attribute name="class">
-                                                                               <text>warn</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '🛈') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <attribute name="class">
+                                                                       <text>info</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '※') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="role">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <attribute name="class">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '⯑') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <attribute name="class">
+                                                                       <text>query</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '☡') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="role">
-                                                                               <text>note</text>
-                                                                       </attribute>
-                                                                       <attribute name="class">
-                                                                               <text>caution</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '⚠︎') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <attribute name="class">
+                                                                       <text>warn</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '⋯') and &sigiled-text;">
-                                                               <element name="div" namespace="&xhtml;">
-                                                                       <attribute name="class">
-                                                                               <text>continuation</text>
-                                                                       </attribute>
-                                                                       <element name="p" namespace="&xhtml;">
-                                                                               <call-template name="LesML:id-and-contents">
-                                                                                       <with-param name="source" select="&unsigiled-text;"/>
-                                                                               </call-template>
-                                                                       </element>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '※') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <attribute name="class">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>

                                                                </element>
                                                                </element>

-                                                       </when>
-                                                       <when test="starts-with($text, '#') and &sigiled-text;">
-                                                               <comment>
-                                                                       <value-of select="&unsigiled-text;"/>
-                                                               </comment>
-                                                       </when>
-                                                       <otherwise>
+                                                       </element>
+                                               </when>
+                                               <when test="starts-with($text, '☡') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>note</text>
+                                                               </attribute>
+                                                               <attribute name="class">
+                                                                       <text>caution</text>
+                                                               </attribute>

                                                                <element name="p" namespace="&xhtml;">
                                                                        <call-template name="LesML:id-and-contents">
                                                                <element name="p" namespace="&xhtml;">
                                                                        <call-template name="LesML:id-and-contents">

-                                                                               <with-param name="source" select="$text"/>
+                                                                               <with-param name="source" select="&unsigiled-text;"/>

                                                                        </call-template>
                                                                </element>
                                                                        </call-template>
                                                                </element>

-                                                       </otherwise>
-                                               </choose>
-                                       </variable>
-                                       <choose>
-                                               <when test="translate(string($text), '&section-break; ', '')=''">
-                                                       <element name="hr" namespace="&xhtml;"/>
+                                                       </element>

                                                </when>
                                                </when>

-                                               <when test="$quoted">
-                                                       <element name="blockquote" namespace="&xhtml;">
-                                                               <copy-of select="$par"/>
+                                               <when test="starts-with($text, '⋯') and &sigiled-text;">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>continuation</text>
+                                                               </attribute>
+                                                               <element name="p" namespace="&xhtml;">
+                                                                       <call-template name="LesML:id-and-contents">
+                                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                                       </call-template>
+                                                               </element>

                                                        </element>
                                                </when>
                                                        </element>
                                                </when>

+                                               <when test="starts-with($text, '#') and &sigiled-text;">
+                                                       <call-template name="LesML:comment-out">
+                                                               <with-param name="source" select="&unsigiled-text;"/>
+                                                       </call-template>
+                                               </when>

                                                <otherwise>
                                                <otherwise>

-                                                       <copy-of select="$par"/>
+                                                       <element name="p" namespace="&xhtml;">
+                                                               <call-template name="LesML:id-and-contents">
+                                                                       <with-param name="source" select="$text"/>
+                                                               </call-template>
+                                                       </element>

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

-                               </if>
-                       </for-each>
+                               </otherwise>
+                       </choose>
+               </for-each>
+       </template>
+       <template name="LesML:paragraphize">
+               <param name="lines" select="/.."/>
+               <variable name="blocked-fragment">
+                       <call-template name="LesML:block">
+                               <with-param name="lines" select="$lines"/>
+                       </call-template>

                </variable>
                </variable>

-               <variable name="inlined">
-                       <apply-templates select="exsl:node-set($blocked)/node()" mode="LesML:comment"/>
+               <variable name="inlined-fragment">
+                       <apply-templates select="exsl:node-set($blocked-fragment)/node()" mode="LesML:comment"/>

                </variable>
                </variable>

-               <apply-templates select="exsl:node-set($inlined)/node()" mode="LesML:finalize-tree"/>
+               <apply-templates select="exsl:node-set($inlined-fragment)/node()" mode="LesML:finalize-tree"/>

        </template>
        <template match="html:script[@type='text/lesml']">
                <variable name="lines-fragment">
        </template>
        <template match="html:script[@type='text/lesml']">
                <variable name="lines-fragment">


@@ -709,45 +782,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </if>
                </element>
        </template>
                        </if>
                </element>
        </template>

-       <template match="html:blockquote" mode="LesML:finalize-tree">
-               <if test="not(preceding-sibling::node()) or preceding-sibling::node()[position()=1 and not(self::html:blockquote)]">
-                       <variable name="notquote" select="following-sibling::node()[not(self::html:blockquote)][1]"/>
-                       <variable name="contents">
-                               <copy-of select="node()"/>
-                               <for-each select="exslset:leading(following-sibling::node(), $notquote)">
-                                       <copy-of select="node()"/>
-                               </for-each>
-                       </variable>
-                       <variable name="content-nodes" select="exsl:node-set($contents)/node()"/>
-                       <variable name="laststarttext" select="$content-nodes[last()]/self::html:p[not(@class) and not(@role)]/node()[self::text() or self::*][position()=1 and self::text()]"/>
-                       <choose>
-                               <when test="starts-with($laststarttext, '— ')">
-                                       <variable name="caption">
-                                               <copy-of select="$laststarttext/preceding-sibling::node()"/>
-                                               <value-of select="substring-after($laststarttext, '— ')"/>
-                                               <copy-of select="$laststarttext/following-sibling::node()"/>
-                                       </variable>
-                                       <element name="figure" namespace="&xhtml;">
-                                               <copy>
-                                                       <apply-templates select="@*|$content-nodes[position()!=last()]" mode="LesML:finalize-tree"/>
-                                               </copy>
-                                               <element name="figcaption" namespace="&xhtml;">
-                                                       <for-each select="$content-nodes[last()]">
-                                                               <copy>
-                                                                       <apply-templates select="@*|exsl:node-set($caption)/node()" mode="LesML:finalize-tree"/>
-                                                               </copy>
-                                                       </for-each>
-                                               </element>
-                                       </element>
-                               </when>
-                               <otherwise>
-                                       <copy>
-                                               <apply-templates select="@*|$content-nodes" mode="LesML:finalize-tree"/>
-                                       </copy>
-                               </otherwise>
-                       </choose>
-               </if>
-       </template>

        <template match="html:div" mode="LesML:finalize-tree">
                <if test="not(@class='continuation') or not(preceding-sibling::node()) or preceding-sibling::node()[position()=1 and not(self::html:div or self::html:li)]">
                        <variable name="notcontinuation" select="following-sibling::node()[not(self::html:div and @class='continuation')][1]"/>
        <template match="html:div" mode="LesML:finalize-tree">
                <if test="not(@class='continuation') or not(preceding-sibling::node()) or preceding-sibling::node()[position()=1 and not(self::html:div or self::html:li)]">
                        <variable name="notcontinuation" select="following-sibling::node()[not(self::html:div and @class='continuation')][1]"/>


@@ -839,12 +873,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </for-each>
                                                                <value-of select="substring-before($end-node, '⌫')"/>
                                                        </variable>
                                                                </for-each>
                                                                <value-of select="substring-before($end-node, '⌫')"/>
                                                        </variable>

-                                                       <variable name="comment-split-fragment">
-                                                               <call-template name="LesML:split">
-                                                                       <with-param name="source" select="string($comment)"/>
-                                                                       <with-param name="separator" select="'--'"/>
-                                                               </call-template>
-                                                       </variable>

                                                        <variable name="rest-fragment">
                                                                <element name="span" namespace="&xhtml;">
                                                                        <value-of select="substring-after($end-node, '⌫')"/>
                                                        <variable name="rest-fragment">
                                                                <element name="span" namespace="&xhtml;">
                                                                        <value-of select="substring-after($end-node, '⌫')"/>


@@ -858,22 +886,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <copy-of select="@*"/>
                                                                <copy-of select="$start-node/preceding-sibling::node()"/>
                                                                <copy-of select="substring-before($start-node, '⌦')"/>
                                                                <copy-of select="@*"/>
                                                                <copy-of select="$start-node/preceding-sibling::node()"/>
                                                                <copy-of select="substring-before($start-node, '⌦')"/>

-                                                               <comment>
-                                                                       <for-each select="exsl:node-set($comment-split-fragment)/*">
-                                                                               <if test="string()='' or starts-with(., '‐')">
-                                                                                       <text>&#x034F;</text>
-                                                                               </if>
-                                                                               <value-of select="."/>
-                                                                               <if test="substring(., string-length(.), 1)='‐'">
-                                                                                       <text>&#x034F;</text>
-                                                                               </if>
-                                                                               <choose>
-                                                                                       <when test="position()!=last()">
-                                                                                               <text>-&#x034F;-</text>
-                                                                                       </when>
-                                                                               </choose>
-                                                                       </for-each>
-                                                               </comment>
+                                                               <call-template name="LesML:comment-out">
+                                                                       <with-param name="source" select="string($comment)"/>
+                                                               </call-template>

                                                                <copy-of select="exsl:node-set($commented-rest-fragment)/*/node()"/>
                                                        </copy>
                                                </when>
                                                                <copy-of select="exsl:node-set($commented-rest-fragment)/*/node()"/>
                                                        </copy>
                                                </when>


@@ -895,9 +910,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <for-each select="exsl:node-set($split-fragment)/node()">
                                                <value-of select="."/>
                                                <if test="position()!=last()">
                                        <for-each select="exsl:node-set($split-fragment)/node()">
                                                <value-of select="."/>
                                                <if test="position()!=last()">

-                                                       <comment>
-                                                               <text>&#x034F;</text>
-                                                       </comment>
+                                                       <call-template name="LesML:comment-out"/>

                                                </if>
                                        </for-each>
                                </when>
                                                </if>
                                        </for-each>
                                </when>