Skip to content

Commit c9a85b2

Browse files
martindholmesmartindholmes
committed
Partial broken implementation of issue #734.
1 parent 00ad120 commit c9a85b2

30 files changed

+89
-83
lines changed

‎Documentation/teixsl.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ with a table of links on the left or right. </p>
432432
whether they should start a new window, occupy all of the current
433433
window, or stay within the frame. These stylesheets implement the
434434
following rules:
435-
<list type="ordered"><item>Any <gi>ref</gi> or <gi>ptr</gi> link stays within the frame</item><item>Any link containing <q>://</q> uses the whole browser window</item><item>Any link starting <q>.</q> uses the whole browser window</item><item>If the stylesheet sets no splitting of the document,
435+
<list rend="numbered"><item>Any <gi>ref</gi> or <gi>ptr</gi> link stays within the frame</item><item>Any link containing <q>://</q> uses the whole browser window</item><item>Any link starting <q>.</q> uses the whole browser window</item><item>If the stylesheet sets no splitting of the document,
436436
any <gi>ref</gi> or <gi>ptr</gi> link uses the whole browser
437437
window</item><item>If a <gi>ref</gi> or <gi>ptr</gi> link has a
438438
<ident>rend</ident> attribute value of <q>noframe</q>, the whole browser

‎Test/expected-results/mdtest1.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<p>Paragraphs are separated by a blank line.</p>
1818
<p>2nd paragraph. <hi rend="italic">Italic</hi>, <hi rend="bold">bold</hi>, <code>monospace</code>, <del>deleted</del>. Itemized lists</p>
1919
<p>look like:</p>
20-
<list type="unordered">
20+
<list rend="bulleted">
2121
<item>this one</item>
2222
<item>that one</item>
2323
<item>the other one</item>

‎Test/expected-results/test-complex.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ <h1>
616616
</header>
617617
<p>Various sorts of list are legal within paragraphs, and you can reference
618618
<a class="link_ref" href="#birds" title="Birds">items in lists</a>...</p>
619-
<ol>
619+
<ol class="numbered">
620620
<li class="item">Dogs</li>
621621
<li class="item">Zebras</li>
622622
<li class="item" id="birds">Birds</li>

‎Test/expected-results/test-ota.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ <h1>
554554
</header>
555555
<p>Various sorts of list are legal within paragraphs, and you can reference
556556
<a class="link_ref" href="#birds" title="Birds">items in lists</a>...</p>
557-
<ol>
557+
<ol class="numbered">
558558
<li class="item">Dogs</li>
559559
<li class="item">Zebras</li>
560560
<li class="item" id="birds">Birds</li>

‎Test/expected-results/test.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ <h1>
582582
</header>
583583
<p>Various sorts of list are legal within paragraphs, and you can reference
584584
<a class="link_ref" href="#birds" title="Birds">items in lists</a>...</p>
585-
<ol>
585+
<ol class="numbered">
586586
<li class="item">Dogs</li>
587587
<li class="item">Zebras</li>
588588
<li class="item" id="birds">Birds</li>
@@ -604,7 +604,7 @@ <h1>
604604
</dl>
605605
<p>The preceding lists was between paragraphs.</p>
606606
<div class="listhead">This untyped list has a heading and a nested glosslist</div>
607-
<ul>
607+
<ul class="bulleted">
608608
<li class="item">first item</li>
609609
<li class="item">
610610
<dl>

‎Test/expected-results/test.html5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
</header>
583583
<p>Various sorts of list are legal within paragraphs, and you can reference
584584
<a class="link_ref" href="#birds" title="Birds">items in lists</a>...</p>
585-
<ol>
585+
<ol class="numbered">
586586
<li class="item">Dogs</li>
587587
<li class="item">Zebras</li>
588588
<li class="item" id="birds">Birds</li>

