metanorma-m3aawg 2.1.1 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -652,14 +652,41 @@
652
652
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text>
653
653
  </xsl:variable>
654
654
 
655
- <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
655
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:variable name="table_widths_from_if_calculated_">
656
+ <xsl:for-each select="$table_widths_from_if//table">
657
+ <xsl:copy>
658
+ <xsl:copy-of select="@*"/>
659
+ <xsl:call-template name="calculate-column-widths-autolayout-algorithm"/>
660
+ </xsl:copy>
661
+ </xsl:for-each>
662
+ </xsl:variable><xsl:variable name="table_widths_from_if_calculated" select="xalan:nodeset($table_widths_from_if_calculated_)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_">
656
663
  false
657
664
  </xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang">
658
665
  <xsl:call-template name="getLang"/>
659
- </xsl:variable><xsl:variable name="pageWidth_">
660
- 215.9
666
+ </xsl:variable><xsl:variable name="papersize" select="java:toLowerCase(java:java.lang.String.new(normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata']/*[local-name() = 'papersize'])))"/><xsl:variable name="papersize_width_">
667
+ <xsl:choose>
668
+ <xsl:when test="$papersize = 'letter'">215.9</xsl:when>
669
+ <xsl:when test="$papersize = 'a4'">210</xsl:when>
670
+ </xsl:choose>
671
+ </xsl:variable><xsl:variable name="papersize_width" select="normalize-space($papersize_width_)"/><xsl:variable name="papersize_height_">
672
+ <xsl:choose>
673
+ <xsl:when test="$papersize = 'letter'">279.4</xsl:when>
674
+ <xsl:when test="$papersize = 'a4'">297</xsl:when>
675
+ </xsl:choose>
676
+ </xsl:variable><xsl:variable name="papersize_height" select="normalize-space($papersize_height_)"/><xsl:variable name="pageWidth_">
677
+ <xsl:choose>
678
+ <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
679
+ <xsl:otherwise>
680
+ 215.9
681
+ </xsl:otherwise>
682
+ </xsl:choose>
661
683
  </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
662
- 279.4
684
+ <xsl:choose>
685
+ <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
686
+ <xsl:otherwise>
687
+ 279.4
688
+ </xsl:otherwise>
689
+ </xsl:choose>
663
690
  </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
664
691
  17.3
665
692
  </xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
@@ -773,7 +800,8 @@
773
800
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
774
801
  </xsl:otherwise>
775
802
  </xsl:choose>
776
- </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
803
+ </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
804
+
777
805
 
778
806
 
779
807
 
@@ -784,7 +812,8 @@
784
812
 
785
813
 
786
814
 
787
- <xsl:attribute name="font-family">EB Garamond 12</xsl:attribute>
815
+ <xsl:attribute name="font-family">EB Garamond 12, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
816
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
788
817
  <xsl:attribute name="font-size">12pt</xsl:attribute>
789
818
 
790
819
 
@@ -804,17 +833,60 @@
804
833
  </xsl:variable>
805
834
  <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
806
835
 
836
+ <xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
837
+
807
838
  <xsl:for-each select="$root-style_/root-style/@*">
839
+
808
840
  <xsl:choose>
809
- <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
841
+ <xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
842
+ <xsl:when test="local-name() = 'font-family'">
843
+
844
+ <xsl:variable name="font_regional_prefix">
845
+ <xsl:choose>
846
+ <xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
847
+ <xsl:otherwise>Noto Serif</xsl:otherwise>
848
+ </xsl:choose>
849
+ </xsl:variable>
850
+
810
851
  <xsl:attribute name="{local-name()}">
811
- <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
852
+
853
+ <xsl:variable name="font_extended">
854
+ <xsl:choose>
855
+ <xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
856
+ <xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
857
+ <xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
858
+ <xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
859
+ <xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
860
+ <xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
861
+ </xsl:choose>
862
+ </xsl:variable>
863
+ <xsl:if test="normalize-space($font_extended) != ''">
864
+ <xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
865
+ <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
866
+ </xsl:if>
867
+
868
+ <xsl:value-of select="."/>
869
+
870
+ <xsl:if test="$additional_fonts != ''">
871
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
872
+ </xsl:if>
812
873
  </xsl:attribute>
813
874
  </xsl:when>
814
875
  <xsl:otherwise>
815
876
  <xsl:copy-of select="."/>
816
877
  </xsl:otherwise>
817
878
  </xsl:choose>
879
+
880
+ <!-- <xsl:choose>
881
+ <xsl:when test="local-name() = 'font-family'">
882
+ <xsl:attribute name="{local-name()}">
883
+ <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
884
+ </xsl:attribute>
885
+ </xsl:when>
886
+ <xsl:otherwise>
887
+ <xsl:copy-of select="."/>
888
+ </xsl:otherwise>
889
+ </xsl:choose> -->
818
890
  </xsl:for-each>
819
891
  </xsl:template><xsl:attribute-set name="copyright-statement-style">
820
892
 
@@ -889,7 +961,8 @@
889
961
 
890
962
 
891
963
 
892
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
964
+
965
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
893
966
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
894
967
 
895
968
 
@@ -905,7 +978,10 @@
905
978
 
906
979
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
907
980
 
981
+
908
982
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
983
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
984
+
909
985
 
910
986
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
911
987
 
@@ -929,6 +1005,7 @@
929
1005
 
930
1006
 
931
1007
 
1008
+
932
1009
 
933
1010
  <xsl:attribute name="margin-top">14pt</xsl:attribute>
934
1011
  <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
@@ -944,6 +1021,7 @@
944
1021
 
945
1022
 
946
1023
 
1024
+
947
1025
  <xsl:attribute name="margin-top">8pt</xsl:attribute>
948
1026
  <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
949
1027
 
@@ -968,6 +1046,7 @@
968
1046
 
969
1047
 
970
1048
 
1049
+
971
1050
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
972
1051
  <xsl:attribute name="font-weight">bold</xsl:attribute>
973
1052
 
@@ -1005,12 +1084,14 @@
1005
1084
 
1006
1085
 
1007
1086
 
1087
+
1008
1088
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1009
1089
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1010
1090
 
1011
1091
 
1012
1092
  </xsl:attribute-set><xsl:variable name="table-border_">
1013
1093
 
1094
+
1014
1095
  </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
1015
1096
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1016
1097
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -1026,6 +1107,7 @@
1026
1107
 
1027
1108
 
1028
1109
 
1110
+
1029
1111
 
1030
1112
 
1031
1113
 
@@ -1054,6 +1136,7 @@
1054
1136
 
1055
1137
 
1056
1138
 
1139
+
1057
1140
 
1058
1141
 
1059
1142
 
