metanorma-cc 2.6.6 → 2.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/cc/cc.standard.xsl +633 -1139
  3. data/lib/isodoc/cc/html/_coverpage.css +0 -2
  4. data/lib/isodoc/cc/html/htmlstyle.css +0 -2
  5. data/lib/metanorma/cc/isodoc.rng +32 -2
  6. data/lib/metanorma/cc/version.rb +1 -1
  7. metadata +2 -2
data/lib/isodoc/cc/cc.standard.xsl CHANGED
@@ -1,4 +1,4 @@
1
- <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:csd="https://www.metanorma.org/ns/standoc" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java xalan" extension-element-prefixes="redirect" version="1.0">
1
+ <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:csd="https://www.metanorma.org/ns/standoc" xmlns:mn="https://www.metanorma.org/ns/xslt" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java xalan" extension-element-prefixes="redirect" version="1.0">
2
2
 
3
3
  <xsl:output version="1.0" method="xml" encoding="UTF-8" indent="no"/>
4
4
 
@@ -20,16 +20,15 @@
20
20
  <xsl:variable name="header" select="/csd:metanorma/csd:bibdata/csd:docidentifier[@type = 'CalConnect']"/>
21
21
 
22
22
  <xsl:variable name="contents_">
23
- <contents>
23
+ <mn:contents>
24
24
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
25
25
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
26
26
  <xsl:call-template name="processTablesFigures_Contents"/>
27
- </contents>
27
+ </mn:contents>
28
28
  </xsl:variable>
29
29
  <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
30
30
 
31
31
  <xsl:template match="/">
32
- <xsl:call-template name="namespaceCheck"/>
33
32
  <fo:root xml:lang="{$lang}">
34
33
  <xsl:variable name="root-style">
35
34
  <root-style xsl:use-attribute-sets="root-style"/>
@@ -379,14 +378,14 @@
379
378
 
380
379
  <xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
381
380
 
382
- <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
381
+ <xsl:for-each select="$contents//mn:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
383
382
 
384
383
  <fo:block role="TOCI">
385
384
  <xsl:if test="@level = 1">
386
385
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
387
386
  </xsl:if>
388
387
 
389
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {title}"> <!-- link at this level needs for PDF structure tags -->
388
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mn:title}"> <!-- link at this level needs for PDF structure tags -->
390
389
  <fo:list-block role="SKIP">
391
390
  <xsl:attribute name="provisional-distance-between-starts">
392
391
  <xsl:choose>
@@ -403,8 +402,8 @@
403
402
  </fo:list-item-label>
404
403
  <fo:list-item-body start-indent="body-start()" role="SKIP">
405
404
  <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm" role="SKIP">
406
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
407
- <xsl:apply-templates select="title"/>
405
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}" role="SKIP">
406
+ <xsl:apply-templates select="mn:title"/>
408
407
  <fo:inline keep-together.within-line="always" role="SKIP">
409
408
  <fo:leader leader-pattern="dots"/>
410
409
  <fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
@@ -419,21 +418,21 @@
419
418
  </xsl:for-each>
420
419
 
421
420
  <!-- List of Tables -->
422
- <xsl:if test="$contents//tables/table">
421
+ <xsl:if test="$contents//mn:tables/mn:table">
423
422
  <xsl:call-template name="insertListOf_Title">
424
423
  <xsl:with-param name="title" select="$title-list-tables"/>
425
424
  </xsl:call-template>
426
- <xsl:for-each select="$contents//tables/table">
425
+ <xsl:for-each select="$contents//mn:tables/mn:table">
427
426
  <xsl:call-template name="insertListOf_Item"/>
428
427
  </xsl:for-each>
429
428
  </xsl:if>
430
429
 
431
430
  <!-- List of Figures -->
432
- <xsl:if test="$contents//figures/figure">
431
+ <xsl:if test="$contents//mn:figures/mn:figure">
433
432
  <xsl:call-template name="insertListOf_Title">
434
433
  <xsl:with-param name="title" select="$title-list-figures"/>
435
434
  </xsl:call-template>
436
- <xsl:for-each select="$contents//figures/figure">
435
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
437
436
  <xsl:call-template name="insertListOf_Item"/>
438
437
  </xsl:for-each>
439
438
  </xsl:if>
@@ -496,12 +495,12 @@
496
495
  <xsl:call-template name="getName"/>
497
496
  </xsl:variable>
498
497
 
499
- <item id="{@id}" level="{$level}" section="{$section}" display="{$display}">
500
- <title>
498
+ <mn:item id="{@id}" level="{$level}" section="{$section}" display="{$display}">
499
+ <mn:title>
501
500
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
502
- </title>
501
+ </mn:title>
503
502
  <xsl:apply-templates mode="contents"/>
504
- </item>
503
+ </mn:item>
505
504
  </xsl:if>
506
505
 
507
506
  </xsl:template>
@@ -663,34 +662,25 @@
663
662
  </fo:static-content>
664
663
  </xsl:template>
665
664
 
666
- <!-- <xsl:strip-space elements="csd:xref"/> -->
665
+ <!-- https://www.metanorma.org/ns/standoc -->
666
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
667
667
 
668
- <xsl:variable name="namespace_full_">
669
- <xsl:choose>
670
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
671
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
672
- </xsl:choose>
673
- </xsl:variable>
674
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
668
+ <!-- https://www.metanorma.org/ns/xsl -->
669
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
675
670
 
676
- <xsl:variable name="root_element_">
677
- <xsl:choose>
678
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
679
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
680
- </xsl:choose>
681
- </xsl:variable>
682
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
671
+ <xsl:variable name="root_element">metanorma</xsl:variable>
683
672
 
673
+ <!---examples: 2013, 2024 -->
684
674
  <xsl:variable name="document_scheme" select="normalize-space(//*[local-name() = 'metanorma']/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/>
685
675
 
686
676
  <!-- external parameters -->
687
-
688
677
  <xsl:param name="svg_images"/> <!-- svg images array -->
689
678
  <xsl:variable name="images" select="document($svg_images)"/>
690
679
  <xsl:param name="basepath"/> <!-- base path for images -->
691
680
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
692
681
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
693
682
  <xsl:param name="output_path"/> <!-- output PDF file name -->
683
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
694
684
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
695
685
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
696
686
  <xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
@@ -737,20 +727,13 @@
737
727
 
738
728
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
739
729
 
740
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
741
- true
730
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
731
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
742
732
  </xsl:variable>
743
733
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
744
734
 
745
- <xsl:variable name="isGenerateTableIF_">
746
- <xsl:choose>
747
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
748
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
749
- </xsl:when>
750
- <xsl:otherwise>false</xsl:otherwise>
751
- </xsl:choose>
752
- </xsl:variable>
753
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
735
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
736
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
754
737
 
755
738
  <xsl:variable name="lang">
756
739
  <xsl:call-template name="getLang"/>
@@ -802,8 +785,7 @@
802
785
  <xsl:variable name="pageWidth_">
803
786
  <xsl:choose>
804
787
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
805
- <xsl:otherwise>
806
- 210
788
+ <xsl:otherwise>210
807
789
  </xsl:otherwise>
808
790
  </xsl:choose>
809
791
  </xsl:variable>
@@ -813,8 +795,7 @@
813
795
  <xsl:variable name="pageHeight_">
814
796
  <xsl:choose>
815
797
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
816
- <xsl:otherwise>
817
- 297
798
+ <xsl:otherwise>297
818
799
  </xsl:otherwise>
819
800
  </xsl:choose>
820
801
  </xsl:variable>
@@ -823,23 +804,19 @@
823
804
  <!-- Page margins in mm (just digits, without 'mm')-->
824
805
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
825
806
  for example, left margin on odd page and right margin on even page -->
826
- <xsl:variable name="marginLeftRight1_">
827
- 19
807
+ <xsl:variable name="marginLeftRight1_">19
828
808
  </xsl:variable>
829
809
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
830
810
 
831
- <xsl:variable name="marginLeftRight2_">
832
- 19
811
+ <xsl:variable name="marginLeftRight2_">19
833
812
  </xsl:variable>
834
813
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
835
814
 
836
- <xsl:variable name="marginTop_">
837
- 20.2
815
+ <xsl:variable name="marginTop_">20.2
838
816
  </xsl:variable>
839
817
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
840
818
 
841
- <xsl:variable name="marginBottom_">
842
- 20.3
819
+ <xsl:variable name="marginBottom_">20.3
843
820
  </xsl:variable>
844
821
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
845
822
 
@@ -888,13 +865,10 @@
888
865
  <title-toc lang="zh">目次</title-toc>
889
866
 
890
867
  <title-part lang="en">
891
-
892
868
  </title-part>
893
869
  <title-part lang="fr">
894
-
895
870
  </title-part>
896
871
  <title-part lang="ru">
897
-
898
872
  </title-part>
899
873
  <title-part lang="zh">第 # 部分:</title-part>
900
874
 
@@ -948,6 +922,7 @@
948
922
  <xsl:variable name="hair_space"> </xsl:variable>
949
923
  <xsl:variable name="en_dash">–</xsl:variable>
950
924
  <xsl:variable name="em_dash">—</xsl:variable>
925
+ <xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
951
926
  <xsl:variable name="cr">&#13;</xsl:variable>
952
927
  <xsl:variable name="lf">
953
928
  </xsl:variable>
@@ -989,11 +964,9 @@
989
964
  <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>
990
965
  <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>
991
966
  <xsl:attribute-set name="root-style">
992
-
993
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans"/>, STIX Two Math</xsl:attribute>
994
- <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
995
- <xsl:attribute name="font-size">10.5pt</xsl:attribute>
996
-
967
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans"/>, STIX Two Math</xsl:attribute>
968
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
969
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
997
970
  </xsl:attribute-set> <!-- root-style -->
998
971
 
999
972
  <xsl:template name="insertRootStyle">
@@ -1081,28 +1054,22 @@
1081
1054
 
1082
1055
  <!-- Preface sections styles -->
1083
1056
  <xsl:attribute-set name="copyright-statement-style">
1084
-
1085
1057
  </xsl:attribute-set> <!-- copyright-statement-style -->
1086
1058
 
1087
1059
  <xsl:attribute-set name="copyright-statement-title-style">
1088
-
1089
1060
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
1090
1061
 
1091
1062
  <xsl:attribute-set name="copyright-statement-p-style">
1092
-
1093
1063
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
1094
1064
 
1095
1065
  <xsl:attribute-set name="license-statement-style">
1096
-
1097
1066
  </xsl:attribute-set>
1098
1067
 
1099
1068
  <xsl:attribute-set name="license-statement-title-style">
1100
1069
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1101
-
1102
1070
  </xsl:attribute-set> <!-- license-statement-title-style -->
1103
1071
 
1104
1072
  <xsl:attribute-set name="license-statement-p-style">
1105
-
1106
1073
  </xsl:attribute-set> <!-- license-statement-p-style -->
1107
1074
 
1108
1075
  <xsl:attribute-set name="legal-statement-style">
@@ -1111,89 +1078,69 @@
1111
1078
 
1112
1079
  <xsl:attribute-set name="legal-statement-title-style">
1113
1080
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1114
-
1115
1081
  </xsl:attribute-set> <!-- legal-statement-title-style -->
1116
1082
 
1117
1083
  <xsl:attribute-set name="legal-statement-p-style">
1118
-
1119
1084
  </xsl:attribute-set> <!-- legal-statement-p-style -->
1120
1085
 
1121
1086
  <xsl:attribute-set name="feedback-statement-style">
1122
-
1123
1087
  </xsl:attribute-set> <!-- feedback-statement-style -->
1124
1088
 
1125
1089
  <xsl:attribute-set name="feedback-statement-title-style">
1126
1090
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1127
-
1128
1091
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
1129
1092
 
1130
1093
  <xsl:attribute-set name="feedback-statement-p-style">
1131
-
1132
1094
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
1133
1095
 
1134
1096
  <!-- End Preface sections styles -->
1135
1097
 
1136
1098
  <xsl:attribute-set name="link-style">
1137
-
1138
- <xsl:attribute name="color">blue</xsl:attribute>
1139
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1140
-
1099
+ <xsl:attribute name="color">blue</xsl:attribute>
1100
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1141
1101
  </xsl:attribute-set>
1142
1102
 
1143
1103
  <xsl:template name="refine_link-style">
1144
-
1145
1104
  </xsl:template> <!-- refine_link-style -->
1146
1105
 
1147
1106
  <xsl:attribute-set name="sourcecode-container-style">
1148
-
1149
1107
  </xsl:attribute-set>
1150
1108
 
1151
1109
  <xsl:attribute-set name="sourcecode-style">
1152
1110
  <xsl:attribute name="white-space">pre</xsl:attribute>
1153
1111
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
1154
1112
  <xsl:attribute name="role">Code</xsl:attribute>
1155
-
1156
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1157
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1158
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1159
-
1113
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1114
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1115
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1160
1116
  </xsl:attribute-set>
1161
1117
 
1162
1118
  <xsl:template name="refine_sourcecode-style">
1163
-
1164
1119
  </xsl:template> <!-- refine_sourcecode-style -->
1165
1120
 
1166
1121
  <xsl:attribute-set name="pre-style">
1167
1122
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1168
1123
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1169
-
1170
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1171
-
1124
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1172
1125
  </xsl:attribute-set>
1173
1126
 
1174
1127
  <xsl:attribute-set name="permission-style">
1175
-
1176
1128
  </xsl:attribute-set>
1177
1129
 
1178
1130
  <xsl:attribute-set name="permission-name-style">
1179
-
1180
1131
  </xsl:attribute-set>
1181
1132
 
1182
1133
  <xsl:attribute-set name="permission-label-style">
1183
-
1184
1134
  </xsl:attribute-set>
1185
1135
 
1186
1136
  <xsl:attribute-set name="requirement-style">
1187
-
1188
1137
  </xsl:attribute-set>
1189
1138
 
1190
1139
  <xsl:attribute-set name="requirement-name-style">
1191
1140
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1192
-
1193
1141
  </xsl:attribute-set>
1194
1142
 
1195
1143
  <xsl:attribute-set name="requirement-label-style">
1196
-
1197
1144
  </xsl:attribute-set>
1198
1145
 
1199
1146
  <xsl:attribute-set name="subject-style">
@@ -1221,132 +1168,102 @@
1221
1168
  </xsl:attribute-set>
1222
1169
 
1223
1170
  <xsl:attribute-set name="recommendation-style">
1224
-
1225
1171
  </xsl:attribute-set>
1226
1172
 
1227
1173
  <xsl:attribute-set name="recommendation-name-style">
1228
-
1229
1174
  </xsl:attribute-set>
1230
1175
 
1231
1176
  <xsl:attribute-set name="recommendation-label-style">
1232
-
1233
1177
  </xsl:attribute-set>
1234
1178
 
1235
1179
  <xsl:attribute-set name="termexample-style">
1236
-
1237
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1238
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1239
-
1180
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1181
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1240
1182
  </xsl:attribute-set>
1241
1183
 
1242
1184
  <xsl:template name="refine_termexample-style">
1243
-
1244
1185
  </xsl:template>
1245
1186
 
1246
1187
  <xsl:attribute-set name="example-style">
1247
-
1248
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1249
-
1188
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1250
1189
  </xsl:attribute-set> <!-- example-style -->
1251
1190
 
1252
1191
  <xsl:template name="refine_example-style">
1253
-
1254
1192
  </xsl:template> <!-- refine_example-style -->
1255
1193
 
1256
1194
  <xsl:attribute-set name="example-body-style">
1257
-
1258
- <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
1259
-
1195
+ <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
1260
1196
  </xsl:attribute-set> <!-- example-body-style -->
1261
1197
 
1262
1198
  <xsl:attribute-set name="example-name-style">
1263
-
1264
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1265
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1266
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1267
-
1199
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1200
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1201
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1268
1202
  </xsl:attribute-set> <!-- example-name-style -->
1269
1203
 
1270
1204
  <xsl:template name="refine_example-name-style">
1271
-
1272
1205
  </xsl:template>
1273
1206
 
1274
1207
  <xsl:attribute-set name="example-p-style">
1275
-
1276
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1208
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1277
1209
 
1278
1210
  </xsl:attribute-set> <!-- example-p-style -->
1279
1211
 
1280
1212
  <xsl:template name="refine_example-p-style">
1281
-
1282
1213
  </xsl:template> <!-- refine_example-p-style -->
1283
1214
 
1284
1215
  <xsl:attribute-set name="termexample-name-style">
1285
-
1286
- <xsl:attribute name="padding-right">10mm</xsl:attribute>
1287
-
1216
+ <xsl:attribute name="padding-right">10mm</xsl:attribute>
1288
1217
  </xsl:attribute-set> <!-- termexample-name-style -->
1289
1218
 
1290
1219
  <xsl:template name="refine_termexample-name-style">
1291
-
1292
1220
  </xsl:template>
1293
1221
 
1294
1222
  <!-- ========================== -->
1295
1223
  <!-- Table styles -->
1296
1224
  <!-- ========================== -->
1297
1225
  <xsl:variable name="table-border_">
1298
-
1299
1226
  </xsl:variable>
1300
1227
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
1301
1228
 
1302
1229
  <xsl:variable name="table-cell-border_">
1303
-
1304
1230
  </xsl:variable>
1305
1231
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
1306
1232
 
1307
1233
  <xsl:attribute-set name="table-container-style">
1308
1234
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1309
1235
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1310
-
1311
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1312
-
1236
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1313
1237
  </xsl:attribute-set> <!-- table-container-style -->
1314
1238
 
1315
1239
  <xsl:template name="refine_table-container-style">
1316
1240
  <xsl:param name="margin-side"/>
1317
-
1318
- <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1319
- <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1320
-
1241
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1242
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1321
1243
  <!-- end table block-container attributes -->
1322
1244
  </xsl:template> <!-- refine_table-container-style -->
