metanorma-ietf 3.0.5 → 3.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ietf/blocks.rb +9 -0
- data/lib/isodoc/ietf/i18n.rb +1 -1
- data/lib/isodoc/ietf/init.rb +1 -1
- data/lib/isodoc/ietf/references.rb +0 -13
- data/lib/metanorma/ietf/biblio.rng +171 -47
- data/lib/metanorma/ietf/blocks.rb +16 -14
- data/lib/metanorma/ietf/cleanup.rb +0 -16
- data/lib/metanorma/ietf/converter.rb +1 -1
- data/lib/metanorma/ietf/isodoc.rng +72 -0
- data/lib/metanorma/ietf/version.rb +1 -1
- data/metanorma-ietf.gemspec +1 -1
- metadata +5 -8
- data/docs/installation.md +0 -21
- data/docs/navigation.md +0 -7
- data/docs/overview.md +0 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 71679f9a6d5e530d891b8c56b4353846fd3be9fff356e2aeb9efee7ab21b5b68
|
|
4
|
+
data.tar.gz: 801f308896032b32cc194292ab0c44b9b624ce616e1155b5957bc83fa9bbb217
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c406406aa3a034082595dcea77a43ddf55e55a7463033180216d3820b31449182af81e9c1dede1cc99ee944c27ad33359a7feb0df9170793e186af157cbaa640
|
|
7
|
+
data.tar.gz: 2439758d94f9966ced0e48a5970ec68e6083afc9f308832cc2529d86b555d84595f86b64569a233ebe8b3487ca98f59bfa0b76842b538b6dfafc1cebeaab12c9
|
data/lib/isodoc/ietf/blocks.rb
CHANGED
|
@@ -179,6 +179,15 @@ module IsoDoc
|
|
|
179
179
|
end
|
|
180
180
|
end
|
|
181
181
|
|
|
182
|
+
def admonition_name(node, type)
|
|
183
|
+
name = node&.at(ns("./name")) and return name
|
|
184
|
+
name = Nokogiri::XML::Node.new("name", node.document)
|
|
185
|
+
return unless type && @i18n.admonition[type]
|
|
186
|
+
|
|
187
|
+
name << @i18n.admonition[type]&.upcase
|
|
188
|
+
name
|
|
189
|
+
end
|
|
190
|
+
|
|
182
191
|
def admonition_name_parse(_node, div, name)
|
|
183
192
|
div.t **{ keepWithNext: "true" } do |p|
|
|
184
193
|
name.children.each { |n| parse(n, p) }
|
data/lib/isodoc/ietf/i18n.rb
CHANGED
data/lib/isodoc/ietf/init.rb
CHANGED
|
@@ -38,7 +38,6 @@ module IsoDoc
|
|
|
38
38
|
|
|
39
39
|
i += 1 if b.name == "bibitem"
|
|
40
40
|
if b.name == "note" then note_parse(b, div)
|
|
41
|
-
elsif ietf?(b) then ietf_bibitem_entry(div, b, i)
|
|
42
41
|
else
|
|
43
42
|
nonstd_bibitem(div, b, i, biblio)
|
|
44
43
|
end
|
|
@@ -171,18 +170,6 @@ module IsoDoc
|
|
|
171
170
|
end
|
|
172
171
|
end
|
|
173
172
|
end
|
|
174
|
-
|
|
175
|
-
def ietf_bibitem_entry(div, bib, _idx)
|
|
176
|
-
url = bib&.at(ns("./uri[@type = 'xml']"))&.text
|
|
177
|
-
div << "<xi:include href='#{url}'/>"
|
|
178
|
-
end
|
|
179
|
-
|
|
180
|
-
def ietf?(bib)
|
|
181
|
-
return false if !@xinclude
|
|
182
|
-
|
|
183
|
-
url = bib.at(ns("./uri[@type = 'xml']")) or return false
|
|
184
|
-
/xml2rfc\.tools\.ietf\.org/.match(url)
|
|
185
|
-
end
|
|
186
173
|
end
|
|
187
174
|
end
|
|
188
175
|
end
|
|
@@ -614,12 +614,103 @@
|
|
|
614
614
|
<optional>
|
|
615
615
|
<ref name="fetched"/>
|
|
616
616
|
</optional>
|
|
617
|
-
<
|
|
618
|
-
<oneOrMore>
|
|
619
|
-
<ref name="btitle"/>
|
|
620
|
-
</oneOrMore>
|
|
617
|
+
<optional>
|
|
621
618
|
<ref name="formattedref"/>
|
|
622
|
-
</
|
|
619
|
+
</optional>
|
|
620
|
+
<oneOrMore>
|
|
621
|
+
<ref name="btitle"/>
|
|
622
|
+
</oneOrMore>
|
|
623
|
+
<zeroOrMore>
|
|
624
|
+
<ref name="bsource"/>
|
|
625
|
+
</zeroOrMore>
|
|
626
|
+
<oneOrMore>
|
|
627
|
+
<ref name="docidentifier"/>
|
|
628
|
+
</oneOrMore>
|
|
629
|
+
<optional>
|
|
630
|
+
<ref name="docnumber"/>
|
|
631
|
+
</optional>
|
|
632
|
+
<zeroOrMore>
|
|
633
|
+
<ref name="bdate"/>
|
|
634
|
+
</zeroOrMore>
|
|
635
|
+
<zeroOrMore>
|
|
636
|
+
<ref name="contributor"/>
|
|
637
|
+
</zeroOrMore>
|
|
638
|
+
<optional>
|
|
639
|
+
<ref name="edition"/>
|
|
640
|
+
</optional>
|
|
641
|
+
<zeroOrMore>
|
|
642
|
+
<ref name="version"/>
|
|
643
|
+
</zeroOrMore>
|
|
644
|
+
<zeroOrMore>
|
|
645
|
+
<ref name="biblionote"/>
|
|
646
|
+
</zeroOrMore>
|
|
647
|
+
<zeroOrMore>
|
|
648
|
+
<ref name="language"/>
|
|
649
|
+
</zeroOrMore>
|
|
650
|
+
<zeroOrMore>
|
|
651
|
+
<ref name="script"/>
|
|
652
|
+
</zeroOrMore>
|
|
653
|
+
<zeroOrMore>
|
|
654
|
+
<ref name="bibabstract"/>
|
|
655
|
+
</zeroOrMore>
|
|
656
|
+
<optional>
|
|
657
|
+
<ref name="status"/>
|
|
658
|
+
</optional>
|
|
659
|
+
<zeroOrMore>
|
|
660
|
+
<ref name="copyright"/>
|
|
661
|
+
</zeroOrMore>
|
|
662
|
+
<zeroOrMore>
|
|
663
|
+
<ref name="docrelation"/>
|
|
664
|
+
</zeroOrMore>
|
|
665
|
+
<zeroOrMore>
|
|
666
|
+
<ref name="series"/>
|
|
667
|
+
</zeroOrMore>
|
|
668
|
+
<optional>
|
|
669
|
+
<ref name="medium"/>
|
|
670
|
+
</optional>
|
|
671
|
+
<zeroOrMore>
|
|
672
|
+
<ref name="bplace"/>
|
|
673
|
+
</zeroOrMore>
|
|
674
|
+
<zeroOrMore>
|
|
675
|
+
<ref name="bprice"/>
|
|
676
|
+
</zeroOrMore>
|
|
677
|
+
<zeroOrMore>
|
|
678
|
+
<ref name="extent"/>
|
|
679
|
+
</zeroOrMore>
|
|
680
|
+
<optional>
|
|
681
|
+
<ref name="bibliographic_size"/>
|
|
682
|
+
</optional>
|
|
683
|
+
<zeroOrMore>
|
|
684
|
+
<ref name="accesslocation"/>
|
|
685
|
+
</zeroOrMore>
|
|
686
|
+
<zeroOrMore>
|
|
687
|
+
<ref name="license"/>
|
|
688
|
+
</zeroOrMore>
|
|
689
|
+
<zeroOrMore>
|
|
690
|
+
<ref name="bclassification"/>
|
|
691
|
+
</zeroOrMore>
|
|
692
|
+
<zeroOrMore>
|
|
693
|
+
<ref name="bkeyword"/>
|
|
694
|
+
</zeroOrMore>
|
|
695
|
+
<optional>
|
|
696
|
+
<ref name="validity"/>
|
|
697
|
+
</optional>
|
|
698
|
+
</define>
|
|
699
|
+
<define name="ReducedBibliographicItem">
|
|
700
|
+
<optional>
|
|
701
|
+
<attribute name="type">
|
|
702
|
+
<ref name="BibItemType"/>
|
|
703
|
+
</attribute>
|
|
704
|
+
</optional>
|
|
705
|
+
<optional>
|
|
706
|
+
<ref name="fetched"/>
|
|
707
|
+
</optional>
|
|
708
|
+
<optional>
|
|
709
|
+
<ref name="formattedref"/>
|
|
710
|
+
</optional>
|
|
711
|
+
<zeroOrMore>
|
|
712
|
+
<ref name="btitle"/>
|
|
713
|
+
</zeroOrMore>
|
|
623
714
|
<zeroOrMore>
|
|
624
715
|
<ref name="bsource"/>
|
|
625
716
|
</zeroOrMore>
|
|
@@ -638,9 +729,9 @@
|
|
|
638
729
|
<optional>
|
|
639
730
|
<ref name="edition"/>
|
|
640
731
|
</optional>
|
|
641
|
-
<
|
|
732
|
+
<zeroOrMore>
|
|
642
733
|
<ref name="version"/>
|
|
643
|
-
</
|
|
734
|
+
</zeroOrMore>
|
|
644
735
|
<zeroOrMore>
|
|
645
736
|
<ref name="biblionote"/>
|
|
646
737
|
</zeroOrMore>
|
|
@@ -833,6 +924,12 @@
|
|
|
833
924
|
<data type="boolean"/>
|
|
834
925
|
</attribute>
|
|
835
926
|
</optional>
|
|
927
|
+
<optional>
|
|
928
|
+
<attribute name="language"/>
|
|
929
|
+
</optional>
|
|
930
|
+
<optional>
|
|
931
|
+
<attribute name="script"/>
|
|
932
|
+
</optional>
|
|
836
933
|
<text/>
|
|
837
934
|
</element>
|
|
838
935
|
</define>
|
|
@@ -851,17 +948,46 @@
|
|
|
851
948
|
</define>
|
|
852
949
|
<define name="bplace">
|
|
853
950
|
<element name="place">
|
|
854
|
-
<
|
|
855
|
-
<
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
951
|
+
<choice>
|
|
952
|
+
<text/>
|
|
953
|
+
<group>
|
|
954
|
+
<ref name="bibliocity"/>
|
|
955
|
+
<zeroOrMore>
|
|
956
|
+
<ref name="biblioregion"/>
|
|
957
|
+
</zeroOrMore>
|
|
958
|
+
<zeroOrMore>
|
|
959
|
+
<ref name="bibliocountry"/>
|
|
960
|
+
</zeroOrMore>
|
|
961
|
+
</group>
|
|
962
|
+
</choice>
|
|
963
|
+
</element>
|
|
964
|
+
</define>
|
|
965
|
+
<define name="bibliocity">
|
|
966
|
+
<element name="city">
|
|
862
967
|
<text/>
|
|
863
968
|
</element>
|
|
864
969
|
</define>
|
|
970
|
+
<define name="biblioregion">
|
|
971
|
+
<element name="region">
|
|
972
|
+
<ref name="RegionType"/>
|
|
973
|
+
</element>
|
|
974
|
+
</define>
|
|
975
|
+
<define name="bibliocountry">
|
|
976
|
+
<element name="country">
|
|
977
|
+
<ref name="RegionType"/>
|
|
978
|
+
</element>
|
|
979
|
+
</define>
|
|
980
|
+
<define name="RegionType">
|
|
981
|
+
<optional>
|
|
982
|
+
<attribute name="iso"/>
|
|
983
|
+
</optional>
|
|
984
|
+
<optional>
|
|
985
|
+
<attribute name="recommended">
|
|
986
|
+
<data type="boolean"/>
|
|
987
|
+
</attribute>
|
|
988
|
+
</optional>
|
|
989
|
+
<text/>
|
|
990
|
+
</define>
|
|
865
991
|
<define name="bprice">
|
|
866
992
|
<element name="price">
|
|
867
993
|
<attribute name="currency"/>
|
|
@@ -957,36 +1083,34 @@
|
|
|
957
1083
|
<ref name="SeriesType"/>
|
|
958
1084
|
</attribute>
|
|
959
1085
|
</optional>
|
|
960
|
-
<
|
|
1086
|
+
<optional>
|
|
961
1087
|
<ref name="formattedref"/>
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
</group>
|
|
989
|
-
</choice>
|
|
1088
|
+
</optional>
|
|
1089
|
+
<ref name="btitle"/>
|
|
1090
|
+
<optional>
|
|
1091
|
+
<ref name="bplace"/>
|
|
1092
|
+
</optional>
|
|
1093
|
+
<optional>
|
|
1094
|
+
<ref name="seriesorganization"/>
|
|
1095
|
+
</optional>
|
|
1096
|
+
<optional>
|
|
1097
|
+
<ref name="abbreviation"/>
|
|
1098
|
+
</optional>
|
|
1099
|
+
<optional>
|
|
1100
|
+
<ref name="seriesfrom"/>
|
|
1101
|
+
</optional>
|
|
1102
|
+
<optional>
|
|
1103
|
+
<ref name="seriesto"/>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<ref name="seriesnumber"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<optional>
|
|
1109
|
+
<ref name="seriespartnumber"/>
|
|
1110
|
+
</optional>
|
|
1111
|
+
<optional>
|
|
1112
|
+
<ref name="seriesrun"/>
|
|
1113
|
+
</optional>
|
|
990
1114
|
</element>
|
|
991
1115
|
</define>
|
|
992
1116
|
<define name="SeriesType">
|
|
@@ -1145,7 +1269,7 @@
|
|
|
1145
1269
|
</element>
|
|
1146
1270
|
</optional>
|
|
1147
1271
|
<element name="bibitem">
|
|
1148
|
-
<ref name="
|
|
1272
|
+
<ref name="ReducedBibliographicItem"/>
|
|
1149
1273
|
</element>
|
|
1150
1274
|
<choice>
|
|
1151
1275
|
<zeroOrMore>
|
|
@@ -1170,9 +1294,9 @@
|
|
|
1170
1294
|
<optional>
|
|
1171
1295
|
<ref name="revision-date"/>
|
|
1172
1296
|
</optional>
|
|
1173
|
-
<
|
|
1297
|
+
<optional>
|
|
1174
1298
|
<ref name="draft"/>
|
|
1175
|
-
</
|
|
1299
|
+
</optional>
|
|
1176
1300
|
</element>
|
|
1177
1301
|
</define>
|
|
1178
1302
|
<define name="vedition">
|
|
@@ -2,10 +2,10 @@ module Metanorma
|
|
|
2
2
|
module Ietf
|
|
3
3
|
class Converter < ::Metanorma::Standoc::Converter
|
|
4
4
|
def para_attrs(node)
|
|
5
|
-
attr_code(
|
|
5
|
+
attr_code("keep-with-next": node.attr("keepWithNext") ||
|
|
6
6
|
node.attr("keep-with-next"),
|
|
7
7
|
"keep-with-previous": node.attr("keepWithPrevious") ||
|
|
8
|
-
|
|
8
|
+
node.attr("keep-with-previous"),
|
|
9
9
|
id: ::Metanorma::Utils::anchor_or_uuid(node))
|
|
10
10
|
end
|
|
11
11
|
|
|
@@ -36,20 +36,21 @@ module Metanorma
|
|
|
36
36
|
|
|
37
37
|
def sidebar(node)
|
|
38
38
|
return unless draft?
|
|
39
|
+
|
|
39
40
|
noko do |xml|
|
|
40
|
-
xml.review **
|
|
41
|
+
xml.review **sidebar_attrs(node) do |r|
|
|
41
42
|
node.title.nil? or r.name { |name| name << node.title }
|
|
42
43
|
wrap_in_para(node, r)
|
|
43
44
|
end
|
|
44
45
|
end
|
|
45
46
|
end
|
|
46
47
|
|
|
47
|
-
def note(
|
|
48
|
+
def note(node)
|
|
48
49
|
noko do |xml|
|
|
49
|
-
xml.note **attr_code(id: ::Metanorma::Utils::anchor_or_uuid(
|
|
50
|
-
removeInRFC:
|
|
51
|
-
|
|
52
|
-
wrap_in_para(
|
|
50
|
+
xml.note **attr_code(id: ::Metanorma::Utils::anchor_or_uuid(nil),
|
|
51
|
+
removeInRFC: node.attr("remove-in-rfc")) do |c|
|
|
52
|
+
node.title.nil? or c.name { |name| name << node.title }
|
|
53
|
+
wrap_in_para(node, c)
|
|
53
54
|
end
|
|
54
55
|
end.join("\n")
|
|
55
56
|
end
|
|
@@ -59,9 +60,9 @@ module Metanorma
|
|
|
59
60
|
xml.figure **literal_attrs(node) do |f|
|
|
60
61
|
figure_title(node, f)
|
|
61
62
|
f.pre node.lines.join("\n"),
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
63
|
+
**attr_code(align: node.attr("align"),
|
|
64
|
+
id: ::Metanorma::Utils::anchor_or_uuid(nil),
|
|
65
|
+
alt: node.attr("alt"))
|
|
65
66
|
end
|
|
66
67
|
end
|
|
67
68
|
end
|
|
@@ -70,9 +71,10 @@ module Metanorma
|
|
|
70
71
|
super.merge(attr_code(align: node.attr("align")))
|
|
71
72
|
end
|
|
72
73
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
def listing_attrs(node)
|
|
75
|
+
super.merge(attr_code(markers: node.attr("markers"),
|
|
76
|
+
src: node.attr("src")))
|
|
77
|
+
end
|
|
76
78
|
end
|
|
77
79
|
end
|
|
78
80
|
end
|
|
@@ -5,7 +5,6 @@ module Metanorma
|
|
|
5
5
|
bcp14_cleanup(xmldoc)
|
|
6
6
|
abstract_cleanup(xmldoc)
|
|
7
7
|
super
|
|
8
|
-
rfc_anchor_cleanup(xmldoc)
|
|
9
8
|
cref_cleanup(xmldoc)
|
|
10
9
|
xmldoc
|
|
11
10
|
end
|
|
@@ -42,21 +41,6 @@ module Metanorma
|
|
|
42
41
|
end
|
|
43
42
|
end
|
|
44
43
|
|
|
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
|
-
next if b.at("./ancestor::bibdata | ./ancestor::bibitem")
|
|
49
|
-
|
|
50
|
-
id = b.at("./docidentifier[@type = 'IETF' or @type = 'RFC'][@scope = 'anchor']").text
|
|
51
|
-
m[b["id"]] = id
|
|
52
|
-
b["id"] = id
|
|
53
|
-
end
|
|
54
|
-
xml.xpath("//eref | //origin").each do |x|
|
|
55
|
-
map[x["bibitemid"]] and x["bibitemid"] = map[x["bibitemid"]]
|
|
56
|
-
end
|
|
57
|
-
xml
|
|
58
|
-
end
|
|
59
|
-
|
|
60
44
|
def smartquotes_cleanup(xmldoc)
|
|
61
45
|
xmldoc.traverse do |n|
|
|
62
46
|
next unless n.text?
|
|
@@ -32,6 +32,43 @@
|
|
|
32
32
|
<ref name="DocumentType"/>
|
|
33
33
|
</element>
|
|
34
34
|
</define>
|
|
35
|
+
<define name="admonition">
|
|
36
|
+
<element name="admonition">
|
|
37
|
+
<attribute name="type">
|
|
38
|
+
<ref name="AdmonitionType"/>
|
|
39
|
+
</attribute>
|
|
40
|
+
<optional>
|
|
41
|
+
<attribute name="class"/>
|
|
42
|
+
</optional>
|
|
43
|
+
<attribute name="id">
|
|
44
|
+
<data type="ID"/>
|
|
45
|
+
</attribute>
|
|
46
|
+
<optional>
|
|
47
|
+
<attribute name="uri">
|
|
48
|
+
<data type="anyURI"/>
|
|
49
|
+
</attribute>
|
|
50
|
+
</optional>
|
|
51
|
+
<optional>
|
|
52
|
+
<attribute name="coverpage">
|
|
53
|
+
<data type="boolean"/>
|
|
54
|
+
</attribute>
|
|
55
|
+
</optional>
|
|
56
|
+
<optional>
|
|
57
|
+
<attribute name="notag">
|
|
58
|
+
<data type="boolean"/>
|
|
59
|
+
</attribute>
|
|
60
|
+
</optional>
|
|
61
|
+
<optional>
|
|
62
|
+
<ref name="tname"/>
|
|
63
|
+
</optional>
|
|
64
|
+
<zeroOrMore>
|
|
65
|
+
<ref name="paragraph-with-footnote"/>
|
|
66
|
+
</zeroOrMore>
|
|
67
|
+
<zeroOrMore>
|
|
68
|
+
<ref name="note"/>
|
|
69
|
+
</zeroOrMore>
|
|
70
|
+
</element>
|
|
71
|
+
</define>
|
|
35
72
|
<define name="index">
|
|
36
73
|
<element name="index">
|
|
37
74
|
<optional>
|
|
@@ -245,6 +282,9 @@
|
|
|
245
282
|
<ref name="MultilingualRenderingType"/>
|
|
246
283
|
</attribute>
|
|
247
284
|
</optional>
|
|
285
|
+
<optional>
|
|
286
|
+
<ref name="tname"/>
|
|
287
|
+
</optional>
|
|
248
288
|
<oneOrMore>
|
|
249
289
|
<ref name="ul_li"/>
|
|
250
290
|
</oneOrMore>
|
|
@@ -287,6 +327,9 @@
|
|
|
287
327
|
</choice>
|
|
288
328
|
</attribute>
|
|
289
329
|
</optional>
|
|
330
|
+
<optional>
|
|
331
|
+
<ref name="tname"/>
|
|
332
|
+
</optional>
|
|
290
333
|
<oneOrMore>
|
|
291
334
|
<ref name="li"/>
|
|
292
335
|
</oneOrMore>
|
|
@@ -323,6 +366,9 @@
|
|
|
323
366
|
<ref name="MultilingualRenderingType"/>
|
|
324
367
|
</attribute>
|
|
325
368
|
</optional>
|
|
369
|
+
<optional>
|
|
370
|
+
<ref name="tname"/>
|
|
371
|
+
</optional>
|
|
326
372
|
<oneOrMore>
|
|
327
373
|
<ref name="dt"/>
|
|
328
374
|
<ref name="dd"/>
|
|
@@ -657,6 +703,9 @@
|
|
|
657
703
|
<optional>
|
|
658
704
|
<attribute name="tag"/>
|
|
659
705
|
</optional>
|
|
706
|
+
<optional>
|
|
707
|
+
<attribute name="type"/>
|
|
708
|
+
</optional>
|
|
660
709
|
<optional>
|
|
661
710
|
<attribute name="multilingual-rendering">
|
|
662
711
|
<ref name="MultilingualRenderingType"/>
|
|
@@ -692,6 +741,9 @@
|
|
|
692
741
|
<optional>
|
|
693
742
|
<attribute name="tag"/>
|
|
694
743
|
</optional>
|
|
744
|
+
<optional>
|
|
745
|
+
<attribute name="type"/>
|
|
746
|
+
</optional>
|
|
695
747
|
<optional>
|
|
696
748
|
<attribute name="multilingual-rendering">
|
|
697
749
|
<ref name="MultilingualRenderingType"/>
|
|
@@ -851,6 +903,16 @@
|
|
|
851
903
|
<ref name="MultilingualRenderingType"/>
|
|
852
904
|
</attribute>
|
|
853
905
|
</optional>
|
|
906
|
+
<optional>
|
|
907
|
+
<attribute name="coverpage">
|
|
908
|
+
<data type="boolean"/>
|
|
909
|
+
</attribute>
|
|
910
|
+
</optional>
|
|
911
|
+
<optional>
|
|
912
|
+
<attribute name="notag">
|
|
913
|
+
<data type="boolean"/>
|
|
914
|
+
</attribute>
|
|
915
|
+
</optional>
|
|
854
916
|
<oneOrMore>
|
|
855
917
|
<choice>
|
|
856
918
|
<ref name="paragraph"/>
|
|
@@ -1178,6 +1240,7 @@
|
|
|
1178
1240
|
<ref name="concept"/>
|
|
1179
1241
|
<ref name="add"/>
|
|
1180
1242
|
<ref name="del"/>
|
|
1243
|
+
<ref name="span"/>
|
|
1181
1244
|
</choice>
|
|
1182
1245
|
</define>
|
|
1183
1246
|
<define name="add">
|
|
@@ -1204,6 +1267,14 @@
|
|
|
1204
1267
|
</choice>
|
|
1205
1268
|
</element>
|
|
1206
1269
|
</define>
|
|
1270
|
+
<define name="span">
|
|
1271
|
+
<element name="span">
|
|
1272
|
+
<attribute name="class"/>
|
|
1273
|
+
<oneOrMore>
|
|
1274
|
+
<ref name="TextElement"/>
|
|
1275
|
+
</oneOrMore>
|
|
1276
|
+
</element>
|
|
1277
|
+
</define>
|
|
1207
1278
|
<define name="concept">
|
|
1208
1279
|
<element name="concept">
|
|
1209
1280
|
<optional>
|
|
@@ -1994,6 +2065,7 @@
|
|
|
1994
2065
|
<value>compare</value>
|
|
1995
2066
|
<value>contrast</value>
|
|
1996
2067
|
<value>see</value>
|
|
2068
|
+
<value>seealso</value>
|
|
1997
2069
|
</choice>
|
|
1998
2070
|
</define>
|
|
1999
2071
|
<define name="deprecates">
|
data/metanorma-ietf.gemspec
CHANGED
|
@@ -37,7 +37,7 @@ 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", "~> 2.
|
|
40
|
+
spec.add_dependency "metanorma-standoc", "~> 2.1.0"
|
|
41
41
|
|
|
42
42
|
spec.add_development_dependency "debug"
|
|
43
43
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
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: 3.0.
|
|
4
|
+
version: 3.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-
|
|
11
|
+
date: 2022-06-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mathml2asciimath
|
|
@@ -44,14 +44,14 @@ dependencies:
|
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 2.
|
|
47
|
+
version: 2.1.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: 2.
|
|
54
|
+
version: 2.1.0
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: debug
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -235,9 +235,6 @@ files:
|
|
|
235
235
|
- LICENSE
|
|
236
236
|
- README.adoc
|
|
237
237
|
- Rakefile
|
|
238
|
-
- docs/installation.md
|
|
239
|
-
- docs/navigation.md
|
|
240
|
-
- docs/overview.md
|
|
241
238
|
- lib/isodoc/ietf/SVG-1.2-RFC.rng
|
|
242
239
|
- lib/isodoc/ietf/blocks.rb
|
|
243
240
|
- lib/isodoc/ietf/cleanup.rb
|
|
@@ -296,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
296
293
|
- !ruby/object:Gem::Version
|
|
297
294
|
version: '0'
|
|
298
295
|
requirements: []
|
|
299
|
-
rubygems_version: 3.3.
|
|
296
|
+
rubygems_version: 3.3.16
|
|
300
297
|
signing_key:
|
|
301
298
|
specification_version: 4
|
|
302
299
|
summary: metanorma-ietf lets you write IETF documents, such as Internet-Drafts and
|
data/docs/installation.md
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
---
|
|
2
|
-
title: Installation
|
|
3
|
-
---
|
|
4
|
-
|
|
5
|
-
Add this line to your application’s Gemfile:
|
|
6
|
-
|
|
7
|
-
```
|
|
8
|
-
gem "metanorma-ietf"
|
|
9
|
-
```
|
|
10
|
-
|
|
11
|
-
And then execute:
|
|
12
|
-
|
|
13
|
-
```
|
|
14
|
-
$ bundle
|
|
15
|
-
```
|
|
16
|
-
|
|
17
|
-
Or install it yourself as:
|
|
18
|
-
|
|
19
|
-
```
|
|
20
|
-
$ gem install metanorma-cli
|
|
21
|
-
```
|
data/docs/navigation.md
DELETED