X-Git-Url: https://git.ladys.computer/LesML/blobdiff_plain/41ef5d0d082b6949d5d03a523e7a0d9592d220394684b3a2b880820145c17605..33e28051265bb1e0d5dacefeb6de15730a7521f08d4bdbc0d4901380483e86ee:/parser.xslt?ds=sidebyside

diff --git a/parser.xslt b/parser.xslt
index de158ec..1baa48d 100644
--- a/parser.xslt
+++ b/parser.xslt
@@ -12,7 +12,9 @@ This Source Code Form is subject to the terms of the Mozilla Public License, v 2
 If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
 -->
 <!DOCTYPE transform [
-	<!ENTITY section-break '*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'>
+	<!ENTITY section-break "*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～">
+	<!ENTITY sigiled-text "(string-length($text)=1 or substring($text, 2, 1)=' ')">
+	<!ENTITY unsigiled-text "substring($text, 3, string-length($text)-2)">
 ]>
 <transform
 	xmlns="http://www.w3.org/1999/XSL/Transform"
@@ -46,6 +48,24 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</otherwise>
 		</choose>
 	</template>
+	<template name="LesML:break-and-unescape">
+		<param name="source"/>
+		<variable name="broken-fragment">
+			<call-template name="LesML:split">
+				<with-param name="source" select="$source"/>
+				<with-param name="separator" select="'&#xA;'"/>
+			</call-template>
+		</variable>
+		<variable name="broken" select="exsl:node-set($broken-fragment)/node()"/>
+		<for-each select="$broken">
+			<call-template name="LesML:unescape">
+				<with-param name="source" select="string()"/>
+			</call-template>
+			<if test="position()!=count($broken)">
+				<element name="html:br"/>
+			</if>
+		</for-each>
+	</template>
 	<template name="LesML:unescape">
 		<param name="source"/>
 		<choose>
@@ -103,9 +123,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<when test="starts-with($source, '¶')">
 				<choose>
 					<when test="contains($source, ' ')">
-						<attribute name="id">
-							<value-of select="substring-before(substring-after($source, '¶'), ' ')"/>
-						</attribute>
+						<variable name="id" select="substring-before(substring-after($source, '¶'), ' ')"/>
+						<if test="$id!=''">
+							<attribute name="id">
+								<value-of select="$id"/>
+							</attribute>
+						</if>
 						<value-of select="substring-after($source, ' ')"/>
 					</when>
 					<otherwise>
@@ -196,7 +219,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		</if>
 		<if test="$shebang!='' or $doclines[normalize-space()!='']">
 			<variable name="record-separators" select="$doclines[starts-with(., '%%')]"/>
-			<html:article>
+			<element name="html:article">
 				<for-each select="$params/html:div/html:dt[string()=' LANG ']">
 					<attribute name="lang">
 						<value-of select="following-sibling::html:dd"/>
@@ -211,23 +234,26 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					</attribute>
 				</for-each>
 				<if test="$record-separators[preceding-sibling::*[normalize-space()!='']]">
-					<html:footer class="head">
+					<element name="html:footer">
+						<attribute name="class">
+							<text>head</text>
+						</attribute>
 						<for-each select="$record-separators">
 							<variable name="position" select="position()"/>
 							<variable name="prev-separator" select="$record-separators[($position)-1]"/>
 							<variable name="fields" select="$noshebang[following-sibling::*[generate-id()=generate-id(current())] and (not($prev-separator) or preceding-sibling::*[generate-id()=generate-id($prev-separator)])]"/>
 							<if test="$fields">
-								<html:dl>
+								<element name="html:dl">
 									<for-each select="$fields">
 										<choose>
 											<when test="starts-with(., ' ') and $fields[generate-id()=generate-id(current()/preceding-sibling::*[1])]"/>
 											<otherwise>
 												<variable name="next" select="following-sibling::*[not(starts-with(., ' '))]"/>
-												<html:div>
-													<html:dt>
+												<element name="html:div">
+													<element name="html:dt">
 														<value-of select="normalize-space(substring-before(., ':'))"/>
-													</html:dt>
-													<html:dd>
+													</element>
+													<element name="html:dd">
 														<variable name="firstline">
 															<choose>
 																<when test="contains(., ':')">
@@ -257,12 +283,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 																</otherwise>
 															</choose>
 														</for-each>
-													</html:dd>
-												</html:div>
+													</element>
+												</element>
 											</otherwise>
 										</choose>
 									</for-each>
-								</html:dl>
+								</element>
 							</if>
 							<if test=".!='%%'">
 								<comment>
@@ -270,14 +296,17 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 								</comment>
 							</if>
 						</for-each>
-					</html:footer>
+					</element>
 				</if>
-				<html:div class="body">
+				<element name="html:div">
+					<attribute name="class">
+						<text>body</text>
+					</attribute>
 					<call-template name="LesML:paragraphize">
 						<with-param name="lines" select="$doclines[not($record-separators) or preceding-sibling::*[generate-id()=generate-id($record-separators[last()])]]"/>
 					</call-template>
