metanorma-ietf 2.5.0 → 3.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +4 -70
- data/.gitignore +5 -0
- data/lib/isodoc/ietf/references.rb +2 -2
- data/lib/isodoc/ietf/rfc_convert.rb +2 -2
- data/lib/{asciidoctor → metanorma}/ietf/basicdoc.rng +5 -3
- data/lib/{asciidoctor → metanorma}/ietf/biblio.rng +7 -5
- data/lib/{asciidoctor → metanorma}/ietf/blocks.rb +2 -2
- data/lib/{asciidoctor → metanorma}/ietf/cleanup.rb +8 -8
- data/lib/{asciidoctor → metanorma}/ietf/converter.rb +4 -4
- data/lib/{asciidoctor → metanorma}/ietf/front.rb +2 -2
- data/lib/{asciidoctor → metanorma}/ietf/ietf.rng +0 -0
- data/lib/{asciidoctor → metanorma}/ietf/isodoc.rng +171 -20
- data/lib/{asciidoctor → metanorma}/ietf/macros.rb +1 -1
- data/lib/{asciidoctor → metanorma}/ietf/reqt.rng +0 -0
- data/lib/{asciidoctor → metanorma}/ietf/validate.rb +2 -2
- data/lib/metanorma/ietf/version.rb +1 -1
- data/lib/metanorma-ietf.rb +1 -1
- data/metanorma-ietf.gemspec +3 -4
- metadata +17 -37
- data/bin/asciidoctor-rfc2 +0 -14
- data/bin/asciidoctor-rfc2.bat +0 -2
- data/bin/asciidoctor-rfc3 +0 -14
- data/bin/console +0 -14
- data/bin/rspec +0 -17
- data/bin/setup +0 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a30dfa750747253b30b4f126a42af57de34cf3dfa8aadb9fea370479318dbbca
|
4
|
+
data.tar.gz: efc69ed17e66a50bf4ee3dfcabac1142602e1447a41c7b06f5551355ee5860c5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 889ffb5917a97616ff220dda0fb23167e13180f107cfd9adef5c395dbc35079927fdb671a4018e1c920fbecc1f2c35c8b2faca7169a2b1c6106b1d6c47dc81c1
|
7
|
+
data.tar.gz: ce7908251bcc737ca78a1233d7d35d79636bd5a356ec1aa0de262659f93c06a66af7702002c1471e8be873e77f334a830ecbb7d5cad5ae569718b5fdda80d894
|
data/.github/workflows/rake.yml
CHANGED
@@ -8,75 +8,9 @@ on:
|
|
8
8
|
tags: [ v* ]
|
9
9
|
pull_request:
|
10
10
|
|
11
|
+
|
11
12
|
jobs:
|
12
13
|
rake:
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
strategy:
|
17
|
-
fail-fast: false
|
18
|
-
matrix:
|
19
|
-
ruby: [ '3.0', '2.7', '2.6', '2.5' ]
|
20
|
-
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
21
|
-
experimental: [ false ]
|
22
|
-
|
23
|
-
steps:
|
24
|
-
- uses: actions/checkout@master
|
25
|
-
|
26
|
-
- uses: ruby/setup-ruby@v1
|
27
|
-
with:
|
28
|
-
ruby-version: ${{ matrix.ruby }}
|
29
|
-
bundler-cache: true
|
30
|
-
|
31
|
-
- uses: actions/setup-python@v1
|
32
|
-
with:
|
33
|
-
python-version: '3.6'
|
34
|
-
|
35
|
-
- name: set PIP_DOWNLOAD_CACHE
|
36
|
-
shell: python
|
37
|
-
run: |
|
38
|
-
import os
|
39
|
-
import platform
|
40
|
-
from os.path import expanduser
|
41
|
-
|
42
|
-
home = expanduser("~")
|
43
|
-
cache_path = {
|
44
|
-
"Linux": f"{home}/.cache/pip",
|
45
|
-
"Darwin": f"{home}Library/Caches/pip",
|
46
|
-
"Windows": f"{home}\\AppData\\Local\\pip\\Cache"
|
47
|
-
}[platform.system()]
|
48
|
-
|
49
|
-
os.system(f"echo PIP_DOWNLOAD_CACHE={cache_path} >> {os.environ['GITHUB_ENV']}")
|
50
|
-
|
51
|
-
- uses: actions/cache@v2
|
52
|
-
with:
|
53
|
-
path: ${{ env.PIP_DOWNLOAD_CACHE }}
|
54
|
-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
55
|
-
restore-keys: ${{ runner.os }}-pip-
|
56
|
-
|
57
|
-
- uses: actions/cache@v2
|
58
|
-
with:
|
59
|
-
path: ~/.cache/xml2rfc
|
60
|
-
key: xml2rfc
|
61
|
-
restore-keys: xml2rfc
|
62
|
-
|
63
|
-
- if: matrix.os == 'macos-latest'
|
64
|
-
run: brew install libmagic
|
65
|
-
|
66
|
-
- if: matrix.os == 'windows-latest'
|
67
|
-
run: pip install python-magic-bin
|
68
|
-
|
69
|
-
- run: pip install xml2rfc
|
70
|
-
|
71
|
-
- run: bundle exec rake
|
72
|
-
|
73
|
-
tests-passed:
|
74
|
-
needs: rake
|
75
|
-
runs-on: ubuntu-latest
|
76
|
-
steps:
|
77
|
-
- uses: peter-evans/repository-dispatch@v1
|
78
|
-
with:
|
79
|
-
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
80
|
-
repository: ${{ github.repository }}
|
81
|
-
event-type: tests-passed
|
82
|
-
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
14
|
+
uses: metanorma/metanorma-build-scripts/.github/workflows/xml2rfc-rake.yml@main
|
15
|
+
secrets:
|
16
|
+
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
data/.gitignore
CHANGED
@@ -62,12 +62,12 @@ module IsoDoc
|
|
62
62
|
def docidentifier_render(bib, out)
|
63
63
|
docidentifiers = bib.xpath(ns("./docidentifier"))
|
64
64
|
id = render_identifier(bibitem_ref_code(bib))
|
65
|
-
!id[
|
65
|
+
!id[:sdo].nil? && id[:sdo] != "(NO ID)" and out.refcontent id[:sdo]
|
66
66
|
docidentifiers&.each do |u|
|
67
67
|
u["type"] == "DOI" and
|
68
68
|
out.seriesInfo nil, **attr_code(value: u.text.sub(/^DOI /, ""),
|
69
69
|
name: "DOI")
|
70
|
-
u["type"]
|
70
|
+
%w(IETF RFC).include?(u["type"]) and docidentifier_ietf(u, out)
|
71
71
|
end
|
72
72
|
end
|
73
73
|
|
@@ -52,7 +52,7 @@ module IsoDoc::Ietf
|
|
52
52
|
case node.name
|
53
53
|
when "bcp14" then bcp14_parse(node, out)
|
54
54
|
when "concept" then concept_parse(node, out)
|
55
|
-
when "
|
55
|
+
when "verbal-definition", "non-verbal-representation"
|
56
56
|
node.elements.each { |n| parse(n, out) }
|
57
57
|
else
|
58
58
|
text = node.to_xml.gsub(/</, "<").gsub(/>/, ">")
|
@@ -61,7 +61,7 @@ module IsoDoc::Ietf
|
|
61
61
|
end
|
62
62
|
|
63
63
|
def omit_docid_prefix(prefix)
|
64
|
-
return true if prefix
|
64
|
+
return true if %w(IETF RFC).include?(prefix)
|
65
65
|
|
66
66
|
super
|
67
67
|
end
|
@@ -173,9 +173,11 @@
|
|
173
173
|
<data type="dateTime"/>
|
174
174
|
</attribute>
|
175
175
|
</optional>
|
176
|
-
<
|
177
|
-
<
|
178
|
-
|
176
|
+
<optional>
|
177
|
+
<attribute name="from">
|
178
|
+
<data type="IDREF"/>
|
179
|
+
</attribute>
|
180
|
+
</optional>
|
179
181
|
<optional>
|
180
182
|
<attribute name="to">
|
181
183
|
<data type="IDREF"/>
|
@@ -209,9 +209,6 @@
|
|
209
209
|
<zeroOrMore>
|
210
210
|
<ref name="contact"/>
|
211
211
|
</zeroOrMore>
|
212
|
-
<zeroOrMore>
|
213
|
-
<ref name="uri"/>
|
214
|
-
</zeroOrMore>
|
215
212
|
</element>
|
216
213
|
</define>
|
217
214
|
<define name="fullname">
|
@@ -401,9 +398,9 @@
|
|
401
398
|
<choice>
|
402
399
|
<!-- iso191606 TODO -->
|
403
400
|
<group>
|
404
|
-
<
|
401
|
+
<zeroOrMore>
|
405
402
|
<ref name="street"/>
|
406
|
-
</
|
403
|
+
</zeroOrMore>
|
407
404
|
<ref name="city"/>
|
408
405
|
<optional>
|
409
406
|
<ref name="state"/>
|
@@ -828,6 +825,11 @@
|
|
828
825
|
<optional>
|
829
826
|
<attribute name="scope"/>
|
830
827
|
</optional>
|
828
|
+
<optional>
|
829
|
+
<attribute name="primary">
|
830
|
+
<data type="boolean"/>
|
831
|
+
</attribute>
|
832
|
+
</optional>
|
831
833
|
<text/>
|
832
834
|
</element>
|
833
835
|
</define>
|
@@ -1,6 +1,6 @@
|
|
1
|
-
module
|
1
|
+
module Metanorma
|
2
2
|
module Ietf
|
3
|
-
class Converter < ::
|
3
|
+
class Converter < ::Metanorma::Standoc::Converter
|
4
4
|
def para_attrs(node)
|
5
5
|
attr_code( "keep-with-next": node.attr("keepWithNext") ||
|
6
6
|
node.attr("keep-with-next"),
|
@@ -1,6 +1,6 @@
|
|
1
|
-
module
|
1
|
+
module Metanorma
|
2
2
|
module Ietf
|
3
|
-
class Converter < ::
|
3
|
+
class Converter < ::Metanorma::Standoc::Converter
|
4
4
|
def cleanup(xmldoc)
|
5
5
|
bcp14_cleanup(xmldoc)
|
6
6
|
abstract_cleanup(xmldoc)
|
@@ -42,19 +42,19 @@ module Asciidoctor
|
|
42
42
|
end
|
43
43
|
end
|
44
44
|
|
45
|
-
def rfc_anchor_cleanup(
|
46
|
-
map =
|
47
|
-
|
45
|
+
def rfc_anchor_cleanup(xml)
|
46
|
+
map = xml.xpath("//bibitem[docidentifier[@type = 'IETF' or @type = 'RFC']"\
|
47
|
+
"[@scope = 'anchor']]").each_with_object({}) do |b, m|
|
48
48
|
next if b.at("./ancestor::bibdata | ./ancestor::bibitem")
|
49
49
|
|
50
|
-
id = b.at("./docidentifier[@type = '
|
50
|
+
id = b.at("./docidentifier[@type = 'IETF' or @type = 'RFC'][@scope = 'anchor']").text
|
51
51
|
m[b["id"]] = id
|
52
52
|
b["id"] = id
|
53
53
|
end
|
54
|
-
|
54
|
+
xml.xpath("//eref | //origin").each do |x|
|
55
55
|
map[x["bibitemid"]] and x["bibitemid"] = map[x["bibitemid"]]
|
56
56
|
end
|
57
|
-
|
57
|
+
xml
|
58
58
|
end
|
59
59
|
|
60
60
|
def smartquotes_cleanup(xmldoc)
|
@@ -1,5 +1,5 @@
|
|
1
1
|
require "asciidoctor"
|
2
|
-
require "
|
2
|
+
require "metanorma/standoc/converter"
|
3
3
|
require "isodoc/ietf/rfc_convert"
|
4
4
|
require_relative "./front"
|
5
5
|
require_relative "./blocks"
|
@@ -7,11 +7,11 @@ require_relative "./validate"
|
|
7
7
|
require_relative "./cleanup"
|
8
8
|
require_relative "./macros"
|
9
9
|
|
10
|
-
module
|
10
|
+
module Metanorma
|
11
11
|
module Ietf
|
12
|
-
class Converter < ::
|
12
|
+
class Converter < ::Metanorma::Standoc::Converter
|
13
13
|
Asciidoctor::Extensions.register do
|
14
|
-
inline_macro
|
14
|
+
inline_macro Metanorma::Ietf::InlineCrefMacro
|
15
15
|
end
|
16
16
|
|
17
17
|
XML_ROOT_TAG = "ietf-standard".freeze
|
File without changes
|
@@ -32,6 +32,56 @@
|
|
32
32
|
<ref name="DocumentType"/>
|
33
33
|
</element>
|
34
34
|
</define>
|
35
|
+
<define name="index">
|
36
|
+
<element name="index">
|
37
|
+
<optional>
|
38
|
+
<attribute name="to">
|
39
|
+
<data type="IDREF"/>
|
40
|
+
</attribute>
|
41
|
+
</optional>
|
42
|
+
<element name="primary">
|
43
|
+
<oneOrMore>
|
44
|
+
<choice>
|
45
|
+
<ref name="PureTextElement"/>
|
46
|
+
<ref name="stem"/>
|
47
|
+
</choice>
|
48
|
+
</oneOrMore>
|
49
|
+
</element>
|
50
|
+
<optional>
|
51
|
+
<element name="secondary">
|
52
|
+
<oneOrMore>
|
53
|
+
<choice>
|
54
|
+
<ref name="PureTextElement"/>
|
55
|
+
<ref name="stem"/>
|
56
|
+
</choice>
|
57
|
+
</oneOrMore>
|
58
|
+
</element>
|
59
|
+
</optional>
|
60
|
+
<optional>
|
61
|
+
<element name="tertiary">
|
62
|
+
<oneOrMore>
|
63
|
+
<choice>
|
64
|
+
<ref name="PureTextElement"/>
|
65
|
+
<ref name="stem"/>
|
66
|
+
</choice>
|
67
|
+
</oneOrMore>
|
68
|
+
</element>
|
69
|
+
</optional>
|
70
|
+
</element>
|
71
|
+
</define>
|
72
|
+
<define name="bibitem">
|
73
|
+
<element name="bibitem">
|
74
|
+
<attribute name="id">
|
75
|
+
<data type="ID"/>
|
76
|
+
</attribute>
|
77
|
+
<optional>
|
78
|
+
<attribute name="hidden">
|
79
|
+
<data type="boolean"/>
|
80
|
+
</attribute>
|
81
|
+
</optional>
|
82
|
+
<ref name="BibliographicItem"/>
|
83
|
+
</element>
|
84
|
+
</define>
|
35
85
|
<define name="section-title">
|
36
86
|
<element name="title">
|
37
87
|
<zeroOrMore>
|
@@ -58,7 +108,7 @@
|
|
58
108
|
<attribute name="alt"/>
|
59
109
|
</optional>
|
60
110
|
<optional>
|
61
|
-
<attribute name="
|
111
|
+
<attribute name="update-type">
|
62
112
|
<data type="boolean"/>
|
63
113
|
</attribute>
|
64
114
|
</optional>
|
@@ -690,6 +740,7 @@
|
|
690
740
|
<ref name="terms"/>
|
691
741
|
<ref name="term-clause"/>
|
692
742
|
<ref name="definitions"/>
|
743
|
+
<ref name="floating-title"/>
|
693
744
|
</choice>
|
694
745
|
</oneOrMore>
|
695
746
|
</element>
|
@@ -1013,6 +1064,26 @@
|
|
1013
1064
|
</zeroOrMore>
|
1014
1065
|
</element>
|
1015
1066
|
</define>
|
1067
|
+
<define name="sub">
|
1068
|
+
<element name="sub">
|
1069
|
+
<zeroOrMore>
|
1070
|
+
<choice>
|
1071
|
+
<ref name="PureTextElement"/>
|
1072
|
+
<ref name="stem"/>
|
1073
|
+
</choice>
|
1074
|
+
</zeroOrMore>
|
1075
|
+
</element>
|
1076
|
+
</define>
|
1077
|
+
<define name="sup">
|
1078
|
+
<element name="sup">
|
1079
|
+
<zeroOrMore>
|
1080
|
+
<choice>
|
1081
|
+
<ref name="PureTextElement"/>
|
1082
|
+
<ref name="stem"/>
|
1083
|
+
</choice>
|
1084
|
+
</zeroOrMore>
|
1085
|
+
</element>
|
1086
|
+
</define>
|
1016
1087
|
<define name="pagebreak">
|
1017
1088
|
<element name="pagebreak">
|
1018
1089
|
<optional>
|
@@ -1680,6 +1751,7 @@
|
|
1680
1751
|
<ref name="clause-subsection"/>
|
1681
1752
|
<ref name="terms"/>
|
1682
1753
|
<ref name="definitions"/>
|
1754
|
+
<ref name="floating-title"/>
|
1683
1755
|
</choice>
|
1684
1756
|
</oneOrMore>
|
1685
1757
|
</choice>
|
@@ -1722,6 +1794,7 @@
|
|
1722
1794
|
<ref name="terms"/>
|
1723
1795
|
<ref name="definitions"/>
|
1724
1796
|
<ref name="references"/>
|
1797
|
+
<ref name="floating-title"/>
|
1725
1798
|
</choice>
|
1726
1799
|
</zeroOrMore>
|
1727
1800
|
</group>
|
@@ -1796,6 +1869,20 @@
|
|
1796
1869
|
<data type="ID"/>
|
1797
1870
|
</attribute>
|
1798
1871
|
</optional>
|
1872
|
+
<optional>
|
1873
|
+
<attribute name="language"/>
|
1874
|
+
</optional>
|
1875
|
+
<optional>
|
1876
|
+
<attribute name="script"/>
|
1877
|
+
</optional>
|
1878
|
+
<optional>
|
1879
|
+
<attribute name="tag"/>
|
1880
|
+
</optional>
|
1881
|
+
<optional>
|
1882
|
+
<attribute name="multilingual-rendering">
|
1883
|
+
<ref name="MultilingualRenderingType"/>
|
1884
|
+
</attribute>
|
1885
|
+
</optional>
|
1799
1886
|
<oneOrMore>
|
1800
1887
|
<ref name="preferred"/>
|
1801
1888
|
</oneOrMore>
|
@@ -1814,9 +1901,6 @@
|
|
1814
1901
|
<optional>
|
1815
1902
|
<ref name="termsubject"/>
|
1816
1903
|
</optional>
|
1817
|
-
<optional>
|
1818
|
-
<ref name="termusage"/>
|
1819
|
-
</optional>
|
1820
1904
|
<oneOrMore>
|
1821
1905
|
<ref name="termdefinition"/>
|
1822
1906
|
</oneOrMore>
|
@@ -1880,17 +1964,37 @@
|
|
1880
1964
|
</attribute>
|
1881
1965
|
</optional>
|
1882
1966
|
<optional>
|
1883
|
-
<attribute name="
|
1967
|
+
<attribute name="geographic-area"/>
|
1884
1968
|
</optional>
|
1885
1969
|
<choice>
|
1886
1970
|
<ref name="expression_designation"/>
|
1887
1971
|
<ref name="letter_symbol_designation"/>
|
1888
1972
|
<ref name="graphical_symbol_designation"/>
|
1889
1973
|
</choice>
|
1974
|
+
<optional>
|
1975
|
+
<ref name="fieldofapplication"/>
|
1976
|
+
</optional>
|
1977
|
+
<optional>
|
1978
|
+
<ref name="usageinfo"/>
|
1979
|
+
</optional>
|
1890
1980
|
<zeroOrMore>
|
1891
1981
|
<ref name="termsource"/>
|
1892
1982
|
</zeroOrMore>
|
1893
1983
|
</define>
|
1984
|
+
<define name="fieldofapplication">
|
1985
|
+
<element name="field-of-application">
|
1986
|
+
<oneOrMore>
|
1987
|
+
<ref name="PureTextElement"/>
|
1988
|
+
</oneOrMore>
|
1989
|
+
</element>
|
1990
|
+
</define>
|
1991
|
+
<define name="usageinfo">
|
1992
|
+
<element name="usage-info">
|
1993
|
+
<oneOrMore>
|
1994
|
+
<ref name="PureTextElement"/>
|
1995
|
+
</oneOrMore>
|
1996
|
+
</element>
|
1997
|
+
</define>
|
1894
1998
|
<define name="letter_symbol_designation">
|
1895
1999
|
<element name="letter-symbol">
|
1896
2000
|
<optional>
|
@@ -1942,11 +2046,15 @@
|
|
1942
2046
|
</optional>
|
1943
2047
|
<element name="name">
|
1944
2048
|
<zeroOrMore>
|
1945
|
-
<
|
2049
|
+
<choice>
|
2050
|
+
<ref name="PureTextElement"/>
|
2051
|
+
<ref name="stem"/>
|
2052
|
+
<ref name="index"/>
|
2053
|
+
</choice>
|
1946
2054
|
</zeroOrMore>
|
1947
2055
|
</element>
|
1948
2056
|
<optional>
|
1949
|
-
<element name="
|
2057
|
+
<element name="abbreviation-type">
|
1950
2058
|
<ref name="AbbreviationType"/>
|
1951
2059
|
</element>
|
1952
2060
|
</optional>
|
@@ -1956,7 +2064,7 @@
|
|
1956
2064
|
</element>
|
1957
2065
|
</optional>
|
1958
2066
|
<optional>
|
1959
|
-
<element name="
|
2067
|
+
<element name="grammar">
|
1960
2068
|
<ref name="Grammar"/>
|
1961
2069
|
</element>
|
1962
2070
|
</optional>
|
@@ -1983,6 +2091,11 @@
|
|
1983
2091
|
<ref name="GrammarGender"/>
|
1984
2092
|
</element>
|
1985
2093
|
</zeroOrMore>
|
2094
|
+
<zeroOrMore>
|
2095
|
+
<element name="number">
|
2096
|
+
<ref name="GrammarNumber"/>
|
2097
|
+
</element>
|
2098
|
+
</zeroOrMore>
|
1986
2099
|
<optional>
|
1987
2100
|
<element name="isPreposition">
|
1988
2101
|
<data type="boolean"/>
|
@@ -2014,7 +2127,7 @@
|
|
2014
2127
|
</element>
|
2015
2128
|
</optional>
|
2016
2129
|
<zeroOrMore>
|
2017
|
-
<element name="
|
2130
|
+
<element name="grammar-value">
|
2018
2131
|
<text/>
|
2019
2132
|
</element>
|
2020
2133
|
</zeroOrMore>
|
@@ -2027,6 +2140,13 @@
|
|
2027
2140
|
<value>common</value>
|
2028
2141
|
</choice>
|
2029
2142
|
</define>
|
2143
|
+
<define name="GrammarNumber">
|
2144
|
+
<choice>
|
2145
|
+
<value>singular</value>
|
2146
|
+
<value>dual</value>
|
2147
|
+
<value>plural</value>
|
2148
|
+
</choice>
|
2149
|
+
</define>
|
2030
2150
|
<define name="termdomain">
|
2031
2151
|
<element name="domain">
|
2032
2152
|
<oneOrMore>
|
@@ -2041,13 +2161,6 @@
|
|
2041
2161
|
</oneOrMore>
|
2042
2162
|
</element>
|
2043
2163
|
</define>
|
2044
|
-
<define name="termusage">
|
2045
|
-
<element name="usageinfo">
|
2046
|
-
<oneOrMore>
|
2047
|
-
<ref name="BasicBlock"/>
|
2048
|
-
</oneOrMore>
|
2049
|
-
</element>
|
2050
|
-
</define>
|
2051
2164
|
<define name="termdefinition">
|
2052
2165
|
<element name="definition">
|
2053
2166
|
<choice>
|
@@ -2061,9 +2174,17 @@
|
|
2061
2174
|
</element>
|
2062
2175
|
</define>
|
2063
2176
|
<define name="verbaldefinition">
|
2064
|
-
<element name="
|
2177
|
+
<element name="verbal-definition">
|
2065
2178
|
<oneOrMore>
|
2066
|
-
<
|
2179
|
+
<choice>
|
2180
|
+
<ref name="paragraph"/>
|
2181
|
+
<ref name="dl"/>
|
2182
|
+
<ref name="ol"/>
|
2183
|
+
<ref name="ul"/>
|
2184
|
+
<ref name="table"/>
|
2185
|
+
<ref name="figure"/>
|
2186
|
+
<ref name="formula"/>
|
2187
|
+
</choice>
|
2067
2188
|
</oneOrMore>
|
2068
2189
|
<zeroOrMore>
|
2069
2190
|
<ref name="termsource"/>
|
@@ -2071,7 +2192,7 @@
|
|
2071
2192
|
</element>
|
2072
2193
|
</define>
|
2073
2194
|
<define name="nonverbalrep">
|
2074
|
-
<element name="
|
2195
|
+
<element name="non-verbal-representation">
|
2075
2196
|
<oneOrMore>
|
2076
2197
|
<choice>
|
2077
2198
|
<ref name="table"/>
|
@@ -2152,7 +2273,18 @@
|
|
2152
2273
|
<ref name="MultilingualRenderingType"/>
|
2153
2274
|
</attribute>
|
2154
2275
|
</optional>
|
2155
|
-
<
|
2276
|
+
<oneOrMore>
|
2277
|
+
<choice>
|
2278
|
+
<ref name="formula"/>
|
2279
|
+
<ref name="ul"/>
|
2280
|
+
<ref name="ol"/>
|
2281
|
+
<ref name="dl"/>
|
2282
|
+
<ref name="quote"/>
|
2283
|
+
<ref name="sourcecode"/>
|
2284
|
+
<ref name="paragraph"/>
|
2285
|
+
<ref name="figure"/>
|
2286
|
+
</choice>
|
2287
|
+
</oneOrMore>
|
2156
2288
|
</element>
|
2157
2289
|
</define>
|
2158
2290
|
<define name="termsource">
|
@@ -2163,6 +2295,12 @@
|
|
2163
2295
|
<value>modified</value>
|
2164
2296
|
</choice>
|
2165
2297
|
</attribute>
|
2298
|
+
<attribute name="type">
|
2299
|
+
<choice>
|
2300
|
+
<value>authoritative</value>
|
2301
|
+
<value>lineage</value>
|
2302
|
+
</choice>
|
2303
|
+
</attribute>
|
2166
2304
|
<ref name="origin"/>
|
2167
2305
|
<optional>
|
2168
2306
|
<ref name="modification"/>
|
@@ -2480,4 +2618,17 @@
|
|
2480
2618
|
</oneOrMore>
|
2481
2619
|
</element>
|
2482
2620
|
</define>
|
2621
|
+
<define name="floating-title">
|
2622
|
+
<element name="floating-title">
|
2623
|
+
<attribute name="id">
|
2624
|
+
<data type="ID"/>
|
2625
|
+
</attribute>
|
2626
|
+
<attribute name="depth">
|
2627
|
+
<data type="int"/>
|
2628
|
+
</attribute>
|
2629
|
+
<zeroOrMore>
|
2630
|
+
<ref name="TextElement"/>
|
2631
|
+
</zeroOrMore>
|
2632
|
+
</element>
|
2633
|
+
</define>
|
2483
2634
|
</grammar>
|
File without changes
|
data/lib/metanorma-ietf.rb
CHANGED
@@ -2,7 +2,7 @@ require "asciidoctor" unless defined? Asciidoctor::Converter
|
|
2
2
|
require "metanorma"
|
3
3
|
|
4
4
|
require_relative "metanorma/ietf"
|
5
|
-
require_relative "
|
5
|
+
require_relative "metanorma/ietf/converter"
|
6
6
|
require_relative "isodoc/ietf/rfc_convert"
|
7
7
|
|
8
8
|
Metanorma::Registry.instance.register(Metanorma::Ietf::Processor)
|
data/metanorma-ietf.gemspec
CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
|
|
28
28
|
spec.license = "BSD-2-Clause"
|
29
29
|
|
30
30
|
spec.files = `git ls-files -z`.split("\x0").reject do |f|
|
31
|
-
f.match(%r{^(test|spec|features)/})
|
31
|
+
f.match(%r{^(bin|test|spec|features)/})
|
32
32
|
end
|
33
33
|
spec.bindir = "exe"
|
34
34
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
@@ -37,10 +37,9 @@ Gem::Specification.new do |spec|
|
|
37
37
|
|
38
38
|
spec.add_dependency "mathml2asciimath"
|
39
39
|
spec.add_dependency "metanorma-ietf-data"
|
40
|
-
spec.add_dependency "metanorma-standoc", "~>
|
41
|
-
spec.add_dependency "open-uri"
|
40
|
+
spec.add_dependency "metanorma-standoc", "~> 2.0.0"
|
42
41
|
|
43
|
-
spec.add_development_dependency "
|
42
|
+
spec.add_development_dependency "debug"
|
44
43
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
45
44
|
spec.add_development_dependency "guard", "~> 2.14"
|
46
45
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-ietf
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 3.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-02-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mathml2asciimath
|
@@ -44,30 +44,16 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version:
|
47
|
+
version: 2.0.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version:
|
54
|
+
version: 2.0.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - ">="
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: '0'
|
62
|
-
type: :runtime
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - ">="
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: '0'
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: byebug
|
56
|
+
name: debug
|
71
57
|
requirement: !ruby/object:Gem::Requirement
|
72
58
|
requirements:
|
73
59
|
- - ">="
|
@@ -249,26 +235,9 @@ files:
|
|
249
235
|
- LICENSE
|
250
236
|
- README.adoc
|
251
237
|
- Rakefile
|
252
|
-
- bin/asciidoctor-rfc2
|
253
|
-
- bin/asciidoctor-rfc2.bat
|
254
|
-
- bin/asciidoctor-rfc3
|
255
|
-
- bin/console
|
256
|
-
- bin/rspec
|
257
|
-
- bin/setup
|
258
238
|
- docs/installation.md
|
259
239
|
- docs/navigation.md
|
260
240
|
- docs/overview.md
|
261
|
-
- lib/asciidoctor/ietf/basicdoc.rng
|
262
|
-
- lib/asciidoctor/ietf/biblio.rng
|
263
|
-
- lib/asciidoctor/ietf/blocks.rb
|
264
|
-
- lib/asciidoctor/ietf/cleanup.rb
|
265
|
-
- lib/asciidoctor/ietf/converter.rb
|
266
|
-
- lib/asciidoctor/ietf/front.rb
|
267
|
-
- lib/asciidoctor/ietf/ietf.rng
|
268
|
-
- lib/asciidoctor/ietf/isodoc.rng
|
269
|
-
- lib/asciidoctor/ietf/macros.rb
|
270
|
-
- lib/asciidoctor/ietf/reqt.rng
|
271
|
-
- lib/asciidoctor/ietf/validate.rb
|
272
241
|
- lib/isodoc/ietf/SVG-1.2-RFC.rng
|
273
242
|
- lib/isodoc/ietf/blocks.rb
|
274
243
|
- lib/isodoc/ietf/cleanup.rb
|
@@ -291,7 +260,18 @@ files:
|
|
291
260
|
- lib/isodoc/ietf/xref.rb
|
292
261
|
- lib/metanorma-ietf.rb
|
293
262
|
- lib/metanorma/ietf.rb
|
263
|
+
- lib/metanorma/ietf/basicdoc.rng
|
264
|
+
- lib/metanorma/ietf/biblio.rng
|
265
|
+
- lib/metanorma/ietf/blocks.rb
|
266
|
+
- lib/metanorma/ietf/cleanup.rb
|
267
|
+
- lib/metanorma/ietf/converter.rb
|
268
|
+
- lib/metanorma/ietf/front.rb
|
269
|
+
- lib/metanorma/ietf/ietf.rng
|
270
|
+
- lib/metanorma/ietf/isodoc.rng
|
271
|
+
- lib/metanorma/ietf/macros.rb
|
294
272
|
- lib/metanorma/ietf/processor.rb
|
273
|
+
- lib/metanorma/ietf/reqt.rng
|
274
|
+
- lib/metanorma/ietf/validate.rb
|
295
275
|
- lib/metanorma/ietf/version.rb
|
296
276
|
- metanorma-ietf.gemspec
|
297
277
|
- rfc2629-other.ent
|
@@ -316,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
316
296
|
- !ruby/object:Gem::Version
|
317
297
|
version: '0'
|
318
298
|
requirements: []
|
319
|
-
rubygems_version: 3.2.
|
299
|
+
rubygems_version: 3.2.32
|
320
300
|
signing_key:
|
321
301
|
specification_version: 4
|
322
302
|
summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
|
data/bin/asciidoctor-rfc2
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require "metanorma-ietf"
|
4
|
-
require "asciidoctor/cli"
|
5
|
-
|
6
|
-
options = Asciidoctor::Cli::Options.new backend: "rfc2", header_footer: true
|
7
|
-
# FIXME This is a really bizarre API. Please make me simpler.
|
8
|
-
|
9
|
-
exit 0 if options.parse!(ARGV) == 0
|
10
|
-
|
11
|
-
invoker = Asciidoctor::Cli::Invoker.new options
|
12
|
-
GC.start
|
13
|
-
invoker.invoke!
|
14
|
-
exit invoker.code
|
data/bin/asciidoctor-rfc2.bat
DELETED
data/bin/asciidoctor-rfc3
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require "metanorma-ietf"
|
4
|
-
require "asciidoctor/cli"
|
5
|
-
|
6
|
-
options = Asciidoctor::Cli::Options.new backend: "rfc3", header_footer: true
|
7
|
-
# FIXME This is a really bizarre API. Please make me simpler.
|
8
|
-
|
9
|
-
exit 0 if options.parse!(ARGV) == 0
|
10
|
-
|
11
|
-
invoker = Asciidoctor::Cli::Invoker.new options
|
12
|
-
GC.start
|
13
|
-
invoker.invoke!
|
14
|
-
exit invoker.code
|
data/bin/console
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require "bundler/setup"
|
4
|
-
require "metanorma-ietf"
|
5
|
-
|
6
|
-
# You can add fixtures and/or initialization code here to make experimenting
|
7
|
-
# with your gem easier. You can also use a different console, if you like.
|
8
|
-
|
9
|
-
# (If you use this, don't forget to add pry to your Gemfile!)
|
10
|
-
# require "pry"
|
11
|
-
# Pry.start
|
12
|
-
|
13
|
-
require "irb"
|
14
|
-
IRB.start(__FILE__)
|
data/bin/rspec
DELETED
@@ -1,17 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
# This file was generated by Bundler.
|
4
|
-
#
|
5
|
-
# The application 'rspec' is installed as part of a gem, and
|
6
|
-
# this file is here to facilitate running it.
|
7
|
-
#
|
8
|
-
|
9
|
-
require "pathname"
|
10
|
-
ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
|
11
|
-
"../../Gemfile", Pathname.new(__FILE__).realpath
|
12
|
-
)
|
13
|
-
|
14
|
-
require "rubygems"
|
15
|
-
require "bundler/setup"
|
16
|
-
|
17
|
-
load Gem.bin_path("rspec-core", "rspec")
|