1323
1245
 
1324
1246
  <xsl:attribute-set name="table-style">
1325
1247
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
1326
1248
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
1327
-
1328
1249
  </xsl:attribute-set><!-- table-style -->
1329
1250
 
1330
1251
  <xsl:template name="refine_table-style">
1331
1252
  <xsl:param name="margin-side"/>
1332
-
1333
- <xsl:if test="$margin-side != 0">
1334
- <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1335
- <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1336
- </xsl:if>
1253
+ <xsl:if test="$margin-side != 0">
1254
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1255
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1256
+ </xsl:if>
1337
1257
 
1338
1258
  <xsl:call-template name="setBordersTableArray"/>
1339
-
1340
1259
  </xsl:template> <!-- refine_table-style -->
1341
1260
 
1342
1261
  <xsl:attribute-set name="table-name-style">
1343
1262
  <xsl:attribute name="role">Caption</xsl:attribute>
1344
1263
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1345
-
1346
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1347
- <xsl:attribute name="text-align">center</xsl:attribute>
1348
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1349
-
1264
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1265
+ <xsl:attribute name="text-align">center</xsl:attribute>
1266
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1350
1267
  </xsl:attribute-set> <!-- table-name-style -->
1351
1268
 
1352
1269
  <xsl:template name="refine_table-name-style">
@@ -1354,31 +1271,25 @@
1354
1271
  <xsl:if test="$continued = 'true'">
1355
1272
  <xsl:attribute name="role">SKIP</xsl:attribute>
1356
1273
  </xsl:if>
1357
-
1358
1274
  </xsl:template> <!-- refine_table-name-style -->
1359
1275
 
1360
1276
  <xsl:attribute-set name="table-row-style">
1361
1277
  <xsl:attribute name="min-height">4mm</xsl:attribute>
1362
-
1363
1278
  </xsl:attribute-set>
1364
1279
 
1365
1280
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1366
1281
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1367
-
1368
1282
  </xsl:attribute-set>
1369
1283
 
1370
1284
  <xsl:template name="refine_table-header-row-style">
1371
1285
 
1372
1286
  <xsl:call-template name="setBordersTableArray"/>
1373
-
1374
1287
  </xsl:template> <!-- refine_table-header-row-style -->
1375
1288
 
1376
1289
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
1377
-
1378
1290
  </xsl:attribute-set>
1379
1291
 
1380
1292
  <xsl:template name="refine_table-footer-row-style">
1381
-
1382
1293
  </xsl:template> <!-- refine_table-footer-row-style -->
1383
1294
 
1384
1295
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -1388,7 +1299,6 @@
1388
1299
  <xsl:template name="refine_table-body-row-style">
1389
1300
 
1390
1301
  <xsl:call-template name="setBordersTableArray"/>
1391
-
1392
1302
  </xsl:template> <!-- refine_table-body-row-style -->
1393
1303
 
1394
1304
  <xsl:attribute-set name="table-header-cell-style">
@@ -1396,7 +1306,6 @@
1396
1306
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1397
1307
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1398
1308
  <xsl:attribute name="display-align">center</xsl:attribute>
1399
-
1400
1309
  </xsl:attribute-set> <!-- table-header-cell-style -->
1401
1310
 
1402
1311
  <xsl:template name="refine_table-header-cell-style">
@@ -1408,14 +1317,12 @@
1408
1317
  </xsl:if>
1409
1318
 
1410
1319
  <xsl:call-template name="setTableCellAttributes"/>
1411
-
1412
1320
  </xsl:template> <!-- refine_table-header-cell-style -->
1413
1321
 
1414
1322
  <xsl:attribute-set name="table-cell-style">
1415
1323
  <xsl:attribute name="display-align">center</xsl:attribute>
1416
1324
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1417
1325
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1418
-
1419
1326
  </xsl:attribute-set> <!-- table-cell-style -->
1420
1327
 
1421
1328
  <xsl:template name="refine_table-cell-style">
@@ -1424,8 +1331,6 @@
1424
1331
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1425
1332
  </xsl:if>
1426
1333
 
1427
- <!-- bsi -->
1428
-
1429
1334
  <xsl:call-template name="setBordersTableArray"/>
1430
1335
 
1431
1336
  </xsl:template> <!-- refine_table-cell-style -->
@@ -1435,56 +1340,44 @@
1435
1340
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1436
1341
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1437
1342
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
1438
-
1439
1343
  </xsl:attribute-set> <!-- table-footer-cell-style -->
1440
1344
 
1441
1345
  <xsl:template name="refine_table-footer-cell-style">
1442
-
1443
1346
  </xsl:template> <!-- refine_table-footer-cell-style -->
1444
1347
 
1445
1348
  <xsl:attribute-set name="table-note-style">
1446
1349
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1447
1350
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1448
-
1449
1351
  </xsl:attribute-set><!-- table-note-style -->
1450
1352
 
1451
1353
  <xsl:template name="refine_table-note-style">
1452
-
1453
1354
  </xsl:template> <!-- refine_table-note-style -->
1454
1355
 
1455
1356
  <xsl:attribute-set name="table-fn-style">
1456
1357
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1457
-
1458
1358
  </xsl:attribute-set> <!-- table-fn-style -->
1459
1359
 
1460
1360
  <xsl:template name="refine_table-fn-style">
1461
-
1462
1361
  </xsl:template>
1463
1362
 
1464
1363
  <xsl:attribute-set name="table-fn-number-style">
1465
1364
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
1466
-
1467
1365
  </xsl:attribute-set> <!-- table-fn-number-style -->
1468
1366
 
1469
1367
  <xsl:attribute-set name="table-fmt-fn-label-style">
1470
1368
  <xsl:attribute name="font-size">80%</xsl:attribute>
1471
-
1472
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1473
-
1369
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1474
1370
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
1475
1371
 
1476
1372
  <xsl:template name="refine_table-fmt-fn-label-style">
1477
-
1478
1373
  </xsl:template>
1479
1374
 
1480
1375
  <xsl:attribute-set name="fn-container-body-style">
1481
1376
  <xsl:attribute name="text-indent">0</xsl:attribute>
1482
1377
  <xsl:attribute name="start-indent">0</xsl:attribute>
1483
-
1484
1378
  </xsl:attribute-set>
1485
1379
 
1486
1380
  <xsl:attribute-set name="table-fn-body-style">
1487
-
1488
1381
  </xsl:attribute-set>
1489
1382
 
1490
1383
  <xsl:attribute-set name="figure-fn-number-style">
@@ -1494,17 +1387,14 @@
1494
1387
  <xsl:attribute-set name="figure-fmt-fn-label-style">
1495
1388
  <xsl:attribute name="font-size">80%</xsl:attribute>
1496
1389
  <xsl:attribute name="vertical-align">super</xsl:attribute>
1497
-
1498
1390
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
1499
1391
 
1500
1392
  <xsl:template name="refine_figure-fmt-fn-label-style">
1501
-
1502
1393
  </xsl:template>
1503
1394
 
1504
1395
  <xsl:attribute-set name="figure-fn-body-style">
1505
1396
  <xsl:attribute name="text-align">justify</xsl:attribute>
1506
1397
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1507
-
1508
1398
  </xsl:attribute-set>
1509
1399
  <!-- ========================== -->
1510
1400
  <!-- END Table styles -->
@@ -1515,47 +1405,36 @@
1515
1405
  <!-- ========================== -->
1516
1406
 
1517
1407
  <xsl:attribute-set name="dl-block-style">
1518
-
1519
1408
  </xsl:attribute-set>
1520
1409
 
1521
1410
  <xsl:attribute-set name="dt-row-style">
1522
-
1523
1411
  </xsl:attribute-set>
1524
1412
 
1525
1413
  <xsl:attribute-set name="dt-cell-style">
1526
-
1527
1414
  </xsl:attribute-set>
1528
1415
 
1529
1416
  <xsl:template name="refine_dt-cell-style">
1530
-
1531
1417
  </xsl:template> <!-- refine_dt-cell-style -->
1532
1418
 
1533
1419
  <xsl:attribute-set name="dt-block-style">
1534
1420
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
1535
-
1536
- <xsl:attribute name="margin-left">7mm</xsl:attribute>
1537
-
1421
+ <xsl:attribute name="margin-left">7mm</xsl:attribute>
1538
1422
  </xsl:attribute-set>
1539
1423
 
1540
1424
  <xsl:template name="refine_dt-block-style">
1541
-
1542
1425
  </xsl:template> <!-- refine_dt-block-style -->
1543
1426
 
1544
1427
  <xsl:attribute-set name="dl-name-style">
1545
1428
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1546
1429
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1547
-
1548
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1549
-
1430
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1550
1431
  </xsl:attribute-set> <!-- dl-name-style -->
1551
1432
 
1552
1433
  <xsl:attribute-set name="dd-cell-style">
1553
1434
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
1554
-
1555
1435
  </xsl:attribute-set>
1556
1436
 
1557
1437
  <xsl:template name="refine_dd-cell-style">
1558
-
1559
1438
  </xsl:template> <!-- refine_dd-cell-style -->
1560
1439
 
1561
1440
  <!-- ========================== -->
@@ -1563,241 +1442,181 @@
1563
1442
  <!-- ========================== -->
1564
1443
 
1565
1444
  <xsl:attribute-set name="appendix-style">
1566
-
1567
- <xsl:attribute name="font-size">12pt</xsl:attribute>
1568
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1569
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1570
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1571
-
1445
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
1446
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1447
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1448
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1572
1449
  </xsl:attribute-set>
1573
1450
 
1574
1451
  <xsl:attribute-set name="appendix-example-style">
1575
-
1576
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1577
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
1578
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1579
-
1452
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1453
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
1454
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1580
1455
  </xsl:attribute-set>
1581
1456
 
1582
1457
  <xsl:attribute-set name="xref-style">
1583
-
1584
1458
  </xsl:attribute-set>
1585
1459
 
1586
1460
  <xsl:attribute-set name="eref-style">
1587
-
1588
- <xsl:attribute name="color">blue</xsl:attribute>
1589
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1590
-
1461
+ <xsl:attribute name="color">blue</xsl:attribute>
1462
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1591
1463
  </xsl:attribute-set>
1592
1464
 
1593
1465
  <xsl:template name="refine_eref-style">
1594
1466
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
1595
1467
  <xsl:variable name="text" select="normalize-space()"/>
1596
-
1597
1468
  </xsl:template> <!-- refine_eref-style -->
1598
1469
 
1599
1470
  <xsl:attribute-set name="note-style">
1600
-
1601
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1602
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1603
-
1471
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1472
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1604
1473
  </xsl:attribute-set>
1605
1474
 
1606
1475
  <xsl:template name="refine_note-style">
1607
-
1608
1476
  </xsl:template>
1609
1477
 
1610
1478
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
1611
1479
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
1612
1480
 
1613
1481
  <xsl:attribute-set name="note-name-style">
1614
-
1615
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
1616
-
1482
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
1617
1483
  </xsl:attribute-set>
1618
1484
 
1619
1485
  <xsl:template name="refine_note-name-style">
1620
-
1621
1486
  </xsl:template> <!-- refine_note-name-style -->
1622
1487
 
1623
1488
  <xsl:attribute-set name="table-note-name-style">
1624
1489
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
1625
-
1626
1490
  </xsl:attribute-set>
1627
1491
 
1628
1492
  <xsl:template name="refine_table-note-name-style">
1629
-
1630
1493
  </xsl:template> <!-- refine_table-note-name-style -->
1631
1494
 
1632
1495
  <xsl:attribute-set name="note-p-style">
1633
-
1634
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1635
-
1496
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1636
1497
  </xsl:attribute-set>
1637
1498
 
1638
1499
  <xsl:attribute-set name="termnote-style">
1639
-
1640
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1641
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1642
-
1500
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1501
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1643
1502
  </xsl:attribute-set>
1644
1503
 
1645
1504
  <xsl:template name="refine_termnote-style">
1646
-
1647
1505
  </xsl:template> <!-- refine_termnote-style -->
1648
1506
 
1649
1507
  <xsl:attribute-set name="termnote-name-style">
1650
-
1651
1508
  </xsl:attribute-set>
1652
1509
 
1653
1510
  <xsl:template name="refine_termnote-name-style">
1654
-
1655
- <!-- <xsl:if test="$namespace = 'ieee'">
1656
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
1657
- </xsl:if> -->
1658
-
1659
1511
  </xsl:template>
1660
1512
 
1661
1513
  <xsl:attribute-set name="termnote-p-style">
1662
-
1663
1514
  </xsl:attribute-set>
1664
1515
 
1665
1516
  <xsl:attribute-set name="quote-style">
1666
1517
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
1667
1518
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
1668
-
1669
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1670
-
1519
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1671
1520
  </xsl:attribute-set>
1672
1521
 
1673
1522
  <xsl:template name="refine_quote-style">
1674
-
1675
1523
  </xsl:template>
1676
1524
 
1677
1525
  <xsl:attribute-set name="quote-source-style">
1678
1526
  <xsl:attribute name="text-align">right</xsl:attribute>
1679
-
1680
1527
  </xsl:attribute-set>
1681
1528
 
1682
1529
  <xsl:attribute-set name="termsource-style">
1683
-
1684
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1685
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1686
-
1530
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
1531
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1687
1532
  </xsl:attribute-set>
1688
1533
 
1689
1534
  <xsl:template name="refine_termsource-style">
1690
-
1691
1535
  </xsl:template> <!-- refine_termsource-style -->
1692
1536
 
1693
1537
  <xsl:attribute-set name="termsource-text-style">
1694
-
1695
1538
  </xsl:attribute-set>
1696
1539
 
1697
1540
  <xsl:attribute-set name="origin-style">
1698
-
1699
1541
  </xsl:attribute-set>
1700
1542
 
1701
1543
  <xsl:attribute-set name="term-style">
1702
-
1703
1544
  </xsl:attribute-set>
1704
1545
 
1705
1546
  <xsl:attribute-set name="term-name-style">
1706
1547
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1707
1548
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1708
-
1709
1549
  </xsl:attribute-set>
1710
1550
 
1711
1551
  <xsl:attribute-set name="figure-block-style">
1712
1552
  <xsl:attribute name="role">SKIP</xsl:attribute>
1713
-
1714
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1715
-
1553
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1716
1554
  </xsl:attribute-set>
1717
1555
 
1718
1556
  <xsl:template name="refine_figure-block-style">
1719
-
1720
1557
  </xsl:template>
1721
1558
 
1722
1559
  <xsl:attribute-set name="figure-style">
1723
-
1724
1560
  </xsl:attribute-set>
1725
1561
 
1726
1562
  <xsl:attribute-set name="figure-name-style">
1727
1563
  <xsl:attribute name="role">Caption</xsl:attribute>
1728
-
1729
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1730
- <xsl:attribute name="text-align">center</xsl:attribute>
1731
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1732
- <xsl:attribute name="space-after">12pt</xsl:attribute>
1733
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1734
-
1564
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1565
+ <xsl:attribute name="text-align">center</xsl:attribute>
1566
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1567
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
1568
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1735
1569
  </xsl:attribute-set>
1736
1570
 
1737
1571
  <xsl:template name="refine_figure-name-style">
1738
-
1739
1572
  </xsl:template> <!-- refine_figure-name-style -->
1740
1573
 
1741
1574
  <xsl:attribute-set name="figure-source-style">
1742
-
1743
1575
  </xsl:attribute-set>
1744
1576
 
1745
1577
  <!-- Formula's styles -->
1746
1578
  <xsl:attribute-set name="formula-style">
1747
1579
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
1748
1580
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1749
-
1750
1581
  </xsl:attribute-set> <!-- formula-style -->
1751
1582
 
1752
1583
  <xsl:attribute-set name="formula-stem-block-style">
1753
1584
  <xsl:attribute name="text-align">center</xsl:attribute>
1754
-
1755
- <xsl:attribute name="text-align">left</xsl:attribute>
1756
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
1757
-
1585
+ <xsl:attribute name="text-align">left</xsl:attribute>
1586
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
1758
1587
  </xsl:attribute-set> <!-- formula-stem-block-style -->
1759
1588
 
1760
1589
  <xsl:template name="refine_formula-stem-block-style">
1761
-
1762
1590
  </xsl:template> <!-- refine_formula-stem-block-style -->
1763
1591
 
1764
1592
  <xsl:attribute-set name="formula-stem-number-style">
1765
1593
  <xsl:attribute name="text-align">right</xsl:attribute>
1766
-
1767
1594
  </xsl:attribute-set> <!-- formula-stem-number-style -->
1768
1595
  <!-- End Formula's styles -->
1769
1596
 
1770
1597
  <xsl:template name="refine_formula-stem-number-style">
1771
-
1772
1598
  </xsl:template>
1773
1599
 
1774
1600
  <xsl:attribute-set name="image-style">
1775
1601
  <xsl:attribute name="role">SKIP</xsl:attribute>
1776
1602
  <xsl:attribute name="text-align">center</xsl:attribute>
1777
-
1778
1603
  </xsl:attribute-set>
1779
1604
 
1780
1605
  <xsl:template name="refine_image-style">
1781
-
1782
1606
  </xsl:template>
1783
1607
 
1784
1608
  <xsl:attribute-set name="figure-pseudocode-p-style">
1785
-
1786
1609
  </xsl:attribute-set>
1787
1610
 
1788
1611
  <xsl:attribute-set name="image-graphic-style">
1789
1612
  <xsl:attribute name="width">100%</xsl:attribute>
1790
1613
  <xsl:attribute name="content-height">100%</xsl:attribute>
1791
1614
  <xsl:attribute name="scaling">uniform</xsl:attribute>
1792
-
1793
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1794
-
1615
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1795
1616
  </xsl:attribute-set>
1796
1617
 
1797
1618
  <xsl:attribute-set name="tt-style">
1798
-
1799
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1800
-
1619
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1801
1620
  </xsl:attribute-set>
