metanorma-un 0.9.2 → 0.9.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/un/presentation_xml_convert.rb +1 -1
- data/lib/isodoc/un/un.plenary-attachment.xsl +190 -33
- data/lib/isodoc/un/un.plenary.xsl +190 -33
- data/lib/isodoc/un/un.recommendation.xsl +190 -32
- data/lib/metanorma/un/biblio.rng +102 -5
- data/lib/metanorma/un/isodoc.rng +7 -0
- data/lib/metanorma/un/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7a19302629920120d5bd3ef41ad5caf321914a49faf45ddff3646b8f5e2224e2
|
4
|
+
data.tar.gz: 7ffc87968fbd90b21ea9fdf3007f17db5695a48575284302bd79696b35ac0fce
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 65dbc51a9c7d6d3c3c5f08d4cbeed51c56ca86fd95a65f08ecf6a7a33baf6f2869ed7410c8820248d3aac77eeac40f84c26dec6a4e6823dde1e5af096611b470
|
7
|
+
data.tar.gz: 84051bf8dce10c80c15a6fbf2bf7eeaf156264b8692a72316ec1a7684d6b48aabc73f35a3427bf0d3f7b7f6d32e1c7310d29aa8f60e7d91aca5f968d53edf873
|
@@ -904,7 +904,7 @@
|
|
904
904
|
<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
|
905
905
|
</xsl:otherwise>
|
906
906
|
</xsl:choose>
|
907
|
-
</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
|
907
|
+
</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
|
908
908
|
|
909
909
|
|
910
910
|
|
@@ -921,7 +921,9 @@
|
|
921
921
|
|
922
922
|
|
923
923
|
|
924
|
-
|
924
|
+
|
925
|
+
<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
|
926
|
+
<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
|
925
927
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
926
928
|
|
927
929
|
</xsl:attribute-set><xsl:template name="insertRootStyle">
|
@@ -935,17 +937,60 @@
|
|
935
937
|
</xsl:variable>
|
936
938
|
<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
|
937
939
|
|
940
|
+
<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
|
941
|
+
|
938
942
|
<xsl:for-each select="$root-style_/root-style/@*">
|
943
|
+
|
939
944
|
<xsl:choose>
|
940
|
-
<xsl:when test="local-name() = 'font-family'
|
945
|
+
<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
|
946
|
+
<xsl:when test="local-name() = 'font-family'">
|
947
|
+
|
948
|
+
<xsl:variable name="font_regional_prefix">
|
949
|
+
<xsl:choose>
|
950
|
+
<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
|
951
|
+
<xsl:otherwise>Noto Serif</xsl:otherwise>
|
952
|
+
</xsl:choose>
|
953
|
+
</xsl:variable>
|
954
|
+
|
941
955
|
<xsl:attribute name="{local-name()}">
|
942
|
-
|
956
|
+
|
957
|
+
<xsl:variable name="font_extended">
|
958
|
+
<xsl:choose>
|
959
|
+
<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
960
|
+
<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
|
961
|
+
<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
|
962
|
+
<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
|
963
|
+
<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
964
|
+
<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
|
965
|
+
</xsl:choose>
|
966
|
+
</xsl:variable>
|
967
|
+
<xsl:if test="normalize-space($font_extended) != ''">
|
968
|
+
<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
|
969
|
+
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
970
|
+
</xsl:if>
|
971
|
+
|
972
|
+
<xsl:value-of select="."/>
|
973
|
+
|
974
|
+
<xsl:if test="$additional_fonts != ''">
|
975
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
976
|
+
</xsl:if>
|
943
977
|
</xsl:attribute>
|
944
978
|
</xsl:when>
|
945
979
|
<xsl:otherwise>
|
946
980
|
<xsl:copy-of select="."/>
|
947
981
|
</xsl:otherwise>
|
948
982
|
</xsl:choose>
|
983
|
+
|
984
|
+
<!-- <xsl:choose>
|
985
|
+
<xsl:when test="local-name() = 'font-family'">
|
986
|
+
<xsl:attribute name="{local-name()}">
|
987
|
+
<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
|
988
|
+
</xsl:attribute>
|
989
|
+
</xsl:when>
|
990
|
+
<xsl:otherwise>
|
991
|
+
<xsl:copy-of select="."/>
|
992
|
+
</xsl:otherwise>
|
993
|
+
</xsl:choose> -->
|
949
994
|
</xsl:for-each>
|
950
995
|
</xsl:template><xsl:attribute-set name="copyright-statement-style">
|
951
996
|
|
@@ -1016,13 +1061,14 @@
|
|
1016
1061
|
|
1017
1062
|
|
1018
1063
|
|
1064
|
+
|
1019
1065
|
|
1020
1066
|
|
1021
1067
|
|
1022
1068
|
|
1023
1069
|
|
1024
1070
|
|
1025
|
-
<xsl:attribute name="font-family">Courier New
|
1071
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
1026
1072
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
1027
1073
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1028
1074
|
|
@@ -1060,6 +1106,7 @@
|
|
1060
1106
|
|
1061
1107
|
|
1062
1108
|
|
1109
|
+
|
1063
1110
|
|
1064
1111
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
1065
1112
|
|
@@ -1075,6 +1122,7 @@
|
|
1075
1122
|
|
1076
1123
|
|
1077
1124
|
|
1125
|
+
|
1078
1126
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
1079
1127
|
|
1080
1128
|
|
@@ -1094,6 +1142,7 @@
|
|
1094
1142
|
|
1095
1143
|
|
1096
1144
|
|
1145
|
+
|
1097
1146
|
|
1098
1147
|
|
1099
1148
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -1134,6 +1183,7 @@
|
|
1134
1183
|
|
1135
1184
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
1136
1185
|
|
1186
|
+
|
1137
1187
|
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
|
1138
1188
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1139
1189
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -1156,6 +1206,7 @@
|
|
1156
1206
|
|
1157
1207
|
|
1158
1208
|
|
1209
|
+
|
1159
1210
|
<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
|
1160
1211
|
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
1161
1212
|
|
@@ -1185,6 +1236,7 @@
|
|
1185
1236
|
|
1186
1237
|
|
1187
1238
|
|
1239
|
+
|
1188
1240
|
<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
|
1189
1241
|
|
1190
1242
|
|
@@ -1194,6 +1246,7 @@
|
|
1194
1246
|
|
1195
1247
|
|
1196
1248
|
|
1249
|
+
|
1197
1250
|
|
1198
1251
|
|
1199
1252
|
|
@@ -1280,6 +1333,7 @@
|
|
1280
1333
|
|
1281
1334
|
|
1282
1335
|
|
1336
|
+
|
1283
1337
|
<xsl:attribute name="display-align">before</xsl:attribute>
|
1284
1338
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
1285
1339
|
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
@@ -1301,7 +1355,7 @@
|
|
1301
1355
|
|
1302
1356
|
|
1303
1357
|
|
1304
|
-
|
1358
|
+
|
1305
1359
|
|
1306
1360
|
|
1307
1361
|
|
@@ -1316,6 +1370,7 @@
|
|
1316
1370
|
|
1317
1371
|
|
1318
1372
|
|
1373
|
+
|
1319
1374
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
|
1320
1375
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1321
1376
|
|
@@ -1324,6 +1379,8 @@
|
|
1324
1379
|
|
1325
1380
|
|
1326
1381
|
|
1382
|
+
|
1383
|
+
|
1327
1384
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
|
1328
1385
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
1329
1386
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -1339,6 +1396,7 @@
|
|
1339
1396
|
|
1340
1397
|
|
1341
1398
|
|
1399
|
+
|
1342
1400
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1343
1401
|
|
1344
1402
|
</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
|
@@ -1375,6 +1433,7 @@
|
|
1375
1433
|
|
1376
1434
|
|
1377
1435
|
|
1436
|
+
|
1378
1437
|
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
|
1379
1438
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1380
1439
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
@@ -1383,6 +1442,7 @@
|
|
1383
1442
|
|
1384
1443
|
|
1385
1444
|
|
1445
|
+
|
1386
1446
|
|
1387
1447
|
|
1388
1448
|
|
@@ -1425,6 +1485,7 @@
|
|
1425
1485
|
|
1426
1486
|
|
1427
1487
|
|
1488
|
+
|
1428
1489
|
|
1429
1490
|
|
1430
1491
|
|
@@ -1492,6 +1553,8 @@
|
|
1492
1553
|
|
1493
1554
|
|
1494
1555
|
|
1556
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
|
1557
|
+
|
1495
1558
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1496
1559
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
1497
1560
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
@@ -1532,6 +1595,7 @@
|
|
1532
1595
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
1533
1596
|
|
1534
1597
|
|
1598
|
+
|
1535
1599
|
|
1536
1600
|
|
1537
1601
|
|
@@ -1576,6 +1640,7 @@
|
|
1576
1640
|
|
1577
1641
|
|
1578
1642
|
|
1643
|
+
|
1579
1644
|
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
|
1580
1645
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
1581
1646
|
|
@@ -1598,17 +1663,16 @@
|
|
1598
1663
|
</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
|
1599
1664
|
|
1600
1665
|
</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
|
1666
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
1667
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1668
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1601
1669
|
|
1602
1670
|
|
1603
1671
|
|
1604
|
-
<xsl:attribute name="width">100%</xsl:attribute>
|
1605
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1606
1672
|
<xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
|
1607
|
-
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1608
1673
|
|
1609
1674
|
|
1610
|
-
|
1611
|
-
|
1675
|
+
|
1612
1676
|
</xsl:attribute-set><xsl:attribute-set name="tt-style">
|
1613
1677
|
|
1614
1678
|
|
@@ -1686,6 +1750,7 @@
|
|
1686
1750
|
|
1687
1751
|
|
1688
1752
|
|
1753
|
+
|
1689
1754
|
<xsl:attribute name="provisional-distance-between-starts">4mm</xsl:attribute>
|
1690
1755
|
<xsl:attribute name="margin-left">-8mm</xsl:attribute>
|
1691
1756
|
|
@@ -1751,6 +1816,7 @@
|
|
1751
1816
|
|
1752
1817
|
|
1753
1818
|
|
1819
|
+
|
1754
1820
|
<xsl:attribute name="font-size">60%</xsl:attribute>
|
1755
1821
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1756
1822
|
|
@@ -1777,6 +1843,7 @@
|
|
1777
1843
|
|
1778
1844
|
|
1779
1845
|
|
1846
|
+
|
1780
1847
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
1781
1848
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
1782
1849
|
<xsl:attribute name="line-height">125%</xsl:attribute>
|
@@ -1801,6 +1868,7 @@
|
|
1801
1868
|
|
1802
1869
|
|
1803
1870
|
|
1871
|
+
|
1804
1872
|
<xsl:attribute name="font-size">60%</xsl:attribute>
|
1805
1873
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1806
1874
|
<xsl:attribute name="padding-right">8mm</xsl:attribute>
|
@@ -1820,6 +1888,7 @@
|
|
1820
1888
|
|
1821
1889
|
|
1822
1890
|
|
1891
|
+
|
1823
1892
|
<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
|
1824
1893
|
<xsl:attribute name="margin-left">-3mm</xsl:attribute>
|
1825
1894
|
<xsl:attribute name="margin-right">-3mm</xsl:attribute>
|
@@ -1828,6 +1897,9 @@
|
|
1828
1897
|
|
1829
1898
|
|
1830
1899
|
</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
|
1900
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1901
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
1902
|
+
|
1831
1903
|
|
1832
1904
|
|
1833
1905
|
|
@@ -1872,6 +1944,7 @@
|
|
1872
1944
|
|
1873
1945
|
|
1874
1946
|
|
1947
|
+
|
1875
1948
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
1876
1949
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1877
1950
|
<xsl:attribute name="line-height">122%</xsl:attribute>
|
@@ -1914,6 +1987,7 @@
|
|
1914
1987
|
|
1915
1988
|
|
1916
1989
|
|
1990
|
+
|
1917
1991
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
|
1918
1992
|
|
1919
1993
|
|
@@ -1933,6 +2007,7 @@
|
|
1933
2007
|
|
1934
2008
|
|
1935
2009
|
|
2010
|
+
|
1936
2011
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
1937
2012
|
|
1938
2013
|
|
@@ -1959,6 +2034,7 @@
|
|
1959
2034
|
|
1960
2035
|
|
1961
2036
|
|
2037
|
+
|
1962
2038
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1963
2039
|
|
1964
2040
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
|
@@ -1979,6 +2055,7 @@
|
|
1979
2055
|
|
1980
2056
|
|
1981
2057
|
|
2058
|
+
|
1982
2059
|
<xsl:attribute name="font-size">60%</xsl:attribute>
|
1983
2060
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1984
2061
|
|
@@ -1997,6 +2074,7 @@
|
|
1997
2074
|
|
1998
2075
|
|
1999
2076
|
|
2077
|
+
|
2000
2078
|
</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
|
2001
2079
|
|
2002
2080
|
|
@@ -2428,6 +2506,8 @@
|
|
2428
2506
|
|
2429
2507
|
|
2430
2508
|
|
2509
|
+
|
2510
|
+
|
2431
2511
|
|
2432
2512
|
|
2433
2513
|
|
@@ -2472,6 +2552,8 @@
|
|
2472
2552
|
|
2473
2553
|
|
2474
2554
|
|
2555
|
+
|
2556
|
+
|
2475
2557
|
</xsl:element>
|
2476
2558
|
</xsl:variable>
|
2477
2559
|
|
@@ -2614,23 +2696,29 @@
|
|
2614
2696
|
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
|
2615
2697
|
<xsl:param name="continued"/>
|
2616
2698
|
<xsl:if test="normalize-space() != ''">
|
2617
|
-
|
2618
|
-
|
2619
|
-
|
2620
|
-
|
2621
|
-
|
2699
|
+
|
2700
|
+
|
2622
2701
|
|
2623
|
-
|
2624
|
-
|
2702
|
+
<fo:block xsl:use-attribute-sets="table-name-style">
|
2703
|
+
|
2625
2704
|
|
2626
|
-
|
2627
|
-
|
2628
|
-
|
2629
|
-
|
2630
|
-
|
2631
|
-
|
2705
|
+
|
2706
|
+
|
2707
|
+
|
2708
|
+
<xsl:choose>
|
2709
|
+
<xsl:when test="$continued = 'true'">
|
2710
|
+
|
2711
|
+
</xsl:when>
|
2712
|
+
<xsl:otherwise>
|
2713
|
+
<xsl:apply-templates/>
|
2714
|
+
</xsl:otherwise>
|
2715
|
+
</xsl:choose>
|
2716
|
+
|
2717
|
+
|
2718
|
+
</fo:block>
|
2719
|
+
|
2632
2720
|
|
2633
|
-
|
2721
|
+
|
2634
2722
|
</xsl:if>
|
2635
2723
|
</xsl:template><xsl:template name="calculate-columns-numbers">
|
2636
2724
|
<xsl:param name="table-row"/>
|
@@ -3028,12 +3116,18 @@
|
|
3028
3116
|
<fo:table-row>
|
3029
3117
|
<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
|
3030
3118
|
|
3031
|
-
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
3032
|
-
<xsl:with-param name="continued">true</xsl:with-param>
|
3033
|
-
</xsl:apply-templates>
|
3034
3119
|
|
3035
3120
|
|
3036
3121
|
|
3122
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
3123
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
3124
|
+
</xsl:apply-templates>
|
3125
|
+
|
3126
|
+
|
3127
|
+
|
3128
|
+
|
3129
|
+
|
3130
|
+
|
3037
3131
|
</fo:table-cell>
|
3038
3132
|
</fo:table-row>
|
3039
3133
|
</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
@@ -3134,7 +3228,10 @@
|
|
3134
3228
|
|
3135
3229
|
|
3136
3230
|
<!-- fn processing -->
|
3137
|
-
|
3231
|
+
|
3232
|
+
<xsl:call-template name="table_fn_display"/>
|
3233
|
+
|
3234
|
+
|
3138
3235
|
|
3139
3236
|
<!-- for PAS display Notes after footnotes -->
|
3140
3237
|
|
@@ -3144,6 +3241,9 @@
|
|
3144
3241
|
</fo:table-body>
|
3145
3242
|
|
3146
3243
|
</fo:table>
|
3244
|
+
|
3245
|
+
|
3246
|
+
|
3147
3247
|
</xsl:if>
|
3148
3248
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
3149
3249
|
|
@@ -3232,6 +3332,9 @@
|
|
3232
3332
|
|
3233
3333
|
|
3234
3334
|
|
3335
|
+
|
3336
|
+
|
3337
|
+
|
3235
3338
|
|
3236
3339
|
|
3237
3340
|
<xsl:call-template name="setTableRowAttributes"/>
|
@@ -3251,6 +3354,8 @@
|
|
3251
3354
|
|
3252
3355
|
|
3253
3356
|
|
3357
|
+
|
3358
|
+
|
3254
3359
|
<xsl:call-template name="setTableRowAttributes"/>
|
3255
3360
|
<xsl:apply-templates/>
|
3256
3361
|
</fo:table-row>
|
@@ -3336,6 +3441,8 @@
|
|
3336
3441
|
|
3337
3442
|
|
3338
3443
|
|
3444
|
+
|
3445
|
+
|
3339
3446
|
|
3340
3447
|
|
3341
3448
|
|
@@ -3411,7 +3518,11 @@
|
|
3411
3518
|
|
3412
3519
|
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
3413
3520
|
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
3414
|
-
<xsl:variable name="
|
3521
|
+
<xsl:variable name="reference_">
|
3522
|
+
<xsl:value-of select="@reference"/>
|
3523
|
+
<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
|
3524
|
+
</xsl:variable>
|
3525
|
+
<xsl:variable name="reference" select="normalize-space($reference_)"/>
|
3415
3526
|
<!-- fn sequence number in document -->
|
3416
3527
|
<xsl:variable name="current_fn_number">
|
3417
3528
|
<xsl:choose>
|
@@ -3486,7 +3597,7 @@
|
|
3486
3597
|
<xsl:copy-of select="node()"/>
|
3487
3598
|
</fn>
|
3488
3599
|
</xsl:for-each>
|
3489
|
-
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
|
3600
|
+
<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
|
3490
3601
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3491
3602
|
<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
3492
3603
|
<!-- copy unique fn -->
|
@@ -5127,6 +5238,11 @@
|
|
5127
5238
|
</xsl:variable>
|
5128
5239
|
<fo:inline xsl:use-attribute-sets="link-style">
|
5129
5240
|
|
5241
|
+
<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
|
5242
|
+
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
5243
|
+
</xsl:if>
|
5244
|
+
|
5245
|
+
|
5130
5246
|
|
5131
5247
|
|
5132
5248
|
|
@@ -5405,7 +5521,19 @@
|
|
5405
5521
|
<xsl:value-of select="$suffix"/>
|
5406
5522
|
</xsl:if>
|
5407
5523
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
5408
|
-
<
|
5524
|
+
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
5525
|
+
<xsl:choose>
|
5526
|
+
<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
|
5527
|
+
<fo:inline xsl:use-attribute-sets="termnote-p-style">
|
5528
|
+
<xsl:apply-templates/>
|
5529
|
+
</fo:inline>
|
5530
|
+
</xsl:when>
|
5531
|
+
<xsl:otherwise>
|
5532
|
+
<fo:block xsl:use-attribute-sets="termnote-p-style">
|
5533
|
+
<xsl:apply-templates/>
|
5534
|
+
</fo:block>
|
5535
|
+
</xsl:otherwise>
|
5536
|
+
</xsl:choose>
|
5409
5537
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5410
5538
|
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
5411
5539
|
<fo:block id="{@id}">
|
@@ -6222,7 +6350,7 @@
|
|
6222
6350
|
</xsl:choose>
|
6223
6351
|
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
|
6224
6352
|
<xsl:value-of select="."/>
|
6225
|
-
</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6353
|
+
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6226
6354
|
<xsl:text> </xsl:text>
|
6227
6355
|
</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
|
6228
6356
|
<xsl:copy>
|
@@ -7075,6 +7203,7 @@
|
|
7075
7203
|
|
7076
7204
|
|
7077
7205
|
|
7206
|
+
|
7078
7207
|
<xsl:choose>
|
7079
7208
|
<xsl:when test="ancestor::un:sections and $depth = 1">12</xsl:when>
|
7080
7209
|
<xsl:when test="ancestor::un:sections">8</xsl:when>
|
@@ -8011,12 +8140,16 @@
|
|
8011
8140
|
<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
|
8012
8141
|
|
8013
8142
|
|
8143
|
+
|
8144
|
+
|
8014
8145
|
|
8015
8146
|
|
8016
8147
|
|
8017
8148
|
<fo:block-container xsl:use-attribute-sets="admonition-container-style">
|
8018
8149
|
|
8019
8150
|
|
8151
|
+
|
8152
|
+
|
8020
8153
|
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8021
8154
|
<fo:block>
|
8022
8155
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
@@ -8224,6 +8357,8 @@
|
|
8224
8357
|
</xsl:when>
|
8225
8358
|
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
8226
8359
|
</xsl:choose>
|
8360
|
+
</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
|
8361
|
+
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
8227
8362
|
</xsl:template><xsl:template name="printEdition">
|
8228
8363
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
8229
8364
|
<xsl:text> </xsl:text>
|
@@ -8330,6 +8465,27 @@
|
|
8330
8465
|
</xsl:when>
|
8331
8466
|
<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
|
8332
8467
|
</xsl:choose>
|
8468
|
+
</xsl:template><xsl:template name="getMonthLocalizedByNum">
|
8469
|
+
<xsl:param name="num"/>
|
8470
|
+
<xsl:variable name="monthStr">
|
8471
|
+
<xsl:choose>
|
8472
|
+
<xsl:when test="$num = '01'">january</xsl:when>
|
8473
|
+
<xsl:when test="$num = '02'">february</xsl:when>
|
8474
|
+
<xsl:when test="$num = '03'">march</xsl:when>
|
8475
|
+
<xsl:when test="$num = '04'">april</xsl:when>
|
8476
|
+
<xsl:when test="$num = '05'">may</xsl:when>
|
8477
|
+
<xsl:when test="$num = '06'">june</xsl:when>
|
8478
|
+
<xsl:when test="$num = '07'">july</xsl:when>
|
8479
|
+
<xsl:when test="$num = '08'">august</xsl:when>
|
8480
|
+
<xsl:when test="$num = '09'">september</xsl:when>
|
8481
|
+
<xsl:when test="$num = '10'">october</xsl:when>
|
8482
|
+
<xsl:when test="$num = '11'">november</xsl:when>
|
8483
|
+
<xsl:when test="$num = '12'">december</xsl:when>
|
8484
|
+
</xsl:choose>
|
8485
|
+
</xsl:variable>
|
8486
|
+
<xsl:call-template name="getLocalizedString">
|
8487
|
+
<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
|
8488
|
+
</xsl:call-template>
|
8333
8489
|
</xsl:template><xsl:template name="insertKeywords">
|
8334
8490
|
<xsl:param name="sorting" select="'true'"/>
|
8335
8491
|
<xsl:param name="charAtEnd" select="'.'"/>
|
@@ -8523,6 +8679,7 @@
|
|
8523
8679
|
|
8524
8680
|
|
8525
8681
|
|
8682
|
+
|
8526
8683
|
<xsl:value-of select="document('')//*/namespace::un"/>
|
8527
8684
|
|
8528
8685
|
|