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

Jump to bottom

fix(text): Render list items correctly #1137

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

fix(text): Render list items correctly #1137

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8d3a94
fix: Render ol items correctly
kesara Jul 9, 2024
ccf2c89
chore: Run yestests pre-changes
kesara Jul 9, 2024
0f35391
chore: Run yestests post-changes
kesara Jul 9, 2024
fdb6fb8
fixup! fix: Render ol items correctly
kesara Jul 9, 2024
5865342
fix: Insert a new line to li rather than skipping
kesara Jul 10, 2024
d98c434
chore: Run yestests after new line change
kesara Jul 10, 2024
11ef6ac
fixup! fix: Insert a new line to li rather than skipping
kesara Jul 12, 2024
fe874cf
chore: Run yestests after changes
kesara Jul 12, 2024
fe595b1
test: Add test for ul with empty bullets
kesara Jul 12, 2024
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
16 changes: 8 additions & 8 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.21.0</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.22.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.21.0" name="generator">
<meta content="xml2rfc-docs-3.21.0" name="ietf.draft">
<meta content="xml2rfc 3.22.0" name="generator">
<meta content="xml2rfc-docs-3.22.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 All @@ -24,7 +24,7 @@
<thead><tr>
<td class="left"></td>
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
<td class="right">April 2024</td>
<td class="right">July 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-04-23" class="published">23 April 2024</time>
<time datetime="2024-07-09" class="published">9 July 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.21.0</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.22.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 @@ -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.21.0.<a href="#section-1-6" class="pilcrow">¶</a></p>
This documentation applies to xml2rfc version 3.22.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 @@ -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.21.0:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
manpage Jinja2 template, as of xml2rfc version 3.22.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
17 changes: 8 additions & 9 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.21.0" name="generator">
<meta content="xml2rfc 3.22.0" 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,20 @@
<meta content="Extensible Markup Language" name="keyword">
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.21.0
xml2rfc 3.22.0
Python 3.10.12
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
Jinja2 3.1.4
lxml 4.9.4
platformdirs 4.2.0
pycountry 23.12.11
platformdirs 4.2.2
pycountry 24.6.1
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
requests 2.32.3
setuptools 70.1.0
wcwidth 0.2.13
weasyprint 61.2
weasyprint 62.3
-->
<link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down
17 changes: 8 additions & 9 deletions tests/valid/draft-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
<meta content="xml2rfc 3.21.0" name="generator">
<meta content="xml2rfc 3.22.0" name="generator">
<meta content="template" name="keyword">
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.21.0
xml2rfc 3.22.0
Python 3.10.12
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
Jinja2 3.1.4
lxml 4.9.4
platformdirs 4.2.0
pycountry 23.12.11
platformdirs 4.2.2
pycountry 24.6.1
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
requests 2.32.3
setuptools 70.1.0
wcwidth 0.2.13
weasyprint 61.2
weasyprint 62.3
-->
<link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/elements.bom.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Author, et al. Expires 13 January 2019 [Page 8]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


4.1 Sublist with '%p' parent counter element in the list
4. 4.1 Sublist with '%p' parent counter element in the list
kesara marked this conversation as resolved.
Show resolved Hide resolved
counter, item one

4.2 Item two.
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/elements.pages.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Author, et al. Expires January 13, 2019 [Page 8]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


4.1 Sublist with '%p' parent counter element in the list
4. 4.1 Sublist with '%p' parent counter element in the list
counter, item one

4.2 Item two.
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/elements.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ Table of Contents
Case Ambiguity [RFC8174], Appendix A.1 / Key Words Case
Ambiguity [RFC8174] (Appendix A.1).

4.1 Sublist with '%p' parent counter element in the list
4. 4.1 Sublist with '%p' parent counter element in the list
counter, item one

4.2 Item two.
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/elements.wip.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ Author, et al. Expires 13 January 2019 [Page 8]
Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


4.1 Sublist with '%p' parent counter element in the list
4. 4.1 Sublist with '%p' parent counter element in the list
counter, item one

4.2 Item two.
Expand Down
16 changes: 8 additions & 8 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 April 23, 2024
Internet-Draft July 9, 2024
Intended status: Experimental
Expires: October 25, 2024
Expires: January 10, 2025


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 25, 2024.
This Internet-Draft will expire on January 10, 2025.

Copyright Notice

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



Person Expires October 25, 2024 [Page 1]
Person Expires January 10, 2025 [Page 1]

Internet-Draft xml2rfc index tests April 2024
Internet-Draft xml2rfc index tests July 2024


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



Person Expires October 25, 2024 [Page 2]
Person Expires January 10, 2025 [Page 2]

Internet-Draft xml2rfc index tests April 2024
Internet-Draft xml2rfc index tests July 2024


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



Person Expires October 25, 2024 [Page 3]
Person Expires January 10, 2025 [Page 3]
8 changes: 4 additions & 4 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" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="indexes-00" indexInclude="true" prepTime="2024-04-23T11:10:19" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.21.0 -->
<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-07-09T08:21:22" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.22.0 -->



Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="23" month="04" year="2024"/>
<date day="09" month="07" 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 25 October 2024.
This Internet-Draft will expire on 10 January 2025.
</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
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 April 23, 2024
Internet-Draft July 9, 2024
Intended status: Experimental
Expires: October 25, 2024
Expires: January 10, 2025


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 25, 2024.
This Internet-Draft will expire on January 10, 2025.

Copyright Notice

Expand Down
12 changes: 6 additions & 6 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.21.0" name="generator">
<meta content="xml2rfc 3.22.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 @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc index tests</td>
<td class="right">April 2024</td>
<td class="right">July 2024</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires October 25, 2024</td>
<td class="center">Expires January 10, 2025</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-04-23" class="published">April 23, 2024</time>
<time datetime="2024-07-09" class="published">July 9, 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-10-25">October 25, 2024</time></dd>
<dd class="expires"><time datetime="2025-01-10">January 10, 2025</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 October 25, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on January 10, 2025.<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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
xml2rfc(1) xml2rfc(1)
23 April 2024
9 July 2024


Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.21.0
xml2rfc-docs-3.21.0
xml2rfc release 3.22.0
xml2rfc-docs-3.22.0

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.21.0.
This documentation applies to xml2rfc version 3.22.0.

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.21.0:
Jinja2 template, as of xml2rfc version 3.22.0:

{{ bare_latin_tags }}:

Expand Down
17 changes: 8 additions & 9 deletions tests/valid/rfc7911.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,23 @@
that each path is identified by a Path Identifier in addition to the
address prefix.
" name="description">
<meta content="xml2rfc 3.21.0" name="generator">
<meta content="xml2rfc 3.22.0" name="generator">
<meta content="7911" name="rfc.number">
<!-- Generator version information:
xml2rfc 3.21.0
xml2rfc 3.22.0
Python 3.10.12
ConfigArgParse 1.7
google-i18n-address 3.1.0
intervaltree 3.1.0
Jinja2 3.1.3
Jinja2 3.1.4
lxml 4.9.4
platformdirs 4.2.0
pycountry 23.12.11
platformdirs 4.2.2
pycountry 24.6.1
PyYAML 6.0.1
requests 2.31.0
setuptools 69.0.2
six 1.16.0
requests 2.32.3
setuptools 70.1.0
wcwidth 0.2.13
weasyprint 61.2
weasyprint 62.3
-->
<link href="tests/input/rfc7911.xml" rel="alternate" type="application/rfc+xml">
<link href="#copyright" rel="license">
Expand Down
Loading
Loading