metanorma-csa 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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 45959b5a6ad480a4f137f112b1870251f630aaaebc6372a7a29aaac39f3af260
4
- data.tar.gz: aacc7798825826fcc91fff4add677c85b47accde7166ec675be98dbe618b633d
3
+ metadata.gz: 6139996072717cfc8cf816cb62386b0c9ac9627bd5696b43ad259a5131923295
4
+ data.tar.gz: 14644e80340f6ee2c18f94866c6f5e25d4aa8ffc5817692be334771e42d574d1
5
5
  SHA512:
6
- metadata.gz: 8c4baf779ffc4f2a63431205baece87358bc7ca6921e253c2347cd6c9a07e616363696f694818ebb8fcc1756b8f6665006b5cf96320627be2e220999ee42d80e
7
- data.tar.gz: 6d62db06a77d5b0ea15011bde9131d3384597809874844359f9be7f96d6e125894d9ff87c4343dd656c835774d782372d56b4a2580623a6f483d1935dba09552
6
+ metadata.gz: 59f769d2b1949d9fd9e2c5596f2a502534048b1c7c5a7d4e0889e723b9fe217168eeafce6422f6e0410761c3757446222de0de18e64253e098f27210ed0add42
7
+ data.tar.gz: 8b157609f48ddafdb23d172986c382039c8bc743d4f10539225d8ad52e0636f8222ccf0462c2b4f6f1963edabf118e128b161611c7f7db56604e04e87bf2af90
@@ -722,11 +722,12 @@
722
722
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
723
723
  </xsl:otherwise>
724
724
  </xsl:choose>
725
- </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">
725
+ </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">
726
726
 
727
727
 
728
728
 
729
- <xsl:attribute name="font-family">Azo Sans, STIX Two Math</xsl:attribute>
729
+ <xsl:attribute name="font-family">Azo Sans, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
730
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
730
731
  <xsl:attribute name="font-size">10pt</xsl:attribute>
731
732
 
732
733
 
@@ -742,6 +743,7 @@
742
743
 
743
744
 
744
745
 
746
+
745
747
  </xsl:attribute-set><xsl:template name="insertRootStyle">
746
748
  <xsl:param name="root-style"/>
747
749
  <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
@@ -753,17 +755,60 @@
753
755
  </xsl:variable>
754
756
  <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
755
757
 
758
+ <xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
759
+
756
760
  <xsl:for-each select="$root-style_/root-style/@*">
761
+
757
762
  <xsl:choose>
758
- <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
763
+ <xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
764
+ <xsl:when test="local-name() = 'font-family'">
765
+
766
+ <xsl:variable name="font_regional_prefix">
767
+ <xsl:choose>
768
+ <xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
769
+ <xsl:otherwise>Noto Serif</xsl:otherwise>
770
+ </xsl:choose>
771
+ </xsl:variable>
772
+
759
773
  <xsl:attribute name="{local-name()}">
760
- <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
774
+
775
+ <xsl:variable name="font_extended">
776
+ <xsl:choose>
777
+ <xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
778
+ <xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
779
+ <xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
780
+ <xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
781
+ <xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
782
+ <xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
783
+ </xsl:choose>
784
+ </xsl:variable>
785
+ <xsl:if test="normalize-space($font_extended) != ''">
786
+ <xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
787
+ <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
788
+ </xsl:if>
789
+
790
+ <xsl:value-of select="."/>
791
+
792
+ <xsl:if test="$additional_fonts != ''">
793
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
794
+ </xsl:if>
761
795
  </xsl:attribute>
762
796
  </xsl:when>
763
797
  <xsl:otherwise>
764
798
  <xsl:copy-of select="."/>
765
799
  </xsl:otherwise>
766
800
  </xsl:choose>
801
+
802
+ <!-- <xsl:choose>
803
+ <xsl:when test="local-name() = 'font-family'">
804
+ <xsl:attribute name="{local-name()}">
805
+ <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
806
+ </xsl:attribute>
807
+ </xsl:when>
808
+ <xsl:otherwise>
809
+ <xsl:copy-of select="."/>
810
+ </xsl:otherwise>
811
+ </xsl:choose> -->
767
812
  </xsl:for-each>
