metanorma-cc 2.3.4 → 2.4.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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8efdbe54be171796accca13bb98afc3b173717b2b2c02b0d23fd67e51987dff9
4
- data.tar.gz: c1bddc69e619f416f1fc807b417bbc01a14db43329d36f056c3f70a1fed3e805
3
+ metadata.gz: aabfe31a3db1633ed85d5e6148447e62fa4fcca3f1bd2f247f8255096b225bfe
4
+ data.tar.gz: 585246f15ca5e5eb9a54b00c06482da576a28e754eebf51eb7f0fa201fb673b9
5
5
  SHA512:
6
- metadata.gz: 67bf1e06d3b18799c2904a4d4fe5642c13b79a328c82aaa60b7665b1d78b2a2d006e302d6c958efa42b2b1ba460b1d1843dcfc38d13b2bd209539af022f13c1e
7
- data.tar.gz: ad309c13a97aa7ee9c6a8f6e13b2442eefce6043cf626b0abcf574c29de1518d737a1afb8ff17094290569cb569ecca1e3e2dd51deb04853a2500ed62ca5ebea
6
+ metadata.gz: d511e3460ceca5253447539b12c5ea50985a8bf39bc51c96e0f9ec8c5e41a7fe279f41d3e06e4a7371e278c35904fb3e6b2a58aa75a4c6bf590d0777b16d370a
7
+ data.tar.gz: 1a4c1d388dc574e46c18b9e42776582883273e6f92f697c83db0542b733c5d670f7479b5a5a65eaf6753c4d85720b62d14ae419d0ed047e0dfa2864552c2310a
data/Gemfile CHANGED
@@ -4,12 +4,6 @@ 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
- group :development, :test do
8
- gem "rspec"
9
- end
10
-
11
- if File.exist? "Gemfile.devel"
12
- eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
13
- end
14
-
15
7
  gemspec
8
+
9
+ eval_gemfile("Gemfile.devel") rescue nil
@@ -8989,14 +8989,16 @@
8989
8989
 
8990
8990
  <xsl:template match="*[local-name() = 'annex']">
8991
8991
  <fo:block break-after="page"/>
8992
- <fo:block id="{@id}">
8992
+ <fo:block>
8993
8993
 
8994
8994
  <xsl:call-template name="setBlockSpanAll"/>
8995
8995
 
8996
8996
  <xsl:call-template name="refine_annex_style"/>
8997
8997
 
8998
8998
  </fo:block>
8999
- <xsl:apply-templates/>
8999
+ <fo:block id="{@id}">
9000
+ <xsl:apply-templates/>
9001
+ </fo:block>
9000
9002
  </xsl:template>
9001
9003
 
9002
9004
  <xsl:template name="refine_annex_style">
@@ -9697,6 +9699,7 @@
9697
9699
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
9698
9700
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
9699
9701
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
9702
+
9700
9703
  <fo:list-item>
9701
9704
  <fo:list-item-label end-indent="label-end()">
9702
9705
  <fo:block role="SKIP">
@@ -9900,10 +9903,10 @@
9900
9903
 
9901
9904
  <xsl:variable name="toc_level">
9902
9905
  <!-- https://www.metanorma.org/author/ref/document-attributes/ -->
9903
- <xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
9906
+ <xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf Number of table of contents levels to render in PDF output; used to override :toclevels:-->
9904
9907
  <xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
9905
9908
  <xsl:choose>
9906
- <xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
9909
+ <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
9907
9910
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
9908
9911
  <xsl:otherwise><!-- default value -->
9909
9912
  2
@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
132
132
  color: red;
133
133
  text-decoration: line-through; }
134
134
 
135
+ ruby {
136
+ ruby-position: over;
137
+ -webkit-ruby-position: before; }
138
+
139
+ ruby ruby {
140
+ ruby-position: under;
141
+ -webkit-ruby-position: after; }
142
+
135
143
  /* code highlighting with line numbers */
136
144
  table.rouge-line-table td.rouge-gutter {
137
145
  -moz-user-select: none;
@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
132
132
  color: red;
133
133
  text-decoration: line-through; }
134
134
 
135
+ ruby {
136
+ ruby-position: over;
137
+ -webkit-ruby-position: before; }
138
+
139
+ ruby ruby {
140
+ ruby-position: under;
141
+ -webkit-ruby-position: after; }
142
+
135
143
  /* code highlighting with line numbers */
