Skip to content

Commit

Permalink
fix: Make index sort case insensitive (#763)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kesara
kesara authored Apr 26, 2022
1 parent 72255eb commit 8436c2f
Show file tree
Hide file tree
Showing 12 changed files with 269 additions and 225 deletions.
6 changes: 5 additions & 1 deletion tests/input/indexes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
<iref item="t"/>
This is another section!
</t>
<t>
<iref item="TASK"/>
TASK
</t>
<dl>
<dt><iref item="dt"/>dt
</dt>
Expand Down Expand Up @@ -138,4 +142,4 @@
</referencegroup>
</references>
</back>
</rfc>
</rfc>
12 changes: 6 additions & 6 deletions tests/valid/docfile.py36.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8">
<meta content="Cherokee,Common,Greek,Latin" name="scripts">
<meta content="initial-scale=1.0" name="viewport">
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.3</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.4</title>
<meta content="xml2rfc(1)" name="author">
<meta content="
This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema. The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use. The textual descriptions depend on manual updates in order to reflect the implementation.
" name="description">
<meta content="xml2rfc 3.12.3" name="generator">
<meta content="xml2rfc-docs-3.12.3" name="ietf.draft">
<meta content="xml2rfc 3.12.4" name="generator">
<meta content="xml2rfc-docs-3.12.4" name="ietf.draft">
<link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
<link href="xml2rfc.css" rel="stylesheet">
Expand Down Expand Up @@ -45,7 +45,7 @@
</dd>
</dl>
</div>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.3</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.4</h1>
<section id="section-abstract">
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
<p id="section-abstract-1">
Expand Down Expand Up @@ -367,7 +367,7 @@ <h2 id="name-introduction">
<p id="section-1-5">
The latest version of this documentation is available in HTML form at <span><a href="https://xml2rfc.ietf.org/xml2rfc-doc">https://xml2rfc.ietf.org/xml2rfc-doc</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
<p id="section-1-6">
This documentation applies to xml2rfc version 3.12.3.<a href="#section-1-6" class="pilcrow"></a></p>
This documentation applies to xml2rfc version 3.12.4.<a href="#section-1-6" class="pilcrow"></a></p>
</section>
<section id="section-2">
<h2 id="name-schema-version-3-elements">
Expand Down Expand Up @@ -6342,7 +6342,7 @@ <h2 id="name-xml2rfc-documentation-templ">
<p id="appendix-D-1">

The following variables are available for use in an xml2rfc
manpage Jinja2 template, as of xml2rfc version 3.12.3:<a href="#appendix-D-1" class="pilcrow"></a></p>
manpage Jinja2 template, as of xml2rfc version 3.12.4:<a href="#appendix-D-1" class="pilcrow"></a></p>
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/docfile.py37.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8">
<meta content="Cherokee,Common,Greek,Latin" name="scripts">
<meta content="initial-scale=1.0" name="viewport">
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.3</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.4</title>
<meta content="xml2rfc(1)" name="author">
<meta content="
This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema. The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use. The textual descriptions depend on manual updates in order to reflect the implementation.
" name="description">
<meta content="xml2rfc 3.12.3" name="generator">
<meta content="xml2rfc-docs-3.12.3" name="ietf.draft">
<meta content="xml2rfc 3.12.4" name="generator">
<meta content="xml2rfc-docs-3.12.4" name="ietf.draft">
<link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
<link href="xml2rfc.css" rel="stylesheet">
Expand Down Expand Up @@ -45,7 +45,7 @@
</dd>
</dl>
</div>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.3</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.4</h1>
<section id="section-abstract">
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
<p id="section-abstract-1">
Expand Down Expand Up @@ -367,7 +367,7 @@ <h2 id="name-introduction">
<p id="section-1-5">
The latest version of this documentation is available in HTML form at <span><a href="https://xml2rfc.ietf.org/xml2rfc-doc">https://xml2rfc.ietf.org/xml2rfc-doc</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
<p id="section-1-6">
This documentation applies to xml2rfc version 3.12.3.<a href="#section-1-6" class="pilcrow"></a></p>
This documentation applies to xml2rfc version 3.12.4.<a href="#section-1-6" class="pilcrow"></a></p>
</section>
<section id="section-2">
<h2 id="name-schema-version-3-elements">
Expand Down Expand Up @@ -6342,7 +6342,7 @@ <h2 id="name-xml2rfc-documentation-templ">
<p id="appendix-D-1">

The following variables are available for use in an xml2rfc
manpage Jinja2 template, as of xml2rfc version 3.12.3:<a href="#appendix-D-1" class="pilcrow"></a></p>
manpage Jinja2 template, as of xml2rfc version 3.12.4:<a href="#appendix-D-1" class="pilcrow"></a></p>
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/docfile.py38.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8">
<meta content="Cherokee,Common,Greek,Latin" name="scripts">
<meta content="initial-scale=1.0" name="viewport">
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.3</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.12.4</title>
<meta content="xml2rfc(1)" name="author">
<meta content="
This document provides information about the XML schema implemented in this release of xml2rfc, and the individual elements of that schema. The document is generated from the RNG schema file that is part of the xml2rfc distribution, so schema information in this document should always be in sync with the schema in actual use. The textual descriptions depend on manual updates in order to reflect the implementation.
" name="description">
<meta content="xml2rfc 3.12.3" name="generator">
<meta content="xml2rfc-docs-3.12.3" name="ietf.draft">
<meta content="xml2rfc 3.12.4" name="generator">
<meta content="xml2rfc-docs-3.12.4" name="ietf.draft">
<link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
<link href="xml2rfc.css" rel="stylesheet">
Expand Down Expand Up @@ -45,7 +45,7 @@
</dd>
</dl>
</div>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.3</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.12.4</h1>
<section id="section-abstract">
<h2 id="abstract"><a href="#abstract" class="selfRef">Abstract</a></h2>
<p id="section-abstract-1">
Expand Down Expand Up @@ -367,7 +367,7 @@ <h2 id="name-introduction">
<p id="section-1-5">
The latest version of this documentation is available in HTML form at <span><a href="https://xml2rfc.ietf.org/xml2rfc-doc">https://xml2rfc.ietf.org/xml2rfc-doc</a></span>.<a href="#section-1-5" class="pilcrow"></a></p>
<p id="section-1-6">
This documentation applies to xml2rfc version 3.12.3.<a href="#section-1-6" class="pilcrow"></a></p>
This documentation applies to xml2rfc version 3.12.4.<a href="#section-1-6" class="pilcrow"></a></p>
</section>
<section id="section-2">
<h2 id="name-schema-version-3-elements">
Expand Down Expand Up @@ -6342,7 +6342,7 @@ <h2 id="name-xml2rfc-documentation-templ">
<p id="appendix-D-1">

The following variables are available for use in an xml2rfc
manpage Jinja2 template, as of xml2rfc version 3.12.3:<a href="#appendix-D-1" class="pilcrow"></a></p>
manpage Jinja2 template, as of xml2rfc version 3.12.4:<a href="#appendix-D-1" class="pilcrow"></a></p>
<span class="break"></span><dl class="dlNewline" id="appendix-D-2">
<dt id="appendix-D-2.1">{{ bare_latin_tags }}:</dt>
<dd style="margin-left: 1.5em" id="appendix-D-2.2"></dd>
Expand Down
32 changes: 16 additions & 16 deletions tests/valid/indexes.pages.text
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft April 12, 2022
Internet-Draft April 26, 2022
Intended status: Experimental
Expires: October 14, 2022
Expires: October 28, 2022


xml2rfc index tests
Expand All @@ -26,7 +26,7 @@ Status of This Memo
time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress."

This Internet-Draft will expire on October 14, 2022.
This Internet-Draft will expire on October 28, 2022.

Copyright Notice

Expand All @@ -53,13 +53,15 @@ Table of Contents



Person Expires October 14, 2022 [Page 1]
Person Expires October 28, 2022 [Page 1]

Internet-Draft xml2rfc index tests April 2022


This is another section!

TASK

dt dd

* unnumbered item
Expand Down Expand Up @@ -105,26 +107,26 @@ Index
dd Section 1
dt Section 1

E



Person Expires October 14, 2022 [Page 2]
Person Expires October 28, 2022 [Page 2]

Internet-Draft xml2rfc index tests April 2022


E

em Section 1, Paragraph 1

F

figure Section 1, Paragraph 8.1.2.1.1
figure Section 1, Paragraph 9.1.2.1.1

L

li
ol Section 1, Paragraph 5, Item 1
ul Section 1, Paragraph 4, Item 1
ol Section 1, Paragraph 6, Item 1
ul Section 1, Paragraph 5, Item 1

S

Expand All @@ -136,9 +138,10 @@ Internet-Draft xml2rfc index tests April 2022
T

t Section 1, Paragraph 1; Section 1, Paragraph 2
in an aside tag Section 1, Paragraph 6.1
in an aside tag Section 1, Paragraph 7.1
table Table 1
td Section 1, Paragraph 8.1.2.1.1
TASK Section 1, Paragraph 3
td Section 1, Paragraph 9.1.2.1.1
th Table 1
tt Section 1, Paragraph 1

Expand All @@ -162,7 +165,4 @@ Author's Address






Person Expires October 14, 2022 [Page 3]
Person Expires October 28, 2022 [Page 3]
Loading

0 comments on commit 8436c2f

Please sign in to comment.