X-Git-Url: https://git.ladys.computer/LesML/blobdiff_plain/0c826f34b9a00337f05549fcc3b796470b83dc4056fd840c1ee7897820158ca7..76f50a0b2dbe30d9542438fae09d30c6375dc557190051bc17e99599e9750b27:/parser.xslt?ds=sidebyside

diff --git a/parser.xslt b/parser.xslt
index 014c15b..d9b2986 100644
--- 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">
-	<!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">
@@ -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>
+	<param name="LESML_SECTION_BREAK_CHARS" select="'*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'"/>
 	<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>
+	<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">
@@ -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!='##'">
-			<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(., '%%')]"/>
@@ -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=".!='%%'">
-								<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>
@@ -359,317 +385,362 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</call-template>
 		</if>
 	</template>
-	<template name="LesML:paragraphize">
+	<template name="LesML:block">
 		<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">
-									<text>&#xA;</text>
+									<value-of select="substring-after(., '|')"/>
 								</when>
 								<otherwise>
-									<text> </text>
+									<value-of select="normalize-space()"/>
 								</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">
-										<with-param name="source" select="$text"/>
+										<with-param name="source" select="&unsigiled-text;"/>
 									</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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>
-							</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">
-										<with-param name="source" select="$text"/>
+										<with-param name="source" select="&unsigiled-text;"/>
 									</call-template>
 								</element>
-							</otherwise>
-						</choose>
-					</variable>
-					<choose>
-						<when test="translate(string($text), '&section-break; ', '')=''">
-							<element name="hr" namespace="&xhtml;"/>
+							</element>
 						</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;">
+								<processing-instruction name="LesML-Continuation"/>
+								<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;">
+							<call-template name="LesML:comment-out">
+								<with-param name="source" select="&unsigiled-text;"/>
+							</call-template>
+						</when>
 						<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>
-				</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 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>
-		<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">
@@ -709,58 +780,69 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</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()]"/>
+	<template match="html:div" mode="LesML:finalize-tree">
+		<if test="not(processing-instruction()[local-name()='LesML-Continuation']) or not(preceding-sibling::node()[position()=1 and self::html:* and contains(' div li h1 h2 h3 h4 h5 h6 ', local-name())])">
+			<variable name="notcontinuation" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][1]"/>
 			<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;">
+				<when test="processing-instruction()[local-name()='LesML-Continuation'] and $notcontinuation[self::html:* and contains(' h1 h2 h3 h4 h5 h6 ', local-name())]">
+					<variable name="notcontinuation2" select="$notcontinuation/following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][1]"/>
+					<element name="hgroup" namespace="&xhtml;">
+						<apply-templates select="node()" mode="LesML:finalize-tree"/>
+						<for-each select="exslset:leading(following-sibling::node(), $notcontinuation2)">
+							<choose>
+								<when test="self::html:div">
+									<apply-templates select="node()" mode="LesML:finalize-tree"/>
+								</when>
+								<otherwise>
+									<copy>
+										<apply-templates select="@*|node()" mode="LesML:finalize-tree"/>
+									</copy>
+								</otherwise>
+							</choose>
+						</for-each>
+					</element>
+				</when>
+				<when test="not(processing-instruction()[local-name()='LesML-Continuation'])">
+					<copy>
+						<apply-templates select="@*|node()" mode="LesML:finalize-tree"/>
+						<for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">
+							<apply-templates select="node()" mode="LesML:finalize-tree"/>
+						</for-each>
+					</copy>
+				</when>
+				<otherwise>
+					<apply-templates select="node()" mode="LesML:finalize-tree"/>
+					<for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">
+						<apply-templates select="node()" mode="LesML:finalize-tree"/>
+					</for-each>
+				</otherwise>
+			</choose>
+		</if>
+	</template>
+	<template match="html:h1|html:h2|html:h3|html:h4|html:h5|html:h6" mode="LesML:finalize-tree">
+		<if test="not(preceding-sibling::node()[position()=1 and self::html:div/processing-instruction()[local-name()='LesML-Continuation']]) or preceding-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][position()=1 and self::html:* and contains(' h1 h2 h3 h4 h5 h6 ', local-name())]">
+			<choose>
+				<when test="following-sibling::node()[position()=1 and self::html:div]/processing-instruction()[local-name()='LesML-Continuation']">
+					<variable name="notcontinuation" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][1]"/>
+					<element name="hgroup" namespace="&xhtml;">
 						<copy>
-							<apply-templates select="@*|$content-nodes[position()!=last()]" mode="LesML:finalize-tree"/>
+							<apply-templates select="@*|node()" 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>
+						<for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">
+							<apply-templates select="node()" mode="LesML:finalize-tree"/>
+						</for-each>
 					</element>
 				</when>
 				<otherwise>
 					<copy>
