metanorma-iho 0.8.3 → 0.8.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +7 -3
- data/lib/isodoc/iho/iho.specification.xsl +11 -2
- data/lib/isodoc/iho/iho.standard.xsl +11 -2
- data/lib/isodoc/iho/xref.rb +4 -6
- data/lib/metanorma/iho/basicdoc.rng +38 -35
- data/lib/metanorma/iho/biblio.rng +9 -0
- data/lib/metanorma/iho/isodoc.rng +27 -1
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 605494aaa8ff19ab9e36a002b122d88f23cd6f34126e2706aaad621722ffa7bf
|
|
4
|
+
data.tar.gz: a175eb6e4e50c49f8d527690a49bedca15e4bb7bb4a98e6f68d5a43320510e78
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 475b4726dbbcd9313d161b80f721af157b0ea639fe8e95faf6c3df9d1869cbd68d9a54f7964e0d0160e7c90b1dcf8c43693154ecc109fcd1c533cbbcfc766f99
|
|
7
|
+
data.tar.gz: 6cebf782f12345e259b11437aa5dc30f54623f0cbebe5179e30ec5f97e2e93418723bb91360e9da4eabd25254cf26c2da569b6d00d514a97fe33670ec9be7351
|
data/Gemfile
CHANGED
|
@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
|
|
|
4
4
|
source "https://rubygems.org"
|
|
5
5
|
git_source(:github) { |repo| "https://github.com/#{repo}" }
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
group :development, :test do
|
|
8
|
+
gem "rspec"
|
|
9
|
+
end
|
|
8
10
|
|
|
9
|
-
if File.exist?
|
|
10
|
-
eval File.read(
|
|
11
|
+
if File.exist? "Gemfile.devel"
|
|
12
|
+
eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
|
|
11
13
|
end
|
|
14
|
+
|
|
15
|
+
gemspec
|
|
@@ -5171,8 +5171,17 @@
|
|
|
5171
5171
|
<xsl:variable name="styles_">
|
|
5172
5172
|
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
|
5173
5173
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
5174
|
-
<xsl:variable name="
|
|
5175
|
-
<xsl:
|
|
5174
|
+
<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
5175
|
+
<xsl:variable name="value">
|
|
5176
|
+
<xsl:choose>
|
|
5177
|
+
<!-- if font-size is digits only -->
|
|
5178
|
+
<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
|
|
5179
|
+
<xsl:otherwise>
|
|
5180
|
+
<xsl:value-of select="$value_"/>
|
|
5181
|
+
</xsl:otherwise>
|
|
5182
|
+
</xsl:choose>
|
|
5183
|
+
</xsl:variable>
|
|
5184
|
+
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
|
|
5176
5185
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
|
5177
5186
|
</xsl:if>
|
|
5178
5187
|
</xsl:for-each>
|
|
@@ -5171,8 +5171,17 @@
|
|
|
5171
5171
|
<xsl:variable name="styles_">
|
|
5172
5172
|
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
|
5173
5173
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
5174
|
-
<xsl:variable name="
|
|
5175
|
-
<xsl:
|
|
5174
|
+
<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
5175
|
+
<xsl:variable name="value">
|
|
5176
|
+
<xsl:choose>
|
|
5177
|
+
<!-- if font-size is digits only -->
|
|
5178
|
+
<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
|
|
5179
|
+
<xsl:otherwise>
|
|
5180
|
+
<xsl:value-of select="$value_"/>
|
|
5181
|
+
</xsl:otherwise>
|
|
5182
|
+
</xsl:choose>
|
|
5183
|
+
</xsl:variable>
|
|
5184
|
+
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
|
|
5176
5185
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
|
5177
5186
|
</xsl:if>
|
|
5178
5187
|
</xsl:for-each>
|
data/lib/isodoc/iho/xref.rb
CHANGED
|
@@ -57,11 +57,10 @@ module IsoDoc
|
|
|
57
57
|
@anchors[clause["id"]] =
|
|
58
58
|
{ label: num, xref: l10n("#{lbl} #{num}"),
|
|
59
59
|
level: level, type: "clause" }
|
|
60
|
-
i = Counter.new
|
|
60
|
+
i = Counter.new(0, prefix: "#{num}.")
|
|
61
61
|
clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
|
|
62
62
|
.each do |c|
|
|
63
|
-
i.increment(c)
|
|
64
|
-
annex_names1(c, "#{num}.#{i.print}", level + 1)
|
|
63
|
+
annex_names1(c, i.increment(c).print, level + 1)
|
|
65
64
|
end
|
|
66
65
|
end
|
|
67
66
|
|
|
@@ -81,10 +80,9 @@ module IsoDoc
|
|
|
81
80
|
{ label: num, level: level,
|
|
82
81
|
xref: l10n("#{@labels['subclause']} #{num}"),
|
|
83
82
|
type: "clause", elem: @labels["subclause"] }
|
|
84
|
-
i = Counter.new
|
|
83
|
+
i = Counter.new(0, prefix: "#{num}.")
|
|
85
84
|
clause.xpath(ns(SUBCLAUSES)).each do |c|
|
|
86
|
-
i.increment(c)
|
|
87
|
-
section_names1(c, "#{num}.#{i.print}", level + 1)
|
|
85
|
+
section_names1(c, i.increment(c).print, level + 1)
|
|
88
86
|
end
|
|
89
87
|
end
|
|
90
88
|
end
|
|
@@ -914,44 +914,47 @@
|
|
|
914
914
|
-->
|
|
915
915
|
<define name="image">
|
|
916
916
|
<element name="image">
|
|
917
|
-
<
|
|
918
|
-
|
|
917
|
+
<ref name="Image"/>
|
|
918
|
+
</element>
|
|
919
|
+
</define>
|
|
920
|
+
<define name="Image">
|
|
921
|
+
<attribute name="id">
|
|
922
|
+
<data type="ID"/>
|
|
923
|
+
</attribute>
|
|
924
|
+
<attribute name="src">
|
|
925
|
+
<data type="anyURI"/>
|
|
926
|
+
</attribute>
|
|
927
|
+
<attribute name="mimetype"/>
|
|
928
|
+
<optional>
|
|
929
|
+
<attribute name="filename"/>
|
|
930
|
+
</optional>
|
|
931
|
+
<optional>
|
|
932
|
+
<attribute name="width">
|
|
933
|
+
<choice>
|
|
934
|
+
<data type="int"/>
|
|
935
|
+
<value>auto</value>
|
|
936
|
+
</choice>
|
|
919
937
|
</attribute>
|
|
920
|
-
|
|
938
|
+
</optional>
|
|
939
|
+
<optional>
|
|
940
|
+
<attribute name="height">
|
|
941
|
+
<choice>
|
|
942
|
+
<data type="int"/>
|
|
943
|
+
<value>auto</value>
|
|
944
|
+
</choice>
|
|
945
|
+
</attribute>
|
|
946
|
+
</optional>
|
|
947
|
+
<optional>
|
|
948
|
+
<attribute name="alt"/>
|
|
949
|
+
</optional>
|
|
950
|
+
<optional>
|
|
951
|
+
<attribute name="title"/>
|
|
952
|
+
</optional>
|
|
953
|
+
<optional>
|
|
954
|
+
<attribute name="longdesc">
|
|
921
955
|
<data type="anyURI"/>
|
|
922
956
|
</attribute>
|
|
923
|
-
|
|
924
|
-
<optional>
|
|
925
|
-
<attribute name="filename"/>
|
|
926
|
-
</optional>
|
|
927
|
-
<optional>
|
|
928
|
-
<attribute name="width">
|
|
929
|
-
<choice>
|
|
930
|
-
<data type="int"/>
|
|
931
|
-
<value>auto</value>
|
|
932
|
-
</choice>
|
|
933
|
-
</attribute>
|
|
934
|
-
</optional>
|
|
935
|
-
<optional>
|
|
936
|
-
<attribute name="height">
|
|
937
|
-
<choice>
|
|
938
|
-
<data type="int"/>
|
|
939
|
-
<value>auto</value>
|
|
940
|
-
</choice>
|
|
941
|
-
</attribute>
|
|
942
|
-
</optional>
|
|
943
|
-
<optional>
|
|
944
|
-
<attribute name="alt"/>
|
|
945
|
-
</optional>
|
|
946
|
-
<optional>
|
|
947
|
-
<attribute name="title"/>
|
|
948
|
-
</optional>
|
|
949
|
-
<optional>
|
|
950
|
-
<attribute name="longdesc">
|
|
951
|
-
<data type="anyURI"/>
|
|
952
|
-
</attribute>
|
|
953
|
-
</optional>
|
|
954
|
-
</element>
|
|
957
|
+
</optional>
|
|
955
958
|
</define>
|
|
956
959
|
<define name="video">
|
|
957
960
|
<element name="video">
|
|
@@ -348,6 +348,9 @@
|
|
|
348
348
|
<zeroOrMore>
|
|
349
349
|
<ref name="contact"/>
|
|
350
350
|
</zeroOrMore>
|
|
351
|
+
<optional>
|
|
352
|
+
<ref name="logo"/>
|
|
353
|
+
</optional>
|
|
351
354
|
</element>
|
|
352
355
|
</define>
|
|
353
356
|
<define name="orgname">
|
|
@@ -366,6 +369,11 @@
|
|
|
366
369
|
</choice>
|
|
367
370
|
</element>
|
|
368
371
|
</define>
|
|
372
|
+
<define name="logo">
|
|
373
|
+
<element name="logo">
|
|
374
|
+
<ref name="image"/>
|
|
375
|
+
</element>
|
|
376
|
+
</define>
|
|
369
377
|
<define name="NameWithVariants">
|
|
370
378
|
<element name="primary">
|
|
371
379
|
<ref name="LocalizedString"/>
|
|
@@ -942,6 +950,7 @@
|
|
|
942
950
|
<value>obsoleted</value>
|
|
943
951
|
<value>confirmed</value>
|
|
944
952
|
<value>updated</value>
|
|
953
|
+
<value>corrected</value>
|
|
945
954
|
<value>issued</value>
|
|
946
955
|
<value>transmitted</value>
|
|
947
956
|
<value>copied</value>
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
|
18
18
|
of this.
|
|
19
19
|
-->
|
|
20
|
-
<!-- VERSION v1.2.
|
|
20
|
+
<!-- VERSION v1.2.8 -->
|
|
21
21
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
22
22
|
<include href="reqt.rng"/>
|
|
23
23
|
<include href="basicdoc.rng">
|
|
@@ -1054,6 +1054,17 @@
|
|
|
1054
1054
|
<ref name="date_inline"/>
|
|
1055
1055
|
</choice>
|
|
1056
1056
|
</define>
|
|
1057
|
+
<define name="PureTextElement" combine="choice">
|
|
1058
|
+
<ref name="passthrough_inline"/>
|
|
1059
|
+
</define>
|
|
1060
|
+
<define name="passthrough_inline">
|
|
1061
|
+
<element name="passthrough">
|
|
1062
|
+
<optional>
|
|
1063
|
+
<attribute name="formats"/>
|
|
1064
|
+
</optional>
|
|
1065
|
+
<text/>
|
|
1066
|
+
</element>
|
|
1067
|
+
</define>
|
|
1057
1068
|
<define name="add">
|
|
1058
1069
|
<element name="add">
|
|
1059
1070
|
<choice>
|
|
@@ -1092,6 +1103,9 @@
|
|
|
1092
1103
|
<optional>
|
|
1093
1104
|
<attribute name="style"/>
|
|
1094
1105
|
</optional>
|
|
1106
|
+
<optional>
|
|
1107
|
+
<attribute name="custom-charset"/>
|
|
1108
|
+
</optional>
|
|
1095
1109
|
<oneOrMore>
|
|
1096
1110
|
<ref name="TextElement"/>
|
|
1097
1111
|
</oneOrMore>
|
|
@@ -1394,6 +1408,9 @@
|
|
|
1394
1408
|
<optional>
|
|
1395
1409
|
<attribute name="number"/>
|
|
1396
1410
|
</optional>
|
|
1411
|
+
<optional>
|
|
1412
|
+
<attribute name="branch-number"/>
|
|
1413
|
+
</optional>
|
|
1397
1414
|
<optional>
|
|
1398
1415
|
<attribute name="obligation">
|
|
1399
1416
|
<choice>
|
|
@@ -1617,6 +1634,9 @@
|
|
|
1617
1634
|
<optional>
|
|
1618
1635
|
<attribute name="number"/>
|
|
1619
1636
|
</optional>
|
|
1637
|
+
<optional>
|
|
1638
|
+
<attribute name="branch-number"/>
|
|
1639
|
+
</optional>
|
|
1620
1640
|
<optional>
|
|
1621
1641
|
<attribute name="type"/>
|
|
1622
1642
|
</optional>
|
|
@@ -1668,6 +1688,9 @@
|
|
|
1668
1688
|
<optional>
|
|
1669
1689
|
<attribute name="number"/>
|
|
1670
1690
|
</optional>
|
|
1691
|
+
<optional>
|
|
1692
|
+
<attribute name="branch-number"/>
|
|
1693
|
+
</optional>
|
|
1671
1694
|
<optional>
|
|
1672
1695
|
<ref name="section-title"/>
|
|
1673
1696
|
</optional>
|
|
@@ -1765,6 +1788,9 @@
|
|
|
1765
1788
|
<optional>
|
|
1766
1789
|
<attribute name="number"/>
|
|
1767
1790
|
</optional>
|
|
1791
|
+
<optional>
|
|
1792
|
+
<attribute name="branch-number"/>
|
|
1793
|
+
</optional>
|
|
1768
1794
|
<optional>
|
|
1769
1795
|
<attribute name="obligation">
|
|
1770
1796
|
<choice>
|
data/metanorma-iho.gemspec
CHANGED
|
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.require_paths = ["lib"]
|
|
28
28
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
|
|
29
29
|
|
|
30
|
-
spec.add_dependency "metanorma-generic", "~> 2.5.
|
|
30
|
+
spec.add_dependency "metanorma-generic", "~> 2.5.4"
|
|
31
31
|
|
|
32
32
|
spec.add_development_dependency "debug"
|
|
33
33
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iho
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-11-
|
|
11
|
+
date: 2023-11-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 2.5.
|
|
19
|
+
version: 2.5.4
|
|
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: 2.5.
|
|
26
|
+
version: 2.5.4
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: debug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|