metanorma-csa 2.6.7 → 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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/csa/csa.standard.xsl +622 -1130
  3. data/lib/metanorma/csa/isodoc.rng +19 -2
  4. data/lib/metanorma/csa/version.rb +1 -1
  5. metadata +2 -2
data/lib/isodoc/csa/csa.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:csa="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:csa="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="yes"/>
4
4
 
@@ -15,16 +15,15 @@
15
15
  <xsl:variable name="color-header-document">rgb(79, 201, 204)</xsl:variable>
16
16
 
17
17
  <xsl:variable name="contents_">
18
- <contents>
18
+ <mn:contents>
19
19
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
20
20
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
21
21
  <xsl:call-template name="processTablesFigures_Contents"/>
22
- </contents>
22
+ </mn:contents>
23
23
  </xsl:variable>
24
24
  <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
25
25
 
26
26
  <xsl:template match="/">
27
- <xsl:call-template name="namespaceCheck"/>
28
27
  <fo:root xml:lang="{$lang}">
29
28
  <xsl:variable name="root-style">
30
29
  <root-style xsl:use-attribute-sets="root-style"/>
@@ -305,7 +304,7 @@
305
304
 
306
305
  <xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
307
306
  <fo:block margin-left="-3mm" role="TOC">
308
- <xsl:for-each select="$contents//item[@display = 'true']">
307
+ <xsl:for-each select="$contents//mn:item[@display = 'true']">
309
308
  <fo:block role="TOCI">
310
309
  <fo:list-block>
311
310
  <xsl:attribute name="provisional-distance-between-starts">
@@ -320,9 +319,9 @@
320
319
  </fo:list-item-label>
321
320
  <fo:list-item-body start-indent="body-start()">
322
321
  <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
323
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
322
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
324
323
  <fo:inline padding-right="2mm"><xsl:value-of select="@section"/></fo:inline>
325
- <xsl:apply-templates select="title"/>
324
+ <xsl:apply-templates select="mn:title"/>
326
325
  <fo:inline keep-together.within-line="always">
327
326
  <fo:leader leader-pattern="dots"/>
328
327
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
@@ -336,21 +335,21 @@
336
335
  </xsl:for-each>
337
336
 
338
337
  <!-- List of Tables -->
339
- <xsl:if test="$contents//tables/table">
338
+ <xsl:if test="$contents//mn:tables/mn:table">
340
339
  <xsl:call-template name="insertListOf_Title">
341
340
  <xsl:with-param name="title" select="$title-list-tables"/>
342
341
  </xsl:call-template>
343
- <xsl:for-each select="$contents//tables/table">
342
+ <xsl:for-each select="$contents//mn:tables/mn:table">
344
343
  <xsl:call-template name="insertListOf_Item"/>
345
344
  </xsl:for-each>
346
345
  </xsl:if>
347
346
 
348
347
  <!-- List of Figures -->
349
- <xsl:if test="$contents//figures/figure">
348
+ <xsl:if test="$contents//mn:figures/mn:figure">
350
349
  <xsl:call-template name="insertListOf_Title">
351
350
  <xsl:with-param name="title" select="$title-list-figures"/>
352
351
  </xsl:call-template>
353
- <xsl:for-each select="$contents//figures/figure">
352
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
354
353
  <xsl:call-template name="insertListOf_Item"/>
355
354
  </xsl:for-each>
356
355
  </xsl:if>
@@ -410,12 +409,12 @@
410
409
  <xsl:call-template name="getName"/>
411
410
  </xsl:variable>
412
411
 
413
- <item id="{@id}" level="{$level}" section="{$section}" display="{$display}">
414
- <title>
412
+ <mn:item id="{@id}" level="{$level}" section="{$section}" display="{$display}">
413
+ <mn:title>
415
414
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
416
- </title>
415
+ </mn:title>
417
416
  <xsl:apply-templates mode="contents"/>
418
- </item>
417
+ </mn:item>
419
418
  </xsl:if>
420
419
  </xsl:template>
421
420
 
@@ -652,34 +651,25 @@
652
651
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAASEAAAEhCAYAAAAwHRYbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDplYWRhN2RlNC04YzAyLTQ1N2UtYjUwNy0zNGYzY2RjNWE2ZGQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDUyNzBENDc3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDUyNzBENDY3NjVCMTFFQTlDMDhGMEI2ODhENjUxQkIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgSW5EZXNpZ24gMTQuMCAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOmZiZjFiODZmLTIzMjMtM2U0OS1hMDMzLTVlOGQxYThlNmI1YiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmlkOjFlMzVjZTE3LWU5NzAtNDQ1OS05ZjI0LTM1NzcwZWYzMjNjMiIvPiA8L3Jk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</xsl:text>
653
652
  </xsl:variable>
654
653
 
655
- <!-- <xsl:strip-space elements="csa:xref"/> -->
654
+ <!-- https://www.metanorma.org/ns/standoc -->
655
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
656
656
 
657
- <xsl:variable name="namespace_full_">
658
- <xsl:choose>
659
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
660
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
661
- </xsl:choose>
662
- </xsl:variable>
663
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
657
+ <!-- https://www.metanorma.org/ns/xsl -->
658
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
664
659
 
665
- <xsl:variable name="root_element_">
666
- <xsl:choose>
667
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
668
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
669
- </xsl:choose>
670
- </xsl:variable>
671
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
660
+ <xsl:variable name="root_element">metanorma</xsl:variable>
672
661
 
662
+ <!---examples: 2013, 2024 -->
673
663
  <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'])"/>
674
664
 
675
665
  <!-- external parameters -->
676
-
677
666
  <xsl:param name="svg_images"/> <!-- svg images array -->
678
667
  <xsl:variable name="images" select="document($svg_images)"/>
679
668
  <xsl:param name="basepath"/> <!-- base path for images -->
680
669
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
681
670
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
682
671
  <xsl:param name="output_path"/> <!-- output PDF file name -->
672
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
683
673
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
684
674
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
685
675
  <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 -->
@@ -726,20 +716,13 @@
726
716
 
727
717
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
728
718
 
729
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
730
- true
719
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
720
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
731
721
  </xsl:variable>
732
722
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
733
723
 
734
- <xsl:variable name="isGenerateTableIF_">
735
- <xsl:choose>
736
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
737
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
738
- </xsl:when>
739
- <xsl:otherwise>false</xsl:otherwise>
740
- </xsl:choose>
741
- </xsl:variable>
742
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
724
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
725
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
743
726
 
744
727
  <xsl:variable name="lang">
745
728
  <xsl:call-template name="getLang"/>
@@ -791,8 +774,7 @@
791
774
  <xsl:variable name="pageWidth_">
792
775
  <xsl:choose>
793
776
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
794
- <xsl:otherwise>
795
- 215.9
777
+ <xsl:otherwise>215.9
796
778
  </xsl:otherwise>
797
779
  </xsl:choose>
798
780
  </xsl:variable>
@@ -802,8 +784,7 @@
802
784
  <xsl:variable name="pageHeight_">
803
785
  <xsl:choose>
804
786
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
805
- <xsl:otherwise>
806
- 279.4
787
+ <xsl:otherwise>279.4
807
788
  </xsl:otherwise>
808
789
  </xsl:choose>
809
790
  </xsl:variable>
@@ -812,23 +793,19 @@
812
793
  <!-- Page margins in mm (just digits, without 'mm')-->
813
794
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
814
795
  for example, left margin on odd page and right margin on even page -->
815
- <xsl:variable name="marginLeftRight1_">
816
- 25
796
+ <xsl:variable name="marginLeftRight1_">25
817
797
  </xsl:variable>
818
798
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
819
799
 
820
- <xsl:variable name="marginLeftRight2_">
821
- 25
800
+ <xsl:variable name="marginLeftRight2_">25
822
801
  </xsl:variable>
823
802
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
824
803
 
825
- <xsl:variable name="marginTop_">
826
- 25
804
+ <xsl:variable name="marginTop_">25
827
805
  </xsl:variable>
828
806
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
829
807
 
830
- <xsl:variable name="marginBottom_">
831
- 21
808
+ <xsl:variable name="marginBottom_">21
832
809
  </xsl:variable>
833
810
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
834
811
 
@@ -877,13 +854,10 @@
877
854
  <title-toc lang="zh">目次</title-toc>
878
855
 
879
856
  <title-part lang="en">
880
-
881
857
  </title-part>
882
858
  <title-part lang="fr">
883
-
884
859
  </title-part>
885
860
  <title-part lang="ru">
886
-
887
861
  </title-part>
888
862
  <title-part lang="zh">第 # 部分:</title-part>
889
863
 
@@ -979,11 +953,9 @@
979
953
  <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>
980
954
  <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>
981
955
  <xsl:attribute-set name="root-style">
982
-
983
- <xsl:attribute name="font-family">Azo Sans, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
984
- <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
985
- <xsl:attribute name="font-size">10pt</xsl:attribute>
986
-
956
+ <xsl:attribute name="font-family">Azo Sans, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
957
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
958
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
987
959
  </xsl:attribute-set> <!-- root-style -->
988
960
 
989
961
  <xsl:template name="insertRootStyle">
@@ -1071,28 +1043,22 @@
1071
1043
 
1072
1044
  <!-- Preface sections styles -->
1073
1045
  <xsl:attribute-set name="copyright-statement-style">
1074
-
1075
1046
  </xsl:attribute-set> <!-- copyright-statement-style -->
1076
1047
 
1077
1048
  <xsl:attribute-set name="copyright-statement-title-style">
1078
-
1079
1049
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
1080
1050
 
1081
1051
  <xsl:attribute-set name="copyright-statement-p-style">
1082
-
1083
1052
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
1084
1053
 
1085
1054
  <xsl:attribute-set name="license-statement-style">
1086
-
1087
1055
  </xsl:attribute-set>
1088
1056
 
1089
1057
  <xsl:attribute-set name="license-statement-title-style">
1090
1058
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1091
-
1092
1059
  </xsl:attribute-set> <!-- license-statement-title-style -->
1093
1060
 
1094
1061
  <xsl:attribute-set name="license-statement-p-style">
1095
-
1096
1062
  </xsl:attribute-set> <!-- license-statement-p-style -->
1097
1063
 
1098
1064
  <xsl:attribute-set name="legal-statement-style">
@@ -1101,91 +1067,71 @@
1101
1067
 
1102
1068
  <xsl:attribute-set name="legal-statement-title-style">
1103
1069
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1104
-
1105
1070
  </xsl:attribute-set> <!-- legal-statement-title-style -->
1106
1071
 
1107
1072
  <xsl:attribute-set name="legal-statement-p-style">
1108
-
1109
1073
  </xsl:attribute-set> <!-- legal-statement-p-style -->
1110
1074
 
1111
1075
  <xsl:attribute-set name="feedback-statement-style">
1112
-
1113
1076
  </xsl:attribute-set> <!-- feedback-statement-style -->
1114
1077
 
1115
1078
  <xsl:attribute-set name="feedback-statement-title-style">
1116
1079
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1117
-
1118
1080
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
1119
1081
 
1120
1082
  <xsl:attribute-set name="feedback-statement-p-style">
1121
-
1122
1083
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
1123
1084
 
1124
1085
  <!-- End Preface sections styles -->
1125
1086
 
1126
1087
  <xsl:attribute-set name="link-style">
1127
-
1128
- <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1129
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1130
-
1088
+ <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1089
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1131
1090
  </xsl:attribute-set>
1132
1091
 
1133
1092
  <xsl:template name="refine_link-style">
1134
-
1135
1093
  </xsl:template> <!-- refine_link-style -->
1136
1094
 
1137
1095
  <xsl:attribute-set name="sourcecode-container-style">
1138
-
1139
1096
  </xsl:attribute-set>
1140
1097
 
1141
1098
  <xsl:attribute-set name="sourcecode-style">
1142
1099
  <xsl:attribute name="white-space">pre</xsl:attribute>
1143
1100
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
1144
1101
  <xsl:attribute name="role">Code</xsl:attribute>
1145
-
1146
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1147
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1148
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1149
- <xsl:attribute name="line-height">113%</xsl:attribute>
1150
-
1102
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1103
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1104
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1105
+ <xsl:attribute name="line-height">113%</xsl:attribute>
1151
1106
  </xsl:attribute-set>
1152
1107
 
1153
1108
  <xsl:template name="refine_sourcecode-style">
1154
-
1155
1109
  </xsl:template> <!-- refine_sourcecode-style -->
1156
1110
 
1157
1111
  <xsl:attribute-set name="pre-style">
1158
1112
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1159
1113
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1160
-
1161
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1162
- <xsl:attribute name="line-height">113%</xsl:attribute>
1163
-
1114
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1115
+ <xsl:attribute name="line-height">113%</xsl:attribute>
1164
1116
  </xsl:attribute-set>
1165
1117
 
1166
1118
  <xsl:attribute-set name="permission-style">
1167
-
1168
1119
  </xsl:attribute-set>
1169
1120
 
1170
1121
  <xsl:attribute-set name="permission-name-style">
1171
-
1172
1122
  </xsl:attribute-set>
1173
1123
 
1174
1124
  <xsl:attribute-set name="permission-label-style">
1175
-
1176
1125
  </xsl:attribute-set>
1177
1126
 
1178
1127
  <xsl:attribute-set name="requirement-style">
1179
-
1180
1128
  </xsl:attribute-set>
1181
1129
 
1182
1130
  <xsl:attribute-set name="requirement-name-style">
1183
1131
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1184
-
1185
1132
  </xsl:attribute-set>
1186
1133
 
1187
1134
  <xsl:attribute-set name="requirement-label-style">
1188
-
1189
1135
  </xsl:attribute-set>
1190
1136
 
1191
1137
  <xsl:attribute-set name="subject-style">
@@ -1213,128 +1159,100 @@
1213
1159
  </xsl:attribute-set>
1214
1160
 
1215
1161
  <xsl:attribute-set name="recommendation-style">
1216
-
1217
1162
  </xsl:attribute-set>
1218
1163
 
1219
1164
  <xsl:attribute-set name="recommendation-name-style">
1220
-
1221
1165
  </xsl:attribute-set>
1222
1166
 
1223
1167
  <xsl:attribute-set name="recommendation-label-style">
1224
-
1225
1168
  </xsl:attribute-set>
1226
1169
 
1227
1170
  <xsl:attribute-set name="termexample-style">
1228
-
1229
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1230
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1231
-
1171
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1172
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1232
1173
  </xsl:attribute-set>
1233
1174
 
1234
1175
  <xsl:template name="refine_termexample-style">
1235
-
1236
1176
  </xsl:template>
1237
1177
 
1238
1178
  <xsl:attribute-set name="example-style">
1239
-
1240
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1241
-
1179
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1242
1180
  </xsl:attribute-set> <!-- example-style -->
1243
1181
 
1244
1182
  <xsl:template name="refine_example-style">
1245
-
1246
1183
  </xsl:template> <!-- refine_example-style -->
1247
1184
 
1248
1185
  <xsl:attribute-set name="example-body-style">
1249
-
1250
- <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
1251
- <xsl:attribute name="margin-right">12.5mm</xsl:attribute>
1252
-
1186
+ <xsl:attribute name="margin-left">12.5mm</xsl:attribute>
1187
+ <xsl:attribute name="margin-right">12.5mm</xsl:attribute>
1253
1188
  </xsl:attribute-set> <!-- example-body-style -->
1254
1189
 
1255
1190
  <xsl:attribute-set name="example-name-style">
1256
-
1257
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
1258
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1259
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1260
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1261
-
1191
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1192
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1193
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1194
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1262
1195
  </xsl:attribute-set> <!-- example-name-style -->
1263
1196
 
1264
1197
  <xsl:template name="refine_example-name-style">
1265
-
1266
1198
  </xsl:template>
1267
1199
 
1268
1200
  <xsl:attribute-set name="example-p-style">
1269
-
1270
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1201
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1271
1202
 
1272
1203
  </xsl:attribute-set> <!-- example-p-style -->
1273
1204
 
1274
1205
  <xsl:template name="refine_example-p-style">
1275
-
1276
1206
  </xsl:template> <!-- refine_example-p-style -->
1277
1207
 
1278
1208
  <xsl:attribute-set name="termexample-name-style">
1279
-
1280
- <xsl:attribute name="padding-right">10mm</xsl:attribute>
1281
-
1209
+ <xsl:attribute name="padding-right">10mm</xsl:attribute>
1282
1210
  </xsl:attribute-set> <!-- termexample-name-style -->
1283
1211
 
1284
1212
  <xsl:template name="refine_termexample-name-style">
1285
-
1286
1213
  </xsl:template>
1287
1214
 
1288
1215
  <!-- ========================== -->
1289
1216
  <!-- Table styles -->
1290
1217
  <!-- ========================== -->
1291
1218
  <xsl:variable name="table-border_">
1292
-
1293
1219
  </xsl:variable>
1294
1220
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
1295
1221
 
1296
1222
  <xsl:variable name="table-cell-border_">
1297
-
1298
1223
  </xsl:variable>
1299
1224
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
1300
1225
 
1301
1226
  <xsl:attribute-set name="table-container-style">
1302
1227
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1303
1228
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1304
-
1305
1229
  </xsl:attribute-set> <!-- table-container-style -->
1306
1230
 
1307
1231
  <xsl:template name="refine_table-container-style">
1308
1232
  <xsl:param name="margin-side"/>
1309
-
1310
- <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1311
- <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1312
-
1233
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1234
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
1313
1235
  <!-- end table block-container attributes -->
1314
1236
  </xsl:template> <!-- refine_table-container-style -->
1315
1237
 
1316
1238
  <xsl:attribute-set name="table-style">
