Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a class to the index section #864

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add a class to the index section #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4745929
chore: yestests
martinthomson Aug 17, 2022
2b09328
feat: Add a class to the index section
martinthomson Aug 17, 2022
baa15ec
fix: minimal fixes for .index styling
martinthomson Aug 17, 2022
b89f8ec
test: fix tests to expect index anchors and classes
martinthomson Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/valid/docfile.html
View file
Open in desktop
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.13.1</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.14.0</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.13.1" name="generator">
<meta content="xml2rfc-docs-3.13.1" name="ietf.draft">
<meta content="xml2rfc 3.14.0" name="generator">
<meta content="xml2rfc-docs-3.14.0" 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.13.1</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.14.0</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://ietf-tools.github.io/xml2rfc/">https://ietf-tools.github.io/xml2rfc/</a></span>.<a href="#section-1-5" class="pilcrow">¶</a></p>
<p id="section-1-6">
This documentation applies to xml2rfc version 3.13.1.<a href="#section-1-6" class="pilcrow">¶</a></p>
This documentation applies to xml2rfc version 3.14.0.<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 @@ -6351,7 +6351,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.13.1:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
manpage Jinja2 template, as of xml2rfc version 3.14.0:<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
8 changes: 4 additions & 4 deletions tests/valid/draft-miek-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
This version is adapted to work with "xml2rfc" version 2.x.

' name="description">
<meta content="xml2rfc 3.13.1" name="generator">
<meta content="xml2rfc 3.14.0" name="generator">
<meta content="RFC" name="keyword">
<meta content="Request for Comments" name="keyword">
<meta content="I-D" name="keyword">
Expand All @@ -26,8 +26,8 @@
<meta content="Extensible Markup Language" name="keyword">
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.13.1
Python 3.9.13
xml2rfc 3.14.0
Python 3.10.4
appdirs 1.4.4
ConfigArgParse 1.5.3
google-i18n-address 2.5.2
Expand All @@ -40,7 +40,7 @@
pycountry 22.3.5
PyYAML 6.0
requests 2.28.1
setuptools 63.2.0
setuptools 63.4.1
six 1.16.0
weasyprint 56.1
-->
Expand Down
8 changes: 4 additions & 4 deletions tests/valid/draft-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
<meta content="xml2rfc 3.13.1" name="generator">
<meta content="xml2rfc 3.14.0" name="generator">
<meta content="template" name="keyword">
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.13.1
Python 3.9.13
xml2rfc 3.14.0
Python 3.10.4
appdirs 1.4.4
ConfigArgParse 1.5.3
google-i18n-address 2.5.2
Expand All @@ -29,7 +29,7 @@
pycountry 22.3.5
PyYAML 6.0
requests 2.28.1
setuptools 63.2.0
setuptools 63.4.1
six 1.16.0
weasyprint 56.1
-->
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/indexes.pages.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 9, 2022
Internet-Draft August 17, 2022
Intended status: Experimental
Expires: February 10, 2023
Expires: February 18, 2023


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 February 10, 2023.
This Internet-Draft will expire on February 18, 2023.

Copyright Notice

Expand All @@ -53,7 +53,7 @@ Table of Contents



Person Expires February 10, 2023 [Page 1]
Person Expires February 18, 2023 [Page 1]

Internet-Draft xml2rfc index tests August 2022

Expand Down Expand Up @@ -109,7 +109,7 @@ Index



Person Expires February 10, 2023 [Page 2]
Person Expires February 18, 2023 [Page 2]

Internet-Draft xml2rfc index tests August 2022

Expand Down Expand Up @@ -165,4 +165,4 @@ Author's Address



