merged rev. 3094:3101 and 3102:HEAD from branches/multiple-ids to trunk

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@3129 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 58 insertions, 58 deletions

diff --git a/docutils/test/test_transforms/test_sectnum.py b/docutils/test/test_transforms/test_sectnum.py
index 2ecb6b802..514ae419f 100755
--- a/docutils/test/test_transforms/test_sectnum.py
+++ b/docutils/test/test_transforms/test_sectnum.py
@@ -46,30 +46,30 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 1\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title auto="1">
-                    <generated class="sectnum">
+                    <generated classes="sectnum">
                         1.1.1\u00a0\u00a0\u00a0
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.2\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>
@@ -84,9 +84,9 @@ Paragraph 1.
 """,
 u"""\
 <document source="test data">
-    <section id="bold-title" name="bold title">
+    <section ids="bold-title" names="bold title">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 1\u00a0\u00a0\u00a0
             <strong>
                 Bold Title
@@ -114,28 +114,28 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 1\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title>
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.2\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>
@@ -163,56 +163,56 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <topic class="contents" id="contents" name="contents">
+    <topic classes="contents" ids="contents" names="contents">
         <title>
             Contents
-        <bullet_list class="auto-toc">
+        <bullet_list classes="auto-toc">
             <list_item>
                 <paragraph>
-                    <reference id="id1" refid="title-1">
-                        <generated class="sectnum">
+                    <reference ids="id1" refid="title-1">
+                        <generated classes="sectnum">
                             1\u00a0\u00a0\u00a0
                         Title 1
-                <bullet_list class="auto-toc">
+                <bullet_list classes="auto-toc">
                     <list_item>
                         <paragraph>
-                            <reference id="id2" refid="title-2">
-                                <generated class="sectnum">
+                            <reference ids="id2" refid="title-2">
+                                <generated classes="sectnum">
                                     1.1\u00a0\u00a0\u00a0
                                 Title 2
                         <bullet_list>
                             <list_item>
                                 <paragraph>
-                                    <reference id="id3" refid="title-3">
+                                    <reference ids="id3" refid="title-3">
                                         Title 3
                     <list_item>
                         <paragraph>
-                            <reference id="id4" refid="title-4">
-                                <generated class="sectnum">
+                            <reference ids="id4" refid="title-4">
+                                <generated classes="sectnum">
                                     1.2\u00a0\u00a0\u00a0
                                 Title 4
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1" refid="id1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 1\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1" refid="id2">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title refid="id3">
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1" refid="id4">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     1.2\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>
@@ -240,30 +240,30 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 Arbitrary-1\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     Arbitrary-1.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title auto="1">
-                    <generated class="sectnum">
+                    <generated classes="sectnum">
                         Arbitrary-1.1.1\u00a0\u00a0\u00a0
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     Arbitrary-1.2\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>
@@ -291,30 +291,30 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 3\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     3.1\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title auto="1">
-                    <generated class="sectnum">
+                    <generated classes="sectnum">
                         3.1.1\u00a0\u00a0\u00a0
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     3.2\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>
@@ -344,30 +344,30 @@ Paragraph 4.
 """,
 u"""\
 <document source="test data">
-    <section id="title-1" name="title 1">
+    <section ids="title-1" names="title 1">
         <title auto="1">
-            <generated class="sectnum">
+            <generated classes="sectnum">
                 (5.9.3)\u00a0\u00a0\u00a0
             Title 1
         <paragraph>
             Paragraph 1.
-        <section id="title-2" name="title 2">
+        <section ids="title-2" names="title 2">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     (5.9.3.1)\u00a0\u00a0\u00a0
                 Title 2
             <paragraph>
                 Paragraph 2.
-            <section id="title-3" name="title 3">
+            <section ids="title-3" names="title 3">
                 <title auto="1">
-                    <generated class="sectnum">
+                    <generated classes="sectnum">
                         (5.9.3.1.1)\u00a0\u00a0\u00a0
                     Title 3
                 <paragraph>
                     Paragraph 3.
-        <section id="title-4" name="title 4">
+        <section ids="title-4" names="title 4">
             <title auto="1">
-                <generated class="sectnum">
+                <generated classes="sectnum">
                     (5.9.3.2)\u00a0\u00a0\u00a0
                 Title 4
             <paragraph>