1802
1621
 
1803
1622
  <xsl:attribute-set name="sourcecode-name-style">
@@ -1806,54 +1625,43 @@
1806
1625
  <xsl:attribute name="text-align">center</xsl:attribute>
1807
1626
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1808
1627
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1809
-
1810
1628
  </xsl:attribute-set>
1811
1629
 
1812
1630
  <xsl:attribute-set name="preferred-block-style">
1813
-
1814
- <xsl:attribute name="line-height">1.1</xsl:attribute>
1815
-
1631
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
1816
1632
  </xsl:attribute-set>
1817
1633
 
1818
1634
  <xsl:attribute-set name="preferred-term-style">
1819
1635
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1820
1636
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1821
-
1822
1637
  </xsl:attribute-set>
1823
1638
 
1824
1639
  <xsl:attribute-set name="domain-style">
1825
-
1826
1640
  </xsl:attribute-set>
1827
1641
 
1828
1642
  <xsl:attribute-set name="admitted-style">
1829
-
1830
1643
  </xsl:attribute-set>
1831
1644
 
1832
1645
  <xsl:attribute-set name="deprecates-style">
1833
-
1834
1646
  </xsl:attribute-set>
1835
1647
 
1836
1648
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
1837
1649
  </xsl:attribute-set>
1838
1650
 
1839
1651
  <xsl:attribute-set name="definition-style">
1840
-
1841
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1842
-
1652
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1843
1653
  </xsl:attribute-set>
1844
1654
 
1845
1655
  <xsl:variable name="color-added-text">
1846
1656
  <xsl:text>rgb(0, 255, 0)</xsl:text>
1847
1657
  </xsl:variable>
1848
1658
  <xsl:attribute-set name="add-style">
1849
-
1850
- <xsl:attribute name="color">red</xsl:attribute>
1851
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1852
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1659
+ <xsl:attribute name="color">red</xsl:attribute>
1660
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1661
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
1853
1662
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1854
1663
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
1855
1664
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1856
-
1857
1665
  </xsl:attribute-set>
1858
1666
 
1859
1667
  <xsl:variable name="add-style">
@@ -1873,57 +1681,43 @@
1873
1681
 
1874
1682
  <xsl:attribute-set name="mathml-style">
1875
1683
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
1876
-
1877
1684
  </xsl:attribute-set>
1878
1685
 
1879
1686
  <xsl:template name="refine_mathml-style">
1880
-
1881
1687
  </xsl:template>
1882
1688
 
1883
1689
  <xsl:attribute-set name="list-style">
1884
-
1885
- <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1886
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1887
-
1690
+ <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1691
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1888
1692
  </xsl:attribute-set> <!-- list-style -->
1889
1693
 
1890
1694
  <xsl:template name="refine_list-style">
1891
-
1892
- <xsl:if test="ancestor::csd:ol">
1893
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
1894
- </xsl:if>
1895
-
1695
+ <xsl:if test="ancestor::csd:ol">
1696
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
1697
+ </xsl:if>
1896
1698
  </xsl:template> <!-- refine_list-style -->
1897
1699
 
1898
1700
  <xsl:attribute-set name="list-name-style">
1899
1701
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1900
-
1901
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1902
-
1702
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1903
1703
  </xsl:attribute-set> <!-- list-name-style -->
1904
1704
 
1905
1705
  <xsl:attribute-set name="list-item-style">
1906
-
1907
1706
  </xsl:attribute-set>
1908
1707
 
1909
1708
  <xsl:template name="refine_list-item-style">
1910
-
1911
1709
  </xsl:template> <!-- refine_list-item-style -->
1912
1710
 
1913
1711
  <xsl:attribute-set name="list-item-label-style">
1914
-
1915
1712
  </xsl:attribute-set>
1916
1713
 
1917
1714
  <xsl:template name="refine_list-item-label-style">
1918
-
1919
1715
  </xsl:template> <!-- refine_list-item-label-style -->
1920
1716
 
1921
1717
  <xsl:attribute-set name="list-item-body-style">
1922
-
1923
1718
  </xsl:attribute-set>
1924
1719
 
1925
1720
  <xsl:template name="refine_list-item-body-style">
1926
-
1927
1721
  </xsl:template> <!-- refine_list-item-body-style -->
1928
1722
 
1929
1723
  <xsl:attribute-set name="toc-style">
@@ -1937,7 +1731,6 @@
1937
1731
  </xsl:attribute-set>
1938
1732
 
1939
1733
  <xsl:template name="refine_fn-reference-style">
1940
-
1941
1734
  </xsl:template> <!-- refine_fn-reference-style -->
1942
1735
 
1943
1736
  <xsl:attribute-set name="fn-style">
@@ -1946,10 +1739,8 @@
1946
1739
 
1947
1740
  <xsl:attribute-set name="fn-num-style">
1948
1741
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1949
-
1950
- <xsl:attribute name="font-size">65%</xsl:attribute>
1951
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1952
-
1742
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1743
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1953
1744
  </xsl:attribute-set>
1954
1745
 
1955
1746
  <xsl:attribute-set name="fn-body-style">
@@ -1957,112 +1748,84 @@
1957
1748
  <xsl:attribute name="font-style">normal</xsl:attribute>
1958
1749
  <xsl:attribute name="text-indent">0</xsl:attribute>
1959
1750
  <xsl:attribute name="start-indent">0</xsl:attribute>
1960
-
1961
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1962
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1963
-
1751
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1752
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1964
1753
  </xsl:attribute-set>
1965
1754
 
1966
1755
  <xsl:template name="refine_fn-body-style">
1967
-
1968
1756
  </xsl:template> <!-- refine_fn-body-style -->
1969
1757
 
1970
1758
  <xsl:attribute-set name="fn-body-num-style">
1971
1759
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1972
-
1973
- <xsl:attribute name="font-size">60%</xsl:attribute>
1974
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1975
-
1760
+ <xsl:attribute name="font-size">60%</xsl:attribute>
1761
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1976
1762
  </xsl:attribute-set> <!-- fn-body-num-style -->
1977
1763
 
1978
1764
  <xsl:template name="refine_fn-body-num-style">
1979
-
1980
1765
  </xsl:template> <!-- refine_fn-body-num-style -->
1981
1766
 
1982
1767
  <!-- admonition -->
1983
1768
  <xsl:attribute-set name="admonition-style">
1984
-
1985
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1986
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1987
-
1769
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1770
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1988
1771
  </xsl:attribute-set> <!-- admonition-style -->
1989
1772
 
1990
1773
  <xsl:attribute-set name="admonition-container-style">
1991
1774
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1992
1775
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1993
-
1994
1776
  </xsl:attribute-set> <!-- admonition-container-style -->
1995
1777
 
1996
1778
  <xsl:attribute-set name="admonition-name-style">
1997
1779
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1998
-
1999
1780
  </xsl:attribute-set> <!-- admonition-name-style -->
2000
1781
 
2001
1782
  <xsl:attribute-set name="admonition-p-style">
2002
-
2003
1783
  </xsl:attribute-set> <!-- admonition-p-style -->
2004
1784
  <!-- end admonition -->
2005
1785
 
2006
1786
  <!-- bibitem in Normative References (references/@normative="true") -->
2007
1787
  <xsl:attribute-set name="bibitem-normative-style">
2008
-
2009
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2010
-
1788
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2011
1789
  </xsl:attribute-set> <!-- bibitem-normative-style -->
2012
1790
 
2013
1791
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
2014
1792
  <xsl:attribute-set name="bibitem-normative-list-style">
2015
1793
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
2016
1794
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2017
-
2018
- <!-- <xsl:if test="$namespace = 'ieee'">
2019
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2020
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
2021
- </xsl:if> -->
2022
-
2023
1795
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
2024
1796
 
2025
1797
  <xsl:attribute-set name="bibitem-non-normative-style">
2026
-
2027
1798
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
2028
1799
 
2029
1800
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
2030
1801
  <xsl:attribute-set name="bibitem-non-normative-list-style">
2031
1802
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
2032
1803
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2033
-
2034
1804
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
2035
1805
 
2036
1806
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
2037
1807
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2038
-
2039
1808
  </xsl:attribute-set>
2040
1809
 
2041
1810
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
2042
1811
  <xsl:attribute-set name="bibitem-normative-list-body-style">
2043
-
2044
1812
  </xsl:attribute-set>
2045
1813
 
2046
1814
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
2047
-
2048
1815
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
2049
1816
 
2050
1817
  <!-- footnote reference number for bibitem, in the text -->
2051
1818
  <xsl:attribute-set name="bibitem-note-fn-style">
2052
1819
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
2053
1820
  <xsl:attribute name="font-size">65%</xsl:attribute>
2054
-
2055
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2056
-
1821
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2057
1822
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
2058
1823
 
2059
1824
  <!-- footnote number on the page bottom -->
2060
1825
  <xsl:attribute-set name="bibitem-note-fn-number-style">
2061
1826
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
2062
-
2063
- <xsl:attribute name="font-size">60%</xsl:attribute>
2064
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2065
-
1827
+ <xsl:attribute name="font-size">60%</xsl:attribute>
1828
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2066
1829
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
2067
1830
 
2068
1831
  <!-- footnote body (text) on the page bottom -->
@@ -2070,11 +1833,9 @@
2070
1833
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2071
1834
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2072
1835
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
2073
-
2074
1836
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
2075
1837
 
2076
1838
  <xsl:attribute-set name="references-non-normative-style">
2077
-
2078
1839
  </xsl:attribute-set> <!-- references-non-normative-style -->
2079
1840
 
2080
1841
  <!-- Highlight.js syntax GitHub styles -->
@@ -2234,12 +1995,10 @@
2234
1995
  <!-- Index section styles -->
2235
1996
  <xsl:attribute-set name="indexsect-title-style">
2236
1997
  <xsl:attribute name="role">H1</xsl:attribute>
2237
-
2238
1998
  </xsl:attribute-set>
2239
1999
 
2240
2000
  <xsl:attribute-set name="indexsect-clause-title-style">
2241
2001
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2242
-
2243
2002
  </xsl:attribute-set>
2244
2003
 
2245
2004
  <!-- End Index section styles -->
@@ -2316,47 +2075,47 @@
2316
2075
  </xsl:template>
2317
2076
 
2318
2077
  <xsl:template name="processTables_Contents">
2319
- <tables>
2078
+ <mn:tables>
2320
2079
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
2321
2080
  <xsl:choose>
2322
2081
  <xsl:when test="*[local-name() = 'fmt-name']">
2323
2082
  <xsl:variable name="fmt_name">
2324
2083
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
2325
2084
  </xsl:variable>
2326
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
2085
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
2327
2086
  <xsl:copy-of select="$fmt_name"/>
2328
- </table>
2087
+ </mn:table>
2329
2088
  </xsl:when>
2330
2089
  <xsl:otherwise>
2331
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
2090
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
2332
2091
  <xsl:copy-of select="*[local-name() = 'name']"/>
2333
- </table>
2092
+ </mn:table>
2334
2093
  </xsl:otherwise>
2335
2094
  </xsl:choose>
2336
2095
  </xsl:for-each>
2337
- </tables>
2096
+ </mn:tables>
2338
2097
  </xsl:template>
2339
2098
 
2340
2099
  <xsl:template name="processFigures_Contents">
2341
- <figures>
2100
+ <mn:figures>
2342
2101
  <xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
2343
2102
  <xsl:choose>
2344
2103
  <xsl:when test="*[local-name() = 'fmt-name']">
2345
2104
  <xsl:variable name="fmt_name">
2346
2105
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
2347
2106
  </xsl:variable>
2348
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
2107
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
2349
2108
  <xsl:copy-of select="$fmt_name"/>
2350
- </figure>
2109
+ </mn:figure>
2351
2110
  </xsl:when>
2352
2111
  <xsl:otherwise>
2353
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
2112
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
2354
2113
  <xsl:copy-of select="*[local-name() = 'name']"/>
2355
- </figure>
2114
+ </mn:figure>
2356
2115
  </xsl:otherwise>
2357
2116
  </xsl:choose>
2358
2117
  </xsl:for-each>
2359
- </figures>
2118
+ </mn:figures>
2360
2119
  </xsl:template>
2361
2120
 
2362
2121
  <xsl:template name="processPrefaceSectionsDefault">
@@ -2375,7 +2134,6 @@
2375
2134
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2376
2135
  <xsl:sort select="@displayorder" data-type="number"/>
2377
2136
  <xsl:apply-templates select="."/>
2378
-
2379
2137
  </xsl:for-each>
2380
2138
 
2381
2139
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -2482,7 +2240,6 @@
2482
2240
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2483
2241
  <xsl:sort select="@displayorder" data-type="number"/>
2484
2242
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
2485
-
2486
2243
  </xsl:for-each>
2487
2244
  </xsl:element>
2488
2245
  </xsl:element>
@@ -2616,7 +2373,6 @@
2616
2373
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
2617
2374
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
2618
2375
  </xsl:apply-templates>
2619
-
2620
2376
  </xsl:for-each>
2621
2377
  </xsl:element>
2622
2378
 
@@ -2656,19 +2412,17 @@
2656
2412
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2657
2413
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
2658
2414
  <xsl:template match="text()" name="text">
2659
-
2660
- <xsl:choose>
2661
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2662
- <xsl:otherwise>
2663
- <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2664
- <xsl:call-template name="replace_fo_inline_tags">
2665
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2666
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2667
- <xsl:with-param name="text" select="$text"/>
2668
- </xsl:call-template>
2669
- </xsl:otherwise>
2670
- </xsl:choose>
2671
-
2415
+ <xsl:choose>
2416
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2417
+ <xsl:otherwise>
2418
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2419
+ <xsl:call-template name="replace_fo_inline_tags">
2420
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2421
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2422
+ <xsl:with-param name="text" select="$text"/>
2423
+ </xsl:call-template>
2424
+ </xsl:otherwise>
2425
+ </xsl:choose>
2672
2426
  </xsl:template>
2673
2427
 
2674
2428
  <xsl:template name="replace_fo_inline_tags">
@@ -2722,7 +2476,7 @@
2722
2476
  <xsl:with-param name="keep_sep">true</xsl:with-param>
2723
2477
  </xsl:call-template>
2724
2478
  </xsl:variable>
2725
- <xsl:for-each select="xalan:nodeset($items)/item">
2479
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
2726
2480
  <xsl:choose>
2727
2481
  <xsl:when test=". = $sep">
2728
2482
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -2751,17 +2505,13 @@
2751
2505
  </xsl:template> <!-- copyright-statement -->
2752
2506
 
2753
2507
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
2754
-
2755
- <!-- process in the template 'title' -->
2756
- <xsl:call-template name="title"/>
2757
-
2508
+ <!-- process in the template 'title' -->
2509
+ <xsl:call-template name="title"/>
2758
2510
  </xsl:template> <!-- copyright-statement//title -->
2759
2511
 
2760
2512
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
2761
-
2762
- <!-- process in the template 'paragraph' -->
2763
- <xsl:call-template name="paragraph"/>
2764
-
2513
+ <!-- process in the template 'paragraph' -->
2514
+ <xsl:call-template name="paragraph"/>
2765
2515
  </xsl:template> <!-- copyright-statement//p -->
2766
2516
 
2767
2517
  <xsl:template match="*[local-name()='license-statement']">
@@ -2771,42 +2521,34 @@
2771
2521
  </xsl:template> <!-- license-statement -->
2772
2522
 
2773
2523
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
2774
-
2775
- <!-- process in the template 'title' -->
2776
- <xsl:call-template name="title"/>
2777
-
2524
+ <!-- process in the template 'title' -->
2525
+ <xsl:call-template name="title"/>
2778
2526
  </xsl:template> <!-- license-statement/title -->
2779
2527
 
2780
2528
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
2781
-
2782
- <!-- process in the template 'paragraph' -->
2783
- <xsl:call-template name="paragraph"/>
2784
-
2529
+ <!-- process in the template 'paragraph' -->
2530
+ <xsl:call-template name="paragraph"/>
2785
2531
  </xsl:template> <!-- license-statement/p -->
2786
2532
 
2787
2533
  <xsl:template match="*[local-name()='legal-statement']">
2788
2534
  <xsl:param name="isLegacy">false</xsl:param>
2789
2535
  <fo:block xsl:use-attribute-sets="legal-statement-style">
2790
-
2791
2536
  <xsl:apply-templates/>
2792
2537
  </fo:block>
2793
2538
  </xsl:template> <!-- legal-statement -->
2794
2539
 
2795
2540
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
2796
-
2797
- <!-- process in the template 'title' -->
2798
- <xsl:call-template name="title"/>
2541
+ <!-- process in the template 'title' -->
2542
+ <xsl:call-template name="title"/>
2799
2543
 
2800
2544
  </xsl:template> <!-- legal-statement/title -->
2801
2545
 
2802
2546
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
2803
2547
  <xsl:param name="margin"/>
2804
-
2805
- <!-- process in the template 'paragraph' -->
2806
- <xsl:call-template name="paragraph">
2807
- <xsl:with-param name="margin" select="$margin"/>
2808
- </xsl:call-template>
2809
-
2548
+ <!-- process in the template 'paragraph' -->
2549
+ <xsl:call-template name="paragraph">
2550
+ <xsl:with-param name="margin" select="$margin"/>
2551
+ </xsl:call-template>
2810
2552
  </xsl:template> <!-- legal-statement/p -->
2811
2553
 
2812
2554
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -2816,20 +2558,16 @@
2816
2558
  </xsl:template> <!-- feedback-statement -->
2817
2559
 
2818
2560
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
2819
-
2820
- <!-- process in the template 'title' -->
2821
- <xsl:call-template name="title"/>
2822
-
2561
+ <!-- process in the template 'title' -->
2562
+ <xsl:call-template name="title"/>
2823
2563
  </xsl:template>
