Skip to content

Commit

Permalink
fix: Avoid breaking citation labels (#1114)
Browse files Browse the repository at this point in the history
* fix: Avoid breaking citation labels

Fixes #685
  • Loading branch information
kesara authored Mar 18, 2024
1 parent c8e2998 commit 312b01a
Show file tree
Hide file tree
Showing 14 changed files with 81 additions and 69 deletions.
16 changes: 8 additions & 8 deletions tests/valid/docfile.html
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.19.4</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.20.1</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.19.4" name="generator">
<meta content="xml2rfc-docs-3.19.4" name="ietf.draft">
<meta content="xml2rfc 3.20.1" name="generator">
<meta content="xml2rfc-docs-3.20.1" 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 All @@ -24,7 +24,7 @@
<thead><tr>
<td class="left"></td>
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
<td class="right">February 2024</td>
<td class="right">March 2024</td>
</tr></thead>
<tfoot><tr>
<td class="left">xml2rfc(1)</td>
Expand All @@ -39,7 +39,7 @@
<dd class="workgroup">xml2rfc(1)</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2024-02-19" class="published">19 February 2024</time>
<time datetime="2024-03-16" class="published">16 March 2024</time>
</dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
Expand All @@ -49,7 +49,7 @@
</dd>
</dl>
</div>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.19.4</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.20.1</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 @@ -371,7 +371,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.19.4.<a href="#section-1-6" class="pilcrow"></a></p>
This documentation applies to xml2rfc version 3.20.1.<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 @@ -6367,7 +6367,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.19.4:<a href="#appendix-D-1" class="pilcrow"></a></p>
manpage Jinja2 template, as of xml2rfc version 3.20.1:<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
11 changes: 7 additions & 4 deletions tests/valid/draft-miek-test.html
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.19.4" name="generator">
<meta content="xml2rfc 3.20.1" name="generator">
<meta content="RFC" name="keyword">
<meta content="Request for Comments" name="keyword">
<meta content="I-D" name="keyword">
Expand All @@ -26,21 +26,21 @@
<meta content="Extensible Markup Language" name="keyword">
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.19.4
xml2rfc 3.20.1
Python 3.11.7
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
lxml 4.9.4
platformdirs 4.1.0
platformdirs 4.2.0
pycountry 23.12.11
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
wcwidth 0.2.13
weasyprint 60.2
weasyprint 61.2
-->
<link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down Expand Up @@ -326,6 +326,9 @@
text-align: right;
font-style: italic;
}
.xref {
overflow-wrap: normal;
}

/* tables */
table {
Expand Down
11 changes: 7 additions & 4 deletions tests/valid/draft-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
<meta content="xml2rfc 3.19.4" name="generator">
<meta content="xml2rfc 3.20.1" name="generator">
<meta content="template" name="keyword">
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.19.4
xml2rfc 3.20.1
Python 3.11.7
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
lxml 4.9.4
platformdirs 4.1.0
platformdirs 4.2.0
pycountry 23.12.11
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
wcwidth 0.2.13
weasyprint 60.2
weasyprint 61.2
-->
<link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down Expand Up @@ -315,6 +315,9 @@
text-align: right;
font-style: italic;
}
.xref {
overflow-wrap: normal;
}

