Skip to content

Commit 2133493

Browse files
kesarakesara
authored
fix(html): Use basename for alternative link (#1198)
* fix: Use basename for alternate link This removes path from the alternate link. Fixes #1068 * chore: Run yes tests (pre-changes) * chore: Run yestets (post-changes)
1 parent 924f192 commit 2133493

23 files changed

+76
-76
lines changed

‎tests/valid/docfile.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
" name="description">
1414
<meta content="xml2rfc 3.25.0" name="generator">
1515
<meta content="xml2rfc-docs-3.25.0" name="ietf.draft">
16-
<link href="tests/out/docfile.xml" rel="alternate" type="application/rfc+xml">
16+
<link href="docfile.xml" rel="alternate" type="application/rfc+xml">
1717
<link href="#copyright" rel="license">
1818
<link href="xml2rfc.css" rel="stylesheet">
1919
<link href="rfc-local.css" rel="stylesheet" type="text/css">
@@ -24,7 +24,7 @@
2424
<thead><tr>
2525
<td class="left"></td>
2626
<td class="center">Xml2rfc Vocabulary V3 Schema</td>
27-
<td class="right">December 2024</td>
27+
<td class="right">January 2025</td>
2828
</tr></thead>
2929
<tfoot><tr>
3030
<td class="left">xml2rfc(1)</td>
@@ -39,7 +39,7 @@
3939
<dd class="workgroup">xml2rfc(1)</dd>
4040
<dt class="label-published">Published:</dt>
4141
<dd class="published">
42-
<time datetime="2024-12-04" class="published">4 December 2024</time>
42+
<time datetime="2025-01-10" class="published">10 January 2025</time>
4343
</dd>
4444
<dt class="label-authors">Author:</dt>
4545
<dd class="authors">

‎tests/valid/draft-miek-test.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
wcwidth 0.2.13
4343
weasyprint 61.2
4444
-->
45-
<link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
45+
<link href="draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
4646
<link href="#copyright" rel="license">
4747
<style type="text/css">/*
4848

‎tests/valid/draft-miek-test.v3.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
This version is adapted to work with "xml2rfc" version 2.x.
1717
1818
' name="description">
19-
<meta content="xml2rfc 3.18.0" name="generator">
19+
<meta content="xml2rfc 3.25.0" name="generator">
2020
<meta content="RFC" name="keyword">
2121
<meta content="Request for Comments" name="keyword">
2222
<meta content="I-D" name="keyword">
@@ -25,7 +25,7 @@
2525
<meta content="Pandoc" name="keyword">
2626
<meta content="Extensible Markup Language" name="keyword">
2727
<meta content="draft-gieben-writing-rfcs-pandoc-02" name="ietf.draft">
28-
<link href="tests/input/draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
28+
<link href="draft-miek-test.xml" rel="alternate" type="application/rfc+xml">
2929
<link href="#copyright" rel="license">
3030
<link href="xml2rfc.css" rel="stylesheet">
3131
<link href="rfc-local.css" rel="stylesheet" type="text/css">

‎tests/valid/draft-template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
wcwidth 0.2.13
3232
weasyprint 61.2
3333
-->
34-
<link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
34+
<link href="draft-template.xml" rel="alternate" type="application/rfc+xml">
3535
<link href="#copyright" rel="license">
3636
<style type="text/css">/*
3737

‎tests/valid/draft-template.v3.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
Insert an abstract: MANDATORY. This template is for creating an
1212
Internet Draft.
1313
" name="description">
14-
<meta content="xml2rfc 3.18.0" name="generator">
14+
<meta content="xml2rfc 3.25.0" name="generator">
1515
<meta content="template" name="keyword">
1616
<meta content="draft-ietf-xml2rfc-template-05" name="ietf.draft">
17-
<link href="tests/input/draft-template.xml" rel="alternate" type="application/rfc+xml">
17+
<link href="draft-template.xml" rel="alternate" type="application/rfc+xml">
1818
<link href="#copyright" rel="license">
1919
<link href="xml2rfc.css" rel="stylesheet">
2020
<link href="rfc-local.css" rel="stylesheet" type="text/css">
@@ -921,7 +921,7 @@ <h3 id="name-informative-references">
921921
<dl class="references">
922922
<dt id="DOI_10.1145_2975159">[DOI_10.1145_2975159]</dt>
923923
<dd>
924-
<span class="refAuthor">Singh, A.</span>, <span class="refAuthor">Ong, J.</span>, <span class="refAuthor">Agarwal, A.</span>, <span class="refAuthor">Anderson, G.</span>, <span class="refAuthor">Armistead, A.</span>, <span class="refAuthor">Bannon, R.</span>, <span class="refAuthor">Boving, S.</span>, <span class="refAuthor">Desai, G.</span>, <span class="refAuthor">Felderman, B.</span>, <span class="refAuthor">Germano, P.</span>, <span class="refAuthor">Kanagala, A.</span>, <span class="refAuthor">Liu, H.</span>, <span class="refAuthor">Provost, J.</span>, <span class="refAuthor">Simmons, J.</span>, <span class="refAuthor">Tanda, E.</span>, <span class="refAuthor">Wanderer, J.</span>, <span class="refAuthor">Hölzle, U.</span>, <span class="refAuthor">Stuart, S.</span>, <span class="refAuthor">Vahdat, A.</span>, and <span class="refAuthor">Association for Computing Machinery (ACM)</span>, <span class="refTitle">"Jupiter rising"</span>, <span class="refContent">Communications of the ACM, vol. 59, no. 9, pp. 88-97</span>, <span class="seriesInfo">DOI 10.1145/2975159</span>, <time datetime="2016-08-24" class="refDate">August 24, 2016</time>, <span>&lt;<a href="http://dx.doi.org/10.1145/2975159">http://dx.doi.org/10.1145/2975159</a>&gt;</span>. </dd>
924+
<span class="refAuthor">Singh, A.</span>, <span class="refAuthor">Ong, J.</span>, <span class="refAuthor">Agarwal, A.</span>, <span class="refAuthor">Anderson, G.</span>, <span class="refAuthor">Armistead, A.</span>, <span class="refAuthor">Bannon, R.</span>, <span class="refAuthor">Boving, S.</span>, <span class="refAuthor">Desai, G.</span>, <span class="refAuthor">Felderman, B.</span>, <span class="refAuthor">Germano, P.</span>, <span class="refAuthor">Kanagala, A.</span>, <span class="refAuthor">Liu, H.</span>, <span class="refAuthor">Provost, J.</span>, <span class="refAuthor">Simmons, J.</span>, <span class="refAuthor">Tanda, E.</span>, <span class="refAuthor">Wanderer, J.</span>, <span class="refAuthor">Hölzle, U.</span>, <span class="refAuthor">Stuart, S.</span>, <span class="refAuthor">Vahdat, A.</span>, and <span class="refAuthor">Association for Computing Machinery (ACM)</span>, <span class="refTitle">"Jupiter rising"</span>, <span class="refContent">Communications of the ACM, vol. 59, no. 9, pp. 88-97</span>, <span class="seriesInfo">DOI 10.1145/2975159</span>, <time datetime="2016-08-24" class="refDate">August 24, 2016</time>, <span>&lt;<a href="https://doi.org/10.1145/2975159">https://doi.org/10.1145/2975159</a>&gt;</span>. </dd>
925925
<dd class="break"></dd>
926926
<dt id="DOMINATION">[DOMINATION]</dt>
927927
<dd>

‎tests/valid/draft-v3-features.v3.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
This document tests features introduced in xml2rfc v3 vocabulary.
1414
1515
" name="description">
16-
<meta content="xml2rfc 3.19.4" name="generator">
16+
<meta content="xml2rfc 3.25.0" name="generator">
1717
<meta content="draft-v3-features" name="ietf.draft">
18-
<link href="tests/input/draft-v3-features.xml" rel="alternate" type="application/rfc+xml">
18+
<link href="draft-v3-features.xml" rel="alternate" type="application/rfc+xml">
1919
<link href="#copyright" rel="license">
2020
<link href="xml2rfc.css" rel="stylesheet">
2121
<link href="rfc-local.css" rel="stylesheet" type="text/css">

‎tests/valid/elements.v3.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<meta content="
1616
This is the abstract.
1717
" name="description">
18-
<meta content="xml2rfc 3.22.0" name="generator">
18+
<meta content="xml2rfc 3.25.0" name="generator">
1919
<meta content="elements-00" name="ietf.draft">
20-
<link href="tests/input/elements.xml" rel="alternate" type="application/rfc+xml">
20+
<link href="elements.xml" rel="alternate" type="application/rfc+xml">
2121
<link href="#copyright" rel="license">
2222
<link href="xml2rfc.css" rel="stylesheet">
2323
<link href="rfc-local.css" rel="stylesheet" type="text/css">

‎tests/valid/indexes.pages.text‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44

55
Network Working Group H. Person, Ed.
6-
Internet-Draft December 4, 2024
6+
Internet-Draft January 10, 2025
77
Intended status: Experimental
8-
Expires: June 7, 2025
8+
Expires: July 14, 2025
99

1010

1111
xml2rfc index tests
@@ -26,11 +26,11 @@ Status of This Memo
2626
time. It is inappropriate to use Internet-Drafts as reference
2727
material or to cite them other than as "work in progress."
2828

29-
This Internet-Draft will expire on June 7, 2025.
29+
This Internet-Draft will expire on July 14, 2025.
3030

3131
Copyright Notice
3232

33-
Copyright (c) 2024 IETF Trust and the persons identified as the
33+
Copyright (c) 2025 IETF Trust and the persons identified as the
3434
document authors. All rights reserved.
3535

3636
This document is subject to BCP 78 and the IETF Trust's Legal
@@ -53,9 +53,9 @@ Table of Contents
5353

5454

5555

56-
Person Expires June 7, 2025 [Page 1]
56+
Person Expires July 14, 2025 [Page 1]
5757

58-
Internet-Draft xml2rfc index tests December 2024
58+
Internet-Draft xml2rfc index tests January 2025
5959

6060

6161
This is another section!
@@ -109,9 +109,9 @@ Index
109109

110110

111111

112-
Person Expires June 7, 2025 [Page 2]
112+
Person Expires July 14, 2025 [Page 2]
113113

114-
Internet-Draft xml2rfc index tests December 2024
114+
Internet-Draft xml2rfc index tests January 2025
115115

116116

117117
E
@@ -165,4 +165,4 @@ Author's Address
165165

166166

167167

168-
Person Expires June 7, 2025 [Page 3]
168+
Person Expires July 14, 2025 [Page 3]

‎tests/valid/indexes.prepped.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
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-12-04T00:11:42" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
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="2025-01-10T04:34:27" scripts="Common,Latin" symRefs="true" tocDepth="3" tocInclude="true">
33
<!-- xml2rfc v2v3 conversion 3.25.0 -->
44

55

@@ -20,7 +20,7 @@
2020
</postal>
2121
</address>
2222
</author>
23-
<date day="04" month="12" year="2024"/>
23+
<date day="10" month="01" year="2025"/>
2424
<boilerplate>
2525
<section anchor="status-of-memo" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.1">
2626
<name slugifiedName="name-status-of-this-memo">Status of This Memo</name>
@@ -41,13 +41,13 @@
4141
material or to cite them other than as "work in progress."
4242
</t>
4343
<t indent="0" pn="section-boilerplate.1-4">
44-
This Internet-Draft will expire on 7 June 2025.
44+
This Internet-Draft will expire on 14 July 2025.
4545
</t>
4646
</section>
4747
<section anchor="copyright" numbered="false" removeInRFC="false" toc="exclude" pn="section-boilerplate.2">
4848
<name slugifiedName="name-copyright-notice">Copyright Notice</name>
4949
<t indent="0" pn="section-boilerplate.2-1">
50-
Copyright (c) 2024 IETF Trust and the persons identified as the
50+
Copyright (c) 2025 IETF Trust and the persons identified as the
5151
document authors. All rights reserved.
5252
</t>
5353
<t indent="0" pn="section-boilerplate.2-2">

‎tests/valid/indexes.text‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44

55
Network Working Group H. Person, Ed.
6-
Internet-Draft December 4, 2024
6+
Internet-Draft January 10, 2025
77
Intended status: Experimental
8-
Expires: June 7, 2025
8+
Expires: July 14, 2025
99

1010

1111
xml2rfc index tests
@@ -26,11 +26,11 @@ Status of This Memo
2626
time. It is inappropriate to use Internet-Drafts as reference
2727
material or to cite them other than as "work in progress."
2828

29-
This Internet-Draft will expire on June 7, 2025.
29+
This Internet-Draft will expire on July 14, 2025.
3030

3131
Copyright Notice
3232

33-
Copyright (c) 2024 IETF Trust and the persons identified as the
33+
Copyright (c) 2025 IETF Trust and the persons identified as the
3434
document authors. All rights reserved.
3535

3636
This document is subject to BCP 78 and the IETF Trust's Legal

0 commit comments

Comments
 (0)