metanorma-nist 1.2.16 → 1.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/nist/isodoc.rng +130 -1
- data/lib/isodoc/nist/html/htmlstyle.css +7 -0
- data/lib/isodoc/nist/html_convert.rb +0 -1
- data/lib/isodoc/nist/nist.csts.xsl +4 -0
- data/lib/isodoc/nist/nist.cswp.xsl +4 -0
- data/lib/isodoc/nist/nist.sp.xsl +4 -0
- data/lib/isodoc/nist/presentation_xml_convert.rb +1 -1
- data/lib/metanorma/nist/version.rb +1 -1
- data/metanorma-nist.gemspec +6 -6
- metadata +25 -25
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 26eb1c4fec35c9eb6c8d6d1fa99fb33703ce641257f815ede17943c423c099c4
|
|
4
|
+
data.tar.gz: d3b1cfa6945dc6f81d717d1dd9b5a4036dc9abdefe4ca92da5cf29ed6b3e2abc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e4a63e9748f608d57eecbcdc59895b52b8e488a4bc7220de62794ed44f3342fe943e6f69f7442bb0cba2d720a320deab0362c0edefc33a695541b847d9dda1b7
|
|
7
|
+
data.tar.gz: 1c8042ce84cd97f2b760b95cd602a70e4d5caffbac6d1e1079aa47544a22b44874616680ae3a34595c072525a7296ccf1d0f852b2091a738631ceef7ab7f5cdc
|
|
@@ -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">
|
|
@@ -108,6 +108,13 @@ a.FootnoteRef + a.FootnoteRef:before {
|
|
|
108
108
|
content: ", ";
|
|
109
109
|
vertical-align: super; }
|
|
110
110
|
|
|
111
|
+
.addition {
|
|
112
|
+
color: blue; }
|
|
113
|
+
|
|
114
|
+
.deletion {
|
|
115
|
+
color: red;
|
|
116
|
+
text-decoration: line-through; }
|
|
117
|
+
|
|
111
118
|
#nist-sp-band {
|
|
112
119
|
background-color: #d8eca8; }
|
|
113
120
|
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
<xsl:param name="svg_images"/>
|
|
8
8
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
9
9
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
10
|
+
<xsl:param name="basepath"/>
|
|
10
11
|
|
|
11
12
|
|
|
12
13
|
|
|
@@ -3516,6 +3517,9 @@
|
|
|
3516
3517
|
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
3517
3518
|
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
3518
3519
|
</xsl:when>
|
|
3520
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
3521
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
3522
|
+
</xsl:when>
|
|
3519
3523
|
<xsl:otherwise>
|
|
3520
3524
|
<xsl:value-of select="@src"/>
|
|
3521
3525
|
</xsl:otherwise>
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
<xsl:param name="svg_images"/>
|
|
8
8
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
9
9
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
10
|
+
<xsl:param name="basepath"/>
|
|
10
11
|
|
|
11
12
|
|
|
12
13
|
|
|
@@ -3516,6 +3517,9 @@
|
|
|
3516
3517
|
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
3517
3518
|
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
3518
3519
|
</xsl:when>
|
|
3520
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
3521
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
3522
|
+
</xsl:when>
|
|
3519
3523
|
<xsl:otherwise>
|
|
3520
3524
|
<xsl:value-of select="@src"/>
|
|
3521
3525
|
</xsl:otherwise>
|
data/lib/isodoc/nist/nist.sp.xsl
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
<xsl:param name="svg_images"/>
|
|
8
8
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
9
9
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
10
|
+
<xsl:param name="basepath"/>
|
|
10
11
|
|
|
11
12
|
|
|
12
13
|
|
|
@@ -4606,6 +4607,9 @@
|
|
|
4606
4607
|
<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
|
|
4607
4608
|
<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
|
|
4608
4609
|
</xsl:when>
|
|
4610
|
+
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
4611
|
+
<xsl:value-of select="concat('url(file:',$basepath, @src, ')')"/>
|
|
4612
|
+
</xsl:when>
|
|
4609
4613
|
<xsl:otherwise>
|
|
4610
4614
|
<xsl:value-of select="@src"/>
|
|
4611
4615
|
</xsl:otherwise>
|
|
@@ -23,7 +23,7 @@ module IsoDoc
|
|
|
23
23
|
contents = non_locality_elems(node).select { |c| !c.text? || /\S/.match(c) }
|
|
24
24
|
return unless contents.empty?
|
|
25
25
|
link = anchor_linkend(node, docid_l10n(node["target"] || wrap_brackets(node['citeas'])))
|
|
26
|
-
link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link)
|
|
26
|
+
link += eref_localities(node.xpath(ns("./locality | ./localityStack")), link, node)
|
|
27
27
|
non_locality_elems(node).each { |n| n.remove }
|
|
28
28
|
node.add_child(link)
|
|
29
29
|
end
|
data/metanorma-nist.gemspec
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
lib = File.expand_path("
|
|
1
|
+
lib = File.expand_path("lib", __dir__)
|
|
2
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
3
3
|
require "metanorma/nist/version"
|
|
4
4
|
|
|
@@ -25,23 +25,23 @@ Gem::Specification.new do |spec|
|
|
|
25
25
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
|
26
26
|
|
|
27
27
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
28
|
+
spec.add_dependency "iso-639"
|
|
28
29
|
spec.add_dependency "ruby-jing"
|
|
29
30
|
spec.add_dependency "twitter_cldr"
|
|
30
|
-
spec.add_dependency "iso-639"
|
|
31
31
|
spec.add_dependency "tzinfo-data" # we need this for windows only
|
|
32
32
|
|
|
33
|
-
spec.add_dependency "
|
|
34
|
-
spec.add_dependency "
|
|
35
|
-
#spec.add_dependency "relaton-nist", "~> 0.3.0"
|
|
33
|
+
spec.add_dependency "isodoc", "~> 1.6.0"
|
|
34
|
+
spec.add_dependency "metanorma-standoc", "~> 1.9.0"
|
|
35
|
+
# spec.add_dependency "relaton-nist", "~> 0.3.0"
|
|
36
36
|
|
|
37
37
|
spec.add_development_dependency "byebug", "~> 9.1"
|
|
38
|
-
spec.add_development_dependency "sassc", "2.4.0"
|
|
39
38
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
40
39
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
41
40
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
|
42
41
|
spec.add_development_dependency "rake", "~> 13.0"
|
|
43
42
|
spec.add_development_dependency "rspec", "~> 3.6"
|
|
44
43
|
spec.add_development_dependency "rubocop", "~> 1.5.2"
|
|
44
|
+
spec.add_development_dependency "sassc", "2.4.0"
|
|
45
45
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
|
46
46
|
spec.add_development_dependency "timecop", "~> 0.9"
|
|
47
47
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-nist
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.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
14
|
name: htmlentities
|
|
@@ -25,7 +25,7 @@ dependencies:
|
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: 4.3.4
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
|
-
name:
|
|
28
|
+
name: iso-639
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - ">="
|
|
@@ -39,7 +39,7 @@ dependencies:
|
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
40
|
version: '0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
|
-
name:
|
|
42
|
+
name: ruby-jing
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - ">="
|
|
@@ -53,7 +53,7 @@ dependencies:
|
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
|
-
name:
|
|
56
|
+
name: twitter_cldr
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
59
|
- - ">="
|
|
@@ -81,33 +81,33 @@ dependencies:
|
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
82
|
version: '0'
|
|
83
83
|
- !ruby/object:Gem::Dependency
|
|
84
|
-
name:
|
|
84
|
+
name: isodoc
|
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
|
86
86
|
requirements:
|
|
87
87
|
- - "~>"
|
|
88
88
|
- !ruby/object:Gem::Version
|
|
89
|
-
version: 1.
|
|
89
|
+
version: 1.6.0
|
|
90
90
|
type: :runtime
|
|
91
91
|
prerelease: false
|
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
93
|
requirements:
|
|
94
94
|
- - "~>"
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
|
-
version: 1.
|
|
96
|
+
version: 1.6.0
|
|
97
97
|
- !ruby/object:Gem::Dependency
|
|
98
|
-
name:
|
|
98
|
+
name: metanorma-standoc
|
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
|
100
100
|
requirements:
|
|
101
101
|
- - "~>"
|
|
102
102
|
- !ruby/object:Gem::Version
|
|
103
|
-
version: 1.
|
|
103
|
+
version: 1.9.0
|
|
104
104
|
type: :runtime
|
|
105
105
|
prerelease: false
|
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
|
107
107
|
requirements:
|
|
108
108
|
- - "~>"
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
|
-
version: 1.
|
|
110
|
+
version: 1.9.0
|
|
111
111
|
- !ruby/object:Gem::Dependency
|
|
112
112
|
name: byebug
|
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -122,20 +122,6 @@ dependencies:
|
|
|
122
122
|
- - "~>"
|
|
123
123
|
- !ruby/object:Gem::Version
|
|
124
124
|
version: '9.1'
|
|
125
|
-
- !ruby/object:Gem::Dependency
|
|
126
|
-
name: sassc
|
|
127
|
-
requirement: !ruby/object:Gem::Requirement
|
|
128
|
-
requirements:
|
|
129
|
-
- - '='
|
|
130
|
-
- !ruby/object:Gem::Version
|
|
131
|
-
version: 2.4.0
|
|
132
|
-
type: :development
|
|
133
|
-
prerelease: false
|
|
134
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
135
|
-
requirements:
|
|
136
|
-
- - '='
|
|
137
|
-
- !ruby/object:Gem::Version
|
|
138
|
-
version: 2.4.0
|
|
139
125
|
- !ruby/object:Gem::Dependency
|
|
140
126
|
name: equivalent-xml
|
|
141
127
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -220,6 +206,20 @@ dependencies:
|
|
|
220
206
|
- - "~>"
|
|
221
207
|
- !ruby/object:Gem::Version
|
|
222
208
|
version: 1.5.2
|
|
209
|
+
- !ruby/object:Gem::Dependency
|
|
210
|
+
name: sassc
|
|
211
|
+
requirement: !ruby/object:Gem::Requirement
|
|
212
|
+
requirements:
|
|
213
|
+
- - '='
|
|
214
|
+
- !ruby/object:Gem::Version
|
|
215
|
+
version: 2.4.0
|
|
216
|
+
type: :development
|
|
217
|
+
prerelease: false
|
|
218
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
219
|
+
requirements:
|
|
220
|
+
- - '='
|
|
221
|
+
- !ruby/object:Gem::Version
|
|
222
|
+
version: 2.4.0
|
|
223
223
|
- !ruby/object:Gem::Dependency
|
|
224
224
|
name: simplecov
|
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|