diff --git a/Makefile b/Makefile index 1dabbd52b..bc7000108 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,11 @@ tests/out/%.txt tests/out/%.raw.txt tests/out/%.nroff tests/out/%.html tests/out @echo -e "\n Processing $<" @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --base tests/out/ --text --html --strict $<" +tests/out/%.compact_index.text tests/out/%.compact_index.html : tests/input/%.xml install + @echo -e "\n Generating with a compact index $<" + @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --base tests/out/ --$(subst .,,$(suffix $@)) --strict --compact-index --no-pagination $< --out $@" + + tests/out/%.v2v3.xml: tests/input/%.xml install @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --v2v3 --strict --legacy-date-format $< --out $@" @doc=$(basename $@); printf ' '; xmllint --noout --xinclude --relaxng xml2rfc/data/v3.rng $$doc.xml @@ -227,12 +232,12 @@ rfcregressiontest: cleantmp install drafttest: cleantmp env/bin/python install $(drafttests) dateshifttest # rfctest: cleantmp env/bin/python install $(rfctests) -# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc6787.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" -# doc=rfc6787 ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) -# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc7754.edited.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" -# doc=rfc7754.edited ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) -# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc7911.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" -# doc=rfc7911 ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) +# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc6787.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" +# doc=rfc6787 ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) +# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc7754.edited.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" +# doc=rfc7754.edited ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) +# @PS4=" " /bin/bash -cx "xml2rfc --skip-config --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --utf8tests/input/rfc7911.xml --base tmp/ --raw --legacy --text --nroff --html --exp --v2v3 --prep" +# doc=rfc7911 ; postnrofffix="cat" ; type=ascii; $(CHECKOUTPUT) unicodetest: cleantmp env/bin/python install @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --base tmp/ --raw --legacy --text --nroff --html --no-inline-version --exp --v2v3 --prep tests/input/unicode.xml " @@ -246,11 +251,11 @@ v3featuretest: tests/out/draft-v3-features.prepped.xml.test tests/out/draft-v3-f dateshifttest: cleantmp install @PS4=" " /bin/bash -cx "xml2rfc --skip-config --allow-local-file-access --cache \"$${IETF_TEST_CACHE_PATH}\" --no-network --date 2013-02-01 --legacy --out tmp/draft-miek-test.dateshift.txt --text tests/input/draft-miek-test.xml" - @diff -u -I '$(datetime_regex)' -I '$(version_regex)' -I '$(date_regex)' tests/valid/draft-miek-test.dateshift.txt tmp/draft-miek-test.dateshift.txt || { echo "Diff failed for draft-miek-test.dateshift.txt output"; exit 1; } + @diff -u -I '$(datetime_regex)' -I '$(version_regex)' -I '$(date_regex)' tests/valid/draft-miek-test.dateshift.txt tmp/draft-miek-test.dateshift.txt || { echo "Diff failed for draft-miek-test.dateshift.txt output"; exit 1; } elementstest: install tests/out/elements.prepped.xml.test tests/out/elements.text.test tests/out/elements.pages.text.test tests/out/elements.v3.html.test -indextest: install tests/out/indexes.prepped.xml.test tests/out/indexes.text.test tests/out/indexes.pages.text.test tests/out/indexes.v3.html.test +indextest: install tests/out/indexes.prepped.xml.test tests/out/indexes.text.test tests/out/indexes.pages.text.test tests/out/indexes.v3.html.test tests/out/indexes.compact_index.text.test sourcecodetest: install tests/out/sourcecode.prepped.xml.test tests/out/sourcecode.text.test tests/out/sourcecode.pages.text.test tests/out/sourcecode.v3.html.test diff --git a/tests/valid/docfile.html b/tests/valid/docfile.html index a0c1481b4..b0741aa64 100644 --- a/tests/valid/docfile.html +++ b/tests/valid/docfile.html @@ -4,15 +4,15 @@ -Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.13.1 +Xml2rfc Vocabulary Version 3 Schema xml2rfc release 3.14.0 - - + + @@ -45,7 +45,7 @@ -

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.13.1

+

Xml2rfc Vocabulary Version 3 Schema
xml2rfc release 3.14.0

