Make LesML:split a function

[LesML] / parser.xslt

diff --git a/parser.xslt b/parser.xslt
index 5ba22481500091cd93f14a5879c8bac631869336..cf1de9841afef8acf2e844431fbf002f9a647de7 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 pilcrow-atts "(local-name()='id' or local-name()='lang') and namespace-uri()='' or local-name()='lang' and namespace-uri()='http://www.w3.org/XML/1998/namespace'">

        <!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">


@@ -23,17 +23,29 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:LesML="urn:fdc:ladys.computer:20240512:LesML"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exsldyn="http://exslt.org/dynamic"
        xmlns:LesML="urn:fdc:ladys.computer:20240512:LesML"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exsldyn="http://exslt.org/dynamic"

+       xmlns:exslfunc="http://exslt.org/functions"

        xmlns:exslset="http://exslt.org/sets"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        exclude-result-prefixes="LesML"
        xmlns:exslset="http://exslt.org/sets"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        exclude-result-prefixes="LesML"

-       extension-element-prefixes="exsl exsldyn exslset exslstr"
+       extension-element-prefixes="exsl exsldyn exslfunc exslset exslstr"

        version="1.0"
 >
        <书社:id>urn:fdc:ladys.computer:20240512:LesML:parser.xslt</书社:id>
        <param name="LESML_SECTION_BREAK_CHARS" select="'*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'"/>
        version="1.0"
 >
        <书社:id>urn:fdc:ladys.computer:20240512:LesML:parser.xslt</书社:id>
        <param name="LESML_SECTION_BREAK_CHARS" select="'*-.=_~·․‥…⁂⋯─━┄┅┈┉╌╍═╴╶╸╺☙❧　・＊－．＝＿～'"/>

-       <template name="LesML:split">
+       <exslfunc:function name="LesML:split">
+               <param name="source" select="string()"/>
+               <param name="separator" select="'&#xA;'"/>
+               <variable name="result-fragment">
+                       <call-template name="LesML:do-split">
+                               <with-param name="source" select="$source"/>
+                               <with-param name="separator" select="$separator"/>
+                       </call-template>
+               </variable>
+               <exslfunc:result select="exsl:node-set($result-fragment)/node()"/>
+       </exslfunc:function>
+       <template name="LesML:do-split">

                <param name="source"/>
                <param name="separator" select="'&#xA;'"/>
                <choose>
                <param name="source"/>
                <param name="separator" select="'&#xA;'"/>
                <choose>


@@ -41,7 +53,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <html:span>
                                        <value-of select="substring-before($source, $separator)"/>
                                </html:span>
                                <html:span>
                                        <value-of select="substring-before($source, $separator)"/>
                                </html:span>

-                               <call-template name="LesML:split">
+                               <call-template name="LesML:do-split">

                                        <with-param name="source" select="substring-after($source, $separator)"/>
                                        <with-param name="separator" select="$separator"/>
                                </call-template>
                                        <with-param name="source" select="substring-after($source, $separator)"/>
                                        <with-param name="separator" select="$separator"/>
                                </call-template>


@@ -55,18 +67,11 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        </template>
        <template name="LesML:break-and-unescape">
                <param name="source"/>
        </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">
+               <for-each select="LesML:split($source)">

                        <call-template name="LesML:unescape">
                                <with-param name="source" select="string()"/>
                        </call-template>
                        <call-template name="LesML:unescape">
                                <with-param name="source" select="string()"/>
                        </call-template>

-                       <if test="position()!=count($broken)">
+                       <if test="position()!=last()">

                                <element name="br" namespace="&xhtml;"/>
                        </if>
                </for-each>
                                <element name="br" namespace="&xhtml;"/>
                        </if>
                </for-each>


@@ -79,16 +84,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <choose>
                                        <when test="contains($after, '}')">
                                                <variable name="inner" select="substring-before($after, '}')"/>
                                <choose>
                                        <when test="contains($after, '}')">
                                                <variable name="inner" select="substring-before($after, '}')"/>

-                                               <variable name="components">
-                                                       <call-template name="LesML:split">
-                                                               <with-param name="source" select="$inner"/>
-                                                               <with-param name="separator" select="'.'"/>
-                                                       </call-template>
-                                               </variable>
-                                               <variable name="component-nodes" select="exsl:node-set($components)/node()"/>
+                                               <variable name="components" select="LesML:split($inner, '.')"/>

                                                <value-of select="substring-before($source, '{U+')"/>
                                                <choose>
                                                <value-of select="substring-before($source, '{U+')"/>
                                                <choose>

-                                                       <when test="$component-nodes[string(.)='' or translate(., '0123456789ABCDEF', '')!='']">
+                                                       <when test="$components[string(.)='' or translate(., '0123456789ABCDEF', '')!='']">

                                                                <text>{U+</text>
                                                                <value-of select="$inner"/>
                                                                <text>}</text>
                                                                <text>{U+</text>
                                                                <value-of select="$inner"/>
                                                                <text>}</text>


@@ -97,7 +96,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </call-template>
                                                        </when>
                                                        <otherwise>
                                                                </call-template>
                                                        </when>
                                                        <otherwise>

-                                                               <for-each select="$component-nodes">
+                                                               <for-each select="$components">

                                                                        <text disable-output-escaping="yes">&amp;#x</text>
                                                                        <value-of select="."/>
                                                                        <text>;</text>
                                                                        <text disable-output-escaping="yes">&amp;#x</text>
                                                                        <value-of select="."/>
                                                                        <text>;</text>


@@ -124,14 +123,8 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        </template>
        <template name="LesML:comment-out">
                <param name="source"/>
        </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>
                <comment>

-                       <for-each select="exsl:node-set($comment-split-fragment)/*">
+                       <for-each select="LesML:split($source, '--')">

                                <if test="string()='' or starts-with(., '‐')">
                                        <text>&#x034F;</text>
                                </if>
                                <if test="string()='' or starts-with(., '‐')">
                                        <text>&#x034F;</text>
                                </if>