2824
2564
 
2825
2565
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
2826
2566
  <xsl:param name="margin"/>
2827
-
2828
- <!-- process in the template 'paragraph' -->
2829
- <xsl:call-template name="paragraph">
2830
- <xsl:with-param name="margin" select="$margin"/>
2831
- </xsl:call-template>
2832
-
2567
+ <!-- process in the template 'paragraph' -->
2568
+ <xsl:call-template name="paragraph">
2569
+ <xsl:with-param name="margin" select="$margin"/>
2570
+ </xsl:call-template>
2833
2571
  </xsl:template>
2834
2572
 
2835
2573
  <!-- ================================= -->
@@ -2882,7 +2620,6 @@
2882
2620
  <xsl:template match="*[local-name()='table']" name="table">
2883
2621
 
2884
2622
  <xsl:variable name="table-preamble">
2885
-
2886
2623
  </xsl:variable>
2887
2624
 
2888
2625
  <xsl:variable name="table">
@@ -2900,10 +2637,8 @@
2900
2637
 
2901
2638
  <!-- Display table's name before table as standalone block -->
2902
2639
  <!-- $namespace = 'iso' or -->
2903
-
2904
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
2905
-
2906
- <xsl:call-template name="table_name_fn_display"/>
2640
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
2641
+ <xsl:call-template name="table_name_fn_display"/>
2907
2642
 
2908
2643
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
2909
2644
 
@@ -2956,8 +2691,7 @@
2956
2691
 
2957
2692
  <xsl:variable name="table_width_default">100%</xsl:variable>
2958
2693
  <xsl:variable name="table_width">
2959
- <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
2960
- <xsl:value-of select="$table_width_default"/>
2694
+ <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --><xsl:value-of select="$table_width_default"/>
2961
2695
  </xsl:variable>
2962
2696
 
2963
2697
  <xsl:variable name="table_attributes">
@@ -3097,30 +2831,28 @@
3097
2831
  <xsl:variable name="isDeleted" select="@deleted"/>
3098
2832
 
3099
2833
  <xsl:choose>
3100
- <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
3101
-
3102
- <!-- centered table when table name is centered (see table-name-style) -->
3103
-
3104
- <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
3105
-
3106
- <fo:table-column column-width="proportional-column-width(1)"/>
3107
- <fo:table-column column-width="{@width}"/>
3108
- <fo:table-column column-width="proportional-column-width(1)"/>
3109
- <fo:table-body role="SKIP">
3110
- <fo:table-row role="SKIP">
3111
- <fo:table-cell column-number="2" role="SKIP">
3112
- <xsl:copy-of select="$table-preamble"/>
3113
- <fo:block role="SKIP">
3114
- <xsl:call-template name="setTrackChangesStyles">
3115
- <xsl:with-param name="isAdded" select="$isAdded"/>
3116
- <xsl:with-param name="isDeleted" select="$isDeleted"/>
3117
- </xsl:call-template>
3118
- <xsl:copy-of select="$table"/>
3119
- </fo:block>
3120
- </fo:table-cell>
3121
- </fo:table-row>
3122
- </fo:table-body>
3123
- </fo:table>
2834
+ <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
2835
+
2836
+ <!-- centered table when table name is centered (see table-name-style) -->
2837
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
2838
+ <fo:table-column column-width="proportional-column-width(1)"/>
2839
+ <fo:table-column column-width="{@width}"/>
2840
+ <fo:table-column column-width="proportional-column-width(1)"/>
2841
+ <fo:table-body role="SKIP">
2842
+ <fo:table-row role="SKIP">
2843
+ <fo:table-cell column-number="2" role="SKIP">
2844
+ <xsl:copy-of select="$table-preamble"/>
2845
+ <fo:block role="SKIP">
2846
+ <xsl:call-template name="setTrackChangesStyles">
2847
+ <xsl:with-param name="isAdded" select="$isAdded"/>
2848
+ <xsl:with-param name="isDeleted" select="$isDeleted"/>
2849
+ </xsl:call-template>
2850
+ <xsl:copy-of select="$table"/>
2851
+ </fo:block>
2852
+ </fo:table-cell>
2853
+ </fo:table-row>
2854
+ </fo:table-body>
2855
+ </fo:table>
3124
2856
 
3125
2857
  </xsl:when>
3126
2858
  <xsl:otherwise>
@@ -3146,7 +2878,6 @@
3146
2878
  </xsl:template>
3147
2879
 
3148
2880
  <xsl:template name="setBordersTableArray">
3149
-
3150
2881
  </xsl:template>
3151
2882
 
3152
2883
  <!-- table/name-->
@@ -3155,51 +2886,50 @@
3155
2886
  <xsl:param name="cols-count"/>
3156
2887
  <xsl:if test="normalize-space() != ''">
3157
2888
 
3158
- <fo:block xsl:use-attribute-sets="table-name-style">
2889
+ <fo:block xsl:use-attribute-sets="table-name-style">
3159
2890
 
3160
- <xsl:call-template name="refine_table-name-style">
3161
- <xsl:with-param name="continued" select="$continued"/>
3162
- </xsl:call-template>
3163
-
3164
- <xsl:choose>
3165
- <xsl:when test="$continued = 'true'">
2891
+ <xsl:call-template name="refine_table-name-style">
2892
+ <xsl:with-param name="continued" select="$continued"/>
2893
+ </xsl:call-template>
3166
2894
 
3167
- </xsl:when>
3168
- <xsl:otherwise>
3169
- <xsl:apply-templates/>
3170
- </xsl:otherwise>
3171
- </xsl:choose>
2895
+ <xsl:choose>
2896
+ <xsl:when test="$continued = 'true'">
2897
+ </xsl:when>
2898
+ <xsl:otherwise>
2899
+ <xsl:apply-templates/>
2900
+ </xsl:otherwise>
2901
+ </xsl:choose>
3172
2902
 
3173
- </fo:block>
2903
+ </fo:block>
3174
2904
 
3175
- <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
3176
- <xsl:if test="$continued = 'true'">
2905
+ <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
2906
+ <xsl:if test="$continued = 'true'">
3177
2907
 
3178
- <!-- to prevent the error 'THead element may contain only TR elements' -->
2908
+ <!-- to prevent the error 'THead element may contain only TR elements' -->
3179
2909
 
3180
- <xsl:choose>
3181
- <xsl:when test="string(number($cols-count)) != 'NaN'">
3182
- <fo:table width="100%" table-layout="fixed" role="SKIP">
3183
- <fo:table-body role="SKIP">
3184
- <fo:table-row>
3185
- <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
3186
- <fo:block text-align="right" role="SKIP">
3187
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
3188
- </fo:block>
3189
- </fo:table-cell>
3190
- </fo:table-row>
3191
- </fo:table-body>
3192
- </fo:table>
3193
- </xsl:when>
3194
- <xsl:otherwise>
3195
- <fo:block text-align="right">
3196
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
3197
- </fo:block>
3198
- </xsl:otherwise>
3199
- </xsl:choose>
2910
+ <xsl:choose>
2911
+ <xsl:when test="string(number($cols-count)) != 'NaN'">
2912
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
2913
+ <fo:table-body role="SKIP">
2914
+ <fo:table-row>
2915
+ <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
2916
+ <fo:block text-align="right" role="SKIP">
2917
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
2918
+ </fo:block>
2919
+ </fo:table-cell>
2920
+ </fo:table-row>
2921
+ </fo:table-body>
2922
+ </fo:table>
2923
+ </xsl:when>
2924
+ <xsl:otherwise>
2925
+ <fo:block text-align="right">
2926
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
2927
+ </fo:block>
2928
+ </xsl:otherwise>
2929
+ </xsl:choose>
3200
2930
 
3201
- </xsl:if>
3202
- <!-- </xsl:if> -->
2931
+ </xsl:if>
2932
+ <!-- </xsl:if> -->
3203
2933
 
3204
2934
  </xsl:if>
3205
2935
  </xsl:template> <!-- table/name -->
@@ -3574,7 +3304,6 @@
3574
3304
  <xsl:template match="*[local-name()='thead']">
3575
3305
  <xsl:param name="cols-count"/>
3576
3306
  <fo:table-header>
3577
-
3578
3307
  <xsl:apply-templates/>
3579
3308
  </fo:table-header>
3580
3309
  </xsl:template> <!-- thead -->
@@ -3588,21 +3317,20 @@
3588
3317
 
3589
3318
  <xsl:call-template name="refine_table-header-title-style"/>
3590
3319
 
3591
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
3592
- <xsl:with-param name="continued">true</xsl:with-param>
3593
- <xsl:with-param name="cols-count" select="$cols-count"/>
3594
- </xsl:apply-templates>
3320
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
3321
+ <xsl:with-param name="continued">true</xsl:with-param>
3322
+ <xsl:with-param name="cols-count" select="$cols-count"/>
3323
+ </xsl:apply-templates>
3595
3324
 
3596
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
3597
- <fo:block role="SKIP"/>
3598
- </xsl:if>
3325
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
3326
+ <fo:block role="SKIP"/>
3327
+ </xsl:if>
3599
3328
 
3600
3329
  </fo:table-cell>
3601
3330
  </fo:table-row>
3602
3331
  </xsl:template> <!-- table-header-title -->
3603
3332
 
3604
3333
  <xsl:template name="refine_table-header-title-style">
3605
-
3606
3334
  </xsl:template> <!-- refine_table-header-title-style -->
3607
3335
 
3608
3336
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -3632,7 +3360,6 @@
3632
3360
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
3633
3361
 
3634
3362
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
3635
-
3636
3363
  </xsl:variable>
3637
3364
 
3638
3365
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -3694,26 +3421,19 @@
3694
3421
  <xsl:call-template name="setBordersTableArray"/>
3695
3422
 
3696
3423
  <!-- fn will be processed inside 'note' processing -->
3697
-
3698
- <!-- for BSI (not PAS) display Notes before footnotes -->
3699
-
3700
- <!-- except gb and bsi -->
3701
-
3702
- <xsl:apply-templates select="../*[local-name()='p']"/>
3703
- <xsl:apply-templates select="../*[local-name()='dl']"/>
3704
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
3705
- <xsl:apply-templates select="../*[local-name()='example']"/>
3706
- <xsl:apply-templates select="../*[local-name()='source']"/>
3424
+ <xsl:apply-templates select="../*[local-name()='p']"/>
3425
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
3426
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
3427
+ <xsl:apply-templates select="../*[local-name()='example']"/>
3428
+ <xsl:apply-templates select="../*[local-name()='source']"/>
3707
3429
 
3708
3430
  <xsl:variable name="isDisplayRowSeparator">
3709
-
3710
3431
  </xsl:variable>
3711
3432
 
3712
3433
  <!-- horizontal row separator -->
3713
3434
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
3714
3435
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
3715
3436
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
3716
-
3717
3437
  <xsl:call-template name="setBordersTableArray"/>
3718
3438
  <fo:block font-size="1pt"> </fo:block>
3719
3439
  </fo:block-container>
@@ -3721,11 +3441,8 @@
3721
3441
  </xsl:if>
3722
3442
 
3723
3443
  <!-- fn processing -->
3724
-
3725
- <!-- <xsl:call-template name="table_fn_display" /> -->
3726
- <xsl:copy-of select="$table_fn_block"/>
3727
-
3728
- <!-- for PAS display Notes after footnotes -->
3444
+ <!-- <xsl:call-template name="table_fn_display" /> -->
3445
+ <xsl:copy-of select="$table_fn_block"/>
3729
3446
 
3730
3447
  </fo:table-cell>
3731
3448
  </fo:table-row>
@@ -3852,7 +3569,7 @@
3852
3569
  <xsl:with-param name="pText" select="$border_under_row_"/>
3853
3570
  </xsl:call-template>
3854
3571
  </xsl:variable>
3855
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
3572
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
3856
3573
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
3857
3574
  </xsl:if>
3858
3575
  </xsl:when>
@@ -3969,7 +3686,7 @@
3969
3686
  </xsl:variable>
3970
3687
  <xsl:variable name="quot">"</xsl:variable>
3971
3688
  <xsl:variable name="styles_">
3972
- <xsl:for-each select="xalan:nodeset($styles__)/item">
3689
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
3973
3690
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
3974
3691
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
3975
3692
  <xsl:if test="$key = 'color' or $key = 'background-color' or $key = 'border' or $key = 'border-top' or $key = 'border-right' or $key = 'border-left' or $key = 'border-bottom' or $key = 'border-style' or $key = 'border-width' or $key = 'border-color' or $key = 'border-top-style' or $key = 'border-top-width' or $key = 'border-top-color' or $key = 'border-right-style' or $key = 'border-right-width' or $key = 'border-right-color' or $key = 'border-left-style' or $key = 'border-left-width' or $key = 'border-left-color' or $key = 'border-bottom-style' or $key = 'border-bottom-width' or $key = 'border-bottom-color'">
@@ -4019,9 +3736,7 @@
4019
3736
  <fo:block role="SKIP">
4020
3737
 
4021
3738
  <xsl:if test="$isGenerateTableIF = 'true'">
4022
-
4023
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
4024
-
3739
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
4025
3740
  </xsl:if>
4026
3741
 
4027
3742
  <xsl:apply-templates/>
@@ -4036,25 +3751,23 @@
4036
3751
 
4037
3752
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
4038
3753
  <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example'] | *[local-name()='table']/*[local-name()='tfoot']//*[local-name()='note' or local-name() = 'example']" priority="2">
3754
+ <xsl:call-template name="setNamedDestination"/>
3755
+ <fo:block xsl:use-attribute-sets="table-note-style">
3756
+ <xsl:copy-of select="@id"/>
4039
3757
 
4040
- <xsl:call-template name="setNamedDestination"/>
4041
- <fo:block xsl:use-attribute-sets="table-note-style">
4042
- <xsl:copy-of select="@id"/>
4043
-
4044
- <xsl:call-template name="refine_table-note-style"/>
4045
-
4046
- <!-- Table's note/example name (NOTE, for example) -->
4047
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
3758
+ <xsl:call-template name="refine_table-note-style"/>
4048
3759
 
4049
- <xsl:call-template name="refine_table-note-name-style"/>
3760
+ <!-- Table's note/example name (NOTE, for example) -->
3761
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
4050
3762
 
4051
- <xsl:apply-templates select="*[local-name() = 'name']"/>
3763
+ <xsl:call-template name="refine_table-note-name-style"/>
4052
3764
 
4053
- </fo:inline>
3765
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
4054
3766
 
4055
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4056
- </fo:block>
3767
+ </fo:inline>
4057
3768
 
3769
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3770
+ </fo:block>
4058
3771
  </xsl:template> <!-- table/note -->
4059
3772
 
4060
3773
  <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p'] | *[local-name()='table']/*[local-name()='tfoot']//*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
@@ -4099,9 +3812,7 @@
4099
3812
  <xsl:variable name="current_fn_number" select="@reference"/>
4100
3813
 
4101
3814
  <xsl:variable name="current_fn_number_text">
4102
-
4103
- <xsl:value-of select="$current_fn_number"/>
4104
-
3815
+ <xsl:value-of select="$current_fn_number"/>
4105
3816
  </xsl:variable>
4106
3817
 
4107
3818
  <xsl:variable name="ref_id" select="@target"/>
@@ -4113,12 +3824,10 @@
4113
3824
  <xsl:choose>
4114
3825
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
4115
3826
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
4116
-
4117
3827
  </fn_styles>
4118
3828
  </xsl:when>
4119
3829
  <xsl:otherwise>
4120
3830
  <fn_styles xsl:use-attribute-sets="fn-num-style">
4121
-
4122
3831
  </fn_styles>
4123
3832
  </xsl:otherwise>
4124
3833
  </xsl:choose>
@@ -4136,7 +3845,6 @@
4136
3845
  <xsl:with-param name="element">
4137
3846
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
4138
3847
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4139
-
4140
3848
  <xsl:copy-of select="$current_fn_number_text"/>
4141
3849
 
4142
3850
  </fo:inline>
@@ -4174,10 +3882,9 @@
4174
3882
  <here><xsl:copy-of select="$footnotes"/></here> -->
4175
3883
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
4176
3884
  </xsl:variable>
4177
-
4178
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4179
- <xsl:copy-of select="$fn_block"/>
4180
- </fo:block>
3885
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
3886
+ <xsl:copy-of select="$fn_block"/>
3887
+ </fo:block>
4181
3888
 
4182
3889
  </fo:block-container>
4183
3890
  </fo:footnote-body>
@@ -4254,21 +3961,20 @@
4254
3961
  <xsl:variable name="reference" select="@reference"/>
4255
3962
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
4256
3963
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
3964
+ <fo:block xsl:use-attribute-sets="table-fn-style">
3965
+ <xsl:copy-of select="@id"/>
3966
+ <xsl:call-template name="refine_table-fn-style"/>
4257
3967
 
4258
- <fo:block xsl:use-attribute-sets="table-fn-style">
4259
- <xsl:copy-of select="@id"/>
4260
- <xsl:call-template name="refine_table-fn-style"/>
4261
-
4262
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
4263
- <xsl:with-param name="process">true</xsl:with-param>
4264
- </xsl:apply-templates>
3968
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
3969
+ <xsl:with-param name="process">true</xsl:with-param>
3970
+ </xsl:apply-templates>
4265
3971
 
4266
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
4267
- <!-- <xsl:copy-of select="./node()"/> -->
4268
- <xsl:apply-templates/>
4269
- </fo:inline>
3972
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
3973
+ <!-- <xsl:copy-of select="./node()"/> -->
3974
+ <xsl:apply-templates/>
3975
+ </fo:inline>
4270
3976
 
4271
- </fo:block>
3977
+ </fo:block>
4272
3978
 
4273
3979
  <!-- </xsl:if> -->
4274
3980
  </xsl:for-each>
@@ -4321,7 +4027,6 @@
4321
4027
  <xsl:param name="process">false</xsl:param>
