metanorma-ieee 1.4.7 → 1.4.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.
@@ -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:ieee="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:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" 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:ieee="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:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" extension-element-prefixes="redirect" version="1.0">
2
2
 
3
3
  <xsl:output method="xml" encoding="UTF-8" indent="no"/>
4
4
 
@@ -20,15 +20,15 @@
20
20
  <xsl:copy-of select="."/>
21
21
  </xsl:variable> -->
22
22
  <xsl:for-each select="."> <!-- xalan:nodeset($current_document) -->
23
- <doc num="{$num}" firstpage_id="firstpage_id_{$num}" title-part="{$docnumber}" bundle="{$bundle}"> <!-- 'bundle' means several different documents (not language versions) in one xml -->
24
- <contents>
23
+ <mn:doc num="{$num}" firstpage_id="firstpage_id_{$num}" title-part="{$docnumber}" bundle="{$bundle}"> <!-- 'bundle' means several different documents (not language versions) in one xml -->
24
+ <mn:contents>
25
25
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
26
26
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
27
27
  <xsl:apply-templates select="//ieee:indexsect" mode="contents"/>
28
28
 
29
29
  <xsl:call-template name="processTablesFigures_Contents"/>
30
- </contents>
31
- </doc>
30
+ </mn:contents>
31
+ </mn:doc>
32
32
  </xsl:for-each>
33
33
  </xsl:for-each>
34
34
  </xsl:variable>
@@ -1162,7 +1162,7 @@
1162
1162
 
1163
1163
  <xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
1164
1164
  <fo:block role="TOC">
1165
- <xsl:if test="$contents/doc[@num = $num]//item[@display = 'true']">
1165
+ <xsl:if test="$contents/mn:doc[@num = $num]//mn:item[@display = 'true']">
1166
1166
  <xsl:choose>
1167
1167
  <xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
1168
1168
 
@@ -1171,7 +1171,7 @@
1171
1171
 
1172
1172
  <xsl:variable name="margin-left">4</xsl:variable>
1173
1173
 
1174
- <xsl:for-each select="$contents/doc[@num = $num]//item[@display = 'true']">
1174
+ <xsl:for-each select="$contents/mn:doc[@num = $num]//mn:item[@display = 'true']">
1175
1175
  <fo:block role="TOCI">
1176
1176
  <xsl:if test="@level = 1">
1177
1177
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1183,13 +1183,13 @@
1183
1183
  <xsl:attribute name="font-weight">normal</xsl:attribute>
1184
1184
  </xsl:if>
1185
1185
 
1186
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
1186
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
1187
1187
 
1188
1188
  <xsl:value-of select="@section"/>
1189
1189
  <!-- <xsl:if test="normalize-space(@section) != '' and @level = 1">.</xsl:if> -->
1190
1190
  <xsl:if test="normalize-space(@section) != ''"><xsl:text> </xsl:text></xsl:if>
1191
1191
 
1192
- <xsl:apply-templates select="title"/>
1192
+ <xsl:apply-templates select="mn:title"/>
1193
1193
 
1194
1194
  <fo:inline keep-together.within-line="always">
1195
1195
  <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
@@ -1204,21 +1204,21 @@
1204
1204
  </xsl:for-each>
1205
1205
 
1206
1206
  <!-- List of Tables -->
1207
- <xsl:if test="$contents//tables/table">
1207
+ <xsl:if test="$contents//mn:tables/mn:table">
1208
1208
  <xsl:call-template name="insertListOf_Title">
1209
1209
  <xsl:with-param name="title" select="$title-list-tables"/>
1210
1210
  </xsl:call-template>
1211
- <xsl:for-each select="$contents//tables/table">
1211
+ <xsl:for-each select="$contents//mn:tables/mn:table">
1212
1212
  <xsl:call-template name="insertListOf_Item"/>
1213
1213
  </xsl:for-each>
1214
1214
  </xsl:if>
1215
1215
 
1216
1216
  <!-- List of Figures -->
1217
- <xsl:if test="$contents//figures/figure">
1217
+ <xsl:if test="$contents//mn:figures/mn:figure">
1218
1218
  <xsl:call-template name="insertListOf_Title">
1219
1219
  <xsl:with-param name="title" select="$title-list-figures"/>
1220
1220
  </xsl:call-template>
1221
- <xsl:for-each select="$contents//figures/figure">
1221
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
1222
1222
  <xsl:call-template name="insertListOf_Item"/>
1223
1223
  </xsl:for-each>
1224
1224
  </xsl:if>
@@ -1229,7 +1229,7 @@
1229
1229
 
1230
1230
  <xsl:variable name="provisional-distance-between-starts">10</xsl:variable>
1231
1231
 
1232
- <xsl:for-each select="$contents/doc[@num = $num]//item[@display = 'true']">
1232
+ <xsl:for-each select="$contents/mn:doc[@num = $num]//mn:item[@display = 'true']">
1233
1233
 
1234
1234
  <fo:list-block provisional-distance-between-starts="{$provisional-distance-between-starts}mm" role="TOCI">
1235
1235
 
@@ -1256,9 +1256,9 @@
1256
1256
  </xsl:if>
1257
1257
  </xsl:if>
1258
1258
 
1259
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
1259
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
1260
1260
 
1261
- <xsl:apply-templates select="title"/>
1261
+ <xsl:apply-templates select="mn:title"/>
1262
1262
 
1263
1263
  <fo:inline keep-together.within-line="always">
1264
1264
  <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
@@ -1276,23 +1276,23 @@
1276
1276
  </xsl:for-each>
1277
1277
 
1278
1278
  <!-- List of Figures -->
1279
- <xsl:if test="$contents//figures/figure">
1279
+ <xsl:if test="$contents//mn:figures/mn:figure">
1280
1280
  <fo:block break-after="page"/>
1281
1281
  <xsl:call-template name="insertListOf_Title">
1282
1282
  <xsl:with-param name="title" select="'Figures'"/>
1283
1283
  </xsl:call-template>
1284
- <xsl:for-each select="$contents//figures/figure">
1284
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
1285
1285
  <xsl:call-template name="insertListOf_Item"/>
1286
1286
  </xsl:for-each>
1287
1287
  </xsl:if>
1288
1288
 
1289
1289
  <!-- List of Tables -->
1290
- <xsl:if test="$contents//tables/table">
1290
+ <xsl:if test="$contents//mn:tables/mn:table">
1291
1291
  <fo:block break-after="page"/>
1292
1292
  <xsl:call-template name="insertListOf_Title">
1293
1293
  <xsl:with-param name="title" select="'Tables'"/>
1294
1294
  </xsl:call-template>
1295
- <xsl:for-each select="$contents//tables/table">
1295
+ <xsl:for-each select="$contents//mn:tables/mn:table">
1296
1296
  <xsl:call-template name="insertListOf_Item"/>
1297
1297
  </xsl:for-each>
1298
1298
  </xsl:if>
@@ -1313,14 +1313,14 @@
1313
1313
  </xsl:choose>
1314
1314
  </xsl:variable>
1315
1315
 
1316
- <xsl:for-each select="$contents/doc[@num = $num]//item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table']">
1316
+ <xsl:for-each select="$contents/mn:doc[@num = $num]//mn:item[@display = 'true'][@level &lt;= $toc_level or @type = 'figure' or @type = 'table']">
1317
1317
  <fo:block role="TOCI">
1318
1318
  <xsl:if test="@level = 1">
1319
1319
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1320
1320
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1321
1321
  </xsl:if>
1322
1322
 
1323
- <xsl:if test="@type = 'figure' or @type = 'table' and preceding-sibling::item[1][@type = 'figure' or @type = 'table']">
1323
+ <xsl:if test="@type = 'figure' or @type = 'table' and preceding-sibling::mn:item[1][@type = 'figure' or @type = 'table']">
1324
1324
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
1325
1325
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
1326
1326
  </xsl:if>
@@ -1331,13 +1331,13 @@
1331
1331
  <xsl:attribute name="font-weight">normal</xsl:attribute>
1332
1332
  </xsl:if>
1333
1333
 
1334
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
1334
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
1335
1335
 
1336
1336
  <xsl:value-of select="@section"/>
1337
1337
  <xsl:if test="normalize-space(@section) != ''"><xsl:text> </xsl:text></xsl:if>
1338
1338
 
1339
1339
  <xsl:variable name="section_title">
1340
- <xsl:apply-templates select="title"/>
1340
+ <xsl:apply-templates select="mn:title"/>
1341
1341
  </xsl:variable>
1342
1342
 
1343
1343
  <!-- DEBUG=<xsl:copy-of select="$title"/> -->
@@ -1870,19 +1870,19 @@
1870
1870
  <xsl:if test="ancestor-or-self::ieee:annex">annex</xsl:if>
1871
1871
  </xsl:variable>
1872
1872
 
1873
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
1873
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
1874
1874
  <xsl:if test="$type = 'index'">
1875
1875
  <xsl:attribute name="level">1</xsl:attribute>
1876
1876
  </xsl:if>
1877
- <title>
1877
+ <mn:title>
1878
1878
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
1879
1879
  <xsl:with-param name="mode">contents</xsl:with-param>
1880
1880
  </xsl:apply-templates>
1881
- </title>
1881
+ </mn:title>
1882
1882
  <xsl:if test="$type != 'index'">
1883
1883
  <xsl:apply-templates mode="contents"/>
1884
1884
  </xsl:if>
1885
- </item>
1885
+ </mn:item>
1886
1886
  </xsl:if>
1887
1887
  </xsl:template>
1888
1888
 
@@ -1895,7 +1895,7 @@
1895
1895
  </xsl:call-template>
1896
1896
  </xsl:for-each>
1897
1897
  </xsl:variable>
1898
- <item id="{@id}" level="{$level}" section="" type="{local-name()}" root="" display="true">
1898
+ <mn:item id="{@id}" level="{$level}" section="" type="{local-name()}" root="" display="true">
1899
1899
  <xsl:variable name="name">
1900
1900
  <xsl:apply-templates select="ieee:name" mode="contents_item">
1901
1901
  <xsl:with-param name="mode">contents</xsl:with-param>
@@ -1904,10 +1904,10 @@
1904
1904
  <xsl:if test="not(contains(normalize-space($name), '—'))">
1905
1905
  <xsl:attribute name="display">false</xsl:attribute>
1906
1906
  </xsl:if>
1907
- <title>
1907
+ <mn:title>
1908
1908
  <xsl:copy-of select="$name"/>
1909
- </title>
1910
- </item>
1909
+ </mn:title>
1910
+ </mn:item>
1911
1911
  </xsl:if>
1912
1912
  </xsl:template>
1913
1913
 
@@ -3798,34 +3798,25 @@
3798
3798
  <!-- End Back Pages -->
3799
3799
  <!-- =============================== -->
3800
3800
 
3801
- <!-- <xsl:strip-space elements="ieee:xref"/> -->
3801
+ <!-- https://www.metanorma.org/ns/standoc -->
3802
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
3802
3803
 
3803
- <xsl:variable name="namespace_full_">
3804
- <xsl:choose>
3805
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
3806
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
3807
- </xsl:choose>
3808
- </xsl:variable>
3809
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
3804
+ <!-- https://www.metanorma.org/ns/xsl -->
3805
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
3810
3806
 
3811
- <xsl:variable name="root_element_">
3812
- <xsl:choose>
3813
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
3814
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
3815
- </xsl:choose>
3816
- </xsl:variable>
3817
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
3807
+ <xsl:variable name="root_element">metanorma</xsl:variable>
3818
3808
 
3809
+ <!---examples: 2013, 2024 -->
3819
3810
  <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'])"/>
3820
3811
 
3821
3812
  <!-- external parameters -->
3822
-
3823
3813
  <xsl:param name="svg_images"/> <!-- svg images array -->
3824
3814
  <xsl:variable name="images" select="document($svg_images)"/>
3825
3815
  <xsl:param name="basepath"/> <!-- base path for images -->
3826
3816
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
3827
3817
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
3828
3818
  <xsl:param name="output_path"/> <!-- output PDF file name -->
3819
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
3829
3820
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
3830
3821
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
3831
3822
  <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 -->
@@ -3872,20 +3863,13 @@
3872
3863
 
3873
3864
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
3874
3865
 
3875
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
3876
- true
3866
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
3867
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
3877
3868
  </xsl:variable>
3878
3869
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
3879
3870
 
3880
- <xsl:variable name="isGenerateTableIF_">
3881
- <xsl:choose>
3882
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
3883
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
3884
- </xsl:when>
3885
- <xsl:otherwise>false</xsl:otherwise>
3886
- </xsl:choose>
3887
- </xsl:variable>
3888
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
3871
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
3872
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
3889
3873
 
3890
3874
  <xsl:variable name="lang">
3891
3875
  <xsl:call-template name="getLang"/>
@@ -3937,8 +3921,7 @@
3937
3921
  <xsl:variable name="pageWidth_">
3938
3922
  <xsl:choose>
3939
3923
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
3940
- <xsl:otherwise>
3941
- 215.9
3924
+ <xsl:otherwise>215.9
3942
3925
  </xsl:otherwise>
3943
3926
  </xsl:choose>
3944
3927
  </xsl:variable>
@@ -3948,8 +3931,7 @@
3948
3931
  <xsl:variable name="pageHeight_">
3949
3932
  <xsl:choose>
3950
3933
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
3951
- <xsl:otherwise>
3952
- 279.4
3934
+ <xsl:otherwise>279.4
3953
3935
  </xsl:otherwise>
3954
3936
  </xsl:choose>
3955
3937
  </xsl:variable>
@@ -3958,23 +3940,19 @@
3958
3940
  <!-- Page margins in mm (just digits, without 'mm')-->
3959
3941
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
3960
3942
  for example, left margin on odd page and right margin on even page -->
3961
- <xsl:variable name="marginLeftRight1_">
3962
- 31.7
3943
+ <xsl:variable name="marginLeftRight1_">31.7
3963
3944
  </xsl:variable>
3964
3945
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
3965
3946
 
3966
- <xsl:variable name="marginLeftRight2_">
3967
- 31.7
3947
+ <xsl:variable name="marginLeftRight2_">31.7
3968
3948
  </xsl:variable>
3969
3949
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
3970
3950
 
3971
- <xsl:variable name="marginTop_">
3972
- 25.4
3951
+ <xsl:variable name="marginTop_">25.4
3973
3952
  </xsl:variable>
3974
3953
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
3975
3954
 
3976
- <xsl:variable name="marginBottom_">
3977
- 25.4
3955
+ <xsl:variable name="marginBottom_">25.4
3978
3956
  </xsl:variable>
3979
3957
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
3980
3958
 
@@ -4023,13 +4001,10 @@
4023
4001
  <title-toc lang="zh">目次</title-toc>
4024
4002
 
4025
4003
  <title-part lang="en">
4026
-
4027
4004
  </title-part>
4028
4005
  <title-part lang="fr">
4029
-
4030
4006
  </title-part>
4031
4007
  <title-part lang="ru">
4032
-
4033
4008
  </title-part>
4034
4009
  <title-part lang="zh">第 # 部分:</title-part>
4035
4010
 
@@ -4125,11 +4100,9 @@
4125
4100
  <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>
4126
4101
  <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>
4127
4102
  <xsl:attribute-set name="root-style">
4128
-
4129
- <xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
4130
- <xsl:attribute name="font-family-generic">Serif</xsl:attribute>
4131
- <xsl:attribute name="font-size">10pt</xsl:attribute>
4132
-
4103
+ <xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
4104
+ <xsl:attribute name="font-family-generic">Serif</xsl:attribute>
4105
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4133
4106
  </xsl:attribute-set> <!-- root-style -->
4134
4107
 
4135
4108
  <xsl:template name="insertRootStyle">
@@ -4217,28 +4190,22 @@
4217
4190
 
4218
4191
  <!-- Preface sections styles -->
4219
4192
  <xsl:attribute-set name="copyright-statement-style">
4220
-
4221
4193
  </xsl:attribute-set> <!-- copyright-statement-style -->
4222
4194
 
4223
4195
  <xsl:attribute-set name="copyright-statement-title-style">
4224
-
4225
4196
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
4226
4197
 
4227
4198
  <xsl:attribute-set name="copyright-statement-p-style">
4228
-
4229
4199
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
4230
4200
 
4231
4201
  <xsl:attribute-set name="license-statement-style">
4232
-
4233
4202
  </xsl:attribute-set>
4234
4203
 
4235
4204
  <xsl:attribute-set name="license-statement-title-style">
4236
4205
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4237
-
4238
4206
  </xsl:attribute-set> <!-- license-statement-title-style -->
4239
4207
 
4240
4208
  <xsl:attribute-set name="license-statement-p-style">
4241
-
4242
4209
  </xsl:attribute-set> <!-- license-statement-p-style -->
4243
4210
 
4244
4211
  <xsl:attribute-set name="legal-statement-style">
@@ -4247,103 +4214,82 @@
4247
4214
 
4248
4215
  <xsl:attribute-set name="legal-statement-title-style">
4249
4216
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4250
-
4251
4217
  </xsl:attribute-set> <!-- legal-statement-title-style -->
4252
4218
 
4253
4219
  <xsl:attribute-set name="legal-statement-p-style">
4254
-
4255
4220
  </xsl:attribute-set> <!-- legal-statement-p-style -->
4256
4221
 
4257
4222
  <xsl:attribute-set name="feedback-statement-style">
4258
-
4259
4223
  </xsl:attribute-set> <!-- feedback-statement-style -->
4260
4224
 
4261
4225
  <xsl:attribute-set name="feedback-statement-title-style">
4262
4226
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4263
-
4264
4227
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
4265
4228
 
4266
4229
  <xsl:attribute-set name="feedback-statement-p-style">
4267
-
4268
4230
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
4269
4231
 
4270
4232
  <!-- End Preface sections styles -->
4271
4233
 
4272
4234
  <xsl:attribute-set name="link-style">
4273
-
4274
- <xsl:attribute name="color">blue</xsl:attribute>
4275
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
4276
-
4235
+ <xsl:attribute name="color">blue</xsl:attribute>
4236
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4277
4237
  </xsl:attribute-set>
4278
4238
 
4279
4239
  <xsl:template name="refine_link-style">
4280
-
4281
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4282
- <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4283
- <xsl:attribute name="text-decoration">none</xsl:attribute>
4284
- </xsl:if>
4285
- <xsl:if test="$current_template = 'standard'">
4286
- <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4287
- <xsl:attribute name="text-decoration">none</xsl:attribute>
4288
- <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4289
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
4290
- </xsl:if>
4240
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4241
+ <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4242
+ <xsl:attribute name="text-decoration">none</xsl:attribute>
4243
+ </xsl:if>
4244
+ <xsl:if test="$current_template = 'standard'">
4245
+ <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4246
+ <xsl:attribute name="text-decoration">none</xsl:attribute>
4247
+ <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4248
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4291
4249
  </xsl:if>
4292
-
4250
+ </xsl:if>
4293
4251
  </xsl:template> <!-- refine_link-style -->
4294
4252
 
4295
4253
  <xsl:attribute-set name="sourcecode-container-style">
4296
-
4297
4254
  </xsl:attribute-set>
4298
4255
 
4299
4256
  <xsl:attribute-set name="sourcecode-style">
4300
4257
  <xsl:attribute name="white-space">pre</xsl:attribute>
4301
4258
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
4302
4259
  <xsl:attribute name="role">Code</xsl:attribute>
4303
-
4304
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
4305
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
4306
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
4307
-
4260
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
4261
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
4262
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
4308
4263
  </xsl:attribute-set>
4309
4264
 
4310
4265
  <xsl:template name="refine_sourcecode-style">
4311
-
4312
4266
  </xsl:template> <!-- refine_sourcecode-style -->
4313
4267
 
4314
4268
  <xsl:attribute-set name="pre-style">
4315
4269
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
4316
4270
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4317
-
4318
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
4319
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
4320
- <xsl:attribute name="font-size">95%</xsl:attribute>
4321
-
4271
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
4272
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
4273
+ <xsl:attribute name="font-size">95%</xsl:attribute>
4322
4274
  </xsl:attribute-set>
4323
4275
 
4324
4276
  <xsl:attribute-set name="permission-style">
4325
-
4326
4277
  </xsl:attribute-set>
4327
4278
 
4328
4279
  <xsl:attribute-set name="permission-name-style">
4329
-
4330
4280
  </xsl:attribute-set>
4331
4281
 
4332
4282
  <xsl:attribute-set name="permission-label-style">
4333
-
4334
4283
  </xsl:attribute-set>
4335
4284
 
4336
4285
  <xsl:attribute-set name="requirement-style">
4337
-
4338
4286
  </xsl:attribute-set>
4339
4287
 
4340
4288
  <xsl:attribute-set name="requirement-name-style">
4341
4289
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4342
-
4343
4290
  </xsl:attribute-set>
4344
4291
 
4345
4292
  <xsl:attribute-set name="requirement-label-style">
4346
-
4347
4293
  </xsl:attribute-set>
4348
4294
 
4349
4295
  <xsl:attribute-set name="subject-style">
@@ -4371,55 +4317,42 @@
4371
4317
  </xsl:attribute-set>
4372
4318
 
4373
4319
  <xsl:attribute-set name="recommendation-style">
4374
-
4375
4320
  </xsl:attribute-set>
4376
4321
 
4377
4322
  <xsl:attribute-set name="recommendation-name-style">
4378
-
4379
4323
  </xsl:attribute-set>