@@ -174,13 +167,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                </variable>
                <variable name="maybe-langtag">
                        <if test="substring($id-and-lang, string-length($id-and-lang), 1)='$' and contains($id-and-lang, '@')">
                </variable>
                <variable name="maybe-langtag">
                        <if test="substring($id-and-lang, string-length($id-and-lang), 1)='$' and contains($id-and-lang, '@')">

-                               <variable name="split-tag-fragment">
-                                       <call-template name="LesML:split">
-                                               <with-param name="source" select="substring($id-and-lang, 2, string-length($id-and-lang)-2)"/>
-                                               <with-param name="separator" select="'@'"/>
-                                       </call-template>
-                               </variable>
-                               <value-of select="exsl:node-set($split-tag-fragment)/*[last()]"/>
+                               <value-of select="LesML:split(substring($id-and-lang, 2, string-length($id-and-lang)-2), '@')[last()]"/>

                        </if>
                </variable>
                <variable name="langtag">
                        </if>
                </variable>
                <variable name="langtag">


@@ -289,6 +276,56 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                </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(., '%%')]"/>

+                       <variable name="paragraphized-fragment">
+                               <call-template name="LesML:paragraphize">
+                                       <with-param name="lines" select="exslset:trailing($doclines, $record-separators[last()])"/>
+                               </call-template>
+                       </variable>
+                       <variable name="paragraphized" select="exsl:node-set($paragraphized-fragment)"/>
+                       <variable name="filtered-ordered-footnotes-fragment">
+                               <for-each select="$paragraphized//html:li[processing-instruction()[local-name()='LesML-Footnote'] and html:p[position()=1 and @id]]">
+                                       <sort select="count(($paragraphized//html:a[@role='doc-noteref' and @href=concat('#', string(current()/html:p[1]/@id))])[1]/preceding::*)" data-type="number"/>
+                                       <if test="$paragraphized//html:a[@role='doc-noteref' and @href=concat('#', string(current()/html:p[1]/@id))]">
+                                               <copy-of select="."/>
+                                       </if>
+                               </for-each>
+                       </variable>
+                       <variable name="used-footnotes-fragment">
+                               <for-each select="exsl:node-set($filtered-ordered-footnotes-fragment)/node()">
+                                       <variable name="links" select="$paragraphized//html:a[@role='doc-noteref' and @href=concat('#', string(current()/html:p[1]/@id))]"/>
+                                       <element name="li" namespace="&xhtml;">
+                                               <variable name="numero" select="position()"/>
+                                               <attribute name="id">
+                                                       <value-of select="html:p[1]/@id"/>
+                                               </attribute>
+                                               <attribute name="value">
+                                                       <value-of select="$numero"/>
+                                               </attribute>
+                                               <copy-of select="@*|node()"/>
+                                               <element name="footer" namespace="&xhtml;">
+                                                       <attribute name="class">
+                                                               <text>backlinks</text>
+                                                       </attribute>
+                                                       <for-each select="$links[@id]">
+                                                               <if test="position()>1">
+                                                                       <text> </text>
+                                                               </if>
+                                                               <element name="a" namespace="&xhtml;">
+                                                                       <attribute name="role">
+                                                                               <text>doc-backlink</text>
+                                                                       </attribute>
+                                                                       <attribute name="href">
+                                                                               <text>#</text>
+                                                                               <value-of select="@id"/>
+                                                                       </attribute>
+                                                                       <value-of select="position()"/>
+                                                               </element>
+                                                       </for-each>
+                                               </element>
+                                       </element>
+                               </for-each>
+                       </variable>
+                       <variable name="used-footnote-nodes" select="exsl:node-set($used-footnotes-fragment)/node()"/>

                        <element name="article" namespace="&xhtml;">
                                <for-each select="$params/html:div/html:dt[string()=' LANG ']">
                                        <attribute name="lang">
                        <element name="article" namespace="&xhtml;">
                                <for-each select="$params/html:div/html:dt[string()=' LANG ']">
                                        <attribute name="lang">


@@ -372,10 +409,22 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <attribute name="class">
                                                <text>body</text>
                                        </attribute>
                                        <attribute name="class">
                                                <text>body</text>
                                        </attribute>

-                                       <call-template name="LesML:paragraphize">
-                                               <with-param name="lines" select="exslset:trailing($doclines, $record-separators[last()])"/>
-                                       </call-template>
+                                       <apply-templates select="$paragraphized/node()" mode="LesML:finalize">
+                                               <with-param name="used-footnotes" select="$used-footnote-nodes"/>
+                                       </apply-templates>

                                </element>
                                </element>

+                               <if test="$used-footnote-nodes">
+                                       <element name="section" namespace="&xhtml;">
+                                               <attribute name="role">
+                                                       <text>doc-endnotes</text>
+                                               </attribute>
+                                               <element name="ol" namespace="&xhtml;">
+                                                       <apply-templates select="$used-footnote-nodes" mode="LesML:finalize">
+                                                               <with-param name="used-footnotes" select="$used-footnote-nodes"/>
+                                                       </apply-templates>
+                                               </element>
+                                       </element>
+                               </if>

                        </element>
                </if>
                <if test="$docsep">
                        </element>
                </if>
                <if test="$docsep">


@@ -513,7 +562,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>1</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>1</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -528,7 +577,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>1</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>1</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -543,7 +592,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>2</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>2</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -558,7 +607,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>2</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>2</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -573,7 +622,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>3</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>3</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -588,7 +637,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>3</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>3</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -603,7 +652,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>unordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>4</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>4</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -618,7 +667,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                        <text>ordered</text>
                                                                </attribute>

-                                                               <attribute name="data-level">
+                                                               <attribute name="aria-level">

                                                                        <text>4</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">
                                                                        <text>4</text>
                                                                </attribute>
                                                                <element name="p" namespace="&xhtml;">


@@ -628,13 +677,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

-                                               <when test="starts-with($text, '🛈') and &sigiled-text;">
-                                                       <element name="div" namespace="&xhtml;">
+                                               <when test="starts-with($text, '※') and &sigiled-text;">
+                                                       <element name="section" namespace="&xhtml;">

                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">