@@ -1074,6 +1157,7 @@
1074
1157
 
1075
1158
 
1076
1159
 
1160
+
1077
1161
 
1078
1162
 
1079
1163
 
@@ -1144,6 +1228,7 @@
1144
1228
 
1145
1229
 
1146
1230
 
1231
+
1147
1232
  </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
1148
1233
  <xsl:attribute name="border">solid black 1pt</xsl:attribute>
1149
1234
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -1156,7 +1241,7 @@
1156
1241
 
1157
1242
 
1158
1243
 
1159
-
1244
+
1160
1245
 
1161
1246
 
1162
1247
 
@@ -1171,6 +1256,7 @@
1171
1256
 
1172
1257
 
1173
1258
 
1259
+
1174
1260
  </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
1175
1261
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1176
1262
 
@@ -1179,6 +1265,8 @@
1179
1265
 
1180
1266
 
1181
1267
 
1268
+
1269
+
1182
1270
  </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
1183
1271
  <xsl:attribute name="font-size">80%</xsl:attribute>
1184
1272
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -1191,6 +1279,7 @@
1191
1279
 
1192
1280
 
1193
1281
 
1282
+
1194
1283
  <xsl:attribute name="vertical-align">super</xsl:attribute>
1195
1284
 
1196
1285
 
@@ -1228,6 +1317,27 @@
1228
1317
 
1229
1318
 
1230
1319
 
1320
+
1321
+ </xsl:attribute-set><xsl:attribute-set name="dl-name-style">
1322
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1323
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1324
+
1325
+
1326
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1327
+
1328
+
1329
+
1330
+
1331
+
1332
+
1333
+
1334
+
1335
+
1336
+
1337
+
1338
+
1339
+
1340
+
1231
1341
  </xsl:attribute-set><xsl:attribute-set name="dd-cell-style">
1232
1342
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
1233
1343
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
@@ -1266,6 +1376,7 @@
1266
1376
 
1267
1377
 
1268
1378
 
1379
+
1269
1380
 
1270
1381
 
1271
1382
 
@@ -1309,7 +1420,8 @@
1309
1420
 
1310
1421
 
1311
1422
 
1312
-
1423
+
1424
+
1313
1425
 
1314
1426
 
1315
1427
 
@@ -1325,6 +1437,7 @@
1325
1437
  </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1326
1438
 
1327
1439
 
1440
+
1328
1441
 
1329
1442
 
1330
1443
 
@@ -1335,6 +1448,8 @@
1335
1448
 
1336
1449
 
1337
1450
 
1451
+ </xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
1452
+
1338
1453
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1339
1454
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
1340
1455
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -1377,6 +1492,7 @@
1377
1492
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1378
1493
 
1379
1494
 
1495
+
1380
1496
 
1381
1497
 
1382
1498
 
@@ -1425,6 +1541,7 @@
1425
1541
 
1426
1542
 
1427
1543
 
1544
+
1428
1545
  </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
1429
1546
  <xsl:attribute name="text-align">right</xsl:attribute>
1430
1547
 
@@ -1445,21 +1562,20 @@
1445
1562
  </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
1446
1563
 
1447
1564
  </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
1565
+ <xsl:attribute name="width">100%</xsl:attribute>
1566
+ <xsl:attribute name="content-height">100%</xsl:attribute>
1567
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
1448
1568
 
1449
1569
 
1450
1570
 
1451
- <xsl:attribute name="width">100%</xsl:attribute>
1452
- <xsl:attribute name="content-height">100%</xsl:attribute>
1453
1571
  <xsl:attribute name="content-width">scale-to-fit</xsl:attribute>
1454
- <xsl:attribute name="scaling">uniform</xsl:attribute>
1455
1572
 
1456
1573
 
1457
-
1458
-
1574
+
1459
1575
  </xsl:attribute-set><xsl:attribute-set name="tt-style">
1460
1576
 
1461
1577
 
1462
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
1578
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1463
1579
 
1464
1580
 
1465
1581
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
@@ -1530,6 +1646,7 @@
1530
1646
 
1531
1647
 
1532
1648
 
1649
+
1533
1650
  <xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
1534
1651
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1535
1652
 
@@ -1541,6 +1658,24 @@
1541
1658
 
1542
1659
 
1543
1660
 
1661
+ </xsl:attribute-set><xsl:attribute-set name="list-name-style">
1662
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1663
+
1664
+
1665
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1666
+
1667
+
1668
+
1669
+
1670
+
1671
+
1672
+
1673
+
1674
+
1675
+
1676
+
1677
+
1678
+
1544
1679
  </xsl:attribute-set><xsl:attribute-set name="list-item-style">
1545
1680
 
1546
1681
 
@@ -1579,6 +1714,7 @@
1579
1714
 
1580
1715
 
1581
1716
 
1717
+
1582
1718
  <xsl:attribute name="font-size">7pt</xsl:attribute>
1583
1719
  <xsl:attribute name="vertical-align">super</xsl:attribute>
1584
1720
 
@@ -1603,6 +1739,7 @@
1603
1739
 
1604
1740
 
1605
1741
 
1742
+
1606
1743
  <xsl:attribute name="font-size">9pt</xsl:attribute>
1607
1744
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1608
1745
 
@@ -1626,6 +1763,7 @@
1626
1763
 
1627
1764
 
1628
1765
 
1766
+
1629
1767
  <xsl:attribute name="font-size">6pt</xsl:attribute>
1630
1768
  <xsl:attribute name="vertical-align">super</xsl:attribute>
1631
1769
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -1652,7 +1790,11 @@
1652
1790
 
1653
1791
 
1654
1792
 
1793
+
1655
1794
  </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
1795
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
1796
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
1797
+
1656
1798
 
1657
1799
 
1658
1800
 
@@ -1688,6 +1830,7 @@
1688
1830
 
1689
1831
 
1690
1832
 
1833
+
1691
1834
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1692
1835
 
1693
1836
 
@@ -1726,6 +1869,10 @@
1726
1869
 
1727
1870
 
1728
1871
 
1872
+ <!-- <xsl:if test="$namespace = 'ieee'">
1873
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1874
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
1875
+ </xsl:if> -->
1729
1876
 
1730
1877
 
1731
1878
 
@@ -1752,6 +1899,7 @@
1752
1899
 
1753
1900
 
1754
1901
 
1902
+
1755
1903
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
1756
1904
 
1757
1905
 
@@ -1775,6 +1923,7 @@
1775
1923
 
1776
1924
 
1777
1925
 
1926
+
1778
1927
  <xsl:attribute name="font-size">7pt</xsl:attribute>
1779
1928
  <xsl:attribute name="baseline-shift">30%</xsl:attribute>
1780
1929
 