4380
4324
 
4381
4325
  <xsl:attribute-set name="recommendation-label-style">
4382
-
4383
4326
  </xsl:attribute-set>
4384
4327
 
4385
4328
  <xsl:attribute-set name="termexample-style">
4386
-
4387
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
4388
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4389
- <xsl:attribute name="text-align">justify</xsl:attribute>
4390
-
4329
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
4330
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4331
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4391
4332
  </xsl:attribute-set>
4392
4333
 
4393
4334
  <xsl:template name="refine_termexample-style">
4394
-
4395
4335
  </xsl:template>
4396
4336
 
4397
4337
  <xsl:attribute-set name="example-style">
4398
-
4399
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
4400
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4401
- <xsl:attribute name="text-align">justify</xsl:attribute>
4402
-
4338
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
4339
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4340
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4403
4341
  </xsl:attribute-set> <!-- example-style -->
4404
4342
 
4405
4343
  <xsl:template name="refine_example-style">
4406
-
4407
4344
  </xsl:template> <!-- refine_example-style -->
4408
4345
 
4409
4346
  <xsl:attribute-set name="example-body-style">
4410
-
4411
4347
  </xsl:attribute-set> <!-- example-body-style -->
4412
4348
 
4413
4349
  <xsl:attribute-set name="example-name-style">
4414
-
4415
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
4416
- <xsl:attribute name="padding-right">9mm</xsl:attribute>
4417
- <xsl:attribute name="font-style">italic</xsl:attribute>
4418
-
4350
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
4351
+ <xsl:attribute name="padding-right">9mm</xsl:attribute>
4352
+ <xsl:attribute name="font-style">italic</xsl:attribute>
4419
4353
  </xsl:attribute-set> <!-- example-name-style -->
4420
4354
 
4421
4355
  <xsl:template name="refine_example-name-style">
4422
-
4423
4356
  </xsl:template>
4424
4357
 
4425
4358
  <xsl:attribute-set name="example-p-style">
@@ -4427,97 +4360,77 @@
4427
4360
  </xsl:attribute-set> <!-- example-p-style -->
4428
4361
 
4429
4362
  <xsl:template name="refine_example-p-style">
4430
-
4431
- <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])">
4432
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
4433
- </xsl:if>
4434
-
4363
+ <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])">
4364
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
4365
+ </xsl:if>
4435
4366
  </xsl:template> <!-- refine_example-p-style -->
4436
4367
 
4437
4368
  <xsl:attribute-set name="termexample-name-style">
4438
-
4439
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
4440
- <xsl:attribute name="padding-right">9mm</xsl:attribute>
4441
- <xsl:attribute name="font-style">italic</xsl:attribute>
4442
-
4369
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
4370
+ <xsl:attribute name="padding-right">9mm</xsl:attribute>
4371
+ <xsl:attribute name="font-style">italic</xsl:attribute>
4443
4372
  </xsl:attribute-set> <!-- termexample-name-style -->
4444
4373
 
4445
4374
  <xsl:template name="refine_termexample-name-style">
4446
-
4447
4375
  </xsl:template>
4448
4376
 
4449
4377
  <!-- ========================== -->
4450
4378
  <!-- Table styles -->
4451
4379
  <!-- ========================== -->
4452
- <xsl:variable name="table-border_">
4453
-
4454
- 1pt solid black
4455
-
4456
-
4380
+ <xsl:variable name="table-border_">1pt solid black
4457
4381
  </xsl:variable>
4458
4382
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
4459
4383
 
4460
4384
  <xsl:variable name="table-cell-border_">
4461
-
4462
4385
  </xsl:variable>
4463
4386
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
4464
4387
 
4465
4388
  <xsl:attribute-set name="table-container-style">
4466
4389
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
4467
4390
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
4468
-
4469
- <xsl:attribute name="font-size">9pt</xsl:attribute>
4470
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
4471
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4472
-
4391
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
4392
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
4393
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
4473
4394
  </xsl:attribute-set> <!-- table-container-style -->
4474
4395
 
4475
4396
  <xsl:template name="refine_table-container-style">
4476
4397
  <xsl:param name="margin-side"/>
4477
-
4478
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4479
- <xsl:attribute name="font-size">10pt</xsl:attribute>
4480
- </xsl:if>
4481
- <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4482
- <xsl:attribute name="font-size">inherit</xsl:attribute>
4483
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
4484
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4485
- </xsl:if>
4486
-
4398
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4399
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4400
+ </xsl:if>
4401
+ <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4402
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
4403
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
4404
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4405
+ </xsl:if>
4487
4406
  <!-- end table block-container attributes -->
4488
4407
  </xsl:template> <!-- refine_table-container-style -->
4489
4408
 
4490
4409
  <xsl:attribute-set name="table-style">
4491
4410
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
4492
4411
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
4493
-
4494
- <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
4495
-
4412
+ <xsl:attribute name="border"><xsl:value-of select="$table-border"/></xsl:attribute>
4496
4413
  </xsl:attribute-set><!-- table-style -->
4497
4414
 
4498
4415
  <xsl:template name="refine_table-style">
4499
4416
  <xsl:param name="margin-side"/>
4500
-
4501
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4502
- <xsl:attribute name="border">0.5 solid black</xsl:attribute>
4503
- </xsl:if>
4504
- <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4505
- <xsl:attribute name="border">none</xsl:attribute>
4506
- </xsl:if>
4417
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4418
+ <xsl:attribute name="border">0.5 solid black</xsl:attribute>
4419
+ </xsl:if>
4420
+ <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4421
+ <xsl:attribute name="border">none</xsl:attribute>
4422
+ </xsl:if>
4507
4423
 
4508
4424
  <xsl:call-template name="setBordersTableArray"/>
4509
-
4510
4425
  </xsl:template> <!-- refine_table-style -->
4511
4426
 
4512
4427
  <xsl:attribute-set name="table-name-style">
4513
4428
  <xsl:attribute name="role">Caption</xsl:attribute>
4514
4429
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4515
-
4516
- <xsl:attribute name="font-family">Arial</xsl:attribute>
4517
- <xsl:attribute name="font-weight">bold</xsl:attribute>
4518
- <xsl:attribute name="text-align">center</xsl:attribute>
4519
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4520
-
4430
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
4431
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
4432
+ <xsl:attribute name="text-align">center</xsl:attribute>
4433
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4521
4434
  </xsl:attribute-set> <!-- table-name-style -->
4522
4435
 
4523
4436
  <xsl:template name="refine_table-name-style">
@@ -4525,38 +4438,31 @@
4525
4438
  <xsl:if test="$continued = 'true'">
4526
4439
  <xsl:attribute name="role">SKIP</xsl:attribute>
4527
4440
  </xsl:if>
4528
-
4529
4441
  </xsl:template> <!-- refine_table-name-style -->
4530
4442
 
4531
4443
  <xsl:attribute-set name="table-row-style">
4532
4444
  <xsl:attribute name="min-height">4mm</xsl:attribute>
4533
-
4534
4445
  </xsl:attribute-set>
4535
4446
 
4536
4447
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
4537
4448
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4538
-
4539
4449
  </xsl:attribute-set>
4540
4450
 
4541
4451
  <xsl:template name="refine_table-header-row-style">
4542
4452
 
4543
4453
  <xsl:call-template name="setBordersTableArray"/>
4544
-
4545
- <xsl:if test="position() = last()">
4546
- <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
4547
- </xsl:if>
4548
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4549
- <xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
4550
- </xsl:if>
4551
-
4454
+ <xsl:if test="position() = last()">
4455
+ <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
4456
+ </xsl:if>
4457
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4458
+ <xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
4459
+ </xsl:if>
4552
4460
  </xsl:template> <!-- refine_table-header-row-style -->
4553
4461
 
4554
4462
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
4555
-
4556
4463
  </xsl:attribute-set>
4557
4464
 
4558
4465
  <xsl:template name="refine_table-footer-row-style">
4559
-
4560
4466
  </xsl:template> <!-- refine_table-footer-row-style -->
4561
4467
 
4562
4468
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -4564,13 +4470,11 @@
4564
4470
  </xsl:attribute-set>
4565
4471
 
4566
4472
  <xsl:template name="refine_table-body-row-style">
4567
-
4568
- <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4569
- <xsl:attribute name="min-height">0mm</xsl:attribute>
4570
- </xsl:if>
4473
+ <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4474
+ <xsl:attribute name="min-height">0mm</xsl:attribute>
4475
+ </xsl:if>
4571
4476
 
4572
4477
  <xsl:call-template name="setBordersTableArray"/>
4573
-
4574
4478
  </xsl:template> <!-- refine_table-body-row-style -->
4575
4479
 
4576
4480
  <xsl:attribute-set name="table-header-cell-style">
@@ -4578,10 +4482,8 @@
4578
4482
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
4579
4483
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
4580
4484
  <xsl:attribute name="display-align">center</xsl:attribute>
4581
-
4582
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
4583
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4584
-
4485
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
4486
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4585
4487
  </xsl:attribute-set> <!-- table-header-cell-style -->
4586
4488
 
4587
4489
  <xsl:template name="refine_table-header-cell-style">
@@ -4593,17 +4495,14 @@
4593
4495
  </xsl:if>
4594
4496
 
4595
4497
  <xsl:call-template name="setTableCellAttributes"/>
4596
-
4597
4498
  </xsl:template> <!-- refine_table-header-cell-style -->
4598
4499
 
4599
4500
  <xsl:attribute-set name="table-cell-style">
4600
4501
  <xsl:attribute name="display-align">center</xsl:attribute>
4601
4502
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
4602
4503
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
4603
-
4604
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4605
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4606
-
4504
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
4505
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4607
4506
  </xsl:attribute-set> <!-- table-cell-style -->
4608
4507
 
4609
4508
  <xsl:template name="refine_table-cell-style">
@@ -4611,15 +4510,12 @@
4611
4510
  <xsl:if test="$lang = 'ar'">
4612
4511
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
4613
4512
  </xsl:if>
4614
-
4615
- <!-- bsi -->
4616
-
4617
- <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4618
- <xsl:attribute name="padding-left">0mm</xsl:attribute>
4619
- <xsl:attribute name="padding-top">0mm</xsl:attribute>
4620
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
4621
- <xsl:attribute name="border">none</xsl:attribute>
4622
- </xsl:if>
4513
+ <xsl:if test="ancestor::*[local-name() = 'feedback-statement']">
4514
+ <xsl:attribute name="padding-left">0mm</xsl:attribute>
4515
+ <xsl:attribute name="padding-top">0mm</xsl:attribute>
4516
+ <xsl:attribute name="padding-right">0mm</xsl:attribute>
4517
+ <xsl:attribute name="border">none</xsl:attribute>
4518
+ </xsl:if>
4623
4519
 
4624
4520
  <xsl:call-template name="setBordersTableArray"/>
4625
4521
 
@@ -4630,70 +4526,54 @@
4630
4526
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
4631
4527
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
4632
4528
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
4633
-
4634
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4635
-
4529
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
4636
4530
  </xsl:attribute-set> <!-- table-footer-cell-style -->
4637
4531
 
4638
4532
  <xsl:template name="refine_table-footer-cell-style">
4639
-
4640
4533
  </xsl:template> <!-- refine_table-footer-cell-style -->
4641
4534
 
4642
4535
  <xsl:attribute-set name="table-note-style">
4643
4536
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4644
4537
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4645
-
4646
- <xsl:attribute name="font-size">inherit</xsl:attribute>
4647
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4648
-
4538
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
4539
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4649
4540
  </xsl:attribute-set><!-- table-note-style -->
4650
4541
 
4651
4542
  <xsl:template name="refine_table-note-style">
4652
-
4653
4543
  </xsl:template> <!-- refine_table-note-style -->
4654
4544
 
4655
4545
  <xsl:attribute-set name="table-fn-style">
4656
4546
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4657
-
4658
- <xsl:attribute name="font-size">inherit</xsl:attribute>
4659
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4660
- <xsl:attribute name="text-indent">-3mm</xsl:attribute>
4661
- <xsl:attribute name="margin-left">3mm</xsl:attribute>
4662
-
4663
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
4664
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4665
-
4547
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
4548
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4549
+ <xsl:attribute name="text-indent">-3mm</xsl:attribute>
4550
+ <xsl:attribute name="margin-left">3mm</xsl:attribute>
4551
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
4552
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4666
4553
  </xsl:attribute-set> <!-- table-fn-style -->
4667
4554
 
4668
4555
  <xsl:template name="refine_table-fn-style">
4669
-
4670
4556
  </xsl:template>
4671
4557
 
4672
4558
  <xsl:attribute-set name="table-fn-number-style">
4673
4559
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
4674
-
4675
4560
  </xsl:attribute-set> <!-- table-fn-number-style -->
4676
4561
 
4677
4562
  <xsl:attribute-set name="table-fmt-fn-label-style">
4678
4563
  <xsl:attribute name="font-size">80%</xsl:attribute>
4679
-
4680
- <xsl:attribute name="baseline-shift">30%</xsl:attribute>
4681
- <xsl:attribute name="font-size">6.5pt</xsl:attribute>
4682
-
4564
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
4565
+ <xsl:attribute name="font-size">6.5pt</xsl:attribute>
4683
4566
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
4684
4567
 
4685
4568
  <xsl:template name="refine_table-fmt-fn-label-style">
4686
-
4687
4569
  </xsl:template>
4688
4570
 
4689
4571
  <xsl:attribute-set name="fn-container-body-style">
4690
4572
  <xsl:attribute name="text-indent">0</xsl:attribute>
4691
4573
  <xsl:attribute name="start-indent">0</xsl:attribute>
4692
-
4693
4574
  </xsl:attribute-set>
4694
4575
 
4695
4576
  <xsl:attribute-set name="table-fn-body-style">
4696
-
4697
4577
  </xsl:attribute-set>
4698
4578
 
4699
4579
  <xsl:attribute-set name="figure-fn-number-style">
@@ -4703,17 +4583,14 @@
4703
4583
  <xsl:attribute-set name="figure-fmt-fn-label-style">
4704
4584
  <xsl:attribute name="font-size">80%</xsl:attribute>
4705
4585
  <xsl:attribute name="vertical-align">super</xsl:attribute>
4706
-
4707
4586
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
4708
4587
 
4709
4588
  <xsl:template name="refine_figure-fmt-fn-label-style">
4710
-
4711
4589
  </xsl:template>
4712
4590
 
4713
4591
  <xsl:attribute-set name="figure-fn-body-style">
4714
4592
  <xsl:attribute name="text-align">justify</xsl:attribute>
4715
4593
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4716
-
4717
4594
  </xsl:attribute-set>
4718
4595
  <!-- ========================== -->
4719
4596
  <!-- END Table styles -->
@@ -4724,49 +4601,38 @@
4724
4601
  <!-- ========================== -->
4725
4602
 
4726
4603
  <xsl:attribute-set name="dl-block-style">
4727
-
4728
4604
  </xsl:attribute-set>
4729
4605
 
4730
4606
  <xsl:attribute-set name="dt-row-style">
4731
-
4732
4607
  </xsl:attribute-set>
4733
4608
 
4734
4609
  <xsl:attribute-set name="dt-cell-style">
4735
-
4736
4610
  </xsl:attribute-set>
4737
4611
 
4738
4612
  <xsl:template name="refine_dt-cell-style">
4739
-
4740
4613
  </xsl:template> <!-- refine_dt-cell-style -->
4741
4614
 
4742
4615
  <xsl:attribute-set name="dt-block-style">
4743
4616
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
4744
-
4745
- <xsl:attribute name="margin-left">2mm</xsl:attribute>
4746
- <xsl:attribute name="line-height">1.2</xsl:attribute>
4747
-
4617
+ <xsl:attribute name="margin-left">2mm</xsl:attribute>
4618
+ <xsl:attribute name="line-height">1.2</xsl:attribute>
4748
4619
  </xsl:attribute-set>
4749
4620
 
4750
4621
  <xsl:template name="refine_dt-block-style">
4751
-
4752
4622
  </xsl:template> <!-- refine_dt-block-style -->
4753
4623
 
4754
4624
  <xsl:attribute-set name="dl-name-style">
4755
4625
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4756
4626
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4757
-
4758
- <xsl:attribute name="font-famuily">Arial</xsl:attribute>
4759
- <xsl:attribute name="font-weight">bold</xsl:attribute>
4760
-
4627
+ <xsl:attribute name="font-famuily">Arial</xsl:attribute>
4628
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
4761
4629
  </xsl:attribute-set> <!-- dl-name-style -->
4762
4630
 
4763
4631
  <xsl:attribute-set name="dd-cell-style">
4764
4632
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
4765
-
4766
4633
  </xsl:attribute-set>
4767
4634
 
4768
4635
  <xsl:template name="refine_dd-cell-style">
4769
-
4770
4636
  </xsl:template> <!-- refine_dd-cell-style -->
4771
4637
 
4772
4638
  <!-- ========================== -->
@@ -4774,241 +4640,184 @@
4774
4640
  <!-- ========================== -->
4775
4641
 
4776
4642
  <xsl:attribute-set name="appendix-style">
4777
-
4778
4643
  </xsl:attribute-set>
4779
4644
 
4780
4645
  <xsl:attribute-set name="appendix-example-style">
4781
-
4782
4646
  </xsl:attribute-set>
4783
4647
 
4784
4648
  <xsl:attribute-set name="xref-style">
4785
-
4786
- <xsl:attribute name="color">blue</xsl:attribute>
4787
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
4788
-
4649
+ <xsl:attribute name="color">blue</xsl:attribute>
4650
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4789
4651
  </xsl:attribute-set>
4790
4652
 
4791
4653
  <xsl:attribute-set name="eref-style">
4792
-
4793
- <xsl:attribute name="color">blue</xsl:attribute>
4794
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
4795
-
4654
+ <xsl:attribute name="color">blue</xsl:attribute>
4655
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4796
4656
  </xsl:attribute-set>
4797
4657
 
4798
4658
  <xsl:template name="refine_eref-style">
4799
4659
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
4800
4660
  <xsl:variable name="text" select="normalize-space()"/>
4801
-
4802
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4803
- <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4804
- <xsl:attribute name="text-decoration">none</xsl:attribute>
4805
- </xsl:if>
4806
-
4661
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4662
+ <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
4663
+ <xsl:attribute name="text-decoration">none</xsl:attribute>
4664
+ </xsl:if>
4807
4665
  </xsl:template> <!-- refine_eref-style -->
4808
4666
 
4809
4667
  <xsl:attribute-set name="note-style">
4810
-
4811
- <xsl:attribute name="font-size">9pt</xsl:attribute>
4812
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
4813
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4814
- <xsl:attribute name="text-align">justify</xsl:attribute>
4815
-
4668
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
4669
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
4670
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4671
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4816
4672
  </xsl:attribute-set>
4817
4673
 
4818
4674
  <xsl:template name="refine_note-style">
4819
-
4820
4675
  </xsl:template>
4821
4676
 
4822
4677
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
4823
4678
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
4824
4679
 
4825
4680
  <xsl:attribute-set name="note-name-style">
4826
-
4827
4681
  </xsl:attribute-set>
4828
4682
 
4829
4683
  <xsl:template name="refine_note-name-style">
4830
-
4831
4684
  </xsl:template> <!-- refine_note-name-style -->
4832
4685
 
4833
4686
  <xsl:attribute-set name="table-note-name-style">
4834
4687
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
4835
-
4836
4688
  </xsl:attribute-set>
4837
4689
 
4838
4690
  <xsl:template name="refine_table-note-name-style">
4839
-
4840
4691
  </xsl:template> <!-- refine_table-note-name-style -->
4841
4692
 
4842
4693
  <xsl:attribute-set name="note-p-style">
4843
-
4844
- <xsl:attribute name="text-align">justify</xsl:attribute>
4845
-
4694
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4846
4695
  </xsl:attribute-set>
4847
4696
 
4848
4697
  <xsl:attribute-set name="termnote-style">
4849
-
4850
- <xsl:attribute name="font-size">9pt</xsl:attribute>
4851
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
4852
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4853
- <xsl:attribute name="text-align">justify</xsl:attribute>
4854
-
4698
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
4699
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
4700
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4701
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4855
4702
  </xsl:attribute-set>
4856
4703
 
4857
4704
  <xsl:template name="refine_termnote-style">
4858
-
4859
4705
  </xsl:template> <!-- refine_termnote-style -->
4860
4706
 
4861
4707
  <xsl:attribute-set name="termnote-name-style">
4862
-
4863
4708
  </xsl:attribute-set>
4864
4709
 
4865
4710
  <xsl:template name="refine_termnote-name-style">
4866
-
4867
- <!-- <xsl:if test="$namespace = 'ieee'">
4868
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
4869
- </xsl:if> -->
4870
-
4871
4711
  </xsl:template>
4872
4712
 
4873
4713
  <xsl:attribute-set name="termnote-p-style">
4874
-
4875
4714
  </xsl:attribute-set>
4876
4715
 
4877
4716
  <xsl:attribute-set name="quote-style">
4878
4717
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
4879
4718
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
4880
-
4881
4719
  </xsl:attribute-set>
4882
4720
 
4883
4721
  <xsl:template name="refine_quote-style">
4884
-
4885
4722
  </xsl:template>
4886
4723
 
4887
4724
  <xsl:attribute-set name="quote-source-style">
4888
4725
  <xsl:attribute name="text-align">right</xsl:attribute>
4889
-
4890
4726
  </xsl:attribute-set>