-                                                                       <text>info</text>
+                                                                       <text>note</text>

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


@@ -643,13 +692,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

-                                               <when test="starts-with($text, '⯑') and &sigiled-text;">
-                                                       <element name="div" namespace="&xhtml;">
+                                               <when test="starts-with($text, '☡') and &sigiled-text;">
+                                                       <element name="section" namespace="&xhtml;">

                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">

-                                                                       <text>query</text>
+                                                                       <text>caution</text>

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


@@ -658,13 +707,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

-                                               <when test="starts-with($text, '⚠︎') and &sigiled-text;">
-                                                       <element name="div" namespace="&xhtml;">
+                                               <when test="starts-with($text, '⯑') and &sigiled-text;">
+                                                       <element name="section" namespace="&xhtml;">

                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">
                                                                <attribute name="role">
                                                                        <text>note</text>
                                                                </attribute>
                                                                <attribute name="class">

-                                                                       <text>warn</text>
+                                                                       <text>query</text>

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


@@ -673,13 +722,10 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

-                                               <when test="starts-with($text, '※') and &sigiled-text;">
-                                                       <element name="div" namespace="&xhtml;">
+                                               <when test="starts-with($text, '@') and &sigiled-text;">
+                                                       <element name="section" namespace="&xhtml;">

                                                                <attribute name="role">
                                                                <attribute name="role">

-                                                                       <text>note</text>
-                                                               </attribute>
-                                                               <attribute name="class">
-                                                                       <text>note</text>
+                                                                       <text>doc-abstract</text>

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


@@ -688,13 +734,22 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

-                                               <when test="starts-with($text, '☡') and &sigiled-text;">
-                                                       <element name="div" namespace="&xhtml;">
+                                               <when test="starts-with($text, '🛈') and &sigiled-text;">
+                                                       <element name="section" namespace="&xhtml;">

                                                                <attribute name="role">
                                                                <attribute name="role">

-                                                                       <text>note</text>
+                                                                       <text>doc-tip</text>

                                                                </attribute>
                                                                </attribute>

-                                                               <attribute name="class">
-                                                                       <text>caution</text>
+                                                               <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="section" namespace="&xhtml;">
+                                                               <attribute name="role">
+                                                                       <text>doc-notice</text>

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


@@ -713,6 +768,22 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                </element>
                                                        </element>
                                                </when>
                                                                </element>
                                                        </element>
                                                </when>

+                                               <when test="starts-with($text, '^') and &sigiled-text;">
+                                                       <element name="li" namespace="&xhtml;">
+                                                               <attribute name="class">
+                                                                       <text>ordered footnote</text>
+                                                               </attribute>
+                                                               <attribute name="aria-level">
+                                                                       <text>1</text>
+                                                               </attribute>
+                                                               <processing-instruction name="LesML-Footnote"/>
+                                                               <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;"/>
                                                <when test="starts-with($text, '#') and &sigiled-text;">
                                                        <call-template name="LesML:comment-out">
                                                                <with-param name="source" select="&unsigiled-text;"/>


@@ -737,27 +808,97 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="lines" select="$lines"/>
                        </call-template>
                </variable>
                                <with-param name="lines" select="$lines"/>
                        </call-template>
                </variable>

+               <variable name="blocked" select="exsl:node-set($blocked-fragment)"/>
+               <variable name="footnote-ids" select="$blocked//html:li[processing-instruction()[local-name()='LesML-Footnote']]/html:p[1]/@id"/>

                <variable name="inlined-fragment">
                <variable name="inlined-fragment">

-                       <apply-templates select="exsl:node-set($blocked-fragment)/node()" mode="LesML:comment"/>
+                       <apply-templates select="$blocked/node()" mode="LesML:comment">
+                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                       </apply-templates>

                </variable>
                <apply-templates select="exsl:node-set($inlined-fragment)/node()" mode="LesML:finalize-tree"/>
        </template>
        <template match="html:script[@type='text/lesml']">
                </variable>
                <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">
-                       <call-template name="LesML:split">
-                               <with-param name="source">
-                                       <for-each select=".//text()">
-                                               <value-of select="."/>
-                                       </for-each>
-                               </with-param>
-                       </call-template>
+               <variable name="source">
+                       <for-each select=".//text()">
+                               <value-of select="."/>
+                       </for-each>

                </variable>
                <element name="div" namespace="&xhtml;">
                        <call-template name="LesML:parse">
                </variable>
                <element name="div" namespace="&xhtml;">
                        <call-template name="LesML:parse">

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

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