136
144
  table.rouge-line-table td.rouge-gutter {
137
145
  -moz-user-select: none;
@@ -397,6 +405,14 @@ a.FootnoteRef, span.FootnoteRef {
397
405
  color: red;
398
406
  text-decoration: line-through; }
399
407
 
408
+ ruby {
409
+ ruby-position: over;
410
+ -webkit-ruby-position: before; }
411
+
412
+ ruby ruby {
413
+ ruby-position: under;
414
+ -webkit-ruby-position: after; }
415
+
400
416
  /* code highlighting with line numbers */
401
417
  table.rouge-line-table td.rouge-gutter {
402
418
  -moz-user-select: none;
@@ -95,8 +95,89 @@
95
95
  <ref name="pagebreak"/>
96
96
  <ref name="hr"/>
97
97
  <ref name="bookmark"/>
98
+ <ref name="amend"/>
98
99
  </choice>
99
100
  </define>
101
+ <define name="amend">
102
+ <element name="amend">
103
+ <ref name="AmendType"/>
104
+ </element>
105
+ </define>
106
+ <define name="AmendType">
107
+ <optional>
108
+ <attribute name="id">
109
+ <data type="ID"/>
110
+ </attribute>
111
+ </optional>
112
+ <attribute name="change">
113
+ <choice>
114
+ <value>add</value>
115
+ <value>modify</value>
116
+ <value>delete</value>
117
+ <value>replace</value>
118
+ </choice>
119
+ </attribute>
120
+ <optional>
121
+ <attribute name="path"/>
122
+ </optional>
123
+ <optional>
124
+ <attribute name="path_end"/>
125
+ </optional>
126
+ <optional>
127
+ <attribute name="title"/>
128
+ </optional>
129
+ <optional>
130
+ <element name="location">
131
+ <zeroOrMore>
132
+ <choice>
133
+ <ref name="locality"/>
134
+ <ref name="localityStack"/>
135
+ </choice>
136
+ </zeroOrMore>
137
+ </element>
138
+ </optional>
139
+ <optional>
140
+ <element name="description">
141
+ <zeroOrMore>
142
+ <ref name="BasicBlock"/>
143
+ </zeroOrMore>
144
+ </element>
145
+ </optional>
146
+ <optional>
147
+ <element name="newcontent">
148
+ <optional>
149
+ <attribute name="id">
150
+ <data type="ID"/>
151
+ </attribute>
152
+ </optional>
153
+ <zeroOrMore>
154
+ <ref name="BasicBlock"/>
155
+ </zeroOrMore>
156
+ </element>
157
+ </optional>
158
+ <zeroOrMore>
159
+ <ref name="classification"/>
160
+ </zeroOrMore>
161
+ <zeroOrMore>
162
+ <ref name="contributor"/>
163
+ </zeroOrMore>
164
+ </define>
165
+ <define name="classification">
166
+ <element name="classification">
167
+ <ref name="classification_tag"/>
168
+ <ref name="classification_value"/>
169
+ </element>
170
+ </define>
171
+ <define name="classification_tag">
172
+ <element name="tag">
173
+ <text/>
174
+ </element>
175
+ </define>
176
+ <define name="classification_value">
177
+ <element name="value">
178
+ <text/>
179
+ </element>
180
+ </define>
100
181
  <define name="paragraph">
101
182
  <element name="p">
102
183
  <ref name="ParagraphType"/>
@@ -715,27 +796,36 @@
715
796
  </define>
716
797
  <define name="ruby">
717
798
  <element name="ruby">
718
- <zeroOrMore>
719
- <choice>
720
- <ref name="PureTextElement"/>
721
- <ref name="rp"/>
722
- <ref name="rt"/>
723
- </choice>
724
- </zeroOrMore>
799
+ <choice>
800
+ <ref name="ruby_pronunciation"/>
801
+ <ref name="ruby_annotation"/>
802
+ </choice>
803
+ <choice>
804
+ <text/>
805
+ <ref name="ruby"/>
806
+ </choice>
725
807
  </element>
726
808
  </define>
727
- <define name="rp">
728
- <element name="rp">
729
- <zeroOrMore>
730
- <ref name="PureTextElement"/>
731
- </zeroOrMore>
809
+ <define name="ruby_pronunciation">
810
+ <element name="pronunciation">
811
+ <attribute name="value"/>
812
+ <optional>
813
+ <attribute name="script"/>
814
+ </optional>
815
+ <optional>
816
+ <attribute name="lang"/>
817
+ </optional>
732
818
  </element>
733
819
  </define>
734
- <define name="rt">
735
- <element name="rt">
736
- <zeroOrMore>
737
- <ref name="PureTextElement"/>
738
- </zeroOrMore>
820
+ <define name="ruby_annotation">
821
+ <element name="annotation">
822
+ <attribute name="value"/>
823
+ <optional>
824
+ <attribute name="script"/>
825
+ </optional>
826
+ <optional>
827
+ <attribute name="lang"/>
828
+ </optional>
739
829
  </element>
740
830
  </define>
741
831
  <define name="br">
@@ -930,18 +1020,12 @@
930
1020
  </optional>
931
1021
  <optional>
932
1022
  <attribute name="width">
933
- <choice>
934
- <data type="int"/>
935
- <value>auto</value>
936
- </choice>
1023
+ <ref name="ImageSize"/>
937
1024
  </attribute>
938
1025
  </optional>
939
1026
  <optional>
940
1027
  <attribute name="height">
941
- <choice>
942
- <data type="int"/>
943
- <value>auto</value>
944
- </choice>
1028
+ <ref name="ImageSize"/>
945
1029
  </attribute>
946
1030
  </optional>
947
1031
  <optional>
@@ -956,6 +1040,14 @@
956
1040
  </attribute>
957
1041
  </optional>
958
1042
  </define>
1043
+ <define name="ImageSize">
1044
+ <choice>
1045
+ <data type="string">
1046
+ <param name="pattern">\d+([.]\d+)?(%?)</param>
1047
+ </data>
1048
+ <value>auto</value>
1049
+ </choice>
1050
+ </define>
959
1051
  <define name="video">
960
1052
  <element name="video">
961
1053
  <attribute name="id">
@@ -9,11 +9,42 @@
9
9
  -->
10
10
  <include href="biblio.rng">
11
11
  <define name="BibData">
12
- <ref name="BibliographicItem"/>
12
+ <ref name="StandardBibliographicItem"/>
13
13
  <optional>
14
14
  <ref name="ext"/>
15
15
  </optional>
16
16
  </define>
17
+ <define name="docrelation">
18
+ <element name="relation">
19
+ <attribute name="type">
20
+ <ref name="DocRelationType"/>
21
+ </attribute>
22
+ <optional>
23
+ <element name="description">
24
+ <ref name="FormattedString"/>
25
+ </element>
26
+ </optional>
27
+ <element name="bibitem">
28
+ <ref name="StandardReducedBibliographicItem"/>
29
+ </element>
30
+ <choice>
31
+ <zeroOrMore>
32
+ <ref name="locality"/>
33
+ </zeroOrMore>
34
+ <zeroOrMore>
35
+ <ref name="localityStack"/>
36
+ </zeroOrMore>
37
+ </choice>
38
+ <choice>
39
+ <zeroOrMore>
40
+ <ref name="sourceLocality"/>
41
+ </zeroOrMore>
42
+ <zeroOrMore>
43
+ <ref name="sourceLocalityStack"/>
44
+ </zeroOrMore>
45
+ </choice>
46
+ </element>
47
+ </define>
17
48
  </include>
18
49
  <define name="ext">
19
50
  <element name="ext">
@@ -161,4 +192,16 @@
161
192
  </optional>
162
193
  </element>
163
194
  </define>
195
+ <define name="StandardBibliographicItem">
196
+ <ref name="BibliographicItem"/>
197
+ <zeroOrMore>
198
+ <ref name="amend"/>
199
+ </zeroOrMore>
200
+ </define>
201
+ <define name="StandardReducedBibliographicItem">
202
+ <ref name="ReducedBibliographicItem"/>
203
+ <zeroOrMore>
204
+ <ref name="amend"/>
205
+ </zeroOrMore>
206
+ </define>
164
207
  </grammar>
@@ -241,6 +241,9 @@
241
241
  </element>
242
242
  </define>
243
243
  <define name="FullNameType">
244
+ <optional>
245
+ <ref name="name_abbreviation"/>
246
+ </optional>
244
247
  <choice>
245
248
  <group>
246
249
  <zeroOrMore>
@@ -266,6 +269,11 @@
266
269
  <ref name="variantname"/>
267
270
  </zeroOrMore>
268
271
  </define>
272
+ <define name="name_abbreviation">
273
+ <element name="abbreviation">
274
+ <ref name="LocalizedString"/>
275
+ </element>
276
+ </define>
269
277
  <define name="prefix">
270
278
  <element name="prefix">
271
279
  <ref name="LocalizedString"/>
@@ -374,6 +382,16 @@
374
382
  <ref name="image"/>
375
383
  </element>
376
384
  </define>
385
+ <define name="depiction">
386
+ <element name="depiction">
387
+ <optional>
388
+ <attribute name="scope"/>
389
+ </optional>
390
+ <zeroOrMore>
391
+ <ref name="image"/>
392
+ </zeroOrMore>
393
+ </element>
394
+ </define>
377
395
  <define name="NameWithVariants">
378
396
  <element name="primary">
379
397
  <ref name="LocalizedString"/>
@@ -760,6 +778,9 @@
760
778
  <optional>
761
779
  <ref name="validity"/>
762
780
  </optional>
781
+ <optional>
782
+ <ref name="depiction"/>
783
+ </optional>
763
784
  </define>
764
785
  <define name="ReducedBibliographicItem">
765
786
  <optional>
@@ -857,6 +878,9 @@
857
878
  <optional>
858
879
  <ref name="validity"/>
859
880
  </optional>
881
+ <optional>
882
+ <ref name="depiction"/>
883
+ </optional>
860
884
  </define>
861
885
  <define name="btitle">
862
886
  <element name="title">
@@ -17,10 +17,19 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.8 -->
20
+ <!-- VERSION v1.2.12 -->
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">
24
+ <define name="amend">
25
+ <element name="amend">
26
+ <ref name="BlockAttributes"/>
27
+ <ref name="AmendType"/>
28
+ <zeroOrMore>
29
+ <ref name="autonumber"/>
30
+ </zeroOrMore>
31
+ </element>
32
+ </define>
24
33
  <define name="admonition">
25
34
  <element name="admonition">
26
35
  <attribute name="type">
@@ -1958,6 +1967,16 @@
1958
1967
  <data type="boolean"/>
1959
1968
  </attribute>
1960
1969
  </optional>
1970
+ <optional>
1971
+ <attribute name="type">
1972
+ <choice>
1973
+ <value>letter</value>
1974
+ <value>symbol</value>
1975
+ <value>formula</value>
1976
+ <value>equation</value>
1977
+ </choice>
1978
+ </attribute>
1979
+ </optional>
1961
1980
  <element name="name">
1962
1981
  <oneOrMore>
1963
1982
  <choice>
@@ -2309,69 +2328,6 @@
2309
2328
  <ref name="CitationType"/>
2310
2329
  </element>
2311
2330
  </define>
2312
- <define name="amend">
2313
- <element name="amend">
2314
- <optional>
2315
- <attribute name="id">
2316
- <data type="ID"/>
2317
- </attribute>
2318
- </optional>
2319
- <attribute name="change">
2320
- <choice>
2321
- <value>add</value>
2322
- <value>modify</value>
2323
- <value>delete</value>
2324
- <value>replace</value>
2325
- </choice>
2326
- </attribute>
2327
- <optional>
2328
- <attribute name="path"/>
2329
- </optional>
2330
- <optional>
2331
- <attribute name="path_end"/>
2332
- </optional>
2333
- <optional>
2334
- <attribute name="title"/>
2335
- </optional>
2336
- <ref name="BlockAttributes"/>
2337
- <optional>
2338
- <element name="location">
2339
- <zeroOrMore>
2340
- <ref name="locality"/>
2341
- </zeroOrMore>
2342
- </element>
2343
- </optional>
2344
- <zeroOrMore>
2345
- <ref name="autonumber"/>
2346
- </zeroOrMore>
2347
- <optional>
2348
- <element name="description">
2349
- <zeroOrMore>
2350
- <ref name="BasicBlock"/>
2351
- </zeroOrMore>
2352
- </element>
2353
- </optional>
2354
- <optional>
2355
- <element name="newcontent">
2356
- <optional>
2357
- <attribute name="id">
2358
- <data type="ID"/>
2359
- </attribute>
2360
- </optional>
2361
- <zeroOrMore>
2362
- <ref name="BasicBlock"/>
2363
- </zeroOrMore>
2364
- </element>
2365
- </optional>
2366
- <optional>
2367
- <element name="description">
2368
- <zeroOrMore>
2369
- <ref name="BasicBlock"/>
2370
- </zeroOrMore>
2371
- </element>
2372
- </optional>
2373
- </element>
2374
- </define>
2375
2331
  <define name="autonumber">
2376
2332
  <element name="autonumber">
2377
2333
  <attribute name="type">
@@ -207,20 +207,4 @@
207
207
  <value>permission</value>
208
208
  </choice>
209
209
  </define>
210
- <define name="classification">
211
- <element name="classification">
212
- <ref name="classification_tag"/>
213
- <ref name="classification_value"/>
214
- </element>
215
- </define>
216
- <define name="classification_tag">
217
- <element name="tag">
218
- <text/>
219
- </element>
220
- </define>
221
- <define name="classification_value">
222
- <element name="value">
223
- <text/>
224
- </element>
225
- </define>
226
210
  </grammar>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "2.3.4".freeze
3
+ VERSION = "2.4.0".freeze
4
4
  end
5
5
  end
data/metanorma-cc.gemspec CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
29
29
  spec.require_paths = ["lib"]
30
30
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
31
31
 
32
- spec.add_dependency "metanorma-generic", "~> 2.5.4"
32
+ spec.add_dependency "metanorma-generic", "~> 2.6.0"
33
33
 
34
34
  spec.add_development_dependency "debug"
35
35
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-cc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.4
4
+ version: 2.4.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: 2023-11-27 00:00:00.000000000 Z
11
+ date: 2024-01-09 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.4
19
+ version: 2.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: 2.5.4
26
+ version: 2.6.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement