metanorma-cc 1.7.13 → 1.8.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/docs/quickstart.adoc +2 -2
- data/lib/asciidoctor/cc/isodoc.rng +254 -27
- data/lib/isodoc/cc/cc.standard.xsl +55 -17
- data/lib/isodoc/cc/html/htmlstyle.css +4 -2
- data/lib/isodoc/cc/html/htmlstyle.scss +4 -1
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.gemspec +2 -2
- metadata +10 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '09051dfdeea6a295286b0b55b546ff965f76427554632f50b995ddc7f3842a9e'
|
|
4
|
+
data.tar.gz: '08f80ffd700b0947b75a81ef3ccc6031b8f6044f69dde7e291d8606ee2cbd412'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 341a642e16714923295261707ce8d4efbd8dd06aadb54fb6c25b5bca7eb474ba3ca3ebb6218c045c2ef30447c897dc774571241f212d1d65c66c2d14eda7da37
|
|
7
|
+
data.tar.gz: d2a80f70cf8ca48edde2ef672befcfd7a38204e61f4da62b091b1422f4a6044a0bac1215aa2f126498a933c581eddadda588ed306a929363ce75c0ac57984be7
|
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">
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
<attribute name="alt"/>
|
|
59
59
|
</optional>
|
|
60
60
|
<optional>
|
|
61
|
-
<attribute name="
|
|
61
|
+
<attribute name="update-type">
|
|
62
62
|
<data type="boolean"/>
|
|
63
63
|
</attribute>
|
|
64
64
|
</optional>
|
|
@@ -1803,17 +1803,17 @@
|
|
|
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
1817
|
<oneOrMore>
|
|
1818
1818
|
<ref name="termdefinition"/>
|
|
1819
1819
|
</oneOrMore>
|
|
@@ -1830,41 +1830,232 @@
|
|
|
1830
1830
|
</define>
|
|
1831
1831
|
<define name="preferred">
|
|
1832
1832
|
<element name="preferred">
|
|
1833
|
-
<
|
|
1834
|
-
<ref name="TextElement"/>
|
|
1835
|
-
</oneOrMore>
|
|
1833
|
+
<ref name="Designation"/>
|
|
1836
1834
|
</element>
|
|
1837
1835
|
</define>
|
|
1838
1836
|
<define name="admitted">
|
|
1839
1837
|
<element name="admitted">
|
|
1840
|
-
<
|
|
1841
|
-
<ref name="TextElement"/>
|
|
1842
|
-
</oneOrMore>
|
|
1838
|
+
<ref name="Designation"/>
|
|
1843
1839
|
</element>
|
|
1844
1840
|
</define>
|
|
1845
1841
|
<define name="related">
|
|
1846
1842
|
<element name="related">
|
|
1843
|
+
<attribute name="type">
|
|
1844
|
+
<ref name="RelatedTermType"/>
|
|
1845
|
+
</attribute>
|
|
1846
|
+
<element name="preferred">
|
|
1847
|
+
<ref name="Designation"/>
|
|
1848
|
+
</element>
|
|
1849
|
+
<choice>
|
|
1850
|
+
<ref name="eref"/>
|
|
1851
|
+
<ref name="xref"/>
|
|
1852
|
+
<ref name="termref"/>
|
|
1853
|
+
</choice>
|
|
1854
|
+
</element>
|
|
1855
|
+
</define>
|
|
1856
|
+
<define name="RelatedTermType">
|
|
1857
|
+
<choice>
|
|
1858
|
+
<value>deprecates</value>
|
|
1859
|
+
<value>supersedes</value>
|
|
1860
|
+
<value>narrower</value>
|
|
1861
|
+
<value>broader</value>
|
|
1862
|
+
<value>equivalent</value>
|
|
1863
|
+
<value>compare</value>
|
|
1864
|
+
<value>contrast</value>
|
|
1865
|
+
<value>see</value>
|
|
1866
|
+
</choice>
|
|
1867
|
+
</define>
|
|
1868
|
+
<define name="deprecates">
|
|
1869
|
+
<element name="deprecates">
|
|
1870
|
+
<ref name="Designation"/>
|
|
1871
|
+
</element>
|
|
1872
|
+
</define>
|
|
1873
|
+
<define name="Designation">
|
|
1874
|
+
<optional>
|
|
1875
|
+
<attribute name="absent">
|
|
1876
|
+
<data type="boolean"/>
|
|
1877
|
+
</attribute>
|
|
1878
|
+
</optional>
|
|
1879
|
+
<optional>
|
|
1880
|
+
<attribute name="geographic-area"/>
|
|
1881
|
+
</optional>
|
|
1882
|
+
<choice>
|
|
1883
|
+
<ref name="expression_designation"/>
|
|
1884
|
+
<ref name="letter_symbol_designation"/>
|
|
1885
|
+
<ref name="graphical_symbol_designation"/>
|
|
1886
|
+
</choice>
|
|
1887
|
+
<optional>
|
|
1888
|
+
<ref name="fieldofapplication"/>
|
|
1889
|
+
</optional>
|
|
1890
|
+
<optional>
|
|
1891
|
+
<ref name="usageinfo"/>
|
|
1892
|
+
</optional>
|
|
1893
|
+
<zeroOrMore>
|
|
1894
|
+
<ref name="termsource"/>
|
|
1895
|
+
</zeroOrMore>
|
|
1896
|
+
</define>
|
|
1897
|
+
<define name="fieldofapplication">
|
|
1898
|
+
<element name="field-of-application">
|
|
1899
|
+
<oneOrMore>
|
|
1900
|
+
<ref name="PureTextElement"/>
|
|
1901
|
+
</oneOrMore>
|
|
1902
|
+
</element>
|
|
1903
|
+
</define>
|
|
1904
|
+
<define name="usageinfo">
|
|
1905
|
+
<element name="usage-info">
|
|
1906
|
+
<oneOrMore>
|
|
1907
|
+
<ref name="PureTextElement"/>
|
|
1908
|
+
</oneOrMore>
|
|
1909
|
+
</element>
|
|
1910
|
+
</define>
|
|
1911
|
+
<define name="letter_symbol_designation">
|
|
1912
|
+
<element name="letter-symbol">
|
|
1847
1913
|
<optional>
|
|
1848
|
-
<attribute name="
|
|
1914
|
+
<attribute name="isInternational">
|
|
1915
|
+
<data type="boolean"/>
|
|
1916
|
+
</attribute>
|
|
1917
|
+
</optional>
|
|
1918
|
+
<element name="name">
|
|
1919
|
+
<oneOrMore>
|
|
1849
1920
|
<choice>
|
|
1850
|
-
<
|
|
1851
|
-
<
|
|
1852
|
-
<value>see</value>
|
|
1921
|
+
<ref name="PureTextElement"/>
|
|
1922
|
+
<ref name="stem"/>
|
|
1853
1923
|
</choice>
|
|
1924
|
+
</oneOrMore>
|
|
1925
|
+
</element>
|
|
1926
|
+
</element>
|
|
1927
|
+
</define>
|
|
1928
|
+
<define name="graphical_symbol_designation">
|
|
1929
|
+
<element name="graphical-symbol">
|
|
1930
|
+
<optional>
|
|
1931
|
+
<attribute name="isInternational">
|
|
1932
|
+
<data type="boolean"/>
|
|
1854
1933
|
</attribute>
|
|
1855
1934
|
</optional>
|
|
1856
|
-
<
|
|
1857
|
-
<ref name="TextElement"/>
|
|
1858
|
-
</oneOrMore>
|
|
1935
|
+
<ref name="figure"/>
|
|
1859
1936
|
</element>
|
|
1860
1937
|
</define>
|
|
1861
|
-
<define name="
|
|
1862
|
-
<element name="
|
|
1863
|
-
<
|
|
1864
|
-
<
|
|
1865
|
-
|
|
1938
|
+
<define name="expression_designation">
|
|
1939
|
+
<element name="expression">
|
|
1940
|
+
<optional>
|
|
1941
|
+
<attribute name="language">
|
|
1942
|
+
<a:documentation>ISO-639</a:documentation>
|
|
1943
|
+
</attribute>
|
|
1944
|
+
</optional>
|
|
1945
|
+
<optional>
|
|
1946
|
+
<attribute name="script">
|
|
1947
|
+
<a:documentation>ISO-15924</a:documentation>
|
|
1948
|
+
</attribute>
|
|
1949
|
+
</optional>
|
|
1950
|
+
<optional>
|
|
1951
|
+
<attribute name="type">
|
|
1952
|
+
<ref name="ExpressionDesignationType"/>
|
|
1953
|
+
</attribute>
|
|
1954
|
+
</optional>
|
|
1955
|
+
<optional>
|
|
1956
|
+
<attribute name="isInternational">
|
|
1957
|
+
<data type="boolean"/>
|
|
1958
|
+
</attribute>
|
|
1959
|
+
</optional>
|
|
1960
|
+
<element name="name">
|
|
1961
|
+
<zeroOrMore>
|
|
1962
|
+
<ref name="PureTextElement"/>
|
|
1963
|
+
</zeroOrMore>
|
|
1964
|
+
</element>
|
|
1965
|
+
<optional>
|
|
1966
|
+
<element name="abbreviation-type">
|
|
1967
|
+
<ref name="AbbreviationType"/>
|
|
1968
|
+
</element>
|
|
1969
|
+
</optional>
|
|
1970
|
+
<optional>
|
|
1971
|
+
<element name="pronunciation">
|
|
1972
|
+
<ref name="LocalizedString"/>
|
|
1973
|
+
</element>
|
|
1974
|
+
</optional>
|
|
1975
|
+
<optional>
|
|
1976
|
+
<element name="grammar-info">
|
|
1977
|
+
<ref name="Grammar"/>
|
|
1978
|
+
</element>
|
|
1979
|
+
</optional>
|
|
1866
1980
|
</element>
|
|
1867
1981
|
</define>
|
|
1982
|
+
<define name="ExpressionDesignationType">
|
|
1983
|
+
<choice>
|
|
1984
|
+
<value>prefix</value>
|
|
1985
|
+
<value>suffix</value>
|
|
1986
|
+
<value>abbreviation</value>
|
|
1987
|
+
<value>full</value>
|
|
1988
|
+
</choice>
|
|
1989
|
+
</define>
|
|
1990
|
+
<define name="AbbreviationType">
|
|
1991
|
+
<choice>
|
|
1992
|
+
<value>truncation</value>
|
|
1993
|
+
<value>acronym</value>
|
|
1994
|
+
<value>initialism</value>
|
|
1995
|
+
</choice>
|
|
1996
|
+
</define>
|
|
1997
|
+
<define name="Grammar">
|
|
1998
|
+
<zeroOrMore>
|
|
1999
|
+
<element name="gender">
|
|
2000
|
+
<ref name="GrammarGender"/>
|
|
2001
|
+
</element>
|
|
2002
|
+
</zeroOrMore>
|
|
2003
|
+
<zeroOrMore>
|
|
2004
|
+
<element name="number">
|
|
2005
|
+
<ref name="GrammarNumber"/>
|
|
2006
|
+
</element>
|
|
2007
|
+
</zeroOrMore>
|
|
2008
|
+
<optional>
|
|
2009
|
+
<element name="isPreposition">
|
|
2010
|
+
<data type="boolean"/>
|
|
2011
|
+
</element>
|
|
2012
|
+
</optional>
|
|
2013
|
+
<optional>
|
|
2014
|
+
<element name="isParticiple">
|
|
2015
|
+
<data type="boolean"/>
|
|
2016
|
+
</element>
|
|
2017
|
+
</optional>
|
|
2018
|
+
<optional>
|
|
2019
|
+
<element name="isAdjective">
|
|
2020
|
+
<data type="boolean"/>
|
|
2021
|
+
</element>
|
|
2022
|
+
</optional>
|
|
2023
|
+
<optional>
|
|
2024
|
+
<element name="isVerb">
|
|
2025
|
+
<data type="boolean"/>
|
|
2026
|
+
</element>
|
|
2027
|
+
</optional>
|
|
2028
|
+
<optional>
|
|
2029
|
+
<element name="isAdverb">
|
|
2030
|
+
<data type="boolean"/>
|
|
2031
|
+
</element>
|
|
2032
|
+
</optional>
|
|
2033
|
+
<optional>
|
|
2034
|
+
<element name="isNoun">
|
|
2035
|
+
<data type="boolean"/>
|
|
2036
|
+
</element>
|
|
2037
|
+
</optional>
|
|
2038
|
+
<zeroOrMore>
|
|
2039
|
+
<element name="grammar-value">
|
|
2040
|
+
<text/>
|
|
2041
|
+
</element>
|
|
2042
|
+
</zeroOrMore>
|
|
2043
|
+
</define>
|
|
2044
|
+
<define name="GrammarGender">
|
|
2045
|
+
<choice>
|
|
2046
|
+
<value>masculine</value>
|
|
2047
|
+
<value>feminine</value>
|
|
2048
|
+
<value>neuter</value>
|
|
2049
|
+
<value>common</value>
|
|
2050
|
+
</choice>
|
|
2051
|
+
</define>
|
|
2052
|
+
<define name="GrammarNumber">
|
|
2053
|
+
<choice>
|
|
2054
|
+
<value>singular</value>
|
|
2055
|
+
<value>dual</value>
|
|
2056
|
+
<value>plural</value>
|
|
2057
|
+
</choice>
|
|
2058
|
+
</define>
|
|
1868
2059
|
<define name="termdomain">
|
|
1869
2060
|
<element name="domain">
|
|
1870
2061
|
<oneOrMore>
|
|
@@ -1872,8 +2063,8 @@
|
|
|
1872
2063
|
</oneOrMore>
|
|
1873
2064
|
</element>
|
|
1874
2065
|
</define>
|
|
1875
|
-
<define name="
|
|
1876
|
-
<element name="
|
|
2066
|
+
<define name="termsubject">
|
|
2067
|
+
<element name="subject">
|
|
1877
2068
|
<oneOrMore>
|
|
1878
2069
|
<ref name="TextElement"/>
|
|
1879
2070
|
</oneOrMore>
|
|
@@ -1881,9 +2072,39 @@
|
|
|
1881
2072
|
</define>
|
|
1882
2073
|
<define name="termdefinition">
|
|
1883
2074
|
<element name="definition">
|
|
2075
|
+
<choice>
|
|
2076
|
+
<ref name="verbaldefinition"/>
|
|
2077
|
+
<ref name="nonverbalrep"/>
|
|
2078
|
+
<group>
|
|
2079
|
+
<ref name="verbaldefinition"/>
|
|
2080
|
+
<ref name="nonverbalrep"/>
|
|
2081
|
+
</group>
|
|
2082
|
+
</choice>
|
|
2083
|
+
</element>
|
|
2084
|
+
</define>
|
|
2085
|
+
<define name="verbaldefinition">
|
|
2086
|
+
<element name="verbal-definition">
|
|
1884
2087
|
<oneOrMore>
|
|
1885
2088
|
<choice>
|
|
1886
2089
|
<ref name="paragraph"/>
|
|
2090
|
+
<ref name="dl"/>
|
|
2091
|
+
<ref name="ol"/>
|
|
2092
|
+
<ref name="ul"/>
|
|
2093
|
+
<ref name="table"/>
|
|
2094
|
+
<ref name="figure"/>
|
|
2095
|
+
<ref name="formula"/>
|
|
2096
|
+
</choice>
|
|
2097
|
+
</oneOrMore>
|
|
2098
|
+
<zeroOrMore>
|
|
2099
|
+
<ref name="termsource"/>
|
|
2100
|
+
</zeroOrMore>
|
|
2101
|
+
</element>
|
|
2102
|
+
</define>
|
|
2103
|
+
<define name="nonverbalrep">
|
|
2104
|
+
<element name="non-verbal-representation">
|
|
2105
|
+
<oneOrMore>
|
|
2106
|
+
<choice>
|
|
2107
|
+
<ref name="table"/>
|
|
1887
2108
|
<ref name="figure"/>
|
|
1888
2109
|
<ref name="formula"/>
|
|
1889
2110
|
</choice>
|
|
@@ -1972,6 +2193,12 @@
|
|
|
1972
2193
|
<value>modified</value>
|
|
1973
2194
|
</choice>
|
|
1974
2195
|
</attribute>
|
|
2196
|
+
<attribute name="type">
|
|
2197
|
+
<choice>
|
|
2198
|
+
<value>authoritative</value>
|
|
2199
|
+
<value>lineage</value>
|
|
2200
|
+
</choice>
|
|
2201
|
+
</attribute>
|
|
1975
2202
|
<ref name="origin"/>
|
|
1976
2203
|
<optional>
|
|
1977
2204
|
<ref name="modification"/>
|
|
@@ -649,9 +649,10 @@
|
|
|
649
649
|
</xsl:variable>
|
|
650
650
|
<fo:block font-size="{$font-size}" line-height="1.1" role="H{$levelTerm}">
|
|
651
651
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
652
|
-
<xsl:apply-templates select="ancestor::csd:term/csd:name" mode="presentation"/>
|
|
652
|
+
<xsl:apply-templates select="ancestor::csd:term[1]/csd:name" mode="presentation"/>
|
|
653
653
|
</fo:block>
|
|
654
654
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
655
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
655
656
|
<xsl:apply-templates/>
|
|
656
657
|
</fo:block>
|
|
657
658
|
</fo:block>
|
|
@@ -911,6 +912,8 @@
|
|
|
911
912
|
|
|
912
913
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
913
914
|
|
|
915
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
916
|
+
|
|
914
917
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
915
918
|
|
|
916
919
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1400,7 +1403,8 @@
|
|
|
1400
1403
|
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
|
|
1401
1404
|
|
|
1402
1405
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1403
|
-
|
|
1406
|
+
|
|
1407
|
+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
|
|
1404
1408
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1405
1409
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1406
1410
|
</xsl:for-each>
|
|
@@ -1410,7 +1414,7 @@
|
|
|
1410
1414
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1411
1415
|
</xsl:for-each>
|
|
1412
1416
|
|
|
1413
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1417
|
+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1414
1418
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1415
1419
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1416
1420
|
</xsl:for-each>
|
|
@@ -2797,6 +2801,7 @@
|
|
|
2797
2801
|
<fo:table-cell>
|
|
2798
2802
|
|
|
2799
2803
|
<fo:block margin-top="6pt">
|
|
2804
|
+
<xsl:copy-of select="@id"/>
|
|
2800
2805
|
|
|
2801
2806
|
|
|
2802
2807
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3634,14 +3639,18 @@
|
|
|
3634
3639
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3635
3640
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3636
3641
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3642
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3637
3643
|
<fo:block id="{@id}">
|
|
3638
3644
|
<xsl:apply-templates/>
|
|
3639
3645
|
</fo:block>
|
|
3640
3646
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3647
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3641
3648
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3642
3649
|
|
|
3643
3650
|
|
|
3644
|
-
|
|
3651
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3652
|
+
|
|
3653
|
+
</xsl:if>
|
|
3645
3654
|
<xsl:apply-templates/>
|
|
3646
3655
|
</fo:block>
|
|
3647
3656
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3703,6 +3712,7 @@
|
|
|
3703
3712
|
<xsl:otherwise>
|
|
3704
3713
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3705
3714
|
|
|
3715
|
+
|
|
3706
3716
|
<xsl:variable name="src">
|
|
3707
3717
|
<xsl:call-template name="image_src"/>
|
|
3708
3718
|
</xsl:variable>
|
|
@@ -4064,12 +4074,12 @@
|
|
|
4064
4074
|
</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
|
4065
4075
|
<xsl:apply-templates mode="contents"/>
|
|
4066
4076
|
<xsl:text> </xsl:text>
|
|
4067
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
|
|
4077
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
|
|
4068
4078
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4069
4079
|
<xsl:text> </xsl:text>
|
|
4070
4080
|
</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
4081
|
<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']
|
|
4082
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
|
4073
4083
|
<xsl:value-of select="."/>
|
|
4074
4084
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4075
4085
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4167,6 +4177,8 @@
|
|
|
4167
4177
|
|
|
4168
4178
|
|
|
4169
4179
|
|
|
4180
|
+
|
|
4181
|
+
|
|
4170
4182
|
</fo:bookmark-tree>
|
|
4171
4183
|
</xsl:if>
|
|
4172
4184
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4337,6 +4349,8 @@
|
|
|
4337
4349
|
|
|
4338
4350
|
|
|
4339
4351
|
|
|
4352
|
+
|
|
4353
|
+
|
|
4340
4354
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4341
4355
|
<xsl:variable name="_font-size">
|
|
4342
4356
|
|
|
@@ -4370,13 +4384,17 @@
|
|
|
4370
4384
|
|
|
4371
4385
|
|
|
4372
4386
|
|
|
4387
|
+
|
|
4388
|
+
|
|
4373
4389
|
<xsl:apply-templates/>
|
|
4374
4390
|
</fo:block>
|
|
4375
|
-
|
|
4391
|
+
|
|
4376
4392
|
|
|
4377
4393
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4378
4394
|
|
|
4379
4395
|
|
|
4396
|
+
|
|
4397
|
+
|
|
4380
4398
|
</fo:block-container>
|
|
4381
4399
|
</fo:block-container>
|
|
4382
4400
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4612,7 +4630,8 @@
|
|
|
4612
4630
|
</fo:block>
|
|
4613
4631
|
</fo:table-cell>
|
|
4614
4632
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4615
|
-
<fo:block font-size="11pt"
|
|
4633
|
+
<fo:block font-size="11pt">
|
|
4634
|
+
|
|
4616
4635
|
<xsl:apply-templates/>
|
|
4617
4636
|
</fo:block>
|
|
4618
4637
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4717,6 +4736,7 @@
|
|
|
4717
4736
|
</xsl:choose>
|
|
4718
4737
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4719
4738
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4739
|
+
|
|
4720
4740
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4721
4741
|
<xsl:variable name="termsource_text">
|
|
4722
4742
|
<xsl:apply-templates/>
|
|
@@ -4727,13 +4747,15 @@
|
|
|
4727
4747
|
<!-- <xsl:apply-templates /> -->
|
|
4728
4748
|
<xsl:copy-of select="$termsource_text"/>
|
|
4729
4749
|
</xsl:when>
|
|
4730
|
-
<xsl:otherwise>
|
|
4750
|
+
<xsl:otherwise>
|
|
4751
|
+
|
|
4731
4752
|
|
|
4732
4753
|
<xsl:text>[</xsl:text>
|
|
4733
4754
|
|
|
4734
4755
|
<!-- <xsl:apply-templates /> -->
|
|
4735
4756
|
<xsl:copy-of select="$termsource_text"/>
|
|
4736
4757
|
|
|
4758
|
+
|
|
4737
4759
|
<xsl:text>]</xsl:text>
|
|
4738
4760
|
|
|
4739
4761
|
</xsl:otherwise>
|
|
@@ -4817,12 +4839,20 @@
|
|
|
4817
4839
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4818
4840
|
<xsl:text>— </xsl:text>
|
|
4819
4841
|
<xsl:apply-templates/>
|
|
4820
|
-
</xsl:template><xsl:
|
|
4842
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
4843
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
4844
|
+
<xsl:copy-of select="."/>
|
|
4845
|
+
</xsl:for-each>
|
|
4846
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
4847
|
+
<xsl:copy-of select="."/>
|
|
4848
|
+
</xsl:for-each>
|
|
4849
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4821
4850
|
|
|
4822
4851
|
<xsl:variable name="bibitemid">
|
|
4823
4852
|
<xsl:choose>
|
|
4824
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
4825
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
4853
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
4854
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
4855
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
4826
4856
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
4827
4857
|
</xsl:choose>
|
|
4828
4858
|
</xsl:variable>
|
|
@@ -4915,10 +4945,10 @@
|
|
|
4915
4945
|
</xsl:choose>
|
|
4916
4946
|
</xsl:variable>
|
|
4917
4947
|
|
|
4918
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
4948
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
4919
4949
|
|
|
4920
4950
|
<xsl:choose>
|
|
4921
|
-
<xsl:when test="$
|
|
4951
|
+
<xsl:when test="$lang = 'zh'">
|
|
4922
4952
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
4923
4953
|
</xsl:when>
|
|
4924
4954
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -4961,15 +4991,20 @@
|
|
|
4961
4991
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
4962
4992
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
4963
4993
|
</fo:block>
|
|
4994
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
4995
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
4996
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
4997
|
+
</xsl:if>
|
|
4964
4998
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
4965
4999
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
4966
5000
|
<xsl:apply-templates/>
|
|
4967
5001
|
</fo:block>
|
|
4968
5002
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
4969
5003
|
<xsl:apply-templates/>
|
|
4970
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5004
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
4971
5005
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
4972
|
-
<fo:block
|
|
5006
|
+
<!-- <fo:block> </fo:block> -->
|
|
5007
|
+
<fo:block/>
|
|
4973
5008
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
4974
5009
|
|
|
4975
5010
|
<fo:block>
|
|
@@ -5903,12 +5938,15 @@
|
|
|
5903
5938
|
<xsl:param name="default">left</xsl:param>
|
|
5904
5939
|
<xsl:attribute name="text-align">
|
|
5905
5940
|
<xsl:choose>
|
|
5906
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
5941
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
5907
5942
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
5908
5943
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
5909
5944
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
5910
5945
|
</xsl:choose>
|
|
5911
5946
|
</xsl:attribute>
|
|
5947
|
+
<xsl:if test="@align = 'indent'">
|
|
5948
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
5949
|
+
</xsl:if>
|
|
5912
5950
|
</xsl:template><xsl:template name="number-to-words">
|
|
5913
5951
|
<xsl:param name="number"/>
|
|
5914
5952
|
<xsl:param name="first"/>
|
|
@@ -751,10 +751,12 @@ p {
|
|
|
751
751
|
margin-bottom: 1em; }
|
|
752
752
|
|
|
753
753
|
/* Terms */
|
|
754
|
-
.TermNum
|
|
755
|
-
color: #485094;
|
|
754
|
+
.TermNum {
|
|
756
755
|
font-weight: 400; }
|
|
757
756
|
|
|
757
|
+
.TermNum, .Terms, .AltTerms {
|
|
758
|
+
color: #485094; }
|
|
759
|
+
|
|
758
760
|
p.TermNum {
|
|
759
761
|
font-size: 0.9em;
|
|
760
762
|
line-height: 1em;
|
data/lib/metanorma/cc/version.rb
CHANGED
data/metanorma-cc.gemspec
CHANGED
|
@@ -28,9 +28,9 @@ 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
|
-
spec.add_development_dependency "
|
|
33
|
+
spec.add_development_dependency "debug"
|
|
34
34
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
35
35
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
36
36
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
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.3
|
|
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-
|
|
11
|
+
date: 2021-11-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -16,28 +16,28 @@ 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
|
-
name:
|
|
28
|
+
name: debug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
|
-
- - "
|
|
31
|
+
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: '
|
|
33
|
+
version: '0'
|
|
34
34
|
type: :development
|
|
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: '
|
|
40
|
+
version: '0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: equivalent-xml
|
|
43
43
|
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.
|