Person Expires February 10, 2023 [Page 3]
Person Expires February 18, 2023 [Page 3]
10 changes: 5 additions & 5 deletions tests/valid/indexes.prepped.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-08-09T04:14:34" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.13.1 -->
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" category="exp" docName="indexes-00" indexInclude="true" ipr="trust200902" prepTime="2022-08-17T06:49:58" scripts="Common,Latin" sortRefs="true" submissionType="independent" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.14.0 -->



Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="09" month="08" year="2022"/>
<date day="17" month="08" year="2022"/>
<boilerplate>
<section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
<name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
Expand All @@ -41,7 +41,7 @@
material or to cite them other than as "work in progress."
</t>
<t indent="0" pn="section-boilerplate.1-4">
This Internet-Draft will expire on 10 February 2023.
This Internet-Draft will expire on 18 February 2023.
</t>
</section>
<section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
Expand Down Expand Up @@ -198,7 +198,7 @@
</reference>
</referencegroup>
</references>
<section numbered="false" removeInRFC="false" toc="include" pn="section-appendix.a">
<section anchor="rfc.index" numbered="false" removeInRFC="false" toc="include" pn="section-appendix.a">
<name slugifiedName="name-index">Index</name>
<t anchor="rfc.index.index" indent="0" pn="section-appendix.a-1">
<xref format="none" sectionFormat="of" target="rfc.index.u65" derivedContent="">A</xref>
Expand Down
6 changes: 3 additions & 3 deletions tests/valid/indexes.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft August 9, 2022
Internet-Draft August 17, 2022
Intended status: Experimental
Expires: February 10, 2023
Expires: February 18, 2023


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 February 10, 2023.
This Internet-Draft will expire on February 18, 2023.

Copyright Notice