-						<apply-templates select="@*|$content-nodes" mode="LesML:finalize-tree"/>
+						<apply-templates select="@*|node()" 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]"/>
-			<copy>
-				<apply-templates select="@*|node()" mode="LesML:finalize-tree"/>
-				<for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">
-					<apply-templates select="node()" mode="LesML:finalize-tree"/>
-				</for-each>
-			</copy>
-		</if>
-	</template>
 	<template match="html:li" mode="LesML:finalize-tree">
-		<if test="not(preceding-sibling::node()) or preceding-sibling::node()[not(preceding-sibling::* and self::html:div and @class='continuation')][position()=1 and not(self::html:li)]">
+		<if test="not(preceding-sibling::node()) or preceding-sibling::node()[not(preceding-sibling::* and self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][position()=1 and not(self::html:li)]">
 			<apply-templates select="." mode="LesML:finalize-list"/>
 		</if>
 	</template>
@@ -778,10 +860,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</otherwise>
 			</choose>
 		</variable>
-		<variable name="notinlist" select="following-sibling::node()[not(self::html:div and @class='continuation' or self::html:li and (@data-level>$current-level or @data-level=$current-level and @class=$current-class))][1]"/>
+		<variable name="notinlist" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'] or self::html:li and (@data-level>$current-level or @data-level=$current-level and @class=$current-class))][1]"/>
 		<element name="{$wrapper}" namespace="&xhtml;">
 			<for-each select=".|exslset:leading(following-sibling::node(), $notinlist)[self::html:li and @data-level=$current-level]">
-				<variable name="notcontinuation" select="following-sibling::node()[not(self::html:div and @class='continuation')][1]"/>
+				<variable name="notcontinuation" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][1]"/>
 				<copy>
 					<apply-templates select="@*|node()" mode="LesML:finalize-tree"/>
 					<for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">
@@ -801,6 +883,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</apply-templates>
 		</if>
 	</template>
+	<template match="processing-instruction()[local-name()='LesML-Continuation']" mode="LesML:finalize-tree"/>
 	<template match="processing-instruction()[local-name()='LesML-Token-Escape']" mode="LesML:finalize-tree">
 		<value-of select="."/>
 	</template>
@@ -839,12 +922,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>
-							<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, '⌫')"/>
@@ -858,22 +935,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, '⌦')"/>
-								<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>
@@ -895,9 +959,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()">
-							<comment>
-								<text>&#x034F;</text>
-							</comment>
+							<call-template name="LesML:comment-out"/>
 						</if>
 					</for-each>
 				</when>
@@ -994,42 +1056,73 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		<param name="separator"/>
 		<param name="ncname-keys" select="false()"/>
 		<variable name="end-node" select="text()[contains(., $end-sigil)][1]"/>
-		<variable name="has-start-node" select="$end-node/preceding-sibling::text()[contains(., $start-sigil) and not(following-sibling::* or following-sibling::comment())] or string-length(substring-after($end-node, $start-sigil))>string-length(substring-after($end-node, $end-sigil))"/>
+		<variable name="has-start-node" select="$end-node/preceding-sibling::text()[contains(., $start-sigil)] or string-length(substring-after($end-node, $start-sigil))>string-length(substring-after($end-node, $end-sigil))"/>
 		<choose>
 			<when test="$end-node and $has-start-node">
-				<variable name="preceding">
+				<variable name="preceding-fragment">
 					<copy-of select="$end-node/preceding-sibling::node()"/>
 					<value-of select="substring-before($end-node, $end-sigil)"/>
 				</variable>
-				<variable name="start-node" select="exsl:node-set($preceding)/text()[contains(., $start-sigil) and not(following-sibling::*)][last()]"/>
+				<variable name="preceding" select="exsl:node-set($preceding-fragment)/node()"/>
+				<variable name="start-node" select="($preceding[self::text() and contains(., $start-sigil)])[last()][not($ncname-keys) or not(following-sibling::* or following-sibling::comment())]"/>
 				<variable name="start-tokens-fragment">
-					<call-template name="LesML:split">
-						<with-param name="source" select="string($start-node)"/>
-						<with-param name="separator" select="$start-sigil"/>
-					</call-template>
+					<if test="$start-node">
+						<call-template name="LesML:split">
+							<with-param name="source" select="string($start-node)"/>
+							<with-param name="separator" select="$start-sigil"/>
+						</call-template>
+					</if>
 				</variable>
 				<variable name="start-tokens" select="exsl:node-set($start-tokens-fragment)/*"/>
-				<variable name="innards">
+				<variable name="innards-fragment">
 					<value-of select="$start-tokens[last()]"/>