4891
4727
 
4892
4728
  <xsl:attribute-set name="termsource-style">
4893
-
4894
4729
  </xsl:attribute-set>
4895
4730
 
4896
4731
  <xsl:template name="refine_termsource-style">
4897
-
4898
4732
  </xsl:template> <!-- refine_termsource-style -->
4899
4733
 
4900
4734
  <xsl:attribute-set name="termsource-text-style">
4901
-
4902
4735
  </xsl:attribute-set>
4903
4736
 
4904
4737
  <xsl:attribute-set name="origin-style">
4905
-
4906
4738
  </xsl:attribute-set>
4907
4739
 
4908
4740
  <xsl:attribute-set name="term-style">
4909
-
4910
4741
  </xsl:attribute-set>
4911
4742
 
4912
4743
  <xsl:attribute-set name="term-name-style">
4913
4744
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4914
4745
  <xsl:attribute name="font-weight">bold</xsl:attribute>
4915
-
4916
4746
  </xsl:attribute-set>
4917
4747
 
4918
4748
  <xsl:attribute-set name="figure-block-style">
4919
4749
  <xsl:attribute name="role">SKIP</xsl:attribute>
4920
-
4921
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4922
-
4750
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4923
4751
  </xsl:attribute-set>
4924
4752
 
4925
4753
  <xsl:template name="refine_figure-block-style">
4926
-
4927
4754
  </xsl:template>
4928
4755
 
4929
4756
  <xsl:attribute-set name="figure-style">
4930
-
4931
4757
  </xsl:attribute-set>
4932
4758
 
4933
4759
  <xsl:attribute-set name="figure-name-style">
4934
4760
  <xsl:attribute name="role">Caption</xsl:attribute>
4761
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
4762
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
4763
+ <xsl:attribute name="text-align">center</xsl:attribute>
4764
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
4765
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
4766
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
4767
+ </xsl:attribute-set>
4935
4768
 
4936
- <xsl:attribute name="font-family">Arial</xsl:attribute>
4937
- <xsl:attribute name="font-weight">bold</xsl:attribute>
4938
- <xsl:attribute name="text-align">center</xsl:attribute>
4939
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
4940
- <xsl:attribute name="space-after">6pt</xsl:attribute>
4941
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
4942
-
4943
- </xsl:attribute-set>
4944
-
4945
- <xsl:template name="refine_figure-name-style">
4946
-
4947
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4948
- <xsl:attribute name="font-size">inherit</xsl:attribute>
4949
- <xsl:attribute name="font-family">Arial Black</xsl:attribute>
4950
- </xsl:if>
4951
-
4769
+ <xsl:template name="refine_figure-name-style">
4770
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4771
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
4772
+ <xsl:attribute name="font-family">Arial Black</xsl:attribute>
4773
+ </xsl:if>
4952
4774
  </xsl:template> <!-- refine_figure-name-style -->
4953
4775
 
4954
4776
  <xsl:attribute-set name="figure-source-style">
4955
-
4956
4777
  </xsl:attribute-set>
4957
4778
 
4958
4779
  <!-- Formula's styles -->
4959
4780
  <xsl:attribute-set name="formula-style">
4960
4781
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
4961
4782
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4962
-
4963
4783
  </xsl:attribute-set> <!-- formula-style -->
4964
4784
 
4965
4785
  <xsl:attribute-set name="formula-stem-block-style">
4966
4786
  <xsl:attribute name="text-align">center</xsl:attribute>
4967
-
4968
- <xsl:attribute name="text-align">left</xsl:attribute>
4969
- <xsl:attribute name="margin-left">1mm</xsl:attribute>
4970
-
4787
+ <xsl:attribute name="text-align">left</xsl:attribute>
4788
+ <xsl:attribute name="margin-left">1mm</xsl:attribute>
4971
4789
  </xsl:attribute-set> <!-- formula-stem-block-style -->
4972
4790
 
4973
4791
  <xsl:template name="refine_formula-stem-block-style">
4974
-
4975
4792
  </xsl:template> <!-- refine_formula-stem-block-style -->
4976
4793
 
4977
4794
  <xsl:attribute-set name="formula-stem-number-style">
4978
4795
  <xsl:attribute name="text-align">right</xsl:attribute>
4979
-
4980
4796
  </xsl:attribute-set> <!-- formula-stem-number-style -->
4981
4797
  <!-- End Formula's styles -->
4982
4798
 
4983
4799
  <xsl:template name="refine_formula-stem-number-style">
4984
-
4985
4800
  </xsl:template>
4986
4801
 
4987
4802
  <xsl:attribute-set name="image-style">
4988
4803
  <xsl:attribute name="role">SKIP</xsl:attribute>
4989
4804
  <xsl:attribute name="text-align">center</xsl:attribute>
4990
-
4991
4805
  </xsl:attribute-set>
4992
4806
 
4993
4807
  <xsl:template name="refine_image-style">
4994
-
4995
4808
  </xsl:template>
4996
4809
 
4997
4810
  <xsl:attribute-set name="figure-pseudocode-p-style">
4998
-
4999
4811
  </xsl:attribute-set>
5000
4812
 
5001
4813
  <xsl:attribute-set name="image-graphic-style">
5002
4814
  <xsl:attribute name="width">100%</xsl:attribute>
5003
4815
  <xsl:attribute name="content-height">100%</xsl:attribute>
5004
4816
  <xsl:attribute name="scaling">uniform</xsl:attribute>
5005
-
5006
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
5007
-
4817
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
5008
4818
  </xsl:attribute-set>
5009
4819
 
5010
4820
  <xsl:attribute-set name="tt-style">
5011
-
5012
4821
  </xsl:attribute-set>
5013
4822
 
5014
4823
  <xsl:attribute-set name="sourcecode-name-style">
@@ -5017,50 +4826,41 @@
5017
4826
  <xsl:attribute name="text-align">center</xsl:attribute>
5018
4827
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5019
4828
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
5020
-
5021
4829
  </xsl:attribute-set>
5022
4830
 
5023
4831
  <xsl:attribute-set name="preferred-block-style">
5024
-
5025
4832
  </xsl:attribute-set>
5026
4833
 
5027
4834
  <xsl:attribute-set name="preferred-term-style">
5028
4835
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5029
4836
  <xsl:attribute name="font-weight">bold</xsl:attribute>
5030
-
5031
4837
  </xsl:attribute-set>
5032
4838
 
5033
4839
  <xsl:attribute-set name="domain-style">
5034
-
5035
4840
  </xsl:attribute-set>
5036
4841
 
5037
4842
  <xsl:attribute-set name="admitted-style">
5038
-
5039
4843
  </xsl:attribute-set>
5040
4844
 
5041
4845
  <xsl:attribute-set name="deprecates-style">
5042
-
5043
4846
  </xsl:attribute-set>
5044
4847
 
5045
4848
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
5046
4849
  </xsl:attribute-set>
5047
4850
 
5048
4851
  <xsl:attribute-set name="definition-style">
5049
-
5050
4852
  </xsl:attribute-set>
5051
4853
 
5052
4854
  <xsl:variable name="color-added-text">
5053
4855
  <xsl:text>rgb(0, 255, 0)</xsl:text>
5054
4856
  </xsl:variable>
5055
4857
  <xsl:attribute-set name="add-style">
5056
-
5057
- <xsl:attribute name="color">red</xsl:attribute>
5058
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
5059
- <!-- <xsl:attribute name="color">black</xsl:attribute>
4858
+ <xsl:attribute name="color">red</xsl:attribute>
4859
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4860
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
5060
4861
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
5061
4862
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
5062
4863
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
5063
-
5064
4864
  </xsl:attribute-set>
5065
4865
 
5066
4866
  <xsl:variable name="add-style">
@@ -5080,62 +4880,48 @@
5080
4880
 
5081
4881
  <xsl:attribute-set name="mathml-style">
5082
4882
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
5083
-
5084
4883
  </xsl:attribute-set>
5085
4884
 
5086
4885
  <xsl:template name="refine_mathml-style">
5087
-
5088
4886
  </xsl:template>
5089
4887
 
5090
4888
  <xsl:attribute-set name="list-style">
5091
-
5092
- <xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
5093
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
5094
-
4889
+ <xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
4890
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
5095
4891
  </xsl:attribute-set> <!-- list-style -->
5096
4892
 
5097
4893
  <xsl:template name="refine_list-style">
5098
-
5099
4894
  </xsl:template> <!-- refine_list-style -->
5100
4895
 
5101
4896
  <xsl:attribute-set name="list-name-style">
5102
4897
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5103
-
5104
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
5105
- <xsl:attribute name="font-weight">bold</xsl:attribute>
5106
-
4898
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
4899
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
5107
4900
  </xsl:attribute-set> <!-- list-name-style -->
5108
4901
 
5109
4902
  <xsl:attribute-set name="list-item-style">
5110
-
5111
4903
  </xsl:attribute-set>
5112
4904
 
5113
4905
  <xsl:template name="refine_list-item-style">
5114
-
5115
4906
  </xsl:template> <!-- refine_list-item-style -->
5116
4907
 
5117
4908
  <xsl:attribute-set name="list-item-label-style">
5118
-
5119
4909
  </xsl:attribute-set>
5120
4910
 
5121
4911
  <xsl:template name="refine_list-item-label-style">
5122
-
5123
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
5124
- <xsl:attribute name="color">rgb(128,128,128)</xsl:attribute>
5125
- <xsl:attribute name="line-height">1.1</xsl:attribute>
5126
- <xsl:if test=".//ieee:fn">
5127
- <xsl:attribute name="line-height">1.4</xsl:attribute>
5128
- </xsl:if>
4912
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4913
+ <xsl:attribute name="color">rgb(128,128,128)</xsl:attribute>
4914
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
4915
+ <xsl:if test=".//ieee:fn">
4916
+ <xsl:attribute name="line-height">1.4</xsl:attribute>
5129
4917
  </xsl:if>
5130
-
4918
+ </xsl:if>
5131
4919
  </xsl:template> <!-- refine_list-item-label-style -->
5132
4920
 
5133
4921
  <xsl:attribute-set name="list-item-body-style">
5134
-
5135
4922
  </xsl:attribute-set>
5136
4923
 
5137
4924
  <xsl:template name="refine_list-item-body-style">
5138
-
5139
4925
  </xsl:template> <!-- refine_list-item-body-style -->
5140
4926
 
5141
4927
  <xsl:attribute-set name="toc-style">
@@ -5145,14 +4931,12 @@
5145
4931
  <xsl:attribute-set name="fn-reference-style">
5146
4932
  <xsl:attribute name="font-size">80%</xsl:attribute>
5147
4933
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5148
-
5149
- <xsl:attribute name="font-size">65%</xsl:attribute>
5150
- <xsl:attribute name="vertical-align">super</xsl:attribute>
4934
+ <xsl:attribute name="font-size">65%</xsl:attribute>
4935
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5151
4936
 
5152
4937
  </xsl:attribute-set>
5153
4938
 
5154
4939
  <xsl:template name="refine_fn-reference-style">
5155
-
5156
4940
  </xsl:template> <!-- refine_fn-reference-style -->
5157
4941
 
5158
4942
  <xsl:attribute-set name="fn-style">
@@ -5161,10 +4945,8 @@
5161
4945
 
5162
4946
  <xsl:attribute-set name="fn-num-style">
5163
4947
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5164
-
5165
- <xsl:attribute name="font-size">65%</xsl:attribute>
5166
- <xsl:attribute name="vertical-align">super</xsl:attribute>
5167
-
4948
+ <xsl:attribute name="font-size">65%</xsl:attribute>
4949
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5168
4950
  </xsl:attribute-set>
5169
4951
 
5170
4952
  <xsl:attribute-set name="fn-body-style">
@@ -5172,140 +4954,104 @@
5172
4954
  <xsl:attribute name="font-style">normal</xsl:attribute>
5173
4955
  <xsl:attribute name="text-indent">0</xsl:attribute>
5174
4956
  <xsl:attribute name="start-indent">0</xsl:attribute>
5175
-
5176
- <xsl:attribute name="font-size">8pt</xsl:attribute>
5177
- <!-- <xsl:attribute name="margin-bottom">5pt</xsl:attribute> -->
5178
-
4957
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
4958
+ <!-- <xsl:attribute name="margin-bottom">5pt</xsl:attribute> -->
5179
4959
  </xsl:attribute-set>
5180
4960
 
5181
4961
  <xsl:template name="refine_fn-body-style">
5182
-
5183
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
5184
- <xsl:attribute name="font-size">7pt</xsl:attribute>
5185
- <xsl:attribute name="line-height">1.1</xsl:attribute>
5186
- </xsl:if>
5187
-
4962
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4963
+ <xsl:attribute name="font-size">7pt</xsl:attribute>
4964
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
4965
+ </xsl:if>
5188
4966
  </xsl:template> <!-- refine_fn-body-style -->
5189
4967
 
5190
4968
  <xsl:attribute-set name="fn-body-num-style">
5191
4969
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
5192
-
5193
- <xsl:attribute name="font-size">50%</xsl:attribute>
5194
- <xsl:attribute name="vertical-align">super</xsl:attribute>
5195
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
5196
-
4970
+ <xsl:attribute name="font-size">50%</xsl:attribute>
4971
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
4972
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
5197
4973
  </xsl:attribute-set> <!-- fn-body-num-style -->
5198
4974
 
5199
4975
  <xsl:template name="refine_fn-body-num-style">
5200
-
5201
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
5202
- <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
5203
- </xsl:if>
5204
-
4976
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
4977
+ <xsl:attribute name="padding-right">0.5mm</xsl:attribute>
4978
+ </xsl:if>
5205
4979
  </xsl:template> <!-- refine_fn-body-num-style -->
5206
4980
 
5207
4981
  <!-- admonition -->
5208
4982
  <xsl:attribute-set name="admonition-style">
5209
-
5210
- <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
5211
- <xsl:attribute name="space-before">12pt</xsl:attribute>
5212
- <xsl:attribute name="text-align">center</xsl:attribute>
5213
- <xsl:attribute name="space-after">12pt</xsl:attribute>
5214
-
4983
+ <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
4984
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
4985
+ <xsl:attribute name="text-align">center</xsl:attribute>
4986
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
5215
4987
  </xsl:attribute-set> <!-- admonition-style -->
5216
4988
 
5217
4989
  <xsl:attribute-set name="admonition-container-style">
5218
4990
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
5219
4991
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
5220
-
5221
- <xsl:attribute name="padding">1mm</xsl:attribute>
5222
- <xsl:attribute name="padding-bottom">2mm</xsl:attribute>
5223
-
4992
+ <xsl:attribute name="padding">1mm</xsl:attribute>
4993
+ <xsl:attribute name="padding-bottom">2mm</xsl:attribute>
5224
4994
  </xsl:attribute-set> <!-- admonition-container-style -->
5225
4995
 
5226
4996
  <xsl:attribute-set name="admonition-name-style">
5227
4997
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5228
-
5229
4998
  </xsl:attribute-set> <!-- admonition-name-style -->
5230
4999
 
5231
5000
  <xsl:attribute-set name="admonition-p-style">
5232
-
5233
- <xsl:attribute name="text-align">justify</xsl:attribute>
5234
-
5001
+ <xsl:attribute name="text-align">justify</xsl:attribute>
5235
5002
  </xsl:attribute-set> <!-- admonition-p-style -->
5236
5003
  <!-- end admonition -->
5237
5004
 
5238
5005
  <!-- bibitem in Normative References (references/@normative="true") -->
5239
5006
  <xsl:attribute-set name="bibitem-normative-style">
5240
-
5241
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
5242
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5243
-
5007
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
5008
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5244
5009
  </xsl:attribute-set> <!-- bibitem-normative-style -->
5245
5010
 
5246
5011
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
5247
5012
  <xsl:attribute-set name="bibitem-normative-list-style">
5248
5013
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
5249
5014
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5250
-
5251
- <!-- <xsl:if test="$namespace = 'ieee'">
5252
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5253
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
5254
- </xsl:if> -->
5255
-
5256
5015
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
5257
5016
 
5258
5017
  <xsl:attribute-set name="bibitem-non-normative-style">
5259
-
5260
5018
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
5261
5019
 
5262
5020
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
5263
5021
  <xsl:attribute-set name="bibitem-non-normative-list-style">
5264
5022
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
5265
5023
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5266
-
5267
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
5268
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5269
-
5024
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
5025
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5270
5026
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
5271
5027
 
5272
5028
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
5273
5029
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5274
-
5275
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5276
-
5030
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5277
5031
  </xsl:attribute-set>
5278
5032
 
5279
5033
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
5280
5034
  <xsl:attribute-set name="bibitem-normative-list-body-style">
5281
-
5282
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5283
-
5035
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5284
5036
  </xsl:attribute-set>
5285
5037
 
5286
5038
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
5287
-
5288
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5289
-
5039
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
5290
5040
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
5291
5041
 
5292
5042
  <!-- footnote reference number for bibitem, in the text -->
5293
5043
  <xsl:attribute-set name="bibitem-note-fn-style">
5294
5044
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5295
5045
  <xsl:attribute name="font-size">65%</xsl:attribute>
5296
-
5297
- <xsl:attribute name="font-size">8pt</xsl:attribute>
5298
- <xsl:attribute name="baseline-shift">30%</xsl:attribute>
5299
-
5046
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
5047
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
5300
5048
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
5301
5049
 
5302
5050
  <!-- footnote number on the page bottom -->
5303
5051
  <xsl:attribute-set name="bibitem-note-fn-number-style">
5304
5052
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
5305
-
5306
- <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
5307
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
5308
-
5053
+ <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
5054
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
5309
5055
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
5310
5056
 
5311
5057
  <!-- footnote body (text) on the page bottom -->
@@ -5313,14 +5059,11 @@
5313
5059
  <xsl:attribute name="font-size">10pt</xsl:attribute>
5314
5060
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5315
5061
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
5316
-
5317
- <xsl:attribute name="font-size">8pt</xsl:attribute>
5318
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
5319
-
5062
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
5063
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
5320
5064
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
5321
5065
 
5322
5066
  <xsl:attribute-set name="references-non-normative-style">
5323
-
5324
5067
  </xsl:attribute-set> <!-- references-non-normative-style -->
5325
5068
 
5326
5069
  <!-- Highlight.js syntax GitHub styles -->
@@ -5480,12 +5223,10 @@
5480
5223
  <!-- Index section styles -->
5481
5224
  <xsl:attribute-set name="indexsect-title-style">
5482
5225
  <xsl:attribute name="role">H1</xsl:attribute>
5483
-
5484
5226
  </xsl:attribute-set>
5485
5227
 
5486
5228
  <xsl:attribute-set name="indexsect-clause-title-style">
5487
5229
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
5488
-
5489
5230
  </xsl:attribute-set>
5490
5231
 
5491
5232
  <!-- End Index section styles -->
@@ -5562,47 +5303,47 @@
5562
5303
  </xsl:template>
5563
5304
 
5564
5305
  <xsl:template name="processTables_Contents">
5565
- <tables>
5306
+ <mn:tables>
5566
5307
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
5567
5308
  <xsl:choose>
5568
5309
  <xsl:when test="*[local-name() = 'fmt-name']">
5569
5310
  <xsl:variable name="fmt_name">
5570
5311
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
5571
5312
  </xsl:variable>
5572
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
5313
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
5573
5314
  <xsl:copy-of select="$fmt_name"/>
5574
- </table>
5315
+ </mn:table>
5575
5316
  </xsl:when>
5576
5317
  <xsl:otherwise>
5577
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
5318
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
5578
5319
  <xsl:copy-of select="*[local-name() = 'name']"/>
5579
- </table>
5320
+ </mn:table>
5580
5321
  </xsl:otherwise>
5581
5322
  </xsl:choose>
5582
5323
  </xsl:for-each>
5583
- </tables>
5324
+ </mn:tables>
5584
5325
  </xsl:template>
5585
5326
 
5586
5327
  <xsl:template name="processFigures_Contents">
5587
- <figures>
5328
+ <mn:figures>
5588
5329
  <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) != '']">
5589
5330
  <xsl:choose>
5590
5331
  <xsl:when test="*[local-name() = 'fmt-name']">
5591
5332
  <xsl:variable name="fmt_name">
5592
5333
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
5593
5334
  </xsl:variable>
5594
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
5335
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
5595
5336
  <xsl:copy-of select="$fmt_name"/>
5596
- </figure>
5337
+ </mn:figure>
5597
5338
  </xsl:when>
5598
5339
  <xsl:otherwise>
5599
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
5340
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
5600
5341
  <xsl:copy-of select="*[local-name() = 'name']"/>
5601
- </figure>
5342
+ </mn:figure>
5602
5343
  </xsl:otherwise>
5603
5344
  </xsl:choose>
5604
5345
  </xsl:for-each>
5605
- </figures>
5346
+ </mn:figures>
5606
5347
  </xsl:template>
5607
5348
 
5608
5349
  <xsl:template name="processPrefaceSectionsDefault">
@@ -5621,7 +5362,6 @@
5621
5362
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
5622
5363
  <xsl:sort select="@displayorder" data-type="number"/>
5623
5364
  <xsl:apply-templates select="."/>
5624
-
5625
5365
  </xsl:for-each>
5626
5366
 
5627
5367
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -5728,7 +5468,6 @@
5728
5468
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
5729
5469
  <xsl:sort select="@displayorder" data-type="number"/>
5730
5470
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
5731
-
5732
5471
  </xsl:for-each>