‎Test/expected-results/test34.combined.odd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12539,7 +12539,7 @@ Measures</ref>
1253912539
</exemplum>
1254012540
<exemplum versionDate="2008-04-06" xml:lang="fr">
1254112541
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-item-egXML-fz" source="#fr-ex-Perec-vie">
12542-
<list type="unordered">
12542+
<list rend="bulleted">
1254312543
<head>Tentative d'inventaire de quelques-unes des choses qui ont été trouvées dans
1254412544
les escaliers au fil des ans.</head>
1254512545
<item>Plusieurs photos, dont celle d'une jeune fille de quinze<lb/> ans vêtue d'un slip
@@ -12747,7 +12747,7 @@ Measures</ref>
1274712747
des listes ordonnées.</p>
1274812748
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-of" source="#fr-ex-ATILF"> L’unité mixte de
1274912749
recherche ATILF (Analyse et Traitement Informatique de la Langue Française) propose 3 types
12750-
de ressources : <list rend="runon" type="ordered"><label>(1)</label><item>Des ressources linguistiques publiées.</item><label>(2) </label><item>Des ressources linguistiques informatisées.</item><label>(3) </label><item>Des ressources linguistiques logicielles.</item></list>
12750+
de ressources : <list rend="runon numbered"><label>(1)</label><item>Des ressources linguistiques publiées.</item><label>(2) </label><item>Des ressources linguistiques informatisées.</item><label>(3) </label><item>Des ressources linguistiques logicielles.</item></list>
1275112751
</egXML>
1275212752
</exemplum>
1275312753
<exemplum versionDate="2008-04-06" xml:lang="fr">
@@ -12805,7 +12805,7 @@ Measures</ref>
1280512805
</egXML>
1280612806
</exemplum>
1280712807
<exemplum xml:lang="zh-TW">
12808-
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-te"> 有關本書的版權問題，我做出以下兩點聲明。<list rend="runon" type="ordered"><label>(1)</label><item>未經授權許可，請勿擅自複印。</item><label>(2) </label><item>歡迎學術引用本文，然請詳細標明出處。</item></list>
12808+
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-te"> 有關本書的版權問題，我做出以下兩點聲明。<list rend="runon numbered"><label>(1)</label><item>未經授權許可，請勿擅自複印。</item><label>(2) </label><item>歡迎學術引用本文，然請詳細標明出處。</item></list>
1280912809
</egXML>
1281012810
</exemplum>
1281112811
<exemplum xml:lang="zh-TW">
@@ -12828,7 +12828,7 @@ Measures</ref>
1282812828
the <gi>label</gi> element is synonymous with the <att>n</att> attribute on the <gi>item</gi>
1282912829
element:</p>
1283012830
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-dj" source="#GibAut">I will add two facts, which have seldom occurred
12831-
in the composition of six, or at least of five quartos. <list rend="runon" type="ordered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
12831+
in the composition of six, or at least of five quartos. <list rend="runon numbered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
1283212832
printer: the faults and the merits are exclusively my own.</item></list>
1283312833
</egXML>
1283412834
</exemplum>
@@ -12838,7 +12838,7 @@ Measures</ref>
1283812838
<title>Autobiographie</title>. In diesem Fall ist das <gi>label</gi>-Element gleichbedeutend
1283912839
mit dem <att>n</att>-Attribut des <gi>item</gi>-Elements:</p>
1284012840
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-pr" source="#GibAut">I will add two facts, which have seldom occurred
12841-
in the composition of six, or at least of five quartos. <list rend="runon" type="ordered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
12841+
in the composition of six, or at least of five quartos. <list rend="runon numbered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
1284212842
printer: the faults and the merits are exclusively my own.</item></list>
1284312843
</egXML>
1284412844
</exemplum>