1317
1239
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
1318
1240
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
1319
-
1320
1241
  </xsl:attribute-set><!-- table-style -->
1321
1242
 
1322
1243
  <xsl:template name="refine_table-style">
1323
1244
  <xsl:param name="margin-side"/>
1324
-
1325
- <xsl:if test="$margin-side != 0">
1326
- <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1327
- <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1328
- </xsl:if>
1245
+ <xsl:if test="$margin-side != 0">
1246
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1247
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
1248
+ </xsl:if>
1329
1249
 
1330
1250
  <xsl:call-template name="setBordersTableArray"/>
1331
-
1332
1251
  </xsl:template> <!-- refine_table-style -->
1333
1252
 
1334
1253
  <xsl:attribute-set name="table-name-style">
1335
1254
  <xsl:attribute name="role">Caption</xsl:attribute>
1336
1255
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1337
-
1338
1256
  </xsl:attribute-set> <!-- table-name-style -->
1339
1257
 
1340
1258
  <xsl:template name="refine_table-name-style">
@@ -1342,31 +1260,25 @@
1342
1260
  <xsl:if test="$continued = 'true'">
1343
1261
  <xsl:attribute name="role">SKIP</xsl:attribute>
1344
1262
  </xsl:if>
1345
-
1346
1263
  </xsl:template> <!-- refine_table-name-style -->
1347
1264
 
1348
1265
  <xsl:attribute-set name="table-row-style">
1349
1266
  <xsl:attribute name="min-height">4mm</xsl:attribute>
1350
-
1351
1267
  </xsl:attribute-set>
1352
1268
 
1353
1269
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
1354
1270
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1355
-
1356
1271
  </xsl:attribute-set>
1357
1272
 
1358
1273
  <xsl:template name="refine_table-header-row-style">
1359
1274
 
1360
1275
  <xsl:call-template name="setBordersTableArray"/>
1361
-
1362
1276
  </xsl:template> <!-- refine_table-header-row-style -->
1363
1277
 
1364
1278
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
1365
-
1366
1279
  </xsl:attribute-set>
1367
1280
 
1368
1281
  <xsl:template name="refine_table-footer-row-style">
1369
-
1370
1282
  </xsl:template> <!-- refine_table-footer-row-style -->
1371
1283
 
1372
1284
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -1376,7 +1288,6 @@
1376
1288
  <xsl:template name="refine_table-body-row-style">
1377
1289
 
1378
1290
  <xsl:call-template name="setBordersTableArray"/>
1379
-
1380
1291
  </xsl:template> <!-- refine_table-body-row-style -->
1381
1292
 
1382
1293
  <xsl:attribute-set name="table-header-cell-style">
@@ -1384,7 +1295,6 @@
1384
1295
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1385
1296
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1386
1297
  <xsl:attribute name="display-align">center</xsl:attribute>
1387
-
1388
1298
  </xsl:attribute-set> <!-- table-header-cell-style -->
1389
1299
 
1390
1300
  <xsl:template name="refine_table-header-cell-style">
@@ -1396,14 +1306,12 @@
1396
1306
  </xsl:if>
1397
1307
 
1398
1308
  <xsl:call-template name="setTableCellAttributes"/>
1399
-
1400
1309
  </xsl:template> <!-- refine_table-header-cell-style -->
1401
1310
 
1402
1311
  <xsl:attribute-set name="table-cell-style">
1403
1312
  <xsl:attribute name="display-align">center</xsl:attribute>
1404
1313
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1405
1314
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1406
-
1407
1315
  </xsl:attribute-set> <!-- table-cell-style -->
1408
1316
 
1409
1317
  <xsl:template name="refine_table-cell-style">
@@ -1412,8 +1320,6 @@
1412
1320
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1413
1321
  </xsl:if>
1414
1322
 
1415
- <!-- bsi -->
1416
-
1417
1323
  <xsl:call-template name="setBordersTableArray"/>
1418
1324
 
1419
1325
  </xsl:template> <!-- refine_table-cell-style -->
@@ -1423,54 +1329,43 @@
1423
1329
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
1424
1330
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
1425
1331
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
1426
-
1427
1332
  </xsl:attribute-set> <!-- table-footer-cell-style -->
1428
1333
 
1429
1334
  <xsl:template name="refine_table-footer-cell-style">
1430
-
1431
1335
  </xsl:template> <!-- refine_table-footer-cell-style -->
1432
1336
 
1433
1337
  <xsl:attribute-set name="table-note-style">
1434
1338
  <xsl:attribute name="font-size">10pt</xsl:attribute>
1435
1339
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1436
-
1437
1340
  </xsl:attribute-set><!-- table-note-style -->
1438
1341
 
1439
1342
  <xsl:template name="refine_table-note-style">
1440
-
1441
1343
  </xsl:template> <!-- refine_table-note-style -->
1442
1344
 
1443
1345
  <xsl:attribute-set name="table-fn-style">
1444
1346
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1445
-
1446
1347
  </xsl:attribute-set> <!-- table-fn-style -->
1447
1348
 
1448
1349
  <xsl:template name="refine_table-fn-style">
1449
-
1450
1350
  </xsl:template>
1451
1351
 
1452
1352
  <xsl:attribute-set name="table-fn-number-style">
1453
1353
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
1454
-
1455
1354
  </xsl:attribute-set> <!-- table-fn-number-style -->
1456
1355
 
1457
1356
  <xsl:attribute-set name="table-fmt-fn-label-style">
1458
1357
  <xsl:attribute name="font-size">80%</xsl:attribute>
1459
-
1460
1358
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
1461
1359
 
1462
1360
  <xsl:template name="refine_table-fmt-fn-label-style">
1463
-
1464
1361
  </xsl:template>
1465
1362
 
1466
1363
  <xsl:attribute-set name="fn-container-body-style">
1467
1364
  <xsl:attribute name="text-indent">0</xsl:attribute>
1468
1365
  <xsl:attribute name="start-indent">0</xsl:attribute>
1469
-
1470
1366
  </xsl:attribute-set>
1471
1367
 
1472
1368
  <xsl:attribute-set name="table-fn-body-style">
1473
-
1474
1369
  </xsl:attribute-set>
1475
1370
 
1476
1371
  <xsl:attribute-set name="figure-fn-number-style">
@@ -1480,17 +1375,14 @@
1480
1375
  <xsl:attribute-set name="figure-fmt-fn-label-style">
1481
1376
  <xsl:attribute name="font-size">80%</xsl:attribute>
1482
1377
  <xsl:attribute name="vertical-align">super</xsl:attribute>
1483
-
1484
1378
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
1485
1379
 
1486
1380
  <xsl:template name="refine_figure-fmt-fn-label-style">
1487
-
1488
1381
  </xsl:template>
1489
1382
 
1490
1383
  <xsl:attribute-set name="figure-fn-body-style">
1491
1384
  <xsl:attribute name="text-align">justify</xsl:attribute>
1492
1385
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1493
-
1494
1386
  </xsl:attribute-set>
1495
1387
  <!-- ========================== -->
1496
1388
  <!-- END Table styles -->
@@ -1501,43 +1393,34 @@
1501
1393
  <!-- ========================== -->
1502
1394
 
1503
1395
  <xsl:attribute-set name="dl-block-style">
1504
-
1505
1396
  </xsl:attribute-set>
1506
1397
 
1507
1398
  <xsl:attribute-set name="dt-row-style">
1508
-
1509
1399
  </xsl:attribute-set>
1510
1400
 
1511
1401
  <xsl:attribute-set name="dt-cell-style">
1512
-
1513
1402
  </xsl:attribute-set>
1514
1403
 
1515
1404
  <xsl:template name="refine_dt-cell-style">
1516
-
1517
1405
  </xsl:template> <!-- refine_dt-cell-style -->
1518
1406
 
1519
1407
  <xsl:attribute-set name="dt-block-style">
1520
1408
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
1521
-
1522
1409
  </xsl:attribute-set>
1523
1410
 
1524
1411
  <xsl:template name="refine_dt-block-style">
1525
-
1526
1412
  </xsl:template> <!-- refine_dt-block-style -->
1527
1413
 
1528
1414
  <xsl:attribute-set name="dl-name-style">
1529
1415
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1530
1416
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1531
-
1532
1417
  </xsl:attribute-set> <!-- dl-name-style -->
1533
1418
 
1534
1419
  <xsl:attribute-set name="dd-cell-style">
1535
1420
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
1536
-
1537
1421
  </xsl:attribute-set>
1538
1422
 
1539
1423
  <xsl:template name="refine_dd-cell-style">
1540
-
1541
1424
  </xsl:template> <!-- refine_dd-cell-style -->
1542
1425
 
1543
1426
  <!-- ========================== -->
@@ -1545,244 +1428,183 @@
1545
1428
  <!-- ========================== -->
1546
1429
 
1547
1430
  <xsl:attribute-set name="appendix-style">
1548
-
1549
1431
  </xsl:attribute-set>
1550
1432
 
1551
1433
  <xsl:attribute-set name="appendix-example-style">
1552
-
1553
1434
  </xsl:attribute-set>
1554
1435
 
1555
1436
  <xsl:attribute-set name="xref-style">
1556
-
1557
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1558
-
1437
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1559
1438
  </xsl:attribute-set>
1560
1439
 
1561
1440
  <xsl:attribute-set name="eref-style">
1562
-
1563
- <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1564
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1565
-
1441
+ <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1442
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1566
1443
  </xsl:attribute-set>
1567
1444
 
1568
1445
  <xsl:template name="refine_eref-style">
1569
1446
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
1570
1447
  <xsl:variable name="text" select="normalize-space()"/>
1571
-
1572
1448
  </xsl:template> <!-- refine_eref-style -->
1573
1449
 
1574
1450
  <xsl:attribute-set name="note-style">
1575
-
1576
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1577
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1578
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1579
- <xsl:attribute name="line-height">115%</xsl:attribute>
1580
-
1451
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1452
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1453
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1454
+ <xsl:attribute name="line-height">115%</xsl:attribute>
1581
1455
  </xsl:attribute-set>
1582
1456
 
1583
1457
  <xsl:template name="refine_note-style">
1584
-
1585
1458
  </xsl:template>
1586
1459
 
1587
1460
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
1588
1461
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
1589
1462
 
1590
1463
  <xsl:attribute-set name="note-name-style">
1591
-
1592
- <xsl:attribute name="padding-right">4mm</xsl:attribute>
1593
-
1464
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
1594
1465
  </xsl:attribute-set>
1595
1466
 
1596
1467
  <xsl:template name="refine_note-name-style">
1597
-
1598
1468
  </xsl:template> <!-- refine_note-name-style -->
1599
1469
 
1600
1470
  <xsl:attribute-set name="table-note-name-style">
1601
1471
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
1602
-
1603
1472
  </xsl:attribute-set>
1604
1473
 
1605
1474
  <xsl:template name="refine_table-note-name-style">
1606
-
1607
1475
  </xsl:template> <!-- refine_table-note-name-style -->
1608
1476
 
1609
1477
  <xsl:attribute-set name="note-p-style">
1610
-
1611
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1612
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1613
-
1478
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1479
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1614
1480
  </xsl:attribute-set>
1615
1481
 
1616
1482
  <xsl:attribute-set name="termnote-style">
1617
-
1618
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1619
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1620
-
1483
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1484
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1621
1485
  </xsl:attribute-set>
1622
1486
 
1623
1487
  <xsl:template name="refine_termnote-style">
1624
-
1625
1488
  </xsl:template> <!-- refine_termnote-style -->
1626
1489
 
1627
1490
  <xsl:attribute-set name="termnote-name-style">
1628
-
1629
1491
  </xsl:attribute-set>
1630
1492
 
1631
1493
  <xsl:template name="refine_termnote-name-style">
1632
-
1633
- <!-- <xsl:if test="$namespace = 'ieee'">
1634
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
1635
- </xsl:if> -->
1636
-
1637
1494
  </xsl:template>
1638
1495
 
1639
1496
  <xsl:attribute-set name="termnote-p-style">
1640
-
1641
1497
  </xsl:attribute-set>
1642
1498
 
1643
1499
  <xsl:attribute-set name="quote-style">
1644
1500
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
1645
1501
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
1646
-
1647
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1648
- <xsl:attribute name="margin-left">13mm</xsl:attribute>
1649
-
1502
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1503
+ <xsl:attribute name="margin-left">13mm</xsl:attribute>
1650
1504
  </xsl:attribute-set>
1651
1505
 
1652
1506
  <xsl:template name="refine_quote-style">
1653
-
1654
1507
  </xsl:template>
1655
1508
 
1656
1509
  <xsl:attribute-set name="quote-source-style">
1657
1510
  <xsl:attribute name="text-align">right</xsl:attribute>
1658
-
1659
- <xsl:attribute name="margin-right">25mm</xsl:attribute>
1660
-
1511
+ <xsl:attribute name="margin-right">25mm</xsl:attribute>
1661
1512
  </xsl:attribute-set>
1662
1513
 
1663
1514
  <xsl:attribute-set name="termsource-style">
1664
-
1665
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1666
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1667
-
1515
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1516
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1668
1517
  </xsl:attribute-set>
1669
1518
 
1670
1519
  <xsl:template name="refine_termsource-style">
1671
-
1672
1520
  </xsl:template> <!-- refine_termsource-style -->
1673
1521
 
1674
1522
  <xsl:attribute-set name="termsource-text-style">
1675
-
1676
1523
  </xsl:attribute-set>
1677
1524
 
1678
1525
  <xsl:attribute-set name="origin-style">
1679
-
1680
- <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1681
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1682
-
1526
+ <xsl:attribute name="color">rgb(33, 94, 159)</xsl:attribute>
1527
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1683
1528
  </xsl:attribute-set>
1684
1529
 
1685
1530
  <xsl:attribute-set name="term-style">
1686
-
1687
1531
  </xsl:attribute-set>
1688
1532
 
1689
1533
  <xsl:attribute-set name="term-name-style">
1690
1534
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1691
1535
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1692
-
1693
1536
  </xsl:attribute-set>
1694
1537
 
1695
1538
  <xsl:attribute-set name="figure-block-style">
1696
1539
  <xsl:attribute name="role">SKIP</xsl:attribute>
1697
-
1698
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1699
-
1540
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1700
1541
  </xsl:attribute-set>
1701
1542
 
1702
1543
  <xsl:template name="refine_figure-block-style">
1703
-
1704
1544
  </xsl:template>
1705
1545
 
1706
1546
  <xsl:attribute-set name="figure-style">
1707
-
1708
1547
  </xsl:attribute-set>
1709
1548
 
1710
1549
  <xsl:attribute-set name="figure-name-style">
1711
1550
  <xsl:attribute name="role">Caption</xsl:attribute>
1712
-
1713
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1714
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1715
- <xsl:attribute name="text-align">center</xsl:attribute>
1716
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
1717
- <xsl:attribute name="space-after">6pt</xsl:attribute>
1718
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1719
-
1551
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1552
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1553
+ <xsl:attribute name="text-align">center</xsl:attribute>
1554
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
1555
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
1556
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1720
1557
  </xsl:attribute-set>
1721
1558
 
1722
1559
  <xsl:template name="refine_figure-name-style">
1723
-
1724
1560
  </xsl:template> <!-- refine_figure-name-style -->
1725
1561
 
1726
1562
  <xsl:attribute-set name="figure-source-style">
1727
-
1728
1563
  </xsl:attribute-set>
1729
1564
 
1730
1565
  <!-- Formula's styles -->
1731
1566
  <xsl:attribute-set name="formula-style">
1732
1567
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
1733
1568
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1734
-
1735
1569
  </xsl:attribute-set> <!-- formula-style -->
1736
1570
 
1737
1571
  <xsl:attribute-set name="formula-stem-block-style">
1738
1572
  <xsl:attribute name="text-align">center</xsl:attribute>
1739
-
1740
- <xsl:attribute name="text-align">left</xsl:attribute>
1741
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
1742
-
1573
+ <xsl:attribute name="text-align">left</xsl:attribute>
1574
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
1743
1575
  </xsl:attribute-set> <!-- formula-stem-block-style -->
1744
1576
 
1745
1577
  <xsl:template name="refine_formula-stem-block-style">
1746
-
1747
1578
  </xsl:template> <!-- refine_formula-stem-block-style -->
1748
1579
 
1749
1580
  <xsl:attribute-set name="formula-stem-number-style">
1750
1581
  <xsl:attribute name="text-align">right</xsl:attribute>
1751
-
1752
1582
  </xsl:attribute-set> <!-- formula-stem-number-style -->
1753
1583
  <!-- End Formula's styles -->
1754
1584
 
1755
1585
  <xsl:template name="refine_formula-stem-number-style">
1756
-
1757
1586
  </xsl:template>
1758
1587
 
1759
1588
  <xsl:attribute-set name="image-style">
1760
1589
  <xsl:attribute name="role">SKIP</xsl:attribute>
1761
1590
  <xsl:attribute name="text-align">center</xsl:attribute>
1762
-
1763
1591
  </xsl:attribute-set>
1764
1592
 
1765
1593
  <xsl:template name="refine_image-style">
1766
-
1767
1594
  </xsl:template>
1768
1595
 
1769
1596
  <xsl:attribute-set name="figure-pseudocode-p-style">
1770
-
1771
1597
  </xsl:attribute-set>
1772
1598
 
1773
1599
  <xsl:attribute-set name="image-graphic-style">
1774
1600
  <xsl:attribute name="width">100%</xsl:attribute>
1775
1601
  <xsl:attribute name="content-height">100%</xsl:attribute>
1776
1602
  <xsl:attribute name="scaling">uniform</xsl:attribute>
1777
-
1778
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1779
-
1603
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
1780
1604
  </xsl:attribute-set>
1781
1605
 