4322
4028
  <xsl:if test="$process = 'true'">
4323
4029
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
4324
-
4325
4030
  </xsl:if>
4326
4031
  </xsl:template>
4327
4032
 
@@ -4405,7 +4110,6 @@
4405
4110
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
4406
4111
 
4407
4112
  <xsl:variable name="key_iso">
4408
-
4409
4113
  </xsl:variable>
4410
4114
 
4411
4115
  <fo:block>
@@ -4451,7 +4155,6 @@
4451
4155
  <fo:table width="95%" table-layout="fixed">
4452
4156
  <xsl:if test="normalize-space($key_iso) = 'true'">
4453
4157
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4454
-
4455
4158
  </xsl:if>
4456
4159
  <xsl:choose>
4457
4160
  <!-- if there 'dl', then set same columns width -->
@@ -4475,23 +4178,19 @@
4475
4178
  <fo:table-row>
4476
4179
  <fo:table-cell>
4477
4180
  <fo:block>
4478
-
4479
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
4480
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
4481
- <!-- <xsl:value-of select="@reference"/> -->
4482
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
4483
- </fo:inline>
4181
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
4182
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
4183
+ <!-- <xsl:value-of select="@reference"/> -->
4184
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
4185
+ </fo:inline>
4484
4186
 
4485
4187
  </fo:block>
4486
4188
  </fo:table-cell>
4487
4189
  <fo:table-cell>
4488
4190
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
4489
4191
  <xsl:if test="normalize-space($key_iso) = 'true'">
4490
-
4491
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
4492
-
4192
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
4493
4193
  </xsl:if>
4494
-
4495
4194
  <!-- <xsl:copy-of select="./node()"/> -->
4496
4195
  <xsl:apply-templates/>
4497
4196
  </fo:block>
@@ -4541,11 +4240,9 @@
4541
4240
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
4542
4241
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/ *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
4543
4242
  <xsl:variable name="key_iso">
4544
-
4545
4243
  </xsl:variable>
4546
4244
  <xsl:if test="normalize-space($key_iso) = 'true'">
4547
4245
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4548
-
4549
4246
  </xsl:if>
4550
4247
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
4551
4248
  <!-- <xsl:value-of select="@reference"/> -->
@@ -4591,8 +4288,7 @@
4591
4288
  <xsl:text>※</xsl:text>
4592
4289
  </xsl:if> -->
4593
4290
  <!-- <xsl:value-of select="@reference"/> -->
4594
-
4595
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
4291
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
4596
4292
 
4597
4293
  <!-- <xsl:if test="$namespace = 'bsi'">
4598
4294
  <xsl:text>)</xsl:text>
@@ -4664,10 +4360,9 @@
4664
4360
  </xsl:if>
4665
4361
 
4666
4362
  <xsl:call-template name="setBlockSpanAll"/>
4667
-
4668
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
4669
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
4670
- </xsl:if>
4363
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
4364
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
4365
+ </xsl:if>
4671
4366
 
4672
4367
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
4673
4368
  <!-- set font-size as sourcecode font-size -->
@@ -4688,7 +4383,6 @@
4688
4383
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
4689
4384
  </xsl:choose>
4690
4385
  </xsl:attribute>
4691
-
4692
4386
  </xsl:if>
4693
4387
 
4694
4388
  <xsl:call-template name="setTrackChangesStyles">
@@ -4697,37 +4391,32 @@
4697
4391
  </xsl:call-template>
4698
4392
 
4699
4393
  <fo:block-container margin-left="0mm" role="SKIP">
4700
-
4701
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
4394
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
4702
4395
 
4703
4396
  <xsl:variable name="parent" select="local-name(..)"/>
4704
4397
 
4705
- <xsl:variable name="key_iso">
4706
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
4398
+ <xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') -->
4707
4399
  </xsl:variable>
4708
4400
 
4709
4401
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
4710
4402
 
4711
4403
  <xsl:choose>
4712
4404
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
4713
-
4714
- <fo:block margin-bottom="12pt" text-align="left">
4715
-
4716
- <!-- <xsl:variable name="title-where">
4405
+ <fo:block margin-bottom="12pt" text-align="left">
4406
+ <!-- <xsl:variable name="title-where">
4717
4407
  <xsl:call-template name="getLocalizedString">
4718
4408
  <xsl:with-param name="key">where</xsl:with-param>
4719
4409
  </xsl:call-template>
4720
4410
  </xsl:variable>
4721
4411
  <xsl:value-of select="$title-where"/> -->
4722
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
4723
- <xsl:text> </xsl:text>
4724
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
4725
- <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
4726
- <xsl:text> </xsl:text>
4727
- </xsl:if>
4728
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
4729
- </fo:block>
4730
-
4412
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
4413
+ <xsl:text> </xsl:text>
4414
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
4415
+ <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
4416
+ <xsl:text> </xsl:text>
4417
+ </xsl:if>
4418
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
4419
+ </fo:block>
4731
4420
  </xsl:when> <!-- END: only one component -->
4732
4421
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
4733
4422
  <fo:block margin-bottom="12pt" text-align="left">
@@ -4747,19 +4436,17 @@
4747
4436
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
4748
4437
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
4749
4438
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
4439
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
4750
4440
 
4751
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
4752
-
4753
- <xsl:call-template name="refine_figure_key_style"/>
4754
-
4755
- <xsl:variable name="title-key">
4756
- <xsl:call-template name="getLocalizedString">
4757
- <xsl:with-param name="key">key</xsl:with-param>
4758
- </xsl:call-template>
4759
- </xsl:variable>
4760
- <xsl:value-of select="$title-key"/>
4761
- </fo:block>
4441
+ <xsl:call-template name="refine_figure_key_style"/>
4762
4442
 
4443
+ <xsl:variable name="title-key">
4444
+ <xsl:call-template name="getLocalizedString">
4445
+ <xsl:with-param name="key">key</xsl:with-param>
4446
+ </xsl:call-template>
4447
+ </xsl:variable>
4448
+ <xsl:value-of select="$title-key"/>
4449
+ </fo:block>
4763
4450
  </xsl:if>
4764
4451
  </xsl:when> <!-- END: definition list in a figure -->
4765
4452
  </xsl:choose>
@@ -4792,12 +4479,10 @@
4792
4479
  <xsl:if test="$isGenerateTableIF = 'true'">
4793
4480
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
4794
4481
  </xsl:if>
4795
-
4796
4482
  <xsl:choose>
4797
4483
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
4798
4484
  <xsl:when test="normalize-space($key_iso) = 'true'">
4799
4485
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4800
-
4801
4486
  </xsl:when>
4802
4487
  </xsl:choose>
4803
4488
 
@@ -4902,17 +4587,15 @@
4902
4587
  <xsl:call-template name="getMaxLength_dt"/>
4903
4588
  </xsl:variable>
4904
4589
 
4905
- <xsl:variable name="isContainsKeepTogetherTag_">
4906
- false
4590
+ <xsl:variable name="isContainsKeepTogetherTag_">false
4907
4591
  </xsl:variable>
4908
4592
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
4909
4593
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
4910
-
4911
- <xsl:call-template name="setColumnWidth_dl">
4912
- <xsl:with-param name="colwidths" select="$colwidths"/>
4913
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
4914
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
4915
- </xsl:call-template>
4594
+ <xsl:call-template name="setColumnWidth_dl">
4595
+ <xsl:with-param name="colwidths" select="$colwidths"/>
4596
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
4597
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
4598
+ </xsl:call-template>
4916
4599
 
4917
4600
  <fo:table-body>
4918
4601
 
@@ -4963,21 +4646,17 @@
4963
4646
  </xsl:template>
4964
4647
 
4965
4648
  <xsl:template name="refine_dl_formula_where_style">
4966
-
4967
4649
  </xsl:template> <!-- refine_dl_formula_where_style -->
4968
4650
 
4969
4651
  <xsl:template name="refine_figure_key_style">
4970
-
4971
4652
  </xsl:template> <!-- refine_figure_key_style -->
4972
4653
 
4973
4654
  <xsl:template name="refine_multicomponent_style">
4974
4655
  <xsl:variable name="parent" select="local-name(..)"/>
4975
-
4976
4656
  </xsl:template> <!-- refine_multicomponent_style -->
4977
4657
 
4978
4658
  <xsl:template name="refine_multicomponent_block_style">
4979
4659
  <xsl:variable name="parent" select="local-name(..)"/>
4980
-
4981
4660
  </xsl:template> <!-- refine_multicomponent_block_style -->
4982
4661
 
4983
4662
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -5164,14 +4843,11 @@
5164
4843
  <xsl:attribute name="id">
5165
4844
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5166
4845
  </xsl:attribute>
5167
-
5168
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
5169
- <xsl:with-param name="process">true</xsl:with-param>
5170
- </xsl:apply-templates>
5171
-
4846
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
4847
+ <xsl:with-param name="process">true</xsl:with-param>
4848
+ </xsl:apply-templates>
5172
4849
  </td>
5173
4850
  </tr>
5174
-
5175
4851
  </xsl:template>
5176
4852
 
5177
4853
  <!-- Definition's term -->
@@ -5180,7 +4856,6 @@
5180
4856
  <xsl:param name="split_keep-within-line"/>
5181
4857
 
5182
4858
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
5183
-
5184
4859
  <xsl:call-template name="insert_dt_cell">
5185
4860
  <xsl:with-param name="key_iso" select="$key_iso"/>
5186
4861
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -5202,7 +4877,6 @@
5202
4877
  <!-- border is mandatory, to calculate real width -->
5203
4878
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
5204
4879
  <xsl:attribute name="text-align">left</xsl:attribute>
5205
-
5206
4880
  </xsl:if>
5207
4881
 
5208
4882
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -5212,9 +4886,7 @@
5212
4886
 
5213
4887
  <xsl:choose>
5214
4888
  <xsl:when test="$isGenerateTableIF = 'true'">
5215
-
5216
- <xsl:copy-of select="@id"/>
5217
-
4889
+ <xsl:copy-of select="@id"/>
5218
4890
  </xsl:when>
5219
4891
  <xsl:otherwise>
5220
4892
  <xsl:copy-of select="@id"/>
@@ -5251,9 +4923,7 @@
5251
4923
  <fo:block role="SKIP">
5252
4924
 
5253
4925
  <xsl:if test="$isGenerateTableIF = 'true'">
5254
-
5255
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5256
-
4926
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5257
4927
  </xsl:if>
5258
4928
 
5259
4929
  <xsl:choose>
@@ -5401,7 +5071,6 @@
5401
5071
  </xsl:template>
5402
5072
 
5403
5073
  <xsl:template name="refine_italic_style">
5404
-
5405
5074
  </xsl:template>
5406
5075
 
5407
5076
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -5417,7 +5086,6 @@
5417
5086
  </xsl:template>
5418
5087
 
5419
5088
  <xsl:template name="refine_strong_style">
5420
-
5421
5089
  <xsl:if test="ancestor::*['preferred']">
5422
5090
  <xsl:attribute name="role">SKIP</xsl:attribute>
5423
5091
  </xsl:if>
@@ -5442,13 +5110,7 @@
5442
5110
  <xsl:template match="*[local-name()='tt']">
5443
5111
  <fo:inline xsl:use-attribute-sets="tt-style">
5444
5112
 
5445
- <xsl:variable name="_font-size">
5446
-
5447
- 10
5448
-
5449
-
5450
- <!-- inherit -->
5451
-
5113
+ <xsl:variable name="_font-size">10 <!-- inherit -->
5452
5114
  </xsl:variable>
5453
5115
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
5454
5116
  <xsl:if test="$font-size != ''">
@@ -5664,8 +5326,7 @@
5664
5326
  </xsl:otherwise>
5665
5327
  </xsl:choose>
5666
5328
  </xsl:variable>
5667
- <xsl:variable name="ratio_">
5668
- 0.75
5329
+ <xsl:variable name="ratio_">0.75
5669
5330
  </xsl:variable>
5670
5331
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
5671
5332
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -5755,7 +5416,7 @@
5755
5416
 
5756
5417
  <xsl:variable name="quot">"</xsl:variable>
5757
5418
  <xsl:variable name="styles_">
5758
- <xsl:for-each select="xalan:nodeset($styles__)/item">
5419
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
5759
5420
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5760
5421
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5761
5422
  <xsl:variable name="value">
@@ -5767,7 +5428,7 @@
5767
5428
  </xsl:otherwise>
5768
5429
  </xsl:choose>
5769
5430
  </xsl:variable>
5770
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5431
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
5771
5432
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5772
5433
  </xsl:if>
5773
5434
  <xsl:if test="$key = 'text-indent'">
@@ -5781,7 +5442,6 @@
5781
5442
  <fo:inline>
5782
5443
  <xsl:for-each select="$styles/style">
5783
5444
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
5784
-
5785
5445
  </xsl:for-each>
5786
5446
  <xsl:apply-templates/>
5787
5447
  </fo:inline>
@@ -6768,10 +6428,9 @@
6768
6428
  <xsl:variable name="mathml_content">
6769
6429
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
6770
6430
  </xsl:variable>
6771
-
6772
- <xsl:call-template name="mathml_instream_object">
6773
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
6774
- </xsl:call-template>
6431
+ <xsl:call-template name="mathml_instream_object">
6432
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
6433
+ </xsl:call-template>
6775
6434
 
6776
6435
  </fo:inline>
6777
6436
  </xsl:template>
@@ -6805,7 +6464,6 @@
6805
6464
  <xsl:template name="getMathml_asciimath_text">
6806
6465
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
6807
6466
  <xsl:variable name="latexmath">
6808
-
6809
6467
  </xsl:variable>
6810
6468
  <xsl:variable name="asciimath_text_following">
6811
6469
  <xsl:choose>
@@ -6878,7 +6536,6 @@
6878
6536
  </xsl:template>
6879
6537
 
6880
6538
  <xsl:template name="refine_mathml_insteam_object_style">
6881
-
6882
6539
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
6883
6540
 
6884
6541
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -7276,7 +6933,6 @@
7276
6933
  <xsl:variable name="annotation-id" select="@id"/>
7277
6934
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
7278
6935
  <fo:block id="{$annotation-id}" white-space="nowrap">
7279
-
7280
6936
  <fo:inline>
7281
6937
  <xsl:apply-templates>
7282
6938
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -7305,7 +6961,6 @@
7305
6961
  <xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
7306
6962
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
7307
6963
  </xsl:if>
7308
-
7309
6964
  <xsl:if test="parent::*[local-name() = 'add']">
7310
6965
  <xsl:call-template name="append_add-style"/>
7311
6966
  </xsl:if>
@@ -7316,8 +6971,7 @@
7316
6971
  </xsl:template>
7317
6972
 
7318
6973
  <!-- command between two xref points to non-standard bibitem -->
7319
- <xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
7320
- <xsl:value-of select="."/>
6974
+ <xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]"><xsl:value-of select="."/>
7321
6975
  </xsl:template>
7322
6976
 
7323
6977
  <!-- ====== -->
@@ -7332,7 +6986,6 @@
7332
6986
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
7333
6987
  </xsl:choose>
7334
6988
  </xsl:attribute>
7335
-
7336
6989
  </xsl:if>
7337
6990
  <fo:block-container margin-left="0mm" role="SKIP">
7338
6991
  <xsl:call-template name="setNamedDestination"/>
@@ -7422,53 +7075,49 @@
7422
7075
 
7423
7076
  <xsl:template match="*[local-name() = 'note']" name="note">
7424
7077
 
7425
- <xsl:call-template name="setNamedDestination"/>
7426
-
7427
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
7428
-
7429
- <xsl:call-template name="setBlockSpanAll"/>
7430
-
7431
- <xsl:call-template name="refine_note-style"/>
7078
+ <xsl:call-template name="setNamedDestination"/>
7432
7079
 
7433
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
7080
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
7434
7081
 
7435
- <fo:block>
7082
+ <xsl:call-template name="setBlockSpanAll"/>
7436
7083
 
7437
- <xsl:call-template name="refine_note_block_style"/>
7084
+ <xsl:call-template name="refine_note-style"/>
7438
7085
 
7439
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
7086
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
7087
+ <fo:block>
7440
7088
 
7441
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
7089
+ <xsl:call-template name="refine_note_block_style"/>
7442
7090
 
7443
- <xsl:call-template name="refine_note-name-style"/>
7091
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
7444
7092
 
7445
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7446
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
7447
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7448
- <xsl:call-template name="append_add-style"/>
7449
- </xsl:if>
7093
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
7450
7094
 
7451
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7452
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7453
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7454
- <xsl:with-param name="skip">false</xsl:with-param>
7455
- </xsl:apply-templates>
7456
- </xsl:if>
7095
+ <xsl:call-template name="refine_note-name-style"/>
7457
7096
 
7458
- <xsl:apply-templates select="*[local-name() = 'name']"/>
7097
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7098
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
7099
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7100
+ <xsl:call-template name="append_add-style"/>
7101
+ </xsl:if>
7459
7102
 
7460
- </fo:inline>
7103
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7104
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7105
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7106
+ <xsl:with-param name="skip">false</xsl:with-param>
7107
+ </xsl:apply-templates>
7108
+ </xsl:if>
7461
7109
 
7462
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7463
- </fo:block>
7110
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7464
7111
 
7465
- </fo:block-container>
7466
- </fo:block-container>
7112
+ </fo:inline>
7467
7113
 
7114
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7115
+ </fo:block>
7116
+ </fo:block-container>
7117
+ </fo:block-container>
7468
7118
  </xsl:template>
7469
7119
 
7470
7120
  <xsl:template name="refine_note_block_style">
7471
-
7472
7121
  </xsl:template> <!-- refine_note_block_style -->
7473
7122
 
7474
7123
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -7521,7 +7170,6 @@
7521
7170
  <xsl:value-of select="$sfx"/>