+       <template match="html:ol[processing-instruction()[local-name()='LesML-Footnote']]|processing-instruction()[local-name()='LesML-Footnote']" mode="LesML:finalize" priority="1"/>
+       <template match="html:a[@role='doc-noteref']" mode="LesML:finalize">
+               <param name="used-footnotes" select="/.."/>
+               <variable name="matching-note" select="$used-footnotes[concat('#', @id)=current()/@href]"/>
+               <copy>
+                       <apply-templates select="@*" mode="LesML:finalize">
+                               <with-param name="used-footnotes" select="$used-footnotes"/>
+                       </apply-templates>
+                       <choose>
+                               <when test="$matching-note">
+                                       <value-of select="$matching-note/@value"/>
+                               </when>
+                               <otherwise>
+                                       <apply-templates select="node()" mode="LesML:finalize">
+                                               <with-param name="used-footnotes" select="$used-footnotes"/>
+                                       </apply-templates>
+                               </otherwise>
+                       </choose>
+               </copy>
+       </template>
+       <template match="html:p[position()=1 and ancestor::*]" mode="LesML:finalize">
+               <param name="used-footnotes" select="/.."/>
+               <variable name="content" select="@*[not(&pilcrow-atts;)]|node()"/>
+               <if test="$content">
+                       <copy>
+                               <apply-templates select="$content" mode="LesML:finalize">
+                                       <with-param name="used-footnotes" select="$used-footnotes"/>
+                               </apply-templates>
+                       </copy>
+               </if>
+       </template>
+       <template match="html:section" mode="LesML:finalize">
+               <param name="used-footnotes" select="/.."/>
+               <variable name="notinsection" select="following-sibling::node()[not(html:li/@aria-level>1)][1]"/>
+               <copy>
+                       <apply-templates select="@*|html:p[1]/@*[&pilcrow-atts;]" mode="LesML:finalize"/>
+                       <apply-templates select="node()" mode="LesML:finalize"/>
+                       <for-each select="exslset:leading(following-sibling::node(), $notinsection)">
+                               <copy>
+                                       <apply-templates select="@*|node()" mode="LesML:finalize">
+                                               <with-param name="used-footnotes" select="$used-footnotes"/>
+                                       </apply-templates>
+                               </copy>
+                       </for-each>
+               </copy>
+       </template>
+       <template match="html:*[html:li/@aria-level>1]" mode="LesML:finalize">
+               <param name="used-footnotes" select="/.."/>
+               <if test="not(preceding-sibling::node()[not(html:li/@aria-level>1)][1]/self::html:section)">
+                       <copy>
+                               <apply-templates select="@*|node()" mode="LesML:finalize">
+                                       <with-param name="used-footnotes" select="$used-footnotes"/>
+                               </apply-templates>
+                       </copy>
+               </if>
+       </template>
+       <template match="text()" mode="LesML:finalize">
+               <call-template name="LesML:break-and-unescape">
+                       <with-param name="source" select="string()"/>
+               </call-template>
+       </template>
+       <template match="@*|node()" mode="LesML:finalize" priority="-1">
+               <param name="used-footnotes" select="/.."/>
+               <copy>
+                       <apply-templates select="@*|html:p[1]/@*[&pilcrow-atts;]" mode="LesML:finalize"/>
+                       <apply-templates select="node()" mode="LesML:finalize">
+                               <with-param name="used-footnotes" select="$used-footnotes"/>
+                       </apply-templates>
+               </copy>
+       </template>

        <template match="node()" mode="LesML:finalize-attributes">
                <variable name="notattr" select="following-sibling::node()[not(self::text() and translate(., ' &#x9;', '')='' or self::LesML:attribute)]"/>
                <for-each select="(.|exslset:leading(following-sibling::node(), $notattr)[self::LesML:attribute])/@*">
        <template match="node()" mode="LesML:finalize-attributes">
                <variable name="notattr" select="following-sibling::node()[not(self::text() and translate(., ' &#x9;', '')='' or self::LesML:attribute)]"/>
                <for-each select="(.|exslset:leading(following-sibling::node(), $notattr)[self::LesML:attribute])/@*">


@@ -769,19 +910,57 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        </if>
                </for-each>
        </template>
                        </if>
                </for-each>
        </template>

+       <template match="html:li" mode="LesML:finalize-list">
+               <param name="parent-level" select="0"/>
+               <variable name="current-class" select="string(@class)"/>
+               <variable name="current-level" select="number(@aria-level)"/>
+               <variable name="wrapper">
+                       <choose>
+                               <when test="contains(concat(' ', @class, ' '), ' ordered ')">
+                                       <text>ol</text>
+                               </when>
+                               <otherwise>
+                                       <text>ul</text>
+                               </otherwise>
+                       </choose>
+               </variable>
+               <variable name="notinlist" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'] or self::html:li and (@aria-level>$current-level or @aria-level=$current-level and @class=$current-class))][1]"/>
+               <element name="{$wrapper}" namespace="&xhtml;">
+                       <if test="contains(concat(' ', @class, ' '), ' footnote ')">
+                               <processing-instruction name="LesML-Footnote"/>
+                       </if>
+                       <for-each select=".|exslset:leading(following-sibling::node(), $notinlist)[self::html:li and @aria-level=$current-level]">
+                               <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)">
+                                               <apply-templates select="node()" mode="LesML:finalize-tree"/>
+                                       </for-each>
+                                       <if test="$notcontinuation/self::html:li[@aria-level>$current-level]">
+                                               <apply-templates select="$notcontinuation" mode="LesML:finalize-list">
+                                                       <with-param name="parent-level" select="$current-level"/>
+                                               </apply-templates>
+                                       </if>
+                               </copy>
+                       </for-each>
+               </element>
+               <if test="$notinlist/self::html:li[@aria-level>$parent-level]">
+                       <apply-templates select="$notinlist" mode="LesML:finalize-list">
+                               <with-param name="parent-level" select="$parent-level"/>
+                       </apply-templates>
+               </if>
+       </template>

        <template match="LesML:attribute[preceding-sibling::node()[position()=1 and (self::text() or self::*)]]|text()[preceding-sibling::node()[position()=1 and self::*] and following-sibling::node()[position()=1 and self::LesML:attribute] and translate(., ' &#x9;', '')='']" mode="LesML:finalize-tree" priority="2"/>
        <template match="LesML:attribute|text()[following-sibling::node()[position()=1 and self::LesML:attribute]]" mode="LesML:finalize-tree" priority="1">
                <element name="span" namespace="&xhtml;">
                        <apply-templates select="." mode="LesML:finalize-attributes"/>
                        <if test="self::text()">
        <template match="LesML:attribute[preceding-sibling::node()[position()=1 and (self::text() or self::*)]]|text()[preceding-sibling::node()[position()=1 and self::*] and following-sibling::node()[position()=1 and self::LesML:attribute] and translate(., ' &#x9;', '')='']" mode="LesML:finalize-tree" priority="2"/>
        <template match="LesML:attribute|text()[following-sibling::node()[position()=1 and self::LesML:attribute]]" mode="LesML:finalize-tree" priority="1">
                <element name="span" namespace="&xhtml;">
                        <apply-templates select="." mode="LesML:finalize-attributes"/>
                        <if test="self::text()">

-                               <call-template name="LesML:break-and-unescape">
-                                       <with-param name="source" select="string(.)"/>
-                               </call-template>
+                               <copy/>

                        </if>
                </element>
        </template>
        <template match="html:div" mode="LesML:finalize-tree">
                        </if>
                </element>
        </template>
        <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())])">