1782
1606
  <xsl:attribute-set name="tt-style">
1783
-
1784
- <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1785
-
1607
+ <xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
1786
1608
  </xsl:attribute-set>
1787
1609
 
1788
1610
  <xsl:attribute-set name="sourcecode-name-style">
@@ -1791,54 +1613,43 @@
1791
1613
  <xsl:attribute name="text-align">center</xsl:attribute>
1792
1614
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1793
1615
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1794
-
1795
1616
  </xsl:attribute-set>
1796
1617
 
1797
1618
  <xsl:attribute-set name="preferred-block-style">
1798
-
1799
1619
  </xsl:attribute-set>
1800
1620
 
1801
1621
  <xsl:attribute-set name="preferred-term-style">
1802
1622
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1803
1623
  <xsl:attribute name="font-weight">bold</xsl:attribute>
1804
-
1805
- <xsl:attribute name="line-height">1</xsl:attribute>
1806
-
1624
+ <xsl:attribute name="line-height">1</xsl:attribute>
1807
1625
  </xsl:attribute-set>
1808
1626
 
1809
1627
  <xsl:attribute-set name="domain-style">
1810
-
1811
1628
  </xsl:attribute-set>
1812
1629
 
1813
1630
  <xsl:attribute-set name="admitted-style">
1814
-
1815
1631
  </xsl:attribute-set>
1816
1632
 
1817
1633
  <xsl:attribute-set name="deprecates-style">
1818
-
1819
1634
  </xsl:attribute-set>
1820
1635
 
1821
1636
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
1822
1637
  </xsl:attribute-set>
1823
1638
 
1824
1639
  <xsl:attribute-set name="definition-style">
1825
-
1826
- <xsl:attribute name="space-after">6pt</xsl:attribute>
1827
-
1640
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
1828
1641
  </xsl:attribute-set>
1829
1642
 
1830
1643
  <xsl:variable name="color-added-text">
1831
1644
  <xsl:text>rgb(0, 255, 0)</xsl:text>
1832
1645
  </xsl:variable>
1833
1646
  <xsl:attribute-set name="add-style">
1834
-
1835
- <xsl:attribute name="color">red</xsl:attribute>
1836
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1837
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1647
+ <xsl:attribute name="color">red</xsl:attribute>
1648
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1649
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
1838
1650
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1839
1651
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
1840
1652
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1841
-
1842
1653
  </xsl:attribute-set>
1843
1654
 
1844
1655
  <xsl:variable name="add-style">
@@ -1858,53 +1669,40 @@
1858
1669
 
1859
1670
  <xsl:attribute-set name="mathml-style">
1860
1671
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
1861
-
1862
1672
  </xsl:attribute-set>
1863
1673
 
1864
1674
  <xsl:template name="refine_mathml-style">
1865
-
1866
1675
  </xsl:template>
1867
1676
 
1868
1677
  <xsl:attribute-set name="list-style">
1869
-
1870
- <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1871
- <xsl:attribute name="line-height">145%</xsl:attribute>
1872
-
1678
+ <xsl:attribute name="provisional-distance-between-starts">6.5mm</xsl:attribute>
1679
+ <xsl:attribute name="line-height">145%</xsl:attribute>
1873
1680
  </xsl:attribute-set> <!-- list-style -->
1874
1681
 
1875
1682
  <xsl:template name="refine_list-style">
1876
-
1877
1683
  </xsl:template> <!-- refine_list-style -->
1878
1684
 
1879
1685
  <xsl:attribute-set name="list-name-style">
1880
1686
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1881
-
1882
1687
  </xsl:attribute-set> <!-- list-name-style -->
1883
1688
 
1884
1689
  <xsl:attribute-set name="list-item-style">
1885
-
1886
1690
  </xsl:attribute-set>
1887
1691
 
1888
1692
  <xsl:template name="refine_list-item-style">
1889
-
1890
1693
  </xsl:template> <!-- refine_list-item-style -->
1891
1694
 
1892
1695
  <xsl:attribute-set name="list-item-label-style">
1893
-
1894
1696
  </xsl:attribute-set>
1895
1697
 
1896
1698
  <xsl:template name="refine_list-item-label-style">
1897
-
1898
1699
  </xsl:template> <!-- refine_list-item-label-style -->
1899
1700
 
1900
1701
  <xsl:attribute-set name="list-item-body-style">
1901
-
1902
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
1903
-
1702
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
1904
1703
  </xsl:attribute-set>
1905
1704
 
1906
1705
  <xsl:template name="refine_list-item-body-style">
1907
-
1908
1706
  </xsl:template> <!-- refine_list-item-body-style -->
1909
1707
 
1910
1708
  <xsl:attribute-set name="toc-style">
@@ -1918,7 +1716,6 @@
1918
1716
  </xsl:attribute-set>
1919
1717
 
1920
1718
  <xsl:template name="refine_fn-reference-style">
1921
-
1922
1719
  </xsl:template> <!-- refine_fn-reference-style -->
1923
1720
 
1924
1721
  <xsl:attribute-set name="fn-style">
@@ -1927,10 +1724,8 @@
1927
1724
 
1928
1725
  <xsl:attribute-set name="fn-num-style">
1929
1726
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
1930
-
1931
- <xsl:attribute name="font-size">65%</xsl:attribute>
1932
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1933
-
1727
+ <xsl:attribute name="font-size">65%</xsl:attribute>
1728
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1934
1729
  </xsl:attribute-set>
1935
1730
 
1936
1731
  <xsl:attribute-set name="fn-body-style">
@@ -1938,135 +1733,103 @@
1938
1733
  <xsl:attribute name="font-style">normal</xsl:attribute>
1939
1734
  <xsl:attribute name="text-indent">0</xsl:attribute>
1940
1735
  <xsl:attribute name="start-indent">0</xsl:attribute>
1941
-
1942
- <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1943
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1944
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1945
- <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
1946
- <xsl:attribute name="text-align">left</xsl:attribute>
1947
-
1736
+ <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1737
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
1738
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1739
+ <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
1740
+ <xsl:attribute name="text-align">left</xsl:attribute>
1948
1741
  </xsl:attribute-set>
1949
1742
 
1950
1743
  <xsl:template name="refine_fn-body-style">
1951
-
1952
1744
  </xsl:template> <!-- refine_fn-body-style -->
1953
1745
 
1954
1746
  <xsl:attribute-set name="fn-body-num-style">
1955
1747
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
1956
-
1957
- <xsl:attribute name="font-size">60%</xsl:attribute>
1958
- <xsl:attribute name="vertical-align">super</xsl:attribute>
1959
-
1748
+ <xsl:attribute name="font-size">60%</xsl:attribute>
1749
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
1960
1750
  </xsl:attribute-set> <!-- fn-body-num-style -->
1961
1751
 
1962
1752
  <xsl:template name="refine_fn-body-num-style">
1963
-
1964
1753
  </xsl:template> <!-- refine_fn-body-num-style -->
1965
1754
 
1966
1755
  <!-- admonition -->
1967
1756
  <xsl:attribute-set name="admonition-style">
1968
-
1969
- <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
1970
- <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
1971
- <xsl:attribute name="margin-left">16mm</xsl:attribute>
1972
- <xsl:attribute name="margin-right">16mm</xsl:attribute>
1973
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1974
-
1757
+ <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
1758
+ <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
1759
+ <xsl:attribute name="margin-left">16mm</xsl:attribute>
1760
+ <xsl:attribute name="margin-right">16mm</xsl:attribute>
1761
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1975
1762
  </xsl:attribute-set> <!-- admonition-style -->
1976
1763
 
1977
1764
  <xsl:attribute-set name="admonition-container-style">
1978
1765
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
1979
1766
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
1980
-
1981
- <xsl:attribute name="padding">2mm</xsl:attribute>
1982
- <xsl:attribute name="padding-top">3mm</xsl:attribute>
1983
-
1767
+ <xsl:attribute name="padding">2mm</xsl:attribute>
1768
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
1984
1769
  </xsl:attribute-set> <!-- admonition-container-style -->
1985
1770
 
1986
1771
  <xsl:attribute-set name="admonition-name-style">
1987
1772
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1988
-
1989
- <xsl:attribute name="font-size">11pt</xsl:attribute>
1990
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1991
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1992
- <xsl:attribute name="font-style">italic</xsl:attribute>
1993
- <xsl:attribute name="text-align">center</xsl:attribute>
1994
-
1773
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
1774
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1775
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1776
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1777
+ <xsl:attribute name="text-align">center</xsl:attribute>
1995
1778
  </xsl:attribute-set> <!-- admonition-name-style -->
1996
1779
 
1997
1780
  <xsl:attribute-set name="admonition-p-style">
1998
-
1999
- <xsl:attribute name="font-style">italic</xsl:attribute>
2000
-
1781
+ <xsl:attribute name="font-style">italic</xsl:attribute>
2001
1782
  </xsl:attribute-set> <!-- admonition-p-style -->
2002
1783
  <!-- end admonition -->
2003
1784
 
2004
1785
  <!-- bibitem in Normative References (references/@normative="true") -->
2005
1786
  <xsl:attribute-set name="bibitem-normative-style">
2006
-
2007
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2008
- <xsl:attribute name="start-indent">12mm</xsl:attribute>
2009
- <xsl:attribute name="text-indent">-12mm</xsl:attribute>
2010
- <xsl:attribute name="line-height">145%</xsl:attribute>
2011
-
1787
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1788
+ <xsl:attribute name="start-indent">12mm</xsl:attribute>
1789
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
1790
+ <xsl:attribute name="line-height">145%</xsl:attribute>
2012
1791
  </xsl:attribute-set> <!-- bibitem-normative-style -->
2013
1792
 
2014
1793
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
2015
1794
  <xsl:attribute-set name="bibitem-normative-list-style">
2016
1795
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
2017
1796
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2018
-
2019
- <!-- <xsl:if test="$namespace = 'ieee'">
2020
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2021
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
2022
- </xsl:if> -->
2023
-
2024
1797
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
2025
1798
 
2026
1799
  <xsl:attribute-set name="bibitem-non-normative-style">
2027
-
2028
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2029
- <xsl:attribute name="line-height">145%</xsl:attribute>
2030
-
1800
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1801
+ <xsl:attribute name="line-height">145%</xsl:attribute>
2031
1802
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
2032
1803
 
2033
1804
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
2034
1805
  <xsl:attribute-set name="bibitem-non-normative-list-style">
2035
1806
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
2036
1807
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2037
-
2038
1808
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
2039
1809
 
2040
1810
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
2041
1811
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2042
-
2043
1812
  </xsl:attribute-set>
2044
1813
 
2045
1814
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
2046
1815
  <xsl:attribute-set name="bibitem-normative-list-body-style">
2047
-
2048
1816
  </xsl:attribute-set>
2049
1817
 
2050
1818
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
2051
-
2052
1819
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
2053
1820
 
2054
1821
  <!-- footnote reference number for bibitem, in the text -->
2055
1822
  <xsl:attribute-set name="bibitem-note-fn-style">
2056
1823
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
2057
1824
  <xsl:attribute name="font-size">65%</xsl:attribute>
2058
-
2059
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2060
-
1825
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2061
1826
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
2062
1827
 
2063
1828
  <!-- footnote number on the page bottom -->
2064
1829
  <xsl:attribute-set name="bibitem-note-fn-number-style">
2065
1830
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
2066
-
2067
- <xsl:attribute name="font-size">60%</xsl:attribute>
2068
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2069
-
1831
+ <xsl:attribute name="font-size">60%</xsl:attribute>
1832
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2070
1833
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
2071
1834
 
2072
1835
  <!-- footnote body (text) on the page bottom -->
@@ -2074,16 +1837,12 @@
2074
1837
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2075
1838
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2076
1839
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
2077
-
2078
- <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
2079
- <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
2080
-
1840
+ <xsl:attribute name="font-family">Azo Sans Lt</xsl:attribute>
1841
+ <xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
2081
1842
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
2082
1843
 
2083
1844
  <xsl:attribute-set name="references-non-normative-style">
2084
-
2085
- <xsl:attribute name="line-height">145%</xsl:attribute>
2086
-
1845
+ <xsl:attribute name="line-height">145%</xsl:attribute>
2087
1846
  </xsl:attribute-set> <!-- references-non-normative-style -->
2088
1847
 
2089
1848
  <!-- Highlight.js syntax GitHub styles -->
@@ -2243,12 +2002,10 @@
2243
2002
  <!-- Index section styles -->
2244
2003
  <xsl:attribute-set name="indexsect-title-style">
2245
2004
  <xsl:attribute name="role">H1</xsl:attribute>
2246
-
2247
2005
  </xsl:attribute-set>
2248
2006
 
2249
2007
  <xsl:attribute-set name="indexsect-clause-title-style">
2250
2008
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2251
-
2252
2009
  </xsl:attribute-set>
2253
2010
 
2254
2011
  <!-- End Index section styles -->
@@ -2325,47 +2082,47 @@
2325
2082
  </xsl:template>
2326
2083
 
2327
2084
  <xsl:template name="processTables_Contents">
2328
- <tables>
2085
+ <mn:tables>
2329
2086
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
2330
2087
  <xsl:choose>
2331
2088
  <xsl:when test="*[local-name() = 'fmt-name']">
2332
2089
  <xsl:variable name="fmt_name">
2333
2090
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
2334
2091
  </xsl:variable>
2335
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
2092
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
2336
2093
  <xsl:copy-of select="$fmt_name"/>
2337
- </table>
2094
+ </mn:table>
2338
2095
  </xsl:when>
2339
2096
  <xsl:otherwise>
2340
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
2097
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
2341
2098
  <xsl:copy-of select="*[local-name() = 'name']"/>
2342
- </table>
2099
+ </mn:table>
2343
2100
  </xsl:otherwise>
2344
2101
  </xsl:choose>
2345
2102
  </xsl:for-each>
2346
- </tables>
2103
+ </mn:tables>
2347
2104
  </xsl:template>
2348
2105
 
2349
2106
  <xsl:template name="processFigures_Contents">
2350
- <figures>
2107
+ <mn:figures>
2351
2108
  <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) != '']">
2352
2109
  <xsl:choose>
2353
2110
  <xsl:when test="*[local-name() = 'fmt-name']">
2354
2111
  <xsl:variable name="fmt_name">
2355
2112
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
2356
2113
  </xsl:variable>
2357
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
2114
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
2358
2115
  <xsl:copy-of select="$fmt_name"/>
2359
- </figure>
2116
+ </mn:figure>
2360
2117
  </xsl:when>
2361
2118
  <xsl:otherwise>
2362
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
2119
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
2363
2120
  <xsl:copy-of select="*[local-name() = 'name']"/>
2364
- </figure>
2121
+ </mn:figure>
2365
2122
  </xsl:otherwise>
2366
2123
  </xsl:choose>
2367
2124
  </xsl:for-each>
2368
- </figures>
2125
+ </mn:figures>
2369
2126
  </xsl:template>
2370
2127
 
2371
2128
  <xsl:template name="processPrefaceSectionsDefault">
@@ -2384,7 +2141,6 @@
2384
2141
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2385
2142
  <xsl:sort select="@displayorder" data-type="number"/>
2386
2143
  <xsl:apply-templates select="."/>
2387
-
2388
2144
  </xsl:for-each>
2389
2145
 
2390
2146
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -2491,7 +2247,6 @@
2491
2247
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
2492
2248
  <xsl:sort select="@displayorder" data-type="number"/>
2493
2249
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
2494
-
2495
2250
  </xsl:for-each>
2496
2251
  </xsl:element>
2497
2252
  </xsl:element>
@@ -2625,7 +2380,6 @@
2625
2380
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
2626
2381
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
2627
2382
  </xsl:apply-templates>
2628
-
2629
2383
  </xsl:for-each>
2630
2384
  </xsl:element>
2631
2385
 
@@ -2665,19 +2419,17 @@
2665
2419
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2666
2420
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
2667
2421
  <xsl:template match="text()" name="text">
2668
-
2669
- <xsl:choose>
2670
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2671
- <xsl:otherwise>
2672
- <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))"/>
2673
- <xsl:call-template name="replace_fo_inline_tags">
2674
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2675
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2676
- <xsl:with-param name="text" select="$text"/>
2677
- </xsl:call-template>
2678
- </xsl:otherwise>
2679
- </xsl:choose>
2680
-
2422
+ <xsl:choose>
2423
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2424
+ <xsl:otherwise>
2425
+ <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))"/>
2426
+ <xsl:call-template name="replace_fo_inline_tags">
2427
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2428
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2429
+ <xsl:with-param name="text" select="$text"/>
2430
+ </xsl:call-template>
2431
+ </xsl:otherwise>
2432
+ </xsl:choose>
2681
2433
  </xsl:template>
2682
2434
 
2683
2435
  <xsl:template name="replace_fo_inline_tags">
@@ -2731,7 +2483,7 @@
2731
2483
  <xsl:with-param name="keep_sep">true</xsl:with-param>
2732
2484
  </xsl:call-template>
2733
2485
  </xsl:variable>
2734
- <xsl:for-each select="xalan:nodeset($items)/item">
2486
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
2735
2487
  <xsl:choose>
2736
2488
  <xsl:when test=". = $sep">
2737
2489
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -2760,17 +2512,13 @@
2760
2512
  </xsl:template> <!-- copyright-statement -->
2761
2513
 
2762
2514
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
2763
-
2764
- <!-- process in the template 'title' -->
2765
- <xsl:call-template name="title"/>
2766
-
2515
+ <!-- process in the template 'title' -->
2516
+ <xsl:call-template name="title"/>
2767
2517
  </xsl:template> <!-- copyright-statement//title -->
2768
2518
 
