metanorma-generic 2.0.4 → 2.1.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/isodoc/generic/html/html_generic_titlepage.html +2 -0
- data/lib/isodoc/generic/html/word_generic_titlepage.html +4 -0
- data/lib/isodoc/generic/init.rb +2 -2
- data/lib/isodoc/generic/presentation_xml_convert.rb +4 -5
- data/lib/metanorma/generic/biblio.rng +62 -10
- data/lib/metanorma/generic/isodoc.rng +56 -0
- data/lib/metanorma/generic/version.rb +1 -1
- data/metanorma-generic.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: 8c262a3e06b94acff866441168d02ca8b127dcdbcf4ab05050c807d0e636adcc
|
|
4
|
+
data.tar.gz: 133c5dd41e5aedb7c2b68369cc9a54ecc9eda3113221da4afc90847ca2f9b113
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f1a2f73f6898381fa004da28eb1bfc0dd068f5e04e7780c39f5a70ba7ac0dd0ea5bc12154182d9363778ebac9bad636d6288948684757f30a888a0e0232371eb
|
|
7
|
+
data.tar.gz: 7e7ab0b187be8894af035b919f949409418acc1d66d3c0b6c12ebbdacfe041c0d9428ebe6f114da9cee00252e2cb228c9674a2b1fa0e2a76772465875a23b9a5
|
|
@@ -64,6 +64,10 @@ documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-si
|
|
|
64
64
|
|
|
65
65
|
{% endif %}
|
|
66
66
|
|
|
67
|
+
<div class="coverpage-warning" id="coverpage-note-destination" align="center" style='margin-bottom:6.0pt;text-align:center;
|
|
68
|
+
border:none;mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:
|
|
69
|
+
1.0pt 4.0pt 1.0pt 4.0pt'/>
|
|
70
|
+
|
|
67
71
|
</div>
|
|
68
72
|
|
|
69
73
|
<p class="MsoNormal" align="center" style='text-align:center'><span lang="EN-GB"
|
data/lib/isodoc/generic/init.rb
CHANGED
|
@@ -11,7 +11,7 @@ module IsoDoc
|
|
|
11
11
|
@meta = Metadata.new(lang, script, i18n)
|
|
12
12
|
end
|
|
13
13
|
|
|
14
|
-
def xref_init(lang, script,
|
|
14
|
+
def xref_init(lang, script, _klass, i18n, options)
|
|
15
15
|
html = HtmlConvert.new(language: lang, script: script)
|
|
16
16
|
@xrefs = Xref.new(lang, script, html, i18n, options)
|
|
17
17
|
end
|
|
@@ -20,7 +20,7 @@ module IsoDoc
|
|
|
20
20
|
f = Metanorma::Generic.configuration.i18nyaml
|
|
21
21
|
f = nil unless f.is_a? String
|
|
22
22
|
@i18n = I18n.new(
|
|
23
|
-
lang, script, i18nyaml || f || @i18nyaml)
|
|
23
|
+
lang, script, i18nyaml: i18nyaml || f || @i18nyaml)
|
|
24
24
|
end
|
|
25
25
|
|
|
26
26
|
include Utils
|
|
@@ -5,16 +5,15 @@ require "isodoc"
|
|
|
5
5
|
module IsoDoc
|
|
6
6
|
module Generic
|
|
7
7
|
class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
|
|
8
|
-
def annex1(
|
|
9
|
-
lbl = @xrefs.anchor(
|
|
10
|
-
if t =
|
|
8
|
+
def annex1(elem)
|
|
9
|
+
lbl = @xrefs.anchor(elem["id"], :label)
|
|
10
|
+
if t = elem.at(ns("./title"))
|
|
11
11
|
t.children = "<strong>#{t.children.to_xml}</strong>"
|
|
12
12
|
end
|
|
13
|
-
prefix_name(
|
|
13
|
+
prefix_name(elem, "<br/>", lbl, "title")
|
|
14
14
|
end
|
|
15
15
|
|
|
16
16
|
include Init
|
|
17
17
|
end
|
|
18
18
|
end
|
|
19
19
|
end
|
|
20
|
-
|
|
@@ -527,7 +527,7 @@
|
|
|
527
527
|
</define>
|
|
528
528
|
<define name="LocalityType">
|
|
529
529
|
<data type="string">
|
|
530
|
-
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
|
530
|
+
<param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
|
531
531
|
</data>
|
|
532
532
|
</define>
|
|
533
533
|
<define name="referenceFrom">
|
|
@@ -677,6 +677,9 @@
|
|
|
677
677
|
<zeroOrMore>
|
|
678
678
|
<ref name="extent"/>
|
|
679
679
|
</zeroOrMore>
|
|
680
|
+
<optional>
|
|
681
|
+
<ref name="bibliographic_size"/>
|
|
682
|
+
</optional>
|
|
680
683
|
<zeroOrMore>
|
|
681
684
|
<ref name="accesslocation"/>
|
|
682
685
|
</zeroOrMore>
|
|
@@ -848,17 +851,46 @@
|
|
|
848
851
|
</define>
|
|
849
852
|
<define name="bplace">
|
|
850
853
|
<element name="place">
|
|
851
|
-
<
|
|
852
|
-
<
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
854
|
+
<choice>
|
|
855
|
+
<text/>
|
|
856
|
+
<group>
|
|
857
|
+
<ref name="bibliocity"/>
|
|
858
|
+
<zeroOrMore>
|
|
859
|
+
<ref name="biblioregion"/>
|
|
860
|
+
</zeroOrMore>
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<ref name="bibliocountry"/>
|
|
863
|
+
</zeroOrMore>
|
|
864
|
+
</group>
|
|
865
|
+
</choice>
|
|
866
|
+
</element>
|
|
867
|
+
</define>
|
|
868
|
+
<define name="bibliocity">
|
|
869
|
+
<element name="city">
|
|
859
870
|
<text/>
|
|
860
871
|
</element>
|
|
861
872
|
</define>
|
|
873
|
+
<define name="biblioregion">
|
|
874
|
+
<element name="region">
|
|
875
|
+
<ref name="RegionType"/>
|
|
876
|
+
</element>
|
|
877
|
+
</define>
|
|
878
|
+
<define name="bibliocountry">
|
|
879
|
+
<element name="country">
|
|
880
|
+
<ref name="RegionType"/>
|
|
881
|
+
</element>
|
|
882
|
+
</define>
|
|
883
|
+
<define name="RegionType">
|
|
884
|
+
<optional>
|
|
885
|
+
<attribute name="iso"/>
|
|
886
|
+
</optional>
|
|
887
|
+
<optional>
|
|
888
|
+
<attribute name="recommended">
|
|
889
|
+
<data type="boolean"/>
|
|
890
|
+
</attribute>
|
|
891
|
+
</optional>
|
|
892
|
+
<text/>
|
|
893
|
+
</define>
|
|
862
894
|
<define name="bprice">
|
|
863
895
|
<element name="price">
|
|
864
896
|
<attribute name="currency"/>
|
|
@@ -922,9 +954,29 @@
|
|
|
922
954
|
<text/>
|
|
923
955
|
</element>
|
|
924
956
|
</define>
|
|
957
|
+
<define name="sizevalue">
|
|
958
|
+
<element name="value">
|
|
959
|
+
<attribute name="type"/>
|
|
960
|
+
<text/>
|
|
961
|
+
</element>
|
|
962
|
+
</define>
|
|
963
|
+
<define name="bibliographic_size">
|
|
964
|
+
<element name="size">
|
|
965
|
+
<oneOrMore>
|
|
966
|
+
<ref name="sizevalue"/>
|
|
967
|
+
</oneOrMore>
|
|
968
|
+
</element>
|
|
969
|
+
</define>
|
|
925
970
|
<define name="extent">
|
|
926
971
|
<element name="extent">
|
|
927
|
-
<
|
|
972
|
+
<choice>
|
|
973
|
+
<zeroOrMore>
|
|
974
|
+
<ref name="locality"/>
|
|
975
|
+
</zeroOrMore>
|
|
976
|
+
<zeroOrMore>
|
|
977
|
+
<ref name="localityStack"/>
|
|
978
|
+
</zeroOrMore>
|
|
979
|
+
</choice>
|
|
928
980
|
</element>
|
|
929
981
|
</define>
|
|
930
982
|
<define name="series">
|
|
@@ -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>
|
|
@@ -851,6 +888,16 @@
|
|
|
851
888
|
<ref name="MultilingualRenderingType"/>
|
|
852
889
|
</attribute>
|
|
853
890
|
</optional>
|
|
891
|
+
<optional>
|
|
892
|
+
<attribute name="coverpage">
|
|
893
|
+
<data type="boolean"/>
|
|
894
|
+
</attribute>
|
|
895
|
+
</optional>
|
|
896
|
+
<optional>
|
|
897
|
+
<attribute name="notag">
|
|
898
|
+
<data type="boolean"/>
|
|
899
|
+
</attribute>
|
|
900
|
+
</optional>
|
|
854
901
|
<oneOrMore>
|
|
855
902
|
<choice>
|
|
856
903
|
<ref name="paragraph"/>
|
|
@@ -1178,6 +1225,7 @@
|
|
|
1178
1225
|
<ref name="concept"/>
|
|
1179
1226
|
<ref name="add"/>
|
|
1180
1227
|
<ref name="del"/>
|
|
1228
|
+
<ref name="span"/>
|
|
1181
1229
|
</choice>
|
|
1182
1230
|
</define>
|
|
1183
1231
|
<define name="add">
|
|
@@ -1204,6 +1252,14 @@
|
|
|
1204
1252
|
</choice>
|
|
1205
1253
|
</element>
|
|
1206
1254
|
</define>
|
|
1255
|
+
<define name="span">
|
|
1256
|
+
<element name="span">
|
|
1257
|
+
<attribute name="class"/>
|
|
1258
|
+
<oneOrMore>
|
|
1259
|
+
<ref name="TextElement"/>
|
|
1260
|
+
</oneOrMore>
|
|
1261
|
+
</element>
|
|
1262
|
+
</define>
|
|
1207
1263
|
<define name="concept">
|
|
1208
1264
|
<element name="concept">
|
|
1209
1265
|
<optional>
|
data/metanorma-generic.gemspec
CHANGED
|
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
|
28
28
|
|
|
29
29
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
30
|
-
spec.add_dependency "metanorma-standoc", "~> 2.
|
|
30
|
+
spec.add_dependency "metanorma-standoc", "~> 2.1.0"
|
|
31
31
|
spec.add_dependency "ruby-jing"
|
|
32
32
|
|
|
33
33
|
spec.add_development_dependency "debug"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-generic
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0
|
|
4
|
+
version: 2.1.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: 2022-
|
|
11
|
+
date: 2022-05-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: htmlentities
|
|
@@ -30,14 +30,14 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 2.
|
|
33
|
+
version: 2.1.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: 2.
|
|
40
|
+
version: 2.1.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: ruby-jing
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|