768
813
  </xsl:template><xsl:attribute-set name="copyright-statement-style">
769
814
 
@@ -829,7 +874,7 @@
829
874
  <xsl:attribute name="role">Code</xsl:attribute>
830
875
 
831
876
 
832
- <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
877
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
833
878
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
834
879
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
835
880
  <xsl:attribute name="line-height">113%</xsl:attribute>
@@ -842,6 +887,7 @@
842
887
 
843
888
 
844
889
 
890
+
845
891
 
846
892
 
847
893
 
@@ -856,7 +902,10 @@
856
902
 
857
903
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
858
904
 
905
+
859
906
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
907
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
908
+
860
909
 
861
910
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
862
911
 
@@ -885,6 +934,7 @@
885
934
 
886
935
 
887
936
 
937
+
888
938
 
889
939
  </xsl:attribute-set><xsl:attribute-set name="example-style">
890
940
 
@@ -902,6 +952,7 @@
902
952
 
903
953
 
904
954
 
955
+
905
956
  </xsl:attribute-set><xsl:attribute-set name="example-body-style">
906
957
 
907
958
  <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
@@ -929,6 +980,7 @@
929
980
 
930
981
 
931
982
 
983
+
932
984
 
933
985
 
934
986
 
@@ -959,10 +1011,12 @@
959
1011
 
960
1012
 
961
1013
 
1014
+
962
1015
 
963
1016
 
964
1017
  </xsl:attribute-set><xsl:variable name="table-border_">
965
1018
 
1019
+
966
1020
  </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
967
1021
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
968
1022
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -985,6 +1039,7 @@
985
1039
 
986
1040
 
987
1041
 
1042
+
988
1043
 
989
1044
 
990
1045
 
@@ -1014,6 +1069,7 @@
1014
1069
 
1015
1070
 
1016
1071
 
1072
+
1017
1073
 
1018
1074
 
1019
1075
  </xsl:attribute-set><xsl:attribute-set name="table-name-style">
@@ -1022,6 +1078,7 @@
1022
1078
 
1023
1079
 
1024
1080
 
1081
+
1025
1082
 
1026
1083
 
1027
1084
 
@@ -1092,6 +1149,7 @@
1092
1149
 
1093
1150
 
1094
1151
 
1152
+
1095
1153
  </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1096
1154
  <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1097
1155
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -1104,7 +1162,7 @@
1104
1162
 
1105
1163
 
1106
1164
 
1107
-
1165
+
1108
1166
 
1109
1167
 
1110
1168
 
@@ -1119,6 +1177,7 @@
1119
1177
 
1120
1178
 
1121
1179
 
1180
+
1122
1181
  </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
1123
1182
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1124
1183
 
@@ -1127,6 +1186,8 @@
1127
1186
 
1128
1187
 
1129
1188
 
1189
+
1190
+
1130
1191
  </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
1131
1192
  <xsl:attribute name="font-size">80%</xsl:attribute>
1132
1193
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1142,6 +1203,7 @@
1142
1203
 
1143
1204
 
1144
1205
 
1206
+
1145
1207
  </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
1146
1208
  <xsl:attribute name="text-indent">0</xsl:attribute>
1147
1209
  <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>
@@ -1182,6 +1245,7 @@
1182
1245
 
1183
1246
 
1184
1247
 
1248
+
1185
1249
 
1186
1250
 
1187
1251
 
@@ -1230,6 +1294,7 @@
1230
1294
 
1231
1295
 
1232
1296
 
1297
+
1233
1298
 
1234
1299
 
1235
1300
 
@@ -1270,7 +1335,8 @@
1270
1335
 
1271
1336
 
1272
1337
 
1273
-
1338
+
1339
+
1274
1340
 
1275
1341
 
1276
1342
 
@@ -1286,6 +1352,7 @@
1286
1352
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1287
1353
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1288
1354
 
1355
+
1289
1356
 
1290
1357
 
1291
1358
 
@@ -1296,6 +1363,8 @@
1296
1363
 
1297
1364
 
1298
1365
 