/* tables */
table {
Expand Down
16 changes: 8 additions & 8 deletions tests/valid/indexes.pages.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft February 19, 2024
Internet-Draft March 16, 2024
Intended status: Experimental
Expires: August 22, 2024
Expires: September 17, 2024


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 August 22, 2024.
This Internet-Draft will expire on September 17, 2024.

Copyright Notice

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



Person Expires August 22, 2024 [Page 1]
Person Expires September 17, 2024 [Page 1]

Internet-Draft xml2rfc index tests February 2024
Internet-Draft xml2rfc index tests March 2024


This is another section!
Expand Down Expand Up @@ -109,9 +109,9 @@ Index



Person Expires August 22, 2024 [Page 2]
Person Expires September 17, 2024 [Page 2]

Internet-Draft xml2rfc index tests February 2024
Internet-Draft xml2rfc index tests March 2024


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



Person Expires August 22, 2024 [Page 3]
Person Expires September 17, 2024 [Page 3]
8 changes: 4 additions & 4 deletions tests/valid/indexes.prepped.xml
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" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-02-19T00:20:48" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.19.4 -->
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-03-16T00:12:42" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.20.1 -->



Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="19" month="02" year="2024"/>
<date day="16" month="03" year="2024"/>
<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 22 August 2024.
This Internet-Draft will expire on 17 September 2024.
</t>
</section>
<section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
Expand Down
6 changes: 3 additions & 3 deletions tests/valid/indexes.text
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@


Network Working Group H. Person, Ed.
Internet-Draft February 19, 2024
Internet-Draft March 16, 2024
Intended status: Experimental
Expires: August 22, 2024
Expires: September 17, 2024


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 August 22, 2024.
This Internet-Draft will expire on September 17, 2024.

Copyright Notice

Expand Down
12 changes: 6 additions & 6 deletions tests/valid/indexes.v3.html
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.19.4" name="generator">
<meta content="xml2rfc 3.20.1" 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 @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc index tests</td>
<td class="right">February 2024</td>
<td class="right">March 2024</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires August 22, 2024</td>
<td class="center">Expires September 17, 2024</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="2024-02-19" class="published">February 19, 2024</time>
<time datetime="2024-03-16" class="published">March 16, 2024</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="2024-08-22">August 22, 2024</time></dd>
<dd class="expires"><time datetime="2024-09-17">September 17, 2024</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 August 22, 2024.<a href="#section-boilerplate.1-4" class="pilcrow"></a></p>
This Internet-Draft will expire on September 17, 2024.<a href="#section-boilerplate.1-4" class="pilcrow"></a></p>
</section>
</div>
<div id="copyright">
Expand Down
10 changes: 5 additions & 5 deletions tests/valid/manpage.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
19 February 2024
16 March 2024


Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.19.4
xml2rfc-docs-3.19.4
xml2rfc release 3.20.1
xml2rfc-docs-3.20.1

Abstract

Expand Down Expand Up @@ -54,7 +54,7 @@ Table of Contents
The latest version of this documentation is available in HTML form at
https://ietf-tools.github.io/xml2rfc/.

This documentation applies to xml2rfc version 3.19.4.
This documentation applies to xml2rfc version 3.20.1.

2. Schema Version 3 Elements

Expand Down Expand Up @@ -4324,7 +4324,7 @@ Appendix C. xml2rfc Configuration Files
Appendix D. xml2rfc Documentation Template Variables

The following variables are available for use in an xml2rfc manpage
Jinja2 template, as of xml2rfc version 3.19.4:
Jinja2 template, as of xml2rfc version 3.20.1:

{{ bare_latin_tags }}:

Expand Down
11 changes: 7 additions & 4 deletions tests/valid/rfc7911.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
that each path is identified by a Path Identifier in addition to the
address prefix.
" name="description">
<meta content="xml2rfc 3.19.4" name="generator">
<meta content="xml2rfc 3.20.1" name="generator">
<meta content="7911" name="rfc.number">
<!-- Generator version information:
xml2rfc 3.19.4
xml2rfc 3.20.1
Python 3.11.7
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
lxml 4.9.4
platformdirs 4.1.0
platformdirs 4.2.0
pycountry 23.12.11
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
wcwidth 0.2.13
weasyprint 60.2
weasyprint 61.2
-->
<link href="tests/input/rfc7911.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down Expand Up @@ -319,6 +319,9 @@
text-align: right;
font-style: italic;
}
.xref {
overflow-wrap: normal;
}

/* tables */
table {
Expand Down
Loading

0 comments on commit 312b01a

Please sign in to comment.