+               <if test="not(processing-instruction()[local-name()='LesML-Continuation']) or not(preceding-sibling::node()[position()=1 and self::html:* and contains(' div h1 h2 h3 h4 h5 h6 li section ', local-name())])">

                        <variable name="notcontinuation" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'])][1]"/>
                        <choose>
                                <when test="processing-instruction()[local-name()='LesML-Continuation'] and $notcontinuation[self::html:* and contains(' 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="processing-instruction()[local-name()='LesML-Continuation'] and $notcontinuation[self::html:* and contains(' h1 h2 h3 h4 h5 h6 ', local-name())]">


@@ -802,6 +981,14 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </for-each>
                                        </element>
                                </when>
                                                </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)">
                                <otherwise>
                                        <apply-templates select="node()" mode="LesML:finalize-tree"/>
                                        <for-each select="exslset:leading(following-sibling::node(), $notcontinuation)">


@@ -838,130 +1025,25 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <apply-templates select="." mode="LesML:finalize-list"/>
                </if>
        </template>
                        <apply-templates select="." mode="LesML:finalize-list"/>
                </if>
        </template>

-       <template match="html:li" mode="LesML:finalize-list">
-               <param name="parent-level" select="0"/>
-               <variable name="current-class" select="string(@class)"/>
-               <variable name="current-level" select="number(@data-level)"/>
-               <variable name="wrapper">
-                       <choose>
-                               <when test="@class='ordered'">
-                                       <text>ol</text>
-                               </when>
-                               <otherwise>
-                                       <text>ul</text>
-                               </otherwise>
-                       </choose>
-               </variable>
-               <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/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)">
-                                               <apply-templates select="node()" mode="LesML:finalize-tree"/>
-                                       </for-each>
-                                       <if test="$notcontinuation/self::html:li[@data-level>$current-level]">
-                                               <apply-templates select="$notcontinuation" mode="LesML:finalize-list">
-                                                       <with-param name="parent-level" select="$current-level"/>
-                                               </apply-templates>
-                                       </if>
-                               </copy>
+       <template match="html:section" mode="LesML:finalize-tree">
+               <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)">
+                               <apply-templates select="node()" mode="LesML:finalize-tree"/>

                        </for-each>
                        </for-each>

-               </element>
-               <if test="$notinlist/self::html:li[@data-level>$parent-level]">
-                       <apply-templates select="$notinlist" mode="LesML:finalize-list">
-                               <with-param name="parent-level" select="$parent-level"/>
-                       </apply-templates>
-               </if>
+               </copy>

        </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>
        </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>

-       <template match="text()" mode="LesML:finalize-tree">
-               <call-template name="LesML:break-and-unescape">
-                       <with-param name="source" select="string(.)"/>
-               </call-template>
-       </template>

        <template match="@*|node()" mode="LesML:finalize-tree" priority="-1">
                <copy>
                        <apply-templates select="." mode="LesML:finalize-attributes"/>
                        <apply-templates select="node()" mode="LesML:finalize-tree"/>
                </copy>
        </template>
        <template match="@*|node()" mode="LesML:finalize-tree" priority="-1">
                <copy>
                        <apply-templates select="." mode="LesML:finalize-attributes"/>
                        <apply-templates select="node()" mode="LesML:finalize-tree"/>
                </copy>
        </template>

-       <template match="node()" mode="LesML:comment">
-               <variable name="result">
-                       <choose>
-                               <when test="self::*">
-                                       <variable name="start-node" select="text()[contains(., '⌦')][1]"/>
-                                       <variable name="after-start">
-                                               <if test="$start-node">
-                                                       <value-of select="substring-after($start-node, '⌦')"/>
-                                               </if>
-                                       </variable>
-                                       <variable name="has-end-node" select="contains($after-start, '⌫') or $start-node/following-sibling::text()[contains(., '⌫')]"/>
-                                       <choose>
-                                               <when test="$start-node and $has-end-node">
-                                                       <variable name="following">
-                                                               <value-of select="$after-start"/>
-                                                               <copy-of select="$start-node/following-sibling::node()"/>
-                                                       </variable>
-                                                       <variable name="end-node" select="exsl:node-set($following)/text()[contains(., '⌫')][last()]"/>
-                                                       <variable name="comment">
-                                                               <for-each select="$end-node/preceding-sibling::node()">
-                                                                       <value-of select="."/>
-                                                               </for-each>
-                                                               <value-of select="substring-before($end-node, '⌫')"/>
-                                                       </variable>
-                                                       <variable name="rest-fragment">
-                                                               <element name="span" namespace="&xhtml;">
-                                                                       <value-of select="substring-after($end-node, '⌫')"/>
-                                                                       <copy-of select="$end-node/following-sibling::node()"/>
-                                                               </element>
-                                                       </variable>
-                                                       <variable name="commented-rest-fragment">
-                                                               <apply-templates select="exsl:node-set($rest-fragment)/node()" mode="LesML:comment"/>
-                                                       </variable>
-                                                       <copy>
-                                                               <copy-of select="@*"/>
-                                                               <copy-of select="$start-node/preceding-sibling::node()"/>
-                                                               <copy-of select="substring-before($start-node, '⌦')"/>
-                                                               <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>
-                                               <otherwise>
-                                                       <copy>
-                                                               <copy-of select="@*"/>
-                                                               <apply-templates select="node()" mode="LesML:comment"/>
-                                                       </copy>
-                                               </otherwise>
-                                       </choose>
-                               </when>
-                               <when test="self::text()[contains(., '⌧')]">
-                                       <variable name="split-fragment">
-                                               <call-template name="LesML:split">
-                                                       <with-param name="source" select="string()"/>
-                                                       <with-param name="separator" select="'⌧'"/>
-                                               </call-template>
-                                       </variable>
-                                       <for-each select="exsl:node-set($split-fragment)/node()">
-                                               <value-of select="."/>
-                                               <if test="position()!=last()">
-                                                       <call-template name="LesML:comment-out"/>
-                                               </if>
-                                       </for-each>
-                               </when>
-                               <otherwise>
-                                       <copy-of select="."/>
-                               </otherwise>
-                       </choose>
-               </variable>
-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:attrify"/>
-       </template>

        <template match="node()" mode="LesML:inline">
                <param name="element-name"/>
                <param name="element-namespace" select="'http://www.w3.org/1999/xhtml'"/>
        <template match="node()" mode="LesML:inline">
                <param name="element-name"/>
                <param name="element-namespace" select="'http://www.w3.org/1999/xhtml'"/>