2769
2519
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
2770
-
2771
- <!-- process in the template 'paragraph' -->
2772
- <xsl:call-template name="paragraph"/>
2773
-
2520
+ <!-- process in the template 'paragraph' -->
2521
+ <xsl:call-template name="paragraph"/>
2774
2522
  </xsl:template> <!-- copyright-statement//p -->
2775
2523
 
2776
2524
  <xsl:template match="*[local-name()='license-statement']">
@@ -2780,42 +2528,34 @@
2780
2528
  </xsl:template> <!-- license-statement -->
2781
2529
 
2782
2530
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
2783
-
2784
- <!-- process in the template 'title' -->
2785
- <xsl:call-template name="title"/>
2786
-
2531
+ <!-- process in the template 'title' -->
2532
+ <xsl:call-template name="title"/>
2787
2533
  </xsl:template> <!-- license-statement/title -->
2788
2534
 
2789
2535
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
2790
-
2791
- <!-- process in the template 'paragraph' -->
2792
- <xsl:call-template name="paragraph"/>
2793
-
2536
+ <!-- process in the template 'paragraph' -->
2537
+ <xsl:call-template name="paragraph"/>
2794
2538
  </xsl:template> <!-- license-statement/p -->
2795
2539
 
2796
2540
  <xsl:template match="*[local-name()='legal-statement']">
2797
2541
  <xsl:param name="isLegacy">false</xsl:param>
2798
2542
  <fo:block xsl:use-attribute-sets="legal-statement-style">
2799
-
2800
2543
  <xsl:apply-templates/>
2801
2544
  </fo:block>
2802
2545
  </xsl:template> <!-- legal-statement -->
2803
2546
 
2804
2547
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
2805
-
2806
- <!-- process in the template 'title' -->
2807
- <xsl:call-template name="title"/>
2548
+ <!-- process in the template 'title' -->
2549
+ <xsl:call-template name="title"/>
2808
2550
 
2809
2551
  </xsl:template> <!-- legal-statement/title -->
2810
2552
 
2811
2553
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
2812
2554
  <xsl:param name="margin"/>
2813
-
2814
- <!-- process in the template 'paragraph' -->
2815
- <xsl:call-template name="paragraph">
2816
- <xsl:with-param name="margin" select="$margin"/>
2817
- </xsl:call-template>
2818
-
2555
+ <!-- process in the template 'paragraph' -->
2556
+ <xsl:call-template name="paragraph">
2557
+ <xsl:with-param name="margin" select="$margin"/>
2558
+ </xsl:call-template>
2819
2559
  </xsl:template> <!-- legal-statement/p -->
2820
2560
 
2821
2561
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -2825,20 +2565,16 @@
2825
2565
  </xsl:template> <!-- feedback-statement -->
2826
2566
 
2827
2567
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
2828
-
2829
- <!-- process in the template 'title' -->
2830
- <xsl:call-template name="title"/>
2831
-
2568
+ <!-- process in the template 'title' -->
2569
+ <xsl:call-template name="title"/>
2832
2570
  </xsl:template>
2833
2571
 
2834
2572
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
2835
2573
  <xsl:param name="margin"/>
2836
-
2837
- <!-- process in the template 'paragraph' -->
2838
- <xsl:call-template name="paragraph">
2839
- <xsl:with-param name="margin" select="$margin"/>
2840
- </xsl:call-template>
2841
-
2574
+ <!-- process in the template 'paragraph' -->
2575
+ <xsl:call-template name="paragraph">
2576
+ <xsl:with-param name="margin" select="$margin"/>
2577
+ </xsl:call-template>
2842
2578
  </xsl:template>
2843
2579
 
2844
2580
  <!-- ================================= -->
@@ -2891,7 +2627,6 @@
2891
2627
  <xsl:template match="*[local-name()='table']" name="table">
2892
2628
 
2893
2629
  <xsl:variable name="table-preamble">
2894
-
2895
2630
  </xsl:variable>
2896
2631
 
2897
2632
  <xsl:variable name="table">
@@ -2909,8 +2644,7 @@
2909
2644
 
2910
2645
  <!-- Display table's name before table as standalone block -->
2911
2646
  <!-- $namespace = 'iso' or -->
2912
-
2913
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
2647
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
2914
2648
 
2915
2649
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
2916
2650
 
@@ -2963,8 +2697,7 @@
2963
2697
 
2964
2698
  <xsl:variable name="table_width_default">100%</xsl:variable>
2965
2699
  <xsl:variable name="table_width">
2966
- <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
2967
- <xsl:value-of select="$table_width_default"/>
2700
+ <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --><xsl:value-of select="$table_width_default"/>
2968
2701
  </xsl:variable>
2969
2702
 
2970
2703
  <xsl:variable name="table_attributes">
@@ -3107,27 +2840,25 @@
3107
2840
  <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
3108
2841
 
3109
2842
  <!-- centered table when table name is centered (see table-name-style) -->
3110
-
3111
- <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
3112
-
3113
- <fo:table-column column-width="proportional-column-width(1)"/>
3114
- <fo:table-column column-width="{@width}"/>
3115
- <fo:table-column column-width="proportional-column-width(1)"/>
3116
- <fo:table-body role="SKIP">
3117
- <fo:table-row role="SKIP">
3118
- <fo:table-cell column-number="2" role="SKIP">
3119
- <xsl:copy-of select="$table-preamble"/>
3120
- <fo:block role="SKIP">
3121
- <xsl:call-template name="setTrackChangesStyles">
3122
- <xsl:with-param name="isAdded" select="$isAdded"/>
3123
- <xsl:with-param name="isDeleted" select="$isDeleted"/>
3124
- </xsl:call-template>
3125
- <xsl:copy-of select="$table"/>
3126
- </fo:block>
3127
- </fo:table-cell>
3128
- </fo:table-row>
3129
- </fo:table-body>
3130
- </fo:table>
2843
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
2844
+ <fo:table-column column-width="proportional-column-width(1)"/>
2845
+ <fo:table-column column-width="{@width}"/>
2846
+ <fo:table-column column-width="proportional-column-width(1)"/>
2847
+ <fo:table-body role="SKIP">
2848
+ <fo:table-row role="SKIP">
2849
+ <fo:table-cell column-number="2" role="SKIP">
2850
+ <xsl:copy-of select="$table-preamble"/>
2851
+ <fo:block role="SKIP">
2852
+ <xsl:call-template name="setTrackChangesStyles">
2853
+ <xsl:with-param name="isAdded" select="$isAdded"/>
2854
+ <xsl:with-param name="isDeleted" select="$isDeleted"/>
2855
+ </xsl:call-template>
2856
+ <xsl:copy-of select="$table"/>
2857
+ </fo:block>
2858
+ </fo:table-cell>
2859
+ </fo:table-row>
2860
+ </fo:table-body>
2861
+ </fo:table>
3131
2862
 
3132
2863
  </xsl:when>
3133
2864
  <xsl:otherwise>
@@ -3153,7 +2884,6 @@
3153
2884
  </xsl:template>
3154
2885
 
3155
2886
  <xsl:template name="setBordersTableArray">
3156
-
3157
2887
  </xsl:template>
3158
2888
 
3159
2889
  <!-- table/name-->
@@ -3162,51 +2892,50 @@
3162
2892
  <xsl:param name="cols-count"/>
3163
2893
  <xsl:if test="normalize-space() != ''">
3164
2894
 
3165
- <fo:block xsl:use-attribute-sets="table-name-style">
3166
-
3167
- <xsl:call-template name="refine_table-name-style">
3168
- <xsl:with-param name="continued" select="$continued"/>
3169
- </xsl:call-template>
2895
+ <fo:block xsl:use-attribute-sets="table-name-style">
3170
2896
 
3171
- <xsl:choose>
3172
- <xsl:when test="$continued = 'true'">
2897
+ <xsl:call-template name="refine_table-name-style">
2898
+ <xsl:with-param name="continued" select="$continued"/>
2899
+ </xsl:call-template>
3173
2900
 
3174
- </xsl:when>
3175
- <xsl:otherwise>
3176
- <xsl:apply-templates/>
3177
- </xsl:otherwise>
3178
- </xsl:choose>
2901
+ <xsl:choose>
2902
+ <xsl:when test="$continued = 'true'">
2903
+ </xsl:when>
2904
+ <xsl:otherwise>
2905
+ <xsl:apply-templates/>
2906
+ </xsl:otherwise>
2907
+ </xsl:choose>
3179
2908
 
3180
- </fo:block>
2909
+ </fo:block>
3181
2910
 
3182
- <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
3183
- <xsl:if test="$continued = 'true'">
2911
+ <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
2912
+ <xsl:if test="$continued = 'true'">
3184
2913
 
3185
- <!-- to prevent the error 'THead element may contain only TR elements' -->
2914
+ <!-- to prevent the error 'THead element may contain only TR elements' -->
3186
2915
 
3187
- <xsl:choose>
3188
- <xsl:when test="string(number($cols-count)) != 'NaN'">
3189
- <fo:table width="100%" table-layout="fixed" role="SKIP">
3190
- <fo:table-body role="SKIP">
3191
- <fo:table-row>
3192
- <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
3193
- <fo:block text-align="right" role="SKIP">
3194
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
3195
- </fo:block>
3196
- </fo:table-cell>
3197
- </fo:table-row>
3198
- </fo:table-body>
3199
- </fo:table>
3200
- </xsl:when>
3201
- <xsl:otherwise>
3202
- <fo:block text-align="right">
3203
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
3204
- </fo:block>
3205
- </xsl:otherwise>
3206
- </xsl:choose>
2916
+ <xsl:choose>
2917
+ <xsl:when test="string(number($cols-count)) != 'NaN'">
2918
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
2919
+ <fo:table-body role="SKIP">
2920
+ <fo:table-row>
2921
+ <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
2922
+ <fo:block text-align="right" role="SKIP">
2923
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
2924
+ </fo:block>
2925
+ </fo:table-cell>
2926
+ </fo:table-row>
2927
+ </fo:table-body>
2928
+ </fo:table>
2929
+ </xsl:when>
2930
+ <xsl:otherwise>
2931
+ <fo:block text-align="right">
2932
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
2933
+ </fo:block>
2934
+ </xsl:otherwise>
2935
+ </xsl:choose>
3207
2936
 
3208
- </xsl:if>
3209
- <!-- </xsl:if> -->
2937
+ </xsl:if>
2938
+ <!-- </xsl:if> -->
3210
2939
 
3211
2940
  </xsl:if>
3212
2941
  </xsl:template> <!-- table/name -->
@@ -3581,7 +3310,6 @@
3581
3310
  <xsl:template match="*[local-name()='thead']">
3582
3311
  <xsl:param name="cols-count"/>
3583
3312
  <fo:table-header>
3584
-
3585
3313
  <xsl:apply-templates/>
3586
3314
  </fo:table-header>
3587
3315
  </xsl:template> <!-- thead -->
@@ -3595,21 +3323,20 @@
3595
3323
 
3596
3324
  <xsl:call-template name="refine_table-header-title-style"/>
3597
3325
 
3598
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
3599
- <xsl:with-param name="continued">true</xsl:with-param>
3600
- <xsl:with-param name="cols-count" select="$cols-count"/>
3601
- </xsl:apply-templates>
3326
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
3327
+ <xsl:with-param name="continued">true</xsl:with-param>
3328
+ <xsl:with-param name="cols-count" select="$cols-count"/>
3329
+ </xsl:apply-templates>
3602
3330
 
3603
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
3604
- <fo:block role="SKIP"/>
3605
- </xsl:if>
3331
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
3332
+ <fo:block role="SKIP"/>
3333
+ </xsl:if>
3606
3334
 
3607
3335
  </fo:table-cell>
3608
3336
  </fo:table-row>
3609
3337
  </xsl:template> <!-- table-header-title -->
3610
3338
 
3611
3339
  <xsl:template name="refine_table-header-title-style">
3612
-
3613
3340
  </xsl:template> <!-- refine_table-header-title-style -->
3614
3341
 
3615
3342
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -3639,7 +3366,6 @@
3639
3366
  <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']"/>
3640
3367
 
3641
3368
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
3642
-
3643
3369
  </xsl:variable>
3644
3370
 
3645
3371
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -3701,26 +3427,19 @@
3701
3427
  <xsl:call-template name="setBordersTableArray"/>
3702
3428
 
3703
3429
  <!-- fn will be processed inside 'note' processing -->
3704
-
3705
- <!-- for BSI (not PAS) display Notes before footnotes -->
3706
-
3707
- <!-- except gb and bsi -->
3708
-
3709
- <xsl:apply-templates select="../*[local-name()='p']"/>
3710
- <xsl:apply-templates select="../*[local-name()='dl']"/>
3711
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
3712
- <xsl:apply-templates select="../*[local-name()='example']"/>
3713
- <xsl:apply-templates select="../*[local-name()='source']"/>
3430
+ <xsl:apply-templates select="../*[local-name()='p']"/>
3431
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
3432
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
3433
+ <xsl:apply-templates select="../*[local-name()='example']"/>
3434
+ <xsl:apply-templates select="../*[local-name()='source']"/>
3714
3435
 
3715
3436
  <xsl:variable name="isDisplayRowSeparator">
3716
-
3717
3437
  </xsl:variable>
3718
3438
 
3719
3439
  <!-- horizontal row separator -->
3720
3440
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
3721
3441
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
3722
3442
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
3723
-
3724
3443
  <xsl:call-template name="setBordersTableArray"/>
3725
3444
  <fo:block font-size="1pt"> </fo:block>
3726
3445
  </fo:block-container>
@@ -3728,11 +3447,8 @@
3728
3447
  </xsl:if>
3729
3448
 
3730
3449
  <!-- fn processing -->
3731
-
3732
- <!-- <xsl:call-template name="table_fn_display" /> -->
3733
- <xsl:copy-of select="$table_fn_block"/>
3734
-
3735
- <!-- for PAS display Notes after footnotes -->
3450
+ <!-- <xsl:call-template name="table_fn_display" /> -->
3451
+ <xsl:copy-of select="$table_fn_block"/>
3736
3452
 
3737
3453
  </fo:table-cell>
3738
3454
  </fo:table-row>
@@ -3859,7 +3575,7 @@
3859
3575
  <xsl:with-param name="pText" select="$border_under_row_"/>
3860
3576
  </xsl:call-template>
3861
3577
  </xsl:variable>
3862
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
3578
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
3863
3579
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
3864
3580
  </xsl:if>
3865
3581
  </xsl:when>
@@ -3976,7 +3692,7 @@
3976
3692
  </xsl:variable>
3977
3693
  <xsl:variable name="quot">"</xsl:variable>
3978
3694
  <xsl:variable name="styles_">
3979
- <xsl:for-each select="xalan:nodeset($styles__)/item">
3695
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
3980
3696
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
3981
3697
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
3982
3698
  <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'">
@@ -4026,9 +3742,7 @@
4026
3742
  <fo:block role="SKIP">
4027
3743
 
4028
3744
  <xsl:if test="$isGenerateTableIF = 'true'">
4029
-
4030
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
4031
-
3745
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
4032
3746
  </xsl:if>
4033
3747
 
4034
3748
  <xsl:apply-templates/>
@@ -4043,25 +3757,23 @@
4043
3757
 
4044
3758
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
4045
3759
  <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">
3760
+ <xsl:call-template name="setNamedDestination"/>
3761
+ <fo:block xsl:use-attribute-sets="table-note-style">
3762
+ <xsl:copy-of select="@id"/>
4046
3763
 
4047
- <xsl:call-template name="setNamedDestination"/>
4048
- <fo:block xsl:use-attribute-sets="table-note-style">
4049
- <xsl:copy-of select="@id"/>
4050
-
4051
- <xsl:call-template name="refine_table-note-style"/>
4052
-
4053
- <!-- Table's note/example name (NOTE, for example) -->
4054
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
3764
+ <xsl:call-template name="refine_table-note-style"/>
4055
3765
 
4056
- <xsl:call-template name="refine_table-note-name-style"/>
3766
+ <!-- Table's note/example name (NOTE, for example) -->
3767
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
4057
3768
 
4058
- <xsl:apply-templates select="*[local-name() = 'name']"/>
3769
+ <xsl:call-template name="refine_table-note-name-style"/>
4059
3770
 
4060
- </fo:inline>
3771
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
4061
3772
 
4062
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
4063
- </fo:block>
3773
+ </fo:inline>
4064
3774
 
3775
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3776
+ </fo:block>
4065
3777
  </xsl:template> <!-- table/note -->
4066
3778
 
4067
3779
  <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">
@@ -4106,9 +3818,7 @@
4106
3818
  <xsl:variable name="current_fn_number" select="@reference"/>
4107
3819
 
4108
3820
  <xsl:variable name="current_fn_number_text">
4109
-
4110
- <xsl:value-of select="$current_fn_number"/>
4111
-
3821
+ <xsl:value-of select="$current_fn_number"/>
4112
3822
  </xsl:variable>
4113
3823
 
4114
3824
  <xsl:variable name="ref_id" select="@target"/>
@@ -4120,12 +3830,10 @@
4120
3830
  <xsl:choose>
4121
3831
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
4122
3832
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
4123
-
4124
3833
  </fn_styles>
4125
3834
  </xsl:when>
4126
3835
  <xsl:otherwise>
4127
3836
  <fn_styles xsl:use-attribute-sets="fn-num-style">
4128
-
4129
3837
  </fn_styles>
4130
3838
  </xsl:otherwise>
4131
3839
  </xsl:choose>
@@ -4143,7 +3851,6 @@
4143
3851
  <xsl:with-param name="element">
4144
3852
  <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 -->
4145
3853
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4146
-
4147
3854
  <xsl:copy-of select="$current_fn_number_text"/>
4148
3855
 