7522
7171
  </xsl:when>
7523
7172
  <xsl:otherwise>
7524
-
7525
7173
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
7526
7174
  <!-- <xsl:if test="$namespace = 'ieee'">
7527
7175
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -7529,7 +7177,6 @@
7529
7177
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
7530
7178
  <xsl:text>:</xsl:text>
7531
7179
  </xsl:if> -->
7532
-
7533
7180
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
7534
7181
  <xsl:text> – </xsl:text> en dash &#x2013;
7535
7182
  </xsl:if> -->
@@ -7550,7 +7197,6 @@
7550
7197
  <xsl:value-of select="$sfx"/>
7551
7198
  </xsl:when>
7552
7199
  <xsl:otherwise>
7553
-
7554
7200
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
7555
7201
  <!-- <xsl:if test="$namespace = 'ieee'">
7556
7202
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -7606,7 +7252,6 @@
7606
7252
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7607
7253
 
7608
7254
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7609
-
7610
7255
  </xsl:if>
7611
7256
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7612
7257
  </fo:block>
@@ -7646,8 +7291,7 @@
7646
7291
  <!-- Example: Dimensions in millimeters -->
7647
7292
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
7648
7293
 
7649
- <xsl:variable name="show_figure_key_in_block_container">
7650
- true
7294
+ <xsl:variable name="show_figure_key_in_block_container">true
7651
7295
  </xsl:variable>
7652
7296
 
7653
7297
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -7662,11 +7306,9 @@
7662
7306
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
7663
7307
  <xsl:call-template name="showFigureKey"/>
7664
7308
  </xsl:if>
7665
-
7666
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
7309
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
7667
7310
 
7668
7311
  </fo:block-container>
7669
-
7670
7312
  </xsl:template>
7671
7313
 
7672
7314
  <xsl:template name="showFigureKey">
@@ -7704,13 +7346,12 @@
7704
7346
  <!-- SOURCE: ... -->
7705
7347
  <!-- figure/source -->
7706
7348
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
7707
-
7708
- <xsl:call-template name="termsource"/>
7709
-
7349
+ <xsl:call-template name="termsource"/>
7710
7350
  </xsl:template>
7711
7351
 
7712
7352
  <xsl:template match="*[local-name() = 'image']">
7713
7353
  <xsl:param name="indent">0</xsl:param>
7354
+ <xsl:param name="logo_width"/>
7714
7355
  <xsl:variable name="isAdded" select="../@added"/>
7715
7356
  <xsl:variable name="isDeleted" select="../@deleted"/>
7716
7357
  <xsl:choose>
@@ -7732,9 +7373,18 @@
7732
7373
 
7733
7374
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
7734
7375
 
7735
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
7736
7376
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
7737
7377
 
7378
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
7379
+ <xsl:attribute name="width">100%</xsl:attribute>
7380
+ <xsl:if test="normalize-space($logo_width) != ''">
7381
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
7382
+ </xsl:if>
7383
+ <xsl:attribute name="content-height">100%</xsl:attribute>
7384
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
7385
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
7386
+ </xsl:if>
7387
+
7738
7388
  <xsl:variable name="width">
7739
7389
  <xsl:call-template name="setImageWidth"/>
7740
7390
  </xsl:variable>
@@ -7812,8 +7462,7 @@
7812
7462
  </xsl:call-template>
7813
7463
  </xsl:variable>
7814
7464
 
7815
- <xsl:variable name="scaleRatio">
7816
- 1
7465
+ <xsl:variable name="scaleRatio">1
7817
7466
  </xsl:variable>
7818
7467
 
7819
7468
  <xsl:if test="number($scale) &lt; 100">
@@ -7924,18 +7573,14 @@
7924
7573
  </xsl:variable>
7925
7574
 
7926
7575
  <xsl:variable name="image_width_effective">
7927
-
7928
- <xsl:value-of select="$width_effective - number($indent_left)"/>
7929
-
7576
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
7930
7577
  </xsl:variable>
7931
7578
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
7932
7579
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
7933
7580
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
7934
7581
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
7935
7582
  <xsl:variable name="scale">
7936
-
7937
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7938
-
7583
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7939
7584
  </xsl:variable>
7940
7585
  <xsl:value-of select="$scale"/>
7941
7586
  </xsl:template>
@@ -7956,7 +7601,8 @@
7956
7601
  </xsl:when>
7957
7602
  <xsl:when test="not(starts-with(@src, 'data:'))">
7958
7603
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
7959
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
7604
+ <xsl:variable name="file_protocol"><xsl:if test="not(starts-with($src_external, 'http:')) and not(starts-with($src_external, 'https:')) and not(starts-with($src_external, 'www.'))">file:///</xsl:if></xsl:variable>
7605
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
7960
7606
  </xsl:when>
7961
7607
  <xsl:otherwise>
7962
7608
  <xsl:value-of select="@src"/>
@@ -8252,8 +7898,8 @@
8252
7898
  </xsl:call-template>
8253
7899
  </xsl:variable>
8254
7900
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
8255
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
8256
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
7901
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
7902
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
8257
7903
 
8258
7904
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
8259
7905
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -8325,8 +7971,8 @@
8325
7971
  </xsl:variable>
8326
7972
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
8327
7973
  <xsl:variable name="att_name" select="local-name()"/>
8328
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
8329
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
7974
+ <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/mn:item[1], ',', $components/mn:item[2], ',', $components/mn:item[3], ')')"/></xsl:attribute>
7975
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
8330
7976
  </xsl:template>
8331
7977
 
8332
7978
  <!-- ============== -->
@@ -8399,13 +8045,13 @@
8399
8045
  </xsl:call-template>
8400
8046
  </xsl:variable>
8401
8047
  <xsl:variable name="x_coords">
8402
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
8048
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
8403
8049
  <xsl:sort select="." data-type="number"/>
8404
8050
  <x><xsl:value-of select="."/></x>
8405
8051
  </xsl:for-each>
8406
8052
  </xsl:variable>
8407
8053
  <xsl:variable name="y_coords">
8408
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
8054
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
8409
8055
  <xsl:sort select="." data-type="number"/>
8410
8056
  <y><xsl:value-of select="."/></y>
8411
8057
  </xsl:for-each>
@@ -8610,11 +8256,11 @@
8610
8256
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
8611
8257
  </xsl:variable>
8612
8258
 
8613
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
8614
- <title>
8259
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
8260
+ <mn:title>
8615
8261
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
8616
- </title>
8617
- </item>
8262
+ </mn:title>
8263
+ </mn:item>
8618
8264
  </xsl:if>
8619
8265
  </xsl:template>
8620
8266
 
@@ -8685,12 +8331,12 @@
8685
8331
  <xsl:param name="contents"/>
8686
8332
  <xsl:param name="contents_addon"/>
8687
8333
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8688
- <xsl:if test="$contents_nodes//item">
8334
+ <xsl:if test="$contents_nodes//mn:item">
8689
8335
  <fo:bookmark-tree>
8690
8336
  <xsl:choose>
8691
- <xsl:when test="$contents_nodes/doc">
8337
+ <xsl:when test="$contents_nodes/mn:doc">
8692
8338
  <xsl:choose>
8693
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
8339
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
8694
8340
 
8695
8341
  <xsl:if test="$contents_nodes/collection">
8696
8342
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -8698,8 +8344,8 @@
8698
8344
  </fo:bookmark>
8699
8345
  </xsl:if>
8700
8346
 
8701
- <xsl:for-each select="$contents_nodes/doc">
8702
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
8347
+ <xsl:for-each select="$contents_nodes/mn:doc">
8348
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
8703
8349
  <xsl:if test="@bundle = 'true'">
8704
8350
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
8705
8351
  </xsl:if>
@@ -8733,14 +8379,14 @@
8733
8379
  </xsl:choose>
8734
8380
  </fo:bookmark-title>
8735
8381
 
8736
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
8382
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
8737
8383
 
8738
8384
  <xsl:call-template name="insertFigureBookmarks">
8739
- <xsl:with-param name="contents" select="contents"/>
8385
+ <xsl:with-param name="contents" select="mn:contents"/>
8740
8386
  </xsl:call-template>
8741
8387
 
8742
8388
  <xsl:call-template name="insertTableBookmarks">
8743
- <xsl:with-param name="contents" select="contents"/>
8389
+ <xsl:with-param name="contents" select="mn:contents"/>
8744
8390
  <xsl:with-param name="lang" select="@lang"/>
8745
8391
  </xsl:call-template>
8746
8392
 
@@ -8749,16 +8395,16 @@
8749
8395
  </xsl:for-each>
8750
8396
  </xsl:when>
8751
8397
  <xsl:otherwise>
8752
- <xsl:for-each select="$contents_nodes/doc">
8398
+ <xsl:for-each select="$contents_nodes/mn:doc">
8753
8399
 
8754
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
8400
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
8755
8401
 
8756
8402
  <xsl:call-template name="insertFigureBookmarks">
8757
- <xsl:with-param name="contents" select="contents"/>
8403
+ <xsl:with-param name="contents" select="mn:contents"/>
8758
8404
  </xsl:call-template>
8759
8405
 
8760
8406
  <xsl:call-template name="insertTableBookmarks">
8761
- <xsl:with-param name="contents" select="contents"/>
8407
+ <xsl:with-param name="contents" select="mn:contents"/>
8762
8408
  <xsl:with-param name="lang" select="@lang"/>
8763
8409
  </xsl:call-template>
8764
8410
 
@@ -8767,14 +8413,14 @@
8767
8413
  </xsl:choose>
8768
8414
  </xsl:when>
8769
8415
  <xsl:otherwise>
8770
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
8416
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
8771
8417
 
8772
8418
  <xsl:call-template name="insertFigureBookmarks">
8773
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
8419
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
8774
8420
  </xsl:call-template>
8775
8421
 
8776
8422
  <xsl:call-template name="insertTableBookmarks">
8777
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
8423
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
8778
8424
  <xsl:with-param name="lang" select="@lang"/>
8779
8425
  </xsl:call-template>
8780
8426
 
@@ -8791,80 +8437,72 @@
8791
8437
  <xsl:template name="insertFigureBookmarks">
8792
8438
  <xsl:param name="contents"/>
8793
8439
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8794
- <xsl:if test="$contents_nodes/figure">
8795
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
8440
+ <xsl:if test="$contents_nodes/mn:figure">
8441
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
8796
8442
  <fo:bookmark-title>Figures</fo:bookmark-title>
8797
- <xsl:for-each select="$contents_nodes/figure">
8443
+ <xsl:for-each select="$contents_nodes/mn:figure">
8798
8444
  <fo:bookmark internal-destination="{@id}">
8799
8445
  <fo:bookmark-title>
8800
- <xsl:value-of select="normalize-space(title)"/>
8446
+ <xsl:value-of select="normalize-space(mn:title)"/>
8801
8447
  </fo:bookmark-title>
8802
8448
  </fo:bookmark>
8803
8449
  </xsl:for-each>
8804
8450
  </fo:bookmark>
8805
8451
  </xsl:if>
8452
+ <xsl:if test="$contents_nodes//mn:figures/mn:figure">
8453
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8806
8454
 
8807
- <xsl:if test="$contents_nodes//figures/figure">
8808
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8809
-
8810
- <xsl:variable name="bookmark-title">
8811
-
8812
- <xsl:value-of select="$title-list-figures"/>
8813
-
8814
- </xsl:variable>
8815
- <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
8816
- <xsl:for-each select="$contents_nodes//figures/figure">
8817
- <fo:bookmark internal-destination="{@id}">
8818
- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
8819
- </fo:bookmark>
8820
- </xsl:for-each>
8455
+ <xsl:variable name="bookmark-title">
8456
+ <xsl:value-of select="$title-list-figures"/>
8457
+ </xsl:variable>
8458
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
8459
+ <xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
8460
+ <fo:bookmark internal-destination="{@id}">
8461
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
8821
8462
  </fo:bookmark>
8822
- </xsl:if>
8823
-
8463
+ </xsl:for-each>
8464
+ </fo:bookmark>
8465
+ </xsl:if>
8824
8466
  </xsl:template> <!-- insertFigureBookmarks -->
8825
8467
 
8826
8468
  <xsl:template name="insertTableBookmarks">
8827
8469
  <xsl:param name="contents"/>
8828
8470
  <xsl:param name="lang"/>
8829
8471
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8830
- <xsl:if test="$contents_nodes/table">
8831
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
8472
+ <xsl:if test="$contents_nodes/mn:table">
8473
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
8832
8474
  <fo:bookmark-title>
8833
8475
  <xsl:choose>
8834
8476
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
8835
8477
  <xsl:otherwise>Tables</xsl:otherwise>
8836
8478
  </xsl:choose>
8837
8479
  </fo:bookmark-title>
8838
- <xsl:for-each select="$contents_nodes/table">
8480
+ <xsl:for-each select="$contents_nodes/mn:table">
8839
8481
  <fo:bookmark internal-destination="{@id}">
8840
8482
  <fo:bookmark-title>
8841
- <xsl:value-of select="normalize-space(title)"/>
8483
+ <xsl:value-of select="normalize-space(mn:title)"/>
8842
8484
  </fo:bookmark-title>
8843
8485
  </fo:bookmark>
8844
8486
  </xsl:for-each>
8845
8487
  </fo:bookmark>
8846
8488
  </xsl:if>
8489
+ <xsl:if test="$contents_nodes//mn:tables/mn:table">
8490
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8847
8491
 
8848
- <xsl:if test="$contents_nodes//tables/table">
8849
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8850
-
8851
- <xsl:variable name="bookmark-title">
8852
-
8853
- <xsl:value-of select="$title-list-tables"/>
8854
-
8855
- </xsl:variable>
8492
+ <xsl:variable name="bookmark-title">
8493
+ <xsl:value-of select="$title-list-tables"/>
8494
+ </xsl:variable>
8856
8495
 
8857
- <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
8496
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
8858
8497
 
8859
- <xsl:for-each select="$contents_nodes//tables/table">
8860
- <fo:bookmark internal-destination="{@id}">
8861
- <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
8862
- <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
8863
- </fo:bookmark>
8864
- </xsl:for-each>
8498
+ <xsl:for-each select="$contents_nodes//mn:tables/mn:table">
8499
+ <fo:bookmark internal-destination="{@id}">
8500
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
8501
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
8865
8502
  </fo:bookmark>
8866
- </xsl:if>
8867
-
8503
+ </xsl:for-each>
8504
+ </fo:bookmark>
8505
+ </xsl:if>
8868
8506
  </xsl:template> <!-- insertTableBookmarks -->
8869
8507
  <!-- End Bookmarks -->
8870
8508
 
@@ -8894,17 +8532,15 @@
8894
8532
  <xsl:param name="title" select="''"/>
8895
8533
  <xsl:choose>
8896
8534
  <xsl:when test="$lang = 'en'">
8897
-
8898
8535
  </xsl:when>
8899
8536
  <xsl:when test="$lang = 'fr'">
8900
-
8901
8537
  </xsl:when>
8902
8538
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
8903
8539
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
8904
8540
  </xsl:choose>
8905
8541
  </xsl:template>
8906
8542
 
8907
- <xsl:template match="item" mode="bookmark">
8543
+ <xsl:template match="mn:item" mode="bookmark">
8908
8544
  <xsl:choose>
8909
8545
  <xsl:when test="@id != ''">
8910
8546
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -8914,7 +8550,7 @@
8914
8550
  <xsl:text> </xsl:text>
8915
8551
  </xsl:if>
8916
8552
  <xsl:variable name="title">
8917
- <xsl:for-each select="title/node()">
8553
+ <xsl:for-each select="mn:title/node()">
8918
8554
  <xsl:choose>
8919
8555
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
8920
8556
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -8932,7 +8568,7 @@
8932
8568
  </xsl:choose>
8933
8569
  </xsl:template>
8934
8570
 
8935
- <xsl:template match="title" mode="bookmark"/>
8571
+ <xsl:template match="mn:title" mode="bookmark"/>
8936
8572
  <xsl:template match="text()" mode="bookmark"/>
8937
8573
 
8938
8574
  <!-- figure/name -->
@@ -9161,9 +8797,9 @@
9161
8797
  <xsl:template match="text()" mode="contents_item">
9162
8798
  <xsl:variable name="text">
9163
8799
  <!-- to split by '_' and other chars -->
9164
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
8800
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
9165
8801
  </xsl:variable>
9166
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
8802
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
9167
8803
  <xsl:call-template name="keep_together_standard_number"/>
9168
8804
  </xsl:for-each>
9169
8805
  </xsl:template>
@@ -9190,23 +8826,13 @@
9190
8826
 
9191
8827
  <xsl:template match="*[local-name() = 'property']" mode="css">
9192
8828
  <xsl:attribute name="{@name}">
9193
- <xsl:value-of select="@value"/>
9194
- </xsl:attribute>
9195
- </xsl:template>
9196
-
9197
- <xsl:template name="get_sourcecode_attributes">
9198
- <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
9199
- <xsl:variable name="_font-size">
9200
-
9201
- 10
9202
-
9203
-
9204
- <!-- inherit -->
9205
-
9206
- <!-- <xsl:if test="$namespace = 'ieee'">
9207
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
9208
- </xsl:if> -->
8829
+ <xsl:value-of select="@value"/>
8830
+ </xsl:attribute>
8831
+ </xsl:template>
9209
8832
 
8833
+ <xsl:template name="get_sourcecode_attributes">
8834
+ <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
8835
+ <xsl:variable name="_font-size">10<!-- inherit -->
9210
8836
  </xsl:variable>
9211
8837
 
9212
8838
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -9262,7 +8888,6 @@
9262
8888
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
9263
8889
  </xsl:choose>
9264
8890
  </xsl:attribute>
9265
-
9266
8891
  </xsl:if>
9267
8892
  <fo:block-container margin-left="0mm" role="SKIP">
9268
8893
 
