Switch back to @data-level

Per {🔗<https://github.com/w3c/aria/issues/1369>}, `@aria-level´ has
  been deprecated on list items.

diff --git a/README.markdown b/README.markdown
index 12b45efde1ece7a4860e0a8dcf4e63b447d8c2537d5fb7e8605972ec978d0fa1..835285cbfca1690ef83ac8dbcd45466978e37a2c783bc18a5ed39611151ec346 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -133,25 +133,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" aria-level="1">`
-    or `<html:li class="ordered" aria-level="1">`).
+    or ordered list item (`<html:li class="unordered" data-level="1">`
+    or `<html:li class="ordered" data-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" aria-level="2">`
-    or `<html:li class="ordered" aria-level="2">`).
+    or ordered list item (`<html:li class="unordered" data-level="2">`
+    or `<html:li class="ordered" data-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" aria-level="3">`
-    or `<html:li class="ordered" aria-level="3">`).
+    or ordered list item (`<html:li class="unordered" data-level="3">`
+    or `<html:li class="ordered" data-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" aria-level="4">` or
-    `<html:li class="ordered" aria-level="4">`).
+    (`<html:li class="unordered" data-level="4">` or
+    `<html:li class="ordered" data-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.
 


@@ -174,7 +174,7 @@ After this classification, each ordinary paragraph is further
     (`<html:section role="doc-notice">`).
 
 - If the paragraph begins with `^`, it is a footnote
     (`<html:section role="doc-notice">`).
 
 - If the paragraph begins with `^`, it is a footnote

-    (`<html:li class="ordered footnote" aria-level="1">`).
+    (`<html:li class="ordered footnote" data-level="1">`).

   Footnotes are ignored unless their first paragraph has an i·d
     (specified with `¶`) which is referenced by one or more footnote
     references.
   Footnotes are ignored unless their first paragraph has an i·d
     (specified with `¶`) which is referenced by one or more footnote
     references.

diff --git a/parser.xslt b/parser.xslt
index 49b9f06965defa88001329103c57ca7e5b23941b54bbe50a4ab131383edb7831..e5b3bf0fe52ffb60dcbe5a3c37b695ffe5512640f962dbce44ef85236c5bc8f1 100644 (file)
--- a/parser.xslt
+++ b/parser.xslt
@@ -562,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -577,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -592,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -607,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -622,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -637,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -652,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="aria-level">
+                                                               <attribute name="data-level">

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


@@ -667,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="aria-level">
+                                                               <attribute name="data-level">

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


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

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

                                                                        <text>1</text>
                                                                </attribute>
                                                                <processing-instruction name="LesML-Footnote"/>
                                                                        <text>1</text>
                                                                </attribute>
                                                                <processing-instruction name="LesML-Footnote"/>


@@ -862,7 +862,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        </template>
        <template match="html:section" mode="LesML:finalize">
                <param name="used-footnotes" select="/.."/>
        </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]"/>
+               <variable name="notinsection" select="following-sibling::node()[not(html:li/@data-level>1)][1]"/>

                <copy>
                        <apply-templates select="@*|html:p[1]/@*[&pilcrow-atts;]" mode="LesML:finalize"/>
                        <apply-templates select="node()" mode="LesML:finalize"/>
                <copy>
                        <apply-templates select="@*|html:p[1]/@*[&pilcrow-atts;]" mode="LesML:finalize"/>
                        <apply-templates select="node()" mode="LesML:finalize"/>


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

-       <template match="html:*[html:li/@aria-level>1]" mode="LesML:finalize">
+       <template match="html:*[html:li/@data-level>1]" mode="LesML:finalize">

                <param name="used-footnotes" select="/.."/>
                <param name="used-footnotes" select="/.."/>

-               <if test="not(preceding-sibling::node()[not(html:li/@aria-level>1)][1]/self::html:section)">
+               <if test="not(preceding-sibling::node()[not(html:li/@data-level>1)][1]/self::html:section)">

                        <copy>
                                <apply-templates select="@*|node()" mode="LesML:finalize">
                                        <with-param name="used-footnotes" select="$used-footnotes"/>
                        <copy>
                                <apply-templates select="@*|node()" mode="LesML:finalize">
                                        <with-param name="used-footnotes" select="$used-footnotes"/>


@@ -913,7 +913,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(@aria-level)"/>
+               <variable name="current-level" select="number(@data-level)"/>

                <variable name="wrapper">
                        <choose>
                                <when test="contains(concat(' ', @class, ' '), ' ordered ')">
                <variable name="wrapper">
                        <choose>
                                <when test="contains(concat(' ', @class, ' '), ' ordered ')">


@@ -924,19 +924,19 @@ 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 (@aria-level>$current-level or @aria-level=$current-level and @class=$current-class))][1]"/>
+               <variable name="notinlist" select="following-sibling::node()[not(self::html:div/processing-instruction()[local-name()='LesML-Continuation'] or self::html:li and (@data-level>$current-level or @data-level=$current-level and @class=$current-class))][1]"/>

                <element name="{$wrapper}" namespace="&xhtml;">
                        <if test="contains(concat(' ', @class, ' '), ' footnote ')">
                                <processing-instruction name="LesML-Footnote"/>
                        </if>
                <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]">
+                       <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>
                                <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]">
+                                       <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>
                                                <apply-templates select="$notcontinuation" mode="LesML:finalize-list">
                                                        <with-param name="parent-level" select="$current-level"/>
                                                </apply-templates>


@@ -944,7 +944,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[@aria-level>$parent-level]">
+               <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>
                        <apply-templates select="$notinlist" mode="LesML:finalize-list">
                                <with-param name="parent-level" select="$parent-level"/>
                        </apply-templates>