4149
3856
  </fo:inline>
@@ -4181,10 +3888,9 @@
4181
3888
  <here><xsl:copy-of select="$footnotes"/></here> -->
4182
3889
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
4183
3890
  </xsl:variable>
4184
-
4185
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4186
- <xsl:copy-of select="$fn_block"/>
4187
- </fo:block>
3891
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
3892
+ <xsl:copy-of select="$fn_block"/>
3893
+ </fo:block>
4188
3894
 
4189
3895
  </fo:block-container>
4190
3896
  </fo:footnote-body>
@@ -4261,21 +3967,20 @@
4261
3967
  <xsl:variable name="reference" select="@reference"/>
4262
3968
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
4263
3969
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
3970
+ <fo:block xsl:use-attribute-sets="table-fn-style">
3971
+ <xsl:copy-of select="@id"/>
3972
+ <xsl:call-template name="refine_table-fn-style"/>
4264
3973
 
4265
- <fo:block xsl:use-attribute-sets="table-fn-style">
4266
- <xsl:copy-of select="@id"/>
4267
- <xsl:call-template name="refine_table-fn-style"/>
4268
-
4269
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
4270
- <xsl:with-param name="process">true</xsl:with-param>
4271
- </xsl:apply-templates>
3974
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
3975
+ <xsl:with-param name="process">true</xsl:with-param>
3976
+ </xsl:apply-templates>
4272
3977
 
4273
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
4274
- <!-- <xsl:copy-of select="./node()"/> -->
4275
- <xsl:apply-templates/>
4276
- </fo:inline>
3978
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
3979
+ <!-- <xsl:copy-of select="./node()"/> -->
3980
+ <xsl:apply-templates/>
3981
+ </fo:inline>
4277
3982
 
4278
- </fo:block>
3983
+ </fo:block>
4279
3984
 
4280
3985
  <!-- </xsl:if> -->
4281
3986
  </xsl:for-each>
@@ -4328,7 +4033,6 @@
4328
4033
  <xsl:param name="process">false</xsl:param>
4329
4034
  <xsl:if test="$process = 'true'">
4330
4035
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
4331
-
4332
4036
  </xsl:if>
4333
4037
  </xsl:template>
4334
4038
 
@@ -4412,7 +4116,6 @@
4412
4116
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
4413
4117
 
4414
4118
  <xsl:variable name="key_iso">
4415
-
4416
4119
  </xsl:variable>
4417
4120
 
4418
4121
  <fo:block>
@@ -4458,7 +4161,6 @@
4458
4161
  <fo:table width="95%" table-layout="fixed">
4459
4162
  <xsl:if test="normalize-space($key_iso) = 'true'">
4460
4163
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4461
-
4462
4164
  </xsl:if>
4463
4165
  <xsl:choose>
4464
4166
  <!-- if there 'dl', then set same columns width -->
@@ -4482,23 +4184,19 @@
4482
4184
  <fo:table-row>
4483
4185
  <fo:table-cell>
4484
4186
  <fo:block>
4485
-
4486
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
4487
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
4488
- <!-- <xsl:value-of select="@reference"/> -->
4489
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
4490
- </fo:inline>
4187
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
4188
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
4189
+ <!-- <xsl:value-of select="@reference"/> -->
4190
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
4191
+ </fo:inline>
4491
4192
 
4492
4193
  </fo:block>
4493
4194
  </fo:table-cell>
4494
4195
  <fo:table-cell>
4495
4196
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
4496
4197
  <xsl:if test="normalize-space($key_iso) = 'true'">
4497
-
4498
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
4499
-
4198
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
4500
4199
  </xsl:if>
4501
-
4502
4200
  <!-- <xsl:copy-of select="./node()"/> -->
4503
4201
  <xsl:apply-templates/>
4504
4202
  </fo:block>
@@ -4548,11 +4246,9 @@
4548
4246
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
4549
4247
  <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">
4550
4248
  <xsl:variable name="key_iso">
4551
-
4552
4249
  </xsl:variable>
4553
4250
  <xsl:if test="normalize-space($key_iso) = 'true'">
4554
4251
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4555
-
4556
4252
  </xsl:if>
4557
4253
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
4558
4254
  <!-- <xsl:value-of select="@reference"/> -->
@@ -4598,8 +4294,7 @@
4598
4294
  <xsl:text>※</xsl:text>
4599
4295
  </xsl:if> -->
4600
4296
  <!-- <xsl:value-of select="@reference"/> -->
4601
-
4602
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
4297
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
4603
4298
 
4604
4299
  <!-- <xsl:if test="$namespace = 'bsi'">
4605
4300
  <xsl:text>)</xsl:text>
@@ -4671,10 +4366,9 @@
4671
4366
  </xsl:if>
4672
4367
 
4673
4368
  <xsl:call-template name="setBlockSpanAll"/>
4674
-
4675
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
4676
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
4677
- </xsl:if>
4369
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
4370
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
4371
+ </xsl:if>
4678
4372
 
4679
4373
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
4680
4374
  <!-- set font-size as sourcecode font-size -->
@@ -4695,7 +4389,6 @@
4695
4389
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
4696
4390
  </xsl:choose>
4697
4391
  </xsl:attribute>
4698
-
4699
4392
  </xsl:if>
4700
4393
 
4701
4394
  <xsl:call-template name="setTrackChangesStyles">
@@ -4704,37 +4397,32 @@
4704
4397
  </xsl:call-template>
4705
4398
 
4706
4399
  <fo:block-container margin-left="0mm" role="SKIP">
4707
-
4708
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
4400
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
4709
4401
 
4710
4402
  <xsl:variable name="parent" select="local-name(..)"/>
4711
4403
 
4712
- <xsl:variable name="key_iso">
4713
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
4404
+ <xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') -->
4714
4405
  </xsl:variable>
4715
4406
 
4716
4407
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
4717
4408
 
4718
4409
  <xsl:choose>
4719
4410
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
4720
-
4721
- <fo:block margin-bottom="12pt" text-align="left">
4722
-
4723
- <!-- <xsl:variable name="title-where">
4411
+ <fo:block margin-bottom="12pt" text-align="left">
4412
+ <!-- <xsl:variable name="title-where">
4724
4413
  <xsl:call-template name="getLocalizedString">
4725
4414
  <xsl:with-param name="key">where</xsl:with-param>
4726
4415
  </xsl:call-template>
4727
4416
  </xsl:variable>
4728
4417
  <xsl:value-of select="$title-where"/> -->
4729
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
4730
- <xsl:text> </xsl:text>
4731
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
4732
- <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
4733
- <xsl:text> </xsl:text>
4734
- </xsl:if>
4735
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
4736
- </fo:block>
4737
-
4418
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
4419
+ <xsl:text> </xsl:text>
4420
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
4421
+ <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
4422
+ <xsl:text> </xsl:text>
4423
+ </xsl:if>
4424
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
4425
+ </fo:block>
4738
4426
  </xsl:when> <!-- END: only one component -->
4739
4427
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
4740
4428
  <fo:block margin-bottom="12pt" text-align="left">
@@ -4754,19 +4442,17 @@
4754
4442
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
4755
4443
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
4756
4444
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
4445
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
4757
4446
 
4758
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
4759
-
4760
- <xsl:call-template name="refine_figure_key_style"/>
4761
-
4762
- <xsl:variable name="title-key">
4763
- <xsl:call-template name="getLocalizedString">
4764
- <xsl:with-param name="key">key</xsl:with-param>
4765
- </xsl:call-template>
4766
- </xsl:variable>
4767
- <xsl:value-of select="$title-key"/>
4768
- </fo:block>
4447
+ <xsl:call-template name="refine_figure_key_style"/>
4769
4448
 
4449
+ <xsl:variable name="title-key">
4450
+ <xsl:call-template name="getLocalizedString">
4451
+ <xsl:with-param name="key">key</xsl:with-param>
4452
+ </xsl:call-template>
4453
+ </xsl:variable>
4454
+ <xsl:value-of select="$title-key"/>
4455
+ </fo:block>
4770
4456
  </xsl:if>
4771
4457
  </xsl:when> <!-- END: definition list in a figure -->
4772
4458
  </xsl:choose>
@@ -4799,12 +4485,10 @@
4799
4485
  <xsl:if test="$isGenerateTableIF = 'true'">
4800
4486
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
4801
4487
  </xsl:if>
4802
-
4803
4488
  <xsl:choose>
4804
4489
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
4805
4490
  <xsl:when test="normalize-space($key_iso) = 'true'">
4806
4491
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4807
-
4808
4492
  </xsl:when>
4809
4493
  </xsl:choose>
4810
4494
 
@@ -4909,17 +4593,15 @@
4909
4593
  <xsl:call-template name="getMaxLength_dt"/>
4910
4594
  </xsl:variable>
4911
4595
 
4912
- <xsl:variable name="isContainsKeepTogetherTag_">
4913
- false
4596
+ <xsl:variable name="isContainsKeepTogetherTag_">false
4914
4597
  </xsl:variable>
4915
4598
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
4916
4599
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
4917
-
4918
- <xsl:call-template name="setColumnWidth_dl">
4919
- <xsl:with-param name="colwidths" select="$colwidths"/>
4920
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
4921
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
4922
- </xsl:call-template>
4600
+ <xsl:call-template name="setColumnWidth_dl">
4601
+ <xsl:with-param name="colwidths" select="$colwidths"/>
4602
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
4603
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
4604
+ </xsl:call-template>
4923
4605
 
4924
4606
  <fo:table-body>
4925
4607
 
@@ -4970,21 +4652,17 @@
4970
4652
  </xsl:template>
4971
4653
 
4972
4654
  <xsl:template name="refine_dl_formula_where_style">
4973
-
4974
4655
  </xsl:template> <!-- refine_dl_formula_where_style -->
4975
4656
 
4976
4657
  <xsl:template name="refine_figure_key_style">
4977
-
4978
4658
  </xsl:template> <!-- refine_figure_key_style -->
4979
4659
 
4980
4660
  <xsl:template name="refine_multicomponent_style">
4981
4661
  <xsl:variable name="parent" select="local-name(..)"/>
4982
-
4983
4662
  </xsl:template> <!-- refine_multicomponent_style -->
4984
4663
 
4985
4664
  <xsl:template name="refine_multicomponent_block_style">
4986
4665
  <xsl:variable name="parent" select="local-name(..)"/>
4987
-
4988
4666
  </xsl:template> <!-- refine_multicomponent_block_style -->
4989
4667
 
4990
4668
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -5171,14 +4849,11 @@
5171
4849
  <xsl:attribute name="id">
5172
4850
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
5173
4851
  </xsl:attribute>
5174
-
5175
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
5176
- <xsl:with-param name="process">true</xsl:with-param>
5177
- </xsl:apply-templates>
5178
-
4852
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
4853
+ <xsl:with-param name="process">true</xsl:with-param>
4854
+ </xsl:apply-templates>
5179
4855
  </td>
5180
4856
  </tr>
5181
-
5182
4857
  </xsl:template>
5183
4858
 
5184
4859
  <!-- Definition's term -->
@@ -5187,7 +4862,6 @@
5187
4862
  <xsl:param name="split_keep-within-line"/>
5188
4863
 
5189
4864
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
5190
-
5191
4865
  <xsl:call-template name="insert_dt_cell">
5192
4866
  <xsl:with-param name="key_iso" select="$key_iso"/>
5193
4867
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -5209,7 +4883,6 @@
5209
4883
  <!-- border is mandatory, to calculate real width -->
5210
4884
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
5211
4885
  <xsl:attribute name="text-align">left</xsl:attribute>
5212
-
5213
4886
  </xsl:if>
5214
4887
 
5215
4888
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -5219,9 +4892,7 @@
5219
4892
 
5220
4893
  <xsl:choose>
5221
4894
  <xsl:when test="$isGenerateTableIF = 'true'">
5222
-
5223
- <xsl:copy-of select="@id"/>
5224
-
4895
+ <xsl:copy-of select="@id"/>
5225
4896
  </xsl:when>
5226
4897
  <xsl:otherwise>
5227
4898
  <xsl:copy-of select="@id"/>
@@ -5258,9 +4929,7 @@
5258
4929
  <fo:block role="SKIP">
5259
4930
 
5260
4931
  <xsl:if test="$isGenerateTableIF = 'true'">
5261
-
5262
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5263
-
4932
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5264
4933
  </xsl:if>
5265
4934
 
5266
4935
  <xsl:choose>
@@ -5408,7 +5077,6 @@
5408
5077
  </xsl:template>
5409
5078
 
5410
5079
  <xsl:template name="refine_italic_style">
5411
-
5412
5080
  </xsl:template>
5413
5081
 
5414
5082
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -5424,7 +5092,6 @@
5424
5092
  </xsl:template>
5425
5093
 
5426
5094
  <xsl:template name="refine_strong_style">
5427
-
5428
5095
  <xsl:if test="ancestor::*['preferred']">
5429
5096
  <xsl:attribute name="role">SKIP</xsl:attribute>
5430
5097
  </xsl:if>
@@ -5449,12 +5116,7 @@
5449
5116
  <xsl:template match="*[local-name()='tt']">
5450
5117
  <fo:inline xsl:use-attribute-sets="tt-style">
5451
5118
 
5452
- <xsl:variable name="_font-size">
5453
- 10
5454
-
5455
-
5456
- <!-- inherit -->
5457
-
5119
+ <xsl:variable name="_font-size">10 <!-- inherit -->
5458
5120
  </xsl:variable>
5459
5121
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
5460
5122
  <xsl:if test="$font-size != ''">
@@ -5670,8 +5332,7 @@
5670
5332
  </xsl:otherwise>
5671
5333
  </xsl:choose>
5672
5334
  </xsl:variable>
5673
- <xsl:variable name="ratio_">
5674
- 0.75
5335
+ <xsl:variable name="ratio_">0.75
5675
5336
  </xsl:variable>
5676
5337
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
5677
5338
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -5761,7 +5422,7 @@
5761
5422
 
5762
5423
  <xsl:variable name="quot">"</xsl:variable>
5763
5424
  <xsl:variable name="styles_">
5764
- <xsl:for-each select="xalan:nodeset($styles__)/item">
5425
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
5765
5426
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5766
5427
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5767
5428
  <xsl:variable name="value">
@@ -5773,7 +5434,7 @@
5773
5434
  </xsl:otherwise>
5774
5435
  </xsl:choose>
5775
5436
  </xsl:variable>
5776
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
5437
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
5777
5438
  <style name="{$key}"><xsl:value-of select="$value"/></style>
5778
5439
  </xsl:if>
5779
5440
  <xsl:if test="$key = 'text-indent'">
@@ -5787,7 +5448,6 @@
5787
5448
  <fo:inline>
5788
5449
  <xsl:for-each select="$styles/style">
5789
5450
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
5790
-
5791
5451
  </xsl:for-each>
5792
5452
  <xsl:apply-templates/>
5793
5453
  </fo:inline>
@@ -6774,10 +6434,9 @@
6774
6434
  <xsl:variable name="mathml_content">
6775
6435
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
6776
6436
  </xsl:variable>
6777
-
6778
- <xsl:call-template name="mathml_instream_object">
6779
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
6780
- </xsl:call-template>
6437
+ <xsl:call-template name="mathml_instream_object">
6438
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
6439
+ </xsl:call-template>
6781
6440
 
6782
6441
  </fo:inline>
6783
6442
  </xsl:template>
@@ -6811,7 +6470,6 @@
6811
6470
  <xsl:template name="getMathml_asciimath_text">
6812
6471
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
6813
6472
  <xsl:variable name="latexmath">
6814
-
6815
6473
  </xsl:variable>
6816
6474
  <xsl:variable name="asciimath_text_following">
6817
6475
  <xsl:choose>
@@ -6884,7 +6542,6 @@
6884
6542
  </xsl:template>
6885
6543
 
6886
6544
  <xsl:template name="refine_mathml_insteam_object_style">
6887
-
6888
6545
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
6889
6546
 
6890
6547
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -7282,7 +6939,6 @@
7282
6939
  <xsl:variable name="annotation-id" select="@id"/>
7283
6940
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
7284
6941
  <fo:block id="{$annotation-id}" white-space="nowrap">
7285
-
7286
6942
  <fo:inline>
7287
6943
  <xsl:apply-templates>
7288
6944
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -7311,7 +6967,6 @@
7311
6967
  <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'])">
7312
6968
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
7313
6969
  </xsl:if>
7314
-
7315
6970
  <xsl:if test="parent::*[local-name() = 'add']">
7316
6971
  <xsl:call-template name="append_add-style"/>
7317
6972
  </xsl:if>
@@ -7322,8 +6977,7 @@
7322
6977
  </xsl:template>
7323
6978
 
7324
6979
  <!-- command between two xref points to non-standard bibitem -->
7325
- <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']]]">
7326
- <xsl:value-of select="."/>
6980
+ <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="."/>
7327
6981
  </xsl:template>
7328
6982
 
7329
6983
  <!-- ====== -->
@@ -7338,7 +6992,6 @@
7338
6992
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
7339
6993
  </xsl:choose>
7340
6994
  </xsl:attribute>
7341
-
7342
6995
  </xsl:if>
7343
6996
  <fo:block-container margin-left="0mm" role="SKIP">
7344
6997
  <xsl:call-template name="setNamedDestination"/>
@@ -7428,57 +7081,52 @@
7428
7081
 
7429
7082
  <xsl:template match="*[local-name() = 'note']" name="note">
7430
7083
 
7431
- <xsl:call-template name="setNamedDestination"/>
7432
-
7433
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
7434
-
7435
- <xsl:call-template name="setBlockSpanAll"/>
7436
-
7437
- <xsl:call-template name="refine_note-style"/>
7438
-
7439
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
7084
+ <xsl:call-template name="setNamedDestination"/>
7440
7085
 
