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): Fix truncated text issue in cells with rowspan #1184

Merged
merged 3 commits into from
Nov 25, 2024
Merged

fix(text): Fix truncated text issue in cells with rowspan #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bc890a
fix(text): Fix truncated text issue in cells with rowspan
kesara Nov 14, 2024
0fa82f1
chore: Run yestests pre-changes
kesara Nov 14, 2024
3ed8c3b
chore: Run yestests post-changes
kesara Nov 14, 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.23.2</title>
<title>Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.24.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.23.2" name="generator">
<meta content="xml2rfc-docs-3.23.2" name="ietf.draft">
<meta content="xml2rfc 3.24.0" name="generator">
<meta content="xml2rfc-docs-3.24.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">October 2024</td>
<td class="right">November 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-10-22" class="published">22 October 2024</time>
<time datetime="2024-11-14" class="published">14 November 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.23.2</h1>
<h1 id="title">Xml2rfc Vocabulary Version 3 Schema<br>xml2rfc release 3.24.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.23.2.<a href="#section-1-6" class="pilcrow">¶</a></p>
This documentation applies to xml2rfc version 3.24.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 @@ -6387,7 +6387,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.23.2:<a href="#appendix-D-1" class="pilcrow">¶</a></p>
manpage Jinja2 template, as of xml2rfc version 3.24.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
6 changes: 3 additions & 3 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.23.2" name="generator">
<meta content="xml2rfc 3.24.0" name="generator">
<meta content="RFC" name="keyword">
<meta content="Request for Comments" name="keyword">
<meta content="I-D" name="keyword">
Expand All @@ -26,7 +26,7 @@
<meta content="Extensible Markup Language" name="keyword">
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.23.2
xml2rfc 3.24.0
Python 3.12.7
ConfigArgParse 1.7
google-i18n-address 3.1.1
Expand All @@ -38,7 +38,7 @@
pydyf 0.9.0
PyYAML 6.0.2
requests 2.32.3
setuptools 75.2.0
setuptools 75.5.0
wcwidth 0.2.13
weasyprint 61.2
-->
Expand Down
6 changes: 3 additions & 3 deletions tests/valid/draft-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
Insert an abstract: MANDATORY. This template is for creating an
Internet Draft.
" name="description">
<meta content="xml2rfc 3.23.2" name="generator">
<meta content="xml2rfc 3.24.0" name="generator">
<meta content="template" name="keyword">
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
<!-- Generator version information:
xml2rfc 3.23.2
xml2rfc 3.24.0
Python 3.12.7
ConfigArgParse 1.7
google-i18n-address 3.1.1
Expand All @@ -27,7 +27,7 @@
pydyf 0.9.0
PyYAML 6.0.2
requests 2.32.3
setuptools 75.2.0
setuptools 75.5.0
wcwidth 0.2.13
weasyprint 61.2
-->
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/elements.bom.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
| | column. +----+----+
| | column. | | |
| | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
Expand All @@ -612,16 +613,17 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018




Author, et al. Expires 13 January 2019 [Page 11]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
| Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
| Title | Tilte | | | | | |
| 1 | 2 | | | | | |
| | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
kesara marked this conversation as resolved.
Show resolved Hide resolved
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
Expand Down Expand Up @@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018





Author, et al. Expires 13 January 2019 [Page 12]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/elements.pages.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
| | column. +----+----+
| | column. | | |
| | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
Expand All @@ -612,16 +613,17 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018




Author, et al. Expires January 13, 2019 [Page 11]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
| Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
| Title | Tilte | | | | | |
| 1 | 2 | | | | | |
| | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
Expand Down Expand Up @@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018





Author, et al. Expires January 13, 2019 [Page 12]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
Expand Down
9 changes: 6 additions & 3 deletions tests/valid/elements.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ Table of Contents
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
| | column. +----+----+
| | column. | | |
| | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
Expand All @@ -520,8 +521,10 @@ Table of Contents

+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
| Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
| Title | Tilte | | | | | |
| 1 | 2 | | | | | |
| | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
Expand Down
12 changes: 6 additions & 6 deletions tests/valid/elements.wip.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,8 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
| | et dolore disputandum putant. |
| +---------------------+----+----+
| | Another 3-cell | c3 | d3 |
| | column. +----+----+
| | column. | | |
| | +----+----+
| | | x |
+-------------------------------+ +----+----+
| a5 | | c5 | d5 |
Expand All @@ -612,16 +613,17 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018




Author, et al. Expires 13 January 2019 [Page 11]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018


+==========+========+=================+=====+=====+=======+=========+
| Column | Column |Column Title 3 |TC 4 |TC 5 |TC 6 | TC 7 |
| Title | Tilte +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| 1 | 2 |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
| Title | Tilte | | | | | |
| 1 | 2 | | | | | |
| | +==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| | |C1|C2|C3|C4|C5|C6|C1|C2|C1|C2|C1| C2 | C1 | C2 |
+==========+========+==+==+==+==+==+==+==+==+==+==+==+====+====+====+
| Major | Minor |x |x |x |x |x |x |x |x |x |x |x | x | x | x |
| Row 1, | Row 1, | | | | | | | | | | | | | | |
Expand Down Expand Up @@ -667,8 +669,6 @@ Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018





Author, et al. Expires 13 January 2019 [Page 12]

Internet-Draft Xml2rfc Vocabulary V3 Elements July 2018
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 October 22, 2024
Internet-Draft November 14, 2024
Intended status: Experimental
Expires: April 25, 2025
Expires: May 18, 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 April 25, 2025.
This Internet-Draft will expire on May 18, 2025.

Copyright Notice

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



Person Expires April 25, 2025 [Page 1]
Person Expires May 18, 2025 [Page 1]

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


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



Person Expires April 25, 2025 [Page 2]
Person Expires May 18, 2025 [Page 2]

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


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



Person Expires April 25, 2025 [Page 3]
Person Expires May 18, 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-10-22T23:07:20" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.23.2 -->
<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-11-14T10:46:57" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
<!-- xml2rfc v2v3 conversion 3.24.0 -->



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

Copyright Notice

Expand Down
Loading
Loading