metanorma-un 0.9.2 → 0.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/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
@@ -974,7 +974,7 @@
|
|
974
974
|
<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
|
975
975
|
</xsl:otherwise>
|
976
976
|
</xsl:choose>
|
977
|
-
</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">
|
977
|
+
</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">
|
978
978
|
|
979
979
|
|
980
980
|
|
@@ -991,7 +991,9 @@
|
|
991
991
|
|
992
992
|
|
993
993
|
|
994
|
-
|
994
|
+
|
995
|
+
<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
|
996
|
+
<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
|
995
997
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
996
998
|
|
997
999
|
</xsl:attribute-set><xsl:template name="insertRootStyle">
|
@@ -1005,17 +1007,60 @@
|
|
1005
1007
|
</xsl:variable>
|
1006
1008
|
<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
|
1007
1009
|
|
1010
|
+
<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
|
1011
|
+
|
1008
1012
|
<xsl:for-each select="$root-style_/root-style/@*">
|
1013
|
+
|
1009
1014
|
<xsl:choose>
|
1010
|
-
<xsl:when test="local-name() = 'font-family'
|
1015
|
+
<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
|
1016
|
+
<xsl:when test="local-name() = 'font-family'">
|
1017
|
+
|
1018
|
+
<xsl:variable name="font_regional_prefix">
|
1019
|
+
<xsl:choose>
|
1020
|
+
<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
|
1021
|
+
<xsl:otherwise>Noto Serif</xsl:otherwise>
|
1022
|
+
</xsl:choose>
|
1023
|
+
</xsl:variable>
|
1024
|
+
|
1011
1025
|
<xsl:attribute name="{local-name()}">
|
1012
|
-
|
1026
|
+
|
1027
|
+
<xsl:variable name="font_extended">
|
1028
|
+
<xsl:choose>
|
1029
|
+
<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
1030
|
+
<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
|
1031
|
+
<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
|
1032
|
+
<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
|
1033
|
+
<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
1034
|
+
<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
|
1035
|
+
</xsl:choose>
|
1036
|
+
</xsl:variable>
|
1037
|
+
<xsl:if test="normalize-space($font_extended) != ''">
|
1038
|
+
<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
|
1039
|
+
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
1040
|
+
</xsl:if>
|
1041
|
+
|
1042
|
+
<xsl:value-of select="."/>
|
1043
|
+
|
1044
|
+
<xsl:if test="$additional_fonts != ''">
|
1045
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
1046
|
+
</xsl:if>
|
1013
1047
|
</xsl:attribute>
|
1014
1048
|
</xsl:when>
|
1015
1049
|
<xsl:otherwise>
|
1016
1050
|
<xsl:copy-of select="."/>
|
1017
1051
|
</xsl:otherwise>
|
1018
1052
|
</xsl:choose>
|
1053
|
+
|
1054
|
+
<!-- <xsl:choose>
|
1055
|
+
<xsl:when test="local-name() = 'font-family'">
|
1056
|
+
<xsl:attribute name="{local-name()}">
|
1057
|
+
<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
|
1058
|
+
</xsl:attribute>
|
1059
|
+
</xsl:when>
|
1060
|
+
<xsl:otherwise>
|
1061
|
+
<xsl:copy-of select="."/>
|
1062
|
+
</xsl:otherwise>
|
1063
|
+
</xsl:choose> -->
|
1019
1064
|
</xsl:for-each>
|
1020
1065
|
</xsl:template><xsl:attribute-set name="copyright-statement-style">
|
1021
1066
|
|
@@ -1086,13 +1131,14 @@
|
|
1086
1131
|
|
1087
1132
|
|
1088
1133
|
|
1134
|
+
|
1089
1135
|
|
1090
1136
|
|
1091
1137
|
|
1092
1138
|
|
1093
1139
|
|
1094
1140
|
|
1095
|
-
<xsl:attribute name="font-family">Courier New
|
1141
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
1096
1142
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
1097
1143
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1098
1144
|
|
@@ -1130,6 +1176,7 @@
|
|
1130
1176
|
|
1131
1177
|
|
1132
1178
|
|
1179
|
+
|
1133
1180
|
|
1134
1181
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
1135
1182
|
|
@@ -1145,6 +1192,7 @@
|
|
1145
1192
|
|
1146
1193
|
|
1147
1194
|
|
1195
|
+
|
1148
1196
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
1149
1197
|
|
1150
1198
|
|
@@ -1164,6 +1212,7 @@
|
|
1164
1212
|
|
1165
1213
|
|
1166
1214
|
|
1215
|
+
|
1167
1216
|
|
1168
1217
|
|
1169
1218
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
@@ -1204,6 +1253,7 @@
|
|
1204
1253
|
|
1205
1254
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
1206
1255
|
|
1256
|
+
|
1207
1257
|
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
|
1208
1258
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1209
1259
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -1225,6 +1275,7 @@
|
|
1225
1275
|
|
1226
1276
|
|
1227
1277
|
|
1278
|
+
|
1228
1279
|
|
1229
1280
|
|
1230
1281
|
|
@@ -1254,6 +1305,7 @@
|
|
1254
1305
|
|
1255
1306
|
|
1256
1307
|
|
1308
|
+
|
1257
1309
|
|
1258
1310
|
|
1259
1311
|
|
@@ -1263,6 +1315,7 @@
|
|
1263
1315
|
|
1264
1316
|
|
1265
1317
|
|
1318
|
+
|
1266
1319
|
|
1267
1320
|
|
1268
1321
|
|
@@ -1342,6 +1395,7 @@
|
|
1342
1395
|
|
1343
1396
|
|
1344
1397
|
|
1398
|
+
|
1345
1399
|
<xsl:attribute name="text-indent">0mm</xsl:attribute>
|
1346
1400
|
|
1347
1401
|
|
@@ -1357,7 +1411,7 @@
|
|
1357
1411
|
|
1358
1412
|
|
1359
1413
|
|
1360
|
-
|
1414
|
+
|
1361
1415
|
|
1362
1416
|
|
1363
1417
|
|
@@ -1372,6 +1426,7 @@
|
|
1372
1426
|
|
1373
1427
|
|
1374
1428
|
|
1429
|
+
|
1375
1430
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
|
1376
1431
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1377
1432
|
|
@@ -1380,6 +1435,8 @@
|
|
1380
1435
|
|
1381
1436
|
|
1382
1437
|
|
1438
|
+
|
1439
|
+
|
1383
1440
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
|
1384
1441
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
1385
1442
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -1395,6 +1452,7 @@
|
|
1395
1452
|
|
1396
1453
|
|
1397
1454
|
|
1455
|
+
|
1398
1456
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1399
1457
|
|
1400
1458
|
</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
|
@@ -1429,6 +1487,7 @@
|
|
1429
1487
|
|
1430
1488
|
|
1431
1489
|
|
1490
|
+
|
1432
1491
|
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
|
1433
1492
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1434
1493
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
@@ -1437,6 +1496,7 @@
|
|
1437
1496
|
|
1438
1497
|
|
1439
1498
|
|
1499
|
+
|
1440
1500
|
|
1441
1501
|
|
1442
1502
|
|
@@ -1477,6 +1537,7 @@
|
|
1477
1537
|
|
1478
1538
|
|
1479
1539
|
|
1540
|
+
|
1480
1541
|
|
1481
1542
|
|
1482
1543
|
|
@@ -1547,6 +1608,8 @@
|
|
1547
1608
|
|
1548
1609
|
|
1549
1610
|
|
1611
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
|
1612
|
+
|
1550
1613
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1551
1614
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
1552
1615
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
@@ -1587,6 +1650,7 @@
|
|
1587
1650
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
1588
1651
|
|
1589
1652
|
|
1653
|
+
|
1590
1654
|
|
1591
1655
|
|
1592
1656
|
|
@@ -1633,6 +1697,7 @@
|
|
1633
1697
|
|
1634
1698
|
|
1635
1699
|
|
1700
|
+
|
1636
1701
|
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
|
1637
1702
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
1638
1703
|
|
@@ -1654,16 +1719,16 @@
|
|
1654
1719
|
</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
|
1655
1720
|
|
1656
1721
|
</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
|
1722
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
1723
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1724
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1657
1725
|
|
1658
1726
|
|
1659
|
-
<xsl:attribute name="width">100%</xsl:attribute>
|
1660
1727
|
<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
|
1661
|
-
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1662
1728
|
|
1663
1729
|
|
1664
1730
|
|
1665
|
-
|
1666
|
-
|
1731
|
+
|
1667
1732
|
</xsl:attribute-set><xsl:attribute-set name="tt-style">
|
1668
1733
|
|
1669
1734
|
|
@@ -1742,6 +1807,7 @@
|
|
1742
1807
|
|
1743
1808
|
|
1744
1809
|
|
1810
|
+
|
1745
1811
|
<xsl:attribute name="provisional-distance-between-starts">3mm</xsl:attribute>
|
1746
1812
|
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
1747
1813
|
<xsl:attribute name="text-indent">0mm</xsl:attribute>
|
@@ -1808,6 +1874,7 @@
|
|
1808
1874
|
|
1809
1875
|
|
1810
1876
|
|
1877
|
+
|
1811
1878
|
<xsl:attribute name="font-size">55%</xsl:attribute>
|
1812
1879
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1813
1880
|
|
@@ -1834,6 +1901,7 @@
|
|
1834
1901
|
|
1835
1902
|
|
1836
1903
|
|
1904
|
+
|
1837
1905
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
1838
1906
|
<xsl:attribute name="line-height">125%</xsl:attribute>
|
1839
1907
|
|
@@ -1856,6 +1924,7 @@
|
|
1856
1924
|
|
1857
1925
|
|
1858
1926
|
|
1927
|
+
|
1859
1928
|
<xsl:attribute name="font-size">60%</xsl:attribute>
|
1860
1929
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
1861
1930
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
@@ -1875,6 +1944,7 @@
|
|
1875
1944
|
|
1876
1945
|
|
1877
1946
|
|
1947
|
+
|
1878
1948
|
<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
|
1879
1949
|
<xsl:attribute name="margin-top">7mm</xsl:attribute>
|
1880
1950
|
<xsl:attribute name="margin-left">-9mm</xsl:attribute>
|
@@ -1883,6 +1953,9 @@
|
|
1883
1953
|
<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
|
1884
1954
|
|
1885
1955
|
</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
|
1956
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1957
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
1958
|
+
|
1886
1959
|
|
1887
1960
|
|
1888
1961
|
|
@@ -1932,6 +2005,7 @@
|
|
1932
2005
|
|
1933
2006
|
|
1934
2007
|
|
2008
|
+
|
1935
2009
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
1936
2010
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1937
2011
|
|
@@ -1972,6 +2046,7 @@
|
|
1972
2046
|
|
1973
2047
|
|
1974
2048
|
|
2049
|
+
|
1975
2050
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
|
1976
2051
|
|
1977
2052
|
|
@@ -1991,6 +2066,7 @@
|
|
1991
2066
|
|
1992
2067
|
|
1993
2068
|
|
2069
|
+
|
1994
2070
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
1995
2071
|
|
1996
2072
|
|
@@ -2017,6 +2093,7 @@
|
|
2017
2093
|
|
2018
2094
|
|
2019
2095
|
|
2096
|
+
|
2020
2097
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
2021
2098
|
|
2022
2099
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
|
@@ -2037,6 +2114,7 @@
|
|
2037
2114
|
|
2038
2115
|
|
2039
2116
|
|
2117
|
+
|
2040
2118
|
<xsl:attribute name="font-size">60%</xsl:attribute>
|
2041
2119
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
2042
2120
|
|
@@ -2055,6 +2133,7 @@
|
|
2055
2133
|
|
2056
2134
|
|
2057
2135
|
|
2136
|
+
|
2058
2137
|
</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
|
2059
2138
|
|
2060
2139
|
|
@@ -2486,6 +2565,8 @@
|
|
2486
2565
|
|
2487
2566
|
|
2488
2567
|
|
2568
|
+
|
2569
|
+
|
2489
2570
|
|
2490
2571
|
|
2491
2572
|
|
@@ -2534,6 +2615,8 @@
|
|
2534
2615
|
|
2535
2616
|
|
2536
2617
|
|
2618
|
+
|
2619
|
+
|
2537
2620
|
<xsl:if test="ancestor::*[local-name()='sections']">
|
2538
2621
|
<xsl:attribute name="border-top">1.5pt solid black</xsl:attribute>
|
2539
2622
|
<xsl:attribute name="border-bottom">1.5pt solid black</xsl:attribute>
|
@@ -2681,23 +2764,29 @@
|
|
2681
2764
|
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
|
2682
2765
|
<xsl:param name="continued"/>
|
2683
2766
|
<xsl:if test="normalize-space() != ''">
|
2684
|
-
|
2685
|
-
|
2686
|
-
|
2687
|
-
|
2688
|
-
|
2767
|
+
|
2768
|
+
|
2689
2769
|
|
2690
|
-
|
2691
|
-
|
2770
|
+
<fo:block xsl:use-attribute-sets="table-name-style">
|
2771
|
+
|
2692
2772
|
|
2693
|
-
|
2694
|
-
|
2695
|
-
|
2696
|
-
|
2697
|
-
|
2698
|
-
|
2773
|
+
|
2774
|
+
|
2775
|
+
|
2776
|
+
<xsl:choose>
|
2777
|
+
<xsl:when test="$continued = 'true'">
|
2778
|
+
|
2779
|
+
</xsl:when>
|
2780
|
+
<xsl:otherwise>
|
2781
|
+
<xsl:apply-templates/>
|
2782
|
+
</xsl:otherwise>
|
2783
|
+
</xsl:choose>
|
2784
|
+
|
2785
|
+
|
2786
|
+
</fo:block>
|
2787
|
+
|
2699
2788
|
|
2700
|
-
|
2789
|
+
|
2701
2790
|
</xsl:if>
|
2702
2791
|
</xsl:template><xsl:template name="calculate-columns-numbers">
|
2703
2792
|
<xsl:param name="table-row"/>
|
@@ -3095,12 +3184,18 @@
|
|
3095
3184
|
<fo:table-row>
|
3096
3185
|
<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">
|
3097
3186
|
|
3098
|
-
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
3099
|
-
<xsl:with-param name="continued">true</xsl:with-param>
|
3100
|
-
</xsl:apply-templates>
|
3101
3187
|
|
3102
3188
|
|
3103
3189
|
|
3190
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
3191
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
3192
|
+
</xsl:apply-templates>
|
3193
|
+
|
3194
|
+
|
3195
|
+
|
3196
|
+
|
3197
|
+
|
3198
|
+
|
3104
3199
|
</fo:table-cell>
|
3105
3200
|
</fo:table-row>
|
3106
3201
|
</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
@@ -3201,7 +3296,10 @@
|
|
3201
3296
|
|
3202
3297
|
|
3203
3298
|
<!-- fn processing -->
|
3204
|
-
|
3299
|
+
|
3300
|
+
<xsl:call-template name="table_fn_display"/>
|
3301
|
+
|
3302
|
+
|
3205
3303
|
|
3206
3304
|
<!-- for PAS display Notes after footnotes -->
|
3207
3305
|
|
@@ -3211,6 +3309,9 @@
|
|
3211
3309
|
</fo:table-body>
|
3212
3310
|
|
3213
3311
|
</fo:table>
|
3312
|
+
|
3313
|
+
|
3314
|
+
|
3214
3315
|
</xsl:if>
|
3215
3316
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
3216
3317
|
|
@@ -3299,6 +3400,9 @@
|
|
3299
3400
|
|
3300
3401
|
|
3301
3402
|
|
3403
|
+
|
3404
|
+
|
3405
|
+
|
3302
3406
|
|
3303
3407
|
|
3304
3408
|
<xsl:call-template name="setTableRowAttributes"/>
|
@@ -3318,6 +3422,8 @@
|
|
3318
3422
|
|
3319
3423
|
|
3320
3424
|
|
3425
|
+
|
3426
|
+
|
3321
3427
|
<xsl:call-template name="setTableRowAttributes"/>
|
3322
3428
|
<xsl:apply-templates/>
|
3323
3429
|
</fo:table-row>
|
@@ -3414,6 +3520,8 @@
|
|
3414
3520
|
|
3415
3521
|
|
3416
3522
|
|
3523
|
+
|
3524
|
+
|
3417
3525
|
|
3418
3526
|
|
3419
3527
|
|
@@ -3494,7 +3602,11 @@
|
|
3494
3602
|
|
3495
3603
|
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
3496
3604
|
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
3497
|
-
<xsl:variable name="
|
3605
|
+
<xsl:variable name="reference_">
|
3606
|
+
<xsl:value-of select="@reference"/>
|
3607
|
+
<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
|
3608
|
+
</xsl:variable>
|
3609
|
+
<xsl:variable name="reference" select="normalize-space($reference_)"/>
|
3498
3610
|
<!-- fn sequence number in document -->
|
3499
3611
|
<xsl:variable name="current_fn_number">
|
3500
3612
|
<xsl:choose>
|
@@ -3569,7 +3681,7 @@
|
|
3569
3681
|
<xsl:copy-of select="node()"/>
|
3570
3682
|
</fn>
|
3571
3683
|
</xsl:for-each>
|
3572
|
-
<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']/*">
|
3684
|
+
<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']/*">
|
3573
3685
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3574
3686
|
<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])]">
|
3575
3687
|
<!-- copy unique fn -->
|
@@ -5210,6 +5322,11 @@
|
|
5210
5322
|
</xsl:variable>
|
5211
5323
|
<fo:inline xsl:use-attribute-sets="link-style">
|
5212
5324
|
|
5325
|
+
<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
|
5326
|
+
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
5327
|
+
</xsl:if>
|
5328
|
+
|
5329
|
+
|
5213
5330
|
|
5214
5331
|
|
5215
5332
|
|
@@ -5492,7 +5609,19 @@
|
|
5492
5609
|
<xsl:value-of select="$suffix"/>
|
5493
5610
|
</xsl:if>
|
5494
5611
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
5495
|
-
<
|
5612
|
+
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
5613
|
+
<xsl:choose>
|
5614
|
+
<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
|
5615
|
+
<fo:inline xsl:use-attribute-sets="termnote-p-style">
|
5616
|
+
<xsl:apply-templates/>
|
5617
|
+
</fo:inline>
|
5618
|
+
</xsl:when>
|
5619
|
+
<xsl:otherwise>
|
5620
|
+
<fo:block xsl:use-attribute-sets="termnote-p-style">
|
5621
|
+
<xsl:apply-templates/>
|
5622
|
+
</fo:block>
|
5623
|
+
</xsl:otherwise>
|
5624
|
+
</xsl:choose>
|
5496
5625
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5497
5626
|
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
5498
5627
|
<fo:block id="{@id}">
|
@@ -6314,7 +6443,7 @@
|
|
6314
6443
|
</xsl:choose>
|
6315
6444
|
</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">
|
6316
6445
|
<xsl:value-of select="."/>
|
6317
|
-
</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6446
|
+
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6318
6447
|
<xsl:text> </xsl:text>
|
6319
6448
|
</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
|
6320
6449
|
<xsl:copy>
|
@@ -7166,6 +7295,7 @@
|
|
7166
7295
|
|
7167
7296
|
|
7168
7297
|
|
7298
|
+
|
7169
7299
|
<xsl:choose>
|
7170
7300
|
<xsl:when test="ancestor::un:annex and $depth >= 2">9.5</xsl:when>
|
7171
7301
|
<xsl:when test="ancestor::un:sections">9.5</xsl:when>
|
@@ -8101,6 +8231,8 @@
|
|
8101
8231
|
<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
|
8102
8232
|
|
8103
8233
|
|
8234
|
+
|
8235
|
+
|
8104
8236
|
<fo:block xsl:use-attribute-sets="admonition-name-style">
|
8105
8237
|
<xsl:call-template name="displayAdmonitionName"/>
|
8106
8238
|
</fo:block>
|
@@ -8111,6 +8243,8 @@
|
|
8111
8243
|
<fo:block-container xsl:use-attribute-sets="admonition-container-style">
|
8112
8244
|
|
8113
8245
|
|
8246
|
+
|
8247
|
+
|
8114
8248
|
<fo:block-container margin-left="0mm" margin-right="0mm">
|
8115
8249
|
<fo:block>
|
8116
8250
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
@@ -8318,6 +8452,8 @@
|
|
8318
8452
|
</xsl:when>
|
8319
8453
|
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
8320
8454
|
</xsl:choose>
|
8455
|
+
</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
|
8456
|
+
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
8321
8457
|
</xsl:template><xsl:template name="printEdition">
|
8322
8458
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
8323
8459
|
<xsl:text> </xsl:text>
|
@@ -8424,6 +8560,27 @@
|
|
8424
8560
|
</xsl:when>
|
8425
8561
|
<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
|
8426
8562
|
</xsl:choose>
|
8563
|
+
</xsl:template><xsl:template name="getMonthLocalizedByNum">
|
8564
|
+
<xsl:param name="num"/>
|
8565
|
+
<xsl:variable name="monthStr">
|
8566
|
+
<xsl:choose>
|
8567
|
+
<xsl:when test="$num = '01'">january</xsl:when>
|
8568
|
+
<xsl:when test="$num = '02'">february</xsl:when>
|
8569
|
+
<xsl:when test="$num = '03'">march</xsl:when>
|
8570
|
+
<xsl:when test="$num = '04'">april</xsl:when>
|
8571
|
+
<xsl:when test="$num = '05'">may</xsl:when>
|
8572
|
+
<xsl:when test="$num = '06'">june</xsl:when>
|
8573
|
+
<xsl:when test="$num = '07'">july</xsl:when>
|
8574
|
+
<xsl:when test="$num = '08'">august</xsl:when>
|
8575
|
+
<xsl:when test="$num = '09'">september</xsl:when>
|
8576
|
+
<xsl:when test="$num = '10'">october</xsl:when>
|
8577
|
+
<xsl:when test="$num = '11'">november</xsl:when>
|
8578
|
+
<xsl:when test="$num = '12'">december</xsl:when>
|
8579
|
+
</xsl:choose>
|
8580
|
+
</xsl:variable>
|
8581
|
+
<xsl:call-template name="getLocalizedString">
|
8582
|
+
<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
|
8583
|
+
</xsl:call-template>
|
8427
8584
|
</xsl:template><xsl:template name="insertKeywords">
|
8428
8585
|
<xsl:param name="sorting" select="'true'"/>
|
8429
8586
|
<xsl:param name="charAtEnd" select="'.'"/>
|
@@ -8617,6 +8774,7 @@
|
|
8617
8774
|
|
8618
8775
|
|
8619
8776
|
|
8777
|
+
|
8620
8778
|
<xsl:value-of select="document('')//*/namespace::un"/>
|
8621
8779
|
|
8622
8780
|
|