metanorma-m3aawg 1.7.13 → 1.8.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/m3aawg/isodoc.rng +254 -27
- data/lib/isodoc/m3aawg/html/htmlstyle.css +4 -2
- data/lib/isodoc/m3aawg/html/htmlstyle.scss +4 -1
- data/lib/isodoc/m3aawg/html/m3d.css +0 -1
- data/lib/isodoc/m3aawg/html/m3d.scss +0 -1
- data/lib/isodoc/m3aawg/m3aawg.policy.xsl +57 -19
- data/lib/isodoc/m3aawg/m3aawg.report.xsl +57 -19
- data/lib/metanorma/m3aawg/version.rb +1 -1
- data/metanorma-m3d.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: 47f598c3d37818395591ae49cdd1d0d15ddd68466208a3a070114e62b6a6103b
|
|
4
|
+
data.tar.gz: c264e09505ba094b1364c107dc55fe81e285cb297ef703dbb71250b5eaee0bf5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e2be4d3643015b3055b1952a437bec91ff56d20cf30268803fe8e4604ad63e245b1fab3e79c5d9738959f1d112c39ad34579cbec7c007de03bcddae145b3a851
|
|
7
|
+
data.tar.gz: e40c1f0ce6a126a635ba205f902d63f540d8cd546eacbc2ee736cbdc74a632279cbce4c45dc0d14fe90d2e2b85fc58b329f0e05254be80c34c34fd1005d0fa21
|
|
@@ -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"/>
|
|
@@ -597,10 +597,12 @@ h3 {
|
|
|
597
597
|
color: #cfcfcf;
|
|
598
598
|
content: "\f0c1"; } }
|
|
599
599
|
|
|
600
|
-
.TermNum
|
|
601
|
-
color: black;
|
|
600
|
+
.TermNum {
|
|
602
601
|
font-weight: 400; }
|
|
603
602
|
|
|
603
|
+
.TermNum, .Terms, .AltTerms {
|
|
604
|
+
color: black; }
|
|
605
|
+
|
|
604
606
|
p.TermNum {
|
|
605
607
|
font-size: 0.9em;
|
|
606
608
|
line-height: 1em;
|
|
@@ -312,7 +312,6 @@ p.Terms, li.Terms, div.Terms {
|
|
|
312
312
|
mso-fareast-font-family: {{headerfont}};
|
|
313
313
|
mso-bidi-font-family: {{headerfont}};
|
|
314
314
|
mso-ansi-language: EN-GB;
|
|
315
|
-
font-weight: bold;
|
|
316
315
|
mso-bidi-font-weight: normal; }
|
|
317
316
|
|
|
318
317
|
p.AltTerms, li.AltTerms, div.AltTerms {
|
|
@@ -299,7 +299,6 @@ p.Terms, li.Terms, div.Terms
|
|
|
299
299
|
mso-fareast-font-family:$headerfont;
|
|
300
300
|
mso-bidi-font-family:$headerfont;
|
|
301
301
|
mso-ansi-language:EN-GB;
|
|
302
|
-
font-weight:bold;
|
|
303
302
|
mso-bidi-font-weight:normal;}
|
|
304
303
|
p.AltTerms, li.AltTerms, div.AltTerms
|
|
305
304
|
{mso-style-name:"AltTerm\(s\)";
|
|
@@ -738,6 +738,7 @@
|
|
|
738
738
|
<xsl:template match="m3d:preferred">
|
|
739
739
|
|
|
740
740
|
<fo:inline>
|
|
741
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
741
742
|
<xsl:apply-templates/>
|
|
742
743
|
</fo:inline>
|
|
743
744
|
|
|
@@ -995,6 +996,8 @@
|
|
|
995
996
|
|
|
996
997
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
997
998
|
|
|
999
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1000
|
+
|
|
998
1001
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
999
1002
|
|
|
1000
1003
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1477,7 +1480,8 @@
|
|
|
1477
1480
|
<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"/>
|
|
1478
1481
|
|
|
1479
1482
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1480
|
-
|
|
1483
|
+
|
|
1484
|
+
<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']]">
|
|
1481
1485
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1482
1486
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1483
1487
|
</xsl:for-each>
|
|
@@ -1487,7 +1491,7 @@
|
|
|
1487
1491
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1488
1492
|
</xsl:for-each>
|
|
1489
1493
|
|
|
1490
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1494
|
+
<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')]]">
|
|
1491
1495
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1492
1496
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1493
1497
|
</xsl:for-each>
|
|
@@ -2882,6 +2886,7 @@
|
|
|
2882
2886
|
<fo:table-cell>
|
|
2883
2887
|
|
|
2884
2888
|
<fo:block margin-top="6pt">
|
|
2889
|
+
<xsl:copy-of select="@id"/>
|
|
2885
2890
|
|
|
2886
2891
|
|
|
2887
2892
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3724,10 +3729,12 @@
|
|
|
3724
3729
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3725
3730
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3726
3731
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3732
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3727
3733
|
<fo:block id="{@id}">
|
|
3728
3734
|
<xsl:apply-templates/>
|
|
3729
3735
|
</fo:block>
|
|
3730
3736
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3737
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3731
3738
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3732
3739
|
|
|
3733
3740
|
|
|
@@ -3735,7 +3742,9 @@
|
|
|
3735
3742
|
<xsl:apply-templates select="m3d:name" mode="presentation"/>
|
|
3736
3743
|
</fo:block>
|
|
3737
3744
|
|
|
3738
|
-
|
|
3745
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3746
|
+
|
|
3747
|
+
</xsl:if>
|
|
3739
3748
|
<xsl:apply-templates/>
|
|
3740
3749
|
</fo:block>
|
|
3741
3750
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3797,6 +3806,7 @@
|
|
|
3797
3806
|
<xsl:otherwise>
|
|
3798
3807
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3799
3808
|
|
|
3809
|
+
|
|
3800
3810
|
<xsl:variable name="src">
|
|
3801
3811
|
<xsl:call-template name="image_src"/>
|
|
3802
3812
|
</xsl:variable>
|
|
@@ -4158,12 +4168,12 @@
|
|
|
4158
4168
|
</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">
|
|
4159
4169
|
<xsl:apply-templates mode="contents"/>
|
|
4160
4170
|
<xsl:text> </xsl:text>
|
|
4161
|
-
</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">
|
|
4171
|
+
</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">
|
|
4162
4172
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4163
4173
|
<xsl:text> </xsl:text>
|
|
4164
4174
|
</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">
|
|
4165
4175
|
<xsl:value-of select="."/>
|
|
4166
|
-
</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']
|
|
4176
|
+
</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">
|
|
4167
4177
|
<xsl:value-of select="."/>
|
|
4168
4178
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4169
4179
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4261,6 +4271,8 @@
|
|
|
4261
4271
|
|
|
4262
4272
|
|
|
4263
4273
|
|
|
4274
|
+
|
|
4275
|
+
|
|
4264
4276
|
</fo:bookmark-tree>
|
|
4265
4277
|
</xsl:if>
|
|
4266
4278
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4431,6 +4443,8 @@
|
|
|
4431
4443
|
|
|
4432
4444
|
|
|
4433
4445
|
|
|
4446
|
+
|
|
4447
|
+
|
|
4434
4448
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4435
4449
|
<xsl:variable name="_font-size">
|
|
4436
4450
|
|
|
@@ -4464,13 +4478,17 @@
|
|
|
4464
4478
|
|
|
4465
4479
|
|
|
4466
4480
|
|
|
4481
|
+
|
|
4482
|
+
|
|
4467
4483
|
<xsl:apply-templates/>
|
|
4468
4484
|
</fo:block>
|
|
4469
|
-
|
|
4485
|
+
|
|
4470
4486
|
|
|
4471
4487
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4472
4488
|
|
|
4473
4489
|
|
|
4490
|
+
|
|
4491
|
+
|
|
4474
4492
|
</fo:block-container>
|
|
4475
4493
|
</fo:block-container>
|
|
4476
4494
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4706,7 +4724,8 @@
|
|
|
4706
4724
|
</fo:block>
|
|
4707
4725
|
</fo:table-cell>
|
|
4708
4726
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4709
|
-
<fo:block font-size="11pt"
|
|
4727
|
+
<fo:block font-size="11pt">
|
|
4728
|
+
|
|
4710
4729
|
<xsl:apply-templates/>
|
|
4711
4730
|
</fo:block>
|
|
4712
4731
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4811,6 +4830,7 @@
|
|
|
4811
4830
|
</xsl:choose>
|
|
4812
4831
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4813
4832
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4833
|
+
|
|
4814
4834
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4815
4835
|
<xsl:variable name="termsource_text">
|
|
4816
4836
|
<xsl:apply-templates/>
|
|
@@ -4821,13 +4841,15 @@
|
|
|
4821
4841
|
<!-- <xsl:apply-templates /> -->
|
|
4822
4842
|
<xsl:copy-of select="$termsource_text"/>
|
|
4823
4843
|
</xsl:when>
|
|
4824
|
-
<xsl:otherwise>
|
|
4844
|
+
<xsl:otherwise>
|
|
4845
|
+
|
|
4825
4846
|
|
|
4826
4847
|
<xsl:text>[</xsl:text>
|
|
4827
4848
|
|
|
4828
4849
|
<!-- <xsl:apply-templates /> -->
|
|
4829
4850
|
<xsl:copy-of select="$termsource_text"/>
|
|
4830
4851
|
|
|
4852
|
+
|
|
4831
4853
|
<xsl:text>]</xsl:text>
|
|
4832
4854
|
|
|
4833
4855
|
</xsl:otherwise>
|
|
@@ -4894,12 +4916,20 @@
|
|
|
4894
4916
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4895
4917
|
<xsl:text>— </xsl:text>
|
|
4896
4918
|
<xsl:apply-templates/>
|
|
4897
|
-
</xsl:template><xsl:
|
|
4919
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
4920
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
4921
|
+
<xsl:copy-of select="."/>
|
|
4922
|
+
</xsl:for-each>
|
|
4923
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
4924
|
+
<xsl:copy-of select="."/>
|
|
4925
|
+
</xsl:for-each>
|
|
4926
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4898
4927
|
|
|
4899
4928
|
<xsl:variable name="bibitemid">
|
|
4900
4929
|
<xsl:choose>
|
|
4901
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
4902
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
4930
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
4931
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
4932
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
4903
4933
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
4904
4934
|
</xsl:choose>
|
|
4905
4935
|
</xsl:variable>
|
|
@@ -4991,10 +5021,10 @@
|
|
|
4991
5021
|
</xsl:choose>
|
|
4992
5022
|
</xsl:variable>
|
|
4993
5023
|
|
|
4994
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5024
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
4995
5025
|
|
|
4996
5026
|
<xsl:choose>
|
|
4997
|
-
<xsl:when test="$
|
|
5027
|
+
<xsl:when test="$lang = 'zh'">
|
|
4998
5028
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
4999
5029
|
</xsl:when>
|
|
5000
5030
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5028,24 +5058,29 @@
|
|
|
5028
5058
|
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
|
|
5029
5059
|
<xsl:variable name="title-deprecated">
|
|
5030
5060
|
|
|
5031
|
-
|
|
5032
|
-
|
|
5033
|
-
<xsl:with-param name="name" select="'title-deprecated'"/>
|
|
5061
|
+
<xsl:call-template name="getLocalizedString">
|
|
5062
|
+
<xsl:with-param name="key">deprecated</xsl:with-param>
|
|
5034
5063
|
</xsl:call-template>
|
|
5035
5064
|
|
|
5065
|
+
|
|
5036
5066
|
</xsl:variable>
|
|
5037
5067
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5038
5068
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5039
5069
|
</fo:block>
|
|
5070
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5071
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5072
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5073
|
+
</xsl:if>
|
|
5040
5074
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5041
5075
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5042
5076
|
<xsl:apply-templates/>
|
|
5043
5077
|
</fo:block>
|
|
5044
5078
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5045
5079
|
<xsl:apply-templates/>
|
|
5046
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5080
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5047
5081
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5048
|
-
<fo:block
|
|
5082
|
+
<!-- <fo:block> </fo:block> -->
|
|
5083
|
+
<fo:block/>
|
|
5049
5084
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5050
5085
|
|
|
5051
5086
|
<fo:block break-after="page"/>
|
|
@@ -5981,12 +6016,15 @@
|
|
|
5981
6016
|
<xsl:param name="default">left</xsl:param>
|
|
5982
6017
|
<xsl:attribute name="text-align">
|
|
5983
6018
|
<xsl:choose>
|
|
5984
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6019
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
5985
6020
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
5986
6021
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
5987
6022
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
5988
6023
|
</xsl:choose>
|
|
5989
6024
|
</xsl:attribute>
|
|
6025
|
+
<xsl:if test="@align = 'indent'">
|
|
6026
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6027
|
+
</xsl:if>
|
|
5990
6028
|
</xsl:template><xsl:template name="number-to-words">
|
|
5991
6029
|
<xsl:param name="number"/>
|
|
5992
6030
|
<xsl:param name="first"/>
|
|
@@ -738,6 +738,7 @@
|
|
|
738
738
|
<xsl:template match="m3d:preferred">
|
|
739
739
|
|
|
740
740
|
<fo:inline>
|
|
741
|
+
<xsl:call-template name="setStyle_preferred"/>
|
|
741
742
|
<xsl:apply-templates/>
|
|
742
743
|
</fo:inline>
|
|
743
744
|
|
|
@@ -995,6 +996,8 @@
|
|
|
995
996
|
|
|
996
997
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
|
997
998
|
|
|
999
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
|
1000
|
+
|
|
998
1001
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
|
999
1002
|
|
|
1000
1003
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
|
@@ -1477,7 +1480,8 @@
|
|
|
1477
1480
|
<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"/>
|
|
1478
1481
|
|
|
1479
1482
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
|
1480
|
-
|
|
1483
|
+
|
|
1484
|
+
<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']]">
|
|
1481
1485
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1482
1486
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1483
1487
|
</xsl:for-each>
|
|
@@ -1487,7 +1491,7 @@
|
|
|
1487
1491
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1488
1492
|
</xsl:for-each>
|
|
1489
1493
|
|
|
1490
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
|
1494
|
+
<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')]]">
|
|
1491
1495
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
1492
1496
|
<xsl:apply-templates select="." mode="contents"/>
|
|
1493
1497
|
</xsl:for-each>
|
|
@@ -2882,6 +2886,7 @@
|
|
|
2882
2886
|
<fo:table-cell>
|
|
2883
2887
|
|
|
2884
2888
|
<fo:block margin-top="6pt">
|
|
2889
|
+
<xsl:copy-of select="@id"/>
|
|
2885
2890
|
|
|
2886
2891
|
|
|
2887
2892
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
@@ -3724,10 +3729,12 @@
|
|
|
3724
3729
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
|
3725
3730
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
3726
3731
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
|
3732
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
|
3727
3733
|
<fo:block id="{@id}">
|
|
3728
3734
|
<xsl:apply-templates/>
|
|
3729
3735
|
</fo:block>
|
|
3730
3736
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
|
3737
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
|
3731
3738
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
3732
3739
|
|
|
3733
3740
|
|
|
@@ -3735,7 +3742,9 @@
|
|
|
3735
3742
|
<xsl:apply-templates select="m3d:name" mode="presentation"/>
|
|
3736
3743
|
</fo:block>
|
|
3737
3744
|
|
|
3738
|
-
|
|
3745
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
3746
|
+
|
|
3747
|
+
</xsl:if>
|
|
3739
3748
|
<xsl:apply-templates/>
|
|
3740
3749
|
</fo:block>
|
|
3741
3750
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
|
@@ -3797,6 +3806,7 @@
|
|
|
3797
3806
|
<xsl:otherwise>
|
|
3798
3807
|
<fo:block xsl:use-attribute-sets="image-style">
|
|
3799
3808
|
|
|
3809
|
+
|
|
3800
3810
|
<xsl:variable name="src">
|
|
3801
3811
|
<xsl:call-template name="image_src"/>
|
|
3802
3812
|
</xsl:variable>
|
|
@@ -4158,12 +4168,12 @@
|
|
|
4158
4168
|
</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">
|
|
4159
4169
|
<xsl:apply-templates mode="contents"/>
|
|
4160
4170
|
<xsl:text> </xsl:text>
|
|
4161
|
-
</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">
|
|
4171
|
+
</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">
|
|
4162
4172
|
<xsl:apply-templates mode="bookmarks"/>
|
|
4163
4173
|
<xsl:text> </xsl:text>
|
|
4164
4174
|
</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">
|
|
4165
4175
|
<xsl:value-of select="."/>
|
|
4166
|
-
</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']
|
|
4176
|
+
</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">
|
|
4167
4177
|
<xsl:value-of select="."/>
|
|
4168
4178
|
</xsl:template><xsl:template match="node()" mode="contents">
|
|
4169
4179
|
<xsl:apply-templates mode="contents"/>
|
|
@@ -4261,6 +4271,8 @@
|
|
|
4261
4271
|
|
|
4262
4272
|
|
|
4263
4273
|
|
|
4274
|
+
|
|
4275
|
+
|
|
4264
4276
|
</fo:bookmark-tree>
|
|
4265
4277
|
</xsl:if>
|
|
4266
4278
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
|
@@ -4431,6 +4443,8 @@
|
|
|
4431
4443
|
|
|
4432
4444
|
|
|
4433
4445
|
|
|
4446
|
+
|
|
4447
|
+
|
|
4434
4448
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
4435
4449
|
<xsl:variable name="_font-size">
|
|
4436
4450
|
|
|
@@ -4464,13 +4478,17 @@
|
|
|
4464
4478
|
|
|
4465
4479
|
|
|
4466
4480
|
|
|
4481
|
+
|
|
4482
|
+
|
|
4467
4483
|
<xsl:apply-templates/>
|
|
4468
4484
|
</fo:block>
|
|
4469
|
-
|
|
4485
|
+
|
|
4470
4486
|
|
|
4471
4487
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
|
4472
4488
|
|
|
4473
4489
|
|
|
4490
|
+
|
|
4491
|
+
|
|
4474
4492
|
</fo:block-container>
|
|
4475
4493
|
</fo:block-container>
|
|
4476
4494
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
|
@@ -4706,7 +4724,8 @@
|
|
|
4706
4724
|
</fo:block>
|
|
4707
4725
|
</fo:table-cell>
|
|
4708
4726
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
4709
|
-
<fo:block font-size="11pt"
|
|
4727
|
+
<fo:block font-size="11pt">
|
|
4728
|
+
|
|
4710
4729
|
<xsl:apply-templates/>
|
|
4711
4730
|
</fo:block>
|
|
4712
4731
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
|
@@ -4811,6 +4830,7 @@
|
|
|
4811
4830
|
</xsl:choose>
|
|
4812
4831
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
|
4813
4832
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
4833
|
+
|
|
4814
4834
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
4815
4835
|
<xsl:variable name="termsource_text">
|
|
4816
4836
|
<xsl:apply-templates/>
|
|
@@ -4821,13 +4841,15 @@
|
|
|
4821
4841
|
<!-- <xsl:apply-templates /> -->
|
|
4822
4842
|
<xsl:copy-of select="$termsource_text"/>
|
|
4823
4843
|
</xsl:when>
|
|
4824
|
-
<xsl:otherwise>
|
|
4844
|
+
<xsl:otherwise>
|
|
4845
|
+
|
|
4825
4846
|
|
|
4826
4847
|
<xsl:text>[</xsl:text>
|
|
4827
4848
|
|
|
4828
4849
|
<!-- <xsl:apply-templates /> -->
|
|
4829
4850
|
<xsl:copy-of select="$termsource_text"/>
|
|
4830
4851
|
|
|
4852
|
+
|
|
4831
4853
|
<xsl:text>]</xsl:text>
|
|
4832
4854
|
|
|
4833
4855
|
</xsl:otherwise>
|
|
@@ -4894,12 +4916,20 @@
|
|
|
4894
4916
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
|
4895
4917
|
<xsl:text>— </xsl:text>
|
|
4896
4918
|
<xsl:apply-templates/>
|
|
4897
|
-
</xsl:template><xsl:
|
|
4919
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
|
4920
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
|
4921
|
+
<xsl:copy-of select="."/>
|
|
4922
|
+
</xsl:for-each>
|
|
4923
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
|
4924
|
+
<xsl:copy-of select="."/>
|
|
4925
|
+
</xsl:for-each>
|
|
4926
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
|
4898
4927
|
|
|
4899
4928
|
<xsl:variable name="bibitemid">
|
|
4900
4929
|
<xsl:choose>
|
|
4901
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
|
4902
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
|
4930
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
|
4931
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
|
4932
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
|
4903
4933
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
|
4904
4934
|
</xsl:choose>
|
|
4905
4935
|
</xsl:variable>
|
|
@@ -4991,10 +5021,10 @@
|
|
|
4991
5021
|
</xsl:choose>
|
|
4992
5022
|
</xsl:variable>
|
|
4993
5023
|
|
|
4994
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
|
5024
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
|
4995
5025
|
|
|
4996
5026
|
<xsl:choose>
|
|
4997
|
-
<xsl:when test="$
|
|
5027
|
+
<xsl:when test="$lang = 'zh'">
|
|
4998
5028
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
4999
5029
|
</xsl:when>
|
|
5000
5030
|
<xsl:when test="../../@inline-header = 'true'">
|
|
@@ -5028,24 +5058,29 @@
|
|
|
5028
5058
|
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
|
|
5029
5059
|
<xsl:variable name="title-deprecated">
|
|
5030
5060
|
|
|
5031
|
-
|
|
5032
|
-
|
|
5033
|
-
<xsl:with-param name="name" select="'title-deprecated'"/>
|
|
5061
|
+
<xsl:call-template name="getLocalizedString">
|
|
5062
|
+
<xsl:with-param name="key">deprecated</xsl:with-param>
|
|
5034
5063
|
</xsl:call-template>
|
|
5035
5064
|
|
|
5065
|
+
|
|
5036
5066
|
</xsl:variable>
|
|
5037
5067
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5038
5068
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
|
5039
5069
|
</fo:block>
|
|
5070
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
|
5071
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
5072
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5073
|
+
</xsl:if>
|
|
5040
5074
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
|
5041
5075
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
5042
5076
|
<xsl:apply-templates/>
|
|
5043
5077
|
</fo:block>
|
|
5044
5078
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
|
5045
5079
|
<xsl:apply-templates/>
|
|
5046
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
|
5080
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
|
5047
5081
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
5048
|
-
<fo:block
|
|
5082
|
+
<!-- <fo:block> </fo:block> -->
|
|
5083
|
+
<fo:block/>
|
|
5049
5084
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
|
5050
5085
|
|
|
5051
5086
|
<fo:block break-after="page"/>
|
|
@@ -5981,12 +6016,15 @@
|
|
|
5981
6016
|
<xsl:param name="default">left</xsl:param>
|
|
5982
6017
|
<xsl:attribute name="text-align">
|
|
5983
6018
|
<xsl:choose>
|
|
5984
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
|
6019
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
|
5985
6020
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
|
5986
6021
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
|
5987
6022
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
5988
6023
|
</xsl:choose>
|
|
5989
6024
|
</xsl:attribute>
|
|
6025
|
+
<xsl:if test="@align = 'indent'">
|
|
6026
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
6027
|
+
</xsl:if>
|
|
5990
6028
|
</xsl:template><xsl:template name="number-to-words">
|
|
5991
6029
|
<xsl:param name="number"/>
|
|
5992
6030
|
<xsl:param name="first"/>
|
data/metanorma-m3d.gemspec
CHANGED
|
@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
|
|
|
31
31
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
|
32
32
|
spec.add_dependency "thread_safe"
|
|
33
33
|
|
|
34
|
-
spec.add_dependency "metanorma-generic", "~> 1.
|
|
34
|
+
spec.add_dependency "metanorma-generic", "~> 1.11.0"
|
|
35
35
|
|
|
36
|
-
spec.add_development_dependency "
|
|
36
|
+
spec.add_development_dependency "debug"
|
|
37
37
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
38
38
|
spec.add_development_dependency "guard", "~> 2.14"
|
|
39
39
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-m3aawg
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.8.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-
|
|
11
|
+
date: 2021-11-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: htmlentities
|
|
@@ -44,28 +44,28 @@ dependencies:
|
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 1.
|
|
47
|
+
version: 1.11.0
|
|
48
48
|
type: :runtime
|
|
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: 1.
|
|
54
|
+
version: 1.11.0
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
|
-
name:
|
|
56
|
+
name: debug
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
|
-
- - "
|
|
59
|
+
- - ">="
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: '
|
|
61
|
+
version: '0'
|
|
62
62
|
type: :development
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
|
-
- - "
|
|
66
|
+
- - ">="
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version: '
|
|
68
|
+
version: '0'
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: equivalent-xml
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
277
277
|
- !ruby/object:Gem::Version
|
|
278
278
|
version: '0'
|
|
279
279
|
requirements: []
|
|
280
|
-
rubygems_version: 3.
|
|
280
|
+
rubygems_version: 3.2.22
|
|
281
281
|
signing_key:
|
|
282
282
|
specification_version: 4
|
|
283
283
|
summary: metanorma-m3d lets you write M3AAWG Documents in AsciiDoc.
|