5733
5472
  </xsl:element>
5734
5473
  </xsl:element>
@@ -5862,7 +5601,6 @@
5862
5601
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
5863
5602
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
5864
5603
  </xsl:apply-templates>
5865
-
5866
5604
  </xsl:for-each>
5867
5605
  </xsl:element>
5868
5606
 
@@ -5902,19 +5640,17 @@
5902
5640
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
5903
5641
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
5904
5642
  <xsl:template match="text()" name="text">
5905
-
5906
- <xsl:choose>
5907
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
5908
- <xsl:otherwise>
5909
- <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))"/>
5910
- <xsl:call-template name="replace_fo_inline_tags">
5911
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
5912
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
5913
- <xsl:with-param name="text" select="$text"/>
5914
- </xsl:call-template>
5915
- </xsl:otherwise>
5916
- </xsl:choose>
5917
-
5643
+ <xsl:choose>
5644
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
5645
+ <xsl:otherwise>
5646
+ <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))"/>
5647
+ <xsl:call-template name="replace_fo_inline_tags">
5648
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
5649
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
5650
+ <xsl:with-param name="text" select="$text"/>
5651
+ </xsl:call-template>
5652
+ </xsl:otherwise>
5653
+ </xsl:choose>
5918
5654
  </xsl:template>
5919
5655
 
5920
5656
  <xsl:template name="replace_fo_inline_tags">
@@ -5968,7 +5704,7 @@
5968
5704
  <xsl:with-param name="keep_sep">true</xsl:with-param>
5969
5705
  </xsl:call-template>
5970
5706
  </xsl:variable>
5971
- <xsl:for-each select="xalan:nodeset($items)/item">
5707
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
5972
5708
  <xsl:choose>
5973
5709
  <xsl:when test=". = $sep">
5974
5710
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -5997,17 +5733,13 @@
5997
5733
  </xsl:template> <!-- copyright-statement -->
5998
5734
 
5999
5735
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
6000
-
6001
- <!-- process in the template 'title' -->
6002
- <xsl:call-template name="title"/>
6003
-
5736
+ <!-- process in the template 'title' -->
5737
+ <xsl:call-template name="title"/>
6004
5738
  </xsl:template> <!-- copyright-statement//title -->
6005
5739
 
6006
5740
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
6007
-
6008
- <!-- process in the template 'paragraph' -->
6009
- <xsl:call-template name="paragraph"/>
6010
-
5741
+ <!-- process in the template 'paragraph' -->
5742
+ <xsl:call-template name="paragraph"/>
6011
5743
  </xsl:template> <!-- copyright-statement//p -->
6012
5744
 
6013
5745
  <xsl:template match="*[local-name()='license-statement']">
@@ -6017,42 +5749,34 @@
6017
5749
  </xsl:template> <!-- license-statement -->
6018
5750
 
6019
5751
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
6020
-
6021
- <!-- process in the template 'title' -->
6022
- <xsl:call-template name="title"/>
6023
-
5752
+ <!-- process in the template 'title' -->
5753
+ <xsl:call-template name="title"/>
6024
5754
  </xsl:template> <!-- license-statement/title -->
6025
5755
 
6026
5756
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
6027
-
6028
- <!-- process in the template 'paragraph' -->
6029
- <xsl:call-template name="paragraph"/>
6030
-
5757
+ <!-- process in the template 'paragraph' -->
5758
+ <xsl:call-template name="paragraph"/>
6031
5759
  </xsl:template> <!-- license-statement/p -->
6032
5760
 
6033
5761
  <xsl:template match="*[local-name()='legal-statement']">
6034
5762
  <xsl:param name="isLegacy">false</xsl:param>
6035
5763
  <fo:block xsl:use-attribute-sets="legal-statement-style">
6036
-
6037
5764
  <xsl:apply-templates/>
6038
5765
  </fo:block>
6039
5766
  </xsl:template> <!-- legal-statement -->
6040
5767
 
6041
5768
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
6042
-
6043
- <!-- process in the template 'title' -->
6044
- <xsl:call-template name="title"/>
5769
+ <!-- process in the template 'title' -->
5770
+ <xsl:call-template name="title"/>
6045
5771
 
6046
5772
  </xsl:template> <!-- legal-statement/title -->
6047
5773
 
6048
5774
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
6049
5775
  <xsl:param name="margin"/>
6050
-
6051
- <!-- process in the template 'paragraph' -->
6052
- <xsl:call-template name="paragraph">
6053
- <xsl:with-param name="margin" select="$margin"/>
6054
- </xsl:call-template>
6055
-
5776
+ <!-- process in the template 'paragraph' -->
5777
+ <xsl:call-template name="paragraph">
5778
+ <xsl:with-param name="margin" select="$margin"/>
5779
+ </xsl:call-template>
6056
5780
  </xsl:template> <!-- legal-statement/p -->
6057
5781
 
6058
5782
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -6062,20 +5786,16 @@
6062
5786
  </xsl:template> <!-- feedback-statement -->
6063
5787
 
6064
5788
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
6065
-
6066
- <!-- process in the template 'title' -->
6067
- <xsl:call-template name="title"/>
6068
-
5789
+ <!-- process in the template 'title' -->
5790
+ <xsl:call-template name="title"/>
6069
5791
  </xsl:template>
6070
5792
 
6071
5793
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
6072
5794
  <xsl:param name="margin"/>
6073
-
6074
- <!-- process in the template 'paragraph' -->
6075
- <xsl:call-template name="paragraph">
6076
- <xsl:with-param name="margin" select="$margin"/>
6077
- </xsl:call-template>
6078
-
5795
+ <!-- process in the template 'paragraph' -->
5796
+ <xsl:call-template name="paragraph">
5797
+ <xsl:with-param name="margin" select="$margin"/>
5798
+ </xsl:call-template>
6079
5799
  </xsl:template>
6080
5800
 
6081
5801
  <!-- ================================= -->
@@ -6128,7 +5848,6 @@
6128
5848
  <xsl:template match="*[local-name()='table']" name="table">
6129
5849
 
6130
5850
  <xsl:variable name="table-preamble">
6131
-
6132
5851
  </xsl:variable>
6133
5852
 
6134
5853
  <xsl:variable name="table">
@@ -6146,8 +5865,7 @@
6146
5865
 
6147
5866
  <!-- Display table's name before table as standalone block -->
6148
5867
  <!-- $namespace = 'iso' or -->
6149
-
6150
- <xsl:call-template name="table_name_fn_display"/>
5868
+ <xsl:call-template name="table_name_fn_display"/>
6151
5869
 
6152
5870
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
6153
5871
 
@@ -6201,13 +5919,12 @@
6201
5919
  <xsl:variable name="table_width_default">100%</xsl:variable>
6202
5920
  <xsl:variable name="table_width">
6203
5921
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
6204
-
6205
- <xsl:choose>
6206
- <xsl:when test="ancestor::*[local-name() = 'feedback-statement']">50%</xsl:when>
6207
- <xsl:when test="@width = 'full-page-width' or @width = 'text-width'">100%</xsl:when>
6208
- <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
6209
- <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
6210
- </xsl:choose>
5922
+ <xsl:choose>
5923
+ <xsl:when test="ancestor::*[local-name() = 'feedback-statement']">50%</xsl:when>
5924
+ <xsl:when test="@width = 'full-page-width' or @width = 'text-width'">100%</xsl:when>
5925
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
5926
+ <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
5927
+ </xsl:choose>
6211
5928
 
6212
5929
  </xsl:variable>
6213
5930
 
@@ -6376,7 +6093,6 @@
6376
6093
  </xsl:template>
6377
6094
 
6378
6095
  <xsl:template name="setBordersTableArray">
6379
-
6380
6096
  </xsl:template>
6381
6097
 
6382
6098
  <!-- table/name-->
@@ -6384,16 +6100,15 @@
6384
6100
  <xsl:param name="continued"/>
6385
6101
  <xsl:param name="cols-count"/>
6386
6102
  <xsl:if test="normalize-space() != ''">
6103
+ <fo:inline role="SKIP">
6387
6104
 
6388
- <fo:inline role="SKIP">
6389
-
6390
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
6391
- <xsl:attribute name="font-size">11pt</xsl:attribute>
6392
- <xsl:attribute name="font-family">Arial Black</xsl:attribute>
6393
- </xsl:if>
6105
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
6106
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
6107
+ <xsl:attribute name="font-family">Arial Black</xsl:attribute>
6108
+ </xsl:if>
6394
6109
 
6395
- <xsl:apply-templates/>
6396
- </fo:inline>
6110
+ <xsl:apply-templates/>
6111
+ </fo:inline>
6397
6112
 
6398
6113
  </xsl:if>
6399
6114
  </xsl:template> <!-- table/name -->
@@ -6768,11 +6483,9 @@
6768
6483
  <xsl:template match="*[local-name()='thead']">
6769
6484
  <xsl:param name="cols-count"/>
6770
6485
  <fo:table-header>
6771
-
6772
- <xsl:call-template name="table-header-title">
6773
- <xsl:with-param name="cols-count" select="$cols-count"/>
6774
- </xsl:call-template>
6775
-
6486
+ <xsl:call-template name="table-header-title">
6487
+ <xsl:with-param name="cols-count" select="$cols-count"/>
6488
+ </xsl:call-template>
6776
6489
  <xsl:apply-templates/>
6777
6490
  </fo:table-header>
6778
6491
  </xsl:template> <!-- thead -->
@@ -6786,28 +6499,27 @@
6786
6499
 
6787
6500
  <xsl:call-template name="refine_table-header-title-style"/>
6788
6501
 
6789
- <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
6790
- <xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
6791
- </xsl:if>
6502
+ <xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
6503
+ <xsl:attribute name="border-bottom">0.5 solid black</xsl:attribute>
6504
+ </xsl:if>
6792
6505
 
6793
- <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
6506
+ <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
6794
6507
 
6795
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
6796
- <xsl:with-param name="continued">true</xsl:with-param>
6797
- </xsl:apply-templates>
6508
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
6509
+ <xsl:with-param name="continued">true</xsl:with-param>
6510
+ </xsl:apply-templates>
6798
6511
 
6799
- <fo:inline font-weight="normal" font-style="italic" role="SKIP">
6800
- <xsl:text> </xsl:text>
6801
- <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
6802
- </fo:inline>
6803
- </fo:block>
6512
+ <fo:inline font-weight="normal" font-style="italic" role="SKIP">
6513
+ <xsl:text> </xsl:text>
6514
+ <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
6515
+ </fo:inline>
6516
+ </fo:block>
6804
6517
 
6805
6518
  </fo:table-cell>
6806
6519
  </fo:table-row>
6807
6520
  </xsl:template> <!-- table-header-title -->
6808
6521
 
6809
6522
  <xsl:template name="refine_table-header-title-style">
6810
-
6811
6523
  </xsl:template> <!-- refine_table-header-title-style -->
6812
6524
 
6813
6525
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -6837,7 +6549,6 @@
6837
6549
  <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']"/>
6838
6550
 
6839
6551
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
6840
-
6841
6552
  </xsl:variable>
6842
6553
 
6843
6554
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -6899,36 +6610,26 @@
6899
6610
  <xsl:call-template name="setBordersTableArray"/>
6900
6611
 
6901
6612
  <!-- fn will be processed inside 'note' processing -->
6902
-
6903
- <!-- for BSI (not PAS) display Notes before footnotes -->
6904
-
6905
- <!-- except gb and bsi -->
6906
-
6907
- <xsl:apply-templates select="../*[local-name()='p']"/>
6908
- <xsl:apply-templates select="../*[local-name()='dl']"/>
6909
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
6910
- <xsl:apply-templates select="../*[local-name()='example']"/>
6911
- <xsl:apply-templates select="../*[local-name()='source']"/>
6613
+ <xsl:apply-templates select="../*[local-name()='p']"/>
6614
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
6615
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
6616
+ <xsl:apply-templates select="../*[local-name()='example']"/>
6617
+ <xsl:apply-templates select="../*[local-name()='source']"/>
6912
6618
 
6913
6619
  <xsl:variable name="isDisplayRowSeparator">
6914
-
6915
6620
  </xsl:variable>
6916
6621
 
6917
6622
  <!-- horizontal row separator -->
6918
6623
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
6919
6624
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
6920
6625
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
6921
-
6922
6626
  <xsl:call-template name="setBordersTableArray"/>
6923
6627
  <fo:block font-size="1pt"> </fo:block>
6924
6628
  </fo:block-container>
6925
6629
  </xsl:if>
6926
6630
  </xsl:if>
6927
6631
 
6928
- <!-- fn processing -->
6929
- <fo:block/><!-- display fn after table -->
6930
-
6931
- <!-- for PAS display Notes after footnotes -->
6632
+ <!-- fn processing --><fo:block/><!-- display fn after table -->
6932
6633
 
6933
6634
  </fo:table-cell>
6934
6635
  </fo:table-row>
@@ -6940,9 +6641,8 @@
6940
6641
  <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
6941
6642
  <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
6942
6643
  </xsl:if>
6943
-
6944
- <!-- <xsl:call-template name="table_fn_display" /> -->
6945
- <xsl:copy-of select="$table_fn_block"/>
6644
+ <!-- <xsl:call-template name="table_fn_display" /> -->
6645
+ <xsl:copy-of select="$table_fn_block"/>
6946
6646
 
6947
6647
  </xsl:if>
6948
6648
  </xsl:template> <!-- insertTableFooterInSeparateTable -->
@@ -6963,16 +6663,14 @@
6963
6663
  </xsl:otherwise>
6964
6664
  </xsl:choose>
6965
6665
  </xsl:variable>
6966
-
6967
- <!-- if there isn't 'thead' and there is a table's title -->
6968
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
6969
- <fo:table-header>
6970
-
6971
- <xsl:call-template name="table-header-title">
6972
- <xsl:with-param name="cols-count" select="$cols-count"/>
6973
- </xsl:call-template>
6974
- </fo:table-header>
6975
- </xsl:if>
6666
+ <!-- if there isn't 'thead' and there is a table's title -->
6667
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
6668
+ <fo:table-header>
6669
+ <xsl:call-template name="table-header-title">
6670
+ <xsl:with-param name="cols-count" select="$cols-count"/>
6671
+ </xsl:call-template>
6672
+ </fo:table-header>
6673
+ </xsl:if>
6976
6674
 
6977
6675
  <xsl:apply-templates select="../*[local-name()='thead']">
6978
6676
  <xsl:with-param name="cols-count" select="$cols-count"/>
@@ -6983,39 +6681,34 @@
6983
6681
  </xsl:call-template>
6984
6682
 
6985
6683
  <fo:table-body>
6684
+ <xsl:variable name="title_continued_">
6685
+ <xsl:call-template name="getLocalizedString">
6686
+ <xsl:with-param name="key">continued</xsl:with-param>
6687
+ </xsl:call-template>
6688
+ </xsl:variable>
6986
6689
 
6987
- <xsl:variable name="title_continued_">
6988
- <xsl:call-template name="getLocalizedString">
6989
- <xsl:with-param name="key">continued</xsl:with-param>
6990
- </xsl:call-template>
6991
- </xsl:variable>
6992
-
6993
- <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
6994
- <xsl:variable name="title_continued">
6995
- <xsl:value-of select="$title_continued_in_parenthesis"/>
6996
-
6997
- </xsl:variable>
6998
-
6999
- <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
7000
- <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
6690
+ <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
6691
+ <xsl:variable name="title_continued"><xsl:value-of select="$title_continued_in_parenthesis"/>
6692
+ </xsl:variable>
7001
6693
 
7002
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
7003
- <fo:table-cell role="SKIP">
6694
+ <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
6695
+ <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
7004
6696
 
7005
- <fo:marker marker-class-name="table_continued"/>
6697
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
6698
+ <fo:table-cell role="SKIP">
6699
+ <fo:marker marker-class-name="table_continued"/>
7006
6700
 
6701
+ <fo:block role="SKIP"/>
6702
+ </fo:table-cell>
6703
+ </fo:table-row>
6704
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
6705
+ <fo:table-cell role="SKIP">
6706
+ <fo:marker marker-class-name="table_continued">
6707
+ <xsl:value-of select="$title_continued"/>
6708
+ </fo:marker>
7007
6709
  <fo:block role="SKIP"/>
7008
- </fo:table-cell>
7009
- </fo:table-row>
7010
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
7011
- <fo:table-cell role="SKIP">
7012
-
7013
- <fo:marker marker-class-name="table_continued">
7014
- <xsl:value-of select="$title_continued"/>
7015
- </fo:marker>
7016
- <fo:block role="SKIP"/>
7017
- </fo:table-cell>
7018
- </fo:table-row>
6710
+ </fo:table-cell>
6711
+ </fo:table-row>
7019
6712
 
7020
6713
  <xsl:apply-templates/>
7021
6714
 
@@ -7101,7 +6794,7 @@
7101
6794
  <xsl:with-param name="pText" select="$border_under_row_"/>
7102
6795
  </xsl:call-template>
7103
6796
  </xsl:variable>
7104
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
6797
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
7105
6798
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
7106
6799
  </xsl:if>
7107
6800
  </xsl:when>
@@ -7218,7 +6911,7 @@
7218
6911
  </xsl:variable>
7219
6912
  <xsl:variable name="quot">"</xsl:variable>
7220
6913
  <xsl:variable name="styles_">
7221
- <xsl:for-each select="xalan:nodeset($styles__)/item">
6914
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
7222
6915
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7223
6916
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
7224
6917
  <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'">
@@ -7268,9 +6961,7 @@
7268
6961
  <fo:block role="SKIP">
7269
6962
 
7270
6963
  <xsl:if test="$isGenerateTableIF = 'true'">
7271
-
7272
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
7273
-
6964
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
7274
6965
  </xsl:if>
7275
6966
 
7276
6967
  <xsl:apply-templates/>
@@ -7285,25 +6976,23 @@
7285
6976
 
7286
6977
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
7287
6978
  <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">
6979
+ <xsl:call-template name="setNamedDestination"/>
6980
+ <fo:block xsl:use-attribute-sets="table-note-style">
6981
+ <xsl:copy-of select="@id"/>
7288
6982
 
7289
- <xsl:call-template name="setNamedDestination"/>
7290
- <fo:block xsl:use-attribute-sets="table-note-style">
7291
- <xsl:copy-of select="@id"/>
7292
-
7293
- <xsl:call-template name="refine_table-note-style"/>
7294
-
7295
- <!-- Table's note/example name (NOTE, for example) -->
7296
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
6983
+ <xsl:call-template name="refine_table-note-style"/>
7297
6984
 
7298
- <xsl:call-template name="refine_table-note-name-style"/>
6985
+ <!-- Table's note/example name (NOTE, for example) -->
6986
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
7299
6987
 
7300
- <xsl:apply-templates select="*[local-name() = 'name']"/>
6988
+ <xsl:call-template name="refine_table-note-name-style"/>
7301
6989
 
7302
- </fo:inline>
6990
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7303
6991
 
7304
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7305
- </fo:block>
6992
+ </fo:inline>
7306
6993
 
6994
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6995
+ </fo:block>
7307
6996
  </xsl:template> <!-- table/note -->
7308
6997
 
7309
6998
  <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">
@@ -7348,9 +7037,7 @@
7348
7037
  <xsl:variable name="current_fn_number" select="@reference"/>
7349
7038
 
7350
7039
  <xsl:variable name="current_fn_number_text">
7351
-
7352
- <xsl:value-of select="$current_fn_number"/>
7353
-
7040
+ <xsl:value-of select="$current_fn_number"/>
7354
7041
  </xsl:variable>
7355
7042
 
7356
7043
  <xsl:variable name="ref_id" select="@target"/>
@@ -7362,12 +7049,10 @@
7362
7049
  <xsl:choose>
7363
7050
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
7364
7051
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
7365
-
7366
7052
  </fn_styles>
7367
7053
  </xsl:when>
7368
7054
  <xsl:otherwise>
7369
7055
  <fn_styles xsl:use-attribute-sets="fn-num-style">
7370
-
7371
7056
  </fn_styles>
7372
7057
  </xsl:otherwise>
7373
7058
  </xsl:choose>
@@ -7385,7 +7070,6 @@
7385
7070
  <xsl:with-param name="element">
7386
7071
  <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 -->
7387
7072
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
7388
-
7389
7073
  <xsl:copy-of select="$current_fn_number_text"/>
7390
7074
 
7391
7075
  </fo:inline>
@@ -7423,10 +7107,9 @@
7423
7107
  <here><xsl:copy-of select="$footnotes"/></here> -->
7424
7108
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
7425
7109
  </xsl:variable>
7426
-
7427
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
7428
- <xsl:copy-of select="$fn_block"/>
7429
- </fo:block>
7110
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
7111
+ <xsl:copy-of select="$fn_block"/>
7112
+ </fo:block>
7430
7113
 
7431
7114
  </fo:block-container>
7432
7115
  </fo:footnote-body>
@@ -7503,21 +7186,20 @@
7503
7186
  <xsl:variable name="reference" select="@reference"/>
7504
7187
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
7505
7188
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
7189
+ <fo:block xsl:use-attribute-sets="table-fn-style">
7190
+ <xsl:copy-of select="@id"/>
7191
+ <xsl:call-template name="refine_table-fn-style"/>
7506
7192
 