7441
- <xsl:if test="ancestor::csa:ul or ancestor::csa:ol and not(ancestor::csa:note[1]/following-sibling::*)">
7442
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
7443
- </xsl:if>
7086
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
7444
7087
 
7445
- <fo:block>
7088
+ <xsl:call-template name="setBlockSpanAll"/>
7446
7089
 
7447
- <xsl:call-template name="refine_note_block_style"/>
7090
+ <xsl:call-template name="refine_note-style"/>
7448
7091
 
7449
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
7092
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
7093
+ <xsl:if test="ancestor::csa:ul or ancestor::csa:ol and not(ancestor::csa:note[1]/following-sibling::*)">
7094
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
7095
+ </xsl:if>
7096
+ <fo:block>
7450
7097
 
7451
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
7098
+ <xsl:call-template name="refine_note_block_style"/>
7452
7099
 
7453
- <xsl:call-template name="refine_note-name-style"/>
7100
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
7454
7101
 
7455
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7456
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
7457
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7458
- <xsl:call-template name="append_add-style"/>
7459
- </xsl:if>
7102
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
7460
7103
 
7461
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7462
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7463
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7464
- <xsl:with-param name="skip">false</xsl:with-param>
7465
- </xsl:apply-templates>
7466
- </xsl:if>
7104
+ <xsl:call-template name="refine_note-name-style"/>
7467
7105
 
7468
- <xsl:apply-templates select="*[local-name() = 'name']"/>
7106
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7107
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
7108
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7109
+ <xsl:call-template name="append_add-style"/>
7110
+ </xsl:if>
7469
7111
 
7470
- </fo:inline>
7112
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7113
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7114
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7115
+ <xsl:with-param name="skip">false</xsl:with-param>
7116
+ </xsl:apply-templates>
7117
+ </xsl:if>
7471
7118
 
7472
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7473
- </fo:block>
7119
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7474
7120
 
7475
- </fo:block-container>
7476
- </fo:block-container>
7121
+ </fo:inline>
7477
7122
 
7123
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7124
+ </fo:block>
7125
+ </fo:block-container>
7126
+ </fo:block-container>
7478
7127
  </xsl:template>
7479
7128
 
7480
7129
  <xsl:template name="refine_note_block_style">
7481
-
7482
7130
  </xsl:template> <!-- refine_note_block_style -->
7483
7131
 
7484
7132
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -7531,7 +7179,6 @@
7531
7179
  <xsl:value-of select="$sfx"/>
7532
7180
  </xsl:when>
7533
7181
  <xsl:otherwise>
7534
-
7535
7182
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
7536
7183
  <!-- <xsl:if test="$namespace = 'ieee'">
7537
7184
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -7539,7 +7186,6 @@
7539
7186
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
7540
7187
  <xsl:text>:</xsl:text>
7541
7188
  </xsl:if> -->
7542
-
7543
7189
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
7544
7190
  <xsl:text> – </xsl:text> en dash &#x2013;
7545
7191
  </xsl:if> -->
@@ -7560,7 +7206,6 @@
7560
7206
  <xsl:value-of select="$sfx"/>
7561
7207
  </xsl:when>
7562
7208
  <xsl:otherwise>
7563
-
7564
7209
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
7565
7210
  <!-- <xsl:if test="$namespace = 'ieee'">
7566
7211
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -7616,7 +7261,6 @@
7616
7261
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7617
7262
 
7618
7263
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7619
-
7620
7264
  </xsl:if>
7621
7265
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7622
7266
  </fo:block>
@@ -7656,8 +7300,7 @@
7656
7300
  <!-- Example: Dimensions in millimeters -->
7657
7301
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
7658
7302
 
7659
- <xsl:variable name="show_figure_key_in_block_container">
7660
- true
7303
+ <xsl:variable name="show_figure_key_in_block_container">true
7661
7304
  </xsl:variable>
7662
7305
 
7663
7306
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -7672,11 +7315,9 @@
7672
7315
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
7673
7316
  <xsl:call-template name="showFigureKey"/>
7674
7317
  </xsl:if>
7675
-
7676
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
7318
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
7677
7319
 
7678
7320
  </fo:block-container>
7679
-
7680
7321
  </xsl:template>
7681
7322
 
7682
7323
  <xsl:template name="showFigureKey">
@@ -7714,13 +7355,12 @@
7714
7355
  <!-- SOURCE: ... -->
7715
7356
  <!-- figure/source -->
7716
7357
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
7717
-
7718
- <xsl:call-template name="termsource"/>
7719
-
7358
+ <xsl:call-template name="termsource"/>
7720
7359
  </xsl:template>
7721
7360
 
7722
7361
  <xsl:template match="*[local-name() = 'image']">
7723
7362
  <xsl:param name="indent">0</xsl:param>
7363
+ <xsl:param name="logo_width"/>
7724
7364
  <xsl:variable name="isAdded" select="../@added"/>
7725
7365
  <xsl:variable name="isDeleted" select="../@deleted"/>
7726
7366
  <xsl:choose>
@@ -7742,9 +7382,18 @@
7742
7382
 
7743
7383
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
7744
7384
 
7745
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
7746
7385
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
7747
7386
 
7387
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
7388
+ <xsl:attribute name="width">100%</xsl:attribute>
7389
+ <xsl:if test="normalize-space($logo_width) != ''">
7390
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
7391
+ </xsl:if>
7392
+ <xsl:attribute name="content-height">100%</xsl:attribute>
7393
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
7394
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
7395
+ </xsl:if>
7396
+
7748
7397
  <xsl:variable name="width">
7749
7398
  <xsl:call-template name="setImageWidth"/>
7750
7399
  </xsl:variable>
@@ -7822,8 +7471,7 @@
7822
7471
  </xsl:call-template>
7823
7472
  </xsl:variable>
7824
7473
 
7825
- <xsl:variable name="scaleRatio">
7826
- 1
7474
+ <xsl:variable name="scaleRatio">1
7827
7475
  </xsl:variable>
7828
7476
 
7829
7477
  <xsl:if test="number($scale) &lt; 100">
@@ -7934,18 +7582,14 @@
7934
7582
  </xsl:variable>
7935
7583
 
7936
7584
  <xsl:variable name="image_width_effective">
7937
-
7938
- <xsl:value-of select="$width_effective - number($indent_left)"/>
7939
-
7585
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
7940
7586
  </xsl:variable>
7941
7587
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
7942
7588
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
7943
7589
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
7944
7590
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
7945
7591
  <xsl:variable name="scale">
7946
-
7947
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7948
-
7592
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
7949
7593
  </xsl:variable>
7950
7594
  <xsl:value-of select="$scale"/>
7951
7595
  </xsl:template>
@@ -7966,7 +7610,8 @@
7966
7610
  </xsl:when>
7967
7611
  <xsl:when test="not(starts-with(@src, 'data:'))">
7968
7612
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
7969
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
7613
+ <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>
7614
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
7970
7615
  </xsl:when>
7971
7616
  <xsl:otherwise>
7972
7617
  <xsl:value-of select="@src"/>
@@ -8262,8 +7907,8 @@
8262
7907
  </xsl:call-template>
8263
7908
  </xsl:variable>
8264
7909
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
8265
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
8266
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
7910
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
7911
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
8267
7912
 
8268
7913
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
8269
7914
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -8335,8 +7980,8 @@
8335
7980
  </xsl:variable>
8336
7981
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
8337
7982
  <xsl:variable name="att_name" select="local-name()"/>
8338
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
8339
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
7983
+ <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>
7984
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
8340
7985
  </xsl:template>
8341
7986
 
8342
7987
  <!-- ============== -->
@@ -8409,13 +8054,13 @@
8409
8054
  </xsl:call-template>
8410
8055
  </xsl:variable>
8411
8056
  <xsl:variable name="x_coords">
8412
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
8057
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
8413
8058
  <xsl:sort select="." data-type="number"/>
8414
8059
  <x><xsl:value-of select="."/></x>
8415
8060
  </xsl:for-each>
8416
8061
  </xsl:variable>
8417
8062
  <xsl:variable name="y_coords">
8418
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
8063
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
8419
8064
  <xsl:sort select="." data-type="number"/>
8420
8065
  <y><xsl:value-of select="."/></y>
8421
8066
  </xsl:for-each>
@@ -8620,11 +8265,11 @@
8620
8265
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
8621
8266
  </xsl:variable>
8622
8267
 
8623
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
8624
- <title>
8268
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
8269
+ <mn:title>
8625
8270
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
8626
- </title>
8627
- </item>
8271
+ </mn:title>
8272
+ </mn:item>
8628
8273
  </xsl:if>
8629
8274
  </xsl:template>
8630
8275
 
@@ -8695,12 +8340,12 @@
8695
8340
  <xsl:param name="contents"/>
8696
8341
  <xsl:param name="contents_addon"/>
8697
8342
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8698
- <xsl:if test="$contents_nodes//item">
8343
+ <xsl:if test="$contents_nodes//mn:item">
8699
8344
  <fo:bookmark-tree>
8700
8345
  <xsl:choose>
8701
- <xsl:when test="$contents_nodes/doc">
8346
+ <xsl:when test="$contents_nodes/mn:doc">
8702
8347
  <xsl:choose>
8703
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
8348
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
8704
8349
 
8705
8350
  <xsl:if test="$contents_nodes/collection">
8706
8351
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -8708,8 +8353,8 @@
8708
8353
  </fo:bookmark>
8709
8354
  </xsl:if>
8710
8355
 
8711
- <xsl:for-each select="$contents_nodes/doc">
8712
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
8356
+ <xsl:for-each select="$contents_nodes/mn:doc">
8357
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
8713
8358
  <xsl:if test="@bundle = 'true'">
8714
8359
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
8715
8360
  </xsl:if>
@@ -8743,14 +8388,14 @@
8743
8388
  </xsl:choose>
8744
8389
  </fo:bookmark-title>
8745
8390
 
8746
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
8391
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
8747
8392
 
8748
8393
  <xsl:call-template name="insertFigureBookmarks">
8749
- <xsl:with-param name="contents" select="contents"/>
8394
+ <xsl:with-param name="contents" select="mn:contents"/>
8750
8395
  </xsl:call-template>
8751
8396
 
8752
8397
  <xsl:call-template name="insertTableBookmarks">
8753
- <xsl:with-param name="contents" select="contents"/>
8398
+ <xsl:with-param name="contents" select="mn:contents"/>
8754
8399
  <xsl:with-param name="lang" select="@lang"/>
8755
8400
  </xsl:call-template>
8756
8401
 
@@ -8759,16 +8404,16 @@
8759
8404
  </xsl:for-each>
8760
8405
  </xsl:when>
8761
8406
  <xsl:otherwise>
8762
- <xsl:for-each select="$contents_nodes/doc">
8407
+ <xsl:for-each select="$contents_nodes/mn:doc">
8763
8408
 
8764
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
8409
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
8765
8410
 
8766
8411
  <xsl:call-template name="insertFigureBookmarks">
8767
- <xsl:with-param name="contents" select="contents"/>
8412
+ <xsl:with-param name="contents" select="mn:contents"/>
8768
8413
  </xsl:call-template>
8769
8414
 
8770
8415
  <xsl:call-template name="insertTableBookmarks">
8771
- <xsl:with-param name="contents" select="contents"/>
8416
+ <xsl:with-param name="contents" select="mn:contents"/>
8772
8417
  <xsl:with-param name="lang" select="@lang"/>
8773
8418
  </xsl:call-template>
8774
8419
 
@@ -8777,14 +8422,14 @@
8777
8422
  </xsl:choose>
8778
8423
  </xsl:when>
8779
8424
  <xsl:otherwise>
8780
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
8425
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
8781
8426
 
8782
8427
  <xsl:call-template name="insertFigureBookmarks">
8783
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
8428
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
8784
8429
  </xsl:call-template>
8785
8430
 
8786
8431
  <xsl:call-template name="insertTableBookmarks">
8787
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
8432
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
8788
8433
  <xsl:with-param name="lang" select="@lang"/>
8789
8434
  </xsl:call-template>
8790
8435
 
@@ -8801,80 +8446,72 @@
8801
8446
  <xsl:template name="insertFigureBookmarks">
8802
8447
  <xsl:param name="contents"/>
8803
8448
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8804
- <xsl:if test="$contents_nodes/figure">
8805
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
8449
+ <xsl:if test="$contents_nodes/mn:figure">
8450
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
8806
8451
  <fo:bookmark-title>Figures</fo:bookmark-title>
8807
- <xsl:for-each select="$contents_nodes/figure">
8452
+ <xsl:for-each select="$contents_nodes/mn:figure">
8808
8453
  <fo:bookmark internal-destination="{@id}">
8809
8454
  <fo:bookmark-title>
8810
- <xsl:value-of select="normalize-space(title)"/>
8455
+ <xsl:value-of select="normalize-space(mn:title)"/>
8811
8456
  </fo:bookmark-title>
8812
8457
  </fo:bookmark>
8813
8458
  </xsl:for-each>
8814
8459
  </fo:bookmark>
8815
8460
  </xsl:if>
8461
+ <xsl:if test="$contents_nodes//mn:figures/mn:figure">
8462
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8816
8463
 
8817
- <xsl:if test="$contents_nodes//figures/figure">
8818
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8819
-
8820
- <xsl:variable name="bookmark-title">
8821
-
8822
- <xsl:value-of select="$title-list-figures"/>
8823
-
8824
- </xsl:variable>
8825
- <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
8826
- <xsl:for-each select="$contents_nodes//figures/figure">
8827
- <fo:bookmark internal-destination="{@id}">
8828
- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
8829
- </fo:bookmark>
8830
- </xsl:for-each>
8831
- </fo:bookmark>
8832
- </xsl:if>
8833
-
8464
+ <xsl:variable name="bookmark-title">
8465
+ <xsl:value-of select="$title-list-figures"/>
8466
+ </xsl:variable>
8467
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
8468
+ <xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
8469
+ <fo:bookmark internal-destination="{@id}">
8470
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
8471
+ </fo:bookmark>
8472
+ </xsl:for-each>
8473
+ </fo:bookmark>
8474
+ </xsl:if>
8834
8475
  </xsl:template> <!-- insertFigureBookmarks -->
8835
8476
 
8836
8477
  <xsl:template name="insertTableBookmarks">
8837
8478
  <xsl:param name="contents"/>
8838
8479
  <xsl:param name="lang"/>
8839
8480
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
8840
- <xsl:if test="$contents_nodes/table">
8841
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
8481
+ <xsl:if test="$contents_nodes/mn:table">
8482
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
8842
8483
  <fo:bookmark-title>
8843
8484
  <xsl:choose>
8844
8485
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
8845
8486
  <xsl:otherwise>Tables</xsl:otherwise>
8846
8487
  </xsl:choose>
8847
8488
  </fo:bookmark-title>
8848
- <xsl:for-each select="$contents_nodes/table">
8489
+ <xsl:for-each select="$contents_nodes/mn:table">
8849
8490
  <fo:bookmark internal-destination="{@id}">
8850
8491
  <fo:bookmark-title>
8851
- <xsl:value-of select="normalize-space(title)"/>
8492
+ <xsl:value-of select="normalize-space(mn:title)"/>
8852
8493
  </fo:bookmark-title>
8853
8494
  </fo:bookmark>
8854
8495
  </xsl:for-each>
8855
8496
  </fo:bookmark>
8856
8497
  </xsl:if>
8498
+ <xsl:if test="$contents_nodes//mn:tables/mn:table">
8499
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8857
8500
 
8858
- <xsl:if test="$contents_nodes//tables/table">
8859
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
8860
-
8861
- <xsl:variable name="bookmark-title">
8862
-
8863
- <xsl:value-of select="$title-list-tables"/>
8864
-
8865
- </xsl:variable>
8501
+ <xsl:variable name="bookmark-title">
8502
+ <xsl:value-of select="$title-list-tables"/>
8503
+ </xsl:variable>
8866
8504
 
8867
- <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
8505
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
8868
8506
 
8869
- <xsl:for-each select="$contents_nodes//tables/table">
8870
- <fo:bookmark internal-destination="{@id}">
8871
- <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
8872
- <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
8873
- </fo:bookmark>
8874
- </xsl:for-each>
8507
+ <xsl:for-each select="$contents_nodes//mn:tables/mn:table">
8508
+ <fo:bookmark internal-destination="{@id}">
8509
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
8510
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
8875
8511
  </fo:bookmark>
8876
- </xsl:if>
8877
-
8512
+ </xsl:for-each>
8513
+ </fo:bookmark>
8514
+ </xsl:if>
8878
8515
  </xsl:template> <!-- insertTableBookmarks -->
8879
8516
  <!-- End Bookmarks -->
8880
8517
 
@@ -8904,17 +8541,15 @@
8904
8541
  <xsl:param name="title" select="''"/>
8905
8542
  <xsl:choose>
8906
8543
  <xsl:when test="$lang = 'en'">
8907
-
8908
8544
  </xsl:when>
8909
8545
  <xsl:when test="$lang = 'fr'">
8910
-
8911
8546
  </xsl:when>
8912
8547
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
8913
8548
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
8914
8549
  </xsl:choose>
8915
8550
  </xsl:template>
8916
8551
 
8917
- <xsl:template match="item" mode="bookmark">
8552
+ <xsl:template match="mn:item" mode="bookmark">
8918
8553
  <xsl:choose>
8919
8554
  <xsl:when test="@id != ''">
8920
8555
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -8924,7 +8559,7 @@
8924
8559
  <xsl:text> </xsl:text>
8925
8560
  </xsl:if>
8926
8561
  <xsl:variable name="title">