@@ -9286,8 +8911,7 @@
9286
8911
  </fo:block>
9287
8912
 
9288
8913
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
9289
-
9290
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
8914
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
9291
8915
 
9292
8916
  </fo:block-container>
9293
8917
  </fo:block-container>
@@ -9464,25 +9088,6 @@
9464
9088
  </xsl:choose>
9465
9089
  </xsl:template>
9466
9090
 
9467
- <!-- insert 'char' between each character in the string -->
9468
- <xsl:template name="interspers">
9469
- <xsl:param name="str"/>
9470
- <xsl:param name="char" select="$zero_width_space"/>
9471
- <xsl:if test="$str != ''">
9472
- <xsl:value-of select="substring($str, 1, 1)"/>
9473
-
9474
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
9475
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
9476
- <xsl:value-of select="$char"/>
9477
- </xsl:if>
9478
-
9479
- <xsl:call-template name="interspers">
9480
- <xsl:with-param name="str" select="substring($str, 2)"/>
9481
- <xsl:with-param name="char" select="$char"/>
9482
- </xsl:call-template>
9483
- </xsl:if>
9484
- </xsl:template>
9485
-
9486
9091
  <xsl:template name="interspers-java">
9487
9092
  <xsl:param name="str"/>
9488
9093
  <xsl:param name="char" select="$zero_width_space"/>
@@ -9579,7 +9184,7 @@
9579
9184
  </xsl:variable>
9580
9185
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
9581
9186
 
9582
- <xsl:for-each select="$classes/item">
9187
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
9583
9188
  <xsl:variable name="class_name" select="."/>
9584
9189
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
9585
9190
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -9662,12 +9267,9 @@
9662
9267
 
9663
9268
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
9664
9269
  <xsl:if test="normalize-space() != ''">
9665
-
9666
- <fo:block xsl:use-attribute-sets="permission-name-style">
9667
- <xsl:apply-templates/>
9668
-
9669
- </fo:block>
9670
-
9270
+ <fo:block xsl:use-attribute-sets="permission-name-style">
9271
+ <xsl:apply-templates/>
9272
+ </fo:block>
9671
9273
  </xsl:if>
9672
9274
  </xsl:template>
9673
9275
 
@@ -9696,12 +9298,9 @@
9696
9298
  <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
9697
9299
  <xsl:if test="normalize-space() != ''">
9698
9300
 
9699
- <fo:block xsl:use-attribute-sets="requirement-name-style">
9700
-
9701
- <xsl:apply-templates/>
9702
-
9703
- </fo:block>
9704
-
9301
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
9302
+ <xsl:apply-templates/>
9303
+ </fo:block>
9705
9304
  </xsl:if>
9706
9305
  </xsl:template>
9707
9306
 
@@ -9740,11 +9339,9 @@
9740
9339
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
9741
9340
  <xsl:if test="normalize-space() != ''">
9742
9341
 
9743
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
9744
- <xsl:apply-templates/>
9745
-
9746
- </fo:block>
9747
-
9342
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
9343
+ <xsl:apply-templates/>
9344
+ </fo:block>
9748
9345
  </xsl:if>
9749
9346
  </xsl:template>
9750
9347
 
@@ -9870,7 +9467,6 @@
9870
9467
 
9871
9468
  <xsl:if test="parent::*[local-name()='thead'] or starts-with(*[local-name()='td' or local-name()='th'][1], 'Requirement ') or starts-with(*[local-name()='td' or local-name()='th'][1], 'Recommendation ')">
9872
9469
  <xsl:attribute name="font-weight">bold</xsl:attribute>
9873
-
9874
9470
  </xsl:if>
9875
9471
 
9876
9472
  <xsl:apply-templates mode="requirement"/>
@@ -9915,7 +9511,6 @@
9915
9511
 
9916
9512
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
9917
9513
  <fo:block font-size="11pt">
9918
-
9919
9514
  <xsl:apply-templates/>
9920
9515
  </fo:block>
9921
9516
  </xsl:template>
@@ -9955,7 +9550,6 @@
9955
9550
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
9956
9551
  <xsl:variable name="element">inline
9957
9552
 
9958
-
9959
9553
  </xsl:variable>
9960
9554
  <xsl:choose>
9961
9555
  <xsl:when test="contains($element, 'block')">
@@ -9987,110 +9581,105 @@
9987
9581
  text line 2
9988
9582
  -->
9989
9583
  <xsl:template match="*[local-name() = 'example']" name="example">
9584
+ <xsl:call-template name="setNamedDestination"/>
9585
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
9990
9586
 
9991
- <xsl:call-template name="setNamedDestination"/>
9992
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
9587
+ <xsl:call-template name="setBlockSpanAll"/>
9993
9588
 
9994
- <xsl:call-template name="setBlockSpanAll"/>
9589
+ <xsl:call-template name="refine_example-style"/>
9995
9590
 
9996
- <xsl:call-template name="refine_example-style"/>
9591
+ <xsl:variable name="fo_element">
9592
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>block
9593
+ </xsl:variable>
9997
9594
 
9998
- <xsl:variable name="fo_element">
9999
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
10000
- block
10001
- </xsl:variable>
9595
+ <fo:block-container margin-left="0mm" role="SKIP">
10002
9596
 
10003
- <fo:block-container margin-left="0mm" role="SKIP">
9597
+ <xsl:choose>
10004
9598
 
10005
- <xsl:choose>
9599
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
10006
9600
 
10007
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
9601
+ <!-- display name 'EXAMPLE' in a separate block -->
9602
+ <fo:block>
9603
+ <xsl:apply-templates select="*[local-name()='name']">
9604
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9605
+ </xsl:apply-templates>
9606
+ </fo:block>
10008
9607
 
10009
- <!-- display name 'EXAMPLE' in a separate block -->
10010
- <fo:block>
10011
- <xsl:apply-templates select="*[local-name()='name']">
9608
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
9609
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9610
+ <xsl:variable name="example_body">
9611
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10012
9612
  <xsl:with-param name="fo_element" select="$fo_element"/>
10013
9613
  </xsl:apply-templates>
10014
- </fo:block>
10015
-
10016
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10017
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10018
- <xsl:variable name="example_body">
10019
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10020
- <xsl:with-param name="fo_element" select="$fo_element"/>
10021
- </xsl:apply-templates>
10022
- </xsl:variable>
10023
- <xsl:choose>
10024
- <xsl:when test="xalan:nodeset($example_body)/*">
10025
- <xsl:copy-of select="$example_body"/>
10026
- </xsl:when>
10027
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
10028
- </xsl:choose>
10029
- </fo:block-container>
10030
- </fo:block-container>
10031
- </xsl:when> <!-- end block -->
10032
-
10033
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
10034
-
10035
- <xsl:variable name="provisional_distance_between_starts_">
10036
- 7
10037
- </xsl:variable>
10038
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
10039
- <xsl:variable name="indent_">
10040
- 0
10041
9614
  </xsl:variable>
10042
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
10043
-
10044
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
10045
- <fo:list-item>
10046
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
10047
- <fo:block>
10048
- <xsl:apply-templates select="*[local-name()='name']">
10049
- <xsl:with-param name="fo_element">block</xsl:with-param>
10050
- </xsl:apply-templates>
10051
- </fo:block>
10052
- </fo:list-item-label>
10053
- <fo:list-item-body start-indent="body-start()">
10054
- <fo:block>
10055
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10056
- <xsl:with-param name="fo_element" select="$fo_element"/>
10057
- </xsl:apply-templates>
10058
- </fo:block>
10059
- </fo:list-item-body>
10060
- </fo:list-item>
10061
- </fo:list-block>
10062
- </xsl:when> <!-- end list -->
9615
+ <xsl:choose>
9616
+ <xsl:when test="xalan:nodeset($example_body)/*">
9617
+ <xsl:copy-of select="$example_body"/>
9618
+ </xsl:when>
9619
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
9620
+ </xsl:choose>
9621
+ </fo:block-container>
9622
+ </fo:block-container>
9623
+ </xsl:when> <!-- end block -->
10063
9624
 
10064
- <xsl:otherwise> <!-- inline -->
9625
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
10065
9626
 
10066
- <!-- display 'EXAMPLE' and first element in the same line -->
10067
- <fo:block>
10068
- <xsl:apply-templates select="*[local-name()='name']">
10069
- <xsl:with-param name="fo_element" select="$fo_element"/>
10070
- </xsl:apply-templates>
10071
- <fo:inline>
10072
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
9627
+ <xsl:variable name="provisional_distance_between_starts_">7
9628
+ </xsl:variable>
9629
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
9630
+ <xsl:variable name="indent_">0
9631
+ </xsl:variable>
9632
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
9633
+
9634
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
9635
+ <fo:list-item>
9636
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
9637
+ <fo:block>
9638
+ <xsl:apply-templates select="*[local-name()='name']">
9639
+ <xsl:with-param name="fo_element">block</xsl:with-param>
9640
+ </xsl:apply-templates>
9641
+ </fo:block>
9642
+ </fo:list-item-label>
9643
+ <fo:list-item-body start-indent="body-start()">
9644
+ <fo:block>
9645
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10073
9646
  <xsl:with-param name="fo_element" select="$fo_element"/>
10074
9647
  </xsl:apply-templates>
10075
- </fo:inline>
10076
- </fo:block>
9648
+ </fo:block>
9649
+ </fo:list-item-body>
9650
+ </fo:list-item>
9651
+ </fo:list-block>
9652
+ </xsl:when> <!-- end list -->
10077
9653
 
10078
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
10079
- <!-- display further elements in blocks -->
10080
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10081
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10082
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
10083
- <xsl:with-param name="fo_element" select="'block'"/>
10084
- </xsl:apply-templates>
10085
- </fo:block-container>
10086
- </fo:block-container>
10087
- </xsl:if>
10088
- </xsl:otherwise> <!-- end inline -->
9654
+ <xsl:otherwise> <!-- inline -->
10089
9655
 
10090
- </xsl:choose>
10091
- </fo:block-container>
10092
- </fo:block-container>
9656
+ <!-- display 'EXAMPLE' and first element in the same line -->
9657
+ <fo:block>
9658
+ <xsl:apply-templates select="*[local-name()='name']">
9659
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9660
+ </xsl:apply-templates>
9661
+ <fo:inline>
9662
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
9663
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9664
+ </xsl:apply-templates>
9665
+ </fo:inline>
9666
+ </fo:block>
9667
+
9668
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
9669
+ <!-- display further elements in blocks -->
9670
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
9671
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9672
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
9673
+ <xsl:with-param name="fo_element" select="'block'"/>
9674
+ </xsl:apply-templates>
9675
+ </fo:block-container>
9676
+ </fo:block-container>
9677
+ </xsl:if>
9678
+ </xsl:otherwise> <!-- end inline -->
10093
9679
 
9680
+ </xsl:choose>
9681
+ </fo:block-container>
9682
+ </fo:block-container>
10094
9683
  </xsl:template>
10095
9684
 
10096
9685
  <!-- example/name -->
@@ -10105,7 +9694,6 @@
10105
9694
  </xsl:when>
10106
9695
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
10107
9696
  <fo:block xsl:use-attribute-sets="example-name-style">
10108
-
10109
9697
  <xsl:apply-templates/>
10110
9698
  </fo:block>
10111
9699
  </xsl:when>
@@ -10122,7 +9710,6 @@
10122
9710
  <!-- table/example/name, table/tfoot//example/name -->
10123
9711
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
10124
9712
  <fo:inline xsl:use-attribute-sets="example-name-style">
10125
-
10126
9713
  <xsl:apply-templates/>
10127
9714
  </fo:inline>
10128
9715
  </xsl:template>
@@ -10132,7 +9719,6 @@
10132
9719
 
10133
9720
  <xsl:variable name="num"><xsl:number/></xsl:variable>
10134
9721
  <xsl:variable name="element">
10135
-
10136
9722
  <xsl:value-of select="$fo_element"/>
10137
9723
  </xsl:variable>
10138
9724
  <xsl:choose>
@@ -10250,7 +9836,7 @@
10250
9836
  </xsl:call-template>
10251
9837
  </xsl:variable>
10252
9838
 
10253
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
9839
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
10254
9840
  <xsl:choose>
10255
9841
  <xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
10256
9842
  <xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
@@ -10287,7 +9873,6 @@
10287
9873
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
10288
9874
  </xsl:if>
10289
9875
  </xsl:if>
10290
-
10291
9876
  <fo:block-container margin-left="0mm" role="SKIP">
10292
9877
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10293
9878
 
@@ -10370,7 +9955,6 @@
10370
9955
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
10371
9956
  <xsl:attribute name="vertical-align">super</xsl:attribute>
10372
9957
  <xsl:attribute name="font-size">80%</xsl:attribute>
10373
-
10374
9958
  </xsl:if>
10375
9959
 
10376
9960
  <xsl:call-template name="refine_eref-style"/>
@@ -10419,10 +10003,8 @@
10419
10003
  </xsl:template>
10420
10004
 
10421
10005
  <xsl:template name="refine_basic_link_style">
10422
-
10423
- <xsl:attribute name="color">blue</xsl:attribute>
10424
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
10425
-
10006
+ <xsl:attribute name="color">blue</xsl:attribute>
10007
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
10426
10008
  </xsl:template> <!-- refine_basic_link_style -->
10427
10009
 
10428
10010
  <!-- ====== -->
@@ -10439,13 +10021,11 @@
10439
10021
  </xsl:variable>
10440
10022
 
10441
10023
  <xsl:variable name="padding">
10442
-
10443
- <xsl:choose>
10444
- <xsl:when test="$depth &gt;= 3">3</xsl:when>
10445
- <xsl:when test="$depth = 1">3</xsl:when>
10446
- <xsl:otherwise>2</xsl:otherwise>
10447
- </xsl:choose>
10448
-
10024
+ <xsl:choose>
10025
+ <xsl:when test="$depth &gt;= 3">3</xsl:when>
10026
+ <xsl:when test="$depth = 1">3</xsl:when>
10027
+ <xsl:otherwise>2</xsl:otherwise>
10028
+ </xsl:choose>
10449
10029
  </xsl:variable>
10450
10030
 
10451
10031
  <xsl:variable name="padding-right">
@@ -10456,7 +10036,6 @@
10456
10036
  </xsl:otherwise>
10457
10037
  </xsl:choose>
10458
10038
  </xsl:variable>
10459
-
10460
10039
  <xsl:choose>
10461
10040
  <xsl:when test="$lang = 'zh'">
10462
10041
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -10480,9 +10059,7 @@
10480
10059
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
10481
10060
 
10482
10061
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
10483
-
10484
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
10485
-
10062
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
10486
10063
  </xsl:template>
10487
10064
 
10488
10065
  <xsl:template name="insertNonBreakSpaces">
@@ -10501,11 +10078,10 @@
10501
10078
  <xsl:call-template name="getLevel"/>
10502
10079
  </xsl:variable>
10503
10080
  <xsl:variable name="font-size">
10504
-
10505
- <xsl:choose>
10506
- <xsl:when test="$level &gt;= 3">11pt</xsl:when>
10507
- <xsl:otherwise>12pt</xsl:otherwise>
10508
- </xsl:choose>
10081
+ <xsl:choose>
10082
+ <xsl:when test="$level &gt;= 3">11pt</xsl:when>
10083
+ <xsl:otherwise>12pt</xsl:otherwise>
10084
+ </xsl:choose>
10509
10085
 
10510
10086
  </xsl:variable>
10511
10087
  <xsl:variable name="levelTerm">
@@ -10558,11 +10134,9 @@
10558
10134
  </xsl:template>
10559
10135
 
10560
10136
  <xsl:template name="setStyle_preferred">
10561
-
10562
- <xsl:if test="*[local-name() = 'strong']">
10563
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10564
- </xsl:if>
10565
-
10137
+ <xsl:if test="*[local-name() = 'strong']">
10138
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10139
+ </xsl:if>
10566
10140
  </xsl:template>
10567
10141
 
10568
10142
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10639,7 +10213,6 @@
10639
10213
 
10640
10214
  <!-- main sections -->
10641
10215
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
10642
-
10643
10216
  <xsl:call-template name="setNamedDestination"/>
10644
10217
  <fo:block>
10645
10218
  <xsl:call-template name="setId"/>
@@ -10674,18 +10247,14 @@
10674
10247
  </xsl:template>
10675
10248
 
10676
10249
  <xsl:template name="sections_element_style">
10677
-
10678
- <xsl:variable name="pos"><xsl:number count="csd:sections/*/csd:clause | csd:sections/*/csd:terms"/></xsl:variable>
10679
- <xsl:if test="$pos &gt;= 2">
10680
- <xsl:attribute name="space-before">18pt</xsl:attribute>
10681
- </xsl:if>
10682
-
10250
+ <xsl:variable name="pos"><xsl:number count="csd:sections/*/csd:clause | csd:sections/*/csd:terms"/></xsl:variable>
10251
+ <xsl:if test="$pos &gt;= 2">
10252
+ <xsl:attribute name="space-before">18pt</xsl:attribute>
10253
+ </xsl:if>
10683
10254
  </xsl:template> <!-- sections_element_style -->
10684
10255
 
10685
10256
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
10686
-
10687
- <fo:block break-after="page"/>
10688
-
10257
+ <fo:block break-after="page"/>
10689
10258
  <xsl:call-template name="setNamedDestination"/>
10690
10259
  <fo:block>
10691
10260
  <xsl:call-template name="setId"/>
@@ -10734,7 +10303,6 @@
10734
10303
  </xsl:template>
10735
10304
 
10736
10305
  <xsl:template name="refine_clause_style">
10737
-
10738
10306
  </xsl:template> <!-- refine_clause_style -->
10739
10307
 
10740
10308
  <xsl:template match="*[local-name() = 'definitions']">
@@ -10774,7 +10342,6 @@
10774
10342
  </xsl:template>
10775
10343
 