@@ -980,13 +1062,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                        <value-of select="substring-before($end-node, $end-sigil)"/>
                                                </variable>
                                                <variable name="start-node" select="exsl:node-set($preceding)/text()[contains(., $start-sigil)][last()]"/>
                                                        <value-of select="substring-before($end-node, $end-sigil)"/>
                                                </variable>
                                                <variable name="start-node" select="exsl:node-set($preceding)/text()[contains(., $start-sigil)][last()]"/>

-                                               <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>
-                                               </variable>
-                                               <variable name="start-tokens" select="exsl:node-set($start-tokens-fragment)/*"/>
+                                               <variable name="start-tokens" select="LesML:split($start-node, $start-sigil)"/>

                                                <variable name="wrapped">
                                                        <copy>
                                                                <copy-of select="@*"/>
                                                <variable name="wrapped">
                                                        <copy>
                                                                <copy-of select="@*"/>


@@ -1048,42 +1124,53 @@ 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]"/>
                <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">
                <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>
                                        <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="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>
-                               </variable>
-                               <variable name="start-tokens" select="exsl:node-set($start-tokens-fragment)/*"/>
-                               <variable name="innards">
+                               <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" select="LesML:split($start-node, $start-sigil)"/>
+                               <variable name="innards-fragment">

                                        <value-of select="$start-tokens[last()]"/>
                                        <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>

+                               <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>
                                <choose>

-                                       <when test="contains($innards, $separator)">
-                                               <variable name="keyval-fragment">
-                                                       <call-template name="LesML:split">
-                                                               <with-param name="source" select="$innards"/>
-                                                               <with-param name="separator" select="$separator"/>
-                                                       </call-template>
-                                               </variable>
-                                               <variable name="keyval" select="exsl:node-set($keyval-fragment)/*"/>
-                                               <variable name="key">
+                                       <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()]"/>
+                                               <element name="span" namespace="&xhtml;">
+                                                       <copy-of select="$bad-start-node/preceding-sibling::node()"/>
+                                                       <for-each select="LesML:split($bad-start-node, $start-sigil)">
+                                                               <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" select="LesML:split($separator-node, $separator)"/>
+                                               <variable name="key-fragment">

                                                        <choose>
                                                                <when test="$ncname-keys">
                                                        <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>
                                                                        <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()">
                                                                        <for-each select="$keyval[position()!=last()]">
                                                                                <value-of select="."/>
                                                                                <if test="position()!=last()">


@@ -1107,9 +1194,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>
                                                                        <value-of select="$keyval[last()]"/>
                                                                </otherwise>
                                                        </choose>

+                                                       <for-each select="$separator-node/following-sibling::node()">
+                                                               <value-of select="."/>
+                                                       </for-each>

                                                </variable>
                                                <choose>
                                                </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()]">
                                                                <element name="span" namespace="&xhtml;">
                                                                        <copy-of select="$start-node/preceding-sibling::node()"/>
                                                                        <for-each select="$start-tokens[position()!=last()]">


@@ -1120,7 +1210,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;">
                                                                        </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"/>
                                                                </element>
                                                                <element name="span" namespace="&xhtml;">
                                                                        <value-of select="$value"/>


@@ -1164,7 +1254,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-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()"/>
                                                        <value-of select="$end-sigil"/>
                                                        <value-of select="substring-after($end-node, $end-sigil)"/>
                                                        <copy-of select="$end-node/following-sibling::node()"/>


@@ -1188,7 +1278,101 @@ 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 match="node()" mode="LesML:comment">
+               <param name="footnote-ids" select="/.."/>
+               <variable name="result">
+                       <choose>
+                               <when test="self::*">
+                                       <variable name="start-node" select="text()[contains(., '⌦')][1]"/>
+                                       <variable name="after-start">
+                                               <if test="$start-node">
+                                                       <value-of select="substring-after($start-node, '⌦')"/>
+                                               </if>
+                                       </variable>
+                                       <variable name="has-end-node" select="contains($after-start, '⌫') or $start-node/following-sibling::text()[contains(., '⌫')]"/>
+                                       <choose>
+                                               <when test="$start-node and $has-end-node">
+                                                       <variable name="following">
+                                                               <value-of select="$after-start"/>
+                                                               <copy-of select="$start-node/following-sibling::node()"/>
+                                                       </variable>
+                                                       <variable name="end-node" select="exsl:node-set($following)/text()[contains(., '⌫')][last()]"/>
+                                                       <variable name="comment">
+                                                               <for-each select="$end-node/preceding-sibling::node()">
+                                                                       <value-of select="."/>
+                                                               </for-each>
+                                                               <value-of select="substring-before($end-node, '⌫')"/>
+                                                       </variable>
+                                                       <variable name="rest-fragment">
+                                                               <element name="span" namespace="&xhtml;">
+                                                                       <value-of select="substring-after($end-node, '⌫')"/>
+                                                                       <copy-of select="$end-node/following-sibling::node()"/>
+                                                               </element>
+                                                       </variable>
+                                                       <variable name="commented-rest-fragment">
+                                                               <apply-templates select="exsl:node-set($rest-fragment)/node()" mode="LesML:comment">
+                                                                       <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                               </apply-templates>
+                                                       </variable>
+                                                       <copy>
+                                                               <copy-of select="@*"/>
+                                                               <copy-of select="$start-node/preceding-sibling::node()"/>
+                                                               <copy-of select="substring-before($start-node, '⌦')"/>
+                                                               <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>
+                                               <when test="$start-node">
+                                                       <variable name="rest-fragment">
+                                                               <element name="div" namespace="&xhtml;">
+                                                                       <value-of select="substring-after($after-start, '⌦')"/>
+                                                                       <copy-of select="$start-node/following-sibling::node()"/>
+                                                               </element>
+                                                       </variable>
+                                                       <variable name="commented-rest-fragment">
+                                                               <apply-templates select="exsl:node-set($rest-fragment)/node()" mode="LesML:comment">
+                                                                       <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                               </apply-templates>
+                                                       </variable>
+                                                       <copy>
+                                                               <copy-of select="@*"/>
+                                                               <copy-of select="$start-node/preceding-sibling::node()"/>
+                                                               <copy-of select="substring-before($start-node, '⌦')"/>
+                                                               <text>^</text>
+                                                               <copy-of select="exsl:node-set($commented-rest-fragment)/*/node()"/>
+                                                       </copy>
+                                               </when>
+                                               <otherwise>
+                                                       <copy>
+                                                               <copy-of select="@*"/>
+                                                               <apply-templates select="node()" mode="LesML:comment">
+                                                                       <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                               </apply-templates>
+                                                       </copy>
+                                               </otherwise>
+                                       </choose>
+                               </when>
+                               <when test="self::text()[contains(., '⌧')]">
+                                       <for-each select="LesML:split(., '⌧')">
+                                               <value-of select="."/>
+                                               <if test="position()!=last()">
+                                                       <call-template name="LesML:comment-out"/>
+                                               </if>
+                                       </for-each>
+                               </when>
+                               <otherwise>
+                                       <copy-of select="."/>
+                               </otherwise>
+                       </choose>
+               </variable>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:attrify">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>
+       </template>

        <template match="node()" mode="LesML:attrify">
        <template match="node()" mode="LesML:attrify">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <choose>
                                <when test="self::*">
                <variable name="result">
                        <choose>
                                <when test="self::*">


