metanorma-un 0.5.4 → 0.5.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/un/boilerplate.xml +7 -5
- data/lib/asciidoctor/un/isodoc.rng +0 -1
- data/lib/isodoc/un/html/html_unece_plenary_titlepage.html +17 -1
- data/lib/isodoc/un/html/html_unece_titlepage.html +20 -1
- data/lib/isodoc/un/html/htmlstyle.css +4 -1
- data/lib/isodoc/un/html/htmlstyle.scss +4 -0
- data/lib/isodoc/un/html/word_unece_plenary_titlepage.html +17 -1
- data/lib/isodoc/un/html/word_unece_titlepage.html +17 -1
- data/lib/isodoc/un/presentation_xml_convert.rb +1 -0
- data/lib/isodoc/un/un.plenary-attachment.xsl +259 -45
- data/lib/isodoc/un/un.plenary.xsl +259 -45
- data/lib/isodoc/un/un.recommendation.xsl +264 -48
- data/lib/metanorma/un/version.rb +1 -1
- metadata +2 -2
@@ -39,7 +39,7 @@
|
|
39
39
|
|
40
40
|
<xsl:template match="/">
|
41
41
|
<xsl:call-template name="namespaceCheck"/>
|
42
|
-
<fo:root font-family="Times New Roman,
|
42
|
+
<fo:root font-family="Times New Roman, STIX Two Math, HanSans" font-size="10pt" xml:lang="{$lang}">
|
43
43
|
<fo:layout-master-set>
|
44
44
|
<!-- Cover page -->
|
45
45
|
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
|
@@ -1081,7 +1081,12 @@
|
|
1081
1081
|
|
1082
1082
|
|
1083
1083
|
</title-toc>
|
1084
|
-
<title-toc lang="fr">
|
1084
|
+
<title-toc lang="fr">
|
1085
|
+
|
1086
|
+
<xsl:text>Sommaire</xsl:text>
|
1087
|
+
|
1088
|
+
|
1089
|
+
</title-toc>
|
1085
1090
|
|
1086
1091
|
<title-toc lang="zh">Contents</title-toc>
|
1087
1092
|
|
@@ -1169,10 +1174,19 @@
|
|
1169
1174
|
|
1170
1175
|
</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
|
1171
1176
|
<xsl:param name="name"/>
|
1172
|
-
<xsl:
|
1173
|
-
|
1177
|
+
<xsl:param name="lang"/>
|
1178
|
+
<xsl:variable name="lang_">
|
1179
|
+
<xsl:choose>
|
1180
|
+
<xsl:when test="$lang != ''">
|
1181
|
+
<xsl:value-of select="$lang"/>
|
1182
|
+
</xsl:when>
|
1183
|
+
<xsl:otherwise>
|
1184
|
+
<xsl:call-template name="getLang"/>
|
1185
|
+
</xsl:otherwise>
|
1186
|
+
</xsl:choose>
|
1174
1187
|
</xsl:variable>
|
1175
|
-
<xsl:variable name="
|
1188
|
+
<xsl:variable name="language" select="normalize-space($lang_)"/>
|
1189
|
+
<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
|
1176
1190
|
<xsl:choose>
|
1177
1191
|
<xsl:when test="normalize-space($title_) != ''">
|
1178
1192
|
<xsl:value-of select="$title_"/>
|
@@ -1317,6 +1331,7 @@
|
|
1317
1331
|
<xsl:attribute name="text-indent">0mm</xsl:attribute>
|
1318
1332
|
|
1319
1333
|
|
1334
|
+
|
1320
1335
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1321
1336
|
|
1322
1337
|
|
@@ -1540,6 +1555,8 @@
|
|
1540
1555
|
|
1541
1556
|
|
1542
1557
|
|
1558
|
+
|
1559
|
+
|
1543
1560
|
<!-- $namespace = 'iso' or -->
|
1544
1561
|
|
1545
1562
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -1577,6 +1594,7 @@
|
|
1577
1594
|
<xsl:with-param name="table" select="$simple-table"/>
|
1578
1595
|
</xsl:call-template>
|
1579
1596
|
</xsl:variable>
|
1597
|
+
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
1580
1598
|
|
1581
1599
|
<!-- <xsl:variable name="colwidths2">
|
1582
1600
|
<xsl:call-template name="calculate-column-widths">
|
@@ -1598,37 +1616,59 @@
|
|
1598
1616
|
<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
|
1599
1617
|
|
1600
1618
|
|
1619
|
+
|
1601
1620
|
|
1602
1621
|
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
1622
|
+
<xsl:if test="not(ancestor::*[local-name()='sections'])">
|
1623
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1624
|
+
</xsl:if>
|
1625
|
+
|
1626
|
+
|
1603
1627
|
|
1604
1628
|
|
1629
|
+
|
1605
1630
|
|
1606
|
-
|
1607
1631
|
|
1608
1632
|
|
1609
1633
|
|
1610
|
-
|
1611
|
-
|
1612
|
-
|
1634
|
+
|
1635
|
+
|
1636
|
+
|
1637
|
+
<xsl:variable name="table_attributes">
|
1638
|
+
<attribute name="table-layout">fixed</attribute>
|
1639
|
+
<attribute name="width">100%</attribute>
|
1640
|
+
<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1641
|
+
<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1613
1642
|
|
1614
1643
|
|
1615
1644
|
|
1616
1645
|
|
1646
|
+
|
1617
1647
|
|
1618
1648
|
<xsl:if test="ancestor::*[local-name()='sections']">
|
1619
|
-
<
|
1620
|
-
<
|
1621
|
-
</xsl:if>
|
1622
|
-
|
1623
|
-
|
1624
|
-
</xsl:if>
|
1625
|
-
|
1626
|
-
|
1627
|
-
|
1649
|
+
<attribute name="border-top">1.5pt solid black</attribute>
|
1650
|
+
<attribute name="border-bottom">1.5pt solid black</attribute>
|
1651
|
+
</xsl:if>
|
1652
|
+
|
1653
|
+
|
1628
1654
|
|
1655
|
+
|
1629
1656
|
|
1657
|
+
</xsl:variable>
|
1658
|
+
|
1659
|
+
|
1660
|
+
<fo:table id="{@id}" table-omit-footer-at-break="true">
|
1630
1661
|
|
1662
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1663
|
+
<xsl:attribute name="{@name}">
|
1664
|
+
<xsl:value-of select="."/>
|
1665
|
+
</xsl:attribute>
|
1666
|
+
</xsl:for-each>
|
1631
1667
|
|
1668
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1669
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1670
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1671
|
+
</xsl:if>
|
1632
1672
|
|
1633
1673
|
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1634
1674
|
<xsl:choose>
|
@@ -1652,6 +1692,33 @@
|
|
1652
1692
|
|
1653
1693
|
</fo:table>
|
1654
1694
|
|
1695
|
+
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
1696
|
+
<xsl:call-template name="insertTableFooterInSeparateTable">
|
1697
|
+
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
1698
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
1699
|
+
</xsl:call-template>
|
1700
|
+
</xsl:for-each>
|
1701
|
+
|
1702
|
+
<!-- insert footer as table -->
|
1703
|
+
<!-- <fo:table>
|
1704
|
+
<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
|
1705
|
+
<xsl:attribute name="{@name}">
|
1706
|
+
<xsl:value-of select="."/>
|
1707
|
+
</xsl:attribute>
|
1708
|
+
</xsl:for-each>
|
1709
|
+
|
1710
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1711
|
+
<xsl:choose>
|
1712
|
+
<xsl:when test=". = 1 or . = 0">
|
1713
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1714
|
+
</xsl:when>
|
1715
|
+
<xsl:otherwise>
|
1716
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1717
|
+
</xsl:otherwise>
|
1718
|
+
</xsl:choose>
|
1719
|
+
</xsl:for-each>
|
1720
|
+
</fo:table>-->
|
1721
|
+
|
1655
1722
|
|
1656
1723
|
|
1657
1724
|
|
@@ -1716,6 +1783,13 @@
|
|
1716
1783
|
<xsl:for-each select="xalan:nodeset($table)//tr">
|
1717
1784
|
<xsl:variable name="td_text">
|
1718
1785
|
<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
|
1786
|
+
|
1787
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1788
|
+
<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
|
1789
|
+
<word><xsl:value-of select="normalize-space(.)"/></word>
|
1790
|
+
</xsl:for-each>
|
1791
|
+
</xsl:if> -->
|
1792
|
+
|
1719
1793
|
</xsl:variable>
|
1720
1794
|
<xsl:variable name="words">
|
1721
1795
|
<xsl:variable name="string_with_added_zerospaces">
|
@@ -1775,11 +1849,14 @@
|
|
1775
1849
|
<xsl:value-of select="*[local-name()='origin']/@citeas"/>
|
1776
1850
|
</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
|
1777
1851
|
<xsl:value-of select="@target"/>
|
1852
|
+
</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
|
1853
|
+
<xsl:variable name="math_text" select="normalize-space(.)"/>
|
1854
|
+
<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
|
1778
1855
|
</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
|
1779
1856
|
<xsl:param name="cols-count"/>
|
1780
1857
|
<!-- font-weight="bold" -->
|
1781
1858
|
<fo:table-header>
|
1782
|
-
|
1859
|
+
|
1783
1860
|
<xsl:apply-templates/>
|
1784
1861
|
</fo:table-header>
|
1785
1862
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -1804,6 +1881,13 @@
|
|
1804
1881
|
</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
|
1805
1882
|
<xsl:apply-templates/>
|
1806
1883
|
</xsl:template><xsl:template name="insertTableFooter">
|
1884
|
+
<xsl:param name="cols-count"/>
|
1885
|
+
<xsl:if test="../*[local-name()='tfoot']">
|
1886
|
+
<fo:table-footer>
|
1887
|
+
<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
|
1888
|
+
</fo:table-footer>
|
1889
|
+
</xsl:if>
|
1890
|
+
</xsl:template><xsl:template name="insertTableFooter2">
|
1807
1891
|
<xsl:param name="cols-count"/>
|
1808
1892
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1809
1893
|
<xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
|
@@ -1825,11 +1909,15 @@
|
|
1825
1909
|
<!-- fn will be processed inside 'note' processing -->
|
1826
1910
|
|
1827
1911
|
|
1828
|
-
|
1912
|
+
|
1913
|
+
<!-- except gb and bipm -->
|
1829
1914
|
|
1830
1915
|
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1831
1916
|
|
1832
1917
|
|
1918
|
+
|
1919
|
+
|
1920
|
+
|
1833
1921
|
<!-- horizontal row separator -->
|
1834
1922
|
|
1835
1923
|
|
@@ -1843,6 +1931,84 @@
|
|
1843
1931
|
</fo:table-footer>
|
1844
1932
|
|
1845
1933
|
</xsl:if>
|
1934
|
+
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
1935
|
+
<xsl:param name="table_attributes"/>
|
1936
|
+
<xsl:param name="colwidths"/>
|
1937
|
+
|
1938
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1939
|
+
|
1940
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1941
|
+
|
1942
|
+
<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
|
1943
|
+
|
1944
|
+
<fo:table keep-with-previous="always">
|
1945
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1946
|
+
<xsl:choose>
|
1947
|
+
<xsl:when test="@name = 'border-top'">
|
1948
|
+
<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
|
1949
|
+
</xsl:when>
|
1950
|
+
<xsl:when test="@name = 'border'">
|
1951
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1952
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
1953
|
+
</xsl:when>
|
1954
|
+
<xsl:otherwise>
|
1955
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
1956
|
+
</xsl:otherwise>
|
1957
|
+
</xsl:choose>
|
1958
|
+
</xsl:for-each>
|
1959
|
+
|
1960
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1961
|
+
<xsl:choose>
|
1962
|
+
<xsl:when test=". = 1 or . = 0">
|
1963
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1964
|
+
</xsl:when>
|
1965
|
+
<xsl:otherwise>
|
1966
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1967
|
+
</xsl:otherwise>
|
1968
|
+
</xsl:choose>
|
1969
|
+
</xsl:for-each>
|
1970
|
+
|
1971
|
+
<fo:table-body>
|
1972
|
+
<fo:table-row>
|
1973
|
+
<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
|
1974
|
+
|
1975
|
+
|
1976
|
+
|
1977
|
+
<!-- fn will be processed inside 'note' processing -->
|
1978
|
+
|
1979
|
+
|
1980
|
+
|
1981
|
+
<!-- except gb and bipm -->
|
1982
|
+
|
1983
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1984
|
+
|
1985
|
+
|
1986
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1987
|
+
<xsl:choose>
|
1988
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
1989
|
+
show Note under table in preface (ex. abstract) sections
|
1990
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
1991
|
+
</xsl:when>
|
1992
|
+
<xsl:otherwise>
|
1993
|
+
empty, because notes show at page side in main sections
|
1994
|
+
<fo:block/>
|
1995
|
+
</xsl:otherwise>
|
1996
|
+
</xsl:choose>
|
1997
|
+
</xsl:if> -->
|
1998
|
+
|
1999
|
+
|
2000
|
+
<!-- horizontal row separator -->
|
2001
|
+
|
2002
|
+
|
2003
|
+
<!-- fn processing -->
|
2004
|
+
<xsl:call-template name="fn_display"/>
|
2005
|
+
|
2006
|
+
</fo:table-cell>
|
2007
|
+
</fo:table-row>
|
2008
|
+
</fo:table-body>
|
2009
|
+
|
2010
|
+
</fo:table>
|
2011
|
+
</xsl:if>
|
1846
2012
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
1847
2013
|
|
1848
2014
|
<xsl:variable name="cols-count">
|
@@ -1895,8 +2061,8 @@
|
|
1895
2061
|
|
1896
2062
|
</xsl:if>
|
1897
2063
|
|
1898
|
-
|
1899
|
-
|
2064
|
+
|
2065
|
+
|
1900
2066
|
|
1901
2067
|
<xsl:apply-templates/>
|
1902
2068
|
</fo:table-row>
|
@@ -1936,6 +2102,7 @@
|
|
1936
2102
|
|
1937
2103
|
|
1938
2104
|
|
2105
|
+
|
1939
2106
|
<xsl:if test="@colspan">
|
1940
2107
|
<xsl:attribute name="number-columns-spanned">
|
1941
2108
|
<xsl:value-of select="@colspan"/>
|
@@ -1975,7 +2142,7 @@
|
|
1975
2142
|
|
1976
2143
|
|
1977
2144
|
|
1978
|
-
|
2145
|
+
|
1979
2146
|
|
1980
2147
|
|
1981
2148
|
|
@@ -1988,6 +2155,7 @@
|
|
1988
2155
|
|
1989
2156
|
|
1990
2157
|
|
2158
|
+
|
1991
2159
|
<xsl:if test="@colspan">
|
1992
2160
|
<xsl:attribute name="number-columns-spanned">
|
1993
2161
|
<xsl:value-of select="@colspan"/>
|
@@ -2011,6 +2179,8 @@
|
|
2011
2179
|
|
2012
2180
|
|
2013
2181
|
|
2182
|
+
|
2183
|
+
|
2014
2184
|
<fo:inline padding-right="2mm">
|
2015
2185
|
|
2016
2186
|
|
@@ -2025,10 +2195,11 @@
|
|
2025
2195
|
</fo:inline> -->
|
2026
2196
|
</xsl:if>
|
2027
2197
|
|
2028
|
-
|
2198
|
+
|
2029
2199
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
2030
2200
|
|
2031
2201
|
</fo:inline>
|
2202
|
+
|
2032
2203
|
<xsl:apply-templates mode="process"/>
|
2033
2204
|
</fo:block>
|
2034
2205
|
|
@@ -2052,6 +2223,7 @@
|
|
2052
2223
|
|
2053
2224
|
|
2054
2225
|
|
2226
|
+
|
2055
2227
|
<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
|
2056
2228
|
|
2057
2229
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
@@ -2061,12 +2233,15 @@
|
|
2061
2233
|
|
2062
2234
|
|
2063
2235
|
|
2236
|
+
|
2064
2237
|
<xsl:value-of select="@reference"/>
|
2065
2238
|
|
2239
|
+
|
2066
2240
|
</fo:inline>
|
2067
2241
|
<fo:inline>
|
2068
2242
|
|
2069
|
-
<xsl:apply-templates/>
|
2243
|
+
<!-- <xsl:apply-templates /> -->
|
2244
|
+
<xsl:copy-of select="./node()"/>
|
2070
2245
|
</fo:inline>
|
2071
2246
|
</fo:block>
|
2072
2247
|
</xsl:if>
|
@@ -2103,7 +2278,20 @@
|
|
2103
2278
|
<xsl:variable name="following_dl_colwidths">
|
2104
2279
|
<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
|
2105
2280
|
<xsl:variable name="html-table">
|
2106
|
-
<xsl:variable name="
|
2281
|
+
<xsl:variable name="doc_ns">
|
2282
|
+
|
2283
|
+
</xsl:variable>
|
2284
|
+
<xsl:variable name="ns">
|
2285
|
+
<xsl:choose>
|
2286
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2287
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2288
|
+
</xsl:when>
|
2289
|
+
<xsl:otherwise>
|
2290
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2291
|
+
</xsl:otherwise>
|
2292
|
+
</xsl:choose>
|
2293
|
+
</xsl:variable>
|
2294
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2107
2295
|
<xsl:element name="{$ns}:table">
|
2108
2296
|
<xsl:for-each select="*[local-name() = 'dl'][1]">
|
2109
2297
|
<tbody>
|
@@ -2168,7 +2356,8 @@
|
|
2168
2356
|
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
2169
2357
|
</xsl:if>
|
2170
2358
|
|
2171
|
-
<xsl:apply-templates/>
|
2359
|
+
<!-- <xsl:apply-templates /> -->
|
2360
|
+
<xsl:copy-of select="./node()"/>
|
2172
2361
|
</fo:block>
|
2173
2362
|
</fo:table-cell>
|
2174
2363
|
</fo:table-row>
|
@@ -2187,9 +2376,12 @@
|
|
2187
2376
|
|
2188
2377
|
|
2189
2378
|
|
2379
|
+
|
2190
2380
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
2191
2381
|
|
2382
|
+
|
2192
2383
|
<xsl:value-of select="@reference"/>
|
2384
|
+
|
2193
2385
|
</fo:basic-link>
|
2194
2386
|
</fo:inline>
|
2195
2387
|
</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
|
@@ -2287,7 +2479,20 @@
|
|
2287
2479
|
</xsl:choose>
|
2288
2480
|
<!-- create virtual html table for dl/[dt and dd] -->
|
2289
2481
|
<xsl:variable name="html-table">
|
2290
|
-
<xsl:variable name="
|
2482
|
+
<xsl:variable name="doc_ns">
|
2483
|
+
|
2484
|
+
</xsl:variable>
|
2485
|
+
<xsl:variable name="ns">
|
2486
|
+
<xsl:choose>
|
2487
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2488
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2489
|
+
</xsl:when>
|
2490
|
+
<xsl:otherwise>
|
2491
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2492
|
+
</xsl:otherwise>
|
2493
|
+
</xsl:choose>
|
2494
|
+
</xsl:variable>
|
2495
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2291
2496
|
<xsl:element name="{$ns}:table">
|
2292
2497
|
<tbody>
|
2293
2498
|
<xsl:apply-templates mode="dl"/>
|
@@ -2431,6 +2636,7 @@
|
|
2431
2636
|
|
2432
2637
|
|
2433
2638
|
|
2639
|
+
|
2434
2640
|
<xsl:apply-templates/>
|
2435
2641
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2436
2642
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -2497,18 +2703,18 @@
|
|
2497
2703
|
</xsl:template><xsl:template match="*[local-name()='tt']">
|
2498
2704
|
<fo:inline xsl:use-attribute-sets="tt-style">
|
2499
2705
|
<xsl:variable name="_font-size">
|
2500
|
-
|
2501
|
-
|
2502
|
-
|
2503
2706
|
|
2504
2707
|
|
2505
2708
|
|
2506
2709
|
|
2507
2710
|
|
2508
2711
|
|
2509
|
-
|
2510
2712
|
|
2511
|
-
|
2713
|
+
|
2714
|
+
|
2715
|
+
|
2716
|
+
|
2717
|
+
|
2512
2718
|
|
2513
2719
|
|
2514
2720
|
</xsl:variable>
|
@@ -2846,7 +3052,7 @@
|
|
2846
3052
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
|
2847
3053
|
<xsl:value-of select="substring($str, 2)"/>
|
2848
3054
|
</xsl:template><xsl:template match="mathml:math">
|
2849
|
-
<fo:inline font-family="
|
3055
|
+
<fo:inline font-family="STIX Two Math"> <!-- -->
|
2850
3056
|
<xsl:variable name="mathml">
|
2851
3057
|
<xsl:apply-templates select="." mode="mathml"/>
|
2852
3058
|
</xsl:variable>
|
@@ -2940,7 +3146,7 @@
|
|
2940
3146
|
<xsl:apply-templates/>
|
2941
3147
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
2942
3148
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
2943
|
-
|
3149
|
+
|
2944
3150
|
<xsl:apply-templates/>
|
2945
3151
|
</fo:basic-link>
|
2946
3152
|
</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
|
@@ -3168,18 +3374,9 @@
|
|
3168
3374
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
3169
3375
|
<fo:bookmark-title>
|
3170
3376
|
<xsl:variable name="bookmark-title_">
|
3171
|
-
<xsl:
|
3172
|
-
<xsl:
|
3173
|
-
|
3174
|
-
|
3175
|
-
</xsl:when>
|
3176
|
-
<xsl:when test="@lang = 'fr'">
|
3177
|
-
|
3178
|
-
|
3179
|
-
</xsl:when>
|
3180
|
-
<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
|
3181
|
-
<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
|
3182
|
-
</xsl:choose>
|
3377
|
+
<xsl:call-template name="getLangVersion">
|
3378
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3379
|
+
</xsl:call-template>
|
3183
3380
|
</xsl:variable>
|
3184
3381
|
<xsl:choose>
|
3185
3382
|
<xsl:when test="normalize-space($bookmark-title_) != ''">
|
@@ -3221,6 +3418,20 @@
|
|
3221
3418
|
|
3222
3419
|
</fo:bookmark-tree>
|
3223
3420
|
</xsl:if>
|
3421
|
+
</xsl:template><xsl:template name="getLangVersion">
|
3422
|
+
<xsl:param name="lang"/>
|
3423
|
+
<xsl:choose>
|
3424
|
+
<xsl:when test="$lang = 'en'">
|
3425
|
+
|
3426
|
+
|
3427
|
+
</xsl:when>
|
3428
|
+
<xsl:when test="$lang = 'fr'">
|
3429
|
+
|
3430
|
+
|
3431
|
+
</xsl:when>
|
3432
|
+
<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
|
3433
|
+
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
3434
|
+
</xsl:choose>
|
3224
3435
|
</xsl:template><xsl:template match="item" mode="bookmark">
|
3225
3436
|
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
3226
3437
|
<fo:bookmark-title>
|
@@ -3235,7 +3446,7 @@
|
|
3235
3446
|
</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
|
3236
3447
|
<xsl:if test="normalize-space() != ''">
|
3237
3448
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
3238
|
-
|
3449
|
+
|
3239
3450
|
<xsl:apply-templates/>
|
3240
3451
|
</fo:block>
|
3241
3452
|
</xsl:if>
|
@@ -3871,6 +4082,7 @@
|
|
3871
4082
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
3872
4083
|
<fo:block>
|
3873
4084
|
<xsl:call-template name="setId"/>
|
4085
|
+
|
3874
4086
|
<xsl:apply-templates/>
|
3875
4087
|
</fo:block>
|
3876
4088
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -3911,6 +4123,7 @@
|
|
3911
4123
|
</xsl:choose>
|
3912
4124
|
</xsl:attribute>
|
3913
4125
|
|
4126
|
+
|
3914
4127
|
<fo:block-container margin-left="0mm">
|
3915
4128
|
<fo:block>
|
3916
4129
|
<xsl:apply-templates select="." mode="ul_ol"/>
|
@@ -4096,6 +4309,7 @@
|
|
4096
4309
|
|
4097
4310
|
|
4098
4311
|
|
4312
|
+
|
4099
4313
|
|
4100
4314
|
</xsl:variable>
|
4101
4315
|
<xsl:choose>
|
@@ -4110,6 +4324,7 @@
|
|
4110
4324
|
<dc:creator>
|
4111
4325
|
|
4112
4326
|
|
4327
|
+
|
4113
4328
|
</dc:creator>
|
4114
4329
|
<dc:description>
|
4115
4330
|
<xsl:variable name="abstract">
|
@@ -4119,6 +4334,7 @@
|
|
4119
4334
|
<xsl:copy-of select="/*/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
4120
4335
|
|
4121
4336
|
|
4337
|
+
|
4122
4338
|
</xsl:variable>
|
4123
4339
|
<xsl:value-of select="normalize-space($abstract)"/>
|
4124
4340
|
</dc:description>
|