-				</html:div>
-			</html:article>
+				</element>
+			</element>
 		</if>
 		<if test="$docsep">
 			<call-template name="LesML:parse">
@@ -295,188 +324,296 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				<variable name="prev-last" select="$last-lines[($position)-1]"/>
 				<variable name="linespans" select="$lines[following-sibling::*[generate-id()=generate-id(current())] and (not($prev-last) or preceding-sibling::*[generate-id()=generate-id($prev-last)]) and normalize-space()!='']|."/>
 				<variable name="quoted" select="not($linespans[not(starts-with(., ' ') or starts-with(., '&#x9;'))])"/>
+				<variable name="preformatted" select="not($linespans[not(starts-with(normalize-space(), '|'))])"/>
 				<variable name="text">
 					<for-each select="$linespans">
-						<value-of select="normalize-space()"/>
+						<choose>
+							<when test="$preformatted">
+								<value-of select="substring-after(., '|')"/>
+							</when>
+							<otherwise>
+								<value-of select="normalize-space()"/>
+							</otherwise>
+						</choose>
 						<if test="position()!=count($linespans)">
-							<text> </text>
+							<choose>
+								<when test="$preformatted">
+									<text>&#xA;</text>
+								</when>
+								<otherwise>
+									<text> </text>
+								</otherwise>
+							</choose>
 						</if>
 					</for-each>
 				</variable>
 				<if test="string($text)!=''">
 					<variable name="par">
 						<choose>
-							<when test="starts-with($text, '⁌ ')">
-								<html:h1>
+							<when test="$preformatted">
+								<element name="html:pre">
 									<call-template name="LesML:id-and-contents">
-										<with-param name="source" select="substring-after($text, '⁌ ')"/>
+										<with-param name="source" select="$text"/>
+									</call-template>
+								</element>
+							</when>
+							<when test="starts-with($text, '⁌') and &sigiled-text;">
+								<element name="html:h1">
+									<call-template name="LesML:id-and-contents">
+										<with-param name="source" select="&unsigiled-text;"/>
 									</call-template>
-								</html:h1>
+								</element>
 							</when>
-							<when test="starts-with($text, '§ ')">
-								<html:h2>
+							<when test="starts-with($text, '§') and &sigiled-text;">
+								<element name="html:h2">
 									<call-template name="LesML:id-and-contents">
-										<with-param name="source" select="substring-after($text, '§ ')"/>
+										<with-param name="source" select="&unsigiled-text;"/>
 									</call-template>
-								</html:h2>
+								</element>
 							</when>
-							<when test="starts-with($text, '❦ ')">
-								<html:h3>
+							<when test="starts-with($text, '❦') and &sigiled-text;">
+								<element name="html:h3">
 									<call-template name="LesML:id-and-contents">
-										<with-param name="source" select="substring-after($text, '❦ ')"/>
+										<with-param name="source" select="&unsigiled-text;"/>
 									</call-template>
-								</html:h3>
+								</element>
 							</when>
-							<when test="starts-with($text, '✠ ')">
-								<html:h4>
+							<when test="starts-with($text, '✠') and &sigiled-text;">
+								<element name="html:h4">
 									<call-template name="LesML:id-and-contents">
-										<with-param name="source" select="substring-after($text, '✠ ')"/>
+										<with-param name="source" select="&unsigiled-text;"/>
 									</call-template>
-								</html:h4>
+								</element>
 							</when>
