metanorma-cc 2.1.2 → 2.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +191 -35
- data/lib/isodoc/cc/presentation_xml_convert.rb +4 -5
- data/lib/metanorma/cc/biblio.rng +102 -5
- data/lib/metanorma/cc/isodoc.rng +7 -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: c8e467a854e0b3ff204cb3f5e0c5cc8ca6b61cc9d05a567c080813aef8ad2711
|
4
|
+
data.tar.gz: 45dcf963aebc7ba3b36e0342681a97e1511ac6d6c30d5811227e7dad10946de2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dfaf41af984f9994d9ebf6b5452dbe3368d0214982aec743e0cea7825f70a962f6432b44195f0a0f6255bff5270960affd2d1d8041a0d9a0125c4923dc61daaf
|
7
|
+
data.tar.gz: fdfcc0c0cb6ad5487a4be97458039b3f51e85e864a4b647d1b6eb9225bb8f943bc5d30691ff0750140a5e8acb20094c026d6edaebf5feee9c47a923ba43683f1
|
@@ -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">Source Sans Pro, STIX Two Math,
|
725
|
+
<xsl:attribute name="font-family">Source Sans Pro, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></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">Source Code Pro
|
873
|
+
<xsl:attribute name="font-family">Source Code Pro, <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
|
|
@@ -879,6 +925,7 @@
|
|
879
925
|
|
880
926
|
|
881
927
|
|
928
|
+
|
882
929
|
|
883
930
|
</xsl:attribute-set><xsl:attribute-set name="example-style">
|
884
931
|
|
@@ -896,6 +943,7 @@
|
|
896
943
|
|
897
944
|
|
898
945
|
|
946
|
+
|
899
947
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
900
948
|
|
901
949
|
|
@@ -921,6 +969,7 @@
|
|
921
969
|
|
922
970
|
|
923
971
|
|
972
|
+
|
924
973
|
|
925
974
|
|
926
975
|
|
@@ -955,6 +1004,7 @@
|
|
955
1004
|
|
956
1005
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
957
1006
|
|
1007
|
+
|
958
1008
|
</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
|
959
1009
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
960
1010
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
@@ -978,6 +1028,7 @@
|
|
978
1028
|
|
979
1029
|
|
980
1030
|
|
1031
|
+
|
981
1032
|
|
982
1033
|
|
983
1034
|
|
@@ -1006,6 +1057,7 @@
|
|
1006
1057
|
|
1007
1058
|
|
1008
1059
|
|
1060
|
+
|
1009
1061
|
|
1010
1062
|
|
1011
1063
|
</xsl:attribute-set><xsl:attribute-set name="table-name-style">
|
@@ -1018,6 +1070,7 @@
|
|
1018
1070
|
|
1019
1071
|
|
1020
1072
|
|
1073
|
+
|
1021
1074
|
|
1022
1075
|
|
1023
1076
|
|
@@ -1088,6 +1141,7 @@
|
|
1088
1141
|
|
1089
1142
|
|
1090
1143
|
|
1144
|
+
|
1091
1145
|
</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
|
1092
1146
|
<xsl:attribute name="border">solid black 1pt</xsl:attribute>
|
1093
1147
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
@@ -1100,7 +1154,7 @@
|
|
1100
1154
|
|
1101
1155
|
|
1102
1156
|
|
1103
|
-
|
1157
|
+
|
1104
1158
|
|
1105
1159
|
|
1106
1160
|
|
@@ -1115,6 +1169,7 @@
|
|
1115
1169
|
|
1116
1170
|
|
1117
1171
|
|
1172
|
+
|
1118
1173
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
|
1119
1174
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1120
1175
|
|
@@ -1123,6 +1178,8 @@
|
|
1123
1178
|
|
1124
1179
|
|
1125
1180
|
|
1181
|
+
|
1182
|
+
|
1126
1183
|
</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
|
1127
1184
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
1128
1185
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
@@ -1140,6 +1197,7 @@
|
|
1140
1197
|
|
1141
1198
|
|
1142
1199
|
|
1200
|
+
|
1143
1201
|
</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
|
1144
1202
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
1145
1203
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
@@ -1174,6 +1232,7 @@
|
|
1174
1232
|
|
1175
1233
|
|
1176
1234
|
|
1235
|
+
|
1177
1236
|
</xsl:attribute-set><xsl:attribute-set name="dl-name-style">
|
1178
1237
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1179
1238
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
@@ -1184,6 +1243,7 @@
|
|
1184
1243
|
|
1185
1244
|
|
1186
1245
|
|
1246
|
+
|
1187
1247
|
|
1188
1248
|
|
1189
1249
|
|
@@ -1237,6 +1297,7 @@
|
|
1237
1297
|
|
1238
1298
|
|
1239
1299
|
|
1300
|
+
|
1240
1301
|
|
1241
1302
|
|
1242
1303
|
|
@@ -1302,6 +1363,8 @@
|
|
1302
1363
|
|
1303
1364
|
|
1304
1365
|
|
1366
|
+
</xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
|
1367
|
+
|
1305
1368
|
</xsl:attribute-set><xsl:attribute-set name="quote-style">
|
1306
1369
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
1307
1370
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
@@ -1347,6 +1410,7 @@
|
|
1347
1410
|
</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
|
1348
1411
|
|
1349
1412
|
|
1413
|
+
|
1350
1414
|
|
1351
1415
|
|
1352
1416
|
|
@@ -1396,6 +1460,7 @@
|
|
1396
1460
|
|
1397
1461
|
|
1398
1462
|
|
1463
|
+
|
1399
1464
|
</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
|
1400
1465
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
1401
1466
|
|
@@ -1414,19 +1479,19 @@
|
|
1414
1479
|
</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
|
1415
1480
|
|
1416
1481
|
</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
|
1482
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
1483
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
1484
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1417
1485
|
|
1418
1486
|
|
1419
|
-
<xsl:attribute name="width">100%</xsl:attribute>
|
1420
1487
|
<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
|
1421
|
-
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
1422
1488
|
|
1423
1489
|
|
1424
1490
|
|
1425
|
-
|
1426
|
-
|
1491
|
+
|
1427
1492
|
</xsl:attribute-set><xsl:attribute-set name="tt-style">
|
1428
1493
|
|
1429
|
-
<xsl:attribute name="font-family">Source Code Pro
|
1494
|
+
<xsl:attribute name="font-family">Source Code Pro, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
1430
1495
|
|
1431
1496
|
|
1432
1497
|
|
@@ -1511,6 +1576,7 @@
|
|
1511
1576
|
|
1512
1577
|
|
1513
1578
|
|
1579
|
+
|
1514
1580
|
</xsl:attribute-set><xsl:attribute-set name="list-name-style">
|
1515
1581
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
1516
1582
|
|
@@ -1576,6 +1642,7 @@
|
|
1576
1642
|
|
1577
1643
|
|
1578
1644
|
|
1645
|
+
|
1579
1646
|
</xsl:attribute-set><xsl:attribute-set name="fn-body-style">
|
1580
1647
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
1581
1648
|
<xsl:attribute name="font-style">normal</xsl:attribute>
|
@@ -1602,6 +1669,7 @@
|
|
1602
1669
|
|
1603
1670
|
|
1604
1671
|
|
1672
|
+
|
1605
1673
|
</xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
|
1606
1674
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
1607
1675
|
|
@@ -1624,6 +1692,7 @@
|
|
1624
1692
|
|
1625
1693
|
|
1626
1694
|
|
1695
|
+
|
1627
1696
|
</xsl:attribute-set><xsl:attribute-set name="admonition-style">
|
1628
1697
|
|
1629
1698
|
|
@@ -1642,7 +1711,11 @@
|
|
1642
1711
|
|
1643
1712
|
|
1644
1713
|
|
1714
|
+
|
1645
1715
|
</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
|
1716
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
1717
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
1718
|
+
|
1646
1719
|
|
1647
1720
|
|
1648
1721
|
|
@@ -1680,6 +1753,7 @@
|
|
1680
1753
|
|
1681
1754
|
|
1682
1755
|
|
1756
|
+
|
1683
1757
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
|
1684
1758
|
|
1685
1759
|
|
@@ -1717,6 +1791,7 @@
|
|
1717
1791
|
|
1718
1792
|
|
1719
1793
|
|
1794
|
+
|
1720
1795
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
|
1721
1796
|
|
1722
1797
|
|
@@ -1738,6 +1813,7 @@
|
|
1738
1813
|
|
1739
1814
|
|
1740
1815
|
|
1816
|
+
|
1741
1817
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
1742
1818
|
|
1743
1819
|
|
@@ -1766,6 +1842,7 @@
|
|
1766
1842
|
|
1767
1843
|
|
1768
1844
|
|
1845
|
+
|
1769
1846
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
|
1770
1847
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
1771
1848
|
|
@@ -1787,6 +1864,7 @@
|
|
1787
1864
|
|
1788
1865
|
|
1789
1866
|
|
1867
|
+
|
1790
1868
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
|
1791
1869
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1792
1870
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
@@ -1802,6 +1880,7 @@
|
|
1802
1880
|
|
1803
1881
|
|
1804
1882
|
|
1883
|
+
|
1805
1884
|
</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
|
1806
1885
|
|
1807
1886
|
|
@@ -2233,6 +2312,8 @@
|
|
2233
2312
|
|
2234
2313
|
|
2235
2314
|
|
2315
|
+
|
2316
|
+
|
2236
2317
|
|
2237
2318
|
|
2238
2319
|
|
@@ -2272,6 +2353,8 @@
|
|
2272
2353
|
|
2273
2354
|
|
2274
2355
|
|
2356
|
+
|
2357
|
+
|
2275
2358
|
</xsl:element>
|
2276
2359
|
</xsl:variable>
|
2277
2360
|
|
@@ -2417,23 +2500,29 @@
|
|
2417
2500
|
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
|
2418
2501
|
<xsl:param name="continued"/>
|
2419
2502
|
<xsl:if test="normalize-space() != ''">
|
2420
|
-
|
2421
|
-
|
2422
|
-
|
2423
|
-
|
2424
|
-
|
2503
|
+
|
2504
|
+
|
2425
2505
|
|
2426
|
-
|
2427
|
-
|
2506
|
+
<fo:block xsl:use-attribute-sets="table-name-style">
|
2507
|
+
|
2428
2508
|
|
2429
|
-
|
2430
|
-
|
2431
|
-
|
2432
|
-
|
2433
|
-
|
2434
|
-
|
2509
|
+
|
2510
|
+
|
2511
|
+
|
2512
|
+
<xsl:choose>
|
2513
|
+
<xsl:when test="$continued = 'true'">
|
2514
|
+
|
2515
|
+
</xsl:when>
|
2516
|
+
<xsl:otherwise>
|
2517
|
+
<xsl:apply-templates/>
|
2518
|
+
</xsl:otherwise>
|
2519
|
+
</xsl:choose>
|
2520
|
+
|
2521
|
+
|
2522
|
+
</fo:block>
|
2523
|
+
|
2435
2524
|
|
2436
|
-
|
2525
|
+
|
2437
2526
|
</xsl:if>
|
2438
2527
|
</xsl:template><xsl:template name="calculate-columns-numbers">
|
2439
2528
|
<xsl:param name="table-row"/>
|
@@ -2831,12 +2920,18 @@
|
|
2831
2920
|
<fo:table-row>
|
2832
2921
|
<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
2922
|
|
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
2923
|
|
2838
2924
|
|
2839
2925
|
|
2926
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
2927
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
2928
|
+
</xsl:apply-templates>
|
2929
|
+
|
2930
|
+
|
2931
|
+
|
2932
|
+
|
2933
|
+
|
2934
|
+
|
2840
2935
|
</fo:table-cell>
|
2841
2936
|
</fo:table-row>
|
2842
2937
|
</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
@@ -2937,7 +3032,10 @@
|
|
2937
3032
|
|
2938
3033
|
|
2939
3034
|
<!-- fn processing -->
|
2940
|
-
|
3035
|
+
|
3036
|
+
<xsl:call-template name="table_fn_display"/>
|
3037
|
+
|
3038
|
+
|
2941
3039
|
|
2942
3040
|
<!-- for PAS display Notes after footnotes -->
|
2943
3041
|
|
@@ -2947,6 +3045,9 @@
|
|
2947
3045
|
</fo:table-body>
|
2948
3046
|
|
2949
3047
|
</fo:table>
|
3048
|
+
|
3049
|
+
|
3050
|
+
|
2950
3051
|
</xsl:if>
|
2951
3052
|
</xsl:template><xsl:template match="*[local-name()='tbody']">
|
2952
3053
|
|
@@ -3035,6 +3136,9 @@
|
|
3035
3136
|
|
3036
3137
|
|
3037
3138
|
|
3139
|
+
|
3140
|
+
|
3141
|
+
|
3038
3142
|
|
3039
3143
|
|
3040
3144
|
<xsl:call-template name="setTableRowAttributes"/>
|
@@ -3054,6 +3158,8 @@
|
|
3054
3158
|
|
3055
3159
|
|
3056
3160
|
|
3161
|
+
|
3162
|
+
|
3057
3163
|
<xsl:call-template name="setTableRowAttributes"/>
|
3058
3164
|
<xsl:apply-templates/>
|
3059
3165
|
</fo:table-row>
|
@@ -3135,6 +3241,8 @@
|
|
3135
3241
|
|
3136
3242
|
|
3137
3243
|
|
3244
|
+
|
3245
|
+
|
3138
3246
|
|
3139
3247
|
|
3140
3248
|
|
@@ -3206,7 +3314,11 @@
|
|
3206
3314
|
|
3207
3315
|
<xsl:variable name="gen_id" select="generate-id(.)"/>
|
3208
3316
|
<xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
|
3209
|
-
<xsl:variable name="
|
3317
|
+
<xsl:variable name="reference_">
|
3318
|
+
<xsl:value-of select="@reference"/>
|
3319
|
+
<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
|
3320
|
+
</xsl:variable>
|
3321
|
+
<xsl:variable name="reference" select="normalize-space($reference_)"/>
|
3210
3322
|
<!-- fn sequence number in document -->
|
3211
3323
|
<xsl:variable name="current_fn_number">
|
3212
3324
|
<xsl:choose>
|
@@ -3281,7 +3393,7 @@
|
|
3281
3393
|
<xsl:copy-of select="node()"/>
|
3282
3394
|
</fn>
|
3283
3395
|
</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']/*">
|
3396
|
+
<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
3397
|
<xsl:sort select="@displayorder" data-type="number"/>
|
3286
3398
|
<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
3399
|
<!-- copy unique fn -->
|
@@ -4922,6 +5034,11 @@
|
|
4922
5034
|
</xsl:variable>
|
4923
5035
|
<fo:inline xsl:use-attribute-sets="link-style">
|
4924
5036
|
|
5037
|
+
<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
|
5038
|
+
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
5039
|
+
</xsl:if>
|
5040
|
+
|
5041
|
+
|
4925
5042
|
|
4926
5043
|
|
4927
5044
|
|
@@ -5182,7 +5299,19 @@
|
|
5182
5299
|
<xsl:value-of select="$suffix"/>
|
5183
5300
|
</xsl:if>
|
5184
5301
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
5185
|
-
<
|
5302
|
+
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
5303
|
+
<xsl:choose>
|
5304
|
+
<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
|
5305
|
+
<fo:inline xsl:use-attribute-sets="termnote-p-style">
|
5306
|
+
<xsl:apply-templates/>
|
5307
|
+
</fo:inline>
|
5308
|
+
</xsl:when>
|
5309
|
+
<xsl:otherwise>
|
5310
|
+
<fo:block xsl:use-attribute-sets="termnote-p-style">
|
5311
|
+
<xsl:apply-templates/>
|
5312
|
+
</fo:block>
|
5313
|
+
</xsl:otherwise>
|
5314
|
+
</xsl:choose>
|
5186
5315
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5187
5316
|
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
5188
5317
|
<fo:block id="{@id}">
|
@@ -5999,7 +6128,7 @@
|
|
5999
6128
|
</xsl:choose>
|
6000
6129
|
</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">
|
6001
6130
|
<xsl:value-of select="."/>
|
6002
|
-
</xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6131
|
+
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6003
6132
|
<xsl:text> </xsl:text>
|
6004
6133
|
</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
|
6005
6134
|
<xsl:copy>
|
@@ -6858,6 +6987,7 @@
|
|
6858
6987
|
|
6859
6988
|
|
6860
6989
|
|
6990
|
+
|
6861
6991
|
</xsl:variable>
|
6862
6992
|
|
6863
6993
|
<xsl:variable name="padding-right">
|
@@ -7471,7 +7601,7 @@
|
|
7471
7601
|
|
7472
7602
|
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7473
7603
|
|
7474
|
-
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7604
|
+
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7475
7605
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
7476
7606
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
7477
7607
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
@@ -7482,7 +7612,9 @@
|
|
7482
7612
|
|
7483
7613
|
<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
|
7484
7614
|
<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
|
7485
|
-
|
7615
|
+
|
7616
|
+
<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
|
7617
|
+
|
7486
7618
|
</xsl:if>
|
7487
7619
|
|
7488
7620
|
</fo:inline>
|
@@ -8054,6 +8186,8 @@
|
|
8054
8186
|
</xsl:when>
|
8055
8187
|
<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
|
8056
8188
|
</xsl:choose>
|
8189
|
+
</xsl:template><xsl:template match="*[local-name() = 'lang_none']">
|
8190
|
+
<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
|
8057
8191
|
</xsl:template><xsl:template name="printEdition">
|
8058
8192
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
8059
8193
|
<xsl:text> </xsl:text>
|
@@ -8160,6 +8294,27 @@
|
|
8160
8294
|
</xsl:when>
|
8161
8295
|
<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
|
8162
8296
|
</xsl:choose>
|
8297
|
+
</xsl:template><xsl:template name="getMonthLocalizedByNum">
|
8298
|
+
<xsl:param name="num"/>
|
8299
|
+
<xsl:variable name="monthStr">
|
8300
|
+
<xsl:choose>
|
8301
|
+
<xsl:when test="$num = '01'">january</xsl:when>
|
8302
|
+
<xsl:when test="$num = '02'">february</xsl:when>
|
8303
|
+
<xsl:when test="$num = '03'">march</xsl:when>
|
8304
|
+
<xsl:when test="$num = '04'">april</xsl:when>
|
8305
|
+
<xsl:when test="$num = '05'">may</xsl:when>
|
8306
|
+
<xsl:when test="$num = '06'">june</xsl:when>
|
8307
|
+
<xsl:when test="$num = '07'">july</xsl:when>
|
8308
|
+
<xsl:when test="$num = '08'">august</xsl:when>
|
8309
|
+
<xsl:when test="$num = '09'">september</xsl:when>
|
8310
|
+
<xsl:when test="$num = '10'">october</xsl:when>
|
8311
|
+
<xsl:when test="$num = '11'">november</xsl:when>
|
8312
|
+
<xsl:when test="$num = '12'">december</xsl:when>
|
8313
|
+
</xsl:choose>
|
8314
|
+
</xsl:variable>
|
8315
|
+
<xsl:call-template name="getLocalizedString">
|
8316
|
+
<xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
|
8317
|
+
</xsl:call-template>
|
8163
8318
|
</xsl:template><xsl:template name="insertKeywords">
|
8164
8319
|
<xsl:param name="sorting" select="'true'"/>
|
8165
8320
|
<xsl:param name="charAtEnd" select="'.'"/>
|
@@ -8358,6 +8513,7 @@
|
|
8358
8513
|
|
8359
8514
|
|
8360
8515
|
|
8516
|
+
|
8361
8517
|
<xsl:value-of select="document('')//*/namespace::csd"/>
|
8362
8518
|
|
8363
8519
|
|
@@ -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
@@ -703,6 +703,9 @@
|
|
703
703
|
<optional>
|
704
704
|
<attribute name="tag"/>
|
705
705
|
</optional>
|
706
|
+
<optional>
|
707
|
+
<attribute name="type"/>
|
708
|
+
</optional>
|
706
709
|
<optional>
|
707
710
|
<attribute name="multilingual-rendering">
|
708
711
|
<ref name="MultilingualRenderingType"/>
|
@@ -738,6 +741,9 @@
|
|
738
741
|
<optional>
|
739
742
|
<attribute name="tag"/>
|
740
743
|
</optional>
|
744
|
+
<optional>
|
745
|
+
<attribute name="type"/>
|
746
|
+
</optional>
|
741
747
|
<optional>
|
742
748
|
<attribute name="multilingual-rendering">
|
743
749
|
<ref name="MultilingualRenderingType"/>
|
@@ -2059,6 +2065,7 @@
|
|
2059
2065
|
<value>compare</value>
|
2060
2066
|
<value>contrast</value>
|
2061
2067
|
<value>see</value>
|
2068
|
+
<value>seealso</value>
|
2062
2069
|
</choice>
|
2063
2070
|
</define>
|
2064
2071
|
<define name="deprecates">
|
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.3
|
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-06-
|
11
|
+
date: 2022-06-21 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.
|