metanorma-mpfa 0.8.8 → 0.9.2
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/mpfa/html/html_rsd_titlepage.html +2 -0
- data/lib/isodoc/mpfa/html/htmlstyle.css +6 -0
- data/lib/isodoc/mpfa/html/htmlstyle.scss +1 -0
- data/lib/isodoc/mpfa/html/rsd.css +16 -8
- data/lib/isodoc/mpfa/html/rsd.scss +16 -7
- data/lib/isodoc/mpfa/html/word_rsd_titlepage.html +4 -2
- data/lib/isodoc/mpfa/i18n.rb +1 -1
- data/lib/isodoc/mpfa/init.rb +1 -1
- data/lib/isodoc/mpfa/mpfa.circular.xsl +1633 -337
- data/lib/isodoc/mpfa/mpfa.compliance-standards-for-mpf-trustees.xsl +1633 -337
- data/lib/isodoc/mpfa/mpfa.guidelines.xsl +1633 -337
- data/lib/isodoc/mpfa/mpfa.standards.xsl +1633 -337
- data/lib/isodoc/mpfa/mpfa.supervision-of-mpf-intermediaries.xsl +1633 -337
- data/lib/isodoc/mpfa/word_convert.rb +1 -1
- data/lib/isodoc/mpfa/xref.rb +17 -10
- data/lib/metanorma/mpfa/biblio.rng +69 -42
- data/lib/metanorma/mpfa/isodoc.rng +65 -0
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.gemspec +1 -1
- metadata +5 -5
data/lib/isodoc/mpfa/xref.rb
CHANGED
|
@@ -4,14 +4,20 @@ module IsoDoc
|
|
|
4
4
|
FRONT_CLAUSE = "//*[parent::preface]".freeze
|
|
5
5
|
|
|
6
6
|
def initial_anchor_names(doc)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
if @parse_settings.empty? || @parse_settings[:clauses]
|
|
8
|
+
doc.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
|
|
9
|
+
preface_names(c)
|
|
10
|
+
end
|
|
11
|
+
clause_names(doc, 0)
|
|
12
|
+
end
|
|
13
|
+
if @parse_settings.empty?
|
|
14
|
+
doc.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
|
|
15
|
+
sequential_asset_names(c)
|
|
16
|
+
end
|
|
17
|
+
middle_section_asset_names(doc)
|
|
18
|
+
termnote_anchor_names(doc)
|
|
19
|
+
termexample_anchor_names(doc)
|
|
10
20
|
end
|
|
11
|
-
middle_section_asset_names(doc)
|
|
12
|
-
clause_names(doc, 0)
|
|
13
|
-
termnote_anchor_names(doc)
|
|
14
|
-
termexample_anchor_names(doc)
|
|
15
21
|
end
|
|
16
22
|
|
|
17
23
|
def annex_name_lbl(_clause, num)
|
|
@@ -83,11 +89,12 @@ module IsoDoc
|
|
|
83
89
|
|
|
84
90
|
def annex_names(clause, num)
|
|
85
91
|
@anchors[clause["id"]] = annex_name_anchors(clause, num)
|
|
86
|
-
if
|
|
87
|
-
annex_names1(
|
|
92
|
+
if @klass.single_term_clause?(clause)
|
|
93
|
+
annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
|
|
94
|
+
num.to_s, 1)
|
|
88
95
|
else
|
|
89
96
|
i = 0
|
|
90
|
-
clause.xpath(ns("./clause | ./references")).each do |c|
|
|
97
|
+
clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).each do |c|
|
|
91
98
|
container_names(c, 0)
|
|
92
99
|
i = annex_naming(c, num, 1, i)
|
|
93
100
|
end
|
|
@@ -614,12 +614,12 @@
|
|
|
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
623
|
<zeroOrMore>
|
|
624
624
|
<ref name="bsource"/>
|
|
625
625
|
</zeroOrMore>
|
|
@@ -851,17 +851,46 @@
|
|
|
851
851
|
</define>
|
|
852
852
|
<define name="bplace">
|
|
853
853
|
<element name="place">
|
|
854
|
-
<
|
|
855
|
-
<
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
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">
|
|
862
870
|
<text/>
|
|
863
871
|
</element>
|
|
864
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>
|
|
865
894
|
<define name="bprice">
|
|
866
895
|
<element name="price">
|
|
867
896
|
<attribute name="currency"/>
|
|
@@ -957,36 +986,34 @@
|
|
|
957
986
|
<ref name="SeriesType"/>
|
|
958
987
|
</attribute>
|
|
959
988
|
</optional>
|
|
960
|
-
<
|
|
989
|
+
<optional>
|
|
961
990
|
<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>
|
|
991
|
+
</optional>
|
|
992
|
+
<ref name="btitle"/>
|
|
993
|
+
<optional>
|
|
994
|
+
<ref name="bplace"/>
|
|
995
|
+
</optional>
|
|
996
|
+
<optional>
|
|
997
|
+
<ref name="seriesorganization"/>
|
|
998
|
+
</optional>
|
|
999
|
+
<optional>
|
|
1000
|
+
<ref name="abbreviation"/>
|
|
1001
|
+
</optional>
|
|
1002
|
+
<optional>
|
|
1003
|
+
<ref name="seriesfrom"/>
|
|
1004
|
+
</optional>
|
|
1005
|
+
<optional>
|
|
1006
|
+
<ref name="seriesto"/>
|
|
1007
|
+
</optional>
|
|
1008
|
+
<optional>
|
|
1009
|
+
<ref name="seriesnumber"/>
|
|
1010
|
+
</optional>
|
|
1011
|
+
<optional>
|
|
1012
|
+
<ref name="seriespartnumber"/>
|
|
1013
|
+
</optional>
|
|
1014
|
+
<optional>
|
|
1015
|
+
<ref name="seriesrun"/>
|
|
1016
|
+
</optional>
|
|
990
1017
|
</element>
|
|
991
1018
|
</define>
|
|
992
1019
|
<define name="SeriesType">
|
|
@@ -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"/>
|
|
@@ -851,6 +897,16 @@
|
|
|
851
897
|
<ref name="MultilingualRenderingType"/>
|
|
852
898
|
</attribute>
|
|
853
899
|
</optional>
|
|
900
|
+
<optional>
|
|
901
|
+
<attribute name="coverpage">
|
|
902
|
+
<data type="boolean"/>
|
|
903
|
+
</attribute>
|
|
904
|
+
</optional>
|
|
905
|
+
<optional>
|
|
906
|
+
<attribute name="notag">
|
|
907
|
+
<data type="boolean"/>
|
|
908
|
+
</attribute>
|
|
909
|
+
</optional>
|
|
854
910
|
<oneOrMore>
|
|
855
911
|
<choice>
|
|
856
912
|
<ref name="paragraph"/>
|
|
@@ -1178,6 +1234,7 @@
|
|
|
1178
1234
|
<ref name="concept"/>
|
|
1179
1235
|
<ref name="add"/>
|
|
1180
1236
|
<ref name="del"/>
|
|
1237
|
+
<ref name="span"/>
|
|
1181
1238
|
</choice>
|
|
1182
1239
|
</define>
|
|
1183
1240
|
<define name="add">
|
|
@@ -1204,6 +1261,14 @@
|
|
|
1204
1261
|
</choice>
|
|
1205
1262
|
</element>
|
|
1206
1263
|
</define>
|
|
1264
|
+
<define name="span">
|
|
1265
|
+
<element name="span">
|
|
1266
|
+
<attribute name="class"/>
|
|
1267
|
+
<oneOrMore>
|
|
1268
|
+
<ref name="TextElement"/>
|
|
1269
|
+
</oneOrMore>
|
|
1270
|
+
</element>
|
|
1271
|
+
</define>
|
|
1207
1272
|
<define name="concept">
|
|
1208
1273
|
<element name="concept">
|
|
1209
1274
|
<optional>
|
data/metanorma-mpfd.gemspec
CHANGED
|
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
|
29
29
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
|
30
30
|
|
|
31
31
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
32
|
-
spec.add_dependency "metanorma-standoc", "~> 2.
|
|
32
|
+
spec.add_dependency "metanorma-standoc", "~> 2.1.0"
|
|
33
33
|
spec.add_dependency "twitter_cldr"
|
|
34
34
|
|
|
35
35
|
spec.add_development_dependency "debug"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-mpfa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.9.2
|
|
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-06 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: twitter_cldr
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
282
282
|
- !ruby/object:Gem::Version
|
|
283
283
|
version: '0'
|
|
284
284
|
requirements: []
|
|
285
|
-
rubygems_version: 3.3.
|
|
285
|
+
rubygems_version: 3.3.7
|
|
286
286
|
signing_key:
|
|
287
287
|
specification_version: 4
|
|
288
288
|
summary: metanorma-mpfa lets you write MPFA documents in AsciiDoc.
|