1366
+ </xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
1367
+
1299
1368
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1300
1369
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
1301
1370
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -1354,6 +1423,7 @@
1354
1423
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1355
1424
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1356
1425
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1426
+
1357
1427
 
1358
1428
 
1359
1429
 
@@ -1397,6 +1467,7 @@
1397
1467
 
1398
1468
 
1399
1469
 
1470
+
1400
1471
  </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
1401
1472
  <xsl:attribute name="text-align">right</xsl:attribute>
1402
1473
 
@@ -1415,19 +1486,19 @@
1415
1486
  </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1416
1487
 
1417
1488
  </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1489
+ <xsl:attribute name="width">100%</xsl:attribute>
1490
+ <xsl:attribute name="content-height">100%</xsl:attribute>
1491
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
1418
1492
 
1419
1493
 
1420
- <xsl:attribute name="width">100%</xsl:attribute>
1421
1494
  <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1422
- <xsl:attribute name="scaling">uniform</xsl:attribute>
1423
1495
 
1424
1496
 
1425
1497
 
1426
-
1427
-
1498
+
1428
1499
  </xsl:attribute-set><xsl:attribute-set name="tt-style">
1429
1500
 
1430
- <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1501
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1431
1502
 
1432
1503
 
1433
1504
 
@@ -1512,6 +1583,7 @@
1512
1583
 
1513
1584
 
1514
1585
 
1586
+
1515
1587
  </xsl:attribute-set><xsl:attribute-set name="list-name-style">
1516
1588
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1517
1589
 
@@ -1577,6 +1649,7 @@
1577
1649
 
1578
1650
 
1579
1651
 
1652
+
1580
1653
  </xsl:attribute-set><xsl:attribute-set name="fn-body-style">
1581
1654
  <xsl:attribute name="font-weight">normal</xsl:attribute>
1582
1655
  <xsl:attribute name="font-style">normal</xsl:attribute>
@@ -1606,6 +1679,7 @@
1606
1679
 
1607
1680
 
1608
1681
 
1682
+
1609
1683
  </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
1610
1684
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1611
1685
 
@@ -1628,6 +1702,7 @@
1628
1702
 
1629
1703
 
1630
1704
 
1705
+
1631
1706
  </xsl:attribute-set><xsl:attribute-set name="admonition-style">
1632
1707
 
1633
1708
  <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
@@ -1649,10 +1724,11 @@
1649
1724
 
1650
1725
 
1651
1726
 
1727
+
1652
1728
  </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
1729
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1730
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1653
1731
 
1654
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
1655
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
1656
1732
  <xsl:attribute name="padding">2mm</xsl:attribute>
1657
1733
  <xsl:attribute name="padding-top">3mm</xsl:attribute>
1658
1734
 
@@ -1665,6 +1741,7 @@
1665
1741
 
1666
1742
 
1667
1743
 
1744
+
1668
1745
  </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
1669
1746
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1670
1747
 
@@ -1700,6 +1777,7 @@
1700
1777
 
1701
1778
 
1702
1779
 
1780
+
1703
1781
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
1704
1782
 
1705
1783
 
@@ -1731,6 +1809,10 @@
1731
1809
 
1732
1810
 
1733
1811
 
1812
+ <!-- <xsl:if test="$namespace = 'ieee'">
1813
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1814
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
1815
+ </xsl:if> -->
1734
1816
 
1735
1817
 
1736
1818
 
@@ -1760,13 +1842,16 @@
1760
1842
 
1761
1843
 
1762
1844
 
1845
+
1763
1846
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
1764
1847
 
1765
1848
 
1849
+
1766
1850
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
1767
1851
 
1768
1852
 
1769
1853
 
1854
+
1770
1855
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
1771
1856
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1772
1857
  <xsl:attribute name="font-size">65%</xsl:attribute>
@@ -1788,6 +1873,7 @@
1788
1873
 
1789
1874
 
1790
1875
 
1876
+
1791
1877
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
1792
1878
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1793
1879
 
@@ -1809,6 +1895,7 @@
1809
1895
 
1810
1896
 
1811
1897
 
