metanorma-csa 1.9.4 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -32
  3. data/.gitignore +3 -0
  4. data/bin/console +1 -1
  5. data/lib/isodoc/csa/csa.standard.xsl +1632 -1377
  6. data/lib/isodoc/csa/html/htmlstyle.css +40 -26
  7. data/lib/isodoc/csa/html/htmlstyle.scss +18 -11
  8. data/lib/isodoc/csa/html/wordstyle.css +30 -18
  9. data/lib/isodoc/csa/html/wordstyle.scss +30 -18
  10. data/lib/{asciidoctor → metanorma}/csa/basicdoc.rng +0 -0
  11. data/lib/{asciidoctor → metanorma}/csa/biblio.rng +2 -2
  12. data/lib/{asciidoctor → metanorma}/csa/boilerplate.xml +0 -0
  13. data/lib/{asciidoctor → metanorma}/csa/converter.rb +2 -2
  14. data/lib/{asciidoctor → metanorma}/csa/csa.rng +0 -0
  15. data/lib/{asciidoctor → metanorma}/csa/isodoc.rng +104 -3
  16. data/lib/{asciidoctor → metanorma}/csa/reqt.rng +0 -0
  17. data/lib/metanorma/csa/version.rb +1 -1
  18. data/lib/metanorma-csa.rb +1 -1
  19. data/metanorma-csa.gemspec +1 -1
  20. data/metanorma.yml +1 -1
  21. metadata +11 -12
  22. data/lib/asciidoctor/csa.rb +0 -5
data/lib/{asciidoctor → metanorma}/csa/isodoc.rng RENAMED
@@ -32,6 +32,56 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="index">
36
+ <element name="index">
37
+ <optional>
38
+ <attribute name="to">
39
+ <data type="IDREF"/>
40
+ </attribute>
41
+ </optional>
42
+ <element name="primary">
43
+ <oneOrMore>
44
+ <choice>
45
+ <ref name="PureTextElement"/>
46
+ <ref name="stem"/>
47
+ </choice>
48
+ </oneOrMore>
49
+ </element>
50
+ <optional>
51
+ <element name="secondary">
52
+ <oneOrMore>
53
+ <choice>
54
+ <ref name="PureTextElement"/>
55
+ <ref name="stem"/>
56
+ </choice>
57
+ </oneOrMore>
58
+ </element>
59
+ </optional>
60
+ <optional>
61
+ <element name="tertiary">
62
+ <oneOrMore>
63
+ <choice>
64
+ <ref name="PureTextElement"/>
65
+ <ref name="stem"/>
66
+ </choice>
67
+ </oneOrMore>
68
+ </element>
69
+ </optional>
70
+ </element>
71
+ </define>
72
+ <define name="bibitem">
73
+ <element name="bibitem">
74
+ <attribute name="id">
75
+ <data type="ID"/>
76
+ </attribute>
77
+ <optional>
78
+ <attribute name="hidden">
79
+ <data type="boolean"/>
80
+ </attribute>
81
+ </optional>
82
+ <ref name="BibliographicItem"/>
83
+ </element>
84
+ </define>
35
85
  <define name="section-title">
36
86
  <element name="title">
37
87
  <zeroOrMore>
@@ -690,6 +740,7 @@
690
740
  <ref name="terms"/>
691
741
  <ref name="term-clause"/>
692
742
  <ref name="definitions"/>
743
+ <ref name="floating-title"/>
693
744
  </choice>
694
745
  </oneOrMore>
695
746
  </element>
@@ -1013,6 +1064,26 @@
1013
1064
  </zeroOrMore>
1014
1065
  </element>
1015
1066
  </define>
1067
+ <define name="sub">
1068
+ <element name="sub">
1069
+ <zeroOrMore>
1070
+ <choice>
1071
+ <ref name="PureTextElement"/>
1072
+ <ref name="stem"/>
1073
+ </choice>
1074
+ </zeroOrMore>
1075
+ </element>
1076
+ </define>
1077
+ <define name="sup">
1078
+ <element name="sup">
1079
+ <zeroOrMore>
1080
+ <choice>
1081
+ <ref name="PureTextElement"/>
1082
+ <ref name="stem"/>
1083
+ </choice>
1084
+ </zeroOrMore>
1085
+ </element>
1086
+ </define>
1016
1087
  <define name="pagebreak">
1017
1088
  <element name="pagebreak">
1018
1089
  <optional>
@@ -1680,6 +1751,7 @@
1680
1751
  <ref name="clause-subsection"/>
1681
1752
  <ref name="terms"/>
1682
1753
  <ref name="definitions"/>
1754
+ <ref name="floating-title"/>
1683
1755
  </choice>
1684
1756
  </oneOrMore>
1685
1757
  </choice>
@@ -1722,6 +1794,7 @@
1722
1794
  <ref name="terms"/>
1723
1795
  <ref name="definitions"/>
1724
1796
  <ref name="references"/>
1797
+ <ref name="floating-title"/>
1725
1798
  </choice>
1726
1799
  </zeroOrMore>
1727
1800
  </group>
@@ -1973,7 +2046,11 @@
1973
2046
  </optional>
1974
2047
  <element name="name">
1975
2048
  <zeroOrMore>
1976
- <ref name="PureTextElement"/>
2049
+ <choice>
2050
+ <ref name="PureTextElement"/>
2051
+ <ref name="stem"/>
2052
+ <ref name="index"/>
2053
+ </choice>
1977
2054
  </zeroOrMore>
1978
2055
  </element>
1979
2056
  <optional>