-							<when test="starts-with($text, '• ')">
-								<html:li class="unordered" data-level="1">
-									<html:p>
+							<when test="starts-with($text, '•') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>unordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>1</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '• ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '🔢 ')">
-								<html:li class="ordered" data-level="1">
-									<html:p>
+							<when test="starts-with($text, '🔢') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>ordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>1</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '🔢 ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '◦ ')">
-								<html:li class="unordered" data-level="2">
-									<html:p>
+							<when test="starts-with($text, '◦') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>unordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>2</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '◦ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '🔠 ')">
-								<html:li class="ordered" data-level="2">
-									<html:p>
+							<when test="starts-with($text, '🔠') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>ordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>2</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '🔠 ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '▪ ')">
-								<html:li class="unordered" data-level="3">
-									<html:p>
+							<when test="starts-with($text, '▪') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>unordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>3</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '▪ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '🔡 ')">
-								<html:li class="ordered" data-level="3">
-									<html:p>
+							<when test="starts-with($text, '🔡') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>ordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>3</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '🔡 ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '⁃ ')">
-								<html:li class="unordered" data-level="4">
-									<html:p>
+							<when test="starts-with($text, '⁃') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>unordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>4</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '⁃ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '🔣 ')">
-								<html:li class="ordered" data-level="4">
-									<html:p>
+							<when test="starts-with($text, '🔣') and &sigiled-text;">
+								<element name="html:li">
+									<attribute name="class">
+										<text>ordered</text>
+									</attribute>
+									<attribute name="data-level">
+										<text>4</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '🔣 ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:li>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '🛈 ')">
-								<html:div role="note" class="info">
-									<html:p>
+							<when test="starts-with($text, '🛈') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="role">
+										<text>note</text>
+									</attribute>
+									<attribute name="class">
+										<text>info</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '🛈 ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '⯑ ')">
-								<html:div role="note" class="query">
-									<html:p>
+							<when test="starts-with($text, '⯑') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="role">
+										<text>note</text>
+									</attribute>
+									<attribute name="class">
+										<text>query</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '⯑ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '⚠︎ ')">
-								<html:div role="note" class="warn">
-									<html:p>
+							<when test="starts-with($text, '⚠︎') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="role">
+										<text>note</text>
+									</attribute>
+									<attribute name="class">
+										<text>warn</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '⚠︎ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '※ ')">
-								<html:div role="note" class="note">
-									<html:p>
+							<when test="starts-with($text, '※') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="role">
+										<text>note</text>
+									</attribute>
+									<attribute name="class">
+										<text>note</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '※ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '☡ ')">
-								<html:div role="note" class="caution">
-									<html:p>
+							<when test="starts-with($text, '☡') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="role">
+										<text>note</text>
+									</attribute>
+									<attribute name="class">
+										<text>caution</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '☡ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
 							</when>
-							<when test="starts-with($text, '⋯ ')">
-								<html:div class="continuation">
-									<html:p>
+							<when test="starts-with($text, '⋯') and &sigiled-text;">
+								<element name="html:div">
+									<attribute name="class">
+										<text>continuation</text>
+									</attribute>
+									<element name="html:p">
 										<call-template name="LesML:id-and-contents">
-											<with-param name="source" select="substring-after($text, '⋯ ')"/>
+											<with-param name="source" select="&unsigiled-text;"/>
 										</call-template>
-									</html:p>
-								</html:div>
+									</element>
+								</element>
+							</when>
+							<when test="starts-with($text, '#') and &sigiled-text;">
+								<comment>
+									<value-of select="&unsigiled-text;"/>
+								</comment>
 							</when>
 							<otherwise>
-								<html:p>
+								<element name="html:p">
 									<call-template name="LesML:id-and-contents">
 										<with-param name="source" select="$text"/>
 									</call-template>
-								</html:p>
+								</element>
 							</otherwise>
 						</choose>
 					</variable>
 					<choose>
 						<when test="translate(string($text), '&section-break; ', '')=''">
-							<html:hr/>
+							<element name="html:hr"/>
 						</when>
 						<when test="$quoted">
-							<html:blockquote>
+							<element name="html:blockquote">
 								<copy-of select="$par"/>
-							</html:blockquote>
+							</element>
 						</when>
 						<otherwise>
 							<copy-of select="$par"/>
@@ -510,7 +647,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		</copy>
 	</template>
 	<template match="text()" mode="LesML:finalize-tree">
-		<call-template name="LesML:unescape">
+		<call-template name="LesML:break-and-unescape">
 			<with-param name="source" select="string(.)"/>
 		</call-template>
 	</template>
@@ -532,18 +669,18 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 						<value-of select="substring-after($laststarttext, '— ')"/>
 						<copy-of select="$laststarttext/following-sibling::node()"/>
 					</variable>
-					<html:figure>
+					<element name="html:figure">
 						<copy>
 							<apply-templates select="@*|$content-nodes[position()!=last()]" mode="LesML:finalize-tree"/>
 						</copy>
-						<html:figcaption>
+						<element name="html:figcaption">
 							<for-each select="$content-nodes[last()]">
 								<copy>
 									<apply-templates select="@*|exsl:node-set($caption)/node()" mode="LesML:finalize-tree"/>
 								</copy>
 							</for-each>
-						</html:figcaption>
-					</html:figure>
+						</element>
+					</element>
 				</when>
 				<otherwise>
 					<copy>
@@ -754,7 +891,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 										</variable>
 										<copy-of select="$start-node/preceding-sibling::node()"/>
 										<value-of select="substring-before($start-node, '{🔗')"/>
-										<html:a href="{$ltcomponent-nodes[last()]}">
+										<element name="html:a">
+											<attribute name="href">
+												<value-of select="$ltcomponent-nodes[last()]"/>
+											</attribute>
 											<choose>
 												<when test="count($ltcomponent-nodes)>2 or normalize-space($ltcomponent-nodes[1])!=''">
 													<value-of select="$ltcomponent-nodes[1]"/>
@@ -767,7 +907,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 													<value-of select="$ltcomponent-nodes[last()]"/>
 												</otherwise>
 											</choose>
-										</html:a>
+										</element>
 										<copy-of select="exsl:node-set($processed-rest)/*/node()"/>
 									</when>
 									<otherwise>