1898
+
1812
1899
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
1813
1900
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1814
1901
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -1827,6 +1914,7 @@
1827
1914
 
1828
1915
 
1829
1916
 
1917
+
1830
1918
  </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
1831
1919
 
1832
1920
 
@@ -2258,6 +2346,8 @@
2258
2346
 
2259
2347
 
2260
2348
 
2349
+
2350
+
2261
2351
 
2262
2352
 
2263
2353
 
@@ -2297,6 +2387,8 @@
2297
2387
 
2298
2388
 
2299
2389
 
2390
+
2391
+
2300
2392
  </xsl:element>
2301
2393
  </xsl:variable>
2302
2394
 
@@ -2384,6 +2476,14 @@
2384
2476
 
2385
2477
 
2386
2478
 
2479
+ <xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
2480
+ <fo:block keep-with-previous="always" line-height="0.1">
2481
+ <xsl:for-each select="*[local-name()='bookmark']">
2482
+ <xsl:call-template name="bookmark"/>
2483
+ </xsl:for-each>
2484
+ </fo:block>
2485
+ </xsl:if>
2486
+
2387
2487
  </fo:block-container>
2388
2488
  </xsl:variable>
2389
2489
 
@@ -2442,23 +2542,29 @@
2442
2542
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
2443
2543
  <xsl:param name="continued"/>
2444
2544
  <xsl:if test="normalize-space() != ''">
2445
- <fo:block xsl:use-attribute-sets="table-name-style">
2446
-
2447
-
2448
-
2449
-
2545
+
2546
+
2450
2547
 
2451
- <xsl:choose>
2452
- <xsl:when test="$continued = 'true'">
2548
+ <fo:block xsl:use-attribute-sets="table-name-style">
2549
+
2453
2550
 
2454
- </xsl:when>
2455
- <xsl:otherwise>
2456
- <xsl:apply-templates/>
2457
- </xsl:otherwise>
2458
- </xsl:choose>
2459
-
2551
+
2552
+
2553
+
2554
+ <xsl:choose>
2555
+ <xsl:when test="$continued = 'true'">
2556
+
2557
+ </xsl:when>
2558
+ <xsl:otherwise>
2559
+ <xsl:apply-templates/>
2560
+ </xsl:otherwise>
2561
+ </xsl:choose>
2562
+
2563
+
2564
+ </fo:block>
2565
+
2460
2566
 
2461
- </fo:block>
2567
+
2462
2568
  </xsl:if>
2463
2569
  </xsl:template><xsl:template name="calculate-columns-numbers">
2464
2570
  <xsl:param name="table-row"/>
@@ -2856,12 +2962,18 @@
2856
2962
  <fo:table-row>
2857
2963
  <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">
2858
2964
 
2859
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
2860
- <xsl:with-param name="continued">true</xsl:with-param>
2861
- </xsl:apply-templates>
2862
2965
 
2863
2966
 
2864
2967
 
2968
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
2969
+ <xsl:with-param name="continued">true</xsl:with-param>
2970
+ </xsl:apply-templates>
2971
+
2972
+
2973
+
2974
+
2975
+
2976
+
2865
2977
  </fo:table-cell>
2866
2978
  </fo:table-row>
2867
2979
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -2901,77 +3013,91 @@
2901
3013
  </xsl:choose>
2902
3014
  </xsl:variable>
2903
3015
 
2904
- <fo:table keep-with-previous="always">
2905
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2906
- <xsl:variable name="name" select="local-name()"/>
3016
+
3017
+ <xsl:variable name="tableWithNotesAndFootnotes">
3018
+
3019
+ <fo:table keep-with-previous="always">
3020
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3021
+ <xsl:variable name="name" select="local-name()"/>
3022
+ <xsl:choose>
3023
+ <xsl:when test="$name = 'border-top'">
3024
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3025
+ </xsl:when>
3026
+ <xsl:when test="$name = 'border'">
3027
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3028
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3029
+ </xsl:when>
3030
+ <xsl:otherwise>
3031
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3032
+ </xsl:otherwise>
3033
+ </xsl:choose>
3034
+ </xsl:for-each>
3035
+
3036
+
3037
+
2907
3038
  <xsl:choose>