‎Test/expected-results/test38.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<!--</hgroup>-->
2828
<p>This is the global <eg>&lt;header&gt;</eg> element for this page, including the <eg>&lt;hgroup&gt;</eg> and <eg>&lt;nav&gt;</eg> elements.</p>
2929
<!--<nav>-->
30-
<list type="unordered">
30+
<list rend="bulleted">
3131
<item>
3232
<ref target="#">Global <eg>&lt;nav&gt;</eg> link within the <eg>&lt;header&gt;</eg></ref>
3333
</item>
@@ -53,7 +53,7 @@
5353
You can download them from this page using your browser.)</p>
5454
<div>
5555
<head>Purpose of this document:</head>
56-
<list type="unordered">
56+
<list rend="bulleted">
5757
<item>Includes all the HTML5 elements as listed in the side column. </item>
5858
<item>Minimal styling has been used. Use this document to test CSS files (base, reset, custom, etc.) on desired elements in various browsers.</item>
5959
<item>Use this document to create comprehensive templates that need to use many of the common HTML5 elements.</item>
@@ -91,23 +91,23 @@
9191
</div>
9292
<div>
9393
<head>Unordered list</head>
94-
<list type="unordered">
94+
<list rend="bulleted">
9595
<item>Unordered list item</item>
9696
<item>Unordered list item
97-
<list type="unordered"><item>Unordered list item</item><item>Unordered list item
98-
<list type="unordered"><item>Unordered list item</item><item>Unordered list item</item><item>Unordered list item</item></list>
97+
<list rend="bulleted"><item>Unordered list item</item><item>Unordered list item
98+
<list rend="bulleted"><item>Unordered list item</item><item>Unordered list item</item><item>Unordered list item</item></list>
9999
</item><item>Unordered list item</item></list>
100100
</item>
101101
<item>Unordered list item</item>
102102
</list>
103103
</div>
104104
<div>
105105
<head>Ordered list</head>
106-
<list type="ordered">
106+
<list rend="numbered">
107107
<item>Ordered list item</item>
108108
<item>Ordered list item
109-
<list type="ordered"><item>Ordered list item</item><item>Ordered list item
110-
<list type="ordered"><item>Ordered list item</item><item>Ordered list item</item><item>Ordered list item</item></list>
109+
<list rend="numbered"><item>Ordered list item</item><item>Ordered list item
110+
<list rend="numbered"><item>Ordered list item</item><item>Ordered list item</item><item>Ordered list item</item></list>
111111
</item><item>Ordered list item</item></list>
112112
</item>
113113
<item>Ordered list item</item>
@@ -249,7 +249,7 @@
249249
<head>Details and summary:</head>
250250
<!--<details>-->
251251
<p>Details: Here is information and links related to / referenced within this article. This uses the <eg>&lt;details&gt;</eg> and <eg>&lt;summary&gt;</eg> elements.</p>
252-
<list type="unordered">
252+
<list rend="bulleted">
253253
<item>
254254
<ref target="http://html5doctor.com/glossary/">HTML5doctor: HTML5 Glossary</ref>
255255
</item>
@@ -263,7 +263,7 @@
263263
<item><ref target="http://flesler.blogspot.com/2007/10/jquerylocalscroll-10.html">jQuery.LocalScroll</ref> by Ariel Flesler</item>
264264
<item>See source code for HTML and CSS for other references to stylesheet inspiration etc.</item>
265265
<item>What's next? You need to check out these:
266-
<list type="unordered"><item><ref target="http://diveintohtml5.org/">Dive into HTML5</ref></item><item><ref target="http://html5demos.com/">HTML 5 Demos and Examples</ref></item></list>
266+
<list rend="bulleted"><item><ref target="http://diveintohtml5.org/">Dive into HTML5</ref></item><item><ref target="http://html5demos.com/">HTML 5 Demos and Examples</ref></item></list>
267267
</item>
268268
</list>
269269
<!--</details>-->
@@ -276,7 +276,7 @@
276276
<head>Elements included in this demo:</head>
277277
<p><ref target="#">View / hide</ref> list of elements</p>
278278
<p><hi>Note:</hi> Some elements are only used within the source code and not as examples.</p>
279-
<list type="unordered">
279+
<list rend="bulleted">
280280
<item>
281281
<eg>&lt;!-- Comments --&gt;</eg>
282282
</item>
@@ -508,7 +508,7 @@
508508
<div>
509509
<head>Elements not included in this demo:</head>
510510
<p><ref target="#">View / hide</ref> list of elements</p>
511-
<list type="unordered">
511+
<list rend="bulleted">
512512
<item>
513513
<eg>&lt;area&gt;</eg>
514514
</item>
@@ -586,7 +586,7 @@
586586
<div>
587587
<head>Elements not supported by HTML5:</head>
588588
<p><ref target="#">View / hide</ref> list of elements</p>
589-
<list type="unordered">
589+
<list rend="bulleted">
590590
<item>
591591
<eg>&lt;acronym&gt;</eg>
592592
</item>
@@ -635,7 +635,7 @@
635635
</list>
636636
<p>This is the global <eg>&lt;footer&gt;</eg> for this page/site.</p>
637637
<!--<nav>-->
638-
<list type="unordered">
638+
<list rend="bulleted">
639639
<item>
640640
<ref target="#">Global footer <eg>&lt;nav&gt;</eg> link</ref>
641641
</item>

‎Test/expected-results/test7.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,26 @@
102102
<head>Heading 2</head>
103103
<p>And ending with level two.</p>
104104
<p>Now some lists:</p>
105-
<list type="ordered">
105+
<list rend="numbered">
106106
<item>cats</item>
107107
<item>dogs</item>
108108
</list>
109-
<list type="ordered">
109+
<list rend="numbered">
110110
<item>chow</item>
111111
<item>pooch</item>
112112
<item>hound</item>
113113
</list>
114-
<list type="ordered">
114+
<list rend="numbered">
115115
<item>alligators</item>
116116
</list>
117117
<p>Whereas we have a gloss list now</p>
118-
<list type="unordered">
118+
<list rend="bulleted">
119119
<item>cats</item>
120120
<item>nice creatures</item>
121121
<item>dogs</item>
122122
</list>
123123
<p>nasty creatures</p>
124-
<list type="unordered">
124+
<list rend="bulleted">
125125
<item>lists</item>
126126
<item>paragraphs</item>
127127
<item>tables</item>

