metanorma-ribose 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/lib/asciidoctor/ribose/isodoc.rng +254 -27
- data/lib/isodoc/ribose/html/htmlstyle.css +4 -4
- data/lib/isodoc/ribose/html/htmlstyle.scss +5 -4
- data/lib/isodoc/ribose/ribose.standard.xsl +54 -17
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma-ribose.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: 654aab85ead54fb2e9f016326b3283cb3a25af097fbe6af767aa42583a64d217
|
|
4
|
+
data.tar.gz: 8ea11b8d247cdb71968e627a592f04ca4b428ce18462f386d10d4af19a4819fa
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8d8fd6841d00a8a35be87e27489b9f6a35e908578a0baf438daef5cfaef5f4d39bfbb3c61735bdce3aaf821c8c4b4a8c53e1802557380556a514e1d9cb4a125e
|
|
7
|
+
data.tar.gz: 66ba8cf2a79b4f3403f1adbc1c090365220a2c256cf8239c565d79cf29d500c93cdccdaf75c45ab106919529572ecd17b4bce1161ae15c620050af433d55d415
|
|
@@ -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"/>
|
|
@@ -562,12 +562,12 @@ h3 {
|
|
|
562
562
|
font-size: 1.1em;
|
|
563
563
|
font-weight: 100; }
|
|
564
564
|
|
|
565
|
-
.TermNum
|
|
566
|
-
.Terms,
|
|
567
|
-
.AltTerms {
|
|
568
|
-
color: #1661AD;
|
|
565
|
+
.TermNum {
|
|
569
566
|
font-weight: 100; }
|
|
570
567
|
|
|
568
|
+
.TermNum, .Terms, .AltTerms {
|
|
569
|
+
color: #1661AD; }
|
|
570
|
+
|
|
571
571
|
h2.TermNum {
|
|
572
572
|
margin-bottom: 0; }
|
|
573
573
|
|
|
@@ -232,13 +232,14 @@ h3 {
|
|
|
232
232
|
font-weight: 100;
|
|
233
233
|
}
|
|
234
234
|
|
|
235
|
-
.TermNum
|
|
236
|
-
.Terms,
|
|
237
|
-
.AltTerms {
|
|
238
|
-
color: #1661AD;
|
|
235
|
+
.TermNum {
|
|
239
236
|
font-weight: 100;
|
|
240
237
|
}
|
|
241
238
|
|
|
239
|
+
.TermNum, .Terms, .AltTerms {
|
|
240
|
+
color: #1661AD;
|
|
241
|
+
}
|
|
242
|
+
|
|
242
243
|
h2.TermNum {
|
|
243
244
|
margin-bottom: 0;
|
|
244
245
|
}
|
|
@@ -1100,11 +1100,11 @@
|
|
|
1100
1100
|
<xsl:if test="preceding-sibling::*[1][self::rsd:name]">
|
|
1101
1101
|
<xsl:attribute name="space-before">11mm</xsl:attribute>
|
|
1102
1102
|
<fo:inline padding-right="1mm">
|
|
1103
|
-
<xsl:apply-templates select="ancestor::rsd:term/rsd:name" mode="presentation"/>
|
|
1103
|
+
<xsl:apply-templates select="ancestor::rsd:term[1]/rsd:name" mode="presentation"/>
|
|
1104
1104
|
</fo:inline>
|
|
1105
1105
|
</xsl:if>
|
|
1106
1106
|
|
|
1107
|
-
<fo:inline padding-right="4mm"><xsl:apply-templates/></fo:inline>
|
|
1107
|
+
<fo:inline padding-right="4mm"><xsl:if test="local-name() = 'preferred'"><xsl:call-template name="setStyle_preferred"/></xsl:if><xsl:apply-templates/></fo:inline>
|
|
1108
1108
|
|
|
1109
1109
|
<xsl:variable name="term_kind">
|
|
1110
1110
|
<xsl:choose>
|
|
@@ -1579,6 +1579,8 @@
|
|
|
1579
1579
|
|
|
1580
1580
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1581
1581
|
|
|
1582
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1583
|
+
|
|
1582
1584
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1583
1585
|
|
|
1584
1586
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -2104,7 +2106,8 @@
|
|
|
2104
2106
|
<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"/>
|
|
2105
2107
|
|
|
2106
2108
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
2107
|
-
|
|
2109
|
+
|
|
2110
|
+
<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']]">
|
|
2108
2111
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2109
2112
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2110
2113
|
</xsl:for-each>
|
|
@@ -2114,7 +2117,7 @@
|
|
|
2114
2117
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2115
2118
|
</xsl:for-each>
|
|
2116
2119
|
|
|
2117
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
2120
|
+
<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')]]">
|
|
2118
2121
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2119
2122
|
<xsl:apply-templates select="." mode="contents"/>
|
|
2120
2123
|
</xsl:for-each>
|
|
@@ -3536,6 +3539,7 @@
|
|
|
3536
3539
|
<fo:table-cell>
|
|
3537
3540
|
|
|
3538
3541
|
<fo:block margin-top="6pt">
|
|
3542
|
+
<xsl:copy-of select="@id"/>
|
|
3539
3543
|
|
|
3540
3544
|
|
|
3541
3545
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -4398,14 +4402,18 @@
|
|
|
4398
4402
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
4399
4403
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
4400
4404
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
4405
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
4401
4406
|
<fo:block id="{@id}">
|
|
4402
4407
|
<xsl:apply-templates/>
|
|
4403
4408
|
</fo:block>
|
|
4404
4409
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
4410
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
4405
4411
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
4406
4412
|
|
|
4407
4413
|
|
|
4408
|
-
|
|
4414
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
4415
|
+
|
|
4416
|
+
</xsl:if>
|
|
4409
4417
|
<xsl:apply-templates/>
|
|
4410
4418
|
</fo:block>
|
|
4411
4419
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -4476,6 +4484,7 @@
|
|
|
4476
4484
|
<xsl:otherwise>
|
|
4477
4485
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
4478
4486
|
|
|
4487
|
+
|
|
4479
4488
|
<xsl:variable name="src">
|
|
4480
4489
|
<xsl:call-template name="image_src"/>
|
|
4481
4490
|
</xsl:variable>
|
|
@@ -4837,12 +4846,12 @@
|
|
|
4837
4846
|
</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">
|
|
4838
4847
|
<xsl:apply-templates mode="contents"/>
|
|
4839
4848
|
<xsl:text> </xsl:text>
|
|
4840
|
-
</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">
|
|
4849
|
+
</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">
|
|
4841
4850
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4842
4851
|
<xsl:text> </xsl:text>
|
|
4843
4852
|
</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">
|
|
4844
4853
|
<xsl:value-of select="."/>
|
|
4845
|
-
</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']
|
|
4854
|
+
</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">
|
|
4846
4855
|
<xsl:value-of select="."/>
|
|
4847
4856
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4848
4857
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4940,6 +4949,8 @@
|
|
|
4940
4949
|
|
|
4941
4950
|
|
|
4942
4951
|
|
|
4952
|
+
|
|
4953
|
+
|
|
4943
4954
|
</fo:bookmark-tree>
|
|
4944
4955
|
</xsl:if>
|
|
4945
4956
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -5112,6 +5123,8 @@
|
|
|
5112
5123
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
5113
5124
|
|
|
5114
5125
|
|
|
5126
|
+
|
|
5127
|
+
|
|
5115
5128
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
5116
5129
|
<xsl:variable name="_font-size">
|
|
5117
5130
|
|
|
@@ -5164,10 +5177,14 @@
|
|
|
5164
5177
|
</xsl:if>
|
|
5165
5178
|
|
|
5166
5179
|
|
|
5180
|
+
|
|
5181
|
+
|
|
5167
5182
|
<xsl:apply-templates/>
|
|
5168
5183
|
</fo:block>
|
|
5184
|
+
|
|
5169
5185
|
|
|
5170
5186
|
|
|
5187
|
+
|
|
5171
5188
|
|
|
5172
5189
|
</fo:block-container>
|
|
5173
5190
|
</fo:block-container>
|
|
@@ -5404,7 +5421,8 @@
|
|
|
5404
5421
|
</fo:block>
|
|
5405
5422
|
</fo:table-cell>
|
|
5406
5423
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
5407
|
-
<fo:block font-size="11pt"
|
|
5424
|
+
<fo:block font-size="11pt">
|
|
5425
|
+
|
|
5408
5426
|
<xsl:apply-templates/>
|
|
5409
5427
|
</fo:block>
|
|
5410
5428
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -5519,6 +5537,7 @@
|
|
|
5519
5537
|
</xsl:choose>
|
|
5520
5538
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
5521
5539
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
5540
|
+
|
|
5522
5541
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
5523
5542
|
<xsl:variable name="termsource_text">
|
|
5524
5543
|
<xsl:apply-templates/>
|
|
@@ -5529,11 +5548,13 @@
|
|
|
5529
5548
|
<!-- <xsl:apply-templates /> -->
|
|
5530
5549
|
<xsl:copy-of select="$termsource_text"/>
|
|
5531
5550
|
</xsl:when>
|
|
5532
|
-
<xsl:otherwise>
|
|
5551
|
+
<xsl:otherwise>
|
|
5552
|
+
|
|
5533
5553
|
|
|
5534
5554
|
<!-- <xsl:apply-templates /> -->
|
|
5535
5555
|
<xsl:copy-of select="$termsource_text"/>
|
|
5536
5556
|
|
|
5557
|
+
|
|
5537
5558
|
</xsl:otherwise>
|
|
5538
5559
|
</xsl:choose>
|
|
5539
5560
|
</fo:block>
|
|
@@ -5616,12 +5637,20 @@
|
|
|
5616
5637
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5617
5638
|
<xsl:text>— </xsl:text>
|
|
5618
5639
|
<xsl:apply-templates/>
|
|
5619
|
-
</xsl:template><xsl:
|
|
5640
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5641
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5642
|
+
<xsl:copy-of select="."/>
|
|
5643
|
+
</xsl:for-each>
|
|
5644
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5645
|
+
<xsl:copy-of select="."/>
|
|
5646
|
+
</xsl:for-each>
|
|
5647
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5620
5648
|
|
|
5621
5649
|
<xsl:variable name="bibitemid">
|
|
5622
5650
|
<xsl:choose>
|
|
5623
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5624
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5651
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5652
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5653
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5625
5654
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5626
5655
|
</xsl:choose>
|
|
5627
5656
|
</xsl:variable>
|
|
@@ -5705,10 +5734,10 @@
|
|
|
5705
5734
|
</xsl:choose>
|
|
5706
5735
|
</xsl:variable>
|
|
5707
5736
|
|
|
5708
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5737
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5709
5738
|
|
|
5710
5739
|
<xsl:choose>
|
|
5711
|
-
<xsl:when test="$
|
|
5740
|
+
<xsl:when test="$lang = 'zh'">
|
|
5712
5741
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5713
5742
|
</xsl:when>
|
|
5714
5743
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5751,15 +5780,20 @@
|
|
|
5751
5780
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5752
5781
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5753
5782
|
</fo:block>
|
|
5783
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5784
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5785
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5786
|
+
</xsl:if>
|
|
5754
5787
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5755
5788
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5756
5789
|
<xsl:apply-templates/>
|
|
5757
5790
|
</fo:block>
|
|
5758
5791
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5759
5792
|
<xsl:apply-templates/>
|
|
5760
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5793
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5761
5794
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5762
|
-
<fo:block
|
|
5795
|
+
<!-- <fo:block> </fo:block> -->
|
|
5796
|
+
<fo:block/>
|
|
5763
5797
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5764
5798
|
|
|
5765
5799
|
<fo:block>
|
|
@@ -6693,12 +6727,15 @@
|
|
|
6693
6727
|
<xsl:param name="default">left</xsl:param>
|
|
6694
6728
|
<xsl:attribute name="text-align">
|
|
6695
6729
|
<xsl:choose>
|
|
6696
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6730
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6697
6731
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6698
6732
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6699
6733
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6700
6734
|
</xsl:choose>
|
|
6701
6735
|
</xsl:attribute>
|
|
6736
|
+
<xsl:if test="@align = 'indent'">
|
|
6737
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6738
|
+
</xsl:if>
|
|
6702
6739
|
</xsl:template><xsl:template name="number-to-words">
|
|
6703
6740
|
<xsl:param name="number"/>
|
|
6704
6741
|
<xsl:param name="first"/>
|
data/metanorma-ribose.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-ribose
|
|
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
|
|
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
245
245
|
- !ruby/object:Gem::Version
|
|
246
246
|
version: '0'
|
|
247
247
|
requirements: []
|
|
248
|
-
rubygems_version: 3.
|
|
248
|
+
rubygems_version: 3.2.22
|
|
249
249
|
signing_key:
|
|
250
250
|
specification_version: 4
|
|
251
251
|
summary: metanorma-ribose lets you write Ribose standards in AsciiDoc.
|