metanorma-ietf 2.2.10 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ietf/isodoc.rng +130 -1
- data/lib/isodoc/ietf/blocks.rb +6 -10
- data/lib/isodoc/ietf/front.rb +1 -0
- data/lib/metanorma/ietf/version.rb +1 -1
- data/metanorma-ietf.gemspec +3 -3
- metadata +15 -15
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 762b7326f710d4729e85538a72dcb11fe7f960d995303ef0999c5ff8a665e8d6
|
|
4
|
+
data.tar.gz: f22daa0309aa18c071492e8b4f74a0d087835a966581af394cc6eba4be933e79
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 85bff031c15ec990050395691adbdd51ebd67c0cac1dfdc6746e1a21bf7f4547678d268caceb536b69e9013b681d3082a9dc798107396ce1f1cae4329953502b
|
|
7
|
+
data.tar.gz: f0b5cbde4df5519fcbad880e6b2e441523bf6e53bab819f292f6a588b92baff94fd097734f1398920d4fd4a6709f034433e8053f445d1147459744c8f6bca1d9
|
|
@@ -86,6 +86,35 @@
|
|
|
86
86
|
<text/>
|
|
87
87
|
</element>
|
|
88
88
|
</define>
|
|
89
|
+
<define name="erefType">
|
|
90
|
+
<optional>
|
|
91
|
+
<attribute name="normative">
|
|
92
|
+
<data type="boolean"/>
|
|
93
|
+
</attribute>
|
|
94
|
+
</optional>
|
|
95
|
+
<attribute name="citeas"/>
|
|
96
|
+
<attribute name="type">
|
|
97
|
+
<ref name="ReferenceFormat"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
<optional>
|
|
100
|
+
<attribute name="alt"/>
|
|
101
|
+
</optional>
|
|
102
|
+
<optional>
|
|
103
|
+
<attribute name="case">
|
|
104
|
+
<choice>
|
|
105
|
+
<value>capital</value>
|
|
106
|
+
<value>lowercase</value>
|
|
107
|
+
</choice>
|
|
108
|
+
</attribute>
|
|
109
|
+
</optional>
|
|
110
|
+
<optional>
|
|
111
|
+
<attribute name="droploc">
|
|
112
|
+
<data type="boolean"/>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<ref name="CitationType"/>
|
|
116
|
+
<text/>
|
|
117
|
+
</define>
|
|
89
118
|
<define name="ul">
|
|
90
119
|
<element name="ul">
|
|
91
120
|
<attribute name="id">
|
|
@@ -775,6 +804,78 @@
|
|
|
775
804
|
<ref name="paragraph"/>
|
|
776
805
|
</element>
|
|
777
806
|
</define>
|
|
807
|
+
<define name="em">
|
|
808
|
+
<element name="em">
|
|
809
|
+
<zeroOrMore>
|
|
810
|
+
<choice>
|
|
811
|
+
<ref name="PureTextElement"/>
|
|
812
|
+
<ref name="stem"/>
|
|
813
|
+
<ref name="index"/>
|
|
814
|
+
</choice>
|
|
815
|
+
</zeroOrMore>
|
|
816
|
+
</element>
|
|
817
|
+
</define>
|
|
818
|
+
<define name="strong">
|
|
819
|
+
<element name="strong">
|
|
820
|
+
<zeroOrMore>
|
|
821
|
+
<choice>
|
|
822
|
+
<ref name="PureTextElement"/>
|
|
823
|
+
<ref name="stem"/>
|
|
824
|
+
<ref name="index"/>
|
|
825
|
+
</choice>
|
|
826
|
+
</zeroOrMore>
|
|
827
|
+
</element>
|
|
828
|
+
</define>
|
|
829
|
+
<define name="tt">
|
|
830
|
+
<element name="tt">
|
|
831
|
+
<zeroOrMore>
|
|
832
|
+
<choice>
|
|
833
|
+
<ref name="PureTextElement"/>
|
|
834
|
+
<ref name="index"/>
|
|
835
|
+
</choice>
|
|
836
|
+
</zeroOrMore>
|
|
837
|
+
</element>
|
|
838
|
+
</define>
|
|
839
|
+
<define name="keyword">
|
|
840
|
+
<element name="keyword">
|
|
841
|
+
<zeroOrMore>
|
|
842
|
+
<choice>
|
|
843
|
+
<ref name="PureTextElement"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="strike">
|
|
850
|
+
<element name="strike">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="underline">
|
|
860
|
+
<element name="underline">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="smallcap">
|
|
870
|
+
<element name="smallcap">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
778
879
|
</include>
|
|
779
880
|
<!-- end overrides -->
|
|
780
881
|
<define name="colgroup">
|
|
@@ -793,7 +894,35 @@
|
|
|
793
894
|
<value>internal</value>
|
|
794
895
|
</define>
|
|
795
896
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
897
|
+
<choice>
|
|
898
|
+
<ref name="concept"/>
|
|
899
|
+
<ref name="add"/>
|
|
900
|
+
<ref name="del"/>
|
|
901
|
+
</choice>
|
|
902
|
+
</define>
|
|
903
|
+
<define name="add">
|
|
904
|
+
<element name="add">
|
|
905
|
+
<choice>
|
|
906
|
+
<ref name="PureTextElement"/>
|
|
907
|
+
<ref name="eref"/>
|
|
908
|
+
<ref name="stem"/>
|
|
909
|
+
<ref name="keyword"/>
|
|
910
|
+
<ref name="xref"/>
|
|
911
|
+
<ref name="hyperlink"/>
|
|
912
|
+
</choice>
|
|
913
|
+
</element>
|
|
914
|
+
</define>
|
|
915
|
+
<define name="del">
|
|
916
|
+
<element name="del">
|
|
917
|
+
<choice>
|
|
918
|
+
<ref name="PureTextElement"/>
|
|
919
|
+
<ref name="eref"/>
|
|
920
|
+
<ref name="stem"/>
|
|
921
|
+
<ref name="keyword"/>
|
|
922
|
+
<ref name="xref"/>
|
|
923
|
+
<ref name="hyperlink"/>
|
|
924
|
+
</choice>
|
|
925
|
+
</element>
|
|
797
926
|
</define>
|
|
798
927
|
<define name="concept">
|
|
799
928
|
<element name="concept">
|
data/lib/isodoc/ietf/blocks.rb
CHANGED
|
@@ -73,7 +73,8 @@ module IsoDoc::Ietf
|
|
|
73
73
|
|
|
74
74
|
def note_label(node)
|
|
75
75
|
n = @xrefs.get[node["id"]]
|
|
76
|
-
return l10n("#{@i18n.note}: ") if n.nil? || n[:label].nil? ||
|
|
76
|
+
return l10n("#{@i18n.note}: ") if n.nil? || n[:label].nil? ||
|
|
77
|
+
n[:label].empty?
|
|
77
78
|
l10n("#{@i18n.note} #{n[:label]}: ")
|
|
78
79
|
end
|
|
79
80
|
|
|
@@ -107,16 +108,11 @@ module IsoDoc::Ietf
|
|
|
107
108
|
end
|
|
108
109
|
|
|
109
110
|
def sourcecode_parse(node, out)
|
|
110
|
-
out.
|
|
111
|
-
|
|
112
|
-
|
|
111
|
+
out.sourcecode **attr_code(
|
|
112
|
+
anchor: node["id"], type: node["lang"], name: node["filename"],
|
|
113
|
+
markers: node["markers"], src: node["src"]) do |s|
|
|
114
|
+
node.children.each { |x| parse(x, s) unless x.name == "name" }
|
|
113
115
|
end
|
|
114
|
-
div.sourcecode **attr_code(type: node["lang"], name: node["filename"],
|
|
115
|
-
markers: node["markers"],
|
|
116
|
-
src: node["src"]) do |s|
|
|
117
|
-
node.children.each { |x| parse(x, s) unless x.name == "name" }
|
|
118
|
-
end
|
|
119
|
-
end
|
|
120
116
|
end
|
|
121
117
|
|
|
122
118
|
def pre_parse(node, out)
|
data/lib/isodoc/ietf/front.rb
CHANGED
|
@@ -137,6 +137,7 @@ module IsoDoc::Ietf
|
|
|
137
137
|
def postal(addr, out)
|
|
138
138
|
out.postal do |p|
|
|
139
139
|
if line = addr.at(ns("./formattedAddress"))
|
|
140
|
+
line.xpath(ns(".//br")).each { |br| br.replace("\n") }
|
|
140
141
|
line.text.split(/\n/).each do |l|
|
|
141
142
|
p.postalLine l, **attr_code(ascii: l.transliterate)
|
|
142
143
|
end
|
data/metanorma-ietf.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# coding: utf-8
|
|
2
2
|
|
|
3
|
-
lib = File.expand_path("
|
|
3
|
+
lib = File.expand_path("lib", __dir__)
|
|
4
4
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
5
5
|
require "metanorma/ietf/version"
|
|
6
6
|
|
|
@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
|
|
|
35
35
|
spec.require_paths = ["lib"]
|
|
36
36
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
|
37
37
|
|
|
38
|
-
spec.add_dependency "
|
|
39
|
-
spec.add_dependency "isodoc", "~> 1.5.0"
|
|
38
|
+
spec.add_dependency "isodoc", "~> 1.6.0"
|
|
40
39
|
spec.add_dependency "mathml2asciimath"
|
|
40
|
+
spec.add_dependency "metanorma-standoc", "~> 1.9.0"
|
|
41
41
|
spec.add_dependency "nokogiri", "~> 1.10.4"
|
|
42
42
|
|
|
43
43
|
spec.add_development_dependency "byebug"
|
metadata
CHANGED
|
@@ -1,57 +1,57 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-ietf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-04-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
|
-
name:
|
|
14
|
+
name: isodoc
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 1.
|
|
19
|
+
version: 1.6.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 1.
|
|
26
|
+
version: 1.6.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
|
-
name:
|
|
28
|
+
name: mathml2asciimath
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
|
-
- - "
|
|
31
|
+
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version:
|
|
33
|
+
version: '0'
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
|
-
- - "
|
|
38
|
+
- - ">="
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version:
|
|
40
|
+
version: '0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
|
-
name:
|
|
42
|
+
name: metanorma-standoc
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
|
-
- - "
|
|
45
|
+
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version:
|
|
47
|
+
version: 1.9.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: 1.9.0
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: nokogiri
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|