Abstract

@@ -367,7 +367,7 @@

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.13.1.

+ This documentation applies to xml2rfc version 3.14.0.

@@ -5709,86 +5709,95 @@

-
---debug
+
+--compact-index

- Show debugging output.

+ Generate a compact index.

-
---no-network, -N
+
+--debug

- Don't use the network to resolve references.

+ Show debugging output.

-
---no-org-info, -O
+
+--no-network, -N

- Don't show author orgainzation info on page one (legacy only).

+ Don't use the network to resolve references.

-
---quiet, -q
+
+--no-org-info, -O

- Don't print anything while working.

+ Don't show author orgainzation info on page one (legacy only).

-
---skip-config-files
+
+--quiet, -q

- Ignore config file settings.

-

- Use this to ignore values in config files, even if there are config files in the search path. Somewhat ironically, this option can itself be set in a config file, and cause all other config file settings to be ignored.

+ Don't print anything while working.

-
---allow-local-file-access
+
+--skip-config-files

- Allow local file system references.

+ Ignore config file settings.

+

+ Use this to ignore values in config files, even if there are config files in the search path. Somewhat ironically, this option can itself be set in a config file, and cause all other config file settings to be ignored.

-
---remove-pis, -r
+
+--allow-local-file-access

- Remove XML processing instructions.

+ Allow local file system references.

-
---utf8, -u
+
+--remove-pis, -r

- Generate utf8 output.

+ Remove XML processing instructions.

-
---verbose, -v
+
+--utf8, -u

- Print extra information.

+ Generate utf8 output.

+
+
+
+
+--verbose, -v
+
+
+

+ Print extra information.

@@ -6351,7 +6360,7 @@

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

+ manpage Jinja2 template, as of xml2rfc version 3.14.0:

