metanorma-iho 0.3.13 → 0.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/asciidoctor/iho/isodoc.rng +254 -27
- data/lib/isodoc/iho/base_convert.rb +1 -1
- data/lib/isodoc/iho/html/htmlstyle.css +3 -1
- data/lib/isodoc/iho/html/htmlstyle.scss +3 -0
- data/lib/isodoc/iho/iho.specification.xsl +58 -20
- data/lib/isodoc/iho/iho.standard.xsl +58 -20
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.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: c0c2f79813690cd611008d7dd3be6bd30cb2cb620ce14ed3a51d2a6b1bc4233a
|
|
4
|
+
data.tar.gz: c5b569291b99901d798bb85f1927dee6200cbbcdcd2a1feee7b1bce24903e50f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 244cd939b9dc01067094aa5ce52e72266d9b20c50e304159e44f10fce1a5d0c274b5c2cf156f7edaf656b878eefa0cd8edd8e8242c37b1c224b9fff5654a90a9
|
|
7
|
+
data.tar.gz: d0966e0fc4a23a44876004528d50d88f854960d8807492f2e80d7e3e790c2c8a53ecaed6036da8dab300453036ea8a34006515b930a53c09f1b80b4ac53d3f78
|
|
@@ -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"/>
|
|
@@ -817,9 +817,10 @@
|
|
|
817
817
|
</xsl:variable>
|
|
818
818
|
<fo:block line-height="1.1" role="H{$levelTerm}">
|
|
819
819
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
820
|
-
<xsl:apply-templates select="ancestor::iho:term/iho:name" mode="presentation"/>
|
|
820
|
+
<xsl:apply-templates select="ancestor::iho:term[1]/iho:name" mode="presentation"/>
|
|
821
821
|
</fo:block>
|
|
822
822
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
823
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
823
824
|
<xsl:apply-templates/>
|
|
824
825
|
</fo:block>
|
|
825
826
|
</fo:block>
|
|
@@ -1062,6 +1063,8 @@
|
|
|
1062
1063
|
|
|
1063
1064
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1064
1065
|
|
|
1066
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1067
|
+
|
|
1065
1068
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1066
1069
|
|
|
1067
1070
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1559,7 +1562,8 @@
|
|
|
1559
1562
|
<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"/>
|
|
1560
1563
|
|
|
1561
1564
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1562
|
-
|
|
1565
|
+
|
|
1566
|
+
<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']]">
|
|
1563
1567
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1564
1568
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1565
1569
|
</xsl:for-each>
|
|
@@ -1569,7 +1573,7 @@
|
|
|
1569
1573
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1570
1574
|
</xsl:for-each>
|
|
1571
1575
|
|
|
1572
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1576
|
+
<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')]]">
|
|
1573
1577
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1574
1578
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1575
1579
|
</xsl:for-each>
|
|
@@ -2969,6 +2973,7 @@
|
|
|
2969
2973
|
<fo:table-cell>
|
|
2970
2974
|
|
|
2971
2975
|
<fo:block margin-top="6pt">
|
|
2976
|
+
<xsl:copy-of select="@id"/>
|
|
2972
2977
|
|
|
2973
2978
|
|
|
2974
2979
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3811,14 +3816,18 @@
|
|
|
3811
3816
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3812
3817
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3813
3818
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3819
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3814
3820
|
<fo:block id="{@id}">
|
|
3815
3821
|
<xsl:apply-templates/>
|
|
3816
3822
|
</fo:block>
|
|
3817
3823
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3824
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3818
3825
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3819
3826
|
|
|
3820
3827
|
|
|
3821
|
-
|
|
3828
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3829
|
+
|
|
3830
|
+
</xsl:if>
|
|
3822
3831
|
<xsl:apply-templates/>
|
|
3823
3832
|
</fo:block>
|
|
3824
3833
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3880,6 +3889,7 @@
|
|
|
3880
3889
|
<xsl:otherwise>
|
|
3881
3890
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3882
3891
|
|
|
3892
|
+
|
|
3883
3893
|
<xsl:variable name="src">
|
|
3884
3894
|
<xsl:call-template name="image_src"/>
|
|
3885
3895
|
</xsl:variable>
|
|
@@ -4241,12 +4251,12 @@
|
|
|
4241
4251
|
</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">
|
|
4242
4252
|
<xsl:apply-templates mode="contents"/>
|
|
4243
4253
|
<xsl:text> </xsl:text>
|
|
4244
|
-
</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">
|
|
4254
|
+
</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">
|
|
4245
4255
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4246
4256
|
<xsl:text> </xsl:text>
|
|
4247
4257
|
</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">
|
|
4248
4258
|
<xsl:value-of select="."/>
|
|
4249
|
-
</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']
|
|
4259
|
+
</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">
|
|
4250
4260
|
<xsl:value-of select="."/>
|
|
4251
4261
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4252
4262
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4344,6 +4354,8 @@
|
|
|
4344
4354
|
|
|
4345
4355
|
|
|
4346
4356
|
|
|
4357
|
+
|
|
4358
|
+
|
|
4347
4359
|
</fo:bookmark-tree>
|
|
4348
4360
|
</xsl:if>
|
|
4349
4361
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4514,6 +4526,8 @@
|
|
|
4514
4526
|
|
|
4515
4527
|
|
|
4516
4528
|
|
|
4529
|
+
|
|
4530
|
+
|
|
4517
4531
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4518
4532
|
<xsl:variable name="_font-size">
|
|
4519
4533
|
|
|
@@ -4547,13 +4561,17 @@
|
|
|
4547
4561
|
|
|
4548
4562
|
|
|
4549
4563
|
|
|
4564
|
+
|
|
4565
|
+
|
|
4550
4566
|
<xsl:apply-templates/>
|
|
4551
4567
|
</fo:block>
|
|
4552
|
-
|
|
4568
|
+
|
|
4553
4569
|
|
|
4554
4570
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4555
4571
|
|
|
4556
4572
|
|
|
4573
|
+
|
|
4574
|
+
|
|
4557
4575
|
</fo:block-container>
|
|
4558
4576
|
</fo:block-container>
|
|
4559
4577
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4789,7 +4807,8 @@
|
|
|
4789
4807
|
</fo:block>
|
|
4790
4808
|
</fo:table-cell>
|
|
4791
4809
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4792
|
-
<fo:block font-size="11pt"
|
|
4810
|
+
<fo:block font-size="11pt">
|
|
4811
|
+
|
|
4793
4812
|
<xsl:apply-templates/>
|
|
4794
4813
|
</fo:block>
|
|
4795
4814
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4894,6 +4913,7 @@
|
|
|
4894
4913
|
</xsl:choose>
|
|
4895
4914
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4896
4915
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4916
|
+
|
|
4897
4917
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4898
4918
|
<xsl:variable name="termsource_text">
|
|
4899
4919
|
<xsl:apply-templates/>
|
|
@@ -4904,13 +4924,15 @@
|
|
|
4904
4924
|
<!-- <xsl:apply-templates /> -->
|
|
4905
4925
|
<xsl:copy-of select="$termsource_text"/>
|
|
4906
4926
|
</xsl:when>
|
|
4907
|
-
<xsl:otherwise>
|
|
4927
|
+
<xsl:otherwise>
|
|
4928
|
+
|
|
4908
4929
|
|
|
4909
4930
|
<xsl:text>[</xsl:text>
|
|
4910
4931
|
|
|
4911
4932
|
<!-- <xsl:apply-templates /> -->
|
|
4912
4933
|
<xsl:copy-of select="$termsource_text"/>
|
|
4913
4934
|
|
|
4935
|
+
|
|
4914
4936
|
<xsl:text>]</xsl:text>
|
|
4915
4937
|
|
|
4916
4938
|
</xsl:otherwise>
|
|
@@ -4994,12 +5016,20 @@
|
|
|
4994
5016
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4995
5017
|
<xsl:text>— </xsl:text>
|
|
4996
5018
|
<xsl:apply-templates/>
|
|
4997
|
-
</xsl:template><xsl:
|
|
5019
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5020
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5021
|
+
<xsl:copy-of select="."/>
|
|
5022
|
+
</xsl:for-each>
|
|
5023
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5024
|
+
<xsl:copy-of select="."/>
|
|
5025
|
+
</xsl:for-each>
|
|
5026
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4998
5027
|
|
|
4999
5028
|
<xsl:variable name="bibitemid">
|
|
5000
5029
|
<xsl:choose>
|
|
5001
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5002
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5030
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5031
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5032
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5003
5033
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5004
5034
|
</xsl:choose>
|
|
5005
5035
|
</xsl:variable>
|
|
@@ -5092,10 +5122,10 @@
|
|
|
5092
5122
|
</xsl:choose>
|
|
5093
5123
|
</xsl:variable>
|
|
5094
5124
|
|
|
5095
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5125
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5096
5126
|
|
|
5097
5127
|
<xsl:choose>
|
|
5098
|
-
<xsl:when test="$
|
|
5128
|
+
<xsl:when test="$lang = 'zh'">
|
|
5099
5129
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5100
5130
|
</xsl:when>
|
|
5101
5131
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5129,24 +5159,29 @@
|
|
|
5129
5159
|
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
|
|
5130
5160
|
<xsl:variable name="title-deprecated">
|
|
5131
5161
|
|
|
5132
|
-
|
|
5133
|
-
|
|
5134
|
-
<xsl:with-param name="name" select="'title-deprecated'"/>
|
|
5162
|
+
<xsl:call-template name="getLocalizedString">
|
|
5163
|
+
<xsl:with-param name="key">deprecated</xsl:with-param>
|
|
5135
5164
|
</xsl:call-template>
|
|
5136
5165
|
|
|
5166
|
+
|
|
5137
5167
|
</xsl:variable>
|
|
5138
5168
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5139
5169
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5140
5170
|
</fo:block>
|
|
5171
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5172
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5173
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5174
|
+
</xsl:if>
|
|
5141
5175
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5142
5176
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5143
5177
|
<xsl:apply-templates/>
|
|
5144
5178
|
</fo:block>
|
|
5145
5179
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5146
5180
|
<xsl:apply-templates/>
|
|
5147
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5181
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5148
5182
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5149
|
-
<fo:block
|
|
5183
|
+
<!-- <fo:block> </fo:block> -->
|
|
5184
|
+
<fo:block/>
|
|
5150
5185
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5151
5186
|
|
|
5152
5187
|
<fo:block>
|
|
@@ -6174,12 +6209,15 @@
|
|
|
6174
6209
|
<xsl:param name="default">left</xsl:param>
|
|
6175
6210
|
<xsl:attribute name="text-align">
|
|
6176
6211
|
<xsl:choose>
|
|
6177
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6212
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6178
6213
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6179
6214
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6180
6215
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6181
6216
|
</xsl:choose>
|
|
6182
6217
|
</xsl:attribute>
|
|
6218
|
+
<xsl:if test="@align = 'indent'">
|
|
6219
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6220
|
+
</xsl:if>
|
|
6183
6221
|
</xsl:template><xsl:template name="number-to-words">
|
|
6184
6222
|
<xsl:param name="number"/>
|
|
6185
6223
|
<xsl:param name="first"/>
|
|
@@ -817,9 +817,10 @@
|
|
|
817
817
|
</xsl:variable>
|
|
818
818
|
<fo:block line-height="1.1" role="H{$levelTerm}">
|
|
819
819
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
820
|
-
<xsl:apply-templates select="ancestor::iho:term/iho:name" mode="presentation"/>
|
|
820
|
+
<xsl:apply-templates select="ancestor::iho:term[1]/iho:name" mode="presentation"/>
|
|
821
821
|
</fo:block>
|
|
822
822
|
<fo:block font-weight="bold" keep-with-next="always">
|
|
823
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
823
824
|
<xsl:apply-templates/>
|
|
824
825
|
</fo:block>
|
|
825
826
|
</fo:block>
|
|
@@ -1062,6 +1063,8 @@
|
|
|
1062
1063
|
|
|
1063
1064
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
1064
1065
|
|
|
1066
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1067
|
+
|
|
1065
1068
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
1066
1069
|
|
|
1067
1070
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1559,7 +1562,8 @@
|
|
|
1559
1562
|
<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"/>
|
|
1560
1563
|
|
|
1561
1564
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1562
|
-
|
|
1565
|
+
|
|
1566
|
+
<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']]">
|
|
1563
1567
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1564
1568
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1565
1569
|
</xsl:for-each>
|
|
@@ -1569,7 +1573,7 @@
|
|
|
1569
1573
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1570
1574
|
</xsl:for-each>
|
|
1571
1575
|
|
|
1572
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1576
|
+
<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')]]">
|
|
1573
1577
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1574
1578
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1575
1579
|
</xsl:for-each>
|
|
@@ -2969,6 +2973,7 @@
|
|
|
2969
2973
|
<fo:table-cell>
|
|
2970
2974
|
|
|
2971
2975
|
<fo:block margin-top="6pt">
|
|
2976
|
+
<xsl:copy-of select="@id"/>
|
|
2972
2977
|
|
|
2973
2978
|
|
|
2974
2979
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3811,14 +3816,18 @@
|
|
|
3811
3816
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3812
3817
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3813
3818
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3819
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3814
3820
|
<fo:block id="{@id}">
|
|
3815
3821
|
<xsl:apply-templates/>
|
|
3816
3822
|
</fo:block>
|
|
3817
3823
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3824
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3818
3825
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3819
3826
|
|
|
3820
3827
|
|
|
3821
|
-
|
|
3828
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3829
|
+
|
|
3830
|
+
</xsl:if>
|
|
3822
3831
|
<xsl:apply-templates/>
|
|
3823
3832
|
</fo:block>
|
|
3824
3833
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3880,6 +3889,7 @@
|
|
|
3880
3889
|
<xsl:otherwise>
|
|
3881
3890
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3882
3891
|
|
|
3892
|
+
|
|
3883
3893
|
<xsl:variable name="src">
|
|
3884
3894
|
<xsl:call-template name="image_src"/>
|
|
3885
3895
|
</xsl:variable>
|
|
@@ -4241,12 +4251,12 @@
|
|
|
4241
4251
|
</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">
|
|
4242
4252
|
<xsl:apply-templates mode="contents"/>
|
|
4243
4253
|
<xsl:text> </xsl:text>
|
|
4244
|
-
</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">
|
|
4254
|
+
</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">
|
|
4245
4255
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4246
4256
|
<xsl:text> </xsl:text>
|
|
4247
4257
|
</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">
|
|
4248
4258
|
<xsl:value-of select="."/>
|
|
4249
|
-
</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']
|
|
4259
|
+
</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">
|
|
4250
4260
|
<xsl:value-of select="."/>
|
|
4251
4261
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4252
4262
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4344,6 +4354,8 @@
|
|
|
4344
4354
|
|
|
4345
4355
|
|
|
4346
4356
|
|
|
4357
|
+
|
|
4358
|
+
|
|
4347
4359
|
</fo:bookmark-tree>
|
|
4348
4360
|
</xsl:if>
|
|
4349
4361
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4514,6 +4526,8 @@
|
|
|
4514
4526
|
|
|
4515
4527
|
|
|
4516
4528
|
|
|
4529
|
+
|
|
4530
|
+
|
|
4517
4531
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4518
4532
|
<xsl:variable name="_font-size">
|
|
4519
4533
|
|
|
@@ -4547,13 +4561,17 @@
|
|
|
4547
4561
|
|
|
4548
4562
|
|
|
4549
4563
|
|
|
4564
|
+
|
|
4565
|
+
|
|
4550
4566
|
<xsl:apply-templates/>
|
|
4551
4567
|
</fo:block>
|
|
4552
|
-
|
|
4568
|
+
|
|
4553
4569
|
|
|
4554
4570
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4555
4571
|
|
|
4556
4572
|
|
|
4573
|
+
|
|
4574
|
+
|
|
4557
4575
|
</fo:block-container>
|
|
4558
4576
|
</fo:block-container>
|
|
4559
4577
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4789,7 +4807,8 @@
|
|
|
4789
4807
|
</fo:block>
|
|
4790
4808
|
</fo:table-cell>
|
|
4791
4809
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4792
|
-
<fo:block font-size="11pt"
|
|
4810
|
+
<fo:block font-size="11pt">
|
|
4811
|
+
|
|
4793
4812
|
<xsl:apply-templates/>
|
|
4794
4813
|
</fo:block>
|
|
4795
4814
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4894,6 +4913,7 @@
|
|
|
4894
4913
|
</xsl:choose>
|
|
4895
4914
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4896
4915
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4916
|
+
|
|
4897
4917
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4898
4918
|
<xsl:variable name="termsource_text">
|
|
4899
4919
|
<xsl:apply-templates/>
|
|
@@ -4904,13 +4924,15 @@
|
|
|
4904
4924
|
<!-- <xsl:apply-templates /> -->
|
|
4905
4925
|
<xsl:copy-of select="$termsource_text"/>
|
|
4906
4926
|
</xsl:when>
|
|
4907
|
-
<xsl:otherwise>
|
|
4927
|
+
<xsl:otherwise>
|
|
4928
|
+
|
|
4908
4929
|
|
|
4909
4930
|
<xsl:text>[</xsl:text>
|
|
4910
4931
|
|
|
4911
4932
|
<!-- <xsl:apply-templates /> -->
|
|
4912
4933
|
<xsl:copy-of select="$termsource_text"/>
|
|
4913
4934
|
|
|
4935
|
+
|
|
4914
4936
|
<xsl:text>]</xsl:text>
|
|
4915
4937
|
|
|
4916
4938
|
</xsl:otherwise>
|
|
@@ -4994,12 +5016,20 @@
|
|
|
4994
5016
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4995
5017
|
<xsl:text>— </xsl:text>
|
|
4996
5018
|
<xsl:apply-templates/>
|
|
4997
|
-
</xsl:template><xsl:
|
|
5019
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
5020
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
5021
|
+
<xsl:copy-of select="."/>
|
|
5022
|
+
</xsl:for-each>
|
|
5023
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
5024
|
+
<xsl:copy-of select="."/>
|
|
5025
|
+
</xsl:for-each>
|
|
5026
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4998
5027
|
|
|
4999
5028
|
<xsl:variable name="bibitemid">
|
|
5000
5029
|
<xsl:choose>
|
|
5001
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
5002
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
5030
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
5031
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
5032
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
5003
5033
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
5004
5034
|
</xsl:choose>
|
|
5005
5035
|
</xsl:variable>
|
|
@@ -5092,10 +5122,10 @@
|
|
|
5092
5122
|
</xsl:choose>
|
|
5093
5123
|
</xsl:variable>
|
|
5094
5124
|
|
|
5095
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5125
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
5096
5126
|
|
|
5097
5127
|
<xsl:choose>
|
|
5098
|
-
<xsl:when test="$
|
|
5128
|
+
<xsl:when test="$lang = 'zh'">
|
|
5099
5129
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
5100
5130
|
</xsl:when>
|
|
5101
5131
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5129,24 +5159,29 @@
|
|
|
5129
5159
|
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
|
|
5130
5160
|
<xsl:variable name="title-deprecated">
|
|
5131
5161
|
|
|
5132
|
-
|
|
5133
|
-
|
|
5134
|
-
<xsl:with-param name="name" select="'title-deprecated'"/>
|
|
5162
|
+
<xsl:call-template name="getLocalizedString">
|
|
5163
|
+
<xsl:with-param name="key">deprecated</xsl:with-param>
|
|
5135
5164
|
</xsl:call-template>
|
|
5136
5165
|
|
|
5166
|
+
|
|
5137
5167
|
</xsl:variable>
|
|
5138
5168
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5139
5169
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5140
5170
|
</fo:block>
|
|
5171
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5172
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5173
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5174
|
+
</xsl:if>
|
|
5141
5175
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5142
5176
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5143
5177
|
<xsl:apply-templates/>
|
|
5144
5178
|
</fo:block>
|
|
5145
5179
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5146
5180
|
<xsl:apply-templates/>
|
|
5147
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5181
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5148
5182
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5149
|
-
<fo:block
|
|
5183
|
+
<!-- <fo:block> </fo:block> -->
|
|
5184
|
+
<fo:block/>
|
|
5150
5185
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5151
5186
|
|
|
5152
5187
|
<fo:block>
|
|
@@ -6174,12 +6209,15 @@
|
|
|
6174
6209
|
<xsl:param name="default">left</xsl:param>
|
|
6175
6210
|
<xsl:attribute name="text-align">
|
|
6176
6211
|
<xsl:choose>
|
|
6177
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6212
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
6178
6213
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
6179
6214
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
6180
6215
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
6181
6216
|
</xsl:choose>
|
|
6182
6217
|
</xsl:attribute>
|
|
6218
|
+
<xsl:if test="@align = 'indent'">
|
|
6219
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6220
|
+
</xsl:if>
|
|
6183
6221
|
</xsl:template><xsl:template name="number-to-words">
|
|
6184
6222
|
<xsl:param name="number"/>
|
|
6185
6223
|
<xsl:param name="first"/>
|
data/metanorma-iho.gemspec
CHANGED
|
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
|
28
28
|
|
|
29
29
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
30
|
-
spec.add_dependency "metanorma-generic", "~> 1.
|
|
30
|
+
spec.add_dependency "metanorma-generic", "~> 1.11.0"
|
|
31
31
|
|
|
32
|
-
spec.add_development_dependency "
|
|
32
|
+
spec.add_development_dependency "debug"
|
|
33
33
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
34
34
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
35
35
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iho
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3
|
|
4
|
+
version: 0.4.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: htmlentities
|
|
@@ -30,28 +30,28 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 1.
|
|
33
|
+
version: 1.11.0
|
|
34
34
|
type: :runtime
|
|
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: 1.
|
|
40
|
+
version: 1.11.0
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
|
-
name:
|
|
42
|
+
name: debug
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
|
-
- - "
|
|
45
|
+
- - ">="
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: '
|
|
47
|
+
version: '0'
|
|
48
48
|
type: :development
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
|
-
- - "
|
|
52
|
+
- - ">="
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: '
|
|
54
|
+
version: '0'
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: equivalent-xml
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
261
261
|
- !ruby/object:Gem::Version
|
|
262
262
|
version: '0'
|
|
263
263
|
requirements: []
|
|
264
|
-
rubygems_version: 3.
|
|
264
|
+
rubygems_version: 3.2.22
|
|
265
265
|
signing_key:
|
|
266
266
|
specification_version: 4
|
|
267
267
|
summary: metanorma-iho lets you write IHO in AsciiDoc.
|