Expand Down
64 changes: 33 additions & 31 deletions tests/valid/indexes.v3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta content="initial-scale=1.0" name="viewport">
<title>xml2rfc index tests</title>
<meta content="Human Person" name="author">
<meta content="xml2rfc 3.13.1" name="generator">
<meta content="xml2rfc 3.14.0" name="generator">
<meta content="indexes-00" name="ietf.draft">
<link href="tests/input/indexes.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand All @@ -23,7 +23,7 @@
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires February 10, 2023</td>
<td class="center">Expires February 18, 2023</td>
<td class="right">[Page]</td>
</tr></tfoot>
</table>
Expand All @@ -36,12 +36,12 @@
<dd class="internet-draft">indexes-00</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2022-08-09" class="published">August 9, 2022</time>
<time datetime="2022-08-17" class="published">August 17, 2022</time>
</dd>
<dt class="label-intended-status">Intended Status:</dt>
<dd class="intended-status">Experimental</dd>
<dt class="label-expires">Expires:</dt>
<dd class="expires"><time datetime="2023-02-10">February 10, 2023</time></dd>
<dd class="expires"><time datetime="2023-02-18">February 18, 2023</time></dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
<div class="author">
Expand Down Expand Up @@ -71,7 +71,7 @@ <h2 id="name-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."<a href="#section-boilerplate.1-3" class="pilcrow">¶</a></p>
<p id="section-boilerplate.1-4">
This Internet-Draft will expire on February 10, 2023.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on February 18, 2023.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
</section>
</div>
<div id="copyright">
Expand Down Expand Up @@ -228,7 +228,8 @@ <h2 id="name-references">
<dd class="break"></dd>
</dl>
</section>
<section id="appendix-A">
<div id="rfc.index">
<section class="index" id="appendix-A">
<h2 id="name-index">
<a href="#name-index" class="section-name selfRef">Index</a>
</h2>
Expand All @@ -243,14 +244,14 @@ <h2 id="name-index">
<a href="#rfc.index.u83" class="xref">S</a>
<a href="#rfc.index.u84" class="xref">T</a><a href="#appendix-A-1" class="pilcrow">¶</a></p>
</div>
<ul class="normal ulEmpty">
<li class="normal ulEmpty" id="appendix-A-2.1">
<ul class="index normal ulEmpty">
<li class="index normal ulEmpty" id="appendix-A-2.1">
<div id="rfc.index.u65">
<p id="appendix-A-2.1.1" class="keepWithNext">
<a href="#rfc.index.u65" class="xref">A</a><a href="#appendix-A-2.1.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.1.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.1.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.1.2.1.1">
<dt id="appendix-A-2.1.2.1.1.1">annotation</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.1.2.1.1.2">
Expand All @@ -274,13 +275,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.2">
<li class="index normal ulEmpty" id="appendix-A-2.2">
<div id="rfc.index.u66">
<p id="appendix-A-2.2.1" class="keepWithNext">
<a href="#rfc.index.u66" class="xref">B</a><a href="#appendix-A-2.2.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.2.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.2.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.2.2.1.1">
<dt id="appendix-A-2.2.2.1.1.1">blockquote</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.2.2.1.1.2">
Expand All @@ -292,13 +293,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.3">
<li class="index normal ulEmpty" id="appendix-A-2.3">
<div id="rfc.index.u68">
<p id="appendix-A-2.3.1" class="keepWithNext">
<a href="#rfc.index.u68" class="xref">D</a><a href="#appendix-A-2.3.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.3.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.3.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.3.2.1.1">
<dt id="appendix-A-2.3.2.1.1.1">dd</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.3.2.1.1.2">
Expand All @@ -316,13 +317,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.4">
<li class="index normal ulEmpty" id="appendix-A-2.4">
<div id="rfc.index.u69">
<p id="appendix-A-2.4.1" class="keepWithNext">
<a href="#rfc.index.u69" class="xref">E</a><a href="#appendix-A-2.4.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.4.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.4.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.4.2.1.1">
<dt id="appendix-A-2.4.2.1.1.1">em</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.4.2.1.1.2">
Expand All @@ -334,13 +335,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.5">
<li class="index normal ulEmpty" id="appendix-A-2.5">
<div id="rfc.index.u70">
<p id="appendix-A-2.5.1" class="keepWithNext">
<a href="#rfc.index.u70" class="xref">F</a><a href="#appendix-A-2.5.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.5.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.5.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.5.2.1.1">
<dt id="appendix-A-2.5.2.1.1.1">figure</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.5.2.1.1.2">
Expand All @@ -352,13 +353,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.6">
<li class="index normal ulEmpty" id="appendix-A-2.6">
<div id="rfc.index.u76">
<p id="appendix-A-2.6.1" class="keepWithNext">
<a href="#rfc.index.u76" class="xref">L</a><a href="#appendix-A-2.6.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.6.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.6.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.6.2.1.1">
<dt id="appendix-A-2.6.2.1.1.1">li</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.6.2.1.1.2"></dd>
Expand All @@ -385,13 +386,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.7">
<li class="index normal ulEmpty" id="appendix-A-2.7">
<div id="rfc.index.u83">
<p id="appendix-A-2.7.1" class="keepWithNext">
<a href="#rfc.index.u83" class="xref">S</a><a href="#appendix-A-2.7.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.7.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.7.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.7.2.1.1">
<dt id="appendix-A-2.7.2.1.1.1">section</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.7.2.1.1.2">
Expand Down Expand Up @@ -421,13 +422,13 @@ <h2 id="name-index">
</li>
</ul>
</li>
<li class="normal ulEmpty" id="appendix-A-2.8">
<li class="index normal ulEmpty" id="appendix-A-2.8">
<div id="rfc.index.u84">
<p id="appendix-A-2.8.1" class="keepWithNext">
<a href="#rfc.index.u84" class="xref">T</a><a href="#appendix-A-2.8.1" class="pilcrow">¶</a></p>
</div>
<ul class="compact normal ulEmpty">
<li class="compact normal ulEmpty" id="appendix-A-2.8.2.1">
<ul class="compact index normal ulEmpty">
<li class="compact index normal ulEmpty" id="appendix-A-2.8.2.1">
<span class="break"></span><dl class="dlCompact dlParallel" id="appendix-A-2.8.2.1.1">
<dt id="appendix-A-2.8.2.1.1.1">t</dt>
<dd style="margin-left: 1.5em" id="appendix-A-2.8.2.1.1.2">
Expand Down Expand Up @@ -484,6 +485,7 @@ <h2 id="name-index">
</li>
</ul>
</section>
</div>
<div id="authors-addresses">
<section id="appendix-B">
<h2 id="name-authors-address">
Expand Down
Loading