Use @aria-level instead of @data-level

diff --git a/README.markdown b/README.markdown
index ff264502726fae8e5a174dfed22a6531ab1fe4d2cb85152103ae565f882008d2..f3e276ad03264faa87a33aebc59ca3c273a623d00c3175138d3553988e87ea01 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -132,25 +132,25 @@ After this classification, each ordinary paragraph is further
     (`<html:h4>`).
 
 - If the paragraph begins with `•` or `🔢`, it is a primary unordered
     (`<html:h4>`).
 
 - If the paragraph begins with `•` or `🔢`, it is a primary unordered

-    or ordered list item (`<html:li class="unordered" data-level="1">`
-    or `<html:li class="ordered" data-level="1">`).
+    or ordered list item (`<html:li class="unordered" aria-level="1">`
+    or `<html:li class="ordered" aria-level="1">`).

 
 - If the paragraph begins with `◦` or `🔠`, it is a secondary unordered
 
 - If the paragraph begins with `◦` or `🔠`, it is a secondary unordered

-    or ordered list item (`<html:li class="unordered" data-level="2">`
-    or `<html:li class="ordered" data-level="2">`).
+    or ordered list item (`<html:li class="unordered" aria-level="2">`
+    or `<html:li class="ordered" aria-level="2">`).

   Secondary list items are considered to be nested inside of primary
     list items which precede them.
 
 - If the paragraph begins with `▪` or `🔡`, it is a tertiary unordered
   Secondary list items are considered to be nested inside of primary
     list items which precede them.
 
 - If the paragraph begins with `▪` or `🔡`, it is a tertiary unordered

-    or ordered list item (`<html:li class="unordered" data-level="3">`
-    or `<html:li class="ordered" data-level="3">`).
+    or ordered list item (`<html:li class="unordered" aria-level="3">`
+    or `<html:li class="ordered" aria-level="3">`).

   Tertiary list items are considered to be nested inside of primary
     and secondary list items which precede them.
 
 - If the paragraph begins with `⁃` or `🔣`, it is a quaternary
     unordered or ordered list item
   Tertiary list items are considered to be nested inside of primary
     and secondary list items which precede them.
 
 - If the paragraph begins with `⁃` or `🔣`, it is a quaternary
     unordered or ordered list item

-    (`<html:li class="unordered" data-level="4">` or
-    `<html:li class="ordered" data-level="4">`).
+    (`<html:li class="unordered" aria-level="4">` or
+    `<html:li class="ordered" aria-level="4">`).

   Quaternary list items are considered to be nested inside of primary,
     secondary, and tertiary list items which precede them.
 
   Quaternary list items are considered to be nested inside of primary,
     secondary, and tertiary list items which precede them.
 

diff --git a/parser.xslt b/parser.xslt
index d9b2986eacaca5aa67b52d4fc6ab0bb4c25e26c09d764b4c5b26a4a0eae4beb6..db7901ee1954ec600ac68fed7e67b28281706601d6b0ee1b43480a7e8accc62d 100644 (file)
--- a/parser.xslt
+++ b/parser.xslt
@@ -513,7 +513,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 +528,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 +543,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 +558,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 +573,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 +588,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 +603,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 +618,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;">


@@ -849,7 +849,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        <template match="html:li" mode="LesML:finalize-list">
                <param name="parent-level" select="0"/>
                <variable name="current-class" select="string(@class)"/>
        <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="current-level" select="number(@aria-level)"/>

                <variable name="wrapper">
                        <choose>
                                <when test="@class='ordered'">
                <variable name="wrapper">
                        <choose>
                                <when test="@class='ordered'">


@@ -860,16 +860,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </otherwise>
                        </choose>
                </variable>
                                </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]"/>
+               <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;">
                <element name="{$wrapper}" namespace="&xhtml;">

-                       <for-each select=".|exslset:leading(following-sibling::node(), $notinlist)[self::html:li and @data-level=$current-level]">
+                       <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>
                                <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]">
+                                       <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>
                                                <apply-templates select="$notcontinuation" mode="LesML:finalize-list">
                                                        <with-param name="parent-level" select="$current-level"/>
                                                </apply-templates>


@@ -877,7 +877,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </copy>
                        </for-each>
                </element>
                                </copy>
                        </for-each>
                </element>

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