@@ -1796,6 +1945,7 @@
1796
1945
 
1797
1946
 
1798
1947
 
1948
+
1799
1949
  <xsl:attribute name="font-size">6pt</xsl:attribute>
1800
1950
  <xsl:attribute name="baseline-shift">30%</xsl:attribute>
1801
1951
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
@@ -1818,6 +1968,7 @@
1818
1968
 
1819
1969
 
1820
1970
 
1971
+
1821
1972
  <xsl:attribute name="font-size">9pt</xsl:attribute>
1822
1973
  <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
1823
1974
 
@@ -1934,13 +2085,13 @@
1934
2085
 
1935
2086
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
1936
2087
  <xsl:variable name="nodes_preface_">
1937
- <xsl:for-each select="/*/*[local-name()='preface']/*">
2088
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
1938
2089
  <node id="{@id}"/>
1939
2090
  </xsl:for-each>
1940
2091
  </xsl:variable>
1941
2092
  <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
1942
2093
 
1943
- <xsl:for-each select="/*/*[local-name()='preface']/*">
2094
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
1944
2095
  <xsl:sort select="@displayorder" data-type="number"/>
1945
2096
 
1946
2097
  <!-- process Section's title -->
@@ -2006,7 +2157,7 @@
2006
2157
  </xsl:for-each>
2007
2158
  </figures>
2008
2159
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
2009
- <xsl:for-each select="/*/*[local-name()='preface']/*">
2160
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
2010
2161
  <xsl:sort select="@displayorder" data-type="number"/>
2011
2162
  <xsl:apply-templates select="."/>
2012
2163
  </xsl:for-each>
@@ -2260,6 +2411,8 @@
2260
2411
 
2261
2412
 
2262
2413
 
2414
+
2415
+
2263
2416
 
2264
2417
 
2265
2418
 
@@ -2299,6 +2452,8 @@
2299
2452
 
2300
2453
 
2301
2454
 
2455
+
2456
+
2302
2457
  </xsl:element>
2303
2458
  </xsl:variable>
2304
2459
 
@@ -2444,23 +2599,29 @@
2444
2599
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
2445
2600
  <xsl:param name="continued"/>
2446
2601
  <xsl:if test="normalize-space() != ''">
2447
- <fo:block xsl:use-attribute-sets="table-name-style">
2448
-
2449
-
2450
-
2451
-
2602
+
2603
+
2452
2604
 
2453
- <xsl:choose>
2454
- <xsl:when test="$continued = 'true'">
2605
+ <fo:block xsl:use-attribute-sets="table-name-style">
2606
+
2455
2607
 
2456
- </xsl:when>
2457
- <xsl:otherwise>
2458
- <xsl:apply-templates/>
2459
- </xsl:otherwise>
2460
- </xsl:choose>
2461
-
2608
+
2609
+
2610
+
2611
+ <xsl:choose>
2612
+ <xsl:when test="$continued = 'true'">
2613
+
2614
+ </xsl:when>
2615
+ <xsl:otherwise>
2616
+ <xsl:apply-templates/>
2617
+ </xsl:otherwise>
2618
+ </xsl:choose>
2619
+
2620
+
2621
+ </fo:block>
2622
+
2462
2623
 
2463
- </fo:block>
2624
+
2464
2625
  </xsl:if>
2465
2626
  </xsl:template><xsl:template name="calculate-columns-numbers">
2466
2627
  <xsl:param name="table-row"/>
@@ -2623,8 +2784,9 @@
2623
2784
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
2624
2785
  </xsl:if>
2625
2786
  </xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm">
2626
- <xsl:param name="table"/>
2627
- <xsl:param name="if">false</xsl:param> <!-- via intermediate format -->
2787
+ <xsl:param name="parent_table_page-width"/> <!-- for nested tables, in re-calculate step -->
2788
+
2789
+ <!-- via intermediate format -->
2628
2790
 
2629
2791
  <!-- The algorithm uses two passes through the table data and scales linearly with the size of the table -->
2630
2792
 
@@ -2635,9 +2797,8 @@
2635
2797
  <!-- get current table id -->
2636
2798
  <xsl:variable name="table_id" select="@id"/>
2637
2799
  <!-- find table by id in the file 'table_widths' -->
2638
- <xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
2639
- <xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/>
2640
-
2800
+ <!-- <xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/>
2801
+ <xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> -->
2641
2802
 
2642
2803
  <!-- table='<xsl:copy-of select="$table"/>' -->
2643
2804
  <!-- table_id='<xsl:value-of select="$table_id"/>\ -->
@@ -2645,24 +2806,13 @@
2645
2806
  <!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' -->
2646
2807
 
2647
2808
  <xsl:variable name="table_with_cell_widths_">
2648
- <xsl:choose>
2649
- <xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF -->
2650
-
2651
- <!-- Example: <column>10</column>
2652
- <column>11</column>
2653
- -->
2654
- <xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/>
2655
- </xsl:when>
2656
- <xsl:otherwise>
2657
- <xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/>
2658
- </xsl:otherwise>
2659
- </xsl:choose>
2809
+ <xsl:apply-templates select="." mode="determine_cell_widths-if"/> <!-- read column's width from IF -->
2660
2810
  </xsl:variable>
2661
2811
  <xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/>
2662
2812
 
2663
- <xsl:if test="$table_if_debug = 'true'">
2813
+ <!-- <xsl:if test="$table_if_debug = 'true'">
2664
2814
  <xsl:copy-of select="$table_with_cell_widths"/>
2665
- </xsl:if>
2815
+ </xsl:if> -->
2666
2816
 
2667
2817
 
2668
2818
  <!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. -->
@@ -2708,8 +2858,12 @@
2708
2858
 
2709
2859
  <xsl:variable name="page_width">
2710
2860
  <xsl:choose>
2711
- <xsl:when test="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when>
2712
- <xsl:otherwise>75</xsl:otherwise>
2861
+ <xsl:when test="$parent_table_page-width != ''">
2862
+ <xsl:value-of select="$parent_table_page-width"/>
2863
+ </xsl:when>
2864
+ <xsl:otherwise>
2865
+ <xsl:value-of select="@page-width"/>
2866
+ </xsl:otherwise>
2713
2867
  </xsl:choose>
2714
2868
  </xsl:variable>
2715
2869
 
@@ -2717,9 +2871,6 @@
2717
2871
  <table_width>
2718
2872
  <xsl:copy-of select="$table_widths"/>
2719
2873
  </table_width>
2720
- <!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug>
2721
- <debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug>
2722
- -->
2723
2874
  <debug>$page_width=<xsl:value-of select="$page_width"/></debug>
2724
2875
  </xsl:if>
2725
2876
 
