X-Git-Url: https://git.ladys.computer/LesML/blobdiff_plain/413e1ccc2a7a78b79f37e96c86bbb62b54ccb961b08cde449e19d78464c6491d..33d2a2fe3248db2a2427270db8cb2a7e543163b604895600eb5172af76375ea5:/parser.xslt?ds=sidebyside

diff --git a/parser.xslt b/parser.xslt
index 7a30b3c..8677452 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)">
+				<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>
@@ -189,6 +212,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 		<variable name="noshebang" select="$lines[position()>1 or not(starts-with(., '#!lesml') or starts-with(., '##'))]"/>
 		<variable name="docsep" select="$noshebang[starts-with(., '#!lesml') or starts-with(., '##')][1]"/>
 		<variable name="doclines" select="$noshebang[not($docsep) or following-sibling::*[generate-id()=generate-id($docsep)]]"/>
+		<if test="starts-with($first-line, '##') and $first-line!='##'">
+			<comment>
+				<value-of select="substring-after($first-line, '##')"/>
+			</comment>
+		</if>
 		<if test="$shebang!='' or $doclines[normalize-space()!='']">
 			<variable name="record-separators" select="$doclines[starts-with(., '%%')]"/>
 			<html:article>
@@ -259,6 +287,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 									</for-each>
 								</html:dl>
 							</if>
+							<if test=".!='%%'">
+								<comment>
+									<value-of select="substring-after(., '%%')"/>
+								</comment>
+							</if>
 						</for-each>
 					</html:footer>
 				</if>
@@ -285,171 +318,198 @@ 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, '⁌ ')">
+							<when test="$preformatted">
+								<html:pre>
+									<call-template name="LesML:id-and-contents">
+										<with-param name="source" select="$text"/>
+									</call-template>
+								</html:pre>
+							</when>
+							<when test="starts-with($text, '⁌') and &sigiled-text;">
 								<html:h1>
 									<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:h1>
 							</when>
-							<when test="starts-with($text, '§ ')">
+							<when test="starts-with($text, '§') and &sigiled-text;">
 								<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>
 							</when>
-							<when test="starts-with($text, '❦ ')">
+							<when test="starts-with($text, '❦') and &sigiled-text;">
 								<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>
 							</when>
-							<when test="starts-with($text, '✠ ')">
+							<when test="starts-with($text, '✠') and &sigiled-text;">
 								<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>
 							</when>
-							<when test="starts-with($text, '• ')">
+							<when test="starts-with($text, '•') and &sigiled-text;">
 								<html:li class="unordered" data-level="1">
 									<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>
 							</when>
-							<when test="starts-with($text, '🔢 ')">
+							<when test="starts-with($text, '🔢') and &sigiled-text;">
 								<html:li class="ordered" data-level="1">
 									<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>
 							</when>
-							<when test="starts-with($text, '◦ ')">
+							<when test="starts-with($text, '◦') and &sigiled-text;">
 								<html:li class="unordered" data-level="2">
 									<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>
 							</when>
-							<when test="starts-with($text, '🔠 ')">
+							<when test="starts-with($text, '🔠') and &sigiled-text;">
 								<html:li class="ordered" data-level="2">
 									<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>
 							</when>
-							<when test="starts-with($text, '▪ ')">
+							<when test="starts-with($text, '▪') and &sigiled-text;">
 								<html:li class="unordered" data-level="3">
 									<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>
 							</when>
-							<when test="starts-with($text, '🔡 ')">
+							<when test="starts-with($text, '🔡') and &sigiled-text;">
 								<html:li class="ordered" data-level="3">
 									<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>
 							</when>
-							<when test="starts-with($text, '⁃ ')">
+							<when test="starts-with($text, '⁃') and &sigiled-text;">
 								<html:li class="unordered" data-level="4">
 									<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>
 							</when>
-							<when test="starts-with($text, '🔣 ')">
+							<when test="starts-with($text, '🔣') and &sigiled-text;">
 								<html:li class="ordered" data-level="4">
 									<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>
 							</when>
-							<when test="starts-with($text, '🛈 ')">
+							<when test="starts-with($text, '🛈') and &sigiled-text;">
 								<html:div role="note" class="info">
 									<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>
 							</when>
-							<when test="starts-with($text, '⯑ ')">
+							<when test="starts-with($text, '⯑') and &sigiled-text;">
 								<html:div role="note" class="query">
 									<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>
 							</when>
-							<when test="starts-with($text, '⚠︎ ')">
+							<when test="starts-with($text, '⚠︎') and &sigiled-text;">
 								<html:div role="note" class="warn">
 									<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>
 							</when>
-							<when test="starts-with($text, '※ ')">
+							<when test="starts-with($text, '※') and &sigiled-text;">
 								<html:div role="note" class="note">
 									<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>
 							</when>
-							<when test="starts-with($text, '☡ ')">
+							<when test="starts-with($text, '☡') and &sigiled-text;">
 								<html:div role="note" class="caution">
 									<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>
 							</when>
-							<when test="starts-with($text, '⋯ ')">
+							<when test="starts-with($text, '⋯') and &sigiled-text;">
 								<html:div class="continuation">
 									<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>
 							</when>
+							<when test="starts-with($text, '#') and &sigiled-text;">
+								<comment>
+									<value-of select="&unsigiled-text;"/>
+								</comment>
+							</when>
 							<otherwise>
 								<html:p>
 									<call-template name="LesML:id-and-contents">
@@ -500,7 +560,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>