metanorma-m3aawg 2.1.2 → 2.1.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/m3aawg/m3aawg.policy.xsl +195 -36
- data/lib/isodoc/m3aawg/m3aawg.report.xsl +195 -36
- data/lib/isodoc/m3aawg/presentation_xml_convert.rb +4 -5
- data/lib/metanorma/m3aawg/biblio.rng +102 -5
- data/lib/metanorma/m3aawg/isodoc.rng +7 -0
- data/lib/metanorma/m3aawg/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: a140b7a0a950c9ad08b12cb6ad184e92d433e5cfbc3b65eb8fa818f5f7092246
|
4
|
+
data.tar.gz: 308e823f386b55c9f8cb1b1db95371f8b18bcf692ad73fd860644bdaf6bd974a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 19966d16987fa693f02983401c899ad43f67ce083e2dbb80ce68230523aa1732287dd2e7af4fa3b80c3e27cbb8172aeef92b64350bd1189643379a4db70db6cd
|
7
|
+
data.tar.gz: 8d4784625c82fd71cefcb48f983ccb183423dbbd7018167af9a5e668cb52ea99888b9eacf0ab4e7dac01e877e018a1890d0486efc60f143c41d5ee189de4c8fb
|
@@ -800,7 +800,7 @@
|
|
800
800
|
<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
|
801
801
|
</xsl:otherwise>
|
802
802
|
</xsl:choose>
|
803
|
-
</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">
|
803
|
+
</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">
|
804
804
|
|
805
805
|
|
806
806
|
|
@@ -811,7 +811,9 @@
|
|
811
811
|
|
812
812
|
|
813
813
|
|
814
|
-
|
814
|
+
|
815
|
+
<xsl:attribute name="font-family">EB Garamond 12, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
|
816
|
+
<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
|
815
817
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
816
818
|
|
817
819
|
|
@@ -831,17 +833,60 @@
|
|
831
833
|
</xsl:variable>
|
832
834
|
<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
|
833
835
|
|
836
|
+
<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
|
837
|
+
|
834
838
|
<xsl:for-each select="$root-style_/root-style/@*">
|
839
|
+
|
835
840
|
<xsl:choose>
|
836
|
-
<xsl:when test="local-name() = 'font-family'
|
841
|
+
<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
|
842
|
+
<xsl:when test="local-name() = 'font-family'">
|
843
|
+
|
844
|
+
<xsl:variable name="font_regional_prefix">
|
845
|
+
<xsl:choose>
|
846
|
+
<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
|
847
|
+
<xsl:otherwise>Noto Serif</xsl:otherwise>
|
848
|
+
</xsl:choose>
|
849
|
+
</xsl:variable>
|
850
|
+
|
837
851
|
<xsl:attribute name="{local-name()}">
|
838
|
-
|
852
|
+
|
853
|
+
<xsl:variable name="font_extended">
|
854
|
+
<xsl:choose>
|
855
|
+
<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
856
|
+
<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
|
857
|
+
<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
|
858
|
+
<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
|
859
|
+
<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
860
|
+
<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
|
861
|
+
</xsl:choose>
|
862
|
+
</xsl:variable>
|
863
|
+
<xsl:if test="normalize-space($font_extended) != ''">
|
864
|
+
<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
|
865
|
+
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
866
|
+
</xsl:if>
|
867
|
+
|
868
|
+
<xsl:value-of select="."/>
|
869
|
+
|
870
|
+
<xsl:if test="$additional_fonts != ''">
|
871
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
872
|
+
</xsl:if>
|
839
873
|
</xsl:attribute>
|
840
874
|
</xsl:when>
|
841
875
|
<xsl:otherwise>
|
842
876
|
<xsl:copy-of select="."/>
|
843
877
|
</xsl:otherwise>
|
844
878
|
</xsl:choose>
|
879
|
+
|
880
|
+
<!-- <xsl:choose>
|
881
|
+
<xsl:when test="local-name() = 'font-family'">
|
882
|
+
<xsl:attribute name="{local-name()}">
|
883
|
+
<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
|
884
|
+
</xsl:attribute>
|
885
|
+
</xsl:when>
|
886
|
+
<xsl:otherwise>
|
887
|
+
<xsl:copy-of select="."/>
|
888
|
+
</xsl:otherwise>
|
889
|
+
</xsl:choose> -->
|
845
890
|
</xsl:for-each>
|
846
891
|
</xsl:template><xsl:attribute-set name="copyright-statement-style">
|
847
892
|
|
@@ -916,7 +961,8 @@
|
|
916
961
|
|
917
962
|
|
918
963
|
|
919
|
-
|
964
|
+
|
965
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
920
966
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
921
967
|
|
922
968
|
|
@@ -956,6 +1002,7 @@
|
|
956
1002
|
|
957
1003
|
|
958
1004
|
|
1005
|
+
|
959
1006
|
|
960
1007
|
<xsl:attribute name="margin-top">14pt</xsl:attribute>
|
961
1008
|
<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
|
@@ -971,6 +1018,7 @@
|
|
971
1018
|
|
972
1019
|
|
973
1020
|
|
1021
|
+
|
974
1022
|
<xsl:attribute name="margin-top">8pt</xsl:attribute>
|
975
1023
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
976
1024
|
|
@@ -995,6 +1043,7 @@
|
|
995
1043
|
|
996
1044
|
|
997
1045
|
|
1046
|
+
|
998
1047
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
999
1048
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
1000
1049
|
|
@@ -1038,6 +1087,7 @@
|
|
1038
1087
|
|
1039
1088
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
1040
1089
|
|
1090
|
+
|
1041
1091
|
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
|
1042
1092
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1043
1093
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -1053,6 +1103,7 @@
|
|
1053
1103
|
|
1054
1104
|
|
1055
1105
|
|
1106
|
+
|
1056
1107
|
|
1057
1108
|
|
1058
1109
|
|
@@ -1081,6 +1132,7 @@
|
|
1081
1132
|
|
1082
1133
|
|
1083
1134
|
|
1135
|
+
|
1084
1136
|
|
1085
1137
|
|
1086
1138
|
|
@@ -1101,6 +1153,7 @@
|
|
1101
1153
|
|
1102
1154
|
|
1103
1155
|
|
1156
|
+
|
1104
1157
|
|
1105
1158
|
|
1106
1159
|
|
@@ -1171,6 +1224,7 @@
|
|
1171
1224
|
|
1172
1225
|
|
1173
1226
|
|
1227
|
+
|
1174
1228
|
</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
|
1175
1229
|
<xsl:attribute name="border">solid black 1pt</xsl:attribute>
|
1176
1230
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
@@ -1183,7 +1237,7 @@
|
|
1183
1237
|
|
1184
1238
|
|
1185
1239
|
|
1186
|
-
|
1240
|
+
|
1187
1241
|
|
1188
1242
|
|
1189
1243
|
|
@@ -1198,6 +1252,7 @@
|
|
1198
1252
|
|
1199
1253
|
|
1200
1254
|
|
1255
|
+
|
1201
1256
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
|
1202
1257
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1203
1258
|
|
@@ -1206,6 +1261,8 @@
|
|
1206
1261
|
|
1207
1262
|
|
1208
1263
|
|
1264
|
+
|
1265
|
+
|
1209
1266
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
|
1210
1267
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
1211
1268
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -1218,6 +1275,7 @@
|
|
1218
1275
|
|
1219
1276
|
|
1220
1277
|
|
1278
|
+
|
1221
1279
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1222
1280
|
|
1223
1281
|
|
@@ -1255,6 +1313,7 @@
|
|
1255
1313
|
|
1256
1314
|
|
1257
1315
|
|
1316
|
+
|
1258
1317
|
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
|
1259
1318
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1260
1319
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
@@ -1265,6 +1324,7 @@
|
|
1265
1324
|
|
1266
1325
|
|
1267
1326
|
|
1327
|
+
|
1268
1328
|
|
1269
1329
|
|
1270
1330
|
|
@@ -1312,6 +1372,7 @@
|
|
1312
1372
|
|
1313
1373
|
|
1314
1374
|
|
1375
|
+
|
1315
1376
|
|
1316
1377
|
|
1317
1378
|
|
@@ -1381,6 +1442,8 @@
|
|
1381
1442
|
|
1382
1443
|
|
1383
1444
|
|
1445
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
|
1446
|
+
|
1384
1447
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1385
1448
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
1386
1449
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
@@ -1423,6 +1486,7 @@
|
|
1423
1486
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
1424
1487
|
|
1425
1488
|
|
1489
|
+
|
1426
1490
|
|
1427
1491
|
|
1428
1492
|
|
@@ -1471,6 +1535,7 @@
|
|
1471
1535
|
|
1472
1536
|
|
1473
1537
|
|
1538
|
+
|
1474
1539
|
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
|
1475
1540
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
1476
1541
|
|
@@ -1491,21 +1556,20 @@
|
|
1491
1556
|
</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
|
1492
1557
|
|
1493
1558
|
</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
|
1559
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
1560
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1561
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1494
1562
|
|
1495
1563
|
|
1496
1564
|
|
1497
|
-
<xsl:attribute name="width">100%</xsl:attribute>
|
1498
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1499
1565
|
<xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
|
1500
|
-
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1501
1566
|
|
1502
1567
|
|
1503
|
-
|
1504
|
-
|
1568
|
+
|
1505
1569
|
</xsl:attribute-set><xsl:attribute-set name="tt-style">
|
1506
1570
|
|
1507
1571
|
|
1508
|
-
<xsl:attribute name="font-family">Courier New
|
1572
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
1509
1573
|
|
1510
1574
|
|
1511
1575
|
</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
|
@@ -1576,6 +1640,7 @@
|
|
1576
1640
|
|
1577
1641
|
|
1578
1642
|
|
1643
|
+
|
1579
1644
|
<xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
|
1580
1645
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1581
1646
|
|
@@ -1643,6 +1708,7 @@
|
|
1643
1708
|
|
1644
1709
|
|
1645
1710
|
|
1711
|
+
|
1646
1712
|
<xsl:attribute name="font-size">7pt</xsl:attribute>
|
1647
1713
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1648
1714
|
|
@@ -1667,6 +1733,7 @@
|
|
1667
1733
|
|
1668
1734
|
|
1669
1735
|
|
1736
|
+
|
1670
1737
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
1671
1738
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1672
1739
|
|
@@ -1690,6 +1757,7 @@
|
|
1690
1757
|
|
1691
1758
|
|
1692
1759
|
|
1760
|
+
|
1693
1761
|
<xsl:attribute name="font-size">6pt</xsl:attribute>
|
1694
1762
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
1695
1763
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
@@ -1716,7 +1784,11 @@
|
|
1716
1784
|
|
1717
1785
|
|
1718
1786
|
|
1787
|
+
|
1719
1788
|
</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
|
1789
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1790
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
1791
|
+
|
1720
1792
|
|
1721
1793
|
|
1722
1794
|
|
@@ -1752,6 +1824,7 @@
|
|
1752
1824
|
|
1753
1825
|
|
1754
1826
|
|
1827
|
+
|
1755
1828
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
1756
1829
|
|
1757
1830
|
|
@@ -1797,6 +1870,7 @@
|
|
1797
1870
|
|
1798
1871
|
|
1799
1872
|
|
1873
|
+
|
1800
1874
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
|
1801
1875
|
|
1802
1876
|
|
@@ -1816,6 +1890,7 @@
|
|
1816
1890
|
|
1817
1891
|
|
1818
1892
|
|
1893
|
+
|
1819
1894
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
1820
1895
|
|
1821
1896
|
|
@@ -1839,6 +1914,7 @@
|
|
1839
1914
|
|
1840
1915
|
|
1841
1916
|
|
1917
|
+
|
1842
1918
|
<xsl:attribute name="font-size">7pt</xsl:attribute>
|
1843
1919
|
<xsl:attribute name="baseline-shift">30%</xsl:attribute>
|
1844
1920
|
|
@@ -1860,6 +1936,7 @@
|
|
1860
1936
|
|
1861
1937
|
|
1862
1938
|
|
1939
|
+
|
1863
1940
|
<xsl:attribute name="font-size">6pt</xsl:attribute>
|
1864
1941
|
<xsl:attribute name="baseline-shift">30%</xsl:attribute>
|
1865
1942
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
@@ -1882,6 +1959,7 @@
|
|
1882
1959
|
|
1883
1960
|
|
1884
1961
|
|
1962
|
+
|
1885
1963
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
1886
1964
|
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
1887
1965
|
|
@@ -2324,6 +2402,8 @@
|
|
2324
2402
|
|
2325
2403
|
|
2326
2404
|
|
2405
|
+
|
2406
|
+
|
2327
2407
|
|
2328
2408
|
|
2329
2409
|
|
@@ -2363,6 +2443,8 @@
|
|
2363
2443
|
|
2364
2444
|
|
2365
2445
|
|
2446
|
+
|
2447
|
+
|
2366
2448
|
</xsl:element>
|
2367
2449
|
</xsl:variable>
|
2368
2450
|
|
@@ -2508,23 +2590,29 @@
|
|
2508
2590
|
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
|
2509
2591
|
<xsl:param name="continued"/>
|
2510
2592
|
<xsl:if test="normalize-space() != ''">
|
2511
|
-
|
2512
|
-
|
2513
|
-
|
2514
|
-
|
2515
|
-
|
2593
|
+
|
2594
|
+
|
2516
2595
|
|
2517
|
-
|
2518
|
-
|
2596
|
+
<fo:block xsl:use-attribute-sets="table-name-style">
|
2597
|
+
|
2519
2598
|
|
2520
|
-
|
2521
|
-
|
2522
|
-
|
2523
|
-
|
2524
|
-
|
2525
|
-
|
2599
|
+
|
2600
|
+
|
2601
|
+
|
2602
|
+
<xsl:choose>
|
2603
|
+
<xsl:when test="$continued = 'true'">
|
2604
|
+
|
2605
|
+
</xsl:when>
|
2606
|
+
<xsl:otherwise>
|
2607
|
+
<xsl:apply-templates/>
|
2608
|
+
</xsl:otherwise>
|
2609
|
+
</xsl:choose>
|
2610
|
+
|
2611
|
+
|
2612
|
+
</fo:block>
|
2613
|
+
|
2526
2614
|
|
2527
|
-
|
2615
|
+
|
2528
2616
|
</xsl:if>
|
2529
2617
|
</xsl:template><xsl:template name="calculate-columns-numbers">
|
2530
2618
|
<xsl:param name="table-row"/>
|
@@ -2922,12 +3010,18 @@
|
|
2922
3010
|
<fo:table-row>
|
2923
3011
|
<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">
|
2924
3012
|
|
2925
|
-
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
2926
|
-
<xsl:with-param name="continued">true</xsl:with-param>
|
2927
|
-
</xsl:apply-templates>
|
2928
3013
|
|
2929
3014
|
|
2930
3015
|
|
3016
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
3017
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
3018
|
+
</xsl:apply-templates>
|
3019
|
+
|
3020
|
+
|
3021
|
+
|
3022
|
+
|
3023
|
+
|
3024
|
+
|
2931
3025
|
</fo:table-cell>
|
2932
3026
|
</fo:table-row>
|
2933
3027
|
</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
@@ -3028,7 +3122,10 @@
|
|
3028
3122
|
|
3029
3123
|
|
3030
3124
|
<!-- fn processing -->
|
3031
|
-
|
3125
|
+
|
3126
|
+
<xsl:call-template name="table_fn_display"/>
|
3127
|
+
|
3128
|
+
|
3032
3129
|
|
3033
3130
|
<!-- for PAS display Notes after footnotes -->
|
3034
3131
|
|
@@ -3038,6 +3135,9 @@
|
|
3038
3135
|
</fo:table-body>
|
3039
3136
|
|
3040
3137
|
</fo:table>
|
3138
|
+
|
3139
|
+
|
3140
|
+
|
3041
3141
|
</xsl:if>
|
3042
3142
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
3043
3143
|
|
@@ -3126,6 +3226,9 @@
|
|
3126
3226
|
|
3127
3227
|
|
3128
3228
|
|
3229
|
+
|
3230
|
+
|
3231
|
+
|
3129
3232
|
|
3130
3233
|
|
3131
3234
|
<xsl:call-template name="setTableRowAttributes"/>
|
@@ -3145,6 +3248,8 @@
|
|
3145
3248
|
|
3146
3249
|
|
3147
3250
|
|
3251
|
+
|
3252
|
+
|
3148
3253
|
<xsl:call-template name="setTableRowAttributes"/>
|
3149
3254
|
<xsl:apply-templates/>
|
3150
3255
|
</fo:table-row>
|
@@ -3226,6 +3331,8 @@
|
|
3226
3331
|
|
3227
3332
|
|
3228
3333
|
|
3334
|
+
|
3335
|
+
|
3229
3336
|
|
3230
3337
|
|
3231
3338
|
|
@@ -3297,7 +3404,11 @@
|
|
3297
3404
|
|
3298
3405
|
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
3299
3406
|
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
3300
|
-
<xsl:variable name="
|
3407
|
+
<xsl:variable name="reference_">
|
3408
|
+
<xsl:value-of select="@reference"/>
|
3409
|
+
<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
|
3410
|
+
</xsl:variable>
|
3411
|
+
<xsl:variable name="reference" select="normalize-space($reference_)"/>
|
3301
3412
|
<!-- fn sequence number in document -->
|
3302
3413
|
<xsl:variable name="current_fn_number">
|
3303
3414
|
<xsl:choose>
|
@@ -3372,7 +3483,7 @@
|
|
3372
3483
|
<xsl:copy-of select="node()"/>
|
3373
3484
|
</fn>
|
3374
3485
|
</xsl:for-each>
|
3375
|
-
<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']/*">
|
3486
|
+
<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']/*">
|
3376
3487
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3377
3488
|
<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])]">
|
3378
3489
|
<!-- copy unique fn -->
|
@@ -5018,6 +5129,11 @@
|
|
5018
5129
|
</xsl:variable>
|
5019
5130
|
<fo:inline xsl:use-attribute-sets="link-style">
|
5020
5131
|
|
5132
|
+
<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
|
5133
|
+
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
5134
|
+
</xsl:if>
|
5135
|
+
|
5136
|
+
|
5021
5137
|
|
5022
5138
|
|
5023
5139
|
|
@@ -5280,7 +5396,19 @@
|
|
5280
5396
|
<xsl:value-of select="$suffix"/>
|
5281
5397
|
</xsl:if>
|
5282
5398
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
5283
|
-
<
|
5399
|
+
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
5400
|
+
<xsl:choose>
|
5401
|
+
<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
|
5402
|
+
<fo:inline xsl:use-attribute-sets="termnote-p-style">
|
5403
|
+
<xsl:apply-templates/>
|
5404
|
+
</fo:inline>
|
5405
|
+
</xsl:when>
|
5406
|
+
<xsl:otherwise>
|
5407
|
+
<fo:block xsl:use-attribute-sets="termnote-p-style">
|
5408
|
+
<xsl:apply-templates/>
|
5409
|
+
</fo:block>
|
5410
|
+
</xsl:otherwise>
|
5411
|
+
</xsl:choose>
|
5284
5412
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5285
5413
|
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
5286
5414
|
<fo:block id="{@id}">
|
@@ -6101,7 +6229,7 @@
|
|
6101
6229
|
</xsl:choose>
|
6102
6230
|
</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">
|
6103
6231
|
<xsl:value-of select="."/>
|
6104
|
-
</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6232
|
+
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6105
6233
|
<xsl:text> </xsl:text>
|
6106
6234
|
</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
|
6107
6235
|
<xsl:copy>
|
@@ -6942,6 +7070,7 @@
|
|
6942
7070
|
|
6943
7071
|
|
6944
7072
|
|
7073
|
+
|
6945
7074
|
|
6946
7075
|
<xsl:variable name="references_num_current">
|
6947
7076
|
<xsl:number level="any" count="m3d:references"/>
|
@@ -7578,7 +7707,7 @@
|
|
7578
7707
|
|
7579
7708
|
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7580
7709
|
|
7581
|
-
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7710
|
+
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7582
7711
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
7583
7712
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
7584
7713
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
@@ -7589,7 +7718,9 @@
|
|
7589
7718
|
|
7590
7719
|
<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
|
7591
7720
|
<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
|
7592
|
-
|
7721
|
+
|
7722
|
+
<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
|
7723
|
+
|
7593
7724
|
</xsl:if>
|
7594
7725
|
|
7595
7726
|
</fo:inline>
|
@@ -7931,12 +8062,16 @@
|
|
7931
8062
|
<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
|
7932
8063
|
|
7933
8064
|
|
8065
|
+
|
8066
|
+
|
7934
8067
|
|
7935
8068
|
|
7936
8069
|
|
7937
8070
|
<fo:block-container xsl:use-attribute-sets="admonition-container-style">
|
7938
8071
|
|
7939
8072
|
|
8073
|
+
|
8074
|
+
|
7940
8075
|
<fo:block xsl:use-attribute-sets="admonition-name-style">
|
7941
8076
|
<xsl:call-template name="displayAdmonitionName"/>
|
7942
8077
|
</fo:block>
|
@@ -8140,6 +8275,8 @@
|
|
8140
8275
|
</xsl:when>
|
8141
8276
|
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
8142
8277
|
</xsl:choose>
|
8278
|
+
</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
|
8279
|
+
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
8143
8280
|
</xsl:template><xsl:template name="printEdition">
|
8144
8281
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
8145
8282
|
<xsl:text> </xsl:text>
|
@@ -8246,6 +8383,27 @@
|
|
8246
8383
|
</xsl:when>
|
8247
8384
|
<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
|
8248
8385
|
</xsl:choose>
|
8386
|
+
</xsl:template><xsl:template name="getMonthLocalizedByNum">
|
8387
|
+
<xsl:param name="num"/>
|
8388
|
+
<xsl:variable name="monthStr">
|
8389
|
+
<xsl:choose>
|
8390
|
+
<xsl:when test="$num = '01'">january</xsl:when>
|
8391
|
+
<xsl:when test="$num = '02'">february</xsl:when>
|
8392
|
+
<xsl:when test="$num = '03'">march</xsl:when>
|
8393
|
+
<xsl:when test="$num = '04'">april</xsl:when>
|
8394
|
+
<xsl:when test="$num = '05'">may</xsl:when>
|
8395
|
+
<xsl:when test="$num = '06'">june</xsl:when>
|
8396
|
+
<xsl:when test="$num = '07'">july</xsl:when>
|
8397
|
+
<xsl:when test="$num = '08'">august</xsl:when>
|
8398
|
+
<xsl:when test="$num = '09'">september</xsl:when>
|
8399
|
+
<xsl:when test="$num = '10'">october</xsl:when>
|
8400
|
+
<xsl:when test="$num = '11'">november</xsl:when>
|
8401
|
+
<xsl:when test="$num = '12'">december</xsl:when>
|
8402
|
+
</xsl:choose>
|
8403
|
+
</xsl:variable>
|
8404
|
+
<xsl:call-template name="getLocalizedString">
|
8405
|
+
<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
|
8406
|
+
</xsl:call-template>
|
8249
8407
|
</xsl:template><xsl:template name="insertKeywords">
|
8250
8408
|
<xsl:param name="sorting" select="'true'"/>
|
8251
8409
|
<xsl:param name="charAtEnd" select="'.'"/>
|
@@ -8445,6 +8603,7 @@
|
|
8445
8603
|
|
8446
8604
|
|
8447
8605
|
|
8606
|
+
|
8448
8607
|
<xsl:value-of select="document('')//*/namespace::m3d"/>
|
8449
8608
|
|
8450
8609
|
|