@@ -2730,11 +2881,11 @@
2730
2881
  <xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below -->
2731
2882
  <!-- call old algorithm -->
2732
2883
  <case1/>
2733
- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
2884
+ <!-- <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/>
2734
2885
  <xsl:call-template name="calculate-column-widths-proportional">
2735
2886
  <xsl:with-param name="cols-count" select="$cols-count"/>
2736
2887
  <xsl:with-param name="table" select="$table"/>
2737
- </xsl:call-template>
2888
+ </xsl:call-template> -->
2738
2889
  </xsl:when>
2739
2890
  <!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. -->
2740
2891
  <xsl:when test="$table_widths/table/@width_max &lt;= $page_width">
@@ -2778,95 +2929,49 @@
2778
2929
  <xsl:otherwise><unknown_case/></xsl:otherwise>
2779
2930
  </xsl:choose>
2780
2931
 
2932
+ </xsl:template><xsl:template name="get-calculated-column-widths-autolayout-algorithm">
2781
2933
 
2782
- </xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths">
2783
- <xsl:copy>
2784
- <xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/>
2785
- </xsl:copy>
2786
- </xsl:template><xsl:template match="td | th" mode="determine_cell_widths">
2787
- <xsl:copy>
2788
- <xsl:copy-of select="@*"/>
2934
+ <!-- if nested 'dl' or 'table' -->
2935
+ <xsl:variable name="parent_table_id" select="normalize-space(ancestor::*[local-name() = 'table' or local-name() = 'dl'][1]/@id)"/>
2936
+ <parent_table_id><xsl:value-of select="$parent_table_id"/></parent_table_id>
2789
2937
 
2790
- <!-- The maximum width is given by the widest line. -->
2791
- <xsl:variable name="widths_max">
2792
- <xsl:for-each select=".//*[local-name() = 'p']">
2793
- <xsl:call-template name="add_width"/>
2794
- </xsl:for-each>
2795
- <xsl:if test="not(*[local-name() = 'p'])">
2796
- <xsl:call-template name="add_width"/>
2797
- </xsl:if>
2798
- </xsl:variable>
2799
- <xsl:variable name="width_max">
2800
- <xsl:for-each select="xalan:nodeset($widths_max)//width">
2801
- <xsl:sort select="." data-type="number" order="descending"/>
2802
- <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if>
2803
- </xsl:for-each>
2804
- </xsl:variable>
2805
- <xsl:attribute name="width_max">
2806
- <xsl:value-of select="$width_max"/>
2807
- </xsl:attribute>
2938
+ <parent_element><xsl:value-of select="local-name(..)"/></parent_element>
2808
2939
 
2809
- <!-- The minimum width is given by the widest text element (word, image, etc.) -->
2810
- <!-- To do: image width -->
2811
- <xsl:variable name="td_text">
2812
- <xsl:apply-templates select="." mode="td_text"/>
2813
- </xsl:variable>
2814
- <xsl:variable name="words">
2815
- <xsl:variable name="string_with_added_zerospaces">
2816
- <xsl:call-template name="add-zero-spaces-java">
2817
- <xsl:with-param name="text" select="$td_text"/>
2818
- </xsl:call-template>
2940
+ <xsl:variable name="parent_table_page-width_">
2941
+ <xsl:if test="$parent_table_id != ''">
2942
+ <!-- determine column number in the parent table -->
2943
+ <xsl:variable name="parent_table_column_number">
2944
+ <xsl:choose>
2945
+ <xsl:when test="parent::*[local-name() = 'dd']">2</xsl:when>
2946
+ <xsl:otherwise> <!-- parent is table -->
2947
+ <xsl:value-of select="count(ancestor::*[local-name() = 'td'][1]/preceding-sibling::*[local-name() = 'td']) + 1"/>
2948
+ </xsl:otherwise>
2949
+ </xsl:choose>
2819
2950
  </xsl:variable>
2820
- <xsl:call-template name="tokenize">
2821
- <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
2822
- </xsl:call-template>
2823
- </xsl:variable>
2824
-
2825
- <xsl:variable name="max_word_length">
2826
- <xsl:call-template name="max_length">
2827
- <xsl:with-param name="words" select="xalan:nodeset($words)"/>
2828
- </xsl:call-template>
2829
- </xsl:variable>
2830
- <xsl:variable name="width_min">
2831
- <xsl:value-of select="$max_word_length"/>
2832
- </xsl:variable>
2833
- <xsl:attribute name="width_min">
2834
- <xsl:value-of select="$width_min"/>
2835
- </xsl:attribute>
2836
- <!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals -->
2837
- <xsl:if test="$width_min &gt; $width_max">
2838
- <xsl:attribute name="width_max">
2839
- <xsl:value-of select="$width_min"/>
2840
- </xsl:attribute>
2841
- </xsl:if>
2842
- <xsl:if test="$width_min = 0">
2843
- <xsl:attribute name="width_min">1</xsl:attribute>
2951
+ <!-- find table by id in the file 'table_widths' and get all Nth `<column>...</column> -->
2952
+ <xsl:value-of select="$table_widths_from_if_calculated//table[@id = $parent_table_id]/column[number($parent_table_column_number)]"/>
2844
2953
  </xsl:if>
2845
-
2846
- <xsl:apply-templates select="node()" mode="determine_cell_widths"/>
2847
-
2848
- </xsl:copy>
2849
- </xsl:template><xsl:template name="add_width">
2850
- <xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable>
2851
- <xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/>
2852
-
2853
- <xsl:variable name="p_text_len">
2854
- <xsl:choose>
2855
- <xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters -->
2856
- <xsl:value-of select="$p_text_len_ * 1.5"/>
2857
- </xsl:when>
2858
- <xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise>
2859
- </xsl:choose>
2860
2954
  </xsl:variable>
2955
+ <xsl:variable name="parent_table_page-width" select="normalize-space($parent_table_page-width_)"/>
2861
2956
 
2862
- <xsl:variable name="math_addon_text">
2863
- <xsl:for-each select=".//*[local-name() = 'math']">
2864
- <xsl:apply-templates mode="td_text"/>
2865
- </xsl:for-each>
2866
- </xsl:variable>
2867
- <xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% -->
2957
+ <!-- get current table id -->
2958
+ <xsl:variable name="table_id" select="@id"/>
2959
+
2960
+ <xsl:choose>
2961
+ <xsl:when test="$parent_table_id = '' or $parent_table_page-width = ''">
2962
+ <!-- find table by id in the file 'table_widths' and get all `<column>...</column> -->
2963
+ <xsl:copy-of select="$table_widths_from_if_calculated//table[@id = $table_id]/node()"/>
2964
+ </xsl:when>
2965
+ <xsl:otherwise>
2966
+ <!-- recalculate columns width based on parent table width -->
2967
+ <xsl:for-each select="$table_widths_from_if//table[@id = $table_id]">
2968
+ <xsl:call-template name="calculate-column-widths-autolayout-algorithm">
2969
+ <xsl:with-param name="parent_table_page-width" select="$parent_table_page-width"/> <!-- padding-left = 2mm = 50000-->
2970
+ </xsl:call-template>
2971
+ </xsl:for-each>
2972
+ </xsl:otherwise>
2973
+ </xsl:choose>
2868
2974
 