7507
- <fo:block xsl:use-attribute-sets="table-fn-style">
7508
- <xsl:copy-of select="@id"/>
7509
- <xsl:call-template name="refine_table-fn-style"/>
7510
-
7511
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
7512
- <xsl:with-param name="process">true</xsl:with-param>
7513
- </xsl:apply-templates>
7514
-
7515
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
7516
- <!-- <xsl:copy-of select="./node()"/> -->
7517
- <xsl:apply-templates/>
7518
- </fo:inline>
7193
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
7194
+ <xsl:with-param name="process">true</xsl:with-param>
7195
+ </xsl:apply-templates>
7519
7196
 
7520
- </fo:block>
7197
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
7198
+ <!-- <xsl:copy-of select="./node()"/> -->
7199
+ <xsl:apply-templates/>
7200
+ </fo:inline>
7201
+
7202
+ </fo:block>
7521
7203
 
7522
7204
  <!-- </xsl:if> -->
7523
7205
  </xsl:for-each>
@@ -7570,7 +7252,6 @@
7570
7252
  <xsl:param name="process">false</xsl:param>
7571
7253
  <xsl:if test="$process = 'true'">
7572
7254
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
7573
-
7574
7255
  </xsl:if>
7575
7256
  </xsl:template>
7576
7257
 
@@ -7654,7 +7335,6 @@
7654
7335
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
7655
7336
 
7656
7337
  <xsl:variable name="key_iso">
7657
-
7658
7338
  </xsl:variable>
7659
7339
 
7660
7340
  <fo:block>
@@ -7700,7 +7380,6 @@
7700
7380
  <fo:table width="95%" table-layout="fixed">
7701
7381
  <xsl:if test="normalize-space($key_iso) = 'true'">
7702
7382
  <xsl:attribute name="font-size">10pt</xsl:attribute>
7703
-
7704
7383
  </xsl:if>
7705
7384
  <xsl:choose>
7706
7385
  <!-- if there 'dl', then set same columns width -->
@@ -7724,23 +7403,19 @@
7724
7403
  <fo:table-row>
7725
7404
  <fo:table-cell>
7726
7405
  <fo:block>
7727
-
7728
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
7729
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
7730
- <!-- <xsl:value-of select="@reference"/> -->
7731
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
7732
- </fo:inline>
7406
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
7407
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
7408
+ <!-- <xsl:value-of select="@reference"/> -->
7409
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
7410
+ </fo:inline>
7733
7411
 
7734
7412
  </fo:block>
7735
7413
  </fo:table-cell>
7736
7414
  <fo:table-cell>
7737
7415
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
7738
7416
  <xsl:if test="normalize-space($key_iso) = 'true'">
7739
-
7740
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
7741
-
7417
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
7742
7418
  </xsl:if>
7743
-
7744
7419
  <!-- <xsl:copy-of select="./node()"/> -->
7745
7420
  <xsl:apply-templates/>
7746
7421
  </fo:block>
@@ -7790,11 +7465,9 @@
7790
7465
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
7791
7466
  <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">
7792
7467
  <xsl:variable name="key_iso">
7793
-
7794
7468
  </xsl:variable>
7795
7469
  <xsl:if test="normalize-space($key_iso) = 'true'">
7796
7470
  <xsl:attribute name="font-size">10pt</xsl:attribute>
7797
-
7798
7471
  </xsl:if>
7799
7472
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
7800
7473
  <!-- <xsl:value-of select="@reference"/> -->
@@ -7840,8 +7513,7 @@
7840
7513
  <xsl:text>※</xsl:text>
7841
7514
  </xsl:if> -->
7842
7515
  <!-- <xsl:value-of select="@reference"/> -->
7843
-
7844
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
7516
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
7845
7517
 
7846
7518
  <!-- <xsl:if test="$namespace = 'bsi'">
7847
7519
  <xsl:text>)</xsl:text>
@@ -7913,10 +7585,9 @@
7913
7585
  </xsl:if>
7914
7586
 
7915
7587
  <xsl:call-template name="setBlockSpanAll"/>
7916
-
7917
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
7918
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
7919
- </xsl:if>
7588
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
7589
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
7590
+ </xsl:if>
7920
7591
 
7921
7592
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
7922
7593
  <!-- set font-size as sourcecode font-size -->
@@ -7937,7 +7608,6 @@
7937
7608
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
7938
7609
  </xsl:choose>
7939
7610
  </xsl:attribute>
7940
-
7941
7611
  </xsl:if>
7942
7612
 
7943
7613
  <xsl:call-template name="setTrackChangesStyles">
@@ -7946,37 +7616,32 @@
7946
7616
  </xsl:call-template>
7947
7617
 
7948
7618
  <fo:block-container margin-left="0mm" role="SKIP">
7949
-
7950
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
7619
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
7951
7620
 
7952
7621
  <xsl:variable name="parent" select="local-name(..)"/>
7953
7622
 
7954
- <xsl:variable name="key_iso">
7955
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
7623
+ <xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') -->
7956
7624
  </xsl:variable>
7957
7625
 
7958
7626
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
7959
7627
 
7960
7628
  <xsl:choose>
7961
7629
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
7962
-
7963
- <fo:block margin-bottom="12pt" text-align="left">
7964
-
7965
- <!-- <xsl:variable name="title-where">
7630
+ <fo:block margin-bottom="12pt" text-align="left">
7631
+ <!-- <xsl:variable name="title-where">
7966
7632
  <xsl:call-template name="getLocalizedString">
7967
7633
  <xsl:with-param name="key">where</xsl:with-param>
7968
7634
  </xsl:call-template>
7969
7635
  </xsl:variable>
7970
7636
  <xsl:value-of select="$title-where"/> -->
7971
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
7972
- <xsl:text> </xsl:text>
7973
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
7974
- <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
7975
- <xsl:text> </xsl:text>
7976
- </xsl:if>
7977
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
7978
- </fo:block>
7979
-
7637
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
7638
+ <xsl:text> </xsl:text>
7639
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
7640
+ <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
7641
+ <xsl:text> </xsl:text>
7642
+ </xsl:if>
7643
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
7644
+ </fo:block>
7980
7645
  </xsl:when> <!-- END: only one component -->
7981
7646
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
7982
7647
  <fo:block margin-bottom="12pt" text-align="left">
@@ -7996,19 +7661,17 @@
7996
7661
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
7997
7662
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
7998
7663
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
7664
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
7999
7665
 
8000
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
8001
-
8002
- <xsl:call-template name="refine_figure_key_style"/>
8003
-
8004
- <xsl:variable name="title-key">
8005
- <xsl:call-template name="getLocalizedString">
8006
- <xsl:with-param name="key">key</xsl:with-param>
8007
- </xsl:call-template>
8008
- </xsl:variable>
8009
- <xsl:value-of select="$title-key"/>
8010
- </fo:block>
7666
+ <xsl:call-template name="refine_figure_key_style"/>
8011
7667
 
7668
+ <xsl:variable name="title-key">
7669
+ <xsl:call-template name="getLocalizedString">
7670
+ <xsl:with-param name="key">key</xsl:with-param>
7671
+ </xsl:call-template>
7672
+ </xsl:variable>
7673
+ <xsl:value-of select="$title-key"/>
7674
+ </fo:block>
8012
7675
  </xsl:if>
8013
7676
  </xsl:when> <!-- END: definition list in a figure -->
8014
7677
  </xsl:choose>
@@ -8041,12 +7704,10 @@
8041
7704
  <xsl:if test="$isGenerateTableIF = 'true'">
8042
7705
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
8043
7706
  </xsl:if>
8044
-
8045
7707
  <xsl:choose>
8046
7708
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
8047
7709
  <xsl:when test="normalize-space($key_iso) = 'true'">
8048
7710
  <xsl:attribute name="font-size">10pt</xsl:attribute>
8049
-
8050
7711
  </xsl:when>
8051
7712
  </xsl:choose>
8052
7713
 
@@ -8151,17 +7812,15 @@
8151
7812
  <xsl:call-template name="getMaxLength_dt"/>
8152
7813
  </xsl:variable>
8153
7814
 
8154
- <xsl:variable name="isContainsKeepTogetherTag_">
8155
- false
7815
+ <xsl:variable name="isContainsKeepTogetherTag_">false
8156
7816
  </xsl:variable>
8157
7817
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
8158
7818
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
8159
-
8160
- <xsl:call-template name="setColumnWidth_dl">
8161
- <xsl:with-param name="colwidths" select="$colwidths"/>
8162
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
8163
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
8164
- </xsl:call-template>
7819
+ <xsl:call-template name="setColumnWidth_dl">
7820
+ <xsl:with-param name="colwidths" select="$colwidths"/>
7821
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
7822
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
7823
+ </xsl:call-template>
8165
7824
 
8166
7825
  <fo:table-body>
8167
7826
 
@@ -8212,21 +7871,17 @@
8212
7871
  </xsl:template>
8213
7872
 
8214
7873
  <xsl:template name="refine_dl_formula_where_style">
8215
-
8216
7874
  </xsl:template> <!-- refine_dl_formula_where_style -->
8217
7875
 
8218
7876
  <xsl:template name="refine_figure_key_style">
8219
-
8220
7877
  </xsl:template> <!-- refine_figure_key_style -->
8221
7878
 
8222
7879
  <xsl:template name="refine_multicomponent_style">
8223
7880
  <xsl:variable name="parent" select="local-name(..)"/>
8224
-
8225
7881
  </xsl:template> <!-- refine_multicomponent_style -->
8226
7882
 
8227
7883
  <xsl:template name="refine_multicomponent_block_style">
8228
7884
  <xsl:variable name="parent" select="local-name(..)"/>
8229
-
8230
7885
  </xsl:template> <!-- refine_multicomponent_block_style -->
8231
7886
 
8232
7887
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -8413,14 +8068,11 @@
8413
8068
  <xsl:attribute name="id">
8414
8069
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
8415
8070
  </xsl:attribute>
8416
-
8417
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
8418
- <xsl:with-param name="process">true</xsl:with-param>
8419
- </xsl:apply-templates>
8420
-
8071
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
8072
+ <xsl:with-param name="process">true</xsl:with-param>
8073
+ </xsl:apply-templates>
8421
8074
  </td>
8422
8075
  </tr>
8423
-
8424
8076
  </xsl:template>
8425
8077
 
8426
8078
  <!-- Definition's term -->
@@ -8429,7 +8081,6 @@
8429
8081
  <xsl:param name="split_keep-within-line"/>
8430
8082
 
8431
8083
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
8432
-
8433
8084
  <xsl:call-template name="insert_dt_cell">
8434
8085
  <xsl:with-param name="key_iso" select="$key_iso"/>
8435
8086
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -8451,7 +8102,6 @@
8451
8102
  <!-- border is mandatory, to calculate real width -->
8452
8103
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
8453
8104
  <xsl:attribute name="text-align">left</xsl:attribute>
8454
-
8455
8105
  </xsl:if>
8456
8106
 
8457
8107
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -8461,9 +8111,7 @@
8461
8111
 
8462
8112
  <xsl:choose>
8463
8113
  <xsl:when test="$isGenerateTableIF = 'true'">
8464
-
8465
- <xsl:copy-of select="@id"/>
8466
-
8114
+ <xsl:copy-of select="@id"/>
8467
8115
  </xsl:when>
8468
8116
  <xsl:otherwise>
8469
8117
  <xsl:copy-of select="@id"/>
@@ -8500,9 +8148,7 @@
8500
8148
  <fo:block role="SKIP">
8501
8149
 
8502
8150
  <xsl:if test="$isGenerateTableIF = 'true'">
8503
-
8504
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8505
-
8151
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8506
8152
  </xsl:if>
8507
8153
 
8508
8154
  <xsl:choose>
@@ -8650,7 +8296,6 @@
8650
8296
  </xsl:template>
8651
8297
 
8652
8298
  <xsl:template name="refine_italic_style">
8653
-
8654
8299
  </xsl:template>
8655
8300
 
8656
8301
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -8666,7 +8311,6 @@
8666
8311
  </xsl:template>
8667
8312
 
8668
8313
  <xsl:template name="refine_strong_style">
8669
-
8670
8314
  <xsl:if test="ancestor::*['preferred']">
8671
8315
  <xsl:attribute name="role">SKIP</xsl:attribute>
8672
8316
  </xsl:if>
@@ -8691,10 +8335,7 @@
8691
8335
  <xsl:template match="*[local-name()='tt']">
8692
8336
  <fo:inline xsl:use-attribute-sets="tt-style">
8693
8337
 
8694
- <xsl:variable name="_font-size">
8695
-
8696
- <!-- inherit -->
8697
-
8338
+ <xsl:variable name="_font-size"> <!-- inherit -->
8698
8339
  </xsl:variable>
8699
8340
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
8700
8341
  <xsl:if test="$font-size != ''">
@@ -8910,8 +8551,7 @@
8910
8551
  </xsl:otherwise>
8911
8552
  </xsl:choose>
8912
8553
  </xsl:variable>
8913
- <xsl:variable name="ratio_">
8914
- 0.75
8554
+ <xsl:variable name="ratio_">0.75
8915
8555
  </xsl:variable>
8916
8556
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
8917
8557
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -9001,7 +8641,7 @@
9001
8641
 
9002
8642
  <xsl:variable name="quot">"</xsl:variable>
9003
8643
  <xsl:variable name="styles_">
9004
- <xsl:for-each select="xalan:nodeset($styles__)/item">
8644
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
9005
8645
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
9006
8646
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
9007
8647
  <xsl:variable name="value">
@@ -9013,7 +8653,7 @@
9013
8653
  </xsl:otherwise>
9014
8654
  </xsl:choose>
9015
8655
  </xsl:variable>
9016
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
8656
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
9017
8657
  <style name="{$key}"><xsl:value-of select="$value"/></style>
9018
8658
  </xsl:if>
9019
8659
  <xsl:if test="$key = 'text-indent'">
@@ -9027,7 +8667,6 @@
9027
8667
  <fo:inline>
9028
8668
  <xsl:for-each select="$styles/style">
9029
8669
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
9030
-
9031
8670
  </xsl:for-each>
9032
8671
  <xsl:apply-templates/>
9033
8672
  </fo:inline>
@@ -10014,10 +9653,9 @@
10014
9653
  <xsl:variable name="mathml_content">
10015
9654
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
10016
9655
  </xsl:variable>
10017
-
10018
- <xsl:call-template name="mathml_instream_object">
10019
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
10020
- </xsl:call-template>
9656
+ <xsl:call-template name="mathml_instream_object">
9657
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
9658
+ </xsl:call-template>
10021
9659
 
10022
9660
  </fo:inline>
10023
9661
  </xsl:template>
@@ -10051,9 +9689,7 @@
10051
9689
  <xsl:template name="getMathml_asciimath_text">
10052
9690
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
10053
9691
  <xsl:variable name="latexmath">
10054
-
10055
- <xsl:value-of select="../*[local-name() = 'latexmath']"/>
10056
-
9692
+ <xsl:value-of select="../*[local-name() = 'latexmath']"/>
10057
9693
  </xsl:variable>
10058
9694
  <xsl:variable name="asciimath_text_following">
10059
9695
  <xsl:choose>
@@ -10126,7 +9762,6 @@
10126
9762
  </xsl:template>
10127
9763
 
10128
9764
  <xsl:template name="refine_mathml_insteam_object_style">
10129
-
10130
9765
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
10131
9766
 
10132
9767
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -10524,7 +10159,6 @@
10524
10159
  <xsl:variable name="annotation-id" select="@id"/>
10525
10160
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
10526
10161
  <fo:block id="{$annotation-id}" white-space="nowrap">
10527
-
10528
10162
  <fo:inline>
10529
10163
  <xsl:apply-templates>
10530
10164
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -10553,7 +10187,6 @@
10553
10187
  <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'])">
10554
10188
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
10555
10189
  </xsl:if>
10556
-
10557
10190
  <xsl:if test="parent::*[local-name() = 'add']">
10558
10191
  <xsl:call-template name="append_add-style"/>
10559
10192
  </xsl:if>
@@ -10564,8 +10197,7 @@
10564
10197
  </xsl:template>
10565
10198
 
10566
10199
  <!-- command between two xref points to non-standard bibitem -->
10567
- <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']]]">
10568
- <xsl:value-of select="."/>
10200
+ <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="."/>
10569
10201
  </xsl:template>
10570
10202
 
10571
10203
  <!-- ====== -->
@@ -10580,7 +10212,6 @@
10580
10212
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
10581
10213
  </xsl:choose>
10582
10214
  </xsl:attribute>
10583
-
10584
10215
  </xsl:if>
10585
10216
  <fo:block-container margin-left="0mm" role="SKIP">
10586
10217
  <xsl:call-template name="setNamedDestination"/>
@@ -10670,53 +10301,49 @@
10670
10301
 
10671
10302
  <xsl:template match="*[local-name() = 'note']" name="note">
10672
10303
 
10673
- <xsl:call-template name="setNamedDestination"/>
10674
-
10675
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
10676
-
10677
- <xsl:call-template name="setBlockSpanAll"/>
10678
-
10679
- <xsl:call-template name="refine_note-style"/>
10304
+ <xsl:call-template name="setNamedDestination"/>
10680
10305
 
10681
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10306
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
10682
10307
 
10683
- <fo:block>
10308
+ <xsl:call-template name="setBlockSpanAll"/>
10684
10309
 
10685
- <xsl:call-template name="refine_note_block_style"/>
10310
+ <xsl:call-template name="refine_note-style"/>
10686
10311
 
10687
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
10312
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10313
+ <fo:block>
10688
10314
 
10689
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
10315
+ <xsl:call-template name="refine_note_block_style"/>
10690
10316
 
10691
- <xsl:call-template name="refine_note-name-style"/>
10317
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
10692
10318
 
10693
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
10694
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
10695
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
10696
- <xsl:call-template name="append_add-style"/>
10697
- </xsl:if>
10319
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
10698
10320
 
10699
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
10700
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
10701
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
10702
- <xsl:with-param name="skip">false</xsl:with-param>
10703
- </xsl:apply-templates>
10704
- </xsl:if>
10321
+ <xsl:call-template name="refine_note-name-style"/>
10705
10322
 
10706
- <xsl:apply-templates select="*[local-name() = 'name']"/>
10323
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
10324
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
10325
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
10326
+ <xsl:call-template name="append_add-style"/>
10327
+ </xsl:if>
10707
10328
 
10708
- </fo:inline>
10329
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
10330
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
10331
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
10332
+ <xsl:with-param name="skip">false</xsl:with-param>
10333
+ </xsl:apply-templates>
10334
+ </xsl:if>
10709
10335
 
10710
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
10711
- </fo:block>
10336
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
10712
10337
 
10713
- </fo:block-container>
10714
- </fo:block-container>
10338
+ </fo:inline>
10715
10339
 
10340
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
10341
+ </fo:block>
10342
+ </fo:block-container>
10343
+ </fo:block-container>
10716
10344
  </xsl:template>
10717
10345
 
10718
10346
  <xsl:template name="refine_note_block_style">
10719
-
10720
10347
  </xsl:template> <!-- refine_note_block_style -->
10721
10348
 
10722
10349
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -10769,7 +10396,6 @@
10769
10396
  <xsl:value-of select="$sfx"/>
10770
10397
  </xsl:when>
10771
10398
  <xsl:otherwise>
10772
-
10773
10399
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
10774
10400
  <!-- <xsl:if test="$namespace = 'ieee'">
10775
10401
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -10777,7 +10403,6 @@
10777
10403
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
10778
10404
  <xsl:text>:</xsl:text>
10779
10405
  </xsl:if> -->
10780
-
10781
10406
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
10782
10407
  <xsl:text> – </xsl:text> en dash &#x2013;
10783
10408
  </xsl:if> -->
@@ -10798,7 +10423,6 @@
10798
10423
  <xsl:value-of select="$sfx"/>
10799
10424
  </xsl:when>
10800
10425
  <xsl:otherwise>
10801
-
10802
10426
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
10803
10427
  <!-- <xsl:if test="$namespace = 'ieee'">
10804
10428
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -10854,7 +10478,6 @@
10854
10478
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
10855
10479
 
10856
10480
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
10857
-
10858
10481
  </xsl:if>
10859
10482
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
10860
10483
  </fo:block>
@@ -10894,8 +10517,7 @@
10894
10517
  <!-- Example: Dimensions in millimeters -->
10895
10518
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
10896
10519
 
10897
- <xsl:variable name="show_figure_key_in_block_container">
10898
- true
10520
+ <xsl:variable name="show_figure_key_in_block_container">true
10899
10521
  </xsl:variable>
10900
10522
 
10901
10523
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -10910,11 +10532,9 @@
10910
10532
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
10911
10533
  <xsl:call-template name="showFigureKey"/>
10912
10534
  </xsl:if>
10913
-
10914
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
10535
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
10915
10536
 
10916
10537
  </fo:block-container>
10917
-
10918
10538
  </xsl:template>
10919
10539
 
10920
10540
  <xsl:template name="showFigureKey">
@@ -10952,13 +10572,12 @@
10952
10572
  <!-- SOURCE: ... -->
10953
10573
  <!-- figure/source -->
10954
10574
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
10955
-
10956
- <xsl:call-template name="termsource"/>
10957
-
10575
+ <xsl:call-template name="termsource"/>
10958
10576
  </xsl:template>
10959
10577
 
10960
10578
  <xsl:template match="*[local-name() = 'image']">
10961
10579
  <xsl:param name="indent">0</xsl:param>
10580
+ <xsl:param name="logo_width"/>
10962
10581
  <xsl:variable name="isAdded" select="../@added"/>