-					<for-each select="$start-node/following-sibling::node()">
-						<value-of select="."/>
-					</for-each>
+					<copy-of select="$start-node/following-sibling::node()"/>
 				</variable>
+				<variable name="innards" select="exsl:node-set($innards-fragment)/node()"/>
+				<variable name="separator-node" select="($innards[self::text() and contains(., $separator)])[not($ncname-keys)*(last()-1)+1]"/>
 				<choose>
-					<when test="contains($innards, $separator)">
+					<when test="not($start-node) or $separator-node[following-sibling::* or following-sibling::comment()]">
+						<variable name="bad-start-node" select="($preceding[self::text() and contains(., $start-sigil)])[last()]"/>
+						<variable name="bad-start-tokens-fragment">
+							<call-template name="LesML:split">
+								<with-param name="source" select="string($bad-start-node)"/>
+								<with-param name="separator" select="$start-sigil"/>
+							</call-template>
+						</variable>
+						<element name="span" namespace="&xhtml;">
+							<copy-of select="$bad-start-node/preceding-sibling::node()"/>
+							<for-each select="exsl:node-set($bad-start-tokens-fragment)/*">
+								<value-of select="."/>
+								<if test="position()!=last()">
+									<processing-instruction name="LesML-Token-Escape">
+										<value-of select="$start-sigil"/>
+									</processing-instruction>
+								</if>
+							</for-each>
+							<copy-of select="$bad-start-node/following-sibling::node()"/>
+							<value-of select="$end-sigil"/>
+							<value-of select="substring-after($end-node, $end-sigil)"/>
+							<copy-of select="$end-node/following-sibling::node()"/>
+						</element>
+					</when>
+					<when test="$separator-node">
 						<variable name="keyval-fragment">
 							<call-template name="LesML:split">
-								<with-param name="source" select="$innards"/>
+								<with-param name="source" select="$separator-node"/>
 								<with-param name="separator" select="$separator"/>
 							</call-template>
 						</variable>
 						<variable name="keyval" select="exsl:node-set($keyval-fragment)/*"/>
-						<variable name="key">
+						<variable name="key-fragment">
 							<choose>
 								<when test="$ncname-keys">
+									<for-each select="$separator-node/preceding-sibling::node()">
+										<value-of select="."/>
+									</for-each>
 									<value-of select="$keyval[1]"/>
 								</when>
 								<otherwise>
+									<copy-of select="$separator-node/preceding-sibling::node()"/>
 									<for-each select="$keyval[position()!=last()]">
 										<value-of select="."/>
 										<if test="position()!=last()">
@@ -1053,9 +1146,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 									<value-of select="$keyval[last()]"/>
 								</otherwise>
 							</choose>
+							<for-each select="$separator-node/following-sibling::node()">
+								<value-of select="."/>
+							</for-each>
 						</variable>
 						<choose>
-							<when test="not($ncname-keys) or /self::node()[translate(normalize-space($key), ' /([,*', '')=string($key) and exsldyn:evaluate(concat('not(self::html:', $key, ')'))]">
+							<when test="not($ncname-keys) or /self::node()[translate(normalize-space($key-fragment), ' /([,*', '')=$key-fragment and exsldyn:evaluate(concat('not(self::html:', $key-fragment, ')'))]">
 								<element name="span" namespace="&xhtml;">
 									<copy-of select="$start-node/preceding-sibling::node()"/>
 									<for-each select="$start-tokens[position()!=last()]">
@@ -1066,7 +1162,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 									</for-each>
 								</element>
 								<element name="span" namespace="&xhtml;">
-									<value-of select="$key"/>
+									<copy-of select="$key-fragment"/>
 								</element>
 								<element name="span" namespace="&xhtml;">
 									<value-of select="$value"/>
@@ -1110,7 +1206,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 								<value-of select="$start-sigil"/>
 							</processing-instruction>
 							<value-of select="$start-tokens[last()]"/>
-							<value-of select="$start-node/following-sibling::node()"/>
+							<copy-of select="$start-node/following-sibling::node()"/>
 							<value-of select="$end-sigil"/>
 							<value-of select="substring-after($end-node, $end-sigil)"/>
 							<copy-of select="$end-node/following-sibling::node()"/>
@@ -1216,11 +1312,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 										</attribute>
 										<processing-instruction name="LesML-All-Done"/>
 										<choose>
-											<when test="string($partitioned[2])=''">
+											<when test="not($partitioned[2]/node())">
 												<value-of select="$partitioned[3]"/>
 											</when>
 											<otherwise>
-												<value-of select="$partitioned[2]"/>
+												<copy-of select="$partitioned[2]/node()"/>
 											</otherwise>
 										</choose>
 									</element>