10776
10344
  <xsl:template name="refine_annex_style">
10777
-
10778
10345
  </xsl:template>
10779
10346
 
10780
10347
  <!-- document text (not figures, or tables) footnotes -->
@@ -10878,15 +10445,13 @@
10878
10445
  <!-- Lists processing -->
10879
10446
  <!-- ===================================== -->
10880
10447
  <xsl:variable name="ul_labels_">
10881
-
10882
- <label>—</label> <!-- em dash -->
10448
+ <label>—</label> <!-- em dash -->
10883
10449
 
10884
10450
  </xsl:variable>
10885
10451
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
10886
10452
 
10887
10453
  <xsl:template name="setULLabel">
10888
- <xsl:variable name="list_level__">
10889
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
10454
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
10890
10455
  </xsl:variable>
10891
10456
  <xsl:variable name="list_level_" select="number($list_level__)"/>
10892
10457
  <xsl:variable name="list_level">
@@ -10943,28 +10508,22 @@
10943
10508
  <xsl:variable name="label">
10944
10509
 
10945
10510
  <xsl:variable name="style_prefix_">
10946
- <xsl:if test="$type = 'roman'">
10947
- <!-- Example: (i) -->
10511
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
10948
10512
  </xsl:if>
10949
10513
  <xsl:if test="$type = 'alphabet'">
10950
-
10951
10514
  </xsl:if>
10952
10515
  </xsl:variable>
10953
10516
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
10954
10517
 
10955
10518
  <xsl:variable name="style_suffix_">
10956
10519
  <xsl:choose>
10957
- <xsl:when test="$type = 'arabic'">
10958
- )
10520
+ <xsl:when test="$type = 'arabic'">)
10959
10521
  </xsl:when>
10960
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
10961
- )
10522
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
10962
10523
  </xsl:when>
10963
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
10964
- .
10524
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
10965
10525
  </xsl:when>
10966
- <xsl:when test="$type = 'roman'">
10967
- )
10526
+ <xsl:when test="$type = 'roman'">)
10968
10527
  </xsl:when>
10969
10528
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
10970
10529
  </xsl:choose>
@@ -10981,8 +10540,7 @@
10981
10540
  <xsl:value-of select="$style_suffix"/>
10982
10541
  </xsl:if>
10983
10542
  </xsl:variable>
10984
-
10985
- <xsl:value-of select="normalize-space($label)"/>
10543
+ <xsl:value-of select="normalize-space($label)"/>
10986
10544
 
10987
10545
  </xsl:when>
10988
10546
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -11039,17 +10597,13 @@
11039
10597
 
11040
10598
  <xsl:variable name="format">
11041
10599
  <xsl:choose>
11042
- <xsl:when test="$type = 'arabic'">
11043
- 1)
10600
+ <xsl:when test="$type = 'arabic'">1)
11044
10601
  </xsl:when>
11045
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
11046
- a)
10602
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
11047
10603
  </xsl:when>
11048
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
11049
- A.
10604
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
11050
10605
  </xsl:when>
11051
- <xsl:when test="$type = 'roman'">
11052
- i)
10606
+ <xsl:when test="$type = 'roman'">i)
11053
10607
  </xsl:when>
11054
10608
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
11055
10609
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -11086,19 +10640,16 @@
11086
10640
  </fo:block-container>
11087
10641
  </xsl:when>
11088
10642
  <xsl:otherwise>
11089
-
11090
- <fo:block role="SKIP">
11091
- <xsl:apply-templates select="." mode="list">
11092
- <xsl:with-param name="indent" select="$indent"/>
11093
- </xsl:apply-templates>
11094
- </fo:block>
11095
-
10643
+ <fo:block role="SKIP">
10644
+ <xsl:apply-templates select="." mode="list">
10645
+ <xsl:with-param name="indent" select="$indent"/>
10646
+ </xsl:apply-templates>
10647
+ </fo:block>
11096
10648
  </xsl:otherwise>
11097
10649
  </xsl:choose>
11098
10650
  </xsl:template>
11099
10651
 
11100
10652
  <xsl:template name="refine_list_container_style">
11101
-
11102
10653
  </xsl:template> <!-- refine_list_container_style -->
11103
10654
 
11104
10655
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -11162,7 +10713,6 @@
11162
10713
  </xsl:template>
11163
10714
 
11164
10715
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
11165
-
11166
10716
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
11167
10717
 
11168
10718
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -11447,7 +10997,6 @@
11447
10997
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
11448
10998
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
11449
10999
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
11450
-
11451
11000
  <xsl:apply-templates/>
11452
11001
  </fo:block>
11453
11002
  </xsl:template>
@@ -11499,7 +11048,6 @@
11499
11048
  <fo:table-column column-width="15mm"/>
11500
11049
  <fo:table-body>
11501
11050
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
11502
-
11503
11051
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
11504
11052
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
11505
11053
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -11535,7 +11083,6 @@
11535
11083
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
11536
11084
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
11537
11085
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
11538
-
11539
11086
  </xsl:template>
11540
11087
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
11541
11088
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -11546,16 +11093,13 @@
11546
11093
  <xsl:call-template name="setNamedDestination"/>
11547
11094
  <fo:block id="{@id}">
11548
11095
  <xsl:apply-templates/>
11549
-
11550
11096
  </fo:block>
11551
11097
  </xsl:template>
11552
11098
 
11553
11099
  <!-- Bibliography (non-normative references) -->
11554
11100
  <xsl:template match="*[local-name() = 'references']">
11555
11101
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
11556
-
11557
- <fo:block break-after="page"/>
11558
-
11102
+ <fo:block break-after="page"/>
11559
11103
  </xsl:if>
11560
11104
 
11561
11105
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -11571,9 +11115,7 @@
11571
11115
 
11572
11116
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
11573
11117
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
11574
-
11575
11118
  </fo:block>
11576
-
11577
11119
  </xsl:template> <!-- references -->
11578
11120
 
11579
11121
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -11583,44 +11125,39 @@
11583
11125
  <!-- Normative references -->
11584
11126
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11585
11127
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11586
-
11587
- <xsl:call-template name="setNamedDestination"/>
11588
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11589
-
11590
- <xsl:call-template name="processBibitem"/>
11591
- </fo:block>
11128
+ <xsl:call-template name="setNamedDestination"/>
11129
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11130
+ <xsl:call-template name="processBibitem"/>
11131
+ </fo:block>
11592
11132
 
11593
11133
  </xsl:template> <!-- bibitem -->
11594
11134
 
11595
11135
  <!-- Bibliography (non-normative references) -->
11596
11136
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
11597
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11598
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11137
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11599
11138
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
11600
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
11601
- <xsl:call-template name="setNamedDestination"/>
11602
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11603
-
11604
- <fo:list-item>
11605
- <fo:list-item-label end-indent="label-end()">
11606
- <fo:block role="SKIP">
11607
- <fo:inline role="SKIP">
11608
-
11609
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11610
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11611
- </xsl:apply-templates>
11612
- </fo:inline>
11613
- </fo:block>
11614
- </fo:list-item-label>
11615
- <fo:list-item-body start-indent="body-start()">
11616
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11617
- <xsl:call-template name="processBibitem">
11618
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11619
- </xsl:call-template>
11620
- </fo:block>
11621
- </fo:list-item-body>
11622
- </fo:list-item>
11623
- </fo:list-block>
11139
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
11140
+ <xsl:call-template name="setNamedDestination"/>
11141
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
11142
+ <fo:list-item>
11143
+ <fo:list-item-label end-indent="label-end()">
11144
+ <fo:block role="SKIP">
11145
+ <fo:inline role="SKIP">
11146
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11147
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
11148
+ </xsl:apply-templates>
11149
+ </fo:inline>
11150
+ </fo:block>
11151
+ </fo:list-item-label>
11152
+ <fo:list-item-body start-indent="body-start()">
11153
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
11154
+ <xsl:call-template name="processBibitem">
11155
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
11156
+ </xsl:call-template>
11157
+ </fo:block>
11158
+ </fo:list-item-body>
11159
+ </fo:list-item>
11160
+ </fo:list-block>
11624
11161
 
11625
11162
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
11626
11163
 
@@ -11630,7 +11167,6 @@
11630
11167
  <xsl:otherwise>
11631
11168
  <xsl:call-template name="setNamedDestination"/>
11632
11169
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
11633
-
11634
11170
  <fo:list-item-label end-indent="label-end()">
11635
11171
  <fo:block role="SKIP">
11636
11172
  <fo:inline role="SKIP">
@@ -11657,18 +11193,16 @@
11657
11193
 
11658
11194
  <xsl:template name="processBibitem">
11659
11195
  <xsl:param name="biblio_tag_part">both</xsl:param>
11196
+ <!-- start bibitem processing -->
11197
+ <xsl:if test=".//*[local-name() = 'fn']">
11198
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
11199
+ </xsl:if>
11660
11200
 
11661
- <!-- start bibitem processing -->
11662
- <xsl:if test=".//*[local-name() = 'fn']">
11663
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
11664
- </xsl:if>
11665
-
11666
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11667
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
11668
- </xsl:apply-templates>
11669
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
11670
- <!-- end bibitem processing -->
11671
-
11201
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11202
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
11203
+ </xsl:apply-templates>
11204
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
11205
+ <!-- end bibitem processing -->
11672
11206
  </xsl:template> <!-- processBibitem (bibitem) -->
11673
11207
 
11674
11208
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -11811,8 +11345,7 @@
11811
11345
  <xsl:choose>
11812
11346
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
11813
11347
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
11814
- <xsl:otherwise><!-- default value -->
11815
- 2
11348
+ <xsl:otherwise><!-- default value -->2
11816
11349
  </xsl:otherwise>
11817
11350
  </xsl:choose>
11818
11351
  </xsl:variable>
@@ -12021,28 +11554,26 @@
12021
11554
  <!-- Admonition -->
12022
11555
  <!-- ================ -->
12023
11556
  <xsl:template match="*[local-name() = 'admonition']">
11557
+ <fo:block xsl:use-attribute-sets="admonition-style">
12024
11558
 
12025
- <fo:block xsl:use-attribute-sets="admonition-style">
12026
-
12027
- <xsl:call-template name="setBlockSpanAll"/>
11559
+ <xsl:call-template name="setBlockSpanAll"/>
12028
11560
 
12029
- <xsl:if test="@type = 'editorial'">
12030
- <xsl:attribute name="color">green</xsl:attribute>
12031
- <xsl:attribute name="font-weight">normal</xsl:attribute>
12032
- <!-- <xsl:variable name="note-style">
11561
+ <xsl:if test="@type = 'editorial'">
11562
+ <xsl:attribute name="color">green</xsl:attribute>
11563
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11564
+ <!-- <xsl:variable name="note-style">
12033
11565
  <style xsl:use-attribute-sets="note-style"></style>
12034
11566
  </xsl:variable>
12035
11567
  <xsl:for-each select="xalan:nodeset($note-style)//style/@*">
12036
11568
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
12037
11569
  </xsl:for-each> -->
12038
- </xsl:if>
12039
-
12040
- <xsl:call-template name="displayAdmonitionName">
12041
- <xsl:with-param name="sep"> — </xsl:with-param>
12042
- </xsl:call-template>
11570
+ </xsl:if>
11571
+ <xsl:call-template name="displayAdmonitionName">
11572
+ <xsl:with-param name="sep"> — </xsl:with-param>
11573
+ </xsl:call-template>
12043
11574
 
12044
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
12045
- </fo:block>
11575
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
11576
+ </fo:block>
12046
11577
 
12047
11578
  </xsl:template>
12048
11579
 
@@ -12091,12 +11622,10 @@
12091
11622
  </xsl:template> -->
12092
11623
 
12093
11624
  <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
11625
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
12094
11626
 
12095
- <fo:block xsl:use-attribute-sets="admonition-p-style">
12096
-
12097
- <xsl:apply-templates/>
12098
- </fo:block>
12099
-
11627
+ <xsl:apply-templates/>
11628
+ </fo:block>
12100
11629
  </xsl:template>
12101
11630
 
12102
11631
  <!-- ================ -->
@@ -12132,11 +11661,9 @@
12132
11661
 
12133
11662
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
12134
11663
  <xsl:variable name="updated_xml_step2">
12135
-
12136
- <xsl:if test="$table_if = 'false'">
12137
- <xsl:copy-of select="$updated_xml_step1"/>
12138
- </xsl:if>
12139
-
11664
+ <xsl:if test="$table_if = 'false'">
11665
+ <xsl:copy-of select="$updated_xml_step1"/>
11666
+ </xsl:if>
12140
11667
  </xsl:variable>
12141
11668
 
12142
11669
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -12611,7 +12138,6 @@
12611
12138
  </xsl:template>
12612
12139
 
12613
12140
  <xsl:template name="addNamedDestinationAttribute">
12614
-
12615
12141
  </xsl:template>
12616
12142
 
12617
12143
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -13106,7 +12632,6 @@
13106
12632
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
13107
12633
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
13108
12634
  <!-- if EXPRESS reference -->
13109
-
13110
12635
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
13111
12636
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
13112
12637
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -13160,8 +12685,7 @@
13160
12685
 
13161
12686
  <xsl:variable name="text2">
13162
12687
  <xsl:element name="text" namespace="{$namespace_full}">
13163
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
13164
- <xsl:copy-of select="."/>
12688
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
13165
12689
  </xsl:for-each>
13166
12690
  </xsl:element>
13167
12691
  </xsl:variable>
@@ -13453,9 +12977,7 @@
13453
12977
  </xsl:attribute>
13454
12978
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
13455
12979
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
13456
-
13457
- <xsl:value-of select="$skip_footnote_body_"/>
13458
-
12980
+ <xsl:value-of select="$skip_footnote_body_"/>
13459
12981
  </xsl:attribute>
13460
12982
  <xsl:attribute name="ref_id">
13461
12983
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -13544,7 +13066,6 @@
13544
13066
 
13545
13067
  <xsl:template name="printEdition">
13546
13068
  <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
13547
-
13548
13069
  <xsl:choose>
13549
13070
  <xsl:when test="$edition_i18n != ''">
13550
13071
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -13773,8 +13294,7 @@
13773
13294
  <dc:title>
13774
13295
  <xsl:variable name="title">
13775
13296
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
13776
-
13777
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
13297
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
13778
13298
 
13779
13299
  </xsl:for-each>
13780
13300
  </xsl:variable>
@@ -13793,16 +13313,14 @@
13793
13313
  </dc:title>
13794
13314
  <xsl:variable name="dc_creator">
13795
13315
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
13796
-
13797
- <rdf:Seq>
13798
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
13799
- <rdf:li>
13800
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
13801
- </rdf:li>
13802
- <!-- <xsl:if test="position() != last()">; </xsl:if> -->
13803
- </xsl:for-each>
13804
- </rdf:Seq>
13805
-
13316
+ <rdf:Seq>
13317
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
13318
+ <rdf:li>
13319
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
13320
+ </rdf:li>
13321
+ <!-- <xsl:if test="position() != last()">; </xsl:if> -->
13322
+ </xsl:for-each>
13323
+ </rdf:Seq>
13806
13324
  </xsl:for-each>
13807
13325
  </xsl:variable>
13808
13326
  <xsl:if test="normalize-space($dc_creator) != ''">
@@ -13813,9 +13331,7 @@
13813
13331
 
13814
13332
  <xsl:variable name="dc_description">
13815
13333
  <xsl:variable name="abstract">
13816
-
13817
- <xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
13818
-
13334
+ <xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
13819
13335
  </xsl:variable>
13820
13336
  <rdf:Alt>
13821
13337
  <rdf:li xml:lang="x-default">
@@ -13880,7 +13396,9 @@
13880
13396
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
13881
13397
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
13882
13398
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
13883
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
13399
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
13400
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
13401
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
13884
13402
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
13885
13403
  <!-- Todo: need update -->
13886
13404
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -14045,7 +13563,7 @@
14045
13563
  <xsl:param name="normalize-space" select="'true'"/>
14046
13564
  <xsl:param name="keep_sep" select="'false'"/>
14047
13565
  <xsl:if test="string-length($pText) &gt;0">
14048
- <item>
13566
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
14049
13567
  <xsl:choose>
14050
13568
  <xsl:when test="$normalize-space = 'true'">
14051
13569
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -14054,8 +13572,8 @@
14054
13572
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
14055
13573
  </xsl:otherwise>
14056
13574
  </xsl:choose>
14057
- </item>
14058
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
13575
+ </xsl:element>
13576
+ <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><xsl:element name="item" namespace="{$namespace_mn_xsl}"><xsl:value-of select="$sep"/></xsl:element></xsl:if>
14059
13577
  <xsl:call-template name="split">
14060
13578
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
14061
13579
  <xsl:with-param name="sep" select="$sep"/>
@@ -14073,30 +13591,6 @@
14073
13591
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
14074
13592
  </xsl:template>
14075
13593
 
14076
- <xsl:template name="namespaceCheck">
14077
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
14078
- <xsl:variable name="XSLNS">
14079
-
14080
- <xsl:value-of select="document('')//*/namespace::csd"/>
14081
-
14082
- </xsl:variable>
14083
- <!-- <xsl:if test="$documentNS != $XSLNS">
14084
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
14085
- </xsl:if> -->
14086
- </xsl:template> <!-- namespaceCheck -->
14087
-
14088
- <xsl:template name="getLanguage">
14089
- <xsl:param name="lang"/>
14090
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
14091
- <xsl:choose>
14092
- <xsl:when test="$language = 'en'">English</xsl:when>
14093
- <xsl:when test="$language = 'fr'">French</xsl:when>
14094
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
14095
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
14096
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
14097
- </xsl:choose>
14098
- </xsl:template>
14099
-
14100
13594
  <xsl:template name="setId">
14101
13595
  <xsl:param name="prefix"/>
14102
13596
  <xsl:attribute name="id">