metanorma-cc 1.7.13 → 1.8.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/docs/quickstart.adoc +2 -2
- data/lib/asciidoctor/cc/isodoc.rng +218 -27
- data/lib/isodoc/cc/cc.standard.xsl +7 -1
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.gemspec +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a3f0001744462f6a12891ef4f0b288ff8b2a9a04b4c74c843e24cc4508fc0a45
|
|
4
|
+
data.tar.gz: 831870abd5cce8c14e1a4ed2d14561e188b1ec59311795bb7849b9badbc01e0f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 928dfb9b3cb2ce5b99ffc4c31cce6456695542470acc26ef51ffddcde4ae493f362f5c5a6c2eacf97e5226cf393f3dcf781b866f3ec885397d40ef5223de6fda
|
|
7
|
+
data.tar.gz: 3c2ad0815ec8ee15565256f32b8f55b22c8ecbc95d4df5a16d1874afab0c822f2621620ac00468cc6a47fbe7a15d29bab47ad5efba9097f8424bfd469e53484b
|
data/docs/quickstart.adoc
CHANGED
|
@@ -19,7 +19,7 @@ Assuming you have Docker installed, it’s as easy as:
|
|
|
19
19
|
|
|
20
20
|
[source,console]
|
|
21
21
|
--
|
|
22
|
-
docker pull
|
|
22
|
+
docker pull metanorma/metanorma
|
|
23
23
|
--
|
|
24
24
|
|
|
25
25
|
|
|
@@ -38,7 +38,7 @@ To compile the document, run the Docker container as follows:
|
|
|
38
38
|
|
|
39
39
|
[source,console]
|
|
40
40
|
--
|
|
41
|
-
docker run -v "$(pwd)":/metanorma/ -w /metanorma
|
|
41
|
+
docker run -v "$(pwd)":/metanorma/ -w /metanorma metanorma/metanorma metanorma -t csd -x xml,html,pdf,doc rfc6350.adoc
|
|
42
42
|
--
|
|
43
43
|
|
|
44
44
|
NOTE: If you use Metanorma-CLI instead of Docker,
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
|
18
18
|
of this.
|
|
19
19
|
-->
|
|
20
|
-
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
20
|
+
<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">
|
|
21
21
|
<include href="reqt.rng"/>
|
|
22
22
|
<!-- include "biblio.rnc" { } -->
|
|
23
23
|
<include href="basicdoc.rng">
|
|
@@ -1803,17 +1803,20 @@
|
|
|
1803
1803
|
<ref name="admitted"/>
|
|
1804
1804
|
</zeroOrMore>
|
|
1805
1805
|
<zeroOrMore>
|
|
1806
|
-
<ref name="
|
|
1806
|
+
<ref name="deprecates"/>
|
|
1807
1807
|
</zeroOrMore>
|
|
1808
1808
|
<zeroOrMore>
|
|
1809
|
-
<ref name="
|
|
1809
|
+
<ref name="related"/>
|
|
1810
1810
|
</zeroOrMore>
|
|
1811
1811
|
<optional>
|
|
1812
1812
|
<ref name="termdomain"/>
|
|
1813
1813
|
</optional>
|
|
1814
|
-
<
|
|
1815
|
-
<ref name="
|
|
1816
|
-
</
|
|
1814
|
+
<optional>
|
|
1815
|
+
<ref name="termsubject"/>
|
|
1816
|
+
</optional>
|
|
1817
|
+
<optional>
|
|
1818
|
+
<ref name="termusage"/>
|
|
1819
|
+
</optional>
|
|
1817
1820
|
<oneOrMore>
|
|
1818
1821
|
<ref name="termdefinition"/>
|
|
1819
1822
|
</oneOrMore>
|
|
@@ -1830,41 +1833,200 @@
|
|
|
1830
1833
|
</define>
|
|
1831
1834
|
<define name="preferred">
|
|
1832
1835
|
<element name="preferred">
|
|
1833
|
-
<
|
|
1834
|
-
<ref name="TextElement"/>
|
|
1835
|
-
</oneOrMore>
|
|
1836
|
+
<ref name="Designation"/>
|
|
1836
1837
|
</element>
|
|
1837
1838
|
</define>
|
|
1838
1839
|
<define name="admitted">
|
|
1839
1840
|
<element name="admitted">
|
|
1840
|
-
<
|
|
1841
|
-
<ref name="TextElement"/>
|
|
1842
|
-
</oneOrMore>
|
|
1841
|
+
<ref name="Designation"/>
|
|
1843
1842
|
</element>
|
|
1844
1843
|
</define>
|
|
1845
1844
|
<define name="related">
|
|
1846
1845
|
<element name="related">
|
|
1846
|
+
<attribute name="type">
|
|
1847
|
+
<ref name="RelatedTermType"/>
|
|
1848
|
+
</attribute>
|
|
1849
|
+
<element name="preferred">
|
|
1850
|
+
<ref name="Designation"/>
|
|
1851
|
+
</element>
|
|
1852
|
+
<choice>
|
|
1853
|
+
<ref name="eref"/>
|
|
1854
|
+
<ref name="xref"/>
|
|
1855
|
+
<ref name="termref"/>
|
|
1856
|
+
</choice>
|
|
1857
|
+
</element>
|
|
1858
|
+
</define>
|
|
1859
|
+
<define name="RelatedTermType">
|
|
1860
|
+
<choice>
|
|
1861
|
+
<value>deprecates</value>
|
|
1862
|
+
<value>supersedes</value>
|
|
1863
|
+
<value>narrower</value>
|
|
1864
|
+
<value>broader</value>
|
|
1865
|
+
<value>equivalent</value>
|
|
1866
|
+
<value>compare</value>
|
|
1867
|
+
<value>contrast</value>
|
|
1868
|
+
<value>see</value>
|
|
1869
|
+
</choice>
|
|
1870
|
+
</define>
|
|
1871
|
+
<define name="deprecates">
|
|
1872
|
+
<element name="deprecates">
|
|
1873
|
+
<ref name="Designation"/>
|
|
1874
|
+
</element>
|
|
1875
|
+
</define>
|
|
1876
|
+
<define name="Designation">
|
|
1877
|
+
<optional>
|
|
1878
|
+
<attribute name="absent">
|
|
1879
|
+
<data type="boolean"/>
|
|
1880
|
+
</attribute>
|
|
1881
|
+
</optional>
|
|
1882
|
+
<optional>
|
|
1883
|
+
<attribute name="geographicArea"/>
|
|
1884
|
+
</optional>
|
|
1885
|
+
<choice>
|
|
1886
|
+
<ref name="expression_designation"/>
|
|
1887
|
+
<ref name="letter_symbol_designation"/>
|
|
1888
|
+
<ref name="graphical_symbol_designation"/>
|
|
1889
|
+
</choice>
|
|
1890
|
+
<zeroOrMore>
|
|
1891
|
+
<ref name="termsource"/>
|
|
1892
|
+
</zeroOrMore>
|
|
1893
|
+
</define>
|
|
1894
|
+
<define name="letter_symbol_designation">
|
|
1895
|
+
<element name="letter-symbol">
|
|
1847
1896
|
<optional>
|
|
1848
|
-
<attribute name="
|
|
1897
|
+
<attribute name="isInternational">
|
|
1898
|
+
<data type="boolean"/>
|
|
1899
|
+
</attribute>
|
|
1900
|
+
</optional>
|
|
1901
|
+
<element name="name">
|
|
1902
|
+
<oneOrMore>
|
|
1849
1903
|
<choice>
|
|
1850
|
-
<
|
|
1851
|
-
<
|
|
1852
|
-
<value>see</value>
|
|
1904
|
+
<ref name="PureTextElement"/>
|
|
1905
|
+
<ref name="stem"/>
|
|
1853
1906
|
</choice>
|
|
1907
|
+
</oneOrMore>
|
|
1908
|
+
</element>
|
|
1909
|
+
</element>
|
|
1910
|
+
</define>
|
|
1911
|
+
<define name="graphical_symbol_designation">
|
|
1912
|
+
<element name="graphical-symbol">
|
|
1913
|
+
<optional>
|
|
1914
|
+
<attribute name="isInternational">
|
|
1915
|
+
<data type="boolean"/>
|
|
1854
1916
|
</attribute>
|
|
1855
1917
|
</optional>
|
|
1856
|
-
<
|
|
1857
|
-
<ref name="TextElement"/>
|
|
1858
|
-
</oneOrMore>
|
|
1918
|
+
<ref name="figure"/>
|
|
1859
1919
|
</element>
|
|
1860
1920
|
</define>
|
|
1861
|
-
<define name="
|
|
1862
|
-
<element name="
|
|
1863
|
-
<
|
|
1864
|
-
<
|
|
1865
|
-
|
|
1921
|
+
<define name="expression_designation">
|
|
1922
|
+
<element name="expression">
|
|
1923
|
+
<optional>
|
|
1924
|
+
<attribute name="language">
|
|
1925
|
+
<a:documentation>ISO-639</a:documentation>
|
|
1926
|
+
</attribute>
|
|
1927
|
+
</optional>
|
|
1928
|
+
<optional>
|
|
1929
|
+
<attribute name="script">
|
|
1930
|
+
<a:documentation>ISO-15924</a:documentation>
|
|
1931
|
+
</attribute>
|
|
1932
|
+
</optional>
|
|
1933
|
+
<optional>
|
|
1934
|
+
<attribute name="type">
|
|
1935
|
+
<ref name="ExpressionDesignationType"/>
|
|
1936
|
+
</attribute>
|
|
1937
|
+
</optional>
|
|
1938
|
+
<optional>
|
|
1939
|
+
<attribute name="isInternational">
|
|
1940
|
+
<data type="boolean"/>
|
|
1941
|
+
</attribute>
|
|
1942
|
+
</optional>
|
|
1943
|
+
<element name="name">
|
|
1944
|
+
<zeroOrMore>
|
|
1945
|
+
<ref name="PureTextElement"/>
|
|
1946
|
+
</zeroOrMore>
|
|
1947
|
+
</element>
|
|
1948
|
+
<optional>
|
|
1949
|
+
<element name="abbreviationType">
|
|
1950
|
+
<ref name="AbbreviationType"/>
|
|
1951
|
+
</element>
|
|
1952
|
+
</optional>
|
|
1953
|
+
<optional>
|
|
1954
|
+
<element name="pronunciation">
|
|
1955
|
+
<ref name="LocalizedString"/>
|
|
1956
|
+
</element>
|
|
1957
|
+
</optional>
|
|
1958
|
+
<optional>
|
|
1959
|
+
<element name="grammarInfo">
|
|
1960
|
+
<ref name="Grammar"/>
|
|
1961
|
+
</element>
|
|
1962
|
+
</optional>
|
|
1866
1963
|
</element>
|
|
1867
1964
|
</define>
|
|
1965
|
+
<define name="ExpressionDesignationType">
|
|
1966
|
+
<choice>
|
|
1967
|
+
<value>prefix</value>
|
|
1968
|
+
<value>suffix</value>
|
|
1969
|
+
<value>abbreviation</value>
|
|
1970
|
+
<value>full</value>
|
|
1971
|
+
</choice>
|
|
1972
|
+
</define>
|
|
1973
|
+
<define name="AbbreviationType">
|
|
1974
|
+
<choice>
|
|
1975
|
+
<value>truncation</value>
|
|
1976
|
+
<value>acronym</value>
|
|
1977
|
+
<value>initialism</value>
|
|
1978
|
+
</choice>
|
|
1979
|
+
</define>
|
|
1980
|
+
<define name="Grammar">
|
|
1981
|
+
<zeroOrMore>
|
|
1982
|
+
<element name="gender">
|
|
1983
|
+
<ref name="GrammarGender"/>
|
|
1984
|
+
</element>
|
|
1985
|
+
</zeroOrMore>
|
|
1986
|
+
<optional>
|
|
1987
|
+
<element name="isPreposition">
|
|
1988
|
+
<data type="boolean"/>
|
|
1989
|
+
</element>
|
|
1990
|
+
</optional>
|
|
1991
|
+
<optional>
|
|
1992
|
+
<element name="isParticiple">
|
|
1993
|
+
<data type="boolean"/>
|
|
1994
|
+
</element>
|
|
1995
|
+
</optional>
|
|
1996
|
+
<optional>
|
|
1997
|
+
<element name="isAdjective">
|
|
1998
|
+
<data type="boolean"/>
|
|
1999
|
+
</element>
|
|
2000
|
+
</optional>
|
|
2001
|
+
<optional>
|
|
2002
|
+
<element name="isVerb">
|
|
2003
|
+
<data type="boolean"/>
|
|
2004
|
+
</element>
|
|
2005
|
+
</optional>
|
|
2006
|
+
<optional>
|
|
2007
|
+
<element name="isAdverb">
|
|
2008
|
+
<data type="boolean"/>
|
|
2009
|
+
</element>
|
|
2010
|
+
</optional>
|
|
2011
|
+
<optional>
|
|
2012
|
+
<element name="isNoun">
|
|
2013
|
+
<data type="boolean"/>
|
|
2014
|
+
</element>
|
|
2015
|
+
</optional>
|
|
2016
|
+
<zeroOrMore>
|
|
2017
|
+
<element name="grammarvalue">
|
|
2018
|
+
<text/>
|
|
2019
|
+
</element>
|
|
2020
|
+
</zeroOrMore>
|
|
2021
|
+
</define>
|
|
2022
|
+
<define name="GrammarGender">
|
|
2023
|
+
<choice>
|
|
2024
|
+
<value>masculine</value>
|
|
2025
|
+
<value>feminine</value>
|
|
2026
|
+
<value>neuter</value>
|
|
2027
|
+
<value>common</value>
|
|
2028
|
+
</choice>
|
|
2029
|
+
</define>
|
|
1868
2030
|
<define name="termdomain">
|
|
1869
2031
|
<element name="domain">
|
|
1870
2032
|
<oneOrMore>
|
|
@@ -1872,18 +2034,47 @@
|
|
|
1872
2034
|
</oneOrMore>
|
|
1873
2035
|
</element>
|
|
1874
2036
|
</define>
|
|
1875
|
-
<define name="
|
|
1876
|
-
<element name="
|
|
2037
|
+
<define name="termsubject">
|
|
2038
|
+
<element name="subject">
|
|
1877
2039
|
<oneOrMore>
|
|
1878
2040
|
<ref name="TextElement"/>
|
|
1879
2041
|
</oneOrMore>
|
|
1880
2042
|
</element>
|
|
1881
2043
|
</define>
|
|
2044
|
+
<define name="termusage">
|
|
2045
|
+
<element name="usageinfo">
|
|
2046
|
+
<oneOrMore>
|
|
2047
|
+
<ref name="BasicBlock"/>
|
|
2048
|
+
</oneOrMore>
|
|
2049
|
+
</element>
|
|
2050
|
+
</define>
|
|
1882
2051
|
<define name="termdefinition">
|
|
1883
2052
|
<element name="definition">
|
|
2053
|
+
<choice>
|
|
2054
|
+
<ref name="verbaldefinition"/>
|
|
2055
|
+
<ref name="nonverbalrep"/>
|
|
2056
|
+
<group>
|
|
2057
|
+
<ref name="verbaldefinition"/>
|
|
2058
|
+
<ref name="nonverbalrep"/>
|
|
2059
|
+
</group>
|
|
2060
|
+
</choice>
|
|
2061
|
+
</element>
|
|
2062
|
+
</define>
|
|
2063
|
+
<define name="verbaldefinition">
|
|
2064
|
+
<element name="verbaldefinition">
|
|
2065
|
+
<oneOrMore>
|
|
2066
|
+
<ref name="paragraph"/>
|
|
2067
|
+
</oneOrMore>
|
|
2068
|
+
<zeroOrMore>
|
|
2069
|
+
<ref name="termsource"/>
|
|
2070
|
+
</zeroOrMore>
|
|
2071
|
+
</element>
|
|
2072
|
+
</define>
|
|
2073
|
+
<define name="nonverbalrep">
|
|
2074
|
+
<element name="nonverbalrepresentation">
|
|
1884
2075
|
<oneOrMore>
|
|
1885
2076
|
<choice>
|
|
1886
|
-
<ref name="
|
|
2077
|
+
<ref name="table"/>
|
|
1887
2078
|
<ref name="figure"/>
|
|
1888
2079
|
<ref name="formula"/>
|
|
1889
2080
|
</choice>
|
|
@@ -911,6 +911,8 @@
|
|
|
911
911
|
|
|
912
912
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
913
913
|
|
|
914
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
915
|
+
|
|
914
916
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
915
917
|
|
|
916
918
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -3703,6 +3705,7 @@
|
|
|
3703
3705
|
<xsl:otherwise>
|
|
3704
3706
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3705
3707
|
|
|
3708
|
+
|
|
3706
3709
|
<xsl:variable name="src">
|
|
3707
3710
|
<xsl:call-template name="image_src"/>
|
|
3708
3711
|
</xsl:variable>
|
|
@@ -4069,7 +4072,7 @@
|
|
|
4069
4072
|
<xsl:text> </xsl:text>
|
|
4070
4073
|
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
|
|
4071
4074
|
<xsl:value-of select="."/>
|
|
4072
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']
|
|
4075
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
4073
4076
|
<xsl:value-of select="."/>
|
|
4074
4077
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4075
4078
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4167,6 +4170,8 @@
|
|
|
4167
4170
|
|
|
4168
4171
|
|
|
4169
4172
|
|
|
4173
|
+
|
|
4174
|
+
|
|
4170
4175
|
</fo:bookmark-tree>
|
|
4171
4176
|
</xsl:if>
|
|
4172
4177
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4717,6 +4722,7 @@
|
|
|
4717
4722
|
</xsl:choose>
|
|
4718
4723
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4719
4724
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4725
|
+
|
|
4720
4726
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4721
4727
|
<xsl:variable name="termsource_text">
|
|
4722
4728
|
<xsl:apply-templates/>
|
data/lib/metanorma/cc/version.rb
CHANGED
data/metanorma-cc.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.
|
|
31
|
+
spec.add_dependency "metanorma-generic", "~> 1.11.0"
|
|
32
32
|
|
|
33
33
|
spec.add_development_dependency "byebug", "~> 9.1"
|
|
34
34
|
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: 1.
|
|
4
|
+
version: 1.8.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: 2021-10-
|
|
11
|
+
date: 2021-10-25 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.
|
|
19
|
+
version: 1.11.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.
|
|
26
|
+
version: 1.11.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: byebug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
251
251
|
- !ruby/object:Gem::Version
|
|
252
252
|
version: '0'
|
|
253
253
|
requirements: []
|
|
254
|
-
rubygems_version: 3.
|
|
254
|
+
rubygems_version: 3.2.22
|
|
255
255
|
signing_key:
|
|
256
256
|
specification_version: 4
|
|
257
257
|
summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.
|