metanorma-csa 2.6.6 → 2.6.8

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