8927
- <xsl:for-each select="title/node()">
8562
+ <xsl:for-each select="mn:title/node()">
8928
8563
  <xsl:choose>
8929
8564
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
8930
8565
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -8942,7 +8577,7 @@
8942
8577
  </xsl:choose>
8943
8578
  </xsl:template>
8944
8579
 
8945
- <xsl:template match="title" mode="bookmark"/>
8580
+ <xsl:template match="mn:title" mode="bookmark"/>
8946
8581
  <xsl:template match="text()" mode="bookmark"/>
8947
8582
 
8948
8583
  <!-- figure/name -->
@@ -9171,9 +8806,9 @@
9171
8806
  <xsl:template match="text()" mode="contents_item">
9172
8807
  <xsl:variable name="text">
9173
8808
  <!-- to split by '_' and other chars -->
9174
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
8809
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
9175
8810
  </xsl:variable>
9176
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
8811
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
9177
8812
  <xsl:call-template name="keep_together_standard_number"/>
9178
8813
  </xsl:for-each>
9179
8814
  </xsl:template>
@@ -9206,16 +8841,7 @@
9206
8841
 
9207
8842
  <xsl:template name="get_sourcecode_attributes">
9208
8843
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
9209
- <xsl:variable name="_font-size">
9210
- 10
9211
-
9212
-
9213
- <!-- inherit -->
9214
-
9215
- <!-- <xsl:if test="$namespace = 'ieee'">
9216
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
9217
- </xsl:if> -->
9218
-
8844
+ <xsl:variable name="_font-size">10<!-- inherit -->
9219
8845
  </xsl:variable>
9220
8846
 
9221
8847
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -9271,7 +8897,6 @@
9271
8897
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
9272
8898
  </xsl:choose>
9273
8899
  </xsl:attribute>
9274
-
9275
8900
  </xsl:if>
9276
8901
  <fo:block-container margin-left="0mm" role="SKIP">
9277
8902
 
@@ -9295,8 +8920,7 @@
9295
8920
  </fo:block>
9296
8921
 
9297
8922
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
9298
-
9299
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
8923
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
9300
8924
 
9301
8925
  </fo:block-container>
9302
8926
  </fo:block-container>
@@ -9473,25 +9097,6 @@
9473
9097
  </xsl:choose>
9474
9098
  </xsl:template>
9475
9099
 
9476
- <!-- insert 'char' between each character in the string -->
9477
- <xsl:template name="interspers">
9478
- <xsl:param name="str"/>
9479
- <xsl:param name="char" select="$zero_width_space"/>
9480
- <xsl:if test="$str != ''">
9481
- <xsl:value-of select="substring($str, 1, 1)"/>
9482
-
9483
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
9484
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
9485
- <xsl:value-of select="$char"/>
9486
- </xsl:if>
9487
-
9488
- <xsl:call-template name="interspers">
9489
- <xsl:with-param name="str" select="substring($str, 2)"/>
9490
- <xsl:with-param name="char" select="$char"/>
9491
- </xsl:call-template>
9492
- </xsl:if>
9493
- </xsl:template>
9494
-
9495
9100
  <xsl:template name="interspers-java">
9496
9101
  <xsl:param name="str"/>
9497
9102
  <xsl:param name="char" select="$zero_width_space"/>
@@ -9588,7 +9193,7 @@
9588
9193
  </xsl:variable>
9589
9194
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
9590
9195
 
9591
- <xsl:for-each select="$classes/item">
9196
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
9592
9197
  <xsl:variable name="class_name" select="."/>
9593
9198
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
9594
9199
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -9671,12 +9276,9 @@
9671
9276
 
9672
9277
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
9673
9278
  <xsl:if test="normalize-space() != ''">
9674
-
9675
- <fo:block xsl:use-attribute-sets="permission-name-style">
9676
- <xsl:apply-templates/>
9677
-
9678
- </fo:block>
9679
-
9279
+ <fo:block xsl:use-attribute-sets="permission-name-style">
9280
+ <xsl:apply-templates/>
9281
+ </fo:block>
9680
9282
  </xsl:if>
9681
9283
  </xsl:template>
9682
9284
 
@@ -9705,12 +9307,9 @@
9705
9307
  <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
9706
9308
  <xsl:if test="normalize-space() != ''">
9707
9309
 
9708
- <fo:block xsl:use-attribute-sets="requirement-name-style">
9709
-
9710
- <xsl:apply-templates/>
9711
-
9712
- </fo:block>
9713
-
9310
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
9311
+ <xsl:apply-templates/>
9312
+ </fo:block>
9714
9313
  </xsl:if>
9715
9314
  </xsl:template>
9716
9315
 
@@ -9749,11 +9348,9 @@
9749
9348
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
9750
9349
  <xsl:if test="normalize-space() != ''">
9751
9350
 
9752
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
9753
- <xsl:apply-templates/>
9754
-
9755
- </fo:block>
9756
-
9351
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
9352
+ <xsl:apply-templates/>
9353
+ </fo:block>
9757
9354
  </xsl:if>
9758
9355
  </xsl:template>
9759
9356
 
@@ -9879,7 +9476,6 @@
9879
9476
 
9880
9477
  <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 ')">
9881
9478
  <xsl:attribute name="font-weight">bold</xsl:attribute>
9882
-
9883
9479
  </xsl:if>
9884
9480
 
9885
9481
  <xsl:apply-templates mode="requirement"/>
@@ -9924,7 +9520,6 @@
9924
9520
 
9925
9521
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
9926
9522
  <fo:block font-size="11pt">
9927
-
9928
9523
  <xsl:apply-templates/>
9929
9524
  </fo:block>
9930
9525
  </xsl:template>
@@ -9964,7 +9559,6 @@
9964
9559
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
9965
9560
  <xsl:variable name="element">inline
9966
9561
 
9967
-
9968
9562
  </xsl:variable>
9969
9563
  <xsl:choose>
9970
9564
  <xsl:when test="contains($element, 'block')">
@@ -9996,110 +9590,105 @@
9996
9590
  text line 2
9997
9591
  -->
9998
9592
  <xsl:template match="*[local-name() = 'example']" name="example">
9593
+ <xsl:call-template name="setNamedDestination"/>
9594
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
9999
9595
 
10000
- <xsl:call-template name="setNamedDestination"/>
10001
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
9596
+ <xsl:call-template name="setBlockSpanAll"/>
10002
9597
 
10003
- <xsl:call-template name="setBlockSpanAll"/>
9598
+ <xsl:call-template name="refine_example-style"/>
10004
9599
 
10005
- <xsl:call-template name="refine_example-style"/>
9600
+ <xsl:variable name="fo_element">
9601
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>block
9602
+ </xsl:variable>
10006
9603
 
10007
- <xsl:variable name="fo_element">
10008
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
10009
- block
10010
- </xsl:variable>
9604
+ <fo:block-container margin-left="0mm" role="SKIP">
10011
9605
 
10012
- <fo:block-container margin-left="0mm" role="SKIP">
9606
+ <xsl:choose>
10013
9607
 
10014
- <xsl:choose>
9608
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
10015
9609
 
10016
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
9610
+ <!-- display name 'EXAMPLE' in a separate block -->
9611
+ <fo:block>
9612
+ <xsl:apply-templates select="*[local-name()='name']">
9613
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9614
+ </xsl:apply-templates>
9615
+ </fo:block>
10017
9616
 
10018
- <!-- display name 'EXAMPLE' in a separate block -->
10019
- <fo:block>
10020
- <xsl:apply-templates select="*[local-name()='name']">
9617
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
9618
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9619
+ <xsl:variable name="example_body">
9620
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10021
9621
  <xsl:with-param name="fo_element" select="$fo_element"/>
10022
9622
  </xsl:apply-templates>
10023
- </fo:block>
10024
-
10025
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10026
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10027
- <xsl:variable name="example_body">
10028
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10029
- <xsl:with-param name="fo_element" select="$fo_element"/>
10030
- </xsl:apply-templates>
10031
- </xsl:variable>
10032
- <xsl:choose>
10033
- <xsl:when test="xalan:nodeset($example_body)/*">
10034
- <xsl:copy-of select="$example_body"/>
10035
- </xsl:when>
10036
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
10037
- </xsl:choose>
10038
- </fo:block-container>
10039
- </fo:block-container>
10040
- </xsl:when> <!-- end block -->
10041
-
10042
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
10043
-
10044
- <xsl:variable name="provisional_distance_between_starts_">
10045
- 7
10046
9623
  </xsl:variable>
10047
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
10048
- <xsl:variable name="indent_">
10049
- 0
10050
- </xsl:variable>
10051
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
9624
+ <xsl:choose>
9625
+ <xsl:when test="xalan:nodeset($example_body)/*">
9626
+ <xsl:copy-of select="$example_body"/>
9627
+ </xsl:when>
9628
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
9629
+ </xsl:choose>
9630
+ </fo:block-container>
9631
+ </fo:block-container>
9632
+ </xsl:when> <!-- end block -->
10052
9633
 
10053
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
10054
- <fo:list-item>
10055
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
10056
- <fo:block>
10057
- <xsl:apply-templates select="*[local-name()='name']">
10058
- <xsl:with-param name="fo_element">block</xsl:with-param>
10059
- </xsl:apply-templates>
10060
- </fo:block>
10061
- </fo:list-item-label>
10062
- <fo:list-item-body start-indent="body-start()">
10063
- <fo:block>
10064
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10065
- <xsl:with-param name="fo_element" select="$fo_element"/>
10066
- </xsl:apply-templates>
10067
- </fo:block>
10068
- </fo:list-item-body>
10069
- </fo:list-item>
10070
- </fo:list-block>
10071
- </xsl:when> <!-- end list -->
9634
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
10072
9635
 
10073
- <xsl:otherwise> <!-- inline -->
9636
+ <xsl:variable name="provisional_distance_between_starts_">7
9637
+ </xsl:variable>
9638
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
9639
+ <xsl:variable name="indent_">0
9640
+ </xsl:variable>
9641
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
10074
9642
 
10075
- <!-- display 'EXAMPLE' and first element in the same line -->
10076
- <fo:block>
10077
- <xsl:apply-templates select="*[local-name()='name']">
10078
- <xsl:with-param name="fo_element" select="$fo_element"/>
10079
- </xsl:apply-templates>
10080
- <fo:inline>
10081
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
9643
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
9644
+ <fo:list-item>
9645
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
9646
+ <fo:block>
9647
+ <xsl:apply-templates select="*[local-name()='name']">
9648
+ <xsl:with-param name="fo_element">block</xsl:with-param>
9649
+ </xsl:apply-templates>
9650
+ </fo:block>
9651
+ </fo:list-item-label>
9652
+ <fo:list-item-body start-indent="body-start()">
9653
+ <fo:block>
9654
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
10082
9655
  <xsl:with-param name="fo_element" select="$fo_element"/>
10083
9656
  </xsl:apply-templates>
10084
- </fo:inline>
10085
- </fo:block>
9657
+ </fo:block>
9658
+ </fo:list-item-body>
9659
+ </fo:list-item>
9660
+ </fo:list-block>
9661
+ </xsl:when> <!-- end list -->
10086
9662
 
10087
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
10088
- <!-- display further elements in blocks -->
10089
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
10090
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10091
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
10092
- <xsl:with-param name="fo_element" select="'block'"/>
10093
- </xsl:apply-templates>
10094
- </fo:block-container>
10095
- </fo:block-container>
10096
- </xsl:if>
10097
- </xsl:otherwise> <!-- end inline -->
9663
+ <xsl:otherwise> <!-- inline -->
10098
9664
 
10099
- </xsl:choose>
10100
- </fo:block-container>
10101
- </fo:block-container>
9665
+ <!-- display 'EXAMPLE' and first element in the same line -->
9666
+ <fo:block>
9667
+ <xsl:apply-templates select="*[local-name()='name']">
9668
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9669
+ </xsl:apply-templates>
9670
+ <fo:inline>
9671
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
9672
+ <xsl:with-param name="fo_element" select="$fo_element"/>
9673
+ </xsl:apply-templates>
9674
+ </fo:inline>
9675
+ </fo:block>
10102
9676
 
9677
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
9678
+ <!-- display further elements in blocks -->
9679
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
9680
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9681
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
9682
+ <xsl:with-param name="fo_element" select="'block'"/>
9683
+ </xsl:apply-templates>
9684
+ </fo:block-container>
9685
+ </fo:block-container>
9686
+ </xsl:if>
9687
+ </xsl:otherwise> <!-- end inline -->
9688
+
9689
+ </xsl:choose>
9690
+ </fo:block-container>
9691
+ </fo:block-container>
10103
9692
  </xsl:template>
10104
9693
 
10105
9694
  <!-- example/name -->
@@ -10114,7 +9703,6 @@
10114
9703
  </xsl:when>
10115
9704
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
10116
9705
  <fo:block xsl:use-attribute-sets="example-name-style">
10117
-
10118
9706
  <xsl:apply-templates/>
10119
9707
  </fo:block>
10120
9708
  </xsl:when>
@@ -10131,7 +9719,6 @@
10131
9719
  <!-- table/example/name, table/tfoot//example/name -->
10132
9720
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
10133
9721
  <fo:inline xsl:use-attribute-sets="example-name-style">
10134
-
10135
9722
  <xsl:apply-templates/>
10136
9723
  </fo:inline>
10137
9724
  </xsl:template>
@@ -10141,7 +9728,6 @@
10141
9728
 
10142
9729
  <xsl:variable name="num"><xsl:number/></xsl:variable>
10143
9730
  <xsl:variable name="element">
10144
-
10145
9731
  <xsl:value-of select="$fo_element"/>
10146
9732
  </xsl:variable>
10147
9733
  <xsl:choose>
@@ -10259,7 +9845,7 @@
10259
9845
  </xsl:call-template>
10260
9846
  </xsl:variable>
10261
9847
 
10262
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
9848
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
10263
9849
  <xsl:choose>
10264
9850
  <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>
10265
9851
  <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>
@@ -10296,7 +9882,6 @@
10296
9882
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
10297
9883
  </xsl:if>
10298
9884
  </xsl:if>
10299
-
10300
9885
  <fo:block-container margin-left="0mm" role="SKIP">
10301
9886
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10302
9887
 
@@ -10379,7 +9964,6 @@
10379
9964
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
10380
9965
  <xsl:attribute name="vertical-align">super</xsl:attribute>
10381
9966
  <xsl:attribute name="font-size">80%</xsl:attribute>
10382
-
10383
9967
  </xsl:if>
10384
9968
 
10385
9969
  <xsl:call-template name="refine_eref-style"/>
@@ -10428,7 +10012,6 @@
10428
10012
  </xsl:template>
10429
10013
 
10430
10014
  <xsl:template name="refine_basic_link_style">
10431
-
10432
10015
  </xsl:template> <!-- refine_basic_link_style -->
10433
10016
 
10434
10017
  <!-- ====== -->
@@ -10444,10 +10027,7 @@
10444
10027
  </xsl:call-template>
10445
10028
  </xsl:variable>
10446
10029
 
10447
- <xsl:variable name="padding">
10448
- 2
10449
-
10450
-
10030
+ <xsl:variable name="padding">2
10451
10031
  </xsl:variable>
10452
10032
 
10453
10033
  <xsl:variable name="padding-right">
@@ -10458,7 +10038,6 @@
10458
10038
  </xsl:otherwise>
10459
10039
  </xsl:choose>
10460
10040
  </xsl:variable>
10461
-
10462
10041
  <xsl:choose>
10463
10042
  <xsl:when test="$lang = 'zh'">
10464
10043
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -10482,9 +10061,7 @@
10482
10061
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
10483
10062
 
10484
10063
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
10485
-
10486
- <xsl:attribute name="padding-right">4mm</xsl:attribute>
10487
-
10064
+ <xsl:attribute name="padding-right">4mm</xsl:attribute>
10488
10065
  </xsl:template>
10489
10066
 
10490
10067
  <xsl:template name="insertNonBreakSpaces">
@@ -10503,11 +10080,10 @@
10503
10080
  <xsl:call-template name="getLevel"/>
10504
10081
  </xsl:variable>
10505
10082
  <xsl:variable name="font-size">
10506
-
10507
- <xsl:choose>
10508
- <xsl:when test="$level &gt;= 2">11pt</xsl:when>
10509
- <xsl:otherwise>12pt</xsl:otherwise>
10510
- </xsl:choose>
10083
+ <xsl:choose>
10084
+ <xsl:when test="$level &gt;= 2">11pt</xsl:when>
10085
+ <xsl:otherwise>12pt</xsl:otherwise>
10086
+ </xsl:choose>
10511
10087
 
10512
10088
  </xsl:variable>
10513
10089
  <xsl:variable name="levelTerm">
@@ -10560,11 +10136,9 @@
10560
10136
  </xsl:template>
10561
10137
 
10562
10138
  <xsl:template name="setStyle_preferred">
10563
-
10564
- <xsl:if test="*[local-name() = 'strong']">
10565
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10566
- </xsl:if>
10567
-
10139
+ <xsl:if test="*[local-name() = 'strong']">
10140
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10141
+ </xsl:if>
10568
10142
  </xsl:template>
10569
10143
 
10570
10144
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10641,7 +10215,6 @@
10641
10215
 
10642
10216
  <!-- main sections -->
10643
10217
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
10644
-
10645
10218
  <xsl:call-template name="setNamedDestination"/>
10646
10219
  <fo:block>
10647
10220
  <xsl:call-template name="setId"/>
@@ -10676,18 +10249,14 @@
10676
10249
  </xsl:template>
10677
10250
 
10678
10251
  <xsl:template name="sections_element_style">