@@ -1215,12 +1399,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        <copy-of select="$partitioned[4]/node()"/>
                                                                </copy>
                                                        </variable>
                                                                        <copy-of select="$partitioned[4]/node()"/>
                                                                </copy>
                                                        </variable>

-                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:attrify"/>
+                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:attrify">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>

                                                </when>
                                                <when test="$partitioned[self::processing-instruction() and local-name()='LesML-All-Done']">
                                                        <copy>
                                                                <copy-of select="@*"/>
                                                </when>
                                                <when test="$partitioned[self::processing-instruction() and local-name()='LesML-All-Done']">
                                                        <copy>
                                                                <copy-of select="@*"/>

-                                                               <apply-templates select="node()" mode="LesML:attrify"/>
+                                                               <apply-templates select="node()" mode="LesML:attrify">
+                                                                       <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                               </apply-templates>

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


@@ -1230,7 +1418,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        <copy-of select="$partitioned/node()"/>
                                                                </copy>
                                                        </variable>
                                                                        <copy-of select="$partitioned/node()"/>
                                                                </copy>
                                                        </variable>

-                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:attrify"/>
+                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:attrify">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>

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


@@ -1239,9 +1429,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </otherwise>
                        </choose>
                </variable>
                                </otherwise>
                        </choose>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:linkify"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:linkify">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:linkify">
        </template>
        <template match="node()" mode="LesML:linkify">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <choose>
                                <when test="processing-instruction()[local-name()='LesML-All-Done']">
                <variable name="result">
                        <choose>
                                <when test="processing-instruction()[local-name()='LesML-All-Done']">


@@ -1270,23 +1463,27 @@ 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>
                                                                                </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[3]"/>
                                                                                        </when>
                                                                                        <otherwise>

-                                                                                               <value-of select="$partitioned[2]"/>
+                                                                                               <copy-of select="$partitioned[2]/node()"/>

                                                                                        </otherwise>
                                                                                </choose>
                                                                        </element>
                                                                        <copy-of select="$partitioned[4]/node()"/>
                                                                </copy>
                                                        </variable>
                                                                                        </otherwise>
                                                                                </choose>
                                                                        </element>
                                                                        <copy-of select="$partitioned[4]/node()"/>
                                                                </copy>
                                                        </variable>

-                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:linkify"/>
+                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:linkify">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>

                                                </when>
                                                <when test="$partitioned[self::processing-instruction() and local-name()='LesML-All-Done']">
                                                        <copy>
                                                                <copy-of select="@*"/>
                                                </when>
                                                <when test="$partitioned[self::processing-instruction() and local-name()='LesML-All-Done']">
                                                        <copy>
                                                                <copy-of select="@*"/>

-                                                               <apply-templates select="node()" mode="LesML:linkify"/>
+                                                               <apply-templates select="node()" mode="LesML:linkify">
+                                                                       <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                               </apply-templates>

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


@@ -1296,7 +1493,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                                        <copy-of select="$partitioned/node()"/>
                                                                </copy>
                                                        </variable>
                                                                        <copy-of select="$partitioned/node()"/>
                                                                </copy>
                                                        </variable>

-                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:linkify"/>
+                                                       <apply-templates select="exsl:node-set($processed)/node()" mode="LesML:linkify">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>

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


@@ -1305,9 +1504,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </otherwise>
                        </choose>
                </variable>
                                </otherwise>
                        </choose>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:strikethrough"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:strikethrough">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:strikethrough">
        </template>
        <template match="node()" mode="LesML:strikethrough">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'s'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'s'"/>


@@ -1316,9 +1518,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⸡'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⸡'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:underline"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:underline">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:underline">
        </template>
        <template match="node()" mode="LesML:underline">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'u'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'u'"/>


@@ -1327,9 +1532,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⸥'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⸥'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:noted"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:noted">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:noted">
        </template>
        <template match="node()" mode="LesML:noted">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'small'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'small'"/>


@@ -1339,9 +1547,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="role" select="'note'"/>
                        </apply-templates>
                </variable>
                                <with-param name="role" select="'note'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:parenthetical"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:parenthetical">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:parenthetical">
        </template>
        <template match="node()" mode="LesML:parenthetical">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'small'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'small'"/>


@@ -1350,9 +1561,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⸩'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⸩'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:code"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:code">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:code">
        </template>
        <template match="node()" mode="LesML:code">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'code'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'code'"/>