2869
- <width><xsl:value-of select="$p_text_len + $math_addon_length"/></width>
2870
2975
  </xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if">
2871
2976
  <xsl:copy>
2872
2977
  <xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/>
@@ -2914,12 +3019,18 @@
2914
3019
  <fo:table-row>
2915
3020
  <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">
2916
3021
 
2917
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
2918
- <xsl:with-param name="continued">true</xsl:with-param>
2919
- </xsl:apply-templates>
2920
3022
 
2921
3023
 
2922
3024
 
3025
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
3026
+ <xsl:with-param name="continued">true</xsl:with-param>
3027
+ </xsl:apply-templates>
3028
+
3029
+
3030
+
3031
+
3032
+
3033
+
2923
3034
  </fo:table-cell>
2924
3035
  </fo:table-row>
2925
3036
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -2959,77 +3070,91 @@
2959
3070
  </xsl:choose>
2960
3071
  </xsl:variable>
2961
3072
 
2962
- <fo:table keep-with-previous="always">
2963
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
2964
- <xsl:variable name="name" select="local-name()"/>
3073
+
3074
+ <xsl:variable name="tableWithNotesAndFootnotes">
3075
+
3076
+ <fo:table keep-with-previous="always">
3077
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3078
+ <xsl:variable name="name" select="local-name()"/>
3079
+ <xsl:choose>
3080
+ <xsl:when test="$name = 'border-top'">
3081
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3082
+ </xsl:when>
3083
+ <xsl:when test="$name = 'border'">
3084
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3085
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3086
+ </xsl:when>
3087
+ <xsl:otherwise>
3088
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3089
+ </xsl:otherwise>
3090
+ </xsl:choose>
3091
+ </xsl:for-each>
3092
+
3093
+
3094
+
2965
3095
  <xsl:choose>
2966
- <xsl:when test="$name = 'border-top'">
2967
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
2968
- </xsl:when>
2969
- <xsl:when test="$name = 'border'">
2970
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
2971
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3096
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3097
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3098
+ <fo:table-column column-width="{@width}"/>
3099
+ </xsl:for-each>
2972
3100
  </xsl:when>
2973
3101
  <xsl:otherwise>
2974
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3102
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3103
+ <xsl:call-template name="insertTableColumnWidth">
3104
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3105
+ </xsl:call-template>
2975
3106
  </xsl:otherwise>
2976
3107
  </xsl:choose>
2977
- </xsl:for-each>
2978
-
2979
-
2980
-
2981
- <xsl:choose>
2982
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
2983
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
2984
- <fo:table-column column-width="{@width}"/>
2985
- </xsl:for-each>
2986
- </xsl:when>
2987
- <xsl:otherwise>
2988
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
2989
- <xsl:call-template name="insertTableColumnWidth">
2990
- <xsl:with-param name="colwidths" select="$colwidths"/>
2991
- </xsl:call-template>
2992
- </xsl:otherwise>
2993
- </xsl:choose>
2994
-
2995
- <fo:table-body>
2996
- <fo:table-row>
2997
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
2998
-
2999
-
3108
+
3109
+ <fo:table-body>
3110
+ <fo:table-row>
3111
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3112
+
3113
+
3000
3114
 
3001
-
3002
-
3003
- <!-- fn will be processed inside 'note' processing -->
3004
-
3005
-
3006
-
3007
-
3008
-
3009
-
3010
- <!-- for BSI (not PAS) display Notes before footnotes -->
3011
-
3012
-
3013
- <!-- except gb and bsi -->
3014
-
3015
- <xsl:apply-templates select="../*[local-name()='note']"/>
3016
3115
 
3017
-
3018
-
3019
- <!-- horizontal row separator -->
3020
-
3021
-
3022
- <!-- fn processing -->
3023
- <xsl:call-template name="table_fn_display"/>
3024
-
3025
- <!-- for PAS display Notes after footnotes -->
3026
-
3027
-
3028
- </fo:table-cell>
3029
- </fo:table-row>
3030
- </fo:table-body>
3031
-
3032
- </fo:table>
3116
+
3117
+ <!-- fn will be processed inside 'note' processing -->
3118
+
3119
+
3120
+
3121
+
3122
+
3123
+
3124
+ <!-- for BSI (not PAS) display Notes before footnotes -->
3125
+
3126
+
3127
+ <!-- except gb and bsi -->
3128
+
3129
+ <xsl:apply-templates select="../*[local-name()='note']"/>
3130
+
3131
+
3132
+
3133
+ <!-- horizontal row separator -->
3134
+
3135
+
3136
+ <!-- fn processing -->
3137
+
3138
+ <xsl:call-template name="table_fn_display"/>
3139
+
3140
+
3141
+
3142
+ <!-- for PAS display Notes after footnotes -->
3143
+
3144
+
3145
+ </fo:table-cell>
3146
+ </fo:table-row>
3147
+ </fo:table-body>
3148
+
3149
+ </fo:table>
3150
+ </xsl:variable>
3151
+
3152
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
3153
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
3154
+ </xsl:if>
3155
+
3156
+
3157
+
3033
3158
  </xsl:if>
3034
3159
  </xsl:template><xsl:template match="*[local-name()='tbody']">
3035
3160
 
@@ -3118,6 +3243,9 @@
3118
3243
 
3119
3244
 
3120
3245
 
3246
+
3247
+
3248
+
3121
3249
 
3122
3250
 
3123
3251
  <xsl:call-template name="setTableRowAttributes"/>
@@ -3137,6 +3265,8 @@
3137
3265
 
3138
3266
 
3139
3267
 
3268
+
3269
+
3140
3270
  <xsl:call-template name="setTableRowAttributes"/>
3141
3271
  <xsl:apply-templates/>
3142
3272
  </fo:table-row>
@@ -3218,6 +3348,8 @@
3218
3348
 
3219
3349
 
3220
3350
 
3351
+
3352
+
3221
3353
 
3222
3354
 
3223
3355
 
@@ -3289,7 +3421,11 @@
3289
3421
 
3290
3422
  <xsl:variable name="gen_id" select="generate-id(.)"/>
3291
3423
  <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