{{ bare_latin_tags }}:
diff --git a/tests/valid/draft-miek-test.html b/tests/valid/draft-miek-test.html index 1e05ee171..49492bc36 100644 --- a/tests/valid/draft-miek-test.html +++ b/tests/valid/draft-miek-test.html @@ -16,7 +16,7 @@ This version is adapted to work with "xml2rfc" version 2.x. ' name="description"> - + @@ -26,8 +26,8 @@ diff --git a/tests/valid/draft-template.html b/tests/valid/draft-template.html index 98ab0f509..9fe80af7d 100644 --- a/tests/valid/draft-template.html +++ b/tests/valid/draft-template.html @@ -11,12 +11,12 @@ Insert an abstract: MANDATORY. This template is for creating an Internet Draft. " name="description"> - + diff --git a/tests/valid/indexes.compact_index.text b/tests/valid/indexes.compact_index.text new file mode 100644 index 000000000..e6296350b --- /dev/null +++ b/tests/valid/indexes.compact_index.text @@ -0,0 +1,139 @@ + + + + +Network Working Group H. Person, Ed. +Internet-Draft 17 August 2022 +Intended status: Experimental +Expires: 18 February 2023 + + + xml2rfc index tests + indexes-00 + +Status of This Memo + + This Internet-Draft is submitted in full conformance with the + provisions of BCP 78 and BCP 79. + + Internet-Drafts are working documents of the Internet Engineering + Task Force (IETF). Note that other groups may also distribute + working documents as Internet-Drafts. The list of current Internet- + Drafts is at https://datatracker.ietf.org/drafts/current/. + + Internet-Drafts are draft documents valid for a maximum of six months + and may be updated, replaced, or obsoleted by other documents at any + 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 18 February 2023. + +Copyright Notice + + Copyright (c) 2022 IETF Trust and the persons identified as the + document authors. All rights reserved. + + This document is subject to BCP 78 and the IETF Trust's Legal + Provisions Relating to IETF Documents (https://trustee.ietf.org/ + license-info) in effect on the date of publication of this document. + Please review these documents carefully, as they describe your rights + and restrictions with respect to this document. + +Table of Contents + + 1. First Section + 2. References + Index + Author's Address + +1. First Section + + This is a section! _Emphatically._ *Loudly.* _(Subscripted.) + ^(Superscripted.) Typewritten. + + This is another section! + + TASK + + dt dd + + * unnumbered item + + 1. numbered item + + | This is an aside. + + | This is a blockquote. + + +===============+ + |Table heading | + +===============+ + | printf("Hello world!\n");| + +---------------+ + + Table 1 + +2. References + + [ref0] Author, R. Q., "Reference". This is a reference not in a + reference group. + + [refgroup0] + Author, R. Q., "Reference Group". This is a reference in + a reference group. + +Index + + A B D E F L S T + + A + + annotation Reference [ref0] + in reference group Reference [refgroup0] + + B + + blockquote §1 + + D + + dd §1 + dt §1 + + E + + em §1 ⁋1 + + F + + figure §1 ⁋9.1.2.1.1 + + L + + li + ol *_§1 ⁋6 #1_* + ul §1 ⁋5 •1 + + S + + section §1 + strong *_§1 ⁋1_* + sub §1 ⁋1 + sup §1 ⁋1 + + T + + t §1 ⁋1, §1 ⁋2 + in an aside tag §1 ⁋7.1 + table §1 + TASK §1 ⁋3 + td §1 ⁋9.1.2.1.1 + th §1 + tt §1 ⁋1 + +Author's Address + + Human Person (editor) + line 1 + line 2 + line 3 diff --git a/tests/valid/indexes.pages.text b/tests/valid/indexes.pages.text index a6e6aa32f..c1db2ca02 100644 --- a/tests/valid/indexes.pages.text +++ b/tests/valid/indexes.pages.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft August 9, 2022 +Internet-Draft August 17, 2022 Intended status: Experimental -Expires: February 10, 2023 +Expires: February 18, 2023 xml2rfc index tests @@ -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 February 10, 2023. + This Internet-Draft will expire on February 18, 2023. Copyright Notice @@ -53,7 +53,7 @@ Table of Contents -Person Expires February 10, 2023 [Page 1] +Person Expires February 18, 2023 [Page 1] Internet-Draft xml2rfc index tests August 2022 @@ -109,7 +109,7 @@ Index -Person Expires February 10, 2023 [Page 2] +Person Expires February 18, 2023 [Page 2] Internet-Draft xml2rfc index tests August 2022 @@ -165,4 +165,4 @@ Author's Address -Person Expires February 10, 2023 [Page 3] +Person Expires February 18, 2023 [Page 3] diff --git a/tests/valid/indexes.prepped.xml b/tests/valid/indexes.prepped.xml index 1bb3839a9..75cc9383d 100644 --- a/tests/valid/indexes.prepped.xml +++ b/tests/valid/indexes.prepped.xml @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@ - +
Status of This Memo @@ -41,7 +41,7 @@ material or to cite them other than as "work in progress." - This Internet-Draft will expire on 10 February 2023. + This Internet-Draft will expire on 18 February 2023.
diff --git a/tests/valid/indexes.text b/tests/valid/indexes.text index 75e4440ec..e562eb62f 100644 --- a/tests/valid/indexes.text +++ b/tests/valid/indexes.text @@ -3,9 +3,9 @@ Network Working Group H. Person, Ed. -Internet-Draft August 9, 2022 +Internet-Draft August 17, 2022 Intended status: Experimental -Expires: February 10, 2023 +Expires: February 18, 2023 xml2rfc index tests @@ -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 February 10, 2023. + This Internet-Draft will expire on February 18, 2023. Copyright Notice diff --git a/tests/valid/indexes.v3.html b/tests/valid/indexes.v3.html index 927e2e045..fe30da994 100644 --- a/tests/valid/indexes.v3.html +++ b/tests/valid/indexes.v3.html @@ -6,7 +6,7 @@ xml2rfc index tests - + @@ -23,7 +23,7 @@ Person -Expires February 10, 2023 +Expires February 18, 2023 [Page] @@ -36,12 +36,12 @@
indexes-00
Published:
- +
Intended Status:
Experimental
Expires:
-
+
Author:
@@ -71,7 +71,7 @@

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 February 10, 2023.

+ This Internet-Draft will expire on February 18, 2023.