@@ -1361,9 +1575,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'´'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'´'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:titled"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:titled">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:titled">
        </template>
        <template match="node()" mode="LesML:titled">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'cite'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'cite'"/>


@@ -1372,9 +1589,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⟫'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⟫'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:named"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:named">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:named">
        </template>
        <template match="node()" mode="LesML:named">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'u'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'u'"/>


@@ -1384,9 +1604,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="class" select="'name'"/>
                        </apply-templates>
                </variable>
                                <with-param name="class" select="'name'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:offset"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:offset">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:offset">
        </template>
        <template match="node()" mode="LesML:offset">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'i'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'i'"/>


@@ -1395,9 +1618,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⟩'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⟩'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:bolded"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:bolded">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:bolded">
        </template>
        <template match="node()" mode="LesML:bolded">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'b'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'b'"/>


@@ -1406,9 +1632,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'⦄'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'⦄'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:important"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:important">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:important">
        </template>
        <template match="node()" mode="LesML:important">

+               <param name="footnote-ids" select="/.."/>

                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'strong'"/>
                <variable name="result">
                        <apply-templates select="." mode="LesML:inline">
                                <with-param name="element-name" select="'strong'"/>


@@ -1417,14 +1646,101 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <with-param name="end-sigil" select="'☜'"/>
                        </apply-templates>
                </variable>
                                <with-param name="end-sigil" select="'☜'"/>
                        </apply-templates>
                </variable>

-               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:emphasized"/>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:emphasized">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>
+               </apply-templates>

        </template>
        <template match="node()" mode="LesML:emphasized">
        </template>
        <template match="node()" mode="LesML:emphasized">

-               <apply-templates select="." mode="LesML:inline">
-                       <with-param name="element-name" select="'em'"/>
-                       <with-param name="element-namespace" select="'&xhtml;'"/>
-                       <with-param name="start-sigil" select="'⹐'"/>
-                       <with-param name="end-sigil" select="'⹑'"/>
+               <param name="footnote-ids" select="/.."/>
+               <variable name="result">
+                       <apply-templates select="." mode="LesML:inline">
+                               <with-param name="element-name" select="'em'"/>
+                               <with-param name="element-namespace" select="'&xhtml;'"/>
+                               <with-param name="start-sigil" select="'⹐'"/>
+                               <with-param name="end-sigil" select="'⹑'"/>
+                       </apply-templates>
+               </variable>
+               <apply-templates select="exsl:node-set($result)/node()" mode="LesML:footnoted">
+                       <with-param name="footnote-ids" select="$footnote-ids"/>

                </apply-templates>
        </template>
                </apply-templates>
        </template>

+       <template match="node()" mode="LesML:footnoted">
+               <param name="footnote-ids" select="/.."/>
+               <choose>
+                       <when test="self::*">
+                               <variable name="start-node" select="text()[contains(., '^')][1]"/>
+                               <variable name="after-start" select="substring-after($start-node, '^')"/>
+                               <variable name="footnote-id" select="substring-before($after-start, '.')"/>
+                               <variable name="matched-footnote" select="$footnote-ids[.=$footnote-id]"/>
+                               <choose>
+                                       <when test="$footnote-id!='' and $matched-footnote">
+                                               <variable name="rest-fragment">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <value-of select="substring-after($after-start, '.')"/>
+                                                               <copy-of select="$start-node/following-sibling::node()"/>
+                                                       </element>
+                                               </variable>
+                                               <variable name="footnoted-rest-fragment">
+                                                       <apply-templates select="exsl:node-set($rest-fragment)/node()" mode="LesML:footnoted">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>
+                                               </variable>
+                                               <copy>
+                                                       <copy-of select="@*"/>
+                                                       <copy-of select="$start-node/preceding-sibling::node()"/>
+                                                       <copy-of select="substring-before($start-node, '^')"/>
+                                                       <element name="a" namespace="&xhtml;">
+                                                               <attribute name="id">
+                                                                       <text>LesML.fnref.</text>
+                                                                       <value-of select="generate-id($start-node)"/>
+                                                               </attribute>
+                                                               <attribute name="role">
+                                                                       <text>doc-noteref</text>
+                                                               </attribute>
+                                                               <attribute name="href">
+                                                                       <text>#</text>
+                                                                       <value-of select="$footnote-id"/>
+                                                               </attribute>
+                                                               <attribute name="target">
+                                                                       <text>_self</text>
+                                                               </attribute>
+                                                       </element>
+                                                       <copy-of select="exsl:node-set($footnoted-rest-fragment)/*/node()"/>
+                                               </copy>
+                                       </when>
+                                       <when test="$start-node">
+                                               <variable name="rest-fragment">
+                                                       <element name="div" namespace="&xhtml;">
+                                                               <value-of select="substring-after($after-start, '^')"/>
+                                                               <copy-of select="$start-node/following-sibling::node()"/>
+                                                       </element>
+                                               </variable>
+                                               <variable name="footnoted-rest-fragment">
+                                                       <apply-templates select="exsl:node-set($rest-fragment)/node()" mode="LesML:footnoted">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>
+                                               </variable>
+                                               <copy>
+                                                       <copy-of select="@*"/>
+                                                       <copy-of select="$start-node/preceding-sibling::node()"/>
+                                                       <copy-of select="substring-before($start-node, '^')"/>
+                                                       <text>^</text>
+                                                       <copy-of select="exsl:node-set($footnoted-rest-fragment)/*/node()"/>
+                                               </copy>
+                                       </when>
+                                       <otherwise>
+                                               <copy>
+                                                       <copy-of select="@*"/>
+                                                       <apply-templates select="node()" mode="LesML:footnoted">
+                                                               <with-param name="footnote-ids" select="$footnote-ids"/>
+                                                       </apply-templates>
+                                               </copy>
+                                       </otherwise>
+                               </choose>
+                       </when>
+                       <otherwise>
+                               <copy-of select="."/>
+                       </otherwise>
+               </choose>
+       </template>

 </transform>
 </transform>