3292
- <xsl:variable name="reference" select="@reference"/>
3424
+ <xsl:variable name="reference_">
3425
+ <xsl:value-of select="@reference"/>
3426
+ <xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
3427
+ </xsl:variable>
3428
+ <xsl:variable name="reference" select="normalize-space($reference_)"/>
3293
3429
  <!-- fn sequence number in document -->
3294
3430
  <xsl:variable name="current_fn_number">
3295
3431
  <xsl:choose>
@@ -3309,6 +3445,7 @@
3309
3445
  <xsl:variable name="footnote_inline">
3310
3446
  <fo:inline xsl:use-attribute-sets="fn-num-style">
3311
3447
 
3448
+
3312
3449
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
3313
3450
  <xsl:value-of select="$current_fn_number_text"/>
3314
3451
  </fo:basic-link>
@@ -3330,8 +3467,12 @@
3330
3467
  <fo:block xsl:use-attribute-sets="fn-body-style">
3331
3468
 
3332
3469
 
3470
+
3333
3471
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
3334
3472
 
3473
+
3474
+
3475
+
3335
3476
  <xsl:value-of select="$current_fn_number_text"/>
3336
3477
  </fo:inline>
3337
3478
  <xsl:apply-templates/>
@@ -3364,7 +3505,7 @@
3364
3505
  <xsl:copy-of select="node()"/>
3365
3506
  </fn>
3366
3507
  </xsl:for-each>
3367
- <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']/*">
3508
+ <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']/*">
3368
3509
  <xsl:sort select="@displayorder" data-type="number"/>
3369
3510
  <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])]">
3370
3511
  <!-- copy unique fn -->
@@ -3644,11 +3785,19 @@
3644
3785
 
3645
3786
 
3646
3787
 
3788
+
3789
+ <xsl:if test="ancestor::*[local-name() = 'dd' or local-name() = 'td']">
3790
+ <xsl:attribute name="margin-top">0</xsl:attribute>
3791
+ </xsl:if>
3792
+
3647
3793
  <fo:block>
3648
3794
 
3649
3795
 
3650
3796
 
3651
3797
 
3798
+ <xsl:apply-templates select="*[local-name() = 'name']">
3799
+ <xsl:with-param name="process">true</xsl:with-param>
3800
+ </xsl:apply-templates>
3652
3801
 
3653
3802
  <xsl:if test="$isGenerateTableIF = 'true'">
3654
3803
  <!-- to determine start of table -->
@@ -3671,6 +3820,7 @@
3671
3820
  </xsl:choose>
3672
3821
 
3673
3822
 
3823
+
3674
3824
  <xsl:choose>
3675
3825
  <xsl:when test="$isGenerateTableIF = 'true'">
3676
3826
  <!-- generate IF for table widths -->
@@ -3799,6 +3949,18 @@
3799
3949
  </xsl:if> <!-- END: a few components -->
3800
3950
  </fo:block-container>
3801
3951
  </fo:block-container>
3952
+
3953
+ <xsl:if test="$isGenerateTableIF = 'true'"> <!-- process nested 'dl' -->
3954
+ <xsl:apply-templates select="*[local-name() = 'dd']/*[local-name() = 'dl']"/>
3955
+ </xsl:if>
3956
+
3957
+ </xsl:template><xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
3958
+ <xsl:param name="process">false</xsl:param>
3959
+ <xsl:if test="$process = 'true'">
3960
+ <fo:block xsl:use-attribute-sets="dl-name-style">
3961
+ <xsl:apply-templates/>
3962
+ </fo:block>
3963
+ </xsl:if>
3802
3964
  </xsl:template><xsl:template name="setColumnWidth_dl">
3803
3965
  <xsl:param name="colwidths"/>
3804
3966
  <xsl:param name="maxlength_dt"/>
@@ -3807,6 +3969,11 @@
3807
3969
  <!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
3808
3970
 
3809
3971
  <xsl:choose>
3972
+ <xsl:when test="xalan:nodeset($colwidths)/autolayout">
3973
+ <xsl:call-template name="insertTableColumnWidth">
3974
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3975
+ </xsl:call-template>
3976
+ </xsl:when>
3810
3977
  <xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
3811
3978
  <fo:table-column column-width="50%"/>
3812
3979
  <fo:table-column column-width="50%"/>
@@ -4059,12 +4226,24 @@
4059
4226
  </td>
4060
4227
  <td>
4061
4228
 
4062
- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()"/>
4229
+ <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
4230
+
4231
+ <!-- get paragraphs from nested 'dl' -->
4232
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
4233
+
4063
4234
 
4064
4235
  </td>
4065
4236
  </tr>
4066
4237
 
4067
- </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='em']">
4238
+ </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
4239
+ <xsl:for-each select="*[local-name() = 'dt']">
4240
+ <p>
4241
+ <xsl:copy-of select="node()"/>
4242
+ <xsl:text> </xsl:text>
4243
+ <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'p']/node()"/>
4244
+ </p>
4245
+ </xsl:for-each>
4246
+ </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if_nested"/><xsl:template match="*[local-name()='em']">
4068
4247
  <fo:inline font-style="italic">
4069
4248
  <xsl:apply-templates/>
4070
4249
  </fo:inline>
@@ -4095,7 +4274,7 @@
4095
4274
 
4096
4275
 
4097
4276
 
4098
-
4277
+ <!-- 10 -->
4099
4278
 
4100
4279
 
4101
4280
 
@@ -4972,6 +5151,13 @@
4972
5151
  </xsl:variable>
4973
5152
  <fo:inline xsl:use-attribute-sets="link-style">
4974
5153
 
5154
+ <xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
5155
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
5156
+ </xsl:if>
5157
+
5158
+
5159
+
5160
+
4975
5161
 
4976
5162
 
4977
5163
 
@@ -5185,6 +5371,7 @@
5185
5371
 
5186
5372
 
5187
5373
 
5374
+
5188
5375
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5189
5376
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
5190
5377
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5206,6 +5393,7 @@
5206
5393
  </xsl:when>
5207
5394
  <xsl:otherwise>
5208
5395
 
5396
+
5209
5397
  <xsl:text>:</xsl:text>
5210
5398
 
5211
5399
 
@@ -5226,6 +5414,7 @@
5226
5414
  <xsl:otherwise>
5227
5415
 
5228
5416
 
5417
+
5229
5418
  </xsl:otherwise>
5230
5419
  </xsl:choose>
5231
5420
  </xsl:variable>
@@ -5234,7 +5423,19 @@
5234
5423
  <xsl:value-of select="$suffix"/>
5235
5424
  </xsl:if>