2908
- <xsl:when test="$name = 'border-top'">
2909
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
2910
- </xsl:when>
2911
- <xsl:when test="$name = 'border'">
2912
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2913
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3039
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3040
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3041
+ <fo:table-column column-width="{@width}"/>
3042
+ </xsl:for-each>
2914
3043
  </xsl:when>
2915
3044
  <xsl:otherwise>
2916
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3045
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3046
+ <xsl:call-template name="insertTableColumnWidth">
3047
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3048
+ </xsl:call-template>
2917
3049
  </xsl:otherwise>
2918
3050
  </xsl:choose>
2919
- </xsl:for-each>
2920
-
2921
-
2922
-
2923
- <xsl:choose>
2924
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2925
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2926
- <fo:table-column column-width="{@width}"/>
2927
- </xsl:for-each>
2928
- </xsl:when>
2929
- <xsl:otherwise>
2930
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
2931
- <xsl:call-template name="insertTableColumnWidth">
2932
- <xsl:with-param name="colwidths" select="$colwidths"/>
2933
- </xsl:call-template>
2934
- </xsl:otherwise>
2935
- </xsl:choose>
2936
-
2937
- <fo:table-body>
2938
- <fo:table-row>
2939
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
2940
-
2941
-
3051
+
3052
+ <fo:table-body>
3053
+ <fo:table-row>
3054
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3055
+
3056
+
2942
3057
 
2943
-
2944
-
2945
- <!-- fn will be processed inside 'note' processing -->
2946
-
2947
-
2948
-
2949
-
2950
-
2951
-
2952
- <!-- for BSI (not PAS) display Notes before footnotes -->
2953
-
2954
-
2955
- <!-- except gb and bsi -->
2956
-
2957
- <xsl:apply-templates select="../*[local-name()='note']"/>
2958
3058
 
2959
-
2960
-
2961
- <!-- horizontal row separator -->
2962
-
2963
-
2964
- <!-- fn processing -->
2965
- <xsl:call-template name="table_fn_display"/>
2966
-
2967
- <!-- for PAS display Notes after footnotes -->
2968
-
2969
-
2970
- </fo:table-cell>
2971
- </fo:table-row>
2972
- </fo:table-body>
2973
-
2974
- </fo:table>
3059
+
3060
+ <!-- fn will be processed inside 'note' processing -->
3061
+
3062
+
3063
+
3064
+
3065
+
3066
+
3067
+ <!-- for BSI (not PAS) display Notes before footnotes -->
3068
+
3069
+
3070
+ <!-- except gb and bsi -->
3071
+
3072
+ <xsl:apply-templates select="../*[local-name()='note']"/>
3073
+
3074
+
3075
+
3076
+ <!-- horizontal row separator -->
3077
+
3078
+
3079
+ <!-- fn processing -->
3080
+
3081
+ <xsl:call-template name="table_fn_display"/>
3082
+
3083
+
3084
+
3085
+ <!-- for PAS display Notes after footnotes -->
3086
+
3087
+
3088
+ </fo:table-cell>
3089
+ </fo:table-row>
3090
+ </fo:table-body>
3091
+
3092
+ </fo:table>
3093
+ </xsl:variable>
3094
+
3095
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
3096
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
3097
+ </xsl:if>
3098
+
3099
+
3100
+
2975
3101
  </xsl:if>
2976
3102
  </xsl:template><xsl:template match="*[local-name()='tbody']">
2977
3103
 
@@ -3060,6 +3186,9 @@
3060
3186
 
3061
3187
 
3062
3188
 
3189
+
3190
+
3191
+
3063
3192
 
3064
3193
 
3065
3194
  <xsl:call-template name="setTableRowAttributes"/>
@@ -3079,6 +3208,8 @@
3079
3208
 
3080
3209
 
3081
3210
 
3211
+
3212
+
3082
3213
  <xsl:call-template name="setTableRowAttributes"/>
3083
3214
  <xsl:apply-templates/>
3084
3215
  </fo:table-row>
@@ -3160,6 +3291,8 @@
3160
3291
 
3161
3292
 
3162
3293
 