‎Test/expected-results/testdrama.compiled.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12599,7 +12599,7 @@ Measures</ref>
1259912599
</exemplum>
1260012600
<exemplum versionDate="2008-04-06" xml:lang="fr">
1260112601
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-item-egXML-fz" source="#fr-ex-Perec-vie">
12602-
<list type="unordered">
12602+
<list rend="bulleted">
1260312603
<head>Tentative d'inventaire de quelques-unes des choses qui ont été trouvées dans
1260412604
les escaliers au fil des ans.</head>
1260512605
<item>Plusieurs photos, dont celle d'une jeune fille de quinze<lb/> ans vêtue d'un slip
@@ -12807,7 +12807,7 @@ Measures</ref>
1280712807
des listes ordonnées.</p>
1280812808
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-of" source="#fr-ex-ATILF"> L’unité mixte de
1280912809
recherche ATILF (Analyse et Traitement Informatique de la Langue Française) propose 3 types
12810-
de ressources : <list rend="runon" type="ordered"><label>(1)</label><item>Des ressources linguistiques publiées.</item><label>(2) </label><item>Des ressources linguistiques informatisées.</item><label>(3) </label><item>Des ressources linguistiques logicielles.</item></list>
12810+
de ressources : <list rend="runon numbered"><label>(1)</label><item>Des ressources linguistiques publiées.</item><label>(2) </label><item>Des ressources linguistiques informatisées.</item><label>(3) </label><item>Des ressources linguistiques logicielles.</item></list>
1281112811
</egXML>
1281212812
</exemplum>
1281312813
<exemplum versionDate="2008-04-06" xml:lang="fr">
@@ -12865,7 +12865,7 @@ Measures</ref>
1286512865
</egXML>
1286612866
</exemplum>
1286712867
<exemplum xml:lang="zh-TW">
12868-
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-te"> 有關本書的版權問題，我做出以下兩點聲明。<list rend="runon" type="ordered"><label>(1)</label><item>未經授權許可，請勿擅自複印。</item><label>(2) </label><item>歡迎學術引用本文，然請詳細標明出處。</item></list>
12868+
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-te"> 有關本書的版權問題，我做出以下兩點聲明。<list rend="runon numbered"><label>(1)</label><item>未經授權許可，請勿擅自複印。</item><label>(2) </label><item>歡迎學術引用本文，然請詳細標明出處。</item></list>
1286912869
</egXML>
1287012870
</exemplum>
1287112871
<exemplum xml:lang="zh-TW">
@@ -12888,7 +12888,7 @@ Measures</ref>
1288812888
the <gi>label</gi> element is synonymous with the <att>n</att> attribute on the <gi>item</gi>
1288912889
element:</p>
1289012890
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-dj" source="#GibAut">I will add two facts, which have seldom occurred
12891-
in the composition of six, or at least of five quartos. <list rend="runon" type="ordered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
12891+
in the composition of six, or at least of five quartos. <list rend="runon numbered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
1289212892
printer: the faults and the merits are exclusively my own.</item></list>
1289312893
</egXML>
1289412894
</exemplum>
@@ -12898,7 +12898,7 @@ Measures</ref>
1289812898
<title>Autobiographie</title>. In diesem Fall ist das <gi>label</gi>-Element gleichbedeutend
1289912899
mit dem <att>n</att>-Attribut des <gi>item</gi>-Elements:</p>
1290012900
<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-label-egXML-pr" source="#GibAut">I will add two facts, which have seldom occurred
12901-
in the composition of six, or at least of five quartos. <list rend="runon" type="ordered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
12901+
in the composition of six, or at least of five quartos. <list rend="runon numbered"><label>(1)</label><item>My first rough manuscript, without any intermediate copy, has been sent to the press.</item><label>(2) </label><item>Not a sheet has been seen by any human eyes, excepting those of the author and the
1290212902
printer: the faults and the merits are exclusively my own.</item></list>
1290312903
</egXML>
1290412904
</exemplum>

0 commit comments

Comments
 (0)