metanorma-cc 2.1.2 → 2.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +324 -105
- data/lib/isodoc/cc/presentation_xml_convert.rb +4 -5
- data/lib/metanorma/cc/biblio.rng +102 -5
- data/lib/metanorma/cc/isodoc.rng +33 -0
- data/lib/metanorma/cc/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: e98303d00f33f5c89bed4828260c3767651e7948d56fcbe51f1ac2410049bff6
|
4
|
+
data.tar.gz: 1c1223cb83ca200bee7fcbd7644fe2805ba080317c1cfe415382eadad03a5381
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0546fa6fc7d2268422832c0446beb8ce19c10737ca50fc3b8aceb76a0b15a6a1eaf48a9ea50c1022ccb874a450cffe2e4929e051a5c20e7468050d2b839f0845
|
7
|
+
data.tar.gz: 05cbb47948e90881a0f4eb8bf60e31acaa8355d12a83bf04d3a7224b420f4d1bcb3d8508df5c69ea11e06114fc4c06c5378d8737cb714035dc5f36bdc8f44bdb
|
@@ -717,12 +717,13 @@
|
|
717
717
|
<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
|
718
718
|
</xsl:otherwise>
|
719
719
|
</xsl:choose>
|
720
|
-
</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">
|
720
|
+
</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">
|
721
721
|
|
722
722
|
|
723
723
|
|
724
724
|
|
725
|
-
<xsl:attribute name="font-family"
|
725
|
+
<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans"/>, STIX Two Math</xsl:attribute>
|
726
|
+
<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
|
726
727
|
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
727
728
|
|
728
729
|
|
@@ -737,6 +738,7 @@
|
|
737
738
|
|
738
739
|
|
739
740
|
|
741
|
+
|
740
742
|
</xsl:attribute-set><xsl:template name="insertRootStyle">
|
741
743
|
<xsl:param name="root-style"/>
|
742
744
|
<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
|
@@ -748,17 +750,60 @@
|
|
748
750
|
</xsl:variable>
|
749
751
|
<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
|
750
752
|
|
753
|
+
<xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
|
754
|
+
|
751
755
|
<xsl:for-each select="$root-style_/root-style/@*">
|
756
|
+
|
752
757
|
<xsl:choose>
|
753
|
-
<xsl:when test="local-name() = 'font-family'
|
758
|
+
<xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
|
759
|
+
<xsl:when test="local-name() = 'font-family'">
|
760
|
+
|
761
|
+
<xsl:variable name="font_regional_prefix">
|
762
|
+
<xsl:choose>
|
763
|
+
<xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
|
764
|
+
<xsl:otherwise>Noto Serif</xsl:otherwise>
|
765
|
+
</xsl:choose>
|
766
|
+
</xsl:variable>
|
767
|
+
|
754
768
|
<xsl:attribute name="{local-name()}">
|
755
|
-
|
769
|
+
|
770
|
+
<xsl:variable name="font_extended">
|
771
|
+
<xsl:choose>
|
772
|
+
<xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
773
|
+
<xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
|
774
|
+
<xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
|
775
|
+
<xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
|
776
|
+
<xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
|
777
|
+
<xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
|
778
|
+
</xsl:choose>
|
779
|
+
</xsl:variable>
|
780
|
+
<xsl:if test="normalize-space($font_extended) != ''">
|
781
|
+
<xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
|
782
|
+
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
783
|
+
</xsl:if>
|
784
|
+
|
785
|
+
<xsl:value-of select="."/>
|
786
|
+
|
787
|
+
<xsl:if test="$additional_fonts != ''">
|
788
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
789
|
+
</xsl:if>
|
756
790
|
</xsl:attribute>
|
757
791
|
</xsl:when>
|
758
792
|
<xsl:otherwise>
|
759
793
|
<xsl:copy-of select="."/>
|
760
794
|
</xsl:otherwise>
|
761
795
|
</xsl:choose>
|
796
|
+
|
797
|
+
<!-- <xsl:choose>
|
798
|
+
<xsl:when test="local-name() = 'font-family'">
|
799
|
+
<xsl:attribute name="{local-name()}">
|
800
|
+
<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
|
801
|
+
</xsl:attribute>
|
802
|
+
</xsl:when>
|
803
|
+
<xsl:otherwise>
|
804
|
+
<xsl:copy-of select="."/>
|
805
|
+
</xsl:otherwise>
|
806
|
+
</xsl:choose> -->
|
762
807
|
</xsl:for-each>
|
763
808
|
</xsl:template><xsl:attribute-set name="copyright-statement-style">
|
764
809
|
|
@@ -825,7 +870,7 @@
|
|
825
870
|
|
826
871
|
|
827
872
|
|
828
|
-
<xsl:attribute name="font-family"
|
873
|
+
<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
829
874
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
830
875
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
831
876
|
|
@@ -836,6 +881,7 @@
|
|
836
881
|
|
837
882
|
|
838
883
|
|
884
|
+
|
839
885
|
|
840
886
|
|
841
887
|
|
@@ -850,7 +896,10 @@
|
|
850
896
|
|
851
897
|
</xsl:attribute-set><xsl:attribute-set name="requirement-style">
|
852
898
|
|
899
|
+
|
853
900
|
</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
|
901
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
902
|
+
|
854
903
|
|
855
904
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
856
905
|
|
@@ -879,6 +928,7 @@
|
|
879
928
|
|
880
929
|
|
881
930
|
|
931
|
+
|
882
932
|
|
883
933
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
884
934
|
|
@@ -896,6 +946,7 @@
|
|
896
946
|
|
897
947
|
|
898
948
|
|
949
|
+
|
899
950
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
900
951
|
|
901
952
|
|
@@ -921,6 +972,7 @@
|
|
921
972
|
|
922
973
|
|
923
974
|
|
975
|
+
|
924
976
|
|
925
977
|
|
926
978
|
|
@@ -951,10 +1003,12 @@
|
|
951
1003
|
|
952
1004
|
|
953
1005
|
|
1006
|
+
|
954
1007
|
|
955
1008
|
|
956
1009
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
957
1010
|
|
1011
|
+
|
958
1012
|
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
|
959
1013
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
960
1014
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -978,6 +1032,7 @@
|
|
978
1032
|
|
979
1033
|
|
980
1034
|
|
1035
|
+
|
981
1036
|
|
982
1037
|
|
983
1038
|
|
@@ -1006,6 +1061,7 @@
|
|
1006
1061
|
|
1007
1062
|
|
1008
1063
|
|
1064
|
+
|
1009
1065
|
|
1010
1066
|
|
1011
1067
|
</xsl:attribute-set><xsl:attribute-set name="table-name-style">
|
@@ -1018,6 +1074,7 @@
|
|
1018
1074
|
|
1019
1075
|
|
1020
1076
|
|
1077
|
+
|
1021
1078
|
|
1022
1079
|
|
1023
1080
|
|
@@ -1088,6 +1145,7 @@
|
|
1088
1145
|
|
1089
1146
|
|
1090
1147
|
|
1148
|
+
|
1091
1149
|
</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
|
1092
1150
|
<xsl:attribute name="border">solid black 1pt</xsl:attribute>
|
1093
1151
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
@@ -1100,7 +1158,7 @@
|
|
1100
1158
|
|
1101
1159
|
|
1102
1160
|
|
1103
|
-
|
1161
|
+
|
1104
1162
|
|
1105
1163
|
|
1106
1164
|
|
@@ -1115,6 +1173,7 @@
|
|
1115
1173
|
|
1116
1174
|
|
1117
1175
|
|
1176
|
+
|
1118
1177
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
|
1119
1178
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1120
1179
|
|
@@ -1123,6 +1182,8 @@
|
|
1123
1182
|
|
1124
1183
|
|
1125
1184
|
|
1185
|
+
|
1186
|
+
|
1126
1187
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
|
1127
1188
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
1128
1189
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -1140,6 +1201,7 @@
|
|
1140
1201
|
|
1141
1202
|
|
1142
1203
|
|
1204
|
+
|
1143
1205
|
</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
|
1144
1206
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
1145
1207
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
@@ -1174,6 +1236,7 @@
|
|
1174
1236
|
|
1175
1237
|
|
1176
1238
|
|
1239
|
+
|
1177
1240
|
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
|
1178
1241
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1179
1242
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
@@ -1184,6 +1247,7 @@
|
|
1184
1247
|
|
1185
1248
|
|
1186
1249
|
|
1250
|
+
|
1187
1251
|
|
1188
1252
|
|
1189
1253
|
|
@@ -1237,6 +1301,7 @@
|
|
1237
1301
|
|
1238
1302
|
|
1239
1303
|
|
1304
|
+
|
1240
1305
|
|
1241
1306
|
|
1242
1307
|
|
@@ -1276,7 +1341,8 @@
|
|
1276
1341
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1277
1342
|
|
1278
1343
|
|
1279
|
-
|
1344
|
+
|
1345
|
+
|
1280
1346
|
|
1281
1347
|
|
1282
1348
|
|
@@ -1292,6 +1358,7 @@
|
|
1292
1358
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1293
1359
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1294
1360
|
|
1361
|
+
|
1295
1362
|
|
1296
1363
|
|
1297
1364
|
|
@@ -1302,6 +1369,8 @@
|
|
1302
1369
|
|
1303
1370
|
|
1304
1371
|
|
1372
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
|
1373
|
+
|
1305
1374
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1306
1375
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
1307
1376
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
@@ -1347,6 +1416,7 @@
|
|
1347
1416
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
1348
1417
|
|
1349
1418
|
|
1419
|
+
|
1350
1420
|
|
1351
1421
|
|
1352
1422
|
|
@@ -1396,6 +1466,7 @@
|
|
1396
1466
|
|
1397
1467
|
|
1398
1468
|
|
1469
|
+
|
1399
1470
|
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
|
1400
1471
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
1401
1472
|
|
@@ -1414,19 +1485,19 @@
|
|
1414
1485
|
</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
|
1415
1486
|
|
1416
1487
|
</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
|
1488
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
1489
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1490
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1417
1491
|
|
1418
1492
|
|
1419
|
-
<xsl:attribute name="width">100%</xsl:attribute>
|
1420
1493
|
<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
|
1421
|
-
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1422
1494
|
|
1423
1495
|
|
1424
1496
|
|
1425
|
-
|
1426
|
-
|
1497
|
+
|
1427
1498
|
</xsl:attribute-set><xsl:attribute-set name="tt-style">
|
1428
1499
|
|
1429
|
-
<xsl:attribute name="font-family"
|
1500
|
+
<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
1430
1501
|
|
1431
1502
|
|
1432
1503
|
|
@@ -1511,6 +1582,7 @@
|
|
1511
1582
|
|
1512
1583
|
|
1513
1584
|
|
1585
|
+
|
1514
1586
|
</xsl:attribute-set><xsl:attribute-set name="list-name-style">
|
1515
1587
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1516
1588
|
|
@@ -1576,6 +1648,7 @@
|
|
1576
1648
|
|
1577
1649
|
|
1578
1650
|
|
1651
|
+
|
1579
1652
|
</xsl:attribute-set><xsl:attribute-set name="fn-body-style">
|
1580
1653
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
1581
1654
|
<xsl:attribute name="font-style">normal</xsl:attribute>
|
@@ -1602,6 +1675,7 @@
|
|
1602
1675
|
|
1603
1676
|
|
1604
1677
|
|
1678
|
+
|
1605
1679
|
</xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
|
1606
1680
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
1607
1681
|
|
@@ -1624,6 +1698,7 @@
|
|
1624
1698
|
|
1625
1699
|
|
1626
1700
|
|
1701
|
+
|
1627
1702
|
</xsl:attribute-set><xsl:attribute-set name="admonition-style">
|
1628
1703
|
|
1629
1704
|
|
@@ -1642,7 +1717,11 @@
|
|
1642
1717
|
|
1643
1718
|
|
1644
1719
|
|
1720
|
+
|
1645
1721
|
</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
|
1722
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1723
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
1724
|
+
|
1646
1725
|
|
1647
1726
|
|
1648
1727
|
|
@@ -1680,6 +1759,7 @@
|
|
1680
1759
|
|
1681
1760
|
|
1682
1761
|
|
1762
|
+
|
1683
1763
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
|
1684
1764
|
|
1685
1765
|
|
@@ -1710,6 +1790,10 @@
|
|
1710
1790
|
|
1711
1791
|
|
1712
1792
|
|
1793
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
1794
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1795
|
+
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
1796
|
+
</xsl:if> -->
|
1713
1797
|
|
1714
1798
|
|
1715
1799
|
|
@@ -1738,13 +1822,16 @@
|
|
1738
1822
|
|
1739
1823
|
|
1740
1824
|
|
1825
|
+
|
1741
1826
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
1742
1827
|
|
1743
1828
|
|
1829
|
+
|
1744
1830
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
|
1745
1831
|
|
1746
1832
|
|
1747
1833
|
|
1834
|
+
|
1748
1835
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
|
1749
1836
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
1750
1837
|
<xsl:attribute name="font-size">65%</xsl:attribute>
|
@@ -1766,6 +1853,7 @@
|
|
1766
1853
|
|
1767
1854
|
|
1768
1855
|
|
1856
|
+
|
1769
1857
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
|
1770
1858
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
1771
1859
|
|
@@ -1787,6 +1875,7 @@
|
|
1787
1875
|
|
1788
1876
|
|
1789
1877
|
|
1878
|
+
|
1790
1879
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
|
1791
1880
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1792
1881
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
@@ -1802,6 +1891,7 @@
|
|
1802
1891
|
|
1803
1892
|
|
1804
1893
|
|
1894
|
+
|
1805
1895
|
</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
|
1806
1896
|
|
1807
1897
|
|
@@ -2233,6 +2323,8 @@
|
|
2233
2323
|
|
2234
2324
|
|
2235
2325
|
|
2326
|
+
|
2327
|
+
|
2236
2328
|
|
2237
2329
|
|
2238
2330
|
|
@@ -2272,6 +2364,8 @@
|
|
2272
2364
|
|
2273
2365
|
|
2274
2366
|
|
2367
|
+
|
2368
|
+
|
2275
2369
|
</xsl:element>
|
2276
2370
|
</xsl:variable>
|
2277
2371
|
|
@@ -2359,6 +2453,14 @@
|
|
2359
2453
|
|
2360
2454
|
|
2361
2455
|
|
2456
|
+
<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
|
2457
|
+
<fo:block keep-with-previous="always" line-height="0.1">
|
2458
|
+
<xsl:for-each select="*[local-name()='bookmark']">
|
2459
|
+
<xsl:call-template name="bookmark"/>
|
2460
|
+
</xsl:for-each>
|
2461
|
+
</fo:block>
|
2462
|
+
</xsl:if>
|
2463
|
+
|
2362
2464
|
</fo:block-container>
|
2363
2465
|
</xsl:variable>
|
2364
2466
|
|
@@ -2417,23 +2519,29 @@
|
|
2417
2519
|
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
|
2418
2520
|
<xsl:param name="continued"/>
|
2419
2521
|
<xsl:if test="normalize-space() != ''">
|
2420
|
-
|
2421
|
-
|
2422
|
-
|
2423
|
-
|
2424
|
-
|
2522
|
+
|
2523
|
+
|
2425
2524
|
|
2426
|
-
|
2427
|
-
|
2525
|
+
<fo:block xsl:use-attribute-sets="table-name-style">
|
2526
|
+
|
2428
2527
|
|
2429
|
-
|
2430
|
-
|
2431
|
-
|
2432
|
-
|
2433
|
-
|
2434
|
-
|
2528
|
+
|
2529
|
+
|
2530
|
+
|
2531
|
+
<xsl:choose>
|
2532
|
+
<xsl:when test="$continued = 'true'">
|
2533
|
+
|
2534
|
+
</xsl:when>
|
2535
|
+
<xsl:otherwise>
|
2536
|
+
<xsl:apply-templates/>
|
2537
|
+
</xsl:otherwise>
|
2538
|
+
</xsl:choose>
|
2539
|
+
|
2540
|
+
|
2541
|
+
</fo:block>
|
2542
|
+
|
2435
2543
|
|
2436
|
-
|
2544
|
+
|
2437
2545
|
</xsl:if>
|
2438
2546
|
</xsl:template><xsl:template name="calculate-columns-numbers">
|
2439
2547
|
<xsl:param name="table-row"/>
|
@@ -2831,12 +2939,18 @@
|
|
2831
2939
|
<fo:table-row>
|
2832
2940
|
<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">
|
2833
2941
|
|
2834
|
-
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
2835
|
-
<xsl:with-param name="continued">true</xsl:with-param>
|
2836
|
-
</xsl:apply-templates>
|
2837
2942
|
|
2838
2943
|
|
2839
2944
|
|
2945
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
2946
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
2947
|
+
</xsl:apply-templates>
|
2948
|
+
|
2949
|
+
|
2950
|
+
|
2951
|
+
|
2952
|
+
|
2953
|
+
|
2840
2954
|
</fo:table-cell>
|
2841
2955
|
</fo:table-row>
|
2842
2956
|
</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
@@ -2876,77 +2990,91 @@
|
|
2876
2990
|
</xsl:choose>
|
2877
2991
|
</xsl:variable>
|
2878
2992
|
|
2879
|
-
|
2880
|
-
|
2881
|
-
|
2993
|
+
|
2994
|
+
<xsl:variable name="tableWithNotesAndFootnotes">
|
2995
|
+
|
2996
|
+
<fo:table keep-with-previous="always">
|
2997
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
2998
|
+
<xsl:variable name="name" select="local-name()"/>
|
2999
|
+
<xsl:choose>
|
3000
|
+
<xsl:when test="$name = 'border-top'">
|
3001
|
+
<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
|
3002
|
+
</xsl:when>
|
3003
|
+
<xsl:when test="$name = 'border'">
|
3004
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3005
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3006
|
+
</xsl:when>
|
3007
|
+
<xsl:otherwise>
|
3008
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
3009
|
+
</xsl:otherwise>
|
3010
|
+
</xsl:choose>
|
3011
|
+
</xsl:for-each>
|
3012
|
+
|
3013
|
+
|
3014
|
+
|
2882
3015
|
<xsl:choose>
|
2883
|
-
<xsl:when test="$name
|
2884
|
-
<xsl:
|
2885
|
-
|
2886
|
-
|
2887
|
-
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
2888
|
-
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3016
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3017
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3018
|
+
<fo:table-column column-width="{@width}"/>
|
3019
|
+
</xsl:for-each>
|
2889
3020
|
</xsl:when>
|
2890
3021
|
<xsl:otherwise>
|
2891
|
-
|
3022
|
+
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3023
|
+
<xsl:call-template name="insertTableColumnWidth">
|
3024
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3025
|
+
</xsl:call-template>
|
2892
3026
|
</xsl:otherwise>
|
2893
3027
|
</xsl:choose>
|
2894
|
-
|
2895
|
-
|
2896
|
-
|
2897
|
-
|
2898
|
-
|
2899
|
-
|
2900
|
-
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
2901
|
-
<fo:table-column column-width="{@width}"/>
|
2902
|
-
</xsl:for-each>
|
2903
|
-
</xsl:when>
|
2904
|
-
<xsl:otherwise>
|
2905
|
-
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
2906
|
-
<xsl:call-template name="insertTableColumnWidth">
|
2907
|
-
<xsl:with-param name="colwidths" select="$colwidths"/>
|
2908
|
-
</xsl:call-template>
|
2909
|
-
</xsl:otherwise>
|
2910
|
-
</xsl:choose>
|
2911
|
-
|
2912
|
-
<fo:table-body>
|
2913
|
-
<fo:table-row>
|
2914
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
2915
|
-
|
2916
|
-
|
3028
|
+
|
3029
|
+
<fo:table-body>
|
3030
|
+
<fo:table-row>
|
3031
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3032
|
+
|
3033
|
+
|
2917
3034
|
|
2918
|
-
|
2919
|
-
|
2920
|
-
<!-- fn will be processed inside 'note' processing -->
|
2921
|
-
|
2922
|
-
|
2923
|
-
|
2924
|
-
|
2925
|
-
|
2926
|
-
|
2927
|
-
<!-- for BSI (not PAS) display Notes before footnotes -->
|
2928
|
-
|
2929
|
-
|
2930
|
-
<!-- except gb and bsi -->
|
2931
|
-
|
2932
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
2933
3035
|
|
2934
|
-
|
2935
|
-
|
2936
|
-
|
2937
|
-
|
2938
|
-
|
2939
|
-
|
2940
|
-
|
2941
|
-
|
2942
|
-
|
2943
|
-
|
2944
|
-
|
2945
|
-
|
2946
|
-
|
2947
|
-
|
2948
|
-
|
2949
|
-
|
3036
|
+
|
3037
|
+
<!-- fn will be processed inside 'note' processing -->
|
3038
|
+
|
3039
|
+
|
3040
|
+
|
3041
|
+
|
3042
|
+
|
3043
|
+
|
3044
|
+
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3045
|
+
|
3046
|
+
|
3047
|
+
<!-- except gb and bsi -->
|
3048
|
+
|
3049
|
+
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3050
|
+
|
3051
|
+
|
3052
|
+
|
3053
|
+
<!-- horizontal row separator -->
|
3054
|
+
|
3055
|
+
|
3056
|
+
<!-- fn processing -->
|
3057
|
+
|
3058
|
+
<xsl:call-template name="table_fn_display"/>
|
3059
|
+
|
3060
|
+
|
3061
|
+
|
3062
|
+
<!-- for PAS display Notes after footnotes -->
|
3063
|
+
|
3064
|
+
|
3065
|
+
</fo:table-cell>
|
3066
|
+
</fo:table-row>
|
3067
|
+
</fo:table-body>
|
3068
|
+
|
3069
|
+
</fo:table>
|
3070
|
+
</xsl:variable>
|
3071
|
+
|
3072
|
+
<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
|
3073
|
+
<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
|
3074
|
+
</xsl:if>
|
3075
|
+
|
3076
|
+
|
3077
|
+
|
2950
3078
|
</xsl:if>
|
2951
3079
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
2952
3080
|
|
@@ -3035,6 +3163,9 @@
|
|
3035
3163
|
|
3036
3164
|
|
3037
3165
|
|
3166
|
+
|
3167
|
+
|
3168
|
+
|
3038
3169
|
|
3039
3170
|
|
3040
3171
|
<xsl:call-template name="setTableRowAttributes"/>
|
@@ -3054,6 +3185,8 @@
|
|
3054
3185
|
|
3055
3186
|
|
3056
3187
|
|
3188
|
+
|
3189
|
+
|
3057
3190
|
<xsl:call-template name="setTableRowAttributes"/>
|
3058
3191
|
<xsl:apply-templates/>
|
3059
3192
|
</fo:table-row>
|
@@ -3135,6 +3268,8 @@
|
|
3135
3268
|
|
3136
3269
|
|
3137
3270
|
|
3271
|
+
|
3272
|
+
|
3138
3273
|
|
3139
3274
|
|
3140
3275
|
|
@@ -3206,7 +3341,11 @@
|
|
3206
3341
|
|
3207
3342
|
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
3208
3343
|
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
3209
|
-
<xsl:variable name="
|
3344
|
+
<xsl:variable name="reference_">
|
3345
|
+
<xsl:value-of select="@reference"/>
|
3346
|
+
<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
|
3347
|
+
</xsl:variable>
|
3348
|
+
<xsl:variable name="reference" select="normalize-space($reference_)"/>
|
3210
3349
|
<!-- fn sequence number in document -->
|
3211
3350
|
<xsl:variable name="current_fn_number">
|
3212
3351
|
<xsl:choose>
|
@@ -3226,6 +3365,7 @@
|
|
3226
3365
|
<xsl:variable name="footnote_inline">
|
3227
3366
|
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
3228
3367
|
|
3368
|
+
|
3229
3369
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
3230
3370
|
<xsl:value-of select="$current_fn_number_text"/>
|
3231
3371
|
</fo:basic-link>
|
@@ -3247,8 +3387,12 @@
|
|
3247
3387
|
<fo:block xsl:use-attribute-sets="fn-body-style">
|
3248
3388
|
|
3249
3389
|
|
3390
|
+
|
3250
3391
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
3251
3392
|
|
3393
|
+
|
3394
|
+
|
3395
|
+
|
3252
3396
|
<xsl:value-of select="$current_fn_number_text"/>
|
3253
3397
|
</fo:inline>
|
3254
3398
|
<xsl:apply-templates/>
|
@@ -3281,7 +3425,7 @@
|
|
3281
3425
|
<xsl:copy-of select="node()"/>
|
3282
3426
|
</fn>
|
3283
3427
|
</xsl:for-each>
|
3284
|
-
<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']/*">
|
3428
|
+
<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']/*">
|
3285
3429
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3286
3430
|
<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])]">
|
3287
3431
|
<!-- copy unique fn -->
|
@@ -4922,6 +5066,13 @@
|
|
4922
5066
|
</xsl:variable>
|
4923
5067
|
<fo:inline xsl:use-attribute-sets="link-style">
|
4924
5068
|
|
5069
|
+
<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
|
5070
|
+
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
5071
|
+
</xsl:if>
|
5072
|
+
|
5073
|
+
|
5074
|
+
|
5075
|
+
|
4925
5076
|
|
4926
5077
|
|
4927
5078
|
|
@@ -5135,6 +5286,7 @@
|
|
5135
5286
|
|
5136
5287
|
|
5137
5288
|
|
5289
|
+
|
5138
5290
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
5139
5291
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
5140
5292
|
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
@@ -5157,6 +5309,7 @@
|
|
5157
5309
|
<xsl:otherwise>
|
5158
5310
|
|
5159
5311
|
|
5312
|
+
|
5160
5313
|
</xsl:otherwise>
|
5161
5314
|
</xsl:choose>
|
5162
5315
|
</xsl:variable>
|
@@ -5174,6 +5327,7 @@
|
|
5174
5327
|
<xsl:otherwise>
|
5175
5328
|
|
5176
5329
|
|
5330
|
+
|
5177
5331
|
</xsl:otherwise>
|
5178
5332
|
</xsl:choose>
|
5179
5333
|
</xsl:variable>
|
@@ -5182,7 +5336,19 @@
|
|
5182
5336
|
<xsl:value-of select="$suffix"/>
|
5183
5337
|
</xsl:if>
|
5184
5338
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
5185
|
-
<
|
5339
|
+
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
5340
|
+
<xsl:choose>
|
5341
|
+
<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
|
5342
|
+
<fo:inline xsl:use-attribute-sets="termnote-p-style">
|
5343
|
+
<xsl:apply-templates/>
|
5344
|
+
</fo:inline>
|
5345
|
+
</xsl:when>
|
5346
|
+
<xsl:otherwise>
|
5347
|
+
<fo:block xsl:use-attribute-sets="termnote-p-style">
|
5348
|
+
<xsl:apply-templates/>
|
5349
|
+
</fo:block>
|
5350
|
+
</xsl:otherwise>
|
5351
|
+
</xsl:choose>
|
5186
5352
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5187
5353
|
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
5188
5354
|
<fo:block id="{@id}">
|
@@ -5937,6 +6103,9 @@
|
|
5937
6103
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
5938
6104
|
|
5939
6105
|
|
6106
|
+
|
6107
|
+
|
6108
|
+
|
5940
6109
|
<xsl:apply-templates/>
|
5941
6110
|
</fo:block>
|
5942
6111
|
</xsl:if>
|
@@ -5997,9 +6166,9 @@
|
|
5997
6166
|
<xsl:apply-templates/>
|
5998
6167
|
</xsl:otherwise>
|
5999
6168
|
</xsl:choose>
|
6000
|
-
</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">
|
6169
|
+
</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'] | *[local-name() = 'eref']" mode="contents">
|
6001
6170
|
<xsl:value-of select="."/>
|
6002
|
-
</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6171
|
+
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6003
6172
|
<xsl:text> </xsl:text>
|
6004
6173
|
</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
|
6005
6174
|
<xsl:copy>
|
@@ -6073,6 +6242,9 @@
|
|
6073
6242
|
<!-- 9 -->
|
6074
6243
|
|
6075
6244
|
|
6245
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
6246
|
+
<xsl:if test="$current_template = 'standard'">8</xsl:if>
|
6247
|
+
</xsl:if> -->
|
6076
6248
|
|
6077
6249
|
|
6078
6250
|
|
@@ -6517,10 +6689,14 @@
|
|
6517
6689
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
6518
6690
|
<xsl:variable name="element">inline
|
6519
6691
|
|
6692
|
+
|
6520
6693
|
</xsl:variable>
|
6521
6694
|
<xsl:choose>
|
6522
6695
|
<xsl:when test="contains($element, 'block')">
|
6523
6696
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6697
|
+
|
6698
|
+
|
6699
|
+
|
6524
6700
|
<xsl:apply-templates/>
|
6525
6701
|
</fo:block>
|
6526
6702
|
</xsl:when>
|
@@ -6628,6 +6804,7 @@
|
|
6628
6804
|
</xsl:if>
|
6629
6805
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6630
6806
|
|
6807
|
+
|
6631
6808
|
<xsl:apply-templates/>
|
6632
6809
|
</fo:block>
|
6633
6810
|
</fo:block-container>
|
@@ -6784,6 +6961,8 @@
|
|
6784
6961
|
|
6785
6962
|
|
6786
6963
|
|
6964
|
+
|
6965
|
+
|
6787
6966
|
<fo:basic-link fox:alt-text="{@citeas}">
|
6788
6967
|
<xsl:if test="normalize-space(@citeas) = ''">
|
6789
6968
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
@@ -6858,6 +7037,7 @@
|
|
6858
7037
|
|
6859
7038
|
|
6860
7039
|
|
7040
|
+
|
6861
7041
|
</xsl:variable>
|
6862
7042
|
|
6863
7043
|
<xsl:variable name="padding-right">
|
@@ -7212,6 +7392,8 @@
|
|
7212
7392
|
|
7213
7393
|
|
7214
7394
|
|
7395
|
+
|
7396
|
+
|
7215
7397
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7216
7398
|
<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7217
7399
|
<xsl:call-template name="append_add-style"/>
|
@@ -7396,7 +7578,7 @@
|
|
7396
7578
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
|
7397
7579
|
<!-- to split by '_' and other chars -->
|
7398
7580
|
<xsl:call-template name="add-zero-spaces-java"/>
|
7399
|
-
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
7581
|
+
</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
7400
7582
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
7401
7583
|
<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
|
7402
7584
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
@@ -7469,9 +7651,9 @@
|
|
7469
7651
|
</fo:block>
|
7470
7652
|
|
7471
7653
|
|
7472
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7654
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
7473
7655
|
|
7474
|
-
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7656
|
+
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7475
7657
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
7476
7658
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
7477
7659
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
@@ -7482,7 +7664,7 @@
|
|
7482
7664
|
|
7483
7665
|
<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
|
7484
7666
|
<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
|
7485
|
-
<xsl:number format="[1]"/>
|
7667
|
+
<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
|
7486
7668
|
</xsl:if>
|
7487
7669
|
|
7488
7670
|
</fo:inline>
|
@@ -8054,6 +8236,8 @@
|
|
8054
8236
|
</xsl:when>
|
8055
8237
|
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
8056
8238
|
</xsl:choose>
|
8239
|
+
</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
|
8240
|
+
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
8057
8241
|
</xsl:template><xsl:template name="printEdition">
|
8058
8242
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
8059
8243
|
<xsl:text> </xsl:text>
|
@@ -8160,8 +8344,30 @@
|
|
8160
8344
|
</xsl:when>
|
8161
8345
|
<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
|
8162
8346
|
</xsl:choose>
|
8347
|
+
</xsl:template><xsl:template name="getMonthLocalizedByNum">
|
8348
|
+
<xsl:param name="num"/>
|
8349
|
+
<xsl:variable name="monthStr">
|
8350
|
+
<xsl:choose>
|
8351
|
+
<xsl:when test="$num = '01'">january</xsl:when>
|
8352
|
+
<xsl:when test="$num = '02'">february</xsl:when>
|
8353
|
+
<xsl:when test="$num = '03'">march</xsl:when>
|
8354
|
+
<xsl:when test="$num = '04'">april</xsl:when>
|
8355
|
+
<xsl:when test="$num = '05'">may</xsl:when>
|
8356
|
+
<xsl:when test="$num = '06'">june</xsl:when>
|
8357
|
+
<xsl:when test="$num = '07'">july</xsl:when>
|
8358
|
+
<xsl:when test="$num = '08'">august</xsl:when>
|
8359
|
+
<xsl:when test="$num = '09'">september</xsl:when>
|
8360
|
+
<xsl:when test="$num = '10'">october</xsl:when>
|
8361
|
+
<xsl:when test="$num = '11'">november</xsl:when>
|
8362
|
+
<xsl:when test="$num = '12'">december</xsl:when>
|
8363
|
+
</xsl:choose>
|
8364
|
+
</xsl:variable>
|
8365
|
+
<xsl:call-template name="getLocalizedString">
|
8366
|
+
<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
|
8367
|
+
</xsl:call-template>
|
8163
8368
|
</xsl:template><xsl:template name="insertKeywords">
|
8164
8369
|
<xsl:param name="sorting" select="'true'"/>
|
8370
|
+
<xsl:param name="meta" select="'false'"/>
|
8165
8371
|
<xsl:param name="charAtEnd" select="'.'"/>
|
8166
8372
|
<xsl:param name="charDelim" select="', '"/>
|
8167
8373
|
<xsl:choose>
|
@@ -8169,6 +8375,7 @@
|
|
8169
8375
|
<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
|
8170
8376
|
<xsl:sort data-type="text" order="ascending"/>
|
8171
8377
|
<xsl:call-template name="insertKeyword">
|
8378
|
+
<xsl:with-param name="meta" select="$meta"/>
|
8172
8379
|
<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
|
8173
8380
|
<xsl:with-param name="charDelim" select="$charDelim"/>
|
8174
8381
|
</xsl:call-template>
|
@@ -8177,6 +8384,7 @@
|
|
8177
8384
|
<xsl:otherwise>
|
8178
8385
|
<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
|
8179
8386
|
<xsl:call-template name="insertKeyword">
|
8387
|
+
<xsl:with-param name="meta" select="$meta"/>
|
8180
8388
|
<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
|
8181
8389
|
<xsl:with-param name="charDelim" select="$charDelim"/>
|
8182
8390
|
</xsl:call-template>
|
@@ -8186,7 +8394,15 @@
|
|
8186
8394
|
</xsl:template><xsl:template name="insertKeyword">
|
8187
8395
|
<xsl:param name="charAtEnd"/>
|
8188
8396
|
<xsl:param name="charDelim"/>
|
8189
|
-
<xsl:
|
8397
|
+
<xsl:param name="meta"/>
|
8398
|
+
<xsl:choose>
|
8399
|
+
<xsl:when test="$meta = 'true'">
|
8400
|
+
<xsl:value-of select="."/>
|
8401
|
+
</xsl:when>
|
8402
|
+
<xsl:otherwise>
|
8403
|
+
<xsl:apply-templates/>
|
8404
|
+
</xsl:otherwise>
|
8405
|
+
</xsl:choose>
|
8190
8406
|
<xsl:choose>
|
8191
8407
|
<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
|
8192
8408
|
<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
|
@@ -8231,13 +8447,15 @@
|
|
8231
8447
|
<dc:description>
|
8232
8448
|
<xsl:variable name="abstract">
|
8233
8449
|
|
8234
|
-
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
8450
|
+
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
|
8235
8451
|
|
8236
8452
|
</xsl:variable>
|
8237
8453
|
<xsl:value-of select="normalize-space($abstract)"/>
|
8238
8454
|
</dc:description>
|
8239
8455
|
<pdf:Keywords>
|
8240
|
-
<xsl:call-template name="insertKeywords"
|
8456
|
+
<xsl:call-template name="insertKeywords">
|
8457
|
+
<xsl:with-param name="meta">true</xsl:with-param>
|
8458
|
+
</xsl:call-template>
|
8241
8459
|
</pdf:Keywords>
|
8242
8460
|
</rdf:Description>
|
8243
8461
|
<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
|
@@ -8358,6 +8576,7 @@
|
|
8358
8576
|
|
8359
8577
|
|
8360
8578
|
|
8579
|
+
|
8361
8580
|
<xsl:value-of select="document('')//*/namespace::csd"/>
|
8362
8581
|
|
8363
8582
|
|
@@ -5,16 +5,15 @@ require "isodoc"
|
|
5
5
|
module IsoDoc
|
6
6
|
module CC
|
7
7
|
class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
|
8
|
-
def annex1(
|
9
|
-
lbl = @xrefs.anchor(
|
10
|
-
if t =
|
8
|
+
def annex1(elem)
|
9
|
+
lbl = @xrefs.anchor(elem["id"], :label)
|
10
|
+
if t = elem.at(ns("./title"))
|
11
11
|
t.children = "<strong>#{t.children.to_xml}</strong>"
|
12
12
|
end
|
13
|
-
prefix_name(
|
13
|
+
prefix_name(elem, "<br/>", lbl, "title")
|
14
14
|
end
|
15
15
|
|
16
16
|
include Init
|
17
17
|
end
|
18
18
|
end
|
19
19
|
end
|
20
|
-
|
data/lib/metanorma/cc/biblio.rng
CHANGED
@@ -623,6 +623,97 @@
|
|
623
623
|
<zeroOrMore>
|
624
624
|
<ref name="bsource"/>
|
625
625
|
</zeroOrMore>
|
626
|
+
<oneOrMore>
|
627
|
+
<ref name="docidentifier"/>
|
628
|
+
</oneOrMore>
|
629
|
+
<optional>
|
630
|
+
<ref name="docnumber"/>
|
631
|
+
</optional>
|
632
|
+
<zeroOrMore>
|
633
|
+
<ref name="bdate"/>
|
634
|
+
</zeroOrMore>
|
635
|
+
<zeroOrMore>
|
636
|
+
<ref name="contributor"/>
|
637
|
+
</zeroOrMore>
|
638
|
+
<optional>
|
639
|
+
<ref name="edition"/>
|
640
|
+
</optional>
|
641
|
+
<zeroOrMore>
|
642
|
+
<ref name="version"/>
|
643
|
+
</zeroOrMore>
|
644
|
+
<zeroOrMore>
|
645
|
+
<ref name="biblionote"/>
|
646
|
+
</zeroOrMore>
|
647
|
+
<zeroOrMore>
|
648
|
+
<ref name="language"/>
|
649
|
+
</zeroOrMore>
|
650
|
+
<zeroOrMore>
|
651
|
+
<ref name="script"/>
|
652
|
+
</zeroOrMore>
|
653
|
+
<zeroOrMore>
|
654
|
+
<ref name="bibabstract"/>
|
655
|
+
</zeroOrMore>
|
656
|
+
<optional>
|
657
|
+
<ref name="status"/>
|
658
|
+
</optional>
|
659
|
+
<zeroOrMore>
|
660
|
+
<ref name="copyright"/>
|
661
|
+
</zeroOrMore>
|
662
|
+
<zeroOrMore>
|
663
|
+
<ref name="docrelation"/>
|
664
|
+
</zeroOrMore>
|
665
|
+
<zeroOrMore>
|
666
|
+
<ref name="series"/>
|
667
|
+
</zeroOrMore>
|
668
|
+
<optional>
|
669
|
+
<ref name="medium"/>
|
670
|
+
</optional>
|
671
|
+
<zeroOrMore>
|
672
|
+
<ref name="bplace"/>
|
673
|
+
</zeroOrMore>
|
674
|
+
<zeroOrMore>
|
675
|
+
<ref name="bprice"/>
|
676
|
+
</zeroOrMore>
|
677
|
+
<zeroOrMore>
|
678
|
+
<ref name="extent"/>
|
679
|
+
</zeroOrMore>
|
680
|
+
<optional>
|
681
|
+
<ref name="bibliographic_size"/>
|
682
|
+
</optional>
|
683
|
+
<zeroOrMore>
|
684
|
+
<ref name="accesslocation"/>
|
685
|
+
</zeroOrMore>
|
686
|
+
<zeroOrMore>
|
687
|
+
<ref name="license"/>
|
688
|
+
</zeroOrMore>
|
689
|
+
<zeroOrMore>
|
690
|
+
<ref name="bclassification"/>
|
691
|
+
</zeroOrMore>
|
692
|
+
<zeroOrMore>
|
693
|
+
<ref name="bkeyword"/>
|
694
|
+
</zeroOrMore>
|
695
|
+
<optional>
|
696
|
+
<ref name="validity"/>
|
697
|
+
</optional>
|
698
|
+
</define>
|
699
|
+
<define name="ReducedBibliographicItem">
|
700
|
+
<optional>
|
701
|
+
<attribute name="type">
|
702
|
+
<ref name="BibItemType"/>
|
703
|
+
</attribute>
|
704
|
+
</optional>
|
705
|
+
<optional>
|
706
|
+
<ref name="fetched"/>
|
707
|
+
</optional>
|
708
|
+
<optional>
|
709
|
+
<ref name="formattedref"/>
|
710
|
+
</optional>
|
711
|
+
<zeroOrMore>
|
712
|
+
<ref name="btitle"/>
|
713
|
+
</zeroOrMore>
|
714
|
+
<zeroOrMore>
|
715
|
+
<ref name="bsource"/>
|
716
|
+
</zeroOrMore>
|
626
717
|
<zeroOrMore>
|
627
718
|
<ref name="docidentifier"/>
|
628
719
|
</zeroOrMore>
|
@@ -638,9 +729,9 @@
|
|
638
729
|
<optional>
|
639
730
|
<ref name="edition"/>
|
640
731
|
</optional>
|
641
|
-
<
|
732
|
+
<zeroOrMore>
|
642
733
|
<ref name="version"/>
|
643
|
-
</
|
734
|
+
</zeroOrMore>
|
644
735
|
<zeroOrMore>
|
645
736
|
<ref name="biblionote"/>
|
646
737
|
</zeroOrMore>
|
@@ -833,6 +924,12 @@
|
|
833
924
|
<data type="boolean"/>
|
834
925
|
</attribute>
|
835
926
|
</optional>
|
927
|
+
<optional>
|
928
|
+
<attribute name="language"/>
|
929
|
+
</optional>
|
930
|
+
<optional>
|
931
|
+
<attribute name="script"/>
|
932
|
+
</optional>
|
836
933
|
<text/>
|
837
934
|
</element>
|
838
935
|
</define>
|
@@ -1172,7 +1269,7 @@
|
|
1172
1269
|
</element>
|
1173
1270
|
</optional>
|
1174
1271
|
<element name="bibitem">
|
1175
|
-
<ref name="
|
1272
|
+
<ref name="ReducedBibliographicItem"/>
|
1176
1273
|
</element>
|
1177
1274
|
<choice>
|
1178
1275
|
<zeroOrMore>
|
@@ -1197,9 +1294,9 @@
|
|
1197
1294
|
<optional>
|
1198
1295
|
<ref name="revision-date"/>
|
1199
1296
|
</optional>
|
1200
|
-
<
|
1297
|
+
<optional>
|
1201
1298
|
<ref name="draft"/>
|
1202
|
-
</
|
1299
|
+
</optional>
|
1203
1300
|
</element>
|
1204
1301
|
</define>
|
1205
1302
|
<define name="vedition">
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
@@ -69,6 +69,17 @@
|
|
69
69
|
</zeroOrMore>
|
70
70
|
</element>
|
71
71
|
</define>
|
72
|
+
<define name="AdmonitionType">
|
73
|
+
<choice>
|
74
|
+
<value>warning</value>
|
75
|
+
<value>note</value>
|
76
|
+
<value>tip</value>
|
77
|
+
<value>important</value>
|
78
|
+
<value>caution</value>
|
79
|
+
<value>statement</value>
|
80
|
+
<value>editorial</value>
|
81
|
+
</choice>
|
82
|
+
</define>
|
72
83
|
<define name="index">
|
73
84
|
<element name="index">
|
74
85
|
<optional>
|
@@ -116,6 +127,11 @@
|
|
116
127
|
<data type="boolean"/>
|
117
128
|
</attribute>
|
118
129
|
</optional>
|
130
|
+
<optional>
|
131
|
+
<attribute name="suppress_identifier">
|
132
|
+
<data type="boolean"/>
|
133
|
+
</attribute>
|
134
|
+
</optional>
|
119
135
|
<ref name="BibliographicItem"/>
|
120
136
|
</element>
|
121
137
|
</define>
|
@@ -703,6 +719,9 @@
|
|
703
719
|
<optional>
|
704
720
|
<attribute name="tag"/>
|
705
721
|
</optional>
|
722
|
+
<optional>
|
723
|
+
<attribute name="type"/>
|
724
|
+
</optional>
|
706
725
|
<optional>
|
707
726
|
<attribute name="multilingual-rendering">
|
708
727
|
<ref name="MultilingualRenderingType"/>
|
@@ -738,6 +757,9 @@
|
|
738
757
|
<optional>
|
739
758
|
<attribute name="tag"/>
|
740
759
|
</optional>
|
760
|
+
<optional>
|
761
|
+
<attribute name="type"/>
|
762
|
+
</optional>
|
741
763
|
<optional>
|
742
764
|
<attribute name="multilingual-rendering">
|
743
765
|
<ref name="MultilingualRenderingType"/>
|
@@ -2059,6 +2081,7 @@
|
|
2059
2081
|
<value>compare</value>
|
2060
2082
|
<value>contrast</value>
|
2061
2083
|
<value>see</value>
|
2084
|
+
<value>seealso</value>
|
2062
2085
|
</choice>
|
2063
2086
|
</define>
|
2064
2087
|
<define name="deprecates">
|
@@ -2481,6 +2504,16 @@
|
|
2481
2504
|
<text/>
|
2482
2505
|
</element>
|
2483
2506
|
</optional>
|
2507
|
+
<optional>
|
2508
|
+
<element name="amendment">
|
2509
|
+
<text/>
|
2510
|
+
</element>
|
2511
|
+
</optional>
|
2512
|
+
<optional>
|
2513
|
+
<element name="corrigendum">
|
2514
|
+
<text/>
|
2515
|
+
</element>
|
2516
|
+
</optional>
|
2484
2517
|
<optional>
|
2485
2518
|
<element name="language">
|
2486
2519
|
<text/>
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
248
248
|
- !ruby/object:Gem::Version
|
249
249
|
version: '0'
|
250
250
|
requirements: []
|
251
|
-
rubygems_version: 3.3.
|
251
|
+
rubygems_version: 3.3.16
|
252
252
|
signing_key:
|
253
253
|
specification_version: 4
|
254
254
|
summary: metanorma-cc lets you write CalConnect standards in AsciiDoc.
|