3294
+
3295
+
3163
3296
 
3164
3297
 
3165
3298
 
@@ -3231,7 +3364,11 @@
3231
3364
 
3232
3365
  <xsl:variable name="gen_id" select="generate-id(.)"/>
3233
3366
  <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
3234
- <xsl:variable name="reference" select="@reference"/>
3367
+ <xsl:variable name="reference_">
3368
+ <xsl:value-of select="@reference"/>
3369
+ <xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
3370
+ </xsl:variable>
3371
+ <xsl:variable name="reference" select="normalize-space($reference_)"/>
3235
3372
  <!-- fn sequence number in document -->
3236
3373
  <xsl:variable name="current_fn_number">
3237
3374
  <xsl:choose>
@@ -3251,6 +3388,7 @@
3251
3388
  <xsl:variable name="footnote_inline">
3252
3389
  <fo:inline xsl:use-attribute-sets="fn-num-style">
3253
3390
 
3391
+
3254
3392
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
3255
3393
  <xsl:value-of select="$current_fn_number_text"/>
3256
3394
  </fo:basic-link>
@@ -3272,8 +3410,12 @@
3272
3410
  <fo:block xsl:use-attribute-sets="fn-body-style">
3273
3411
 
3274
3412
 
3413
+
3275
3414
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
3276
3415
 
3416
+
3417
+
3418
+
3277
3419
  <xsl:value-of select="$current_fn_number_text"/>
3278
3420
  </fo:inline>
3279
3421
  <xsl:apply-templates/>
@@ -3306,7 +3448,7 @@
3306
3448
  <xsl:copy-of select="node()"/>
3307
3449
  </fn>
3308
3450
  </xsl:for-each>
3309
- <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']/*">
3451
+ <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']/*">
3310
3452
  <xsl:sort select="@displayorder" data-type="number"/>
3311
3453
  <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])]">
3312
3454
  <!-- copy unique fn -->
@@ -4947,6 +5089,13 @@
4947
5089
  </xsl:variable>
4948
5090
  <fo:inline xsl:use-attribute-sets="link-style">
4949
5091
 
5092
+ <xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
5093
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5094
+ </xsl:if>
5095
+
5096
+
5097
+
5098
+
4950
5099
 
4951
5100
 
4952
5101
 
@@ -5164,6 +5313,7 @@
5164
5313
 
5165
5314
 
5166
5315
 
5316
+
5167
5317
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5168
5318
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
5169
5319
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5186,6 +5336,7 @@
5186
5336
  <xsl:otherwise>
5187
5337
 
5188
5338
 
5339
+
5189
5340
  </xsl:otherwise>
5190
5341
  </xsl:choose>
5191
5342
  </xsl:variable>
@@ -5203,6 +5354,7 @@
5203
5354
  <xsl:otherwise>
5204
5355
 
5205
5356
 
5357
+
5206
5358
  </xsl:otherwise>
5207
5359
  </xsl:choose>
5208
5360
  </xsl:variable>
@@ -5211,7 +5363,19 @@
5211
5363
  <xsl:value-of select="$suffix"/>
5212
5364
  </xsl:if>
5213
5365
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
5214
- <fo:inline><xsl:apply-templates/></fo:inline>
5366
+ <xsl:variable name="num"><xsl:number/></xsl:variable>
5367
+ <xsl:choose>
5368
+ <xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
5369
+ <fo:inline xsl:use-attribute-sets="termnote-p-style">
5370
+ <xsl:apply-templates/>
5371
+ </fo:inline>
5372
+ </xsl:when>
5373
+ <xsl:otherwise>
5374
+ <fo:block xsl:use-attribute-sets="termnote-p-style">
5375
+ <xsl:apply-templates/>
5376
+ </fo:block>
5377
+ </xsl:otherwise>
5378
+ </xsl:choose>
5215
5379
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
5216
5380
  <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
5217
5381
  <fo:block id="{@id}">
@@ -5966,6 +6130,9 @@
5966
6130
  <fo:block xsl:use-attribute-sets="figure-name-style">
5967
6131
 
5968
6132
 
6133
+
6134
+
6135
+
5969
6136
  <xsl:apply-templates/>
