metanorma-cc 1.8.1 → 1.8.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/cc/converter.rb +6 -6
  3. data/lib/asciidoctor/cc/isodoc.rng +61 -18
  4. data/lib/isodoc/cc/cc.standard.xsl +328 -92
  5. data/lib/isodoc/cc/html/_coverpage.css +9 -0
  6. data/lib/isodoc/cc/html/htmlstyle.css +29 -9
  7. data/lib/isodoc/cc/html/htmlstyle.scss +9 -6
  8. data/lib/isodoc/cc/html/scripts.html +0 -1
  9. data/lib/isodoc/cc/html/wordstyle.css +30 -18
  10. data/lib/isodoc/cc/html/wordstyle.scss +30 -18
  11. data/lib/metanorma/cc/version.rb +1 -1
  12. data/metanorma-cc.gemspec +1 -1
  13. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e6773b2389fcbb144d384002256bd7ba303aab7baa25f20ac37b0d40af9ae451
4
- data.tar.gz: ad6d676e3086792134308b0e0abeb32f4a21b65141a923ddb8fe4303d8d822b8
3
+ metadata.gz: 8ca9d11e9a1712f3e8b12ff30290c84a576ddaf07da9345dfe2db4bed5fc6a97
4
+ data.tar.gz: e7cfe501e34131655a6f6d6af1fa7281bdadf83cddd4360c7d69ee0c8ab592ac
5
5
  SHA512:
6
- metadata.gz: 3f0bc68cc852e0ed53dc3a97009a8d4ebd73d0deadc1950bb34c77e2587d11c4840e1f56308c597ed821d2cae87c8b8a681c94902fc811c6dd62662c7f69e58b
7
- data.tar.gz: 8fc55cd529d92cdaf66d93f37979b618df59d3a1e2883480661660795d4f1676756dfee017efc2977c39693cfdd6ff7d44bf0a48748b038bcce7b0a7bf8a9606
6
+ metadata.gz: c0b42e16d5b0a2ed8c8fc9d363c6382a2c37cff259a581be0cd06a77f97999a5697de53917d1b9ced4fea904498d3ebb5e17bb8de34f5048c82f513909862a31
7
+ data.tar.gz: 83dad53d5276c70a3e5cd1eb67134e035b91f84f2b2a390bf6c38843f09c4f8e14914013d70cbe021e21506ffef5367617fd5e927da32dfa1a5e8b06ce55e4f4
data/lib/asciidoctor/cc/converter.rb CHANGED
@@ -35,13 +35,13 @@ module Asciidoctor
35
35
  end
36
36
 
37
37
  def outputs(node, ret)