10679
-
10680
- <xsl:variable name="pos"><xsl:number count="csa:sections/csa:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable>
10681
- <xsl:if test="$pos &gt;= 2">
10682
- <xsl:attribute name="space-before">18pt</xsl:attribute>
10683
- </xsl:if>
10684
-
10252
+ <xsl:variable name="pos"><xsl:number count="csa:sections/csa:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable>
10253
+ <xsl:if test="$pos &gt;= 2">
10254
+ <xsl:attribute name="space-before">18pt</xsl:attribute>
10255
+ </xsl:if>
10685
10256
  </xsl:template> <!-- sections_element_style -->
10686
10257
 
10687
10258
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
10688
-
10689
- <fo:block break-after="page"/>
10690
-
10259
+ <fo:block break-after="page"/>
10691
10260
  <xsl:call-template name="setNamedDestination"/>
10692
10261
  <fo:block>
10693
10262
  <xsl:call-template name="setId"/>
@@ -10736,7 +10305,6 @@
10736
10305
  </xsl:template>
10737
10306
 
10738
10307
  <xsl:template name="refine_clause_style">
10739
-
10740
10308
  </xsl:template> <!-- refine_clause_style -->
10741
10309
 
10742
10310
  <xsl:template match="*[local-name() = 'definitions']">
@@ -10776,7 +10344,6 @@
10776
10344
  </xsl:template>
10777
10345
 
10778
10346
  <xsl:template name="refine_annex_style">
10779
-
10780
10347
  </xsl:template>
10781
10348
 
10782
10349
  <!-- document text (not figures, or tables) footnotes -->
@@ -10880,17 +10447,15 @@
10880
10447
  <!-- Lists processing -->
10881
10448
  <!-- ===================================== -->
10882
10449
  <xsl:variable name="ul_labels_">
10883
-
10884
- <label level="1">•</label>
10885
- <label level="2">-</label><!-- minus -->
10886
- <label level="3" font-size="75%">o</label> <!-- white circle -->
10450
+ <label level="1">•</label>
10451
+ <label level="2">-</label><!-- minus -->
10452
+ <label level="3" font-size="75%">o</label> <!-- white circle -->
10887
10453
 
10888
10454
  </xsl:variable>
10889
10455
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
10890
10456
 
10891
10457
  <xsl:template name="setULLabel">
10892
- <xsl:variable name="list_level__">
10893
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
10458
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
10894
10459
  </xsl:variable>
10895
10460
  <xsl:variable name="list_level_" select="number($list_level__)"/>
10896
10461
  <xsl:variable name="list_level">
@@ -10947,28 +10512,22 @@
10947
10512
  <xsl:variable name="label">
10948
10513
 
10949
10514
  <xsl:variable name="style_prefix_">
10950
- <xsl:if test="$type = 'roman'">
10951
- <!-- Example: (i) -->
10515
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
10952
10516
  </xsl:if>
10953
10517
  <xsl:if test="$type = 'alphabet'">
10954
-
10955
10518
  </xsl:if>
10956
10519
  </xsl:variable>
10957
10520
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
10958
10521
 
10959
10522
  <xsl:variable name="style_suffix_">
10960
10523
  <xsl:choose>
10961
- <xsl:when test="$type = 'arabic'">
10962
- )
10524
+ <xsl:when test="$type = 'arabic'">)
10963
10525
  </xsl:when>
10964
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
10965
- )
10526
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
10966
10527
  </xsl:when>
10967
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
10968
- )
10528
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">)
10969
10529
  </xsl:when>
10970
- <xsl:when test="$type = 'roman'">
10971
- )
10530
+ <xsl:when test="$type = 'roman'">)
10972
10531
  </xsl:when>
10973
10532
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
10974
10533
  </xsl:choose>
@@ -10985,8 +10544,7 @@
10985
10544
  <xsl:value-of select="$style_suffix"/>
10986
10545
  </xsl:if>
10987
10546
  </xsl:variable>
10988
-
10989
- <xsl:value-of select="normalize-space($label)"/>
10547
+ <xsl:value-of select="normalize-space($label)"/>
10990
10548
 
10991
10549
  </xsl:when>
10992
10550
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -11043,17 +10601,13 @@
11043
10601
 
11044
10602
  <xsl:variable name="format">
11045
10603
  <xsl:choose>
11046
- <xsl:when test="$type = 'arabic'">
11047
- 1)
10604
+ <xsl:when test="$type = 'arabic'">1)
11048
10605
  </xsl:when>
11049
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
11050
- a)
10606
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
11051
10607
  </xsl:when>
11052
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
11053
- A)
10608
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A)
11054
10609
  </xsl:when>
11055
- <xsl:when test="$type = 'roman'">
11056
- i)
10610
+ <xsl:when test="$type = 'roman'">i)
11057
10611
  </xsl:when>
11058
10612
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
11059
10613
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -11090,19 +10644,16 @@
11090
10644
  </fo:block-container>
11091
10645
  </xsl:when>
11092
10646
  <xsl:otherwise>
11093
-
11094
- <fo:block role="SKIP">
11095
- <xsl:apply-templates select="." mode="list">
11096
- <xsl:with-param name="indent" select="$indent"/>
11097
- </xsl:apply-templates>
11098
- </fo:block>
11099
-
10647
+ <fo:block role="SKIP">
10648
+ <xsl:apply-templates select="." mode="list">
10649
+ <xsl:with-param name="indent" select="$indent"/>
10650
+ </xsl:apply-templates>
10651
+ </fo:block>
11100
10652
  </xsl:otherwise>
11101
10653
  </xsl:choose>
11102
10654
  </xsl:template>
11103
10655
 
11104
10656
  <xsl:template name="refine_list_container_style">
11105
-
11106
10657
  </xsl:template> <!-- refine_list_container_style -->
11107
10658
 
11108
10659
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -11166,7 +10717,6 @@
11166
10717
  </xsl:template>
11167
10718
 
11168
10719
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
11169
-
11170
10720
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
11171
10721
 
11172
10722
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -11451,7 +11001,6 @@
11451
11001
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
11452
11002
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
11453
11003
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
11454
-
11455
11004
  <xsl:apply-templates/>
11456
11005
  </fo:block>
11457
11006
  </xsl:template>
@@ -11503,7 +11052,6 @@
11503
11052
  <fo:table-column column-width="15mm"/>
11504
11053
  <fo:table-body>
11505
11054
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
11506
-
11507
11055
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
11508
11056
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
11509
11057
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -11539,7 +11087,6 @@
11539
11087
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
11540
11088
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
11541
11089
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
11542
-
11543
11090
  </xsl:template>
11544
11091
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
11545
11092
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -11550,16 +11097,13 @@
11550
11097
  <xsl:call-template name="setNamedDestination"/>
11551
11098
  <fo:block id="{@id}">
11552
11099
  <xsl:apply-templates/>
11553
-
11554
11100
  </fo:block>
11555
11101
  </xsl:template>
11556
11102
 
11557
11103
  <!-- Bibliography (non-normative references) -->
11558
11104
  <xsl:template match="*[local-name() = 'references']">
11559
11105
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
11560
-
11561
- <fo:block break-after="page"/>
11562
-
11106
+ <fo:block break-after="page"/>
11563
11107
  </xsl:if>
11564
11108
 
11565
11109
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -11575,9 +11119,7 @@
11575
11119
 
11576
11120
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
11577
11121
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
11578
-
11579
11122
  </fo:block>
11580
-
11581
11123
  </xsl:template> <!-- references -->
11582
11124
 
11583
11125
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -11587,26 +11129,23 @@
11587
11129
  <!-- Normative references -->
11588
11130
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11589
11131
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11590
-
11591
- <xsl:call-template name="setNamedDestination"/>
11592
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11593
-
11594
- <xsl:call-template name="processBibitem"/>
11595
- </fo:block>
11132
+ <xsl:call-template name="setNamedDestination"/>
11133
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11134
+ <xsl:call-template name="processBibitem"/>
11135
+ </fo:block>
11596
11136
 
11597
11137
  </xsl:template> <!-- bibitem -->
11598
11138
 
11599
11139
  <!-- Bibliography (non-normative references) -->
11600
11140
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
11601
11141
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11602
-
11603
- <!-- start CSA bibitem processing -->
11604
- <xsl:call-template name="setNamedDestination"/>
11605
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
11606
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']"/>
11607
- <xsl:apply-templates select="csa:formattedref"/>
11608
- </fo:block>
11609
- <!-- END CSA bibitem processing -->
11142
+ <!-- start CSA bibitem processing -->
11143
+ <xsl:call-template name="setNamedDestination"/>
11144
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
11145
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']"/>
11146
+ <xsl:apply-templates select="csa:formattedref"/>
11147
+ </fo:block>
11148
+ <!-- END CSA bibitem processing -->
11610
11149
 
11611
11150
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
11612
11151
 
@@ -11616,7 +11155,6 @@
11616
11155
  <xsl:otherwise>
11617
11156
  <xsl:call-template name="setNamedDestination"/>
11618
11157
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
11619
-
11620
11158
  <fo:list-item-label end-indent="label-end()">
11621
11159
  <fo:block role="SKIP">
11622
11160
  <fo:inline role="SKIP">
@@ -11643,18 +11181,16 @@
11643
11181
 
11644
11182
  <xsl:template name="processBibitem">
11645
11183
  <xsl:param name="biblio_tag_part">both</xsl:param>
11184
+ <!-- start bibitem processing -->
11185
+ <xsl:if test=".//*[local-name() = 'fn']">
11186
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
11187
+ </xsl:if>
11646
11188
 
11647
- <!-- start bibitem processing -->
11648
- <xsl:if test=".//*[local-name() = 'fn']">
11649
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
11650
- </xsl:if>
11651
-
11652
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11653
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
11654
- </xsl:apply-templates>
11655
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
11656
- <!-- end bibitem processing -->
11657
-
11189
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
11190
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
11191
+ </xsl:apply-templates>
11192
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
11193
+ <!-- end bibitem processing -->
11658
11194
  </xsl:template> <!-- processBibitem (bibitem) -->
11659
11195
 
11660
11196
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -11797,8 +11333,7 @@
11797
11333
  <xsl:choose>
11798
11334
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
11799
11335
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
11800
- <xsl:otherwise><!-- default value -->
11801
- 2
11336
+ <xsl:otherwise><!-- default value -->2
11802
11337
  </xsl:otherwise>
11803
11338
  </xsl:choose>
11804
11339
  </xsl:variable>
@@ -12006,26 +11541,19 @@
12006
11541
  <!-- ================ -->
12007
11542
  <!-- Admonition -->
12008
11543
  <!-- ================ -->
12009
- <xsl:template match="*[local-name() = 'admonition']">
12010
-
12011
- <!-- text in the box -->
12012
- <xsl:call-template name="setNamedDestination"/>
12013
- <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
12014
-
12015
- <xsl:call-template name="setBlockSpanAll"/>
12016
-
12017
- <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
12018
-
12019
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
12020
- <fo:block>
12021
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
12022
- </fo:block>
12023
- </fo:block-container>
12024
-
12025
- </fo:block-container>
12026
-
12027
- </fo:block-container>
11544
+ <xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
11545
+ <xsl:call-template name="setNamedDestination"/>
11546
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
12028
11547
 
11548
+ <xsl:call-template name="setBlockSpanAll"/>
11549
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
11550
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11551
+ <fo:block>
11552
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
11553
+ </fo:block>
11554
+ </fo:block-container>
11555
+ </fo:block-container>
11556
+ </fo:block-container>
12029
11557
  </xsl:template>
12030
11558
 
12031
11559
  <xsl:template name="displayAdmonitionName">
@@ -12072,9 +11600,8 @@
12072
11600
  </xsl:if>
12073
11601
  </xsl:template> -->
12074
11602
 
12075
- <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
12076
- <!-- processing for admonition/p found in the template for 'p' -->
12077
- <xsl:call-template name="paragraph"/>
11603
+ <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']"> <!-- processing for admonition/p found in the template for 'p' -->
11604
+ <xsl:call-template name="paragraph"/>
12078
11605
 
12079
11606
  </xsl:template>
12080
11607
 
@@ -12111,11 +11638,9 @@
12111
11638
 
12112
11639
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
12113
11640
  <xsl:variable name="updated_xml_step2">
12114
-
12115
- <xsl:if test="$table_if = 'false'">
12116
- <xsl:copy-of select="$updated_xml_step1"/>
12117
- </xsl:if>
12118
-
11641
+ <xsl:if test="$table_if = 'false'">
11642
+ <xsl:copy-of select="$updated_xml_step1"/>
11643
+ </xsl:if>
12119
11644
  </xsl:variable>
12120
11645
 
12121
11646
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -12590,7 +12115,6 @@
12590
12115
  </xsl:template>
12591
12116
 
12592
12117
  <xsl:template name="addNamedDestinationAttribute">
12593
-
12594
12118
  </xsl:template>
12595
12119
 
12596
12120
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -13085,7 +12609,6 @@
13085
12609
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
13086
12610
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
13087
12611
  <!-- if EXPRESS reference -->
13088
-
13089
12612
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
13090
12613
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
13091
12614
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -13139,8 +12662,7 @@
13139
12662
 
13140
12663
  <xsl:variable name="text2">
13141
12664
  <xsl:element name="text" namespace="{$namespace_full}">
13142
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
13143
- <xsl:copy-of select="."/>
12665
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
13144
12666
  </xsl:for-each>
13145
12667
  </xsl:element>
13146
12668
  </xsl:variable>
@@ -13432,9 +12954,7 @@
13432
12954
  </xsl:attribute>
13433
12955
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
13434
12956
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
13435
-
13436
- <xsl:value-of select="$skip_footnote_body_"/>
13437
-
12957
+ <xsl:value-of select="$skip_footnote_body_"/>
13438
12958
  </xsl:attribute>
13439
12959
  <xsl:attribute name="ref_id">
13440
12960
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -13523,7 +13043,6 @@
13523
13043
 
13524
13044
  <xsl:template name="printEdition">
13525
13045
  <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
13526
-
13527
13046
  <xsl:choose>
13528
13047
  <xsl:when test="$edition_i18n != ''">
13529
13048
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -13752,8 +13271,7 @@
13752
13271
  <dc:title>
13753
13272
  <xsl:variable name="title">
13754
13273
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
13755
-
13756
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
13274
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
13757
13275
 
13758
13276
  </xsl:for-each>
13759
13277
  </xsl:variable>
@@ -13772,16 +13290,14 @@
13772
13290
  </dc:title>
13773
13291
  <xsl:variable name="dc_creator">
13774
13292
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
13775
-
13776
- <rdf:Seq>
13777
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
13778
- <rdf:li>
13779
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
13780
- </rdf:li>
13781
- <!-- <xsl:if test="position() != last()">; </xsl:if> -->
13782
- </xsl:for-each>
13783
- </rdf:Seq>
13784
-
13293
+ <rdf:Seq>
13294
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
13295
+ <rdf:li>
13296
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
13297
+ </rdf:li>
13298
+ <!-- <xsl:if test="position() != last()">; </xsl:if> -->
13299
+ </xsl:for-each>
13300
+ </rdf:Seq>
13785
13301
  </xsl:for-each>
13786
13302
  </xsl:variable>
13787
13303
  <xsl:if test="normalize-space($dc_creator) != ''">
@@ -13792,9 +13308,7 @@
13792
13308
 
13793
13309
  <xsl:variable name="dc_description">
13794
13310
  <xsl:variable name="abstract">
13795
-
13796
- <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'])]"/>
13797
-
13311
+ <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'])]"/>
13798
13312
  </xsl:variable>
13799
13313
  <rdf:Alt>
13800
13314
  <rdf:li xml:lang="x-default">
@@ -13859,7 +13373,9 @@
13859
13373
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
13860
13374
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
13861
13375
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
13862
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
13376
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
13377
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
13378
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
13863
13379
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
13864
13380
  <!-- Todo: need update -->
13865
13381
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -14024,7 +13540,7 @@
14024
13540
  <xsl:param name="normalize-space" select="'true'"/>
14025
13541
  <xsl:param name="keep_sep" select="'false'"/>
14026
13542
  <xsl:if test="string-length($pText) &gt;0">
14027
- <item>
13543
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
14028
13544
  <xsl:choose>
14029
13545
  <xsl:when test="$normalize-space = 'true'">
14030
13546
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -14033,8 +13549,8 @@
14033
13549
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
14034
13550
  </xsl:otherwise>
14035
13551
  </xsl:choose>
14036
- </item>
14037
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
13552
+ </xsl:element>
13553
+ <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>
14038
13554
  <xsl:call-template name="split">
14039
13555
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
14040
13556
  <xsl:with-param name="sep" select="$sep"/>
@@ -14052,30 +13568,6 @@
14052
13568
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
14053
13569
  </xsl:template>
14054
13570
 
14055
- <xsl:template name="namespaceCheck">
14056
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
14057
- <xsl:variable name="XSLNS">
14058
-
14059
- <xsl:value-of select="document('')//*/namespace::csa"/>
14060
-
14061
- </xsl:variable>
14062
- <!-- <xsl:if test="$documentNS != $XSLNS">
14063
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
14064
- </xsl:if> -->
14065
- </xsl:template> <!-- namespaceCheck -->
14066
-
14067
- <xsl:template name="getLanguage">
14068
- <xsl:param name="lang"/>
14069
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
14070
- <xsl:choose>
14071
- <xsl:when test="$language = 'en'">English</xsl:when>
14072
- <xsl:when test="$language = 'fr'">French</xsl:when>
14073
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
14074
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
14075
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
14076
- </xsl:choose>
14077
- </xsl:template>
14078
-
14079
13571
  <xsl:template name="setId">
14080
13572
  <xsl:param name="prefix"/>
14081
13573
  <xsl:attribute name="id">