@@ -1987,7 +2064,7 @@
1987
2064
  </element>
1988
2065
  </optional>
1989
2066
  <optional>
1990
- <element name="grammar-info">
2067
+ <element name="grammar">
1991
2068
  <ref name="Grammar"/>
1992
2069
  </element>
1993
2070
  </optional>
@@ -2196,7 +2273,18 @@
2196
2273
  <ref name="MultilingualRenderingType"/>
2197
2274
  </attribute>
2198
2275
  </optional>
2199
- <ref name="paragraph"/>
2276
+ <oneOrMore>
2277
+ <choice>
2278
+ <ref name="formula"/>
2279
+ <ref name="ul"/>
2280
+ <ref name="ol"/>
2281
+ <ref name="dl"/>
2282
+ <ref name="quote"/>
2283
+ <ref name="sourcecode"/>
2284
+ <ref name="paragraph"/>
2285
+ <ref name="figure"/>
2286
+ </choice>
2287
+ </oneOrMore>
2200
2288
  </element>
2201
2289
  </define>
2202
2290
  <define name="termsource">
@@ -2530,4 +2618,17 @@
2530
2618
  </oneOrMore>
2531
2619
  </element>
2532
2620
  </define>
2621
+ <define name="floating-title">
2622
+ <element name="floating-title">
2623
+ <attribute name="id">
2624
+ <data type="ID"/>
2625
+ </attribute>
2626
+ <attribute name="depth">
2627
+ <data type="int"/>
2628
+ </attribute>
2629
+ <zeroOrMore>
2630
+ <ref name="TextElement"/>
2631
+ </zeroOrMore>
2632
+ </element>
2633
+ </define>
2533
2634
  </grammar>
data/lib/{asciidoctor → metanorma}/csa/reqt.rng RENAMED
File without changes
data/lib/metanorma/csa/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Csa
3
- VERSION = "1.9.4".freeze
3
+ VERSION = "2.0.2".freeze
4
4
  end
5
5
  end
data/lib/metanorma-csa.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require 'asciidoctor' unless defined? Asciidoctor::Converter
2
- require_relative 'asciidoctor/csa/converter'
2
+ require_relative 'metanorma/csa/converter'
3
3
  require_relative 'isodoc/csa/html_convert'
4
4
  require_relative 'isodoc/csa/pdf_convert'
5
5
  require_relative 'isodoc/csa/word_convert'
data/metanorma-csa.gemspec CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.require_paths = ["lib"]
29
29
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
30
30
 
31
- spec.add_dependency "metanorma-generic", "~> 1.11.0"
31
+ spec.add_dependency "metanorma-generic", "~> 2.0.0"
32
32
 
33
33
  spec.add_development_dependency "debug"
34
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
data/metanorma.yml CHANGED
@@ -6,7 +6,7 @@ xml_root_tag: csa-standard
6
6
  html_bodyfont: 'Lato,"Source Sans Pro",sans-serif'
7
7
  html_headerfont: 'Lato,"Source Sans Pro",sans-serif'
8
8
  html_monospacefont: '"Source Code Pro",monospace'
9
- validate_rng_file: lib/asciidoctor/csa/csa.rng
9
+ validate_rng_file: lib/metanorma/csa/csa.rng
10
10
  htmlcoverpage: lib/isodoc/csa/html/html_csa_titlepage.html
11
11
  htmlintropage: lib/isodoc/csa/html/html_csa_intro.html
12
12
  htmlstylesheet: lib/isodoc/csa/html/htmlstyle.scss
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.4
4
+ version: 2.0.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: 2021-12-13 00:00:00.000000000 Z
11
+ date: 2022-01-22 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: 1.11.0
19
+ version: 2.0.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: 1.11.0
26
+ version: 2.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,6 @@ files:
188
188
  - bin/console
189
189
  - bin/rspec
190
190
  - bin/setup
191
- - lib/asciidoctor/csa.rb
192
- - lib/asciidoctor/csa/basicdoc.rng
193
- - lib/asciidoctor/csa/biblio.rng
194
- - lib/asciidoctor/csa/boilerplate.xml
195
- - lib/asciidoctor/csa/converter.rb
196
- - lib/asciidoctor/csa/csa.rng
197
- - lib/asciidoctor/csa/isodoc.rng
198
- - lib/asciidoctor/csa/reqt.rng
199
191
  - lib/isodoc/csa/base_convert.rb
200
192
  - lib/isodoc/csa/csa.standard.xsl
201
193
  - lib/isodoc/csa/html/csa-logo-white.png
@@ -225,7 +217,14 @@ files:
225
217
  - lib/isodoc/csa/xref.rb
226
218
  - lib/metanorma-csa.rb
227
219
  - lib/metanorma/csa.rb
220
+ - lib/metanorma/csa/basicdoc.rng
221
+ - lib/metanorma/csa/biblio.rng
222
+ - lib/metanorma/csa/boilerplate.xml
223
+ - lib/metanorma/csa/converter.rb
224
+ - lib/metanorma/csa/csa.rng
225
+ - lib/metanorma/csa/isodoc.rng
228
226
  - lib/metanorma/csa/processor.rb
227
+ - lib/metanorma/csa/reqt.rng
229
228
  - lib/metanorma/csa/version.rb
230
229
  - metanorma-csa.gemspec
231
230
  - metanorma.yml
data/lib/asciidoctor/csa.rb DELETED
@@ -1,5 +0,0 @@
1
- module Asciidoctor
2
- module Csa
3
- # Your code goes here...
4
- end
5
- end