metanorma-mpfa 0.6.13 → 0.7.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/mpfa/isodoc.rng +254 -27
- data/lib/isodoc/mpfa/html/htmlstyle.css +4 -2
- data/lib/isodoc/mpfa/html/htmlstyle.scss +4 -1
- data/lib/isodoc/mpfa/html/rsd.css +0 -1
- data/lib/isodoc/mpfa/html/rsd.scss +0 -1
- data/lib/isodoc/mpfa/mpfa.circular.xsl +54 -16
- data/lib/isodoc/mpfa/mpfa.compliance-standards-for-mpf-trustees.xsl +54 -16
- data/lib/isodoc/mpfa/mpfa.guidelines.xsl +54 -16
- data/lib/isodoc/mpfa/mpfa.standards.xsl +54 -16
- data/lib/isodoc/mpfa/mpfa.supervision-of-mpf-intermediaries.xsl +54 -16
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.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: 8b5d32f151d657d73d428ffcacc923a3b95891986ec9c5dbb8da889a701c345f
|
|
4
|
+
data.tar.gz: 38d2102cfa8ec16f7b72fb29715f1a8df31a59a14205bd13e02cfa5c7edd945f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 321ad88bdcbd130a97a2fed99e3c302b963c5767e4864e25ef2862c4668b16565bb2582b35ddd59d4371a077332465fb6506043c5f395ae545ca9aa24366de52
|
|
7
|
+
data.tar.gz: e73260b551b706fb3d13a2081393f654ce4ada397835985bdb52821e8fc6e2dddcee043f8e2be09b3178a55c8dceea98a0a0e56e73f1a22cb19ce11c612889a7
|
|
@@ -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"/>
|
|
@@ -608,10 +608,12 @@ h3 {
|
|
|
608
608
|
font-size: 1.1em;
|
|
609
609
|
font-weight: 100; }
|
|
610
610
|
|
|
611
|
-
.TermNum
|
|
612
|
-
color: #301907;
|
|
611
|
+
.TermNum {
|
|
613
612
|
font-weight: 100; }
|
|
614
613
|
|
|
614
|
+
.TermNum, .Terms, .AltTerms {
|
|
615
|
+
color: #301907; }
|
|
616
|
+
|
|
615
617
|
h2.TermNum {
|
|
616
618
|
font-size: 0.9em;
|
|
617
619
|
line-height: 1em;
|
|
@@ -309,7 +309,6 @@ p.Terms, li.Terms, div.Terms {
|
|
|
309
309
|
mso-fareast-font-family: {{headerfont}};
|
|
310
310
|
mso-bidi-font-family: {{headerfont}};
|
|
311
311
|
mso-ansi-language: EN-GB;
|
|
312
|
-
font-weight: bold;
|
|
313
312
|
mso-bidi-font-weight: normal; }
|
|
314
313
|
|
|
315
314
|
p.AltTerms, li.AltTerms, div.AltTerms {
|
|
@@ -296,7 +296,6 @@ p.Terms, li.Terms, div.Terms
|
|
|
296
296
|
mso-fareast-font-family:$headerfont;
|
|
297
297
|
mso-bidi-font-family:$headerfont;
|
|
298
298
|
mso-ansi-language:EN-GB;
|
|
299
|
-
font-weight:bold;
|
|
300
299
|
mso-bidi-font-weight:normal;}
|
|
301
300
|
p.AltTerms, li.AltTerms, div.AltTerms
|
|
302
301
|
{mso-style-name:"AltTerm\(s\)";
|
|
@@ -615,6 +615,7 @@
|
|
|
615
615
|
|
|
616
616
|
<xsl:template match="mpfd:preferred">
|
|
617
617
|
<fo:inline font-weight="bold">
|
|
618
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
618
619
|
<xsl:apply-templates/>
|
|
619
620
|
</fo:inline>
|
|
620
621
|
<xsl:if test="not(following-sibling::*[1][local-name() = 'preferred'])">
|
|
@@ -881,6 +882,8 @@
|
|
|
881
882
|
|
|
882
883
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
883
884
|
|
|
885
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
886
|
+
|
|
884
887
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
885
888
|
|
|
886
889
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1339,7 +1342,8 @@
|
|
|
1339
1342
|
<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"/>
|
|
1340
1343
|
|
|
1341
1344
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1342
|
-
|
|
1345
|
+
|
|
1346
|
+
<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']]">
|
|
1343
1347
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1344
1348
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1345
1349
|
</xsl:for-each>
|
|
@@ -1349,7 +1353,7 @@
|
|
|
1349
1353
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1350
1354
|
</xsl:for-each>
|
|
1351
1355
|
|
|
1352
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1356
|
+
<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')]]">
|
|
1353
1357
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1354
1358
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1355
1359
|
</xsl:for-each>
|
|
@@ -2742,6 +2746,7 @@
|
|
|
2742
2746
|
<fo:table-cell>
|
|
2743
2747
|
|
|
2744
2748
|
<fo:block margin-top="6pt">
|
|
2749
|
+
<xsl:copy-of select="@id"/>
|
|
2745
2750
|
|
|
2746
2751
|
|
|
2747
2752
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3577,14 +3582,18 @@
|
|
|
3577
3582
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3578
3583
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3579
3584
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3585
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3580
3586
|
<fo:block id="{@id}">
|
|
3581
3587
|
<xsl:apply-templates/>
|
|
3582
3588
|
</fo:block>
|
|
3583
3589
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3590
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3584
3591
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3585
3592
|
|
|
3586
3593
|
|
|
3587
|
-
|
|
3594
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3595
|
+
|
|
3596
|
+
</xsl:if>
|
|
3588
3597
|
<xsl:apply-templates/>
|
|
3589
3598
|
</fo:block>
|
|
3590
3599
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3646,6 +3655,7 @@
|
|
|
3646
3655
|
<xsl:otherwise>
|
|
3647
3656
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3648
3657
|
|
|
3658
|
+
|
|
3649
3659
|
<xsl:variable name="src">
|
|
3650
3660
|
<xsl:call-template name="image_src"/>
|
|
3651
3661
|
</xsl:variable>
|
|
@@ -4007,12 +4017,12 @@
|
|
|
4007
4017
|
</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">
|
|
4008
4018
|
<xsl:apply-templates mode="contents"/>
|
|
4009
4019
|
<xsl:text> </xsl:text>
|
|
4010
|
-
</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">
|
|
4020
|
+
</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">
|
|
4011
4021
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4012
4022
|
<xsl:text> </xsl:text>
|
|
4013
4023
|
</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">
|
|
4014
4024
|
<xsl:value-of select="."/>
|
|
4015
|
-
</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']
|
|
4025
|
+
</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">
|
|
4016
4026
|
<xsl:value-of select="."/>
|
|
4017
4027
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4018
4028
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4110,6 +4120,8 @@
|
|
|
4110
4120
|
|
|
4111
4121
|
|
|
4112
4122
|
|
|
4123
|
+
|
|
4124
|
+
|
|
4113
4125
|
</fo:bookmark-tree>
|
|
4114
4126
|
</xsl:if>
|
|
4115
4127
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4280,6 +4292,8 @@
|
|
|
4280
4292
|
|
|
4281
4293
|
|
|
4282
4294
|
|
|
4295
|
+
|
|
4296
|
+
|
|
4283
4297
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4284
4298
|
<xsl:variable name="_font-size">
|
|
4285
4299
|
|
|
@@ -4313,13 +4327,17 @@
|
|
|
4313
4327
|
|
|
4314
4328
|
|
|
4315
4329
|
|
|
4330
|
+
|
|
4331
|
+
|
|
4316
4332
|
<xsl:apply-templates/>
|
|
4317
4333
|
</fo:block>
|
|
4318
|
-
|
|
4334
|
+
|
|
4319
4335
|
|
|
4320
4336
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4321
4337
|
|
|
4322
4338
|
|
|
4339
|
+
|
|
4340
|
+
|
|
4323
4341
|
</fo:block-container>
|
|
4324
4342
|
</fo:block-container>
|
|
4325
4343
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4555,7 +4573,8 @@
|
|
|
4555
4573
|
</fo:block>
|
|
4556
4574
|
</fo:table-cell>
|
|
4557
4575
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4558
|
-
<fo:block font-size="11pt"
|
|
4576
|
+
<fo:block font-size="11pt">
|
|
4577
|
+
|
|
4559
4578
|
<xsl:apply-templates/>
|
|
4560
4579
|
</fo:block>
|
|
4561
4580
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4660,6 +4679,7 @@
|
|
|
4660
4679
|
</xsl:choose>
|
|
4661
4680
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4662
4681
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4682
|
+
|
|
4663
4683
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4664
4684
|
<xsl:variable name="termsource_text">
|
|
4665
4685
|
<xsl:apply-templates/>
|
|
@@ -4670,11 +4690,13 @@
|
|
|
4670
4690
|
<!-- <xsl:apply-templates /> -->
|
|
4671
4691
|
<xsl:copy-of select="$termsource_text"/>
|
|
4672
4692
|
</xsl:when>
|
|
4673
|
-
<xsl:otherwise>
|
|
4693
|
+
<xsl:otherwise>
|
|
4694
|
+
|
|
4674
4695
|
|
|
4675
4696
|
<!-- <xsl:apply-templates /> -->
|
|
4676
4697
|
<xsl:copy-of select="$termsource_text"/>
|
|
4677
4698
|
|
|
4699
|
+
|
|
4678
4700
|
</xsl:otherwise>
|
|
4679
4701
|
</xsl:choose>
|
|
4680
4702
|
</fo:block>
|
|
@@ -4756,12 +4778,20 @@
|
|
|
4756
4778
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4757
4779
|
<xsl:text>— </xsl:text>
|
|
4758
4780
|
<xsl:apply-templates/>
|
|
4759
|
-
</xsl:template><xsl:
|
|
4781
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
4782
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
4783
|
+
<xsl:copy-of select="."/>
|
|
4784
|
+
</xsl:for-each>
|
|
4785
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
4786
|
+
<xsl:copy-of select="."/>
|
|
4787
|
+
</xsl:for-each>
|
|
4788
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4760
4789
|
|
|
4761
4790
|
<xsl:variable name="bibitemid">
|
|
4762
4791
|
<xsl:choose>
|
|
4763
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
4764
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
4792
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
4793
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
4794
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
4765
4795
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
4766
4796
|
</xsl:choose>
|
|
4767
4797
|
</xsl:variable>
|
|
@@ -4848,10 +4878,10 @@
|
|
|
4848
4878
|
</xsl:choose>
|
|
4849
4879
|
</xsl:variable>
|
|
4850
4880
|
|
|
4851
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
4881
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
4852
4882
|
|
|
4853
4883
|
<xsl:choose>
|
|
4854
|
-
<xsl:when test="$
|
|
4884
|
+
<xsl:when test="$lang = 'zh'">
|
|
4855
4885
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
4856
4886
|
</xsl:when>
|
|
4857
4887
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -4894,15 +4924,20 @@
|
|
|
4894
4924
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
4895
4925
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
4896
4926
|
</fo:block>
|
|
4927
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
4928
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
4929
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
4930
|
+
</xsl:if>
|
|
4897
4931
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
4898
4932
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
4899
4933
|
<xsl:apply-templates/>
|
|
4900
4934
|
</fo:block>
|
|
4901
4935
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
4902
4936
|
<xsl:apply-templates/>
|
|
4903
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
4937
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
4904
4938
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
4905
|
-
<fo:block
|
|
4939
|
+
<!-- <fo:block> </fo:block> -->
|
|
4940
|
+
<fo:block/>
|
|
4906
4941
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
4907
4942
|
|
|
4908
4943
|
<fo:block>
|
|
@@ -5824,12 +5859,15 @@
|
|
|
5824
5859
|
<xsl:param name="default">left</xsl:param>
|
|
5825
5860
|
<xsl:attribute name="text-align">
|
|
5826
5861
|
<xsl:choose>
|
|
5827
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
5862
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
5828
5863
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
5829
5864
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
5830
5865
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
5831
5866
|
</xsl:choose>
|
|
5832
5867
|
</xsl:attribute>
|
|
5868
|
+
<xsl:if test="@align = 'indent'">
|
|
5869
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
5870
|
+
</xsl:if>
|
|
5833
5871
|
</xsl:template><xsl:template name="number-to-words">
|
|
5834
5872
|
<xsl:param name="number"/>
|
|
5835
5873
|
<xsl:param name="first"/>
|