10963
10582
  <xsl:variable name="isDeleted" select="../@deleted"/>
10964
10583
  <xsl:choose>
@@ -10980,9 +10599,18 @@
10980
10599
 
10981
10600
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
10982
10601
 
10983
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
10984
10602
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
10985
10603
 
10604
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
10605
+ <xsl:attribute name="width">100%</xsl:attribute>
10606
+ <xsl:if test="normalize-space($logo_width) != ''">
10607
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
10608
+ </xsl:if>
10609
+ <xsl:attribute name="content-height">100%</xsl:attribute>
10610
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
10611
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
10612
+ </xsl:if>
10613
+
10986
10614
  <xsl:variable name="width">
10987
10615
  <xsl:call-template name="setImageWidth"/>
10988
10616
  </xsl:variable>
@@ -11060,8 +10688,7 @@
11060
10688
  </xsl:call-template>
11061
10689
  </xsl:variable>
11062
10690
 
11063
- <xsl:variable name="scaleRatio">
11064
- 1
10691
+ <xsl:variable name="scaleRatio">1
11065
10692
  </xsl:variable>
11066
10693
 
11067
10694
  <xsl:if test="number($scale) &lt; 100">
@@ -11172,18 +10799,14 @@
11172
10799
  </xsl:variable>
11173
10800
 
11174
10801
  <xsl:variable name="image_width_effective">
11175
-
11176
- <xsl:value-of select="$width_effective - number($indent_left)"/>
11177
-
10802
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
11178
10803
  </xsl:variable>
11179
10804
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
11180
10805
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
11181
10806
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
11182
10807
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
11183
10808
  <xsl:variable name="scale">
11184
-
11185
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
11186
-
10809
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
11187
10810
  </xsl:variable>
11188
10811
  <xsl:value-of select="$scale"/>
11189
10812
  </xsl:template>
@@ -11204,7 +10827,8 @@
11204
10827
  </xsl:when>
11205
10828
  <xsl:when test="not(starts-with(@src, 'data:'))">
11206
10829
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
11207
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
10830
+ <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>
10831
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
11208
10832
  </xsl:when>
11209
10833
  <xsl:otherwise>
11210
10834
  <xsl:value-of select="@src"/>
@@ -11500,8 +11124,8 @@
11500
11124
  </xsl:call-template>
11501
11125
  </xsl:variable>
11502
11126
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
11503
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
11504
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
11127
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
11128
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
11505
11129
 
11506
11130
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
11507
11131
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -11573,8 +11197,8 @@
11573
11197
  </xsl:variable>
11574
11198
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
11575
11199
  <xsl:variable name="att_name" select="local-name()"/>
11576
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
11577
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
11200
+ <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>
11201
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
11578
11202
  </xsl:template>
11579
11203
 
11580
11204
  <!-- ============== -->
@@ -11647,13 +11271,13 @@
11647
11271
  </xsl:call-template>
11648
11272
  </xsl:variable>
11649
11273
  <xsl:variable name="x_coords">
11650
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
11274
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
11651
11275
  <xsl:sort select="." data-type="number"/>
11652
11276
  <x><xsl:value-of select="."/></x>
11653
11277
  </xsl:for-each>
11654
11278
  </xsl:variable>
11655
11279
  <xsl:variable name="y_coords">
11656
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
11280
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
11657
11281
  <xsl:sort select="." data-type="number"/>
11658
11282
  <y><xsl:value-of select="."/></y>
11659
11283
  </xsl:for-each>
@@ -11858,11 +11482,11 @@
11858
11482
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
11859
11483
  </xsl:variable>
11860
11484
 
11861
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
11862
- <title>
11485
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
11486
+ <mn:title>
11863
11487
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
11864
- </title>
11865
- </item>
11488
+ </mn:title>
11489
+ </mn:item>
11866
11490
  </xsl:if>
11867
11491
  </xsl:template>
11868
11492
 
@@ -11933,12 +11557,12 @@
11933
11557
  <xsl:param name="contents"/>
11934
11558
  <xsl:param name="contents_addon"/>
11935
11559
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
11936
- <xsl:if test="$contents_nodes//item">
11560
+ <xsl:if test="$contents_nodes//mn:item">
11937
11561
  <fo:bookmark-tree>
11938
11562
  <xsl:choose>
11939
- <xsl:when test="$contents_nodes/doc">
11563
+ <xsl:when test="$contents_nodes/mn:doc">
11940
11564
  <xsl:choose>
11941
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
11565
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
11942
11566
 
11943
11567
  <xsl:if test="$contents_nodes/collection">
11944
11568
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -11946,8 +11570,8 @@
11946
11570
  </fo:bookmark>
11947
11571
  </xsl:if>
11948
11572
 
11949
- <xsl:for-each select="$contents_nodes/doc">
11950
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
11573
+ <xsl:for-each select="$contents_nodes/mn:doc">
11574
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
11951
11575
  <xsl:if test="@bundle = 'true'">
11952
11576
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
11953
11577
  </xsl:if>
@@ -11981,14 +11605,14 @@
11981
11605
  </xsl:choose>
11982
11606
  </fo:bookmark-title>
11983
11607
 
11984
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
11608
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
11985
11609
 
11986
11610
  <xsl:call-template name="insertFigureBookmarks">
11987
- <xsl:with-param name="contents" select="contents"/>
11611
+ <xsl:with-param name="contents" select="mn:contents"/>
11988
11612
  </xsl:call-template>
11989
11613
 
11990
11614
  <xsl:call-template name="insertTableBookmarks">
11991
- <xsl:with-param name="contents" select="contents"/>
11615
+ <xsl:with-param name="contents" select="mn:contents"/>
11992
11616
  <xsl:with-param name="lang" select="@lang"/>
11993
11617
  </xsl:call-template>
11994
11618
 
@@ -11997,16 +11621,16 @@
11997
11621
  </xsl:for-each>
11998
11622
  </xsl:when>
11999
11623
  <xsl:otherwise>
12000
- <xsl:for-each select="$contents_nodes/doc">
11624
+ <xsl:for-each select="$contents_nodes/mn:doc">
12001
11625
 
12002
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
11626
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
12003
11627
 
12004
11628
  <xsl:call-template name="insertFigureBookmarks">
12005
- <xsl:with-param name="contents" select="contents"/>
11629
+ <xsl:with-param name="contents" select="mn:contents"/>
12006
11630
  </xsl:call-template>
12007
11631
 
12008
11632
  <xsl:call-template name="insertTableBookmarks">
12009
- <xsl:with-param name="contents" select="contents"/>
11633
+ <xsl:with-param name="contents" select="mn:contents"/>
12010
11634
  <xsl:with-param name="lang" select="@lang"/>
12011
11635
  </xsl:call-template>
12012
11636
 
@@ -12015,14 +11639,14 @@
12015
11639
  </xsl:choose>
12016
11640
  </xsl:when>
12017
11641
  <xsl:otherwise>
12018
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
11642
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
12019
11643
 
12020
11644
  <xsl:call-template name="insertFigureBookmarks">
12021
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
11645
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
12022
11646
  </xsl:call-template>
12023
11647
 
12024
11648
  <xsl:call-template name="insertTableBookmarks">
12025
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
11649
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
12026
11650
  <xsl:with-param name="lang" select="@lang"/>
12027
11651
  </xsl:call-template>
12028
11652
 
@@ -12039,80 +11663,72 @@
12039
11663
  <xsl:template name="insertFigureBookmarks">
12040
11664
  <xsl:param name="contents"/>
12041
11665
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
12042
- <xsl:if test="$contents_nodes/figure">
12043
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
11666
+ <xsl:if test="$contents_nodes/mn:figure">
11667
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
12044
11668
  <fo:bookmark-title>Figures</fo:bookmark-title>
12045
- <xsl:for-each select="$contents_nodes/figure">
11669
+ <xsl:for-each select="$contents_nodes/mn:figure">
12046
11670
  <fo:bookmark internal-destination="{@id}">
12047
11671
  <fo:bookmark-title>
12048
- <xsl:value-of select="normalize-space(title)"/>
11672
+ <xsl:value-of select="normalize-space(mn:title)"/>
12049
11673
  </fo:bookmark-title>
12050
11674
  </fo:bookmark>
12051
11675
  </xsl:for-each>
12052
11676
  </fo:bookmark>
12053
11677
  </xsl:if>
11678
+ <xsl:if test="$contents_nodes//mn:figures/mn:figure">
11679
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12054
11680
 
12055
- <xsl:if test="$contents_nodes//figures/figure">
12056
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12057
-
12058
- <xsl:variable name="bookmark-title">
12059
-
12060
- <xsl:value-of select="$title-list-figures"/>
12061
-
12062
- </xsl:variable>
12063
- <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
12064
- <xsl:for-each select="$contents_nodes//figures/figure">
12065
- <fo:bookmark internal-destination="{@id}">
12066
- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
12067
- </fo:bookmark>
12068
- </xsl:for-each>
11681
+ <xsl:variable name="bookmark-title">
11682
+ <xsl:value-of select="$title-list-figures"/>
11683
+ </xsl:variable>
11684
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
11685
+ <xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
11686
+ <fo:bookmark internal-destination="{@id}">
11687
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
12069
11688
  </fo:bookmark>
12070
- </xsl:if>
12071
-
11689
+ </xsl:for-each>
11690
+ </fo:bookmark>
11691
+ </xsl:if>
12072
11692
  </xsl:template> <!-- insertFigureBookmarks -->
12073
11693
 
12074
11694
  <xsl:template name="insertTableBookmarks">
12075
11695
  <xsl:param name="contents"/>
12076
11696
  <xsl:param name="lang"/>
12077
11697
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
12078
- <xsl:if test="$contents_nodes/table">
12079
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
11698
+ <xsl:if test="$contents_nodes/mn:table">
11699
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
12080
11700
  <fo:bookmark-title>
12081
11701
  <xsl:choose>
12082
11702
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
12083
11703
  <xsl:otherwise>Tables</xsl:otherwise>
12084
11704
  </xsl:choose>
12085
11705
  </fo:bookmark-title>
12086
- <xsl:for-each select="$contents_nodes/table">
11706
+ <xsl:for-each select="$contents_nodes/mn:table">
12087
11707
  <fo:bookmark internal-destination="{@id}">
12088
11708
  <fo:bookmark-title>
12089
- <xsl:value-of select="normalize-space(title)"/>
11709
+ <xsl:value-of select="normalize-space(mn:title)"/>
12090
11710
  </fo:bookmark-title>
12091
11711
  </fo:bookmark>
12092
11712
  </xsl:for-each>
12093
11713
  </fo:bookmark>
12094
11714
  </xsl:if>
11715
+ <xsl:if test="$contents_nodes//mn:tables/mn:table">
11716
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12095
11717
 
12096
- <xsl:if test="$contents_nodes//tables/table">
12097
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12098
-
12099
- <xsl:variable name="bookmark-title">
12100
-
12101
- <xsl:value-of select="$title-list-tables"/>
12102
-
12103
- </xsl:variable>
11718
+ <xsl:variable name="bookmark-title">
11719
+ <xsl:value-of select="$title-list-tables"/>
11720
+ </xsl:variable>
12104
11721
 
12105
- <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
11722
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
12106
11723
 
12107
- <xsl:for-each select="$contents_nodes//tables/table">
12108
- <fo:bookmark internal-destination="{@id}">
12109
- <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
12110
- <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
12111
- </fo:bookmark>
12112
- </xsl:for-each>
11724
+ <xsl:for-each select="$contents_nodes//mn:tables/mn:table">
11725
+ <fo:bookmark internal-destination="{@id}">
11726
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
11727
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
12113
11728
  </fo:bookmark>
12114
- </xsl:if>
12115
-
11729
+ </xsl:for-each>
11730
+ </fo:bookmark>
11731
+ </xsl:if>
12116
11732
  </xsl:template> <!-- insertTableBookmarks -->
12117
11733
  <!-- End Bookmarks -->
12118
11734
 
@@ -12142,17 +11758,15 @@
12142
11758
  <xsl:param name="title" select="''"/>
12143
11759
  <xsl:choose>
12144
11760
  <xsl:when test="$lang = 'en'">
12145
-
12146
11761
  </xsl:when>
12147
11762
  <xsl:when test="$lang = 'fr'">
12148
-
12149
11763
  </xsl:when>
12150
11764
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
12151
11765
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
12152
11766
  </xsl:choose>
12153
11767
  </xsl:template>
12154
11768
 
12155
- <xsl:template match="item" mode="bookmark">
11769
+ <xsl:template match="mn:item" mode="bookmark">
12156
11770
  <xsl:choose>
12157
11771
  <xsl:when test="@id != ''">
12158
11772
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -12162,7 +11776,7 @@
12162
11776
  <xsl:text> </xsl:text>
12163
11777
  </xsl:if>
12164
11778
  <xsl:variable name="title">
12165
- <xsl:for-each select="title/node()">
11779
+ <xsl:for-each select="mn:title/node()">
12166
11780
  <xsl:choose>
12167
11781
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
12168
11782
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -12180,7 +11794,7 @@
12180
11794
  </xsl:choose>
12181
11795
  </xsl:template>
12182
11796
 
12183
- <xsl:template match="title" mode="bookmark"/>
11797
+ <xsl:template match="mn:title" mode="bookmark"/>
12184
11798
  <xsl:template match="text()" mode="bookmark"/>
12185
11799
 
12186
11800
  <!-- figure/name -->
@@ -12409,9 +12023,9 @@
12409
12023
  <xsl:template match="text()" mode="contents_item">
12410
12024
  <xsl:variable name="text">
12411
12025
  <!-- to split by '_' and other chars -->
12412
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
12026
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
12413
12027
  </xsl:variable>
12414
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
12028
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
12415
12029
  <xsl:call-template name="keep_together_standard_number"/>
12416
12030
  </xsl:for-each>
12417
12031
  </xsl:template>
@@ -12444,14 +12058,7 @@
12444
12058
 
12445
12059
  <xsl:template name="get_sourcecode_attributes">
12446
12060
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
12447
- <xsl:variable name="_font-size">
12448
-
12449
- <!-- inherit -->
12450
-
12451
- <!-- <xsl:if test="$namespace = 'ieee'">
12452
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
12453
- </xsl:if> -->
12454
-
12061
+ <xsl:variable name="_font-size"><!-- inherit -->
12455
12062
  </xsl:variable>
12456
12063
 
12457
12064
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -12507,7 +12114,6 @@
12507
12114
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
12508
12115
  </xsl:choose>
12509
12116
  </xsl:attribute>
12510
-
12511
12117
  </xsl:if>
12512
12118
  <fo:block-container margin-left="0mm" role="SKIP">
12513
12119
 
@@ -12531,8 +12137,7 @@
12531
12137
  </fo:block>
12532
12138
 
12533
12139
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
12534
-
12535
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
12140
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
12536
12141
 
12537
12142
  </fo:block-container>
12538
12143
  </fo:block-container>
@@ -12709,25 +12314,6 @@
12709
12314
  </xsl:choose>
12710
12315
  </xsl:template>
12711
12316
 
12712
- <!-- insert 'char' between each character in the string -->
12713
- <xsl:template name="interspers">
12714
- <xsl:param name="str"/>
12715
- <xsl:param name="char" select="$zero_width_space"/>
12716
- <xsl:if test="$str != ''">
12717
- <xsl:value-of select="substring($str, 1, 1)"/>
12718
-
12719
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
12720
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
12721
- <xsl:value-of select="$char"/>
12722
- </xsl:if>
12723
-
12724
- <xsl:call-template name="interspers">
12725
- <xsl:with-param name="str" select="substring($str, 2)"/>
12726
- <xsl:with-param name="char" select="$char"/>
12727
- </xsl:call-template>
12728
- </xsl:if>
12729
- </xsl:template>
12730
-
12731
12317
  <xsl:template name="interspers-java">
12732
12318
  <xsl:param name="str"/>
12733
12319
  <xsl:param name="char" select="$zero_width_space"/>
@@ -12824,7 +12410,7 @@
12824
12410
  </xsl:variable>
12825
12411
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
12826
12412
 
12827
- <xsl:for-each select="$classes/item">
12413
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
12828
12414
  <xsl:variable name="class_name" select="."/>
12829
12415
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
12830
12416
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -12907,12 +12493,9 @@
12907
12493
 
12908
12494
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
12909
12495
  <xsl:if test="normalize-space() != ''">
12910
-
12911
- <fo:block xsl:use-attribute-sets="permission-name-style">
12912
- <xsl:apply-templates/>
12913
-
12914
- </fo:block>
12915
-
12496
+ <fo:block xsl:use-attribute-sets="permission-name-style">
12497
+ <xsl:apply-templates/>
12498
+ </fo:block>
12916
12499
  </xsl:if>
12917
12500
  </xsl:template>
12918
12501
 
@@ -12941,12 +12524,9 @@
12941
12524
  <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
12942
12525
  <xsl:if test="normalize-space() != ''">
12943
12526
 
12944
- <fo:block xsl:use-attribute-sets="requirement-name-style">
12945
-
12946
- <xsl:apply-templates/>
12947
-
12948
- </fo:block>
12949
-
12527
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
12528
+ <xsl:apply-templates/>
12529
+ </fo:block>
12950
12530
  </xsl:if>
12951
12531
  </xsl:template>
12952
12532
 
@@ -12985,11 +12565,9 @@
12985
12565
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
12986
12566
  <xsl:if test="normalize-space() != ''">
12987
12567
 
12988
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
12989
- <xsl:apply-templates/>
12990
-
12991
- </fo:block>
12992
-
12568
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
12569
+ <xsl:apply-templates/>
12570
+ </fo:block>
12993
12571
  </xsl:if>
12994
12572
  </xsl:template>
12995
12573
 
@@ -13115,7 +12693,6 @@
13115
12693
 
13116
12694
  <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 ')">
13117
12695
  <xsl:attribute name="font-weight">bold</xsl:attribute>
13118
-
13119
12696
  </xsl:if>
13120
12697
 
13121
12698
  <xsl:apply-templates mode="requirement"/>
@@ -13160,7 +12737,6 @@
13160
12737
 
13161
12738
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
13162
12739
  <fo:block font-size="11pt">
13163
-
13164
12740
  <xsl:apply-templates/>
13165
12741
  </fo:block>
13166
12742
  </xsl:template>
@@ -13199,16 +12775,14 @@
13199
12775
 
13200
12776
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
13201
12777
  <xsl:variable name="element">inline
13202
-
13203
12778
  block
13204
12779
  </xsl:variable>
13205
12780
  <xsl:choose>
13206
12781
  <xsl:when test="contains($element, 'block')">
13207
12782
  <fo:block xsl:use-attribute-sets="example-p-style">
13208
-
13209
- <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])">
13210
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
13211
- </xsl:if>
12783
+ <xsl:if test="not(preceding-sibling::*[local-name() = 'p'])">
12784
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
12785
+ </xsl:if>
13212
12786
 
13213
12787
  <xsl:apply-templates/>
13214
12788
  </fo:block>
@@ -13236,110 +12810,105 @@
13236
12810
  text line 2
13237
12811
  -->
13238
12812
  <xsl:template match="*[local-name() = 'example']" name="example">
12813
+ <xsl:call-template name="setNamedDestination"/>
12814
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
13239
12815
 
13240
- <xsl:call-template name="setNamedDestination"/>
13241
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
12816
+ <xsl:call-template name="setBlockSpanAll"/>
13242
12817
 
13243
- <xsl:call-template name="setBlockSpanAll"/>
12818
+ <xsl:call-template name="refine_example-style"/>
13244
12819
 
13245
- <xsl:call-template name="refine_example-style"/>
12820
+ <xsl:variable name="fo_element">
12821
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>block
12822
+ </xsl:variable>
13246
12823
 
13247
- <xsl:variable name="fo_element">
13248
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
13249
- block
13250
- </xsl:variable>
12824
+ <fo:block-container margin-left="0mm" role="SKIP">
13251
12825
 
13252
- <fo:block-container margin-left="0mm" role="SKIP">
12826
+ <xsl:choose>
13253
12827
 
13254
- <xsl:choose>
12828
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
13255
12829
 
13256
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
12830
+ <!-- display name 'EXAMPLE' in a separate block -->
12831
+ <fo:block>
12832
+ <xsl:apply-templates select="*[local-name()='name']">
12833
+ <xsl:with-param name="fo_element" select="$fo_element"/>
12834
+ </xsl:apply-templates>
12835
+ </fo:block>
13257
12836
 
13258
- <!-- display name 'EXAMPLE' in a separate block -->
13259
- <fo:block>
13260
- <xsl:apply-templates select="*[local-name()='name']">
12837
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
12838
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
12839
+ <xsl:variable name="example_body">
12840
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
13261
12841
  <xsl:with-param name="fo_element" select="$fo_element"/>
13262
12842
  </xsl:apply-templates>
13263
- </fo:block>
13264
-
13265
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
13266
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
13267
- <xsl:variable name="example_body">
13268
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
13269
- <xsl:with-param name="fo_element" select="$fo_element"/>
13270
- </xsl:apply-templates>
13271
- </xsl:variable>
13272
- <xsl:choose>
13273
- <xsl:when test="xalan:nodeset($example_body)/*">
13274
- <xsl:copy-of select="$example_body"/>
13275
- </xsl:when>
13276
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
13277
- </xsl:choose>
13278
- </fo:block-container>
13279
- </fo:block-container>
13280
- </xsl:when> <!-- end block -->
13281
-
13282
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
13283
-
13284
- <xsl:variable name="provisional_distance_between_starts_">
13285
- 7
13286
- </xsl:variable>
13287
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
13288
- <xsl:variable name="indent_">
13289
- 0
13290
12843
  </xsl:variable>