5236
5425
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
5237
- <fo:inline><xsl:apply-templates/></fo:inline>
5426
+ <xsl:variable name="num"><xsl:number/></xsl:variable>
5427
+ <xsl:choose>
5428
+ <xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
5429
+ <fo:inline xsl:use-attribute-sets="termnote-p-style">
5430
+ <xsl:apply-templates/>
5431
+ </fo:inline>
5432
+ </xsl:when>
5433
+ <xsl:otherwise>
5434
+ <fo:block xsl:use-attribute-sets="termnote-p-style">
5435
+ <xsl:apply-templates/>
5436
+ </fo:block>
5437
+ </xsl:otherwise>
5438
+ </xsl:choose>
5238
5439
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
5239
5440
  <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
5240
5441
  <fo:block id="{@id}">
@@ -5993,6 +6194,9 @@
5993
6194
  <fo:block xsl:use-attribute-sets="figure-name-style">
5994
6195
 
5995
6196
 
6197
+
6198
+
6199
+
5996
6200
  <xsl:apply-templates/>
5997
6201
  </fo:block>
5998
6202
  </xsl:if>
@@ -6053,9 +6257,9 @@
6053
6257
  <xsl:apply-templates/>
6054
6258
  </xsl:otherwise>
6055
6259
  </xsl:choose>
6056
- </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">
6260
+ </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">
6057
6261
  <xsl:value-of select="."/>
6058
- </xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6262
+ </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6059
6263
  <xsl:text> </xsl:text>
6060
6264
  </xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
6061
6265
  <xsl:copy>
@@ -6126,9 +6330,12 @@
6126
6330
 
6127
6331
 
6128
6332
 
6333
+ <!-- 9 -->
6129
6334
 
6130
6335
 
6131
-
6336
+ <!-- <xsl:if test="$namespace = 'ieee'">
6337
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6338
+ </xsl:if> -->
6132
6339
 
6133
6340
 
6134
6341
 
@@ -6210,7 +6417,7 @@
6210
6417
  <xsl:for-each select="xalan:nodeset($text_step4)/node()">
6211
6418
  <xsl:choose>
6212
6419
  <xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
6213
- <xsl:call-template name="interspers">
6420
+ <xsl:call-template name="interspers-java">
6214
6421
  <xsl:with-param name="str" select="."/>
6215
6422
  </xsl:call-template>
6216
6423
  </xsl:when>
@@ -6260,6 +6467,10 @@
6260
6467
  <xsl:with-param name="char" select="$char"/>
6261
6468
  </xsl:call-template>
6262
6469
  </xsl:if>
6470
+ </xsl:template><xsl:template name="interspers-java">
6471
+ <xsl:param name="str"/>
6472
+ <xsl:param name="char" select="$zero_width_space"/>
6473
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($str),'([^ -.:=_—])',concat('$1', $char))"/> <!-- insert $char after each char excep space, - . : = _ etc. -->
6263
6474
  </xsl:template><xsl:template match="*" mode="syntax_highlight">
6264
6475
  <xsl:apply-templates mode="syntax_highlight"/>
6265
6476
  </xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6569,10 +6780,14 @@
6569
6780
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
6570
6781
  <xsl:variable name="element">inline
6571
6782
 
6783
+
6572
6784
  </xsl:variable>
6573
6785
  <xsl:choose>
6574
6786
  <xsl:when test="contains($element, 'block')">
6575
6787
  <fo:block xsl:use-attribute-sets="example-p-style">
6788
+
6789
+
6790
+
6576
6791
  <xsl:apply-templates/>
6577
6792
  </fo:block>
6578
6793
  </xsl:when>
@@ -6680,6 +6895,7 @@
6680
6895
  </xsl:if>
6681
6896
  <fo:block xsl:use-attribute-sets="example-p-style">
6682
6897
 
6898
+
6683
6899
  <xsl:apply-templates/>
6684
6900
  </fo:block>
6685
6901
  </fo:block-container>
@@ -6838,6 +7054,8 @@
6838
7054
 
6839
7055
 
6840
7056
 
7057
+
7058
+
6841
7059
  <fo:basic-link fox:alt-text="{@citeas}">
6842
7060
  <xsl:if test="normalize-space(@citeas) = ''">
6843
7061
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -6892,6 +7110,7 @@
6892
7110
 
6893
7111
 
6894
7112
 
7113
+
6895
7114
 
6896
7115
  <xsl:variable name="references_num_current">
6897
7116
  <xsl:number level="any" count="m3d:references"/>
@@ -7215,6 +7434,11 @@
7215
7434
  </xsl:otherwise>
7216
7435
  </xsl:choose>
7217
7436
  </xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
7437
+
7438
+ <xsl:apply-templates select="*[local-name() = 'name']">
7439
+ <xsl:with-param name="process">true</xsl:with-param>
7440
+ </xsl:apply-templates>
7441
+
7218
7442
  <fo:list-block xsl:use-attribute-sets="list-style">
7219
7443
 
7220
7444
 
@@ -7229,12 +7453,23 @@
7229
7453
 
7230
7454
 
7231
7455
 
7456
+ <xsl:if test="*[local-name() = 'name']">
7457
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
7458
+ </xsl:if>
7459
+
7232
7460
  <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
7233
7461
  </fo:list-block>
7234
7462
  <!-- <xsl:for-each select="./iho:note">
7235
7463
  <xsl:call-template name="note"/>
7236
7464
  </xsl:for-each> -->
7237
7465
  <xsl:apply-templates select="./*[local-name() = 'note']"/>
7466
+ </xsl:template><xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
7467
+ <xsl:param name="process">false</xsl:param>
7468
+ <xsl:if test="$process = 'true'">
7469
+ <fo:block xsl:use-attribute-sets="list-name-style">
7470
+ <xsl:apply-templates/>
7471
+ </fo:block>
7472
+ </xsl:if>
7238
7473
  </xsl:template><xsl:template match="*[local-name()='li']">
7239
7474
  <fo:list-item xsl:use-attribute-sets="list-item-style">
7240
7475
  <xsl:copy-of select="@id"/>
@@ -7246,6 +7481,8 @@
7246
7481
 
7247
7482
 
7248
7483
 
7484
+
7485
+
7249
7486
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7250
7487
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7251
7488
  <xsl:call-template name="append_add-style"/>
@@ -7510,9 +7747,9 @@
7510
7747
  </fo:block>
7511
7748
 
7512
7749
 
7513
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
7750
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
7514
7751
 
7515
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
7752
+ <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
7516
7753
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
7517
7754
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
7518
7755
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
@@ -7523,7 +7760,7 @@
7523
7760
 
7524
7761
  <xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
7525
7762
  <xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
7526
- <xsl:number format="[1]"/>
7763
+ <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
7527
7764
  </xsl:if>
