metanorma-un 0.6.13 → 0.7.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/un/isodoc.rng +254 -27
- data/lib/isodoc/un/html/htmlstyle.css +4 -4
- data/lib/isodoc/un/html/htmlstyle.scss +5 -4
- data/lib/isodoc/un/html/unece.css +0 -1
- data/lib/isodoc/un/html/unece.scss +0 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +53 -16
- data/lib/isodoc/un/un.plenary.xsl +53 -16
- data/lib/isodoc/un/un.recommendation.xsl +53 -16
- data/lib/metanorma/un/version.rb +1 -1
- data/metanorma-unece.gemspec +2 -3
- metadata +10 -24
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d22d2a2819fa74b365c8052975abb0dfc2af24f2b1c5cdac9883800b211de3e7
|
|
4
|
+
data.tar.gz: 80d427b92261fd22e98e680d57f513ad13aa21e232e90db2c8ce42d77a3a661e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d9f251ee7f43bc0e1b493db91b38b87127612c2f35a4667df0e51d89f662aba17b732adfd86ea5fab8510a329e6822c8c766fca3b276c9addd77cf70d9056bdc
|
|
7
|
+
data.tar.gz: 4525ece9666d7b3673bbb5996db9b6f68fae3dc2c61f274a23631cab587af43b4eb10584052ecfbd686466ca4293294f4341d2bab95d24afe8c935799a996742
|
|
@@ -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"/>
|
|
@@ -625,12 +625,12 @@ h6 {
|
|
|
625
625
|
font-size: 1.1em;
|
|
626
626
|
font-weight: 100;
|
|
627
627
|
}*/
|
|
628
|
-
.TermNum
|
|
629
|
-
.Terms,
|
|
630
|
-
.AltTerms {
|
|
631
|
-
color: #00ADEF;
|
|
628
|
+
.TermNum {
|
|
632
629
|
font-weight: 100; }
|
|
633
630
|
|
|
631
|
+
.TermNum, .Terms, .AltTerms {
|
|
632
|
+
color: #00ADEF; }
|
|
633
|
+
|
|
634
634
|
h2.TermNum {
|
|
635
635
|
margin-bottom: 0; }
|
|
636
636
|
|
|
@@ -346,13 +346,14 @@ h6 {
|
|
|
346
346
|
font-weight: 100;
|
|
347
347
|
}*/
|
|
348
348
|
|
|
349
|
-
.TermNum
|
|
350
|
-
.Terms,
|
|
351
|
-
.AltTerms {
|
|
352
|
-
color: $un-blue;
|
|
349
|
+
.TermNum {
|
|
353
350
|
font-weight: 100;
|
|
354
351
|
}
|
|
355
352
|
|
|
353
|
+
.TermNum, .Terms, .AltTerms {
|
|
354
|
+
color: $un-blue;
|
|
355
|
+
}
|
|
356
|
+
|
|
356
357
|
h2.TermNum {
|
|
357
358
|
margin-bottom: 0;
|
|
358
359
|
}
|
|
@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms {
|
|
|
314
314
|
mso-fareast-font-family: {{headerfont}};
|
|
315
315
|
mso-bidi-font-family: {{headerfont}};
|
|
316
316
|
mso-ansi-language: EN-GB;
|
|
317
|
-
font-weight: bold;
|
|
318
317
|
mso-bidi-font-weight: normal; }
|
|
319
318
|
|
|
320
319
|
p.AltTerms, li.AltTerms, div.AltTerms {
|
|
@@ -314,7 +314,6 @@ p.Terms, li.Terms, div.Terms
|
|
|
314
314
|
mso-fareast-font-family:$headerfont;
|
|
315
315
|
mso-bidi-font-family:$headerfont;
|
|
316
316
|
mso-ansi-language:EN-GB;
|
|
317
|
-
font-weight:bold;
|
|
318
317
|
mso-bidi-font-weight:normal;}
|
|
319
318
|
p.AltTerms, li.AltTerms, div.AltTerms
|
|
320
319
|
{mso-style-name:"AltTerm\(s\)";
|
|
@@ -1205,6 +1205,8 @@
|
|
|
1205
1205
|
|
|
1206
1206
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1207
1207
|
|
|
1208
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1209
|
+
|
|
1208
1210
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1209
1211
|
|
|
1210
1212
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1668,7 +1670,8 @@
|
|
|
1668
1670
|
<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"/>
|
|
1669
1671
|
|
|
1670
1672
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1671
|
-
|
|
1673
|
+
|
|
1674
|
+
<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']]">
|
|
1672
1675
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1673
1676
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1674
1677
|
</xsl:for-each>
|
|
@@ -1678,7 +1681,7 @@
|
|
|
1678
1681
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1679
1682
|
</xsl:for-each>
|
|
1680
1683
|
|
|
1681
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1684
|
+
<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')]]">
|
|
1682
1685
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1683
1686
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1684
1687
|
</xsl:for-each>
|
|
@@ -3102,6 +3105,7 @@
|
|
|
3102
3105
|
<fo:table-cell>
|
|
3103
3106
|
|
|
3104
3107
|
<fo:block margin-top="6pt">
|
|
3108
|
+
<xsl:copy-of select="@id"/>
|
|
3105
3109
|
|
|
3106
3110
|
|
|
3107
3111
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3950,14 +3954,18 @@
|
|
|
3950
3954
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3951
3955
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3952
3956
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3957
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3953
3958
|
<fo:block id="{@id}">
|
|
3954
3959
|
<xsl:apply-templates/>
|
|
3955
3960
|
</fo:block>
|
|
3956
3961
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3962
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3957
3963
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3958
3964
|
|
|
3959
3965
|
|
|
3960
|
-
|
|
3966
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3967
|
+
|
|
3968
|
+
</xsl:if>
|
|
3961
3969
|
<xsl:apply-templates/>
|
|
3962
3970
|
</fo:block>
|
|
3963
3971
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -4019,6 +4027,7 @@
|
|
|
4019
4027
|
<xsl:otherwise>
|
|
4020
4028
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
4021
4029
|
|
|
4030
|
+
|
|
4022
4031
|
<xsl:variable name="src">
|
|
4023
4032
|
<xsl:call-template name="image_src"/>
|
|
4024
4033
|
</xsl:variable>
|
|
@@ -4380,12 +4389,12 @@
|
|
|
4380
4389
|
</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">
|
|
4381
4390
|
<xsl:apply-templates mode="contents"/>
|
|
4382
4391
|
<xsl:text> </xsl:text>
|
|
4383
|
-
</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">
|
|
4392
|
+
</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">
|
|
4384
4393
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4385
4394
|
<xsl:text> </xsl:text>
|
|
4386
4395
|
</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">
|
|
4387
4396
|
<xsl:value-of select="."/>
|
|
4388
|
-
</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']
|
|
4397
|
+
</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">
|
|
4389
4398
|
<xsl:value-of select="."/>
|
|
4390
4399
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4391
4400
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4483,6 +4492,8 @@
|
|
|
4483
4492
|
|
|
4484
4493
|
|
|
4485
4494
|
|
|
4495
|
+
|
|
4496
|
+
|
|
4486
4497
|
</fo:bookmark-tree>
|
|
4487
4498
|
</xsl:if>
|
|
4488
4499
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4653,6 +4664,8 @@
|
|
|
4653
4664
|
|
|
4654
4665
|
|
|
4655
4666
|
|
|
4667
|
+
|
|
4668
|
+
|
|
4656
4669
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4657
4670
|
<xsl:variable name="_font-size">
|
|
4658
4671
|
|
|
@@ -4686,13 +4699,17 @@
|
|
|
4686
4699
|
|
|
4687
4700
|
|
|
4688
4701
|
|
|
4702
|
+
|
|
4703
|
+
|
|
4689
4704
|
<xsl:apply-templates/>
|
|
4690
4705
|
</fo:block>
|
|
4691
|
-
|
|
4706
|
+
|
|
4692
4707
|
|
|
4693
4708
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4694
4709
|
|
|
4695
4710
|
|
|
4711
|
+
|
|
4712
|
+
|
|
4696
4713
|
</fo:block-container>
|
|
4697
4714
|
</fo:block-container>
|
|
4698
4715
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4928,7 +4945,8 @@
|
|
|
4928
4945
|
</fo:block>
|
|
4929
4946
|
</fo:table-cell>
|
|
4930
4947
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4931
|
-
<fo:block font-size="11pt"
|
|
4948
|
+
<fo:block font-size="11pt">
|
|
4949
|
+
|
|
4932
4950
|
<xsl:apply-templates/>
|
|
4933
4951
|
</fo:block>
|
|
4934
4952
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -5038,6 +5056,7 @@
|
|
|
5038
5056
|
</xsl:choose>
|
|
5039
5057
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
5040
5058
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
5059
|
+
|
|
5041
5060
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
5042
5061
|
<xsl:variable name="termsource_text">
|
|
5043
5062
|
<xsl:apply-templates/>
|
|
@@ -5048,13 +5067,15 @@
|
|
|
5048
5067
|
<!-- <xsl:apply-templates /> -->
|
|
5049
5068
|
<xsl:copy-of select="$termsource_text"/>
|
|
5050
5069
|
</xsl:when>
|
|
5051
|
-
<xsl:otherwise>
|
|
5070
|
+
<xsl:otherwise>
|
|
5071
|
+
|
|
5052
5072
|
|
|
5053
5073
|
<xsl:text>[</xsl:text>
|
|
5054
5074
|
|
|
5055
5075
|
<!-- <xsl:apply-templates /> -->
|
|
5056
5076
|
<xsl:copy-of select="$termsource_text"/>
|
|
5057
5077
|
|
|
5078
|
+
|
|
5058
5079
|
<xsl:text>]</xsl:text>
|
|
5059
5080
|
|
|
5060
5081
|
</xsl:otherwise>
|
|
@@ -5121,12 +5142,20 @@
|
|
|
5121
5142
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5122
5143
|
<xsl:text>— </xsl:text>
|
|
5123
5144
|
<xsl:apply-templates/>
|
|
5124
|
-
</xsl:template><xsl:
|
|
5145
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5146
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5147
|
+
<xsl:copy-of select="."/>
|
|
5148
|
+
</xsl:for-each>
|
|
5149
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5150
|
+
<xsl:copy-of select="."/>
|
|
5151
|
+
</xsl:for-each>
|
|
5152
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5125
5153
|
|
|
5126
5154
|
<xsl:variable name="bibitemid">
|
|
5127
5155
|
<xsl:choose>
|
|
5128
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5129
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5156
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5157
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5158
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5130
5159
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5131
5160
|
</xsl:choose>
|
|
5132
5161
|
</xsl:variable>
|
|
@@ -5217,10 +5246,10 @@
|
|
|
5217
5246
|
</xsl:choose>
|
|
5218
5247
|
</xsl:variable>
|
|
5219
5248
|
|
|
5220
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5249
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5221
5250
|
|
|
5222
5251
|
<xsl:choose>
|
|
5223
|
-
<xsl:when test="$
|
|
5252
|
+
<xsl:when test="$lang = 'zh'">
|
|
5224
5253
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5225
5254
|
</xsl:when>
|
|
5226
5255
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5263,15 +5292,20 @@
|
|
|
5263
5292
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5264
5293
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5265
5294
|
</fo:block>
|
|
5295
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5296
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5297
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5298
|
+
</xsl:if>
|
|
5266
5299
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5267
5300
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5268
5301
|
<xsl:apply-templates/>
|
|
5269
5302
|
</fo:block>
|
|
5270
5303
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5271
5304
|
<xsl:apply-templates/>
|
|
5272
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5305
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5273
5306
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5274
|
-
<fo:block
|
|
5307
|
+
<!-- <fo:block> </fo:block> -->
|
|
5308
|
+
<fo:block/>
|
|
5275
5309
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5276
5310
|
|
|
5277
5311
|
<fo:block>
|
|
@@ -6210,12 +6244,15 @@
|
|
|
6210
6244
|
<xsl:param name="default">left</xsl:param>
|
|
6211
6245
|
<xsl:attribute name="text-align">
|
|
6212
6246
|
<xsl:choose>
|
|
6213
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6247
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6214
6248
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6215
6249
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6216
6250
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6217
6251
|
</xsl:choose>
|
|
6218
6252
|
</xsl:attribute>
|
|
6253
|
+
<xsl:if test="@align = 'indent'">
|
|
6254
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6255
|
+
</xsl:if>
|
|
6219
6256
|
</xsl:template><xsl:template name="number-to-words">
|
|
6220
6257
|
<xsl:param name="number"/>
|
|
6221
6258
|
<xsl:param name="first"/>
|
|
@@ -1205,6 +1205,8 @@
|
|
|
1205
1205
|
|
|
1206
1206
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1207
1207
|
|
|
1208
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1209
|
+
|
|
1208
1210
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1209
1211
|
|
|
1210
1212
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1668,7 +1670,8 @@
|
|
|
1668
1670
|
<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"/>
|
|
1669
1671
|
|
|
1670
1672
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1671
|
-
|
|
1673
|
+
|
|
1674
|
+
<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']]">
|
|
1672
1675
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1673
1676
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1674
1677
|
</xsl:for-each>
|
|
@@ -1678,7 +1681,7 @@
|
|
|
1678
1681
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1679
1682
|
</xsl:for-each>
|
|
1680
1683
|
|
|
1681
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1684
|
+
<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')]]">
|
|
1682
1685
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1683
1686
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1684
1687
|
</xsl:for-each>
|
|
@@ -3102,6 +3105,7 @@
|
|
|
3102
3105
|
<fo:table-cell>
|
|
3103
3106
|
|
|
3104
3107
|
<fo:block margin-top="6pt">
|
|
3108
|
+
<xsl:copy-of select="@id"/>
|
|
3105
3109
|
|
|
3106
3110
|
|
|
3107
3111
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3950,14 +3954,18 @@
|
|
|
3950
3954
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3951
3955
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3952
3956
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3957
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3953
3958
|
<fo:block id="{@id}">
|
|
3954
3959
|
<xsl:apply-templates/>
|
|
3955
3960
|
</fo:block>
|
|
3956
3961
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3962
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3957
3963
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3958
3964
|
|
|
3959
3965
|
|
|
3960
|
-
|
|
3966
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3967
|
+
|
|
3968
|
+
</xsl:if>
|
|
3961
3969
|
<xsl:apply-templates/>
|
|
3962
3970
|
</fo:block>
|
|
3963
3971
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -4019,6 +4027,7 @@
|
|
|
4019
4027
|
<xsl:otherwise>
|
|
4020
4028
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
4021
4029
|
|
|
4030
|
+
|
|
4022
4031
|
<xsl:variable name="src">
|
|
4023
4032
|
<xsl:call-template name="image_src"/>
|
|
4024
4033
|
</xsl:variable>
|
|
@@ -4380,12 +4389,12 @@
|
|
|
4380
4389
|
</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">
|
|
4381
4390
|
<xsl:apply-templates mode="contents"/>
|
|
4382
4391
|
<xsl:text> </xsl:text>
|
|
4383
|
-
</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">
|
|
4392
|
+
</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">
|
|
4384
4393
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4385
4394
|
<xsl:text> </xsl:text>
|
|
4386
4395
|
</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">
|
|
4387
4396
|
<xsl:value-of select="."/>
|
|
4388
|
-
</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']
|
|
4397
|
+
</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">
|
|
4389
4398
|
<xsl:value-of select="."/>
|
|
4390
4399
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4391
4400
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4483,6 +4492,8 @@
|
|
|
4483
4492
|
|
|
4484
4493
|
|
|
4485
4494
|
|
|
4495
|
+
|
|
4496
|
+
|
|
4486
4497
|
</fo:bookmark-tree>
|
|
4487
4498
|
</xsl:if>
|
|
4488
4499
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4653,6 +4664,8 @@
|
|
|
4653
4664
|
|
|
4654
4665
|
|
|
4655
4666
|
|
|
4667
|
+
|
|
4668
|
+
|
|
4656
4669
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4657
4670
|
<xsl:variable name="_font-size">
|
|
4658
4671
|
|
|
@@ -4686,13 +4699,17 @@
|
|
|
4686
4699
|
|
|
4687
4700
|
|
|
4688
4701
|
|
|
4702
|
+
|
|
4703
|
+
|
|
4689
4704
|
<xsl:apply-templates/>
|
|
4690
4705
|
</fo:block>
|
|
4691
|
-
|
|
4706
|
+
|
|
4692
4707
|
|
|
4693
4708
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4694
4709
|
|
|
4695
4710
|
|
|
4711
|
+
|
|
4712
|
+
|
|
4696
4713
|
</fo:block-container>
|
|
4697
4714
|
</fo:block-container>
|
|
4698
4715
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4928,7 +4945,8 @@
|
|
|
4928
4945
|
</fo:block>
|
|
4929
4946
|
</fo:table-cell>
|
|
4930
4947
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4931
|
-
<fo:block font-size="11pt"
|
|
4948
|
+
<fo:block font-size="11pt">
|
|
4949
|
+
|
|
4932
4950
|
<xsl:apply-templates/>
|
|
4933
4951
|
</fo:block>
|
|
4934
4952
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -5038,6 +5056,7 @@
|
|
|
5038
5056
|
</xsl:choose>
|
|
5039
5057
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
5040
5058
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
5059
|
+
|
|
5041
5060
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
5042
5061
|
<xsl:variable name="termsource_text">
|
|
5043
5062
|
<xsl:apply-templates/>
|
|
@@ -5048,13 +5067,15 @@
|
|
|
5048
5067
|
<!-- <xsl:apply-templates /> -->
|
|
5049
5068
|
<xsl:copy-of select="$termsource_text"/>
|
|
5050
5069
|
</xsl:when>
|
|
5051
|
-
<xsl:otherwise>
|
|
5070
|
+
<xsl:otherwise>
|
|
5071
|
+
|
|
5052
5072
|
|
|
5053
5073
|
<xsl:text>[</xsl:text>
|
|
5054
5074
|
|
|
5055
5075
|
<!-- <xsl:apply-templates /> -->
|
|
5056
5076
|
<xsl:copy-of select="$termsource_text"/>
|
|
5057
5077
|
|
|
5078
|
+
|
|
5058
5079
|
<xsl:text>]</xsl:text>
|
|
5059
5080
|
|
|
5060
5081
|
</xsl:otherwise>
|
|
@@ -5121,12 +5142,20 @@
|
|
|
5121
5142
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5122
5143
|
<xsl:text>— </xsl:text>
|
|
5123
5144
|
<xsl:apply-templates/>
|
|
5124
|
-
</xsl:template><xsl:
|
|
5145
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5146
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5147
|
+
<xsl:copy-of select="."/>
|
|
5148
|
+
</xsl:for-each>
|
|
5149
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5150
|
+
<xsl:copy-of select="."/>
|
|
5151
|
+
</xsl:for-each>
|
|
5152
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5125
5153
|
|
|
5126
5154
|
<xsl:variable name="bibitemid">
|
|
5127
5155
|
<xsl:choose>
|
|
5128
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5129
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5156
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5157
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5158
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5130
5159
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5131
5160
|
</xsl:choose>
|
|
5132
5161
|
</xsl:variable>
|
|
@@ -5217,10 +5246,10 @@
|
|
|
5217
5246
|
</xsl:choose>
|
|
5218
5247
|
</xsl:variable>
|
|
5219
5248
|
|
|
5220
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5249
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5221
5250
|
|
|
5222
5251
|
<xsl:choose>
|
|
5223
|
-
<xsl:when test="$
|
|
5252
|
+
<xsl:when test="$lang = 'zh'">
|
|
5224
5253
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5225
5254
|
</xsl:when>
|
|
5226
5255
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5263,15 +5292,20 @@
|
|
|
5263
5292
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5264
5293
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5265
5294
|
</fo:block>
|
|
5295
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5296
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5297
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5298
|
+
</xsl:if>
|
|
5266
5299
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5267
5300
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5268
5301
|
<xsl:apply-templates/>
|
|
5269
5302
|
</fo:block>
|
|
5270
5303
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5271
5304
|
<xsl:apply-templates/>
|
|
5272
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5305
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5273
5306
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5274
|
-
<fo:block
|
|
5307
|
+
<!-- <fo:block> </fo:block> -->
|
|
5308
|
+
<fo:block/>
|
|
5275
5309
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5276
5310
|
|
|
5277
5311
|
<fo:block>
|
|
@@ -6210,12 +6244,15 @@
|
|
|
6210
6244
|
<xsl:param name="default">left</xsl:param>
|
|
6211
6245
|
<xsl:attribute name="text-align">
|
|
6212
6246
|
<xsl:choose>
|
|
6213
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6247
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6214
6248
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6215
6249
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6216
6250
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6217
6251
|
</xsl:choose>
|
|
6218
6252
|
</xsl:attribute>
|
|
6253
|
+
<xsl:if test="@align = 'indent'">
|
|
6254
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6255
|
+
</xsl:if>
|
|
6219
6256
|
</xsl:template><xsl:template name="number-to-words">
|
|
6220
6257
|
<xsl:param name="number"/>
|
|
6221
6258
|
<xsl:param name="first"/>
|
|
@@ -1162,6 +1162,8 @@
|
|
|
1162
1162
|
|
|
1163
1163
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1164
1164
|
|
|
1165
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1166
|
+
|
|
1165
1167
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1166
1168
|
|
|
1167
1169
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1626,7 +1628,8 @@
|
|
|
1626
1628
|
<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"/>
|
|
1627
1629
|
|
|
1628
1630
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1629
|
-
|
|
1631
|
+
|
|
1632
|
+
<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']]">
|
|
1630
1633
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1631
1634
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1632
1635
|
</xsl:for-each>
|
|
@@ -1636,7 +1639,7 @@
|
|
|
1636
1639
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1637
1640
|
</xsl:for-each>
|
|
1638
1641
|
|
|
1639
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1642
|
+
<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')]]">
|
|
1640
1643
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1641
1644
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1642
1645
|
</xsl:for-each>
|
|
@@ -3065,6 +3068,7 @@
|
|
|
3065
3068
|
<fo:table-cell>
|
|
3066
3069
|
|
|
3067
3070
|
<fo:block margin-top="6pt">
|
|
3071
|
+
<xsl:copy-of select="@id"/>
|
|
3068
3072
|
|
|
3069
3073
|
|
|
3070
3074
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3917,14 +3921,18 @@
|
|
|
3917
3921
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3918
3922
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3919
3923
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3924
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3920
3925
|
<fo:block id="{@id}">
|
|
3921
3926
|
<xsl:apply-templates/>
|
|
3922
3927
|
</fo:block>
|
|
3923
3928
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3929
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3924
3930
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3925
3931
|
|
|
3926
3932
|
|
|
3927
|
-
|
|
3933
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3934
|
+
|
|
3935
|
+
</xsl:if>
|
|
3928
3936
|
<xsl:apply-templates/>
|
|
3929
3937
|
</fo:block>
|
|
3930
3938
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3986,6 +3994,7 @@
|
|
|
3986
3994
|
<xsl:otherwise>
|
|
3987
3995
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3988
3996
|
|
|
3997
|
+
|
|
3989
3998
|
<xsl:if test="ancestor::un:admonition">
|
|
3990
3999
|
<xsl:attribute name="margin-top">-12mm</xsl:attribute>
|
|
3991
4000
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
@@ -4352,12 +4361,12 @@
|
|
|
4352
4361
|
</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">
|
|
4353
4362
|
<xsl:apply-templates mode="contents"/>
|
|
4354
4363
|
<xsl:text> </xsl:text>
|
|
4355
|
-
</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">
|
|
4364
|
+
</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">
|
|
4356
4365
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4357
4366
|
<xsl:text> </xsl:text>
|
|
4358
4367
|
</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">
|
|
4359
4368
|
<xsl:value-of select="."/>
|
|
4360
|
-
</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']
|
|
4369
|
+
</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">
|
|
4361
4370
|
<xsl:value-of select="."/>
|
|
4362
4371
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4363
4372
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4455,6 +4464,8 @@
|
|
|
4455
4464
|
|
|
4456
4465
|
|
|
4457
4466
|
|
|
4467
|
+
|
|
4468
|
+
|
|
4458
4469
|
</fo:bookmark-tree>
|
|
4459
4470
|
</xsl:if>
|
|
4460
4471
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4625,6 +4636,8 @@
|
|
|
4625
4636
|
|
|
4626
4637
|
|
|
4627
4638
|
|
|
4639
|
+
|
|
4640
|
+
|
|
4628
4641
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4629
4642
|
<xsl:variable name="_font-size">
|
|
4630
4643
|
|
|
@@ -4658,13 +4671,17 @@
|
|
|
4658
4671
|
|
|
4659
4672
|
|
|
4660
4673
|
|
|
4674
|
+
|
|
4675
|
+
|
|
4661
4676
|
<xsl:apply-templates/>
|
|
4662
4677
|
</fo:block>
|
|
4663
|
-
|
|
4678
|
+
|
|
4664
4679
|
|
|
4665
4680
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4666
4681
|
|
|
4667
4682
|
|
|
4683
|
+
|
|
4684
|
+
|
|
4668
4685
|
</fo:block-container>
|
|
4669
4686
|
</fo:block-container>
|
|
4670
4687
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4900,7 +4917,8 @@
|
|
|
4900
4917
|
</fo:block>
|
|
4901
4918
|
</fo:table-cell>
|
|
4902
4919
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4903
|
-
<fo:block font-size="11pt"
|
|
4920
|
+
<fo:block font-size="11pt">
|
|
4921
|
+
|
|
4904
4922
|
<xsl:apply-templates/>
|
|
4905
4923
|
</fo:block>
|
|
4906
4924
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -5010,6 +5028,7 @@
|
|
|
5010
5028
|
</xsl:choose>
|
|
5011
5029
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
5012
5030
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
5031
|
+
|
|
5013
5032
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
5014
5033
|
<xsl:variable name="termsource_text">
|
|
5015
5034
|
<xsl:apply-templates/>
|
|
@@ -5020,13 +5039,15 @@
|
|
|
5020
5039
|
<!-- <xsl:apply-templates /> -->
|
|
5021
5040
|
<xsl:copy-of select="$termsource_text"/>
|
|
5022
5041
|
</xsl:when>
|
|
5023
|
-
<xsl:otherwise>
|
|
5042
|
+
<xsl:otherwise>
|
|
5043
|
+
|
|
5024
5044
|
|
|
5025
5045
|
<xsl:text>[</xsl:text>
|
|
5026
5046
|
|
|
5027
5047
|
<!-- <xsl:apply-templates /> -->
|
|
5028
5048
|
<xsl:copy-of select="$termsource_text"/>
|
|
5029
5049
|
|
|
5050
|
+
|
|
5030
5051
|
<xsl:text>]</xsl:text>
|
|
5031
5052
|
|
|
5032
5053
|
</xsl:otherwise>
|
|
@@ -5093,12 +5114,20 @@
|
|
|
5093
5114
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
5094
5115
|
<xsl:text>— </xsl:text>
|
|
5095
5116
|
<xsl:apply-templates/>
|
|
5096
|
-
</xsl:template><xsl:
|
|
5117
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5118
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5119
|
+
<xsl:copy-of select="."/>
|
|
5120
|
+
</xsl:for-each>
|
|
5121
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5122
|
+
<xsl:copy-of select="."/>
|
|
5123
|
+
</xsl:for-each>
|
|
5124
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
5097
5125
|
|
|
5098
5126
|
<xsl:variable name="bibitemid">
|
|
5099
5127
|
<xsl:choose>
|
|
5100
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5101
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5128
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5129
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5130
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5102
5131
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5103
5132
|
</xsl:choose>
|
|
5104
5133
|
</xsl:variable>
|
|
@@ -5187,10 +5216,10 @@
|
|
|
5187
5216
|
</xsl:choose>
|
|
5188
5217
|
</xsl:variable>
|
|
5189
5218
|
|
|
5190
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5219
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5191
5220
|
|
|
5192
5221
|
<xsl:choose>
|
|
5193
|
-
<xsl:when test="$
|
|
5222
|
+
<xsl:when test="$lang = 'zh'">
|
|
5194
5223
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5195
5224
|
</xsl:when>
|
|
5196
5225
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5233,15 +5262,20 @@
|
|
|
5233
5262
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5234
5263
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5235
5264
|
</fo:block>
|
|
5265
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5266
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5267
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5268
|
+
</xsl:if>
|
|
5236
5269
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5237
5270
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5238
5271
|
<xsl:apply-templates/>
|
|
5239
5272
|
</fo:block>
|
|
5240
5273
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5241
5274
|
<xsl:apply-templates/>
|
|
5242
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5275
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5243
5276
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5244
|
-
<fo:block
|
|
5277
|
+
<!-- <fo:block> </fo:block> -->
|
|
5278
|
+
<fo:block/>
|
|
5245
5279
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5246
5280
|
|
|
5247
5281
|
<fo:block break-after="page"/>
|
|
@@ -6182,12 +6216,15 @@
|
|
|
6182
6216
|
<xsl:param name="default">left</xsl:param>
|
|
6183
6217
|
<xsl:attribute name="text-align">
|
|
6184
6218
|
<xsl:choose>
|
|
6185
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6219
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6186
6220
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6187
6221
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6188
6222
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6189
6223
|
</xsl:choose>
|
|
6190
6224
|
</xsl:attribute>
|
|
6225
|
+
<xsl:if test="@align = 'indent'">
|
|
6226
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6227
|
+
</xsl:if>
|
|
6191
6228
|
</xsl:template><xsl:template name="number-to-words">
|
|
6192
6229
|
<xsl:param name="number"/>
|
|
6193
6230
|
<xsl:param name="first"/>
|
data/lib/metanorma/un/version.rb
CHANGED
data/metanorma-unece.gemspec
CHANGED
|
@@ -30,10 +30,9 @@ Gem::Specification.new do |spec|
|
|
|
30
30
|
spec.add_dependency "roman-numerals"
|
|
31
31
|
spec.add_dependency "twitter_cldr"
|
|
32
32
|
|
|
33
|
-
spec.add_dependency "
|
|
34
|
-
spec.add_dependency "metanorma-standoc", "~> 1.10.0"
|
|
33
|
+
spec.add_dependency "metanorma-standoc", "~> 1.11.0"
|
|
35
34
|
|
|
36
|
-
spec.add_development_dependency "
|
|
35
|
+
spec.add_development_dependency "debug"
|
|
37
36
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
38
37
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
39
38
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-un
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.7.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: iso-639
|
|
@@ -52,48 +52,34 @@ dependencies:
|
|
|
52
52
|
- - ">="
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
|
-
- !ruby/object:Gem::Dependency
|
|
56
|
-
name: isodoc
|
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
|
58
|
-
requirements:
|
|
59
|
-
- - "~>"
|
|
60
|
-
- !ruby/object:Gem::Version
|
|
61
|
-
version: 1.7.0
|
|
62
|
-
type: :runtime
|
|
63
|
-
prerelease: false
|
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
65
|
-
requirements:
|
|
66
|
-
- - "~>"
|
|
67
|
-
- !ruby/object:Gem::Version
|
|
68
|
-
version: 1.7.0
|
|
69
55
|
- !ruby/object:Gem::Dependency
|
|
70
56
|
name: metanorma-standoc
|
|
71
57
|
requirement: !ruby/object:Gem::Requirement
|
|
72
58
|
requirements:
|
|
73
59
|
- - "~>"
|
|
74
60
|
- !ruby/object:Gem::Version
|
|
75
|
-
version: 1.
|
|
61
|
+
version: 1.11.0
|
|
76
62
|
type: :runtime
|
|
77
63
|
prerelease: false
|
|
78
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
65
|
requirements:
|
|
80
66
|
- - "~>"
|
|
81
67
|
- !ruby/object:Gem::Version
|
|
82
|
-
version: 1.
|
|
68
|
+
version: 1.11.0
|
|
83
69
|
- !ruby/object:Gem::Dependency
|
|
84
|
-
name:
|
|
70
|
+
name: debug
|
|
85
71
|
requirement: !ruby/object:Gem::Requirement
|
|
86
72
|
requirements:
|
|
87
|
-
- - "
|
|
73
|
+
- - ">="
|
|
88
74
|
- !ruby/object:Gem::Version
|
|
89
|
-
version: '
|
|
75
|
+
version: '0'
|
|
90
76
|
type: :development
|
|
91
77
|
prerelease: false
|
|
92
78
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
79
|
requirements:
|
|
94
|
-
- - "
|
|
80
|
+
- - ">="
|
|
95
81
|
- !ruby/object:Gem::Version
|
|
96
|
-
version: '
|
|
82
|
+
version: '0'
|
|
97
83
|
- !ruby/object:Gem::Dependency
|
|
98
84
|
name: equivalent-xml
|
|
99
85
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -306,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
306
292
|
- !ruby/object:Gem::Version
|
|
307
293
|
version: '0'
|
|
308
294
|
requirements: []
|
|
309
|
-
rubygems_version: 3.
|
|
295
|
+
rubygems_version: 3.2.22
|
|
310
296
|
signing_key:
|
|
311
297
|
specification_version: 4
|
|
312
298
|
summary: Metanorma for UN.
|