5970
6137
  </fo:block>
5971
6138
  </xsl:if>
@@ -6026,9 +6193,9 @@
6026
6193
  <xsl:apply-templates/>
6027
6194
  </xsl:otherwise>
6028
6195
  </xsl:choose>
6029
- </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">
6196
+ </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">
6030
6197
  <xsl:value-of select="."/>
6031
- </xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6198
+ </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6032
6199
  <xsl:text> </xsl:text>
6033
6200
  </xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
6034
6201
  <xsl:copy>
@@ -6102,6 +6269,9 @@
6102
6269
  <!-- 9 -->
6103
6270
 
6104
6271
 
6272
+ <!-- <xsl:if test="$namespace = 'ieee'">
6273
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6274
+ </xsl:if> -->
6105
6275
 
6106
6276
 
6107
6277
 
@@ -6546,10 +6716,14 @@
6546
6716
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
6547
6717
  <xsl:variable name="element">inline
6548
6718
 
6719
+
6549
6720
  </xsl:variable>
6550
6721
  <xsl:choose>
6551
6722
  <xsl:when test="contains($element, 'block')">
6552
6723
  <fo:block xsl:use-attribute-sets="example-p-style">
6724
+
6725
+
6726
+
6553
6727
  <xsl:apply-templates/>
6554
6728
  </fo:block>
6555
6729
  </xsl:when>
@@ -6657,6 +6831,7 @@
6657
6831
  </xsl:if>
6658
6832
  <fo:block xsl:use-attribute-sets="example-p-style">
6659
6833
 
6834
+
6660
6835
  <xsl:apply-templates/>
6661
6836
  </fo:block>
6662
6837
  </fo:block-container>
@@ -6813,6 +6988,8 @@
6813
6988
 
6814
6989
 
6815
6990
 
6991
+
6992
+
6816
6993
  <fo:basic-link fox:alt-text="{@citeas}">
6817
6994
  <xsl:if test="normalize-space(@citeas) = ''">
6818
6995
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -6878,6 +7055,7 @@
6878
7055
 
6879
7056
 
6880
7057
 
7058
+
6881
7059
  </xsl:variable>
6882
7060
 
6883
7061
  <xsl:variable name="padding-right">
@@ -7230,6 +7408,8 @@
7230
7408
 
7231
7409
 
7232
7410
 
7411
+
7412
+
7233
7413
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7234
7414
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7235
7415
  <xsl:call-template name="append_add-style"/>
@@ -7414,7 +7594,7 @@
7414
7594
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
7415
7595
  <!-- to split by '_' and other chars -->
7416
7596
  <xsl:call-template name="add-zero-spaces-java"/>
7417
- </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7597
+ </xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
7418
7598
  <!-- <fo:inline id="{@id}" font-size="1pt"/> -->
7419
7599
  <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
7420
7600
  <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
@@ -7487,7 +7667,7 @@
7487
7667
  </fo:block>
7488
7668
 
7489
7669
 
7490
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
7670
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
7491
7671
 
7492
7672
 
7493
7673
  <!-- start CSA bibitem processing -->
@@ -7496,7 +7676,7 @@
7496
7676
  <xsl:variable name="docidentifier">
7497
7677
  <xsl:value-of select="csa:docidentifier[@type = 'metanorma-ordinal']"/>
7498
7678
  <xsl:if test="not(csa:docidentifier[@type = 'metanorma-ordinal'])">
7499
- <xsl:number format="[1]"/>
7679
+ <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
7500
7680
  </xsl:if>
7501
7681
  </xsl:variable>
7502
7682
 
@@ -7844,12 +8024,16 @@
7844
8024
  <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
7845
8025
 
7846
8026
 
8027
+
8028
+
7847
8029
 
7848
8030
 
7849
8031
 
7850
8032
  <fo:block-container xsl:use-attribute-sets="admonition-container-style">
7851
8033
 
7852
8034
 
8035
+
8036
+
7853
8037
  <fo:block-container margin-left="0mm" margin-right="0mm">
7854
8038
  <fo:block>