7528
7765
 
7529
7766
  </fo:inline>
@@ -7545,26 +7782,23 @@
7545
7782
  <xsl:if test=".//*[local-name() = 'fn']">
7546
7783
  <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
7547
7784
  </xsl:if>
7785
+
7786
+ <!-- display document identifier, not number [1] -->
7548
7787
  <xsl:variable name="docidentifier">
7549
7788
  <xsl:choose>
7550
7789
  <xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
7551
7790
  <xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
7552
7791
  </xsl:choose>
7553
7792
  </xsl:variable>
7554
- <fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
7793
+ <xsl:value-of select="$docidentifier"/>
7794
+
7555
7795
  <xsl:apply-templates select="*[local-name() = 'note']"/>
7556
- <xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
7557
- <xsl:choose>
7558
- <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $lang]">
7559
- <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $lang]"/>
7560
- </xsl:when>
7561
- <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
7562
- <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
7563
- </xsl:when>
7564
- <xsl:otherwise>
7565
- <xsl:apply-templates select="*[local-name() = 'title']"/>
7566
- </xsl:otherwise>
7567
- </xsl:choose>
7796
+
7797
+ <xsl:if test="normalize-space($docidentifier) != '' and *[local-name() = 'formattedref']">
7798
+ <xsl:text>,</xsl:text>
7799
+ <xsl:text> </xsl:text>
7800
+ </xsl:if>
7801
+
7568
7802
  <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
7569
7803
  <!-- end bibitem processing -->
7570
7804
 
@@ -7868,12 +8102,16 @@
7868
8102
  <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
7869
8103
 
7870
8104
 
8105
+
8106
+
7871
8107
 
7872
8108
 
7873
8109
 
7874
8110
  <fo:block-container xsl:use-attribute-sets="admonition-container-style">
7875
8111
 
7876
8112
 
8113
+
8114
+
7877
8115
  <fo:block xsl:use-attribute-sets="admonition-name-style">
7878
8116
  <xsl:call-template name="displayAdmonitionName"/>
7879
8117
  </fo:block>
@@ -7886,25 +8124,32 @@
7886
8124
  </fo:block-container>
7887
8125
 
7888
8126
  </xsl:template><xsl:template name="displayAdmonitionName">
7889
-
8127
+ <xsl:param name="sep"/> <!-- Example: ' - ' -->
8128
+ <!-- <xsl:choose>
8129
+ <xsl:when test="$namespace = 'nist-cswp' or $namespace = 'nist-sp'">
8130
+ <xsl:choose>
8131
+ <xsl:when test="@type='important'"><xsl:apply-templates select="@type"/></xsl:when>
8132
+ <xsl:otherwise>
8133
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
8134
+ </xsl:otherwise>
8135
+ </xsl:choose>
8136
+ </xsl:when>
8137
+ <xsl:otherwise>
7890
8138
  <xsl:apply-templates select="*[local-name() = 'name']"/>
7891
8139
  <xsl:if test="not(*[local-name() = 'name'])">
7892
8140
  <xsl:apply-templates select="@type"/>
7893
8141
  </xsl:if>
7894
-
7895
- </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
7896
- <xsl:apply-templates/>
7897
- </xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
7898
- <xsl:variable name="admonition_type_">
7899
- <xsl:call-template name="getLocalizedString">
7900
- <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
7901
- </xsl:call-template>
8142
+ </xsl:otherwise>
8143
+ </xsl:choose> -->
8144
+ <xsl:variable name="name">
8145
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7902
8146
  </xsl:variable>
7903
- <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
7904
- <xsl:value-of select="$admonition_type"/>
7905
- <xsl:if test="$admonition_type = ''">
7906
- <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
8147
+ <xsl:copy-of select="$name"/>
8148
+ <xsl:if test="normalize-space($name) != ''">
8149
+ <xsl:value-of select="$sep"/>
7907
8150
  </xsl:if>
8151
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
8152
+ <xsl:apply-templates/>
7908
8153
  </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
7909
8154
  <!-- processing for admonition/p found in the template for 'p' -->
7910
8155
  <xsl:call-template name="paragraph"/>
@@ -8070,6 +8315,8 @@
8070
8315
  </xsl:when>
8071
8316
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
8072
8317
  </xsl:choose>
8318
+ </xsl:template><xsl:template match="*[local-name() = 'lang_none']">
8319
+ <fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
8073
8320
  </xsl:template><xsl:template name="printEdition">
8074
8321
  <xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
8075
8322
  <xsl:text> </xsl:text>
@@ -8176,6 +8423,27 @@
8176
8423
  </xsl:when>
8177
8424
  <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
8178
8425
  </xsl:choose>
8426
+ </xsl:template><xsl:template name="getMonthLocalizedByNum">
8427
+ <xsl:param name="num"/>
8428
+ <xsl:variable name="monthStr">
8429
+ <xsl:choose>
8430
+ <xsl:when test="$num = '01'">january</xsl:when>
8431
+ <xsl:when test="$num = '02'">february</xsl:when>
8432
+ <xsl:when test="$num = '03'">march</xsl:when>
8433
+ <xsl:when test="$num = '04'">april</xsl:when>
8434
+ <xsl:when test="$num = '05'">may</xsl:when>
8435
+ <xsl:when test="$num = '06'">june</xsl:when>
8436
+ <xsl:when test="$num = '07'">july</xsl:when>
8437
+ <xsl:when test="$num = '08'">august</xsl:when>
8438
+ <xsl:when test="$num = '09'">september</xsl:when>
8439
+ <xsl:when test="$num = '10'">october</xsl:when>
8440
+ <xsl:when test="$num = '11'">november</xsl:when>
8441
+ <xsl:when test="$num = '12'">december</xsl:when>
8442
+ </xsl:choose>
8443
+ </xsl:variable>
8444
+ <xsl:call-template name="getLocalizedString">
8445
+ <xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
8446
+ </xsl:call-template>
8179
8447
  </xsl:template><xsl:template name="insertKeywords">
8180
8448
  <xsl:param name="sorting" select="'true'"/>
8181
8449
  <xsl:param name="charAtEnd" select="'.'"/>
@@ -8247,7 +8515,7 @@
8247
8515
  <dc:description>
8248
8516
  <xsl:variable name="abstract">
8249
8517
 
8250
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
8518
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
8251
8519
 
8252
8520
  </xsl:variable>
8253
8521
  <xsl:value-of select="normalize-space($abstract)"/>
@@ -8375,6 +8643,7 @@
8375
8643
 
8376
8644
 
8377
8645
 
8646
+
8378
8647
  <xsl:value-of select="document('')//*/namespace::m3d"/>
8379
8648
 
8380
8649