38
- File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
39
- presentation_xml_converter(node).convert(@filename + ".xml")
40
- html_converter(node).convert(@filename + ".presentation.xml",
38
+ File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
39
+ presentation_xml_converter(node).convert("#{@filename}.xml")
40
+ html_converter(node).convert("#{@filename}.presentation.xml",
41
41
  nil, false, "#{@filename}.html")
42
- doc_converter(node).convert(@filename + ".presentation.xml",
42
+ doc_converter(node).convert("#{@filename}.presentation.xml",
43
43
  nil, false, "#{@filename}.doc")
44
- pdf_converter(node)&.convert(@filename + ".presentation.xml",
44
+ pdf_converter(node)&.convert("#{@filename}.presentation.xml",
45
45
  nil, false, "#{@filename}.pdf")
46
46
  end
47
47
 
@@ -52,7 +52,7 @@ module Asciidoctor
52
52
  def pdf_converter(node)
53
53
  return if node.attr("no-pdf")
54
54
 
55
- IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
55
+ IsoDoc::CC::PdfConvert.new(pdf_extract_attributes(node))
56
56
  end
57
57
 
58
58
  def doc_converter(node)
data/lib/asciidoctor/cc/isodoc.rng CHANGED
@@ -58,7 +58,7 @@
58
58
  <attribute name="alt"/>
59
59
  </optional>
60
60
  <optional>
61
- <attribute name="updatetype">
61
+ <attribute name="update-type">
62
62
  <data type="boolean"/>
63
63
  </attribute>
64
64
  </optional>
@@ -1796,6 +1796,20 @@
1796
1796
  <data type="ID"/>
1797
1797
  </attribute>
1798
1798
  </optional>
1799
+ <optional>
1800
+ <attribute name="language"/>
1801
+ </optional>
1802
+ <optional>
1803
+ <attribute name="script"/>
1804
+ </optional>
1805
+ <optional>
1806
+ <attribute name="tag"/>
1807
+ </optional>
1808
+ <optional>
1809
+ <attribute name="multilingual-rendering">
1810
+ <ref name="MultilingualRenderingType"/>
1811
+ </attribute>
1812
+ </optional>
1799
1813
  <oneOrMore>
1800
1814
  <ref name="preferred"/>
1801
1815
  </oneOrMore>
@@ -1814,9 +1828,6 @@
1814
1828
  <optional>
1815
1829
  <ref name="termsubject"/>
1816
1830
  </optional>
1817
- <optional>
1818
- <ref name="termusage"/>
1819
- </optional>
1820
1831
  <oneOrMore>
1821
1832
  <ref name="termdefinition"/>
1822
1833
  </oneOrMore>
@@ -1880,17 +1891,37 @@
1880
1891
  </attribute>
1881
1892
  </optional>
1882
1893
  <optional>
1883
- <attribute name="geographicArea"/>
1894
+ <attribute name="geographic-area"/>
1884
1895
  </optional>
1885
1896
  <choice>
1886
1897
  <ref name="expression_designation"/>
1887
1898
  <ref name="letter_symbol_designation"/>
1888
1899
  <ref name="graphical_symbol_designation"/>
1889
1900
  </choice>
1901
+ <optional>
1902
+ <ref name="fieldofapplication"/>
1903
+ </optional>
1904
+ <optional>
1905
+ <ref name="usageinfo"/>
1906
+ </optional>
1890
1907
  <zeroOrMore>
1891
1908
  <ref name="termsource"/>
1892
1909
  </zeroOrMore>
1893
1910
  </define>
1911
+ <define name="fieldofapplication">
1912
+ <element name="field-of-application">
1913
+ <oneOrMore>
1914
+ <ref name="PureTextElement"/>
1915
+ </oneOrMore>
1916
+ </element>
1917
+ </define>
1918
+ <define name="usageinfo">
1919
+ <element name="usage-info">
1920
+ <oneOrMore>
1921
+ <ref name="PureTextElement"/>
1922
+ </oneOrMore>
1923
+ </element>
1924
+ </define>
1894
1925
  <define name="letter_symbol_designation">
1895
1926
  <element name="letter-symbol">
1896
1927
  <optional>
@@ -1942,11 +1973,15 @@
1942
1973
  </optional>
1943
1974
  <element name="name">
1944
1975
  <zeroOrMore>
1945
- <ref name="PureTextElement"/>
1976
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1946
1981
  </zeroOrMore>
1947
1982
  </element>
1948
1983
  <optional>
1949
- <element name="abbreviationType">
1984
+ <element name="abbreviation-type">
1950
1985
  <ref name="AbbreviationType"/>
1951
1986
  </element>
1952
1987
  </optional>
@@ -1956,7 +1991,7 @@
1956
1991
  </element>
1957
1992
  </optional>
1958
1993
  <optional>
1959
- <element name="grammarInfo">
1994
+ <element name="grammar">
1960
1995
  <ref name="Grammar"/>
1961
1996
  </element>
1962
1997
  </optional>
@@ -1983,6 +2018,11 @@
1983
2018
  <ref name="GrammarGender"/>
1984
2019
  </element>
1985
2020
  </zeroOrMore>
2021
+ <zeroOrMore>
2022
+ <element name="number">
2023
+ <ref name="GrammarNumber"/>
2024
+ </element>
2025
+ </zeroOrMore>
1986
2026
  <optional>
1987
2027
  <element name="isPreposition">
1988
2028
  <data type="boolean"/>
@@ -2014,7 +2054,7 @@
2014
2054
  </element>
2015
2055
  </optional>
2016
2056
  <zeroOrMore>
2017
- <element name="grammarvalue">
2057
+ <element name="grammar-value">
2018
2058
  <text/>
2019
2059
  </element>
2020
2060
  </zeroOrMore>
@@ -2027,6 +2067,13 @@
2027
2067
  <value>common</value>
2028
2068
  </choice>
2029
2069
  </define>
2070
+ <define name="GrammarNumber">
2071
+ <choice>
2072
+ <value>singular</value>
2073
+ <value>dual</value>
2074
+ <value>plural</value>
2075
+ </choice>
2076
+ </define>
2030
2077
  <define name="termdomain">
2031
2078
  <element name="domain">
2032
2079
  <oneOrMore>
@@ -2041,13 +2088,6 @@
2041
2088
  </oneOrMore>
2042
2089
  </element>
2043
2090
  </define>
2044
- <define name="termusage">
2045
- <element name="usageinfo">
2046
- <oneOrMore>
2047
- <ref name="BasicBlock"/>
2048
- </oneOrMore>
2049
- </element>
2050
- </define>
2051
2091
  <define name="termdefinition">
2052
2092
  <element name="definition">
2053
2093
  <choice>
@@ -2061,13 +2101,16 @@
2061
2101
  </element>
2062
2102
  </define>
2063
2103
  <define name="verbaldefinition">
2064
- <element name="verbaldefinition">
2104
+ <element name="verbal-definition">
2065
2105
  <oneOrMore>
2066
2106
  <choice>
2067
2107
  <ref name="paragraph"/>
2068
2108
  <ref name="dl"/>
2069
2109
  <ref name="ol"/>
2070
2110
  <ref name="ul"/>
2111
+ <ref name="table"/>
2112
+ <ref name="figure"/>
2113
+ <ref name="formula"/>
2071
2114
  </choice>
2072
2115
  </oneOrMore>
2073
2116
  <zeroOrMore>
@@ -2076,7 +2119,7 @@
2076
2119
  </element>
2077
2120
  </define>
2078
2121
  <define name="nonverbalrep">
2079
- <element name="nonverbalrepresentation">
2122
+ <element name="non-verbal-representation">
2080
2123
  <oneOrMore>
2081
2124
  <choice>
2082
2125
  <ref name="table"/>