13291
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
12844
+ <xsl:choose>
12845
+ <xsl:when test="xalan:nodeset($example_body)/*">
12846
+ <xsl:copy-of select="$example_body"/>
12847
+ </xsl:when>
12848
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
12849
+ </xsl:choose>
12850
+ </fo:block-container>
12851
+ </fo:block-container>
12852
+ </xsl:when> <!-- end block -->
13292
12853
 
13293
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
13294
- <fo:list-item>
13295
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
13296
- <fo:block>
13297
- <xsl:apply-templates select="*[local-name()='name']">
13298
- <xsl:with-param name="fo_element">block</xsl:with-param>
13299
- </xsl:apply-templates>
13300
- </fo:block>
13301
- </fo:list-item-label>
13302
- <fo:list-item-body start-indent="body-start()">
13303
- <fo:block>
13304
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
13305
- <xsl:with-param name="fo_element" select="$fo_element"/>
13306
- </xsl:apply-templates>
13307
- </fo:block>
13308
- </fo:list-item-body>
13309
- </fo:list-item>
13310
- </fo:list-block>
13311
- </xsl:when> <!-- end list -->
12854
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
13312
12855
 
13313
- <xsl:otherwise> <!-- inline -->
12856
+ <xsl:variable name="provisional_distance_between_starts_">7
12857
+ </xsl:variable>
12858
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
12859
+ <xsl:variable name="indent_">0
12860
+ </xsl:variable>
12861
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
13314
12862
 
13315
- <!-- display 'EXAMPLE' and first element in the same line -->
13316
- <fo:block>
13317
- <xsl:apply-templates select="*[local-name()='name']">
13318
- <xsl:with-param name="fo_element" select="$fo_element"/>
13319
- </xsl:apply-templates>
13320
- <fo:inline>
13321
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
12863
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
12864
+ <fo:list-item>
12865
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
12866
+ <fo:block>
12867
+ <xsl:apply-templates select="*[local-name()='name']">
12868
+ <xsl:with-param name="fo_element">block</xsl:with-param>
12869
+ </xsl:apply-templates>
12870
+ </fo:block>
12871
+ </fo:list-item-label>
12872
+ <fo:list-item-body start-indent="body-start()">
12873
+ <fo:block>
12874
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
13322
12875
  <xsl:with-param name="fo_element" select="$fo_element"/>
13323
12876
  </xsl:apply-templates>
13324
- </fo:inline>
13325
- </fo:block>
12877
+ </fo:block>
12878
+ </fo:list-item-body>
12879
+ </fo:list-item>
12880
+ </fo:list-block>
12881
+ </xsl:when> <!-- end list -->
13326
12882
 
13327
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
13328
- <!-- display further elements in blocks -->
13329
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
13330
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
13331
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
13332
- <xsl:with-param name="fo_element" select="'block'"/>
13333
- </xsl:apply-templates>
13334
- </fo:block-container>
13335
- </fo:block-container>
13336
- </xsl:if>
13337
- </xsl:otherwise> <!-- end inline -->
12883
+ <xsl:otherwise> <!-- inline -->
12884
+
12885
+ <!-- display 'EXAMPLE' and first element in the same line -->
12886
+ <fo:block>
12887
+ <xsl:apply-templates select="*[local-name()='name']">
12888
+ <xsl:with-param name="fo_element" select="$fo_element"/>
12889
+ </xsl:apply-templates>
12890
+ <fo:inline>
12891
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
12892
+ <xsl:with-param name="fo_element" select="$fo_element"/>
12893
+ </xsl:apply-templates>
12894
+ </fo:inline>
12895
+ </fo:block>
13338
12896
 
13339
- </xsl:choose>
13340
- </fo:block-container>
13341
- </fo:block-container>
12897
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
12898
+ <!-- display further elements in blocks -->
12899
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
12900
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
12901
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
12902
+ <xsl:with-param name="fo_element" select="'block'"/>
12903
+ </xsl:apply-templates>
12904
+ </fo:block-container>
12905
+ </fo:block-container>
12906
+ </xsl:if>
12907
+ </xsl:otherwise> <!-- end inline -->
13342
12908
 
12909
+ </xsl:choose>
12910
+ </fo:block-container>
12911
+ </fo:block-container>
13343
12912
  </xsl:template>
13344
12913
 
13345
12914
  <!-- example/name -->
@@ -13354,7 +12923,6 @@
13354
12923
  </xsl:when>
13355
12924
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
13356
12925
  <fo:block xsl:use-attribute-sets="example-name-style">
13357
-
13358
12926
  <xsl:apply-templates/>
13359
12927
  </fo:block>
13360
12928
  </xsl:when>
@@ -13371,7 +12939,6 @@
13371
12939
  <!-- table/example/name, table/tfoot//example/name -->
13372
12940
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
13373
12941
  <fo:inline xsl:use-attribute-sets="example-name-style">
13374
-
13375
12942
  <xsl:apply-templates/>
13376
12943
  </fo:inline>
13377
12944
  </xsl:template>
@@ -13381,7 +12948,6 @@
13381
12948
 
13382
12949
  <xsl:variable name="num"><xsl:number/></xsl:variable>
13383
12950
  <xsl:variable name="element">
13384
-
13385
12951
  <xsl:value-of select="$fo_element"/>
13386
12952
  </xsl:variable>
13387
12953
  <xsl:choose>
@@ -13499,7 +13065,7 @@
13499
13065
  </xsl:call-template>
13500
13066
  </xsl:variable>
13501
13067
 
13502
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
13068
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
13503
13069
  <xsl:choose>
13504
13070
  <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>
13505
13071
  <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>
@@ -13536,7 +13102,6 @@
13536
13102
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
13537
13103
  </xsl:if>
13538
13104
  </xsl:if>
13539
-
13540
13105
  <fo:block-container margin-left="0mm" role="SKIP">
13541
13106
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
13542
13107
 
@@ -13619,7 +13184,6 @@
13619
13184
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
13620
13185
  <xsl:attribute name="vertical-align">super</xsl:attribute>
13621
13186
  <xsl:attribute name="font-size">80%</xsl:attribute>
13622
-
13623
13187
  </xsl:if>
13624
13188
 
13625
13189
  <xsl:call-template name="refine_eref-style"/>
@@ -13668,7 +13232,6 @@
13668
13232
  </xsl:template>
13669
13233
 
13670
13234
  <xsl:template name="refine_basic_link_style">
13671
-
13672
13235
  </xsl:template> <!-- refine_basic_link_style -->
13673
13236
 
13674
13237
  <!-- ====== -->
@@ -13684,11 +13247,7 @@
13684
13247
  </xsl:call-template>
13685
13248
  </xsl:variable>
13686
13249
 
13687
- <xsl:variable name="padding">
13688
-
13689
- 1
13690
-
13691
-
13250
+ <xsl:variable name="padding">1
13692
13251
  </xsl:variable>
13693
13252
 
13694
13253
  <xsl:variable name="padding-right">
@@ -13699,7 +13258,6 @@
13699
13258
  </xsl:otherwise>
13700
13259
  </xsl:choose>
13701
13260
  </xsl:variable>
13702
-
13703
13261
  <xsl:choose>
13704
13262
  <xsl:when test="$lang = 'zh'">
13705
13263
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -13723,7 +13281,6 @@
13723
13281
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
13724
13282
 
13725
13283
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
13726
-
13727
13284
  </xsl:template>
13728
13285
 
13729
13286
  <xsl:template name="insertNonBreakSpaces">
@@ -13741,8 +13298,7 @@
13741
13298
  <xsl:variable name="level">
13742
13299
  <xsl:call-template name="getLevel"/>
13743
13300
  </xsl:variable>
13744
- <xsl:variable name="font-size">
13745
- inherit
13301
+ <xsl:variable name="font-size">inherit
13746
13302
  </xsl:variable>
13747
13303
  <xsl:variable name="levelTerm">
13748
13304
  <xsl:call-template name="getLevelTermName"/>
@@ -13794,11 +13350,9 @@
13794
13350
  </xsl:template>
13795
13351
 
13796
13352
  <xsl:template name="setStyle_preferred">
13797
-
13798
- <xsl:if test="*[local-name() = 'strong']">
13799
- <xsl:attribute name="font-weight">normal</xsl:attribute>
13800
- </xsl:if>
13801
-
13353
+ <xsl:if test="*[local-name() = 'strong']">
13354
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
13355
+ </xsl:if>
13802
13356
  </xsl:template>
13803
13357
 
13804
13358
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -13875,7 +13429,6 @@
13875
13429
 
13876
13430
  <!-- main sections -->
13877
13431
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
13878
-
13879
13432
  <xsl:call-template name="setNamedDestination"/>
13880
13433
  <fo:block>
13881
13434
  <xsl:call-template name="setId"/>
@@ -13910,13 +13463,10 @@
13910
13463
  </xsl:template>
13911
13464
 
13912
13465
  <xsl:template name="sections_element_style">
13913
-
13914
13466
  </xsl:template> <!-- sections_element_style -->
13915
13467
 
13916
13468
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
13917
-
13918
- <fo:block break-after="page"/>
13919
-
13469
+ <fo:block break-after="page"/>
13920
13470
  <xsl:call-template name="setNamedDestination"/>
13921
13471
  <fo:block>
13922
13472
  <xsl:call-template name="setId"/>
@@ -13965,7 +13515,6 @@
13965
13515
  </xsl:template>
13966
13516
 
13967
13517
  <xsl:template name="refine_clause_style">
13968
-
13969
13518
  </xsl:template> <!-- refine_clause_style -->
13970
13519
 
13971
13520
  <xsl:template match="*[local-name() = 'definitions']">
@@ -14005,7 +13554,6 @@
14005
13554
  </xsl:template>
14006
13555
 
14007
13556
  <xsl:template name="refine_annex_style">
14008
-
14009
13557
  </xsl:template>
14010
13558
 
14011
13559
  <!-- document text (not figures, or tables) footnotes -->
@@ -14109,26 +13657,24 @@
14109
13657
  <!-- Lists processing -->
14110
13658
  <!-- ===================================== -->
14111
13659
  <xsl:variable name="ul_labels_">
14112
-
14113
- <xsl:choose>
14114
- <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
14115
- <label level="1" font-size="14pt" color="rgb(128,128,128)">▪</label> <!-- Black small square 25AA 18pt line-height="1.5" -->
14116
- <label level="2">—</label><!-- em dash -->
14117
- </xsl:when>
14118
- <xsl:otherwise>
14119
- <label>–</label>
14120
- <!-- <label level="1">–</label>
13660
+ <xsl:choose>
13661
+ <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
13662
+ <label level="1" font-size="14pt" color="rgb(128,128,128)">▪</label> <!-- Black small square 25AA 18pt line-height="1.5" -->
13663
+ <label level="2">—</label><!-- em dash -->
13664
+ </xsl:when>
13665
+ <xsl:otherwise>
13666
+ <label>–</label>
13667
+ <!-- <label level="1">–</label>
14121
13668
  <label level="2">•</label>
14122
13669
  <label level="3" font-size="75%">o</label> --> <!-- white circle -->
14123
- </xsl:otherwise>
14124
- </xsl:choose>
13670
+ </xsl:otherwise>
13671
+ </xsl:choose>
14125
13672
 
14126
13673
  </xsl:variable>
14127
13674
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
14128
13675
 
14129
13676
  <xsl:template name="setULLabel">
14130
- <xsl:variable name="list_level__">
14131
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
13677
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
14132
13678
  </xsl:variable>
14133
13679
  <xsl:variable name="list_level_" select="number($list_level__)"/>
14134
13680
  <xsl:variable name="list_level">
@@ -14185,28 +13731,22 @@
14185
13731
  <xsl:variable name="label">
14186
13732
 
14187
13733
  <xsl:variable name="style_prefix_">
14188
- <xsl:if test="$type = 'roman'">
14189
- <!-- Example: (i) -->
13734
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
14190
13735
  </xsl:if>
14191
13736
  <xsl:if test="$type = 'alphabet'">
14192
-
14193
13737
  </xsl:if>
14194
13738
  </xsl:variable>
14195
13739
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
14196
13740
 
14197
13741
  <xsl:variable name="style_suffix_">
14198
13742
  <xsl:choose>
14199
- <xsl:when test="$type = 'arabic'">
14200
- )
13743
+ <xsl:when test="$type = 'arabic'">)
14201
13744
  </xsl:when>
14202
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
14203
- )
13745
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
14204
13746
  </xsl:when>
14205
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
14206
- .
13747
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
14207
13748
  </xsl:when>
14208
- <xsl:when test="$type = 'roman'">
14209
- )
13749
+ <xsl:when test="$type = 'roman'">)
14210
13750
  </xsl:when>
14211
13751
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
14212
13752
  </xsl:choose>
@@ -14223,8 +13763,7 @@
14223
13763
  <xsl:value-of select="$style_suffix"/>
14224
13764
  </xsl:if>
14225
13765
  </xsl:variable>
14226
-
14227
- <xsl:value-of select="normalize-space($label)"/>
13766
+ <xsl:value-of select="normalize-space($label)"/>
14228
13767
 
14229
13768
  </xsl:when>
14230
13769
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -14281,17 +13820,13 @@
14281
13820
 
14282
13821
  <xsl:variable name="format">
14283
13822
  <xsl:choose>
14284
- <xsl:when test="$type = 'arabic'">
14285
- 1)
13823
+ <xsl:when test="$type = 'arabic'">1)
14286
13824
  </xsl:when>
14287
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
14288
- a)
13825
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
14289
13826
  </xsl:when>
14290
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
14291
- A.
13827
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
14292
13828
  </xsl:when>
14293
- <xsl:when test="$type = 'roman'">
14294
- i)
13829
+ <xsl:when test="$type = 'roman'">i)
14295
13830
  </xsl:when>
14296
13831
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
14297
13832
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -14328,19 +13863,16 @@
14328
13863
  </fo:block-container>
14329
13864
  </xsl:when>
14330
13865
  <xsl:otherwise>
14331
-
14332
- <fo:block role="SKIP">
14333
- <xsl:apply-templates select="." mode="list">
14334
- <xsl:with-param name="indent" select="$indent"/>
14335
- </xsl:apply-templates>
14336
- </fo:block>
14337
-
13866
+ <fo:block role="SKIP">
13867
+ <xsl:apply-templates select="." mode="list">
13868
+ <xsl:with-param name="indent" select="$indent"/>
13869
+ </xsl:apply-templates>
13870
+ </fo:block>
14338
13871
  </xsl:otherwise>
14339
13872
  </xsl:choose>
14340
13873
  </xsl:template>
14341
13874
 
14342
13875
  <xsl:template name="refine_list_container_style">
14343
-
14344
13876
  </xsl:template> <!-- refine_list_container_style -->
14345
13877
 
14346
13878
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -14404,7 +13936,6 @@
14404
13936
  </xsl:template>
14405
13937
 
14406
13938
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
14407
-
14408
13939
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
14409
13940
 
14410
13941
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -14689,7 +14220,6 @@
14689
14220
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
14690
14221
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
14691
14222
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
14692
-
14693
14223
  <xsl:apply-templates/>
14694
14224
  </fo:block>
14695
14225
  </xsl:template>
@@ -14741,7 +14271,6 @@
14741
14271
  <fo:table-column column-width="15mm"/>
14742
14272
  <fo:table-body>
14743
14273
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
14744
-
14745
14274
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
14746
14275
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
14747
14276
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -14777,7 +14306,6 @@
14777
14306
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
14778
14307
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
14779
14308
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
14780
-
14781
14309
  </xsl:template>
14782
14310
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
14783
14311
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -14788,14 +14316,12 @@
14788
14316
  <xsl:call-template name="setNamedDestination"/>
14789
14317
  <fo:block id="{@id}">
14790
14318
  <xsl:apply-templates/>
14791
-
14792
14319
  </fo:block>
14793
14320
  </xsl:template>
14794
14321
 
14795
14322
  <!-- Bibliography (non-normative references) -->
14796
14323
  <xsl:template match="*[local-name() = 'references']">
14797
14324
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
14798
-
14799
14325
  </xsl:if>
14800
14326
 
14801
14327
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -14811,9 +14337,7 @@
14811
14337
 
14812
14338
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
14813
14339
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
14814
-
14815
14340
  </fo:block>
14816
-
14817
14341
  </xsl:template> <!-- references -->
14818
14342
 
14819
14343
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -14823,57 +14347,50 @@
14823
14347
  <!-- Normative references -->
14824
14348
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
14825
14349
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
14826
-
14827
- <xsl:call-template name="setNamedDestination"/>
14828
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
14829
-
14830
- <xsl:call-template name="processBibitem"/>
14831
- </fo:block>
14350
+ <xsl:call-template name="setNamedDestination"/>
14351
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
14352
+ <xsl:call-template name="processBibitem"/>
14353
+ </fo:block>
14832
14354
 
14833
14355
  </xsl:template> <!-- bibitem -->
14834
14356
 
14835
14357
  <!-- Bibliography (non-normative references) -->
14836
14358
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
14837
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
14838
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
14359
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
14839
14360
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
14840
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
14841
- <xsl:call-template name="setNamedDestination"/>
14842
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
14843
-
14844
- <xsl:variable name="bibitem_label">
14361
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
14362
+ <xsl:call-template name="setNamedDestination"/>
14363
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
14364
+ <xsl:variable name="bibitem_label">
14365
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
14366
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
14367
+ </xsl:apply-templates>
14368
+ </xsl:variable>
14369
+ <xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
14370
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
14371
+ </xsl:if>
14372
+ <fo:list-item>
14373
+ <fo:list-item-label end-indent="label-end()">
14374
+ <fo:block role="SKIP">
14375
+ <fo:inline role="SKIP">
14376
+ <xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
14377
+ <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
14378
+ </xsl:if>
14845
14379
  <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
14846
14380
  <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
14847
14381
  </xsl:apply-templates>
14848
- </xsl:variable>
14849
- <xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
14850
- <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
14851
- </xsl:if>
14852
-
14853
- <fo:list-item>
14854
- <fo:list-item-label end-indent="label-end()">
14855
- <fo:block role="SKIP">
14856
- <fo:inline role="SKIP">
14857
-
14858
- <xsl:if test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
14859
- <xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
14860
- </xsl:if>
14861
-
14862
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
14863
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
14864
- </xsl:apply-templates>
14865
- </fo:inline>
14866
- </fo:block>
14867
- </fo:list-item-label>
14868
- <fo:list-item-body start-indent="body-start()">
14869
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
14870
- <xsl:call-template name="processBibitem">
14871
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
14872
- </xsl:call-template>
14873
- </fo:block>
14874
- </fo:list-item-body>
14875
- </fo:list-item>
14876
- </fo:list-block>
14382
+ </fo:inline>
14383
+ </fo:block>
14384
+ </fo:list-item-label>
14385
+ <fo:list-item-body start-indent="body-start()">
14386
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
14387
+ <xsl:call-template name="processBibitem">
14388
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
14389
+ </xsl:call-template>
14390
+ </fo:block>
14391
+ </fo:list-item-body>
14392
+ </fo:list-item>
14393
+ </fo:list-block>
14877
14394
 
14878
14395
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
14879
14396
 
@@ -14883,7 +14400,6 @@
14883
14400
  <xsl:otherwise>
14884
14401
  <xsl:call-template name="setNamedDestination"/>
14885
14402
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
14886
-
14887
14403
  <fo:list-item-label end-indent="label-end()">
14888
14404
  <fo:block role="SKIP">
14889
14405
  <fo:inline role="SKIP">
@@ -14910,18 +14426,16 @@
14910
14426
 
14911
14427
  <xsl:template name="processBibitem">
14912
14428
  <xsl:param name="biblio_tag_part">both</xsl:param>
14429
+ <!-- start bibitem processing -->
14430
+ <xsl:if test=".//*[local-name() = 'fn']">
14431
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
14432
+ </xsl:if>
14913
14433
 
14914
- <!-- start bibitem processing -->
14915
- <xsl:if test=".//*[local-name() = 'fn']">
14916
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
14917
- </xsl:if>
14918
-
14919
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
14920
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
14921
- </xsl:apply-templates>
14922
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
14923
- <!-- end bibitem processing -->
14924
-
14434
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
14435
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
14436
+ </xsl:apply-templates>
14437
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
14438
+ <!-- end bibitem processing -->
14925
14439
  </xsl:template> <!-- processBibitem (bibitem) -->
14926
14440
 
14927
14441
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -15065,11 +14579,10 @@
15065
14579
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
15066
14580
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
15067
14581
  <xsl:otherwise><!-- default value -->
15068
-
15069
- <xsl:choose>
15070
- <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">3</xsl:when>
15071
- <xsl:otherwise>2</xsl:otherwise>
15072
- </xsl:choose>
14582
+ <xsl:choose>
14583
+ <xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">3</xsl:when>
14584
+ <xsl:otherwise>2</xsl:otherwise>
14585
+ </xsl:choose>
15073
14586
 
15074
14587
  </xsl:otherwise>
15075
14588
  </xsl:choose>
@@ -15278,54 +14791,46 @@
15278
14791
  <!-- ================ -->
