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.

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

fix: Follow HTML presentational hints in PDF #1055

Merged
merged 2 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tests/valid/docfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<thead><tr>
<td class="left"></td>
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
<td class="right">October 2023</td>
<td class="right">November 2023</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="2023-10-26" class="published">26 October 2023</time>
<time datetime="2023-11-16" class="published">16 November 2023</time>
</dd>
<dt class="label-authors">Author:</dt>
<dd class="authors">
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/draft-miek-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.11.0
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/draft-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.11.0
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
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 October 26, 2023
Internet-Draft November 16, 2023
Intended status: Experimental
Expires: April 28, 2024
Expires: May 19, 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 April 28, 2024.
This Internet-Draft will expire on May 19, 2024.

Copyright Notice

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



Person Expires April 28, 2024 [Page 1]
Person Expires May 19, 2024 [Page 1]

Internet-Draft xml2rfc index tests October 2023
Internet-Draft xml2rfc index tests November 2023


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



Person Expires April 28, 2024 [Page 2]
Person Expires May 19, 2024 [Page 2]

Internet-Draft xml2rfc index tests October 2023
Internet-Draft xml2rfc index tests November 2023


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



Person Expires April 28, 2024 [Page 3]
Person Expires May 19, 2024 [Page 3]
6 changes: 3 additions & 3 deletions tests/valid/indexes.prepped.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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="2023-10-26T16:43:20" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<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="2023-11-16T22:23:11" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.18.2 -->


Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="26" month="10" year="2023"/>
<date day="16" month="11" year="2023"/>
<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 28 April 2024.
This Internet-Draft will expire on 19 May 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 October 26, 2023
Internet-Draft November 16, 2023
Intended status: Experimental
Expires: April 28, 2024
Expires: May 19, 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 April 28, 2024.
This Internet-Draft will expire on May 19, 2024.

Copyright Notice

Expand Down
10 changes: 5 additions & 5 deletions tests/valid/indexes.v3.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc index tests</td>
<td class="right">October 2023</td>
<td class="right">November 2023</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires April 28, 2024</td>
<td class="center">Expires May 19, 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="2023-10-26" class="published">October 26, 2023</time>
<time datetime="2023-11-16" class="published">November 16, 2023</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-04-28">April 28, 2024</time></dd>
<dd class="expires"><time datetime="2024-05-19">May 19, 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 April 28, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on May 19, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
</section>
</div>
<div id="copyright">
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/manpage.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
xml2rfc(1) xml2rfc(1)
26 October 2023
16 November 2023


Xml2rfc Vocabulary Version 3 Schema
Expand Down
2 changes: 1 addition & 1 deletion tests/valid/rfc7911.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
intervaltree 3.1.0
Jinja2 3.1.2
lxml 4.9.3
platformdirs 3.11.0
platformdirs 3.10.0
pycountry 22.3.5
PyYAML 6.0.1
requests 2.31.0
Expand Down
20 changes: 10 additions & 10 deletions tests/valid/sourcecode.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 October 26, 2023
Internet-Draft November 16, 2023
Intended status: Experimental
Expires: April 28, 2024
Expires: May 19, 2024


xml2rfc sourcecode 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 April 28, 2024.
This Internet-Draft will expire on May 19, 2024.

Copyright Notice

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



Person Expires April 28, 2024 [Page 1]
Person Expires May 19, 2024 [Page 1]

Internet-Draft xml2rfc sourcecode tests October 2023
Internet-Draft xml2rfc sourcecode tests November 2023


print("01")
Expand Down Expand Up @@ -109,9 +109,9 @@ Internet-Draft xml2rfc sourcecode tests October 2023



Person Expires April 28, 2024 [Page 2]
Person Expires May 19, 2024 [Page 2]

Internet-Draft xml2rfc sourcecode tests October 2023
Internet-Draft xml2rfc sourcecode tests November 2023


print("49")
Expand Down Expand Up @@ -165,9 +165,9 @@ Internet-Draft xml2rfc sourcecode tests October 2023



Person Expires April 28, 2024 [Page 3]
Person Expires May 19, 2024 [Page 3]

Internet-Draft xml2rfc sourcecode tests October 2023
Internet-Draft xml2rfc sourcecode tests November 2023


print("47")
Expand Down Expand Up @@ -221,4 +221,4 @@ Author's Address



Person Expires April 28, 2024 [Page 4]
Person Expires May 19, 2024 [Page 4]
6 changes: 3 additions & 3 deletions tests/valid/sourcecode.prepped.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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="sourcecode-00" prepTime="2023-10-26T16:43:27" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<rfc xmlns:xi="http://www.w3.org/2001/XInclude" version="3" sortRefs="true" category="exp" submissionType="independent" ipr="trust200902" docName="sourcecode-00" prepTime="2023-11-16T22:23:19" indexInclude="true" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.18.2 -->


Expand All @@ -20,7 +20,7 @@
</postal>
</address>
</author>
<date day="26" month="10" year="2023"/>
<date day="16" month="11" year="2023"/>
<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 28 April 2024.
This Internet-Draft will expire on 19 May 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/sourcecode.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 October 26, 2023
Internet-Draft November 16, 2023
Intended status: Experimental
Expires: April 28, 2024
Expires: May 19, 2024


xml2rfc sourcecode 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 April 28, 2024.
This Internet-Draft will expire on May 19, 2024.

Copyright Notice

Expand Down
10 changes: 5 additions & 5 deletions tests/valid/sourcecode.v3.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<thead><tr>
<td class="left">Internet-Draft</td>
<td class="center">xml2rfc sourcecode tests</td>
<td class="right">October 2023</td>
<td class="right">November 2023</td>
</tr></thead>
<tfoot><tr>
<td class="left">Person</td>
<td class="center">Expires April 28, 2024</td>
<td class="center">Expires May 19, 2024</td>
<td class="right">[Page]</td>
</tr></tfoot>
</table>
Expand All @@ -36,12 +36,12 @@
<dd class="internet-draft">sourcecode-00</dd>
<dt class="label-published">Published:</dt>
<dd class="published">
<time datetime="2023-10-26" class="published">October 26, 2023</time>
<time datetime="2023-11-16" class="published">November 16, 2023</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-04-28">April 28, 2024</time></dd>
<dd class="expires"><time datetime="2024-05-19">May 19, 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 April 28, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
This Internet-Draft will expire on May 19, 2024.<a href="#section-boilerplate.1-4" class="pilcrow">¶</a></p>
</section>
</div>
<div id="copyright">
Expand Down
2 changes: 1 addition & 1 deletion xml2rfc/writers/pdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def pdf(self):
page_css_text = page_css_template.format(**page_info)
page_css = weasyprint.CSS(string=page_css_text)

pdf = writer.write_pdf(None, stylesheets=[ css, page_css ])
pdf = writer.write_pdf(None, stylesheets=[ css, page_css ], presentational_hints=True)

return pdf

Expand Down
Loading