7855
8039
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
@@ -8052,6 +8236,8 @@
8052
8236
  </xsl:when>
8053
8237
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
8054
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>
8055
8241
  </xsl:template><xsl:template name="printEdition">
8056
8242
  <xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
8057
8243
  <xsl:text> </xsl:text>
@@ -8158,8 +8344,30 @@
8158
8344
  </xsl:when>
8159
8345
  <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
8160
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>
8161
8368
  </xsl:template><xsl:template name="insertKeywords">
8162
8369
  <xsl:param name="sorting" select="'true'"/>
8370
+ <xsl:param name="meta" select="'false'"/>
8163
8371
  <xsl:param name="charAtEnd" select="'.'"/>
8164
8372
  <xsl:param name="charDelim" select="', '"/>
8165
8373
  <xsl:choose>
@@ -8167,6 +8375,7 @@
8167
8375
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8168
8376
  <xsl:sort data-type="text" order="ascending"/>
8169
8377
  <xsl:call-template name="insertKeyword">
8378
+ <xsl:with-param name="meta" select="$meta"/>
8170
8379
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8171
8380
  <xsl:with-param name="charDelim" select="$charDelim"/>
8172
8381
  </xsl:call-template>
@@ -8175,6 +8384,7 @@
8175
8384
  <xsl:otherwise>
8176
8385
  <xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
8177
8386
  <xsl:call-template name="insertKeyword">
8387
+ <xsl:with-param name="meta" select="$meta"/>
8178
8388
  <xsl:with-param name="charAtEnd" select="$charAtEnd"/>
8179
8389
  <xsl:with-param name="charDelim" select="$charDelim"/>
8180
8390
  </xsl:call-template>
@@ -8184,7 +8394,15 @@
8184
8394
  </xsl:template><xsl:template name="insertKeyword">
8185
8395
  <xsl:param name="charAtEnd"/>
8186
8396
  <xsl:param name="charDelim"/>
8187
- <xsl:apply-templates/>
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>
8188
8406
  <xsl:choose>
8189
8407
  <xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
8190
8408
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
@@ -8229,13 +8447,15 @@
8229
8447
  <dc:description>
8230
8448
  <xsl:variable name="abstract">
8231
8449
 
8232
- <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'])]"/>
8233
8451
 
8234
8452
  </xsl:variable>
8235
8453
  <xsl:value-of select="normalize-space($abstract)"/>
8236
8454
  </dc:description>
8237
8455
  <pdf:Keywords>
8238
- <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>
8239
8459
  </pdf:Keywords>
8240
8460
  </rdf:Description>
8241
8461
  <rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
@@ -8355,6 +8575,7 @@
8355
8575
 
8356
8576
 
8357
8577
 
8578
+
8358
8579
  <xsl:value-of select="document('')//*/namespace::csa"/>
8359
8580
 
8360
8581
 
@@ -5,16 +5,15 @@ require "isodoc"
5
5
  module IsoDoc
6
6
  module Csa
7
7
  class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
8
- def annex1(f)
9
- lbl = @xrefs.anchor(f['id'], :label)
10
- if t = f.at(ns("./title"))
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(f, "<br/>", lbl, "title")
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
-
@@ -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
- <optional>
732
+ <zeroOrMore>
642
733
  <ref name="version"/>
643
- </optional>
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="BibliographicItem"/>
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
- <zeroOrMore>
1297
+ <optional>
1201
1298
  <ref name="draft"/>
1202
- </zeroOrMore>
1299
+ </optional>
1203
1300
  </element>
1204
1301
  </define>
1205
1302
  <define name="vedition">
@@ -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/>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Csa
3
- VERSION = "2.1.2".freeze
3
+ VERSION = "2.1.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-csa
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
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-06-06 00:00:00.000000000 Z
11
+ date: 2022-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
247
247
  - !ruby/object:Gem::Version
248
248
  version: '0'
249
249
  requirements: []
250
- rubygems_version: 3.3.7
250
+ rubygems_version: 3.3.16
251
251
  signing_key:
252
252
  specification_version: 4
253
253
  summary: metanorma-csa lets you write CSA Normal Documents (CSAND) in AsciiDoc.