15279
14792
  <!-- Admonition -->
15280
14793
  <!-- ================ -->
15281
- <xsl:template match="*[local-name() = 'admonition']">
15282
-
15283
- <!-- text in the box -->
15284
- <xsl:call-template name="setNamedDestination"/>
15285
- <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
15286
-
15287
- <xsl:call-template name="setBlockSpanAll"/>
14794
+ <xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
14795
+ <xsl:call-template name="setNamedDestination"/>
14796
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
15288
14797
 
15289
- <xsl:if test="@type = 'editorial'">
15290
- <xsl:attribute name="border">none</xsl:attribute>
15291
- <!-- <xsl:attribute name="font-weight">bold</xsl:attribute>
14798
+ <xsl:call-template name="setBlockSpanAll"/>
14799
+ <xsl:if test="@type = 'editorial'">
14800
+ <xsl:attribute name="border">none</xsl:attribute>
14801
+ <!-- <xsl:attribute name="font-weight">bold</xsl:attribute>
15292
14802
  <xsl:attribute name="font-style">italic</xsl:attribute> -->
15293
- <xsl:attribute name="color">green</xsl:attribute>
15294
- <xsl:attribute name="font-weight">normal</xsl:attribute>
15295
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
15296
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
15297
- <xsl:attribute name="text-align">left</xsl:attribute>
15298
- </xsl:if>
15299
- <xsl:if test="not(@type)">
15300
- <xsl:attribute name="font-size">9pt</xsl:attribute>
15301
- <xsl:attribute name="text-align">left</xsl:attribute>
15302
- </xsl:if>
15303
-
15304
- <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
15305
-
15306
- <xsl:if test="@type = 'editorial' or not(@type)">
15307
- <xsl:attribute name="padding">0mm</xsl:attribute>
15308
- </xsl:if>
15309
- <xsl:if test="not(@type)">
15310
- <xsl:attribute name="padding">1mm</xsl:attribute>
15311
- <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute>
15312
- </xsl:if>
15313
-
15314
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
15315
- <fo:block xsl:use-attribute-sets="admonition-p-style">
15316
- <fo:inline>
15317
- <xsl:call-template name="displayAdmonitionName">
15318
- <xsl:with-param name="sep">: </xsl:with-param>
15319
- </xsl:call-template>
15320
- </fo:inline>
15321
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
15322
- </fo:block>
15323
- </fo:block-container>
15324
-
15325
- </fo:block-container>
15326
-
15327
- </fo:block-container>
14803
+ <xsl:attribute name="color">green</xsl:attribute>
14804
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
14805
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
14806
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
14807
+ <xsl:attribute name="text-align">left</xsl:attribute>
14808
+ </xsl:if>
14809
+ <xsl:if test="not(@type)">
14810
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
14811
+ <xsl:attribute name="text-align">left</xsl:attribute>
14812
+ </xsl:if>
14813
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
14814
+ <xsl:if test="@type = 'editorial' or not(@type)">
14815
+ <xsl:attribute name="padding">0mm</xsl:attribute>
14816
+ </xsl:if>
14817
+ <xsl:if test="not(@type)">
14818
+ <xsl:attribute name="padding">1mm</xsl:attribute>
14819
+ <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute>
14820
+ </xsl:if>
14821
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
14822
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
14823
+ <fo:inline>
14824
+ <xsl:call-template name="displayAdmonitionName">
14825
+ <xsl:with-param name="sep">: </xsl:with-param>
14826
+ </xsl:call-template>
14827
+ </fo:inline>
14828
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
14829
+ </fo:block>
14830
+ </fo:block-container>
15328
14831
 
14832
+ </fo:block-container>
14833
+ </fo:block-container>
15329
14834
  </xsl:template>
15330
14835
 
15331
14836
  <xsl:template name="displayAdmonitionName">
@@ -15373,17 +14878,16 @@
15373
14878
  </xsl:template> -->
15374
14879
 
15375
14880
  <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
15376
-
15377
- <xsl:choose>
15378
- <xsl:when test="ancestor::*[local-name() = 'admonition'][@type = 'editorial']">
15379
- <xsl:apply-templates/>
15380
- </xsl:when>
15381
- <xsl:otherwise>
15382
- <fo:block xsl:use-attribute-sets="admonition-p-style">
15383
- <xsl:apply-templates/>
15384
- </fo:block>
15385
- </xsl:otherwise>
15386
- </xsl:choose>
14881
+ <xsl:choose>
14882
+ <xsl:when test="ancestor::*[local-name() = 'admonition'][@type = 'editorial']">
14883
+ <xsl:apply-templates/>
14884
+ </xsl:when>
14885
+ <xsl:otherwise>
14886
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
14887
+ <xsl:apply-templates/>
14888
+ </fo:block>
14889
+ </xsl:otherwise>
14890
+ </xsl:choose>
15387
14891
 
15388
14892
  </xsl:template>
15389
14893
 
@@ -15420,10 +14924,9 @@
15420
14924
 
15421
14925
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
15422
14926
  <xsl:variable name="updated_xml_step2">
15423
-
15424
- <xsl:if test="$table_if = 'false'">
15425
- <xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
15426
- </xsl:if>
14927
+ <xsl:if test="$table_if = 'false'">
14928
+ <xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
14929
+ </xsl:if>
15427
14930
 
15428
14931
  </xsl:variable>
15429
14932
 
@@ -15899,7 +15402,6 @@
15899
15402
  </xsl:template>
15900
15403
 
15901
15404
  <xsl:template name="addNamedDestinationAttribute">
15902
-
15903
15405
  </xsl:template>
15904
15406
 
15905
15407
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -16354,58 +15856,57 @@
16354
15856
  <!-- =========================================================================== -->
16355
15857
  <!-- END STEP MOVE PAGEBREAK: move <pagebreak/> at top level under 'preface' and 'sections' -->
16356
15858
  <!-- =========================================================================== -->
15859
+ <!-- =========================================================================== -->
15860
+ <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
15861
+ <!-- =========================================================================== -->
15862
+ <xsl:template match="@*|node()" mode="update_xml_step2">
15863
+ <xsl:copy>
15864
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step2"/>
15865
+ </xsl:copy>
15866
+ </xsl:template>
16357
15867
 
16358
- <!-- =========================================================================== -->
16359
- <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
16360
- <!-- =========================================================================== -->
16361
- <xsl:template match="@*|node()" mode="update_xml_step2">
16362
- <xsl:copy>
16363
- <xsl:apply-templates select="@*|node()" mode="update_xml_step2"/>
16364
- </xsl:copy>
16365
- </xsl:template>
16366
-
16367
- <xsl:variable name="localized_string_withdrawn">
15868
+ <xsl:variable name="localized_string_withdrawn">
15869
+ <xsl:call-template name="getLocalizedString">
15870
+ <xsl:with-param name="key">withdrawn</xsl:with-param>
15871
+ </xsl:call-template>
15872
+ </xsl:variable>
15873
+ <xsl:variable name="localized_string_cancelled_and_replaced">
15874
+ <xsl:variable name="str">
16368
15875
  <xsl:call-template name="getLocalizedString">
16369
- <xsl:with-param name="key">withdrawn</xsl:with-param>
15876
+ <xsl:with-param name="key">cancelled_and_replaced</xsl:with-param>
16370
15877
  </xsl:call-template>
16371
15878
  </xsl:variable>
16372
- <xsl:variable name="localized_string_cancelled_and_replaced">
16373
- <xsl:variable name="str">
16374
- <xsl:call-template name="getLocalizedString">
16375
- <xsl:with-param name="key">cancelled_and_replaced</xsl:with-param>
16376
- </xsl:call-template>
16377
- </xsl:variable>
16378
- <xsl:choose>
16379
- <xsl:when test="contains($str, '%')"><xsl:value-of select="substring-before($str, '%')"/></xsl:when>
16380
- <xsl:otherwise><xsl:value-of select="$str"/></xsl:otherwise>
16381
- </xsl:choose>
16382
- </xsl:variable>
15879
+ <xsl:choose>
15880
+ <xsl:when test="contains($str, '%')"><xsl:value-of select="substring-before($str, '%')"/></xsl:when>
15881
+ <xsl:otherwise><xsl:value-of select="$str"/></xsl:otherwise>
15882
+ </xsl:choose>
15883
+ </xsl:variable>
16383
15884
 
16384
- <!-- add 'fn' after eref and origin, to reference bibitem with note = 'Withdrawn.' or 'Cancelled and replaced...' -->
16385
- <xsl:template match="*[local-name() = 'eref'] | *[local-name() = 'origin']" mode="update_xml_step2">
16386
- <xsl:copy-of select="."/>
15885
+ <!-- add 'fn' after eref and origin, to reference bibitem with note = 'Withdrawn.' or 'Cancelled and replaced...' -->
15886
+ <xsl:template match="*[local-name() = 'eref'] | *[local-name() = 'origin']" mode="update_xml_step2">
15887
+ <xsl:copy-of select="."/>
16387
15888
 
16388
- <xsl:variable name="bibitemid" select="@bibitemid"/>
16389
- <xsl:variable name="local_name" select="local-name()"/>
16390
- <xsl:variable name="position"><xsl:number count="*[local-name() = $local_name][@bibitemid = $bibitemid]" level="any"/></xsl:variable>
16391
- <xsl:if test="normalize-space($position) = '1'">
16392
- <xsl:variable name="fn_text">
16393
- <!-- <xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()" /> -->
16394
- <xsl:copy-of select="$bibitems/*[local-name() ='bibitem'][@id = $bibitemid][1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
16395
- </xsl:variable>
16396
- <xsl:if test="normalize-space($fn_text) != ''">
16397
- <xsl:element name="fn" namespace="{$namespace_full}">
16398
- <xsl:attribute name="reference">bibitem_<xsl:value-of select="$bibitemid"/></xsl:attribute>
16399
- <xsl:element name="p" namespace="{$namespace_full}">
16400
- <xsl:copy-of select="$fn_text"/>
16401
- </xsl:element>
15889
+ <xsl:variable name="bibitemid" select="@bibitemid"/>
15890
+ <xsl:variable name="local_name" select="local-name()"/>
15891
+ <xsl:variable name="position"><xsl:number count="*[local-name() = $local_name][@bibitemid = $bibitemid]" level="any"/></xsl:variable>
15892
+ <xsl:if test="normalize-space($position) = '1'">
15893
+ <xsl:variable name="fn_text">
15894
+ <!-- <xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()" /> -->
15895
+ <xsl:copy-of select="$bibitems/*[local-name() ='bibitem'][@id = $bibitemid][1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
15896
+ </xsl:variable>
15897
+ <xsl:if test="normalize-space($fn_text) != ''">
15898
+ <xsl:element name="fn" namespace="{$namespace_full}">
15899
+ <xsl:attribute name="reference">bibitem_<xsl:value-of select="$bibitemid"/></xsl:attribute>
15900
+ <xsl:element name="p" namespace="{$namespace_full}">
15901
+ <xsl:copy-of select="$fn_text"/>
16402
15902
  </xsl:element>
16403
- </xsl:if>
15903
+ </xsl:element>
16404
15904
  </xsl:if>
16405
- </xsl:template>
15905
+ </xsl:if>
15906
+ </xsl:template>
16406
15907
 
16407
- <!-- add id for table without id (for autolayout algorithm) -->
16408
- <!-- <xsl:template match="*[local-name() = 'table'][not(@id)]" mode="update_xml_step2">
15908
+ <!-- add id for table without id (for autolayout algorithm) -->
15909
+ <!-- <xsl:template match="*[local-name() = 'table'][not(@id)]" mode="update_xml_step2">
16409
15910
  <xsl:copy>
16410
15911
  <xsl:apply-templates select="@*" mode="update_xml_step2"/>
16411
15912
  <xsl:attribute name="id">_abc<xsl:value-of select="generate-id()"/></xsl:attribute>
@@ -16414,17 +15915,17 @@
16414
15915
  </xsl:copy>
16415
15916
  </xsl:template> -->
16416
15917
 
16417
- <!-- add @reference for fn -->
16418
- <xsl:template match="*[local-name() = 'fn'][not(@reference)]" mode="update_xml_step2">
16419
- <xsl:copy>
16420
- <xsl:apply-templates select="@*" mode="update_xml_step2"/>
16421
- <xsl:attribute name="reference"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
16422
- <xsl:apply-templates select="node()" mode="update_xml_step2"/>
16423
- </xsl:copy>
16424
- </xsl:template>
15918
+ <!-- add @reference for fn -->
15919
+ <xsl:template match="*[local-name() = 'fn'][not(@reference)]" mode="update_xml_step2">
15920
+ <xsl:copy>
15921
+ <xsl:apply-templates select="@*" mode="update_xml_step2"/>
15922
+ <xsl:attribute name="reference"><xsl:value-of select="generate-id(.)"/></xsl:attribute>
15923
+ <xsl:apply-templates select="node()" mode="update_xml_step2"/>
15924
+ </xsl:copy>
15925
+ </xsl:template>
16425
15926
 
16426
- <!-- add @reference for bibitem/note, similar to fn/reference -->
16427
- <!-- <xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" mode="update_xml_step2">
15927
+ <!-- add @reference for bibitem/note, similar to fn/reference -->
15928
+ <!-- <xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" mode="update_xml_step2">
16428
15929
  <xsl:copy>
16429
15930
  <xsl:apply-templates select="@*" mode="update_xml_step2"/>
16430
15931
 
@@ -16436,28 +15937,28 @@
16436
15937
  </xsl:copy>
16437
15938
  </xsl:template> -->
16438
15939
 
16439
- <!-- enclose sequence of 'char x' + 'combining char y' to <lang_none>xy</lang_none> -->
16440
- <xsl:variable name="regex_combining_chars">(.[̀-ͯ])</xsl:variable>
16441
- <xsl:variable name="element_name_lang_none">lang_none</xsl:variable>
16442
- <xsl:variable name="tag_element_name_lang_none_open">###<xsl:value-of select="$element_name_lang_none"/>###</xsl:variable>
16443
- <xsl:variable name="tag_element_name_lang_none_close">###/<xsl:value-of select="$element_name_lang_none"/>###</xsl:variable>
16444
-
16445
- <xsl:template match="text()" mode="update_xml_step2">
16446
- <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_combining_chars, concat($tag_element_name_lang_none_open,'$1',$tag_element_name_lang_none_close))"/>
16447
- <xsl:call-template name="replace_text_tags">
16448
- <xsl:with-param name="tag_open" select="$tag_element_name_lang_none_open"/>
16449
- <xsl:with-param name="tag_close" select="$tag_element_name_lang_none_close"/>
16450
- <xsl:with-param name="text" select="$text_"/>
16451
- </xsl:call-template>
16452
- </xsl:template>
15940
+ <!-- enclose sequence of 'char x' + 'combining char y' to <lang_none>xy</lang_none> -->
15941
+ <xsl:variable name="regex_combining_chars">(.[̀-ͯ])</xsl:variable>
15942
+ <xsl:variable name="element_name_lang_none">lang_none</xsl:variable>
15943
+ <xsl:variable name="tag_element_name_lang_none_open">###<xsl:value-of select="$element_name_lang_none"/>###</xsl:variable>
15944
+ <xsl:variable name="tag_element_name_lang_none_close">###/<xsl:value-of select="$element_name_lang_none"/>###</xsl:variable>
15945
+
15946
+ <xsl:template match="text()" mode="update_xml_step2">
15947
+ <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_combining_chars, concat($tag_element_name_lang_none_open,'$1',$tag_element_name_lang_none_close))"/>
15948
+ <xsl:call-template name="replace_text_tags">
15949
+ <xsl:with-param name="tag_open" select="$tag_element_name_lang_none_open"/>
15950
+ <xsl:with-param name="tag_close" select="$tag_element_name_lang_none_close"/>
15951
+ <xsl:with-param name="text" select="$text_"/>
15952
+ </xsl:call-template>
15953
+ </xsl:template>
16453
15954
 
16454
- <xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step2">
16455
- <xsl:copy-of select="."/>
16456
- </xsl:template>
15955
+ <xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step2">
15956
+ <xsl:copy-of select="."/>
15957
+ </xsl:template>
16457
15958
 
16458
- <!-- =========================================================================== -->
16459
- <!-- END STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
16460
- <!-- =========================================================================== -->
15959
+ <!-- =========================================================================== -->
15960
+ <!-- END STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
15961
+ <!-- =========================================================================== -->
16461
15962
 
16462
15963
  <!-- =========================================================================== -->
16463
15964
  <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
@@ -16498,7 +15999,6 @@
16498
15999
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
16499
16000
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
16500
16001
  <!-- if EXPRESS reference -->
16501
-
16502
16002
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
16503
16003
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
16504
16004
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -16552,8 +16052,7 @@
16552
16052
 
16553
16053
  <xsl:variable name="text2">
16554
16054
  <xsl:element name="text" namespace="{$namespace_full}">
16555
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
16556
- <xsl:copy-of select="."/>
16055
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
16557
16056
  </xsl:for-each>
16558
16057
  </xsl:element>
16559
16058
  </xsl:variable>
@@ -16845,9 +16344,7 @@
16845
16344
  </xsl:attribute>
16846
16345
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
16847
16346
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
16848
-
16849
- <xsl:value-of select="$skip_footnote_body_"/>
16850
-
16347
+ <xsl:value-of select="$skip_footnote_body_"/>
16851
16348
  </xsl:attribute>
16852
16349
  <xsl:attribute name="ref_id">
16853
16350
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -16936,7 +16433,6 @@
16936
16433
 
16937
16434
  <xsl:template name="printEdition">
16938
16435
  <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
16939
-
16940
16436
  <xsl:choose>
16941
16437
  <xsl:when test="$edition_i18n != ''">
16942
16438
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -17165,9 +16661,8 @@
17165
16661
  <dc:title>
17166
16662
  <xsl:variable name="title">
17167
16663
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
17168
-
17169
- <xsl:value-of select="$title_prefix"/>
17170
- <xsl:value-of select="*[local-name() = 'title']"/>
16664
+ <xsl:value-of select="$title_prefix"/>
16665
+ <xsl:value-of select="*[local-name() = 'title']"/>
17171
16666
 
17172
16667
  </xsl:for-each>
17173
16668
  </xsl:variable>
@@ -17186,12 +16681,11 @@
17186
16681
  </dc:title>
17187
16682
  <xsl:variable name="dc_creator">
17188
16683
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
17189
-
17190
- <rdf:Seq>
17191
- <rdf:li>
17192
- <xsl:value-of select="ieee:ext/ieee:editorialgroup/ieee:committee"/>
17193
- </rdf:li>
17194
- </rdf:Seq>
16684
+ <rdf:Seq>
16685
+ <rdf:li>
16686
+ <xsl:value-of select="ieee:ext/ieee:editorialgroup/ieee:committee"/>
16687
+ </rdf:li>
16688
+ </rdf:Seq>
17195
16689
 
17196
16690
  </xsl:for-each>
17197
16691
  </xsl:variable>
@@ -17203,9 +16697,7 @@
17203
16697
 
17204
16698
  <xsl:variable name="dc_description">
17205
16699
  <xsl:variable name="abstract">
17206
-
17207
- <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'])]"/>
17208
-
16700
+ <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'])]"/>
17209
16701
  </xsl:variable>
17210
16702
  <rdf:Alt>
17211
16703
  <rdf:li xml:lang="x-default">
@@ -17270,7 +16762,9 @@
17270
16762
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
17271
16763
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
17272
16764
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
17273
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
16765
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
16766
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
16767
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
17274
16768
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
17275
16769
  <!-- Todo: need update -->
17276
16770
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -17435,7 +16929,7 @@
17435
16929
  <xsl:param name="normalize-space" select="'true'"/>
17436
16930
  <xsl:param name="keep_sep" select="'false'"/>
17437
16931
  <xsl:if test="string-length($pText) &gt;0">
17438
- <item>
16932
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
17439
16933
  <xsl:choose>
17440
16934
  <xsl:when test="$normalize-space = 'true'">
17441
16935
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -17444,8 +16938,8 @@
17444
16938
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
17445
16939
  </xsl:otherwise>
17446
16940
  </xsl:choose>
17447
- </item>
17448
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
16941
+ </xsl:element>
16942
+ <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>
17449
16943
  <xsl:call-template name="split">
17450
16944
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
17451
16945
  <xsl:with-param name="sep" select="$sep"/>
@@ -17463,30 +16957,6 @@
17463
16957
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
17464
16958
  </xsl:template>
17465
16959
 
17466
- <xsl:template name="namespaceCheck">
17467
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
17468
- <xsl:variable name="XSLNS">
17469
-
17470
- <xsl:value-of select="document('')//*/namespace::ieee"/>
17471
-
17472
- </xsl:variable>
17473
- <!-- <xsl:if test="$documentNS != $XSLNS">
17474
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
17475
- </xsl:if> -->
17476
- </xsl:template> <!-- namespaceCheck -->
17477
-
17478
- <xsl:template name="getLanguage">
17479
- <xsl:param name="lang"/>
17480
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
17481
- <xsl:choose>
17482
- <xsl:when test="$language = 'en'">English</xsl:when>
17483
- <xsl:when test="$language = 'fr'">French</xsl:when>
17484
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
17485
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
17486
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
17487
- </xsl:choose>
17488
- </xsl:template>
17489
-
17490
16960
  <xsl:template name="setId">
17491
16961
  <xsl:param name="prefix"/>
17492
16962
  <xsl:attribute name="id">