metanorma-gb 1.5.6 → 1.5.7
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b0ddd7149d38c5ea3e20a2be7eca774fd274891f44f5d4befd9be899ab68c0ae
|
4
|
+
data.tar.gz: a158e33d9f29bf574705aa57aa13b03c2055048ab193af8f57340d09a7f3e920
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 339ea8375c4197f3a2c52028bfe6cb04215fd5217623af47235c78fa6ba48888c3e6ef2942794341aad2193703ad502d14692c9a53564440b1cb592ce72db526
|
7
|
+
data.tar.gz: bb89373f177df01eb5fb7ec90ef2b3fe2ada866182a43dbc1bf50c041b15beb0311c5b30be80227b52389e8a32b489e92a87945692fdf0fe598dd8528acd0c2e
|
@@ -1149,7 +1149,12 @@
|
|
1149
1149
|
<xsl:text>Table of contents</xsl:text>
|
1150
1150
|
|
1151
1151
|
</title-toc>
|
1152
|
-
<title-toc lang="fr">
|
1152
|
+
<title-toc lang="fr">
|
1153
|
+
|
1154
|
+
<xsl:text>Sommaire</xsl:text>
|
1155
|
+
|
1156
|
+
|
1157
|
+
</title-toc>
|
1153
1158
|
|
1154
1159
|
|
1155
1160
|
<title-toc lang="zh">目次</title-toc>
|
@@ -1241,10 +1246,19 @@
|
|
1241
1246
|
|
1242
1247
|
</xsl:variable><xsl:variable name="tab_zh"> </xsl:variable><xsl:template name="getTitle">
|
1243
1248
|
<xsl:param name="name"/>
|
1244
|
-
<xsl:
|
1245
|
-
|
1249
|
+
<xsl:param name="lang"/>
|
1250
|
+
<xsl:variable name="lang_">
|
1251
|
+
<xsl:choose>
|
1252
|
+
<xsl:when test="$lang != ''">
|
1253
|
+
<xsl:value-of select="$lang"/>
|
1254
|
+
</xsl:when>
|
1255
|
+
<xsl:otherwise>
|
1256
|
+
<xsl:call-template name="getLang"/>
|
1257
|
+
</xsl:otherwise>
|
1258
|
+
</xsl:choose>
|
1246
1259
|
</xsl:variable>
|
1247
|
-
<xsl:variable name="
|
1260
|
+
<xsl:variable name="language" select="normalize-space($lang_)"/>
|
1261
|
+
<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $language]"/>
|
1248
1262
|
<xsl:choose>
|
1249
1263
|
<xsl:when test="normalize-space($title_) != ''">
|
1250
1264
|
<xsl:value-of select="$title_"/>
|
@@ -1394,6 +1408,7 @@
|
|
1394
1408
|
|
1395
1409
|
|
1396
1410
|
|
1411
|
+
|
1397
1412
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
1398
1413
|
|
1399
1414
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -1636,6 +1651,8 @@
|
|
1636
1651
|
|
1637
1652
|
|
1638
1653
|
|
1654
|
+
|
1655
|
+
|
1639
1656
|
<!-- $namespace = 'iso' or -->
|
1640
1657
|
|
1641
1658
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
@@ -1673,6 +1690,7 @@
|
|
1673
1690
|
<xsl:with-param name="table" select="$simple-table"/>
|
1674
1691
|
</xsl:call-template>
|
1675
1692
|
</xsl:variable>
|
1693
|
+
<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
|
1676
1694
|
|
1677
1695
|
<!-- <xsl:variable name="colwidths2">
|
1678
1696
|
<xsl:call-template name="calculate-column-widths">
|
@@ -1693,30 +1711,52 @@
|
|
1693
1711
|
|
1694
1712
|
<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
|
1695
1713
|
|
1714
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1696
1715
|
|
1697
1716
|
|
1717
|
+
|
1718
|
+
|
1719
|
+
|
1698
1720
|
|
1699
1721
|
|
1700
|
-
|
1722
|
+
|
1701
1723
|
|
1702
1724
|
|
1703
1725
|
|
1704
|
-
|
1705
|
-
|
1706
|
-
|
1707
|
-
|
1708
|
-
|
1709
|
-
|
1710
|
-
|
1726
|
+
|
1727
|
+
|
1728
|
+
|
1729
|
+
|
1730
|
+
<xsl:variable name="table_attributes">
|
1731
|
+
<attribute name="table-layout">fixed</attribute>
|
1732
|
+
<attribute name="width">100%</attribute>
|
1733
|
+
<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1734
|
+
<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
|
1711
1735
|
|
1712
1736
|
|
1713
1737
|
|
1714
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1715
1738
|
|
1739
|
+
|
1740
|
+
|
1741
|
+
|
1716
1742
|
|
1743
|
+
|
1717
1744
|
|
1745
|
+
</xsl:variable>
|
1746
|
+
|
1747
|
+
|
1748
|
+
<fo:table id="{@id}" table-omit-footer-at-break="true">
|
1718
1749
|
|
1750
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
1751
|
+
<xsl:attribute name="{@name}">
|
1752
|
+
<xsl:value-of select="."/>
|
1753
|
+
</xsl:attribute>
|
1754
|
+
</xsl:for-each>
|
1719
1755
|
|
1756
|
+
<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1757
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
1758
|
+
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1759
|
+
</xsl:if>
|
1720
1760
|
|
1721
1761
|
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1722
1762
|
<xsl:choose>
|
@@ -1740,6 +1780,33 @@
|
|
1740
1780
|
|
1741
1781
|
</fo:table>
|
1742
1782
|
|
1783
|
+
<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
|
1784
|
+
<xsl:call-template name="insertTableFooterInSeparateTable">
|
1785
|
+
<xsl:with-param name="table_attributes" select="$table_attributes"/>
|
1786
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
1787
|
+
</xsl:call-template>
|
1788
|
+
</xsl:for-each>
|
1789
|
+
|
1790
|
+
<!-- insert footer as table -->
|
1791
|
+
<!-- <fo:table>
|
1792
|
+
<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
|
1793
|
+
<xsl:attribute name="{@name}">
|
1794
|
+
<xsl:value-of select="."/>
|
1795
|
+
</xsl:attribute>
|
1796
|
+
</xsl:for-each>
|
1797
|
+
|
1798
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
1799
|
+
<xsl:choose>
|
1800
|
+
<xsl:when test=". = 1 or . = 0">
|
1801
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
1802
|
+
</xsl:when>
|
1803
|
+
<xsl:otherwise>
|
1804
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
1805
|
+
</xsl:otherwise>
|
1806
|
+
</xsl:choose>
|
1807
|
+
</xsl:for-each>
|
1808
|
+
</fo:table>-->
|
1809
|
+
|
1743
1810
|
|
1744
1811
|
<xsl:apply-templates select="*[local-name()='note']" mode="process"/>
|
1745
1812
|
|
@@ -1806,6 +1873,13 @@
|
|
1806
1873
|
<xsl:for-each select="xalan:nodeset($table)//tr">
|
1807
1874
|
<xsl:variable name="td_text">
|
1808
1875
|
<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
|
1876
|
+
|
1877
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
1878
|
+
<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">
|
1879
|
+
<word><xsl:value-of select="normalize-space(.)"/></word>
|
1880
|
+
</xsl:for-each>
|
1881
|
+
</xsl:if> -->
|
1882
|
+
|
1809
1883
|
</xsl:variable>
|
1810
1884
|
<xsl:variable name="words">
|
1811
1885
|
<xsl:variable name="string_with_added_zerospaces">
|
@@ -1865,11 +1939,14 @@
|
|
1865
1939
|
<xsl:value-of select="*[local-name()='origin']/@citeas"/>
|
1866
1940
|
</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
|
1867
1941
|
<xsl:value-of select="@target"/>
|
1942
|
+
</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
|
1943
|
+
<xsl:variable name="math_text" select="normalize-space(.)"/>
|
1944
|
+
<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
|
1868
1945
|
</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
|
1869
1946
|
<xsl:param name="cols-count"/>
|
1870
1947
|
<!-- font-weight="bold" -->
|
1871
1948
|
<fo:table-header>
|
1872
|
-
|
1949
|
+
|
1873
1950
|
<xsl:apply-templates/>
|
1874
1951
|
</fo:table-header>
|
1875
1952
|
</xsl:template><xsl:template name="table-header-title">
|
@@ -1894,6 +1971,13 @@
|
|
1894
1971
|
</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
|
1895
1972
|
<xsl:apply-templates/>
|
1896
1973
|
</xsl:template><xsl:template name="insertTableFooter">
|
1974
|
+
<xsl:param name="cols-count"/>
|
1975
|
+
<xsl:if test="../*[local-name()='tfoot']">
|
1976
|
+
<fo:table-footer>
|
1977
|
+
<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
|
1978
|
+
</fo:table-footer>
|
1979
|
+
</xsl:if>
|
1980
|
+
</xsl:template><xsl:template name="insertTableFooter2">
|
1897
1981
|
<xsl:param name="cols-count"/>
|
1898
1982
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1899
1983
|
<xsl:if test="../*[local-name()='tfoot'] or $isNoteOrFnExist = 'true'">
|
@@ -1917,7 +2001,11 @@
|
|
1917
2001
|
<!-- fn will be processed inside 'note' processing -->
|
1918
2002
|
|
1919
2003
|
|
1920
|
-
|
2004
|
+
|
2005
|
+
<!-- except gb and bipm -->
|
2006
|
+
|
2007
|
+
|
2008
|
+
|
1921
2009
|
|
1922
2010
|
|
1923
2011
|
<!-- horizontal row separator -->
|
@@ -1933,6 +2021,84 @@
|
|
1933
2021
|
</fo:table-footer>
|
1934
2022
|
|
1935
2023
|
</xsl:if>
|
2024
|
+
</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
|
2025
|
+
<xsl:param name="table_attributes"/>
|
2026
|
+
<xsl:param name="colwidths"/>
|
2027
|
+
|
2028
|
+
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
2029
|
+
|
2030
|
+
<xsl:if test="$isNoteOrFnExist = 'true'">
|
2031
|
+
|
2032
|
+
<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
|
2033
|
+
|
2034
|
+
<fo:table keep-with-previous="always">
|
2035
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
|
2036
|
+
<xsl:choose>
|
2037
|
+
<xsl:when test="@name = 'border-top'">
|
2038
|
+
<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
|
2039
|
+
</xsl:when>
|
2040
|
+
<xsl:when test="@name = 'border'">
|
2041
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
2042
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
2043
|
+
</xsl:when>
|
2044
|
+
<xsl:otherwise>
|
2045
|
+
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
2046
|
+
</xsl:otherwise>
|
2047
|
+
</xsl:choose>
|
2048
|
+
</xsl:for-each>
|
2049
|
+
|
2050
|
+
<xsl:for-each select="xalan:nodeset($colwidths)//column">
|
2051
|
+
<xsl:choose>
|
2052
|
+
<xsl:when test=". = 1 or . = 0">
|
2053
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
2054
|
+
</xsl:when>
|
2055
|
+
<xsl:otherwise>
|
2056
|
+
<fo:table-column column-width="proportional-column-width({.})"/>
|
2057
|
+
</xsl:otherwise>
|
2058
|
+
</xsl:choose>
|
2059
|
+
</xsl:for-each>
|
2060
|
+
|
2061
|
+
<fo:table-body>
|
2062
|
+
<fo:table-row>
|
2063
|
+
<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
|
2064
|
+
|
2065
|
+
<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
|
2066
|
+
|
2067
|
+
|
2068
|
+
|
2069
|
+
<!-- fn will be processed inside 'note' processing -->
|
2070
|
+
|
2071
|
+
|
2072
|
+
|
2073
|
+
<!-- except gb and bipm -->
|
2074
|
+
|
2075
|
+
|
2076
|
+
<!-- <xsl:if test="$namespace = 'bipm'">
|
2077
|
+
<xsl:choose>
|
2078
|
+
<xsl:when test="ancestor::*[local-name()='preface']">
|
2079
|
+
show Note under table in preface (ex. abstract) sections
|
2080
|
+
<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
|
2081
|
+
</xsl:when>
|
2082
|
+
<xsl:otherwise>
|
2083
|
+
empty, because notes show at page side in main sections
|
2084
|
+
<fo:block/>
|
2085
|
+
</xsl:otherwise>
|
2086
|
+
</xsl:choose>
|
2087
|
+
</xsl:if> -->
|
2088
|
+
|
2089
|
+
|
2090
|
+
<!-- horizontal row separator -->
|
2091
|
+
|
2092
|
+
|
2093
|
+
<!-- fn processing -->
|
2094
|
+
<xsl:call-template name="fn_display"/>
|
2095
|
+
|
2096
|
+
</fo:table-cell>
|
2097
|
+
</fo:table-row>
|
2098
|
+
</fo:table-body>
|
2099
|
+
|
2100
|
+
</fo:table>
|
2101
|
+
</xsl:if>
|
1936
2102
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
1937
2103
|
|
1938
2104
|
<xsl:variable name="cols-count">
|
@@ -1988,8 +2154,8 @@
|
|
1988
2154
|
<xsl:attribute name="min-height">0mm</xsl:attribute>
|
1989
2155
|
<xsl:attribute name="line-height">110%</xsl:attribute>
|
1990
2156
|
|
1991
|
-
|
1992
|
-
|
2157
|
+
|
2158
|
+
|
1993
2159
|
|
1994
2160
|
<xsl:apply-templates/>
|
1995
2161
|
</fo:table-row>
|
@@ -2013,6 +2179,7 @@
|
|
2013
2179
|
|
2014
2180
|
|
2015
2181
|
|
2182
|
+
|
2016
2183
|
<xsl:if test="@colspan">
|
2017
2184
|
<xsl:attribute name="number-columns-spanned">
|
2018
2185
|
<xsl:value-of select="@colspan"/>
|
@@ -2056,7 +2223,8 @@
|
|
2056
2223
|
<xsl:if test="ancestor::*[local-name() = 'tfoot']">
|
2057
2224
|
<xsl:attribute name="border-bottom">solid black 0</xsl:attribute>
|
2058
2225
|
</xsl:if>
|
2059
|
-
|
2226
|
+
|
2227
|
+
|
2060
2228
|
|
2061
2229
|
|
2062
2230
|
|
@@ -2090,16 +2258,19 @@
|
|
2090
2258
|
|
2091
2259
|
|
2092
2260
|
|
2261
|
+
|
2262
|
+
|
2093
2263
|
<fo:inline padding-right="2mm">
|
2094
2264
|
|
2095
2265
|
<xsl:attribute name="font-family">SimHei</xsl:attribute>
|
2096
2266
|
|
2097
2267
|
|
2098
2268
|
|
2099
|
-
|
2269
|
+
|
2100
2270
|
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
|
2101
2271
|
|
2102
2272
|
</fo:inline>
|
2273
|
+
|
2103
2274
|
<xsl:apply-templates mode="process"/>
|
2104
2275
|
</fo:block>
|
2105
2276
|
|
@@ -2127,6 +2298,7 @@
|
|
2127
2298
|
|
2128
2299
|
|
2129
2300
|
|
2301
|
+
|
2130
2302
|
<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
|
2131
2303
|
|
2132
2304
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
@@ -2138,12 +2310,15 @@
|
|
2138
2310
|
|
2139
2311
|
|
2140
2312
|
|
2313
|
+
|
2141
2314
|
<xsl:value-of select="@reference"/>
|
2142
2315
|
|
2316
|
+
|
2143
2317
|
</fo:inline>
|
2144
2318
|
<fo:inline>
|
2145
2319
|
|
2146
|
-
<xsl:apply-templates/>
|
2320
|
+
<!-- <xsl:apply-templates /> -->
|
2321
|
+
<xsl:copy-of select="./node()"/>
|
2147
2322
|
</fo:inline>
|
2148
2323
|
</fo:block>
|
2149
2324
|
</xsl:if>
|
@@ -2180,7 +2355,20 @@
|
|
2180
2355
|
<xsl:variable name="following_dl_colwidths">
|
2181
2356
|
<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
|
2182
2357
|
<xsl:variable name="html-table">
|
2183
|
-
<xsl:variable name="
|
2358
|
+
<xsl:variable name="doc_ns">
|
2359
|
+
|
2360
|
+
</xsl:variable>
|
2361
|
+
<xsl:variable name="ns">
|
2362
|
+
<xsl:choose>
|
2363
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2364
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2365
|
+
</xsl:when>
|
2366
|
+
<xsl:otherwise>
|
2367
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2368
|
+
</xsl:otherwise>
|
2369
|
+
</xsl:choose>
|
2370
|
+
</xsl:variable>
|
2371
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2184
2372
|
<xsl:element name="{$ns}:table">
|
2185
2373
|
<xsl:for-each select="*[local-name() = 'dl'][1]">
|
2186
2374
|
<tbody>
|
@@ -2245,7 +2433,8 @@
|
|
2245
2433
|
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
2246
2434
|
</xsl:if>
|
2247
2435
|
|
2248
|
-
<xsl:apply-templates/>
|
2436
|
+
<!-- <xsl:apply-templates /> -->
|
2437
|
+
<xsl:copy-of select="./node()"/>
|
2249
2438
|
</fo:block>
|
2250
2439
|
</fo:table-cell>
|
2251
2440
|
</fo:table-row>
|
@@ -2268,9 +2457,12 @@
|
|
2268
2457
|
|
2269
2458
|
|
2270
2459
|
|
2460
|
+
|
2271
2461
|
<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
|
2272
2462
|
|
2463
|
+
|
2273
2464
|
<xsl:value-of select="@reference"/>
|
2465
|
+
|
2274
2466
|
</fo:basic-link>
|
2275
2467
|
</fo:inline>
|
2276
2468
|
</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
|
@@ -2394,7 +2586,20 @@
|
|
2394
2586
|
</xsl:choose>
|
2395
2587
|
<!-- create virtual html table for dl/[dt and dd] -->
|
2396
2588
|
<xsl:variable name="html-table">
|
2397
|
-
<xsl:variable name="
|
2589
|
+
<xsl:variable name="doc_ns">
|
2590
|
+
|
2591
|
+
</xsl:variable>
|
2592
|
+
<xsl:variable name="ns">
|
2593
|
+
<xsl:choose>
|
2594
|
+
<xsl:when test="normalize-space($doc_ns) != ''">
|
2595
|
+
<xsl:value-of select="normalize-space($doc_ns)"/>
|
2596
|
+
</xsl:when>
|
2597
|
+
<xsl:otherwise>
|
2598
|
+
<xsl:value-of select="substring-before(name(/*), '-')"/>
|
2599
|
+
</xsl:otherwise>
|
2600
|
+
</xsl:choose>
|
2601
|
+
</xsl:variable>
|
2602
|
+
<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
|
2398
2603
|
<xsl:element name="{$ns}:table">
|
2399
2604
|
<tbody>
|
2400
2605
|
<xsl:apply-templates mode="dl"/>
|
@@ -2538,6 +2743,7 @@
|
|
2538
2743
|
|
2539
2744
|
|
2540
2745
|
|
2746
|
+
|
2541
2747
|
<xsl:apply-templates/>
|
2542
2748
|
<!-- <xsl:if test="$namespace = 'gb'">
|
2543
2749
|
<xsl:if test="ancestor::*[local-name()='formula']">
|
@@ -2604,18 +2810,18 @@
|
|
2604
2810
|
</xsl:template><xsl:template match="*[local-name()='tt']">
|
2605
2811
|
<fo:inline xsl:use-attribute-sets="tt-style">
|
2606
2812
|
<xsl:variable name="_font-size">
|
2607
|
-
|
2608
|
-
|
2609
|
-
10
|
2813
|
+
|
2814
|
+
|
2815
|
+
10
|
2816
|
+
|
2817
|
+
|
2610
2818
|
|
2611
2819
|
|
2612
2820
|
|
2613
2821
|
|
2614
2822
|
|
2615
2823
|
|
2616
|
-
|
2617
2824
|
|
2618
|
-
|
2619
2825
|
|
2620
2826
|
|
2621
2827
|
</xsl:variable>
|
@@ -2953,7 +3159,7 @@
|
|
2953
3159
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
|
2954
3160
|
<xsl:value-of select="substring($str, 2)"/>
|
2955
3161
|
</xsl:template><xsl:template match="mathml:math">
|
2956
|
-
<fo:inline font-family="
|
3162
|
+
<fo:inline font-family="STIX Two Math"> <!-- -->
|
2957
3163
|
<xsl:variable name="mathml">
|
2958
3164
|
<xsl:apply-templates select="." mode="mathml"/>
|
2959
3165
|
</xsl:variable>
|
@@ -3047,7 +3253,7 @@
|
|
3047
3253
|
<xsl:apply-templates/>
|
3048
3254
|
</xsl:template><xsl:template match="*[local-name() = 'xref']">
|
3049
3255
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
3050
|
-
|
3256
|
+
|
3051
3257
|
<xsl:apply-templates/>
|
3052
3258
|
</fo:basic-link>
|
3053
3259
|
</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
|
@@ -3271,18 +3477,9 @@
|
|
3271
3477
|
<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
|
3272
3478
|
<fo:bookmark-title>
|
3273
3479
|
<xsl:variable name="bookmark-title_">
|
3274
|
-
<xsl:
|
3275
|
-
<xsl:
|
3276
|
-
|
3277
|
-
|
3278
|
-
</xsl:when>
|
3279
|
-
<xsl:when test="@lang = 'fr'">
|
3280
|
-
|
3281
|
-
|
3282
|
-
</xsl:when>
|
3283
|
-
<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
|
3284
|
-
<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
|
3285
|
-
</xsl:choose>
|
3480
|
+
<xsl:call-template name="getLangVersion">
|
3481
|
+
<xsl:with-param name="lang" select="@lang"/>
|
3482
|
+
</xsl:call-template>
|
3286
3483
|
</xsl:variable>
|
3287
3484
|
<xsl:choose>
|
3288
3485
|
<xsl:when test="normalize-space($bookmark-title_) != ''">
|
@@ -3324,6 +3521,20 @@
|
|
3324
3521
|
|
3325
3522
|
</fo:bookmark-tree>
|
3326
3523
|
</xsl:if>
|
3524
|
+
</xsl:template><xsl:template name="getLangVersion">
|
3525
|
+
<xsl:param name="lang"/>
|
3526
|
+
<xsl:choose>
|
3527
|
+
<xsl:when test="$lang = 'en'">
|
3528
|
+
|
3529
|
+
|
3530
|
+
</xsl:when>
|
3531
|
+
<xsl:when test="$lang = 'fr'">
|
3532
|
+
|
3533
|
+
|
3534
|
+
</xsl:when>
|
3535
|
+
<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
|
3536
|
+
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
3537
|
+
</xsl:choose>
|
3327
3538
|
</xsl:template><xsl:template match="item" mode="bookmark">
|
3328
3539
|
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
3329
3540
|
<fo:bookmark-title>
|
@@ -3338,7 +3549,7 @@
|
|
3338
3549
|
</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">
|
3339
3550
|
<xsl:if test="normalize-space() != ''">
|
3340
3551
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
3341
|
-
|
3552
|
+
|
3342
3553
|
<xsl:apply-templates/>
|
3343
3554
|
</fo:block>
|
3344
3555
|
</xsl:if>
|
@@ -3966,6 +4177,7 @@
|
|
3966
4177
|
</xsl:template><xsl:template match="*[local-name() = 'clause']">
|
3967
4178
|
<fo:block>
|
3968
4179
|
<xsl:call-template name="setId"/>
|
4180
|
+
|
3969
4181
|
<xsl:apply-templates/>
|
3970
4182
|
</fo:block>
|
3971
4183
|
</xsl:template><xsl:template match="*[local-name() = 'definitions']">
|
@@ -4003,6 +4215,7 @@
|
|
4003
4215
|
|
4004
4216
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
4005
4217
|
|
4218
|
+
|
4006
4219
|
<fo:block-container margin-left="0mm">
|
4007
4220
|
<fo:block>
|
4008
4221
|
<xsl:apply-templates select="." mode="ul_ol"/>
|
@@ -4188,6 +4401,7 @@
|
|
4188
4401
|
|
4189
4402
|
|
4190
4403
|
|
4404
|
+
|
4191
4405
|
|
4192
4406
|
</xsl:variable>
|
4193
4407
|
<xsl:choose>
|
@@ -4204,6 +4418,7 @@
|
|
4204
4418
|
<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']/*[local-name() = 'organization']/*[local-name() = 'name']"/>
|
4205
4419
|
|
4206
4420
|
|
4421
|
+
|
4207
4422
|
</dc:creator>
|
4208
4423
|
<dc:description>
|
4209
4424
|
<xsl:variable name="abstract">
|
@@ -4213,6 +4428,7 @@
|
|
4213
4428
|
|
4214
4429
|
|
4215
4430
|
|
4431
|
+
|
4216
4432
|
</xsl:variable>
|
4217
4433
|
<xsl:value-of select="normalize-space($abstract)"/>
|
4218
4434
|
</dc:description>
|
@@ -16,7 +16,7 @@ fieldset, form, label, legend,
|
|
16
16
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
17
17
|
article, aside, canvas, details, embed,
|
18
18
|
figure, figcaption, footer, header, hgroup,
|
19
|
-
menu,
|
19
|
+
menu, output, ruby, section, summary,
|
20
20
|
time, mark, audio, video {
|
21
21
|
margin: 0;
|
22
22
|
padding: 0; }
|
@@ -9,7 +9,7 @@ fieldset, form, label, legend,
|
|
9
9
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
10
10
|
article, aside, canvas, details, embed,
|
11
11
|
figure, figcaption, footer, header, hgroup,
|
12
|
-
menu,
|
12
|
+
menu, output, ruby, section, summary,
|
13
13
|
time, mark, audio, video {
|
14
14
|
margin: 0;
|
15
15
|
padding: 0; }
|
data/lib/metanorma/gb/version.rb
CHANGED
data/metanorma-gb.gemspec
CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.require_paths = ["lib"]
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
31
31
|
|
32
|
-
spec.add_dependency "metanorma-iso", "~> 1.5.
|
32
|
+
spec.add_dependency "metanorma-iso", "~> 1.5.10"
|
33
33
|
spec.add_dependency "isodoc", "~> 1.2.0"
|
34
34
|
spec.add_dependency "twitter_cldr", "~> 4.4.4"
|
35
35
|
spec.add_dependency "gb-agencies", "~> 0.0.4"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-gb
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-10-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-iso
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.5.
|
19
|
+
version: 1.5.10
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.5.
|
26
|
+
version: 1.5.10
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: isodoc
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|