metanorma-iec 2.6.7 → 2.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iec/iec.international-standard.xsl +888 -1431
  3. data/lib/isodoc/iec/presentation_terms.rb +5 -4
  4. data/lib/isodoc/iec/presentation_xml_convert.rb +2 -8
  5. data/lib/metanorma/iec/converter.rb +1 -1
  6. data/lib/metanorma/iec/isodoc.rng +19 -2
  7. data/lib/metanorma/iec/processor.rb +8 -8
  8. data/lib/metanorma/iec/version.rb +1 -1
  9. metadata +2 -2
data/lib/isodoc/iec/iec.international-standard.xsl CHANGED
@@ -1,4 +1,4 @@
1
- <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iec="https://www.metanorma.org/ns/standoc" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java xalan" extension-element-prefixes="redirect" version="1.0">
1
+ <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iec="https://www.metanorma.org/ns/standoc" xmlns:mn="https://www.metanorma.org/ns/xslt" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java xalan" extension-element-prefixes="redirect" version="1.0">
2
2
 
3
3
  <xsl:output method="xml" encoding="UTF-8" indent="no"/>
4
4
 
@@ -90,9 +90,9 @@
90
90
  <xsl:variable name="docid">
91
91
  <xsl:call-template name="getDocumentId"/>
92
92
  </xsl:variable>
93
- <doc id="{$docid}" lang="{$lang}">
93
+ <mn:doc id="{$docid}" lang="{$lang}">
94
94
  <xsl:call-template name="generateContents"/>
95
- </doc>
95
+ </mn:doc>
96
96
  </xsl:for-each>
97
97
  </xsl:for-each>
98
98
 
@@ -100,14 +100,14 @@
100
100
  <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
101
101
 
102
102
  <xsl:template name="generateContents">
103
- <contents>
103
+ <mn:contents>
104
104
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
105
105
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
106
106
  <xsl:apply-templates select="//iec:indexsect" mode="contents"/>
107
107
  <xsl:call-template name="processTablesFigures_Contents">
108
108
  <xsl:with-param name="always">true</xsl:with-param>
109
109
  </xsl:call-template>
110
- </contents>
110
+ </mn:contents>
111
111
  </xsl:template>
112
112
 
113
113
  <xsl:variable name="color_blue">rgb(0, 90, 162)</xsl:variable>
@@ -116,7 +116,6 @@
116
116
  <xsl:variable name="isIEV" select="normalize-space((//iec:metanorma/iec:bibdata/iec:title[@language = 'en' and @type = 'title-main'] = 'International Electrotechnical Vocabulary') and 1 = 1)"/>
117
117
 
118
118
  <xsl:template match="/">
119
- <xsl:call-template name="namespaceCheck"/>
120
119
 
121
120
  <!-- <xsl:variable name="xslfo"> -->
122
121
  <!-- https://stackoverflow.com/questions/25261949/xsl-fo-letter-spacing-with-text-align -->
@@ -1235,7 +1234,7 @@
1235
1234
  </xsl:call-template>
1236
1235
  </fo:block> -->
1237
1236
 
1238
- <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [@display = 'true']
1237
+ <xsl:for-each select="xalan:nodeset($contents)//mn:item[@display = 'true']"><!-- [@display = 'true']
1239
1238
  [@level &lt;= 3]
1240
1239
  [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
1241
1240
  <fo:block text-align-last="justify" role="TOCI">
@@ -1255,12 +1254,12 @@
1255
1254
  <xsl:attribute name="space-before">5pt</xsl:attribute>
1256
1255
  </xsl:if>
1257
1256
 
1258
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {title}"> <!-- link at this level needs for PDF structure tags -->
1257
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mn:title}"> <!-- link at this level needs for PDF structure tags -->
1259
1258
 
1260
1259
  <fo:list-block role="SKIP">
1261
1260
  <xsl:attribute name="margin-left">
1262
1261
  <xsl:choose>
1263
- <xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
1262
+ <xsl:when test="mn:title/@variant-title = 'true'">0mm</xsl:when>
1264
1263
  <xsl:when test="@level = 2">8mm</xsl:when>
1265
1264
  <xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
1266
1265
  <xsl:otherwise>0mm</xsl:otherwise>
@@ -1283,9 +1282,9 @@
1283
1282
  </fo:list-item-label>
1284
1283
  <fo:list-item-body start-indent="body-start()" role="SKIP">
1285
1284
  <fo:block text-align-last="justify" role="SKIP">
1286
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
1285
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}" role="SKIP">
1287
1286
  <xsl:variable name="title">
1288
- <xsl:apply-templates select="title"/>
1287
+ <xsl:apply-templates select="mn:title"/>
1289
1288
  </xsl:variable>
1290
1289
  <xsl:call-template name="addLetterSpacing">
1291
1290
  <xsl:with-param name="text" select="$title"/>
@@ -1304,16 +1303,16 @@
1304
1303
  </fo:block>
1305
1304
  </xsl:for-each>
1306
1305
 
1307
- <xsl:if test="$contents//figures/figure">
1306
+ <xsl:if test="$contents//mn:figures/mn:figure">
1308
1307
  <fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
1309
- <xsl:for-each select="$contents//figures/figure">
1308
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
1310
1309
  <xsl:call-template name="insertListOf_Item"/>
1311
1310
  </xsl:for-each>
1312
1311
  </xsl:if>
1313
1312
 
1314
- <xsl:if test="$contents//tables/table">
1313
+ <xsl:if test="$contents//mn:tables/mn:table">
1315
1314
  <fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
1316
- <xsl:for-each select="$contents//tables/table">
1315
+ <xsl:for-each select="$contents//mn:tables/mn:table">
1317
1316
  <xsl:call-template name="insertListOf_Item"/>
1318
1317
  </xsl:for-each>
1319
1318
  </xsl:if>
@@ -1349,7 +1348,7 @@
1349
1348
  <xsl:call-template name="getDocumentId"/>
1350
1349
  </xsl:variable>
1351
1350
  <xsl:call-template name="insertTOCpages">
1352
- <xsl:with-param name="contents" select="$contents/doc[@id = $docid]"/>
1351
+ <xsl:with-param name="contents" select="$contents/mn:doc[@id = $docid]"/>
1353
1352
  </xsl:call-template>
1354
1353
  </xsl:if>
1355
1354
  </fo:block>
@@ -1642,14 +1641,14 @@
1642
1641
  <xsl:copy-of select="iec:variant-title/node()"/>
1643
1642
  </xsl:variable>
1644
1643
 
1645
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
1644
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
1646
1645
  <xsl:if test="$type ='appendix'">
1647
1646
  <xsl:attribute name="section"/>
1648
1647
  </xsl:if>
1649
1648
  <xsl:if test="$type ='indexsect'">
1650
1649
  <xsl:attribute name="level">1</xsl:attribute>
1651
1650
  </xsl:if>
1652
- <title>
1651
+ <mn:title>
1653
1652
  <xsl:choose>
1654
1653
  <xsl:when test="normalize-space($variant_title) != ''">
1655
1654
  <xsl:attribute name="variant-title">true</xsl:attribute>
@@ -1672,11 +1671,11 @@
1672
1671
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
1673
1672
  </xsl:otherwise>
1674
1673
  </xsl:choose>
1675
- </title>
1674
+ </mn:title>
1676
1675
  <xsl:if test="$type != 'indexsect'">
1677
1676
  <xsl:apply-templates mode="contents"/>
1678
1677
  </xsl:if>
1679
- </item>
1678
+ </mn:item>
1680
1679
 
1681
1680
  </xsl:if>
1682
1681
 
@@ -2176,34 +2175,25 @@
2176
2175
  </xsl:copy>
2177
2176
  </xsl:template> -->
2178
2177
 
2179
- <!-- <xsl:strip-space elements="iec:xref"/> -->
2178
+ <!-- https://www.metanorma.org/ns/standoc -->
2179
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
2180
2180
 
2181
- <xsl:variable name="namespace_full_">
2182
- <xsl:choose>
2183
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
2184
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
2185
- </xsl:choose>
2186
- </xsl:variable>
2187
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
2181
+ <!-- https://www.metanorma.org/ns/xsl -->
2182
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
2188
2183
 
2189
- <xsl:variable name="root_element_">
2190
- <xsl:choose>
2191
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
2192
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
2193
- </xsl:choose>
2194
- </xsl:variable>
2195
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
2184
+ <xsl:variable name="root_element">metanorma</xsl:variable>
2196
2185
 
2186
+ <!---examples: 2013, 2024 -->
2197
2187
  <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'])"/>
2198
2188
 
2199
2189
  <!-- external parameters -->
2200
-
2201
2190
  <xsl:param name="svg_images"/> <!-- svg images array -->
2202
2191
  <xsl:variable name="images" select="document($svg_images)"/>
2203
2192
  <xsl:param name="basepath"/> <!-- base path for images -->
2204
2193
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
2205
2194
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
2206
2195
  <xsl:param name="output_path"/> <!-- output PDF file name -->
2196
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
2207
2197
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
2208
2198
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
2209
2199
  <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 -->
@@ -2250,20 +2240,13 @@
2250
2240
 
2251
2241
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
2252
2242
 
2253
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
2254
- true
2243
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
2244
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
2255
2245
  </xsl:variable>
2256
2246
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
2257
2247
 
2258
- <xsl:variable name="isGenerateTableIF_">
2259
- <xsl:choose>
2260
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
2261
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
2262
- </xsl:when>
2263
- <xsl:otherwise>false</xsl:otherwise>
2264
- </xsl:choose>
2265
- </xsl:variable>
2266
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
2248
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
2249
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
2267
2250
 
2268
2251
  <xsl:variable name="lang">
2269
2252
  <xsl:call-template name="getLang"/>
@@ -2315,8 +2298,7 @@
2315
2298
  <xsl:variable name="pageWidth_">
2316
2299
  <xsl:choose>
2317
2300
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
2318
- <xsl:otherwise>
2319
- 210
2301
+ <xsl:otherwise>210
2320
2302
  </xsl:otherwise>
2321
2303
  </xsl:choose>
2322
2304
  </xsl:variable>
@@ -2326,8 +2308,7 @@
2326
2308
  <xsl:variable name="pageHeight_">
2327
2309
  <xsl:choose>
2328
2310
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
2329
- <xsl:otherwise>
2330
- 297
2311
+ <xsl:otherwise>297
2331
2312
  </xsl:otherwise>
2332
2313
  </xsl:choose>
2333
2314
  </xsl:variable>
@@ -2336,23 +2317,19 @@
2336
2317
  <!-- Page margins in mm (just digits, without 'mm')-->
2337
2318
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
2338
2319
  for example, left margin on odd page and right margin on even page -->
2339
- <xsl:variable name="marginLeftRight1_">
2340
- 25
2320
+ <xsl:variable name="marginLeftRight1_">25
2341
2321
  </xsl:variable>
2342
2322
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
2343
2323
 
2344
- <xsl:variable name="marginLeftRight2_">
2345
- 25
2324
+ <xsl:variable name="marginLeftRight2_">25
2346
2325
  </xsl:variable>
2347
2326
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
2348
2327
 
2349
- <xsl:variable name="marginTop_">
2350
- 31
2328
+ <xsl:variable name="marginTop_">31
2351
2329
  </xsl:variable>
2352
2330
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
2353
2331
 
2354
- <xsl:variable name="marginBottom_">
2355
- 15
2332
+ <xsl:variable name="marginBottom_">15
2356
2333
  </xsl:variable>
2357
2334
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
2358
2335
 
@@ -2401,19 +2378,13 @@
2401
2378
  <title-toc lang="zh">目次</title-toc>
2402
2379
 
2403
2380
  <title-part lang="en">
2404
-
2405
- <xsl:text>Part #: </xsl:text>
2406
-
2381
+ <xsl:text>Part #: </xsl:text>
2407
2382
  </title-part>
2408
2383
  <title-part lang="fr">
2409
-
2410
- <xsl:text>Partie #: </xsl:text>
2411
-
2384
+ <xsl:text>Partie #: </xsl:text>
2412
2385
  </title-part>
2413
2386
  <title-part lang="ru">
2414
-
2415
- <xsl:text>Часть #: </xsl:text>
2416
-
2387
+ <xsl:text>Часть #: </xsl:text>
2417
2388
  </title-part>
2418
2389
  <title-part lang="zh">第 # 部分:</title-part>
2419
2390
 
@@ -2509,11 +2480,9 @@
2509
2480
  <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>
2510
2481
  <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>
2511
2482
  <xsl:attribute-set name="root-style">
2512
-
2513
- <xsl:attribute name="font-family">Arial, Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
2514
- <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
2515
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2516
-
2483
+ <xsl:attribute name="font-family">Arial, Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
2484
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
2485
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2517
2486
  </xsl:attribute-set> <!-- root-style -->
2518
2487
 
2519
2488
  <xsl:template name="insertRootStyle">
@@ -2601,28 +2570,22 @@
2601
2570
 
2602
2571
  <!-- Preface sections styles -->
2603
2572
  <xsl:attribute-set name="copyright-statement-style">
2604
-
2605
2573
  </xsl:attribute-set> <!-- copyright-statement-style -->
2606
2574
 
2607
2575
  <xsl:attribute-set name="copyright-statement-title-style">
2608
-
2609
2576
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
2610
2577
 
2611
2578
  <xsl:attribute-set name="copyright-statement-p-style">
2612
-
2613
2579
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
2614
2580
 
2615
2581
  <xsl:attribute-set name="license-statement-style">
2616
-
2617
2582
  </xsl:attribute-set>
2618
2583
 
2619
2584
  <xsl:attribute-set name="license-statement-title-style">
2620
2585
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2621
-
2622
2586
  </xsl:attribute-set> <!-- license-statement-title-style -->
2623
2587
 
2624
2588
  <xsl:attribute-set name="license-statement-p-style">
2625
-
2626
2589
  </xsl:attribute-set> <!-- license-statement-p-style -->
2627
2590
 
2628
2591
  <xsl:attribute-set name="legal-statement-style">
@@ -2631,95 +2594,73 @@
2631
2594
 
2632
2595
  <xsl:attribute-set name="legal-statement-title-style">
2633
2596
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2634
-
2635
2597
  </xsl:attribute-set> <!-- legal-statement-title-style -->
2636
2598
 
2637
2599
  <xsl:attribute-set name="legal-statement-p-style">
2638
-
2639
2600
  </xsl:attribute-set> <!-- legal-statement-p-style -->
2640
2601
 
2641
2602
  <xsl:attribute-set name="feedback-statement-style">
2642
-
2643
2603
  </xsl:attribute-set> <!-- feedback-statement-style -->
2644
2604
 
2645
2605
  <xsl:attribute-set name="feedback-statement-title-style">
2646
2606
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2647
-
2648
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2649
-
2607
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2650
2608
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
2651
2609
 
2652
2610
  <xsl:attribute-set name="feedback-statement-p-style">
2653
-
2654
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2655
-
2611
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2656
2612
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
2657
2613
 
2658
2614
  <!-- End Preface sections styles -->
2659
2615
 
2660
2616
  <xsl:attribute-set name="link-style">
2661
-
2662
2617
  </xsl:attribute-set>
2663
2618
 
2664
2619
  <xsl:template name="refine_link-style">
2665
-
2666
- <xsl:if test="ancestor::*[local-name()='feedback-statement' or local-name() = 'copyright-statement']">
2667
- <xsl:attribute name="color">blue</xsl:attribute>
2668
- </xsl:if>
2669
-
2620
+ <xsl:if test="ancestor::*[local-name()='feedback-statement' or local-name() = 'copyright-statement']">
2621
+ <xsl:attribute name="color">blue</xsl:attribute>
2622
+ </xsl:if>
2670
2623
  </xsl:template> <!-- refine_link-style -->
2671
2624
 
2672
2625
  <xsl:attribute-set name="sourcecode-container-style">
2673
-
2674
2626
  </xsl:attribute-set>
2675
2627
 
2676
2628
  <xsl:attribute-set name="sourcecode-style">
2677
2629
  <xsl:attribute name="white-space">pre</xsl:attribute>
2678
2630
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
2679
2631
  <xsl:attribute name="role">Code</xsl:attribute>
2680
-
2681
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2682
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
2683
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
2684
-
2632
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2633
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
2634
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
2685
2635
  </xsl:attribute-set>
2686
2636
 
2687
2637
  <xsl:template name="refine_sourcecode-style">
2688
-
2689
2638
  </xsl:template> <!-- refine_sourcecode-style -->
2690
2639
 
2691
2640
  <xsl:attribute-set name="pre-style">
2692
2641
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2693
2642
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2694
-
2695
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
2696
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
2697
-
2643
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
2644
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
2698
2645
  </xsl:attribute-set>
2699
2646
 
2700
2647
  <xsl:attribute-set name="permission-style">
2701
-
2702
2648
  </xsl:attribute-set>
2703
2649
 
2704
2650
  <xsl:attribute-set name="permission-name-style">
2705
-
2706
2651
  </xsl:attribute-set>
2707
2652
 
2708
2653
  <xsl:attribute-set name="permission-label-style">
2709
-
2710
2654
  </xsl:attribute-set>
2711
2655
 
2712
2656
  <xsl:attribute-set name="requirement-style">
2713
-
2714
2657
  </xsl:attribute-set>
2715
2658
 
2716
2659
  <xsl:attribute-set name="requirement-name-style">
2717
2660
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2718
-
2719
2661
  </xsl:attribute-set>
2720
2662
 
2721
2663
  <xsl:attribute-set name="requirement-label-style">
2722
-
2723
2664
  </xsl:attribute-set>
2724
2665
 
2725
2666
  <xsl:attribute-set name="subject-style">
@@ -2747,141 +2688,109 @@
2747
2688
  </xsl:attribute-set>
2748
2689
 
2749
2690
  <xsl:attribute-set name="recommendation-style">
2750
-
2751
2691
  </xsl:attribute-set>
2752
2692
 
2753
2693
  <xsl:attribute-set name="recommendation-name-style">
2754
-
2755
2694
  </xsl:attribute-set>
2756
2695
 
2757
2696
  <xsl:attribute-set name="recommendation-label-style">
2758
-
2759
2697
  </xsl:attribute-set>
2760
2698
 
2761
2699
  <xsl:attribute-set name="termexample-style">
2762
-
2763
- <xsl:attribute name="margin-top">14pt</xsl:attribute>
2764
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
2765
-
2700
+ <xsl:attribute name="margin-top">14pt</xsl:attribute>
2701
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
2766
2702
  </xsl:attribute-set>
2767
2703
 
2768
2704
  <xsl:template name="refine_termexample-style">
2769
-
2770
2705
  </xsl:template>
2771
2706
 
2772
2707
  <xsl:attribute-set name="example-style">
2773
-
2774
- <xsl:attribute name="space-before">8pt</xsl:attribute>
2775
- <xsl:attribute name="space-after">8pt</xsl:attribute>
2776
-
2708
+ <xsl:attribute name="space-before">8pt</xsl:attribute>
2709
+ <xsl:attribute name="space-after">8pt</xsl:attribute>
2777
2710
  </xsl:attribute-set> <!-- example-style -->
2778
2711
 
2779
2712
  <xsl:template name="refine_example-style">
2780
-
2781
2713
  </xsl:template> <!-- refine_example-style -->
2782
2714
 
2783
2715
  <xsl:attribute-set name="example-body-style">
2784
-
2785
- <xsl:attribute name="margin-left">10mm</xsl:attribute>
2786
-
2716
+ <xsl:attribute name="margin-left">10mm</xsl:attribute>
2787
2717
  </xsl:attribute-set> <!-- example-body-style -->
2788
2718
 
2789
2719
  <xsl:attribute-set name="example-name-style">
2790
-
2791
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
2792
- <xsl:attribute name="padding-right">9mm</xsl:attribute>
2793
-
2720
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
2721
+ <xsl:attribute name="padding-right">9mm</xsl:attribute>
2794
2722
  </xsl:attribute-set> <!-- example-name-style -->
2795
2723
 
2796
2724
  <xsl:template name="refine_example-name-style">
2797
-
2798
2725
  </xsl:template>
2799
2726
 
2800
2727
  <xsl:attribute-set name="example-p-style">
2801
-
2802
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
2728
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
2803
2729
 
2804
2730
  </xsl:attribute-set> <!-- example-p-style -->
2805
2731
 
2806
2732
  <xsl:template name="refine_example-p-style">
2807
-
2808
2733
  </xsl:template> <!-- refine_example-p-style -->
2809
2734
 
2810
2735
  <xsl:attribute-set name="termexample-name-style">
2811
-
2812
- <xsl:attribute name="padding-right">10mm</xsl:attribute>
2813
-
2736
+ <xsl:attribute name="padding-right">10mm</xsl:attribute>
2814
2737
  </xsl:attribute-set> <!-- termexample-name-style -->
2815
2738
 
2816
2739
  <xsl:template name="refine_termexample-name-style">
2817
-
2818
2740
  </xsl:template>
2819
2741
 
2820
2742
  <!-- ========================== -->
2821
2743
  <!-- Table styles -->
2822
2744
  <!-- ========================== -->
2823
2745
  <xsl:variable name="table-border_">
2824
-
2825
2746
  </xsl:variable>
2826
2747
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
2827
2748
 
2828
2749
  <xsl:variable name="table-cell-border_">
2829
-
2830
2750
  </xsl:variable>
2831
2751
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
2832
2752
 
2833
2753
  <xsl:attribute-set name="table-container-style">
2834
2754
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2835
2755
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
2836
-
2837
- <xsl:attribute name="font-size">8pt</xsl:attribute>
2838
- <xsl:attribute name="space-after">12pt</xsl:attribute>
2839
-
2756
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2757
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
2840
2758
  </xsl:attribute-set> <!-- table-container-style -->
2841
2759
 
2842
2760
  <xsl:template name="refine_table-container-style">
2843
2761
  <xsl:param name="margin-side"/>
2844
-
2845
- <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
2846
- <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
2847
-
2848
- <xsl:if test="ancestor::*[local-name() = 'preface']">
2849
- <xsl:attribute name="space-after">16pt</xsl:attribute>
2850
- </xsl:if>
2851
-
2762
+ <xsl:attribute name="margin-left"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
2763
+ <xsl:attribute name="margin-right"><xsl:value-of select="-$margin-side"/>mm</xsl:attribute>
2764
+ <xsl:if test="ancestor::*[local-name() = 'preface']">
2765
+ <xsl:attribute name="space-after">16pt</xsl:attribute>
2766
+ </xsl:if>
2852
2767
  <!-- end table block-container attributes -->
2853
2768
  </xsl:template> <!-- refine_table-container-style -->
2854
2769
 
2855
2770
  <xsl:attribute-set name="table-style">
2856
2771
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
2857
2772
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
2858
-
2859
- <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
2860
-
2773
+ <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
2861
2774
  </xsl:attribute-set><!-- table-style -->
2862
2775
 
2863
2776
  <xsl:template name="refine_table-style">
2864
2777
  <xsl:param name="margin-side"/>
2865
-
2866
- <xsl:if test="$margin-side != 0">
2867
- <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2868
- <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2869
- </xsl:if>
2778
+ <xsl:if test="$margin-side != 0">
2779
+ <xsl:attribute name="margin-left"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2780
+ <xsl:attribute name="margin-right"><xsl:value-of select="$margin-side"/>mm</xsl:attribute>
2781
+ </xsl:if>
2870
2782
 
2871
2783
  <xsl:call-template name="setBordersTableArray"/>
2872
-
2873
2784
  </xsl:template> <!-- refine_table-style -->
2874
2785
 
2875
2786
  <xsl:attribute-set name="table-name-style">
2876
2787
  <xsl:attribute name="role">Caption</xsl:attribute>
2877
2788
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2878
-
2879
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2880
- <xsl:attribute name="text-align">center</xsl:attribute>
2881
- <!-- <xsl:attribute name="margin-bottom">6pt</xsl:attribute> -->
2882
- <xsl:attribute name="margin-bottom">-12pt</xsl:attribute>
2883
- <xsl:attribute name="space-before">12pt</xsl:attribute>
2884
-
2789
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2790
+ <xsl:attribute name="text-align">center</xsl:attribute>
2791
+ <!-- <xsl:attribute name="margin-bottom">6pt</xsl:attribute> -->
2792
+ <xsl:attribute name="margin-bottom">-12pt</xsl:attribute>
2793
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
2885
2794
  </xsl:attribute-set> <!-- table-name-style -->
2886
2795
 
2887
2796
  <xsl:template name="refine_table-name-style">
@@ -2889,42 +2798,33 @@
2889
2798
  <xsl:if test="$continued = 'true'">
2890
2799
  <xsl:attribute name="role">SKIP</xsl:attribute>
2891
2800
  </xsl:if>
2892
-
2893
- <xsl:if test="$continued = 'true'">
2894
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2895
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2896
- </xsl:if>
2897
-
2801
+ <xsl:if test="$continued = 'true'">
2802
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2803
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2804
+ </xsl:if>
2898
2805
  </xsl:template> <!-- refine_table-name-style -->
2899
2806
 
2900
2807
  <xsl:attribute-set name="table-row-style">
2901
2808
  <xsl:attribute name="min-height">4mm</xsl:attribute>
2902
-
2903
2809
  </xsl:attribute-set>
2904
2810
 
2905
2811
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
2906
2812
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2907
-
2908
- <xsl:attribute name="border-top">solid black 0.5pt</xsl:attribute>
2909
- <xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
2910
-
2813
+ <xsl:attribute name="border-top">solid black 0.5pt</xsl:attribute>
2814
+ <xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
2911
2815
  </xsl:attribute-set>
2912
2816
 
2913
2817
  <xsl:template name="refine_table-header-row-style">
2914
2818
 
2915
2819
  <xsl:call-template name="setBordersTableArray"/>
2916
-
2917
2820
  </xsl:template> <!-- refine_table-header-row-style -->
2918
2821
 
2919
2822
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
2920
-
2921
- <xsl:attribute name="border-left">solid black 0.5pt</xsl:attribute>
2922
- <xsl:attribute name="border-right">solid black 0.5pt</xsl:attribute>
2923
-
2823
+ <xsl:attribute name="border-left">solid black 0.5pt</xsl:attribute>
2824
+ <xsl:attribute name="border-right">solid black 0.5pt</xsl:attribute>
2924
2825
  </xsl:attribute-set>
2925
2826
 
2926
2827
  <xsl:template name="refine_table-footer-row-style">
2927
-
2928
2828
  </xsl:template> <!-- refine_table-footer-row-style -->
2929
2829
 
2930
2830
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -2934,7 +2834,6 @@
2934
2834
  <xsl:template name="refine_table-body-row-style">
2935
2835
 
2936
2836
  <xsl:call-template name="setBordersTableArray"/>
2937
-
2938
2837
  </xsl:template> <!-- refine_table-body-row-style -->
2939
2838
 
2940
2839
  <xsl:attribute-set name="table-header-cell-style">
@@ -2942,19 +2841,16 @@
2942
2841
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2943
2842
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2944
2843
  <xsl:attribute name="display-align">center</xsl:attribute>
2945
-
2946
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
2947
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
2948
- <xsl:attribute name="text-align">center</xsl:attribute>
2949
-
2844
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
2845
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
2846
+ <xsl:attribute name="text-align">center</xsl:attribute>
2950
2847
  </xsl:attribute-set> <!-- table-header-cell-style -->
2951
2848
 
2952
2849
  <xsl:template name="refine_table-header-cell-style">
2953
-
2954
- <xsl:attribute name="text-align">center</xsl:attribute>
2955
- <xsl:if test="ancestor::*[local-name()='preface']">
2956
- <xsl:attribute name="font-weight">normal</xsl:attribute>
2957
- </xsl:if>
2850
+ <xsl:attribute name="text-align">center</xsl:attribute>
2851
+ <xsl:if test="ancestor::*[local-name()='preface']">
2852
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
2853
+ </xsl:if>
2958
2854
 
2959
2855
  <xsl:call-template name="setBordersTableArray"/>
2960
2856
 
@@ -2963,17 +2859,14 @@
2963
2859
  </xsl:if>
2964
2860
 
2965
2861
  <xsl:call-template name="setTableCellAttributes"/>
2966
-
2967
2862
  </xsl:template> <!-- refine_table-header-cell-style -->
2968
2863
 
2969
2864
  <xsl:attribute-set name="table-cell-style">
2970
2865
  <xsl:attribute name="display-align">center</xsl:attribute>
2971
2866
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2972
2867
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2973
-
2974
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2975
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
2976
-
2868
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2869
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
2977
2870
  </xsl:attribute-set> <!-- table-cell-style -->
2978
2871
 
2979
2872
  <xsl:template name="refine_table-cell-style">
@@ -2981,12 +2874,9 @@
2981
2874
  <xsl:if test="$lang = 'ar'">
2982
2875
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2983
2876
  </xsl:if>
2984
-
2985
- <!-- bsi -->
2986
-
2987
- <xsl:if test="ancestor::*[local-name()='preface']">
2988
- <xsl:attribute name="text-align">center</xsl:attribute>
2989
- </xsl:if>
2877
+ <xsl:if test="ancestor::*[local-name()='preface']">
2878
+ <xsl:attribute name="text-align">center</xsl:attribute>
2879
+ </xsl:if>
2990
2880
 
2991
2881
  <xsl:call-template name="setBordersTableArray"/>
2992
2882
 
@@ -2997,67 +2887,52 @@
2997
2887
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2998
2888
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2999
2889
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
3000
-
3001
- <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
3002
-
2890
+ <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
3003
2891
  </xsl:attribute-set> <!-- table-footer-cell-style -->
3004
2892
 
3005
2893
  <xsl:template name="refine_table-footer-cell-style">
3006
-
3007
2894
  </xsl:template> <!-- refine_table-footer-cell-style -->
3008
2895
 
3009
2896
  <xsl:attribute-set name="table-note-style">
3010
2897
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3011
2898
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3012
-
3013
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3014
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3015
-
2899
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2900
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3016
2901
  </xsl:attribute-set><!-- table-note-style -->
3017
2902
 
3018
2903
  <xsl:template name="refine_table-note-style">
3019
-
3020
2904
  </xsl:template> <!-- refine_table-note-style -->
3021
2905
 
3022
2906
  <xsl:attribute-set name="table-fn-style">
3023
2907
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3024
-
3025
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3026
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3027
- <xsl:attribute name="text-indent">-6mm</xsl:attribute>
3028
- <xsl:attribute name="margin-left">6mm</xsl:attribute>
3029
-
2908
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2909
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2910
+ <xsl:attribute name="text-indent">-6mm</xsl:attribute>
2911
+ <xsl:attribute name="margin-left">6mm</xsl:attribute>
3030
2912
  </xsl:attribute-set> <!-- table-fn-style -->
3031
2913
 
3032
2914
  <xsl:template name="refine_table-fn-style">
3033
-
3034
2915
  </xsl:template>
3035
2916
 
3036
2917
  <xsl:attribute-set name="table-fn-number-style">
3037
2918
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
3038
-
3039
2919
  </xsl:attribute-set> <!-- table-fn-number-style -->
3040
2920
 
3041
2921
  <xsl:attribute-set name="table-fmt-fn-label-style">
3042
2922
  <xsl:attribute name="font-size">80%</xsl:attribute>
3043
-
3044
- <xsl:attribute name="baseline-shift">30%</xsl:attribute>
3045
- <xsl:attribute name="font-size">70%</xsl:attribute>
3046
-
2923
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
2924
+ <xsl:attribute name="font-size">70%</xsl:attribute>
3047
2925
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
3048
2926
 
3049
2927
  <xsl:template name="refine_table-fmt-fn-label-style">
3050
-
3051
2928
  </xsl:template>
3052
2929
 
3053
2930
  <xsl:attribute-set name="fn-container-body-style">
3054
2931
  <xsl:attribute name="text-indent">0</xsl:attribute>
3055
2932
  <xsl:attribute name="start-indent">0</xsl:attribute>
3056
-
3057
2933
  </xsl:attribute-set>
3058
2934
 
3059
2935
  <xsl:attribute-set name="table-fn-body-style">
3060
-
3061
2936
  </xsl:attribute-set>
3062
2937
 
3063
2938
  <xsl:attribute-set name="figure-fn-number-style">
@@ -3067,22 +2942,17 @@
3067
2942
  <xsl:attribute-set name="figure-fmt-fn-label-style">
3068
2943
  <xsl:attribute name="font-size">80%</xsl:attribute>
3069
2944
  <xsl:attribute name="vertical-align">super</xsl:attribute>
3070
-
3071
- <xsl:attribute name="baseline-shift">65%</xsl:attribute>
3072
-
2945
+ <xsl:attribute name="baseline-shift">65%</xsl:attribute>
3073
2946
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
3074
2947
 
3075
2948
  <xsl:template name="refine_figure-fmt-fn-label-style">
3076
-
3077
2949
  </xsl:template>
3078
2950
 
3079
2951
  <xsl:attribute-set name="figure-fn-body-style">
3080
2952
  <xsl:attribute name="text-align">justify</xsl:attribute>
3081
2953
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3082
-
3083
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3084
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3085
-
2954
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
2955
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3086
2956
  </xsl:attribute-set>
3087
2957
  <!-- ========================== -->
3088
2958
  <!-- END Table styles -->
@@ -3093,45 +2963,35 @@
3093
2963
  <!-- ========================== -->
3094
2964
 
3095
2965
  <xsl:attribute-set name="dl-block-style">
3096
-
3097
2966
  </xsl:attribute-set>
3098
2967
 
3099
2968
  <xsl:attribute-set name="dt-row-style">
3100
-
3101
2969
  </xsl:attribute-set>
3102
2970
 
3103
2971
  <xsl:attribute-set name="dt-cell-style">
3104
-
3105
2972
  </xsl:attribute-set>
3106
2973
 
3107
2974
  <xsl:template name="refine_dt-cell-style">
3108
-
3109
2975
  </xsl:template> <!-- refine_dt-cell-style -->
3110
2976
 
3111
2977
  <xsl:attribute-set name="dt-block-style">
3112
2978
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
3113
-
3114
2979
  </xsl:attribute-set>
3115
2980
 
3116
2981
  <xsl:template name="refine_dt-block-style">
3117
-
3118
2982
  </xsl:template> <!-- refine_dt-block-style -->
3119
2983
 
3120
2984
  <xsl:attribute-set name="dl-name-style">
3121
2985
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3122
2986
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3123
-
3124
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3125
-
2987
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3126
2988
  </xsl:attribute-set> <!-- dl-name-style -->
3127
2989
 
3128
2990
  <xsl:attribute-set name="dd-cell-style">
3129
2991
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
3130
-
3131
2992
  </xsl:attribute-set>
3132
2993
 
3133
2994
  <xsl:template name="refine_dd-cell-style">
3134
-
3135
2995
  </xsl:template> <!-- refine_dd-cell-style -->
3136
2996
 
3137
2997
  <!-- ========================== -->
@@ -3139,252 +2999,189 @@
3139
2999
  <!-- ========================== -->
3140
3000
 
3141
3001
  <xsl:attribute-set name="appendix-style">
3142
-
3143
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3144
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3145
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3146
-
3002
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3003
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3004
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3147
3005
  </xsl:attribute-set>
3148
3006
 
3149
3007
  <xsl:attribute-set name="appendix-example-style">
3150
-
3151
- <xsl:attribute name="margin-top">14pt</xsl:attribute>
3152
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3153
-
3008
+ <xsl:attribute name="margin-top">14pt</xsl:attribute>
3009
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3154
3010
  </xsl:attribute-set>
3155
3011
 
3156
3012
  <xsl:attribute-set name="xref-style">
3157
-
3158
3013
  </xsl:attribute-set>
3159
3014
 
3160
3015
  <xsl:attribute-set name="eref-style">
3161
-
3162
3016
  </xsl:attribute-set>
3163
3017
 
3164
3018
  <xsl:template name="refine_eref-style">
3165
3019
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
3166
3020
  <xsl:variable name="text" select="normalize-space()"/>
3167
-
3168
3021
  </xsl:template> <!-- refine_eref-style -->
3169
3022
 
3170
3023
  <xsl:attribute-set name="note-style">
3171
-
3172
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3173
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3174
- <xsl:attribute name="margin-bottom">9pt</xsl:attribute>
3175
-
3024
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3025
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3026
+ <xsl:attribute name="margin-bottom">9pt</xsl:attribute>
3176
3027
  </xsl:attribute-set>
3177
3028
 
3178
3029
  <xsl:template name="refine_note-style">
3179
-
3180
3030
  </xsl:template>
3181
3031
 
3182
3032
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
3183
3033
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
3184
3034
 
3185
3035
  <xsl:attribute-set name="note-name-style">
3186
-
3187
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
3188
-
3036
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
3189
3037
  </xsl:attribute-set>
3190
3038
 
3191
3039
  <xsl:template name="refine_note-name-style">
3192
-
3193
3040
  </xsl:template> <!-- refine_note-name-style -->
3194
3041
 
3195
3042
  <xsl:attribute-set name="table-note-name-style">
3196
3043
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3197
-
3198
3044
  </xsl:attribute-set>
3199
3045
 
3200
3046
  <xsl:template name="refine_table-note-name-style">
3201
-
3202
3047
  </xsl:template> <!-- refine_table-note-name-style -->
3203
3048
 
3204
3049
  <xsl:attribute-set name="note-p-style">
3205
-
3206
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3207
-
3050
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3208
3051
  </xsl:attribute-set>
3209
3052
 
3210
3053
  <xsl:attribute-set name="termnote-style">
3211
-
3212
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3213
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3214
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3215
-
3054
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3055
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3056
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3216
3057
  </xsl:attribute-set>
3217
3058
 
3218
3059
  <xsl:template name="refine_termnote-style">
3219
-
3220
3060
  </xsl:template> <!-- refine_termnote-style -->
3221
3061
 
3222
3062
  <xsl:attribute-set name="termnote-name-style">
3223
-
3224
3063
  </xsl:attribute-set>
3225
3064
 
3226
3065
  <xsl:template name="refine_termnote-name-style">
3227
-
3228
- <!-- <xsl:if test="$namespace = 'ieee'">
3229
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
3230
- </xsl:if> -->
3231
-
3232
3066
  </xsl:template>
3233
3067
 
3234
3068
  <xsl:attribute-set name="termnote-p-style">
3235
-
3236
3069
  </xsl:attribute-set>
3237
3070
 
3238
3071
  <xsl:attribute-set name="quote-style">
3239
3072
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
3240
3073
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
3241
-
3242
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3243
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3244
-
3074
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3075
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3245
3076
  </xsl:attribute-set>
3246
3077
 
3247
3078
  <xsl:template name="refine_quote-style">
3248
-
3249
3079
  </xsl:template>
3250
3080
 
3251
3081
  <xsl:attribute-set name="quote-source-style">
3252
3082
  <xsl:attribute name="text-align">right</xsl:attribute>
3253
-
3254
- <xsl:attribute name="margin-top">15pt</xsl:attribute>
3255
- <xsl:attribute name="margin-left">12mm</xsl:attribute>
3256
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
3257
-
3083
+ <xsl:attribute name="margin-top">15pt</xsl:attribute>
3084
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
3085
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
3258
3086
  </xsl:attribute-set>
3259
3087
 
3260
3088
  <xsl:attribute-set name="termsource-style">
3261
-
3262
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3263
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3264
-
3089
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3090
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3265
3091
  </xsl:attribute-set>
3266
3092
 
3267
3093
  <xsl:template name="refine_termsource-style">
3268
-
3269
3094
  </xsl:template> <!-- refine_termsource-style -->
3270
3095
 
3271
3096
  <xsl:attribute-set name="termsource-text-style">
3272
-
3273
3097
  </xsl:attribute-set>
3274
3098
 
3275
3099
  <xsl:attribute-set name="origin-style">
3276
-
3277
3100
  </xsl:attribute-set>
3278
3101
 
3279
3102
  <xsl:attribute-set name="term-style">
3280
-
3281
3103
  </xsl:attribute-set>
3282
3104
 
3283
3105
  <xsl:attribute-set name="term-name-style">
3284
3106
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3285
3107
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3286
-
3287
3108
  </xsl:attribute-set>
3288
3109
 
3289
3110
  <xsl:attribute-set name="figure-block-style">
3290
3111
  <xsl:attribute name="role">SKIP</xsl:attribute>
3291
-
3292
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3293
-
3112
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3294
3113
  </xsl:attribute-set>
3295
3114
 
3296
3115
  <xsl:template name="refine_figure-block-style">
3297
-
3298
3116
  </xsl:template>
3299
3117
 
3300
3118
  <xsl:attribute-set name="figure-style">
3301
-
3302
3119
  </xsl:attribute-set>
3303
3120
 
3304
3121
  <xsl:attribute-set name="figure-name-style">
3305
3122
  <xsl:attribute name="role">Caption</xsl:attribute>
3306
-
3307
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3308
- <xsl:attribute name="text-align">center</xsl:attribute>
3309
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3310
- <xsl:attribute name="space-after">12pt</xsl:attribute>
3311
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3312
-
3123
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3124
+ <xsl:attribute name="text-align">center</xsl:attribute>
3125
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
3126
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
3127
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3313
3128
  </xsl:attribute-set>
3314
3129
 
3315
3130
  <xsl:template name="refine_figure-name-style">
3316
-
3317
3131
  </xsl:template> <!-- refine_figure-name-style -->
3318
3132
 
3319
3133
  <xsl:attribute-set name="figure-source-style">
3320
-
3321
- <xsl:attribute name="font-size">6pt</xsl:attribute>
3322
- <xsl:attribute name="font-style">italic</xsl:attribute>
3323
- <xsl:attribute name="text-align">right</xsl:attribute>
3324
-
3134
+ <xsl:attribute name="font-size">6pt</xsl:attribute>
3135
+ <xsl:attribute name="font-style">italic</xsl:attribute>
3136
+ <xsl:attribute name="text-align">right</xsl:attribute>
3325
3137
  </xsl:attribute-set>
3326
3138
 
3327
3139
  <!-- Formula's styles -->
3328
3140
  <xsl:attribute-set name="formula-style">
3329
3141
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
3330
3142
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3331
-
3332
3143
  </xsl:attribute-set> <!-- formula-style -->
3333
3144
 
3334
3145
  <xsl:attribute-set name="formula-stem-block-style">
3335
3146
  <xsl:attribute name="text-align">center</xsl:attribute>
3336
-
3337
3147
  </xsl:attribute-set> <!-- formula-stem-block-style -->
3338
3148
 
3339
3149
  <xsl:template name="refine_formula-stem-block-style">
3340
-
3341
3150
  </xsl:template> <!-- refine_formula-stem-block-style -->
3342
3151
 
3343
3152
  <xsl:attribute-set name="formula-stem-number-style">
3344
3153
  <xsl:attribute name="text-align">right</xsl:attribute>
3345
-
3346
- <xsl:attribute name="margin-right">-10mm</xsl:attribute>
3347
-
3154
+ <xsl:attribute name="margin-right">-10mm</xsl:attribute>
3348
3155
  </xsl:attribute-set> <!-- formula-stem-number-style -->
3349
3156
  <!-- End Formula's styles -->
3350
3157
 
3351
3158
  <xsl:template name="refine_formula-stem-number-style">
3352
-
3353
- <xsl:if test="ancestor::*[local-name() = 'table']">
3354
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
3355
- </xsl:if>
3356
-
3159
+ <xsl:if test="ancestor::*[local-name() = 'table']">
3160
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
3161
+ </xsl:if>
3357
3162
  </xsl:template>
3358
3163
 
3359
3164
  <xsl:attribute-set name="image-style">
3360
3165
  <xsl:attribute name="role">SKIP</xsl:attribute>
3361
3166
  <xsl:attribute name="text-align">center</xsl:attribute>
3362
-
3363
3167
  </xsl:attribute-set>
3364
3168
 
3365
3169
  <xsl:template name="refine_image-style">
3366
-
3367
3170
  </xsl:template>
3368
3171
 
3369
3172
  <xsl:attribute-set name="figure-pseudocode-p-style">
3370
-
3371
3173
  </xsl:attribute-set>
3372
3174
 
3373
3175
  <xsl:attribute-set name="image-graphic-style">
3374
3176
  <xsl:attribute name="width">100%</xsl:attribute>
3375
3177
  <xsl:attribute name="content-height">100%</xsl:attribute>
3376
3178
  <xsl:attribute name="scaling">uniform</xsl:attribute>
3377
-
3378
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3379
-
3380
- <xsl:attribute name="width">75%</xsl:attribute>
3381
-
3179
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3180
+ <xsl:attribute name="width">75%</xsl:attribute>
3382
3181
  </xsl:attribute-set>
3383
3182
 
3384
3183
  <xsl:attribute-set name="tt-style">
3385
-
3386
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3387
-
3184
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3388
3185
  </xsl:attribute-set>
3389
3186
 
3390
3187
  <xsl:attribute-set name="sourcecode-name-style">
@@ -3393,59 +3190,47 @@
3393
3190
  <xsl:attribute name="text-align">center</xsl:attribute>
3394
3191
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3395
3192
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3396
-
3397
3193
  </xsl:attribute-set>
3398
3194
 
3399
3195
  <xsl:attribute-set name="preferred-block-style">
3400
-
3401
- <xsl:attribute name="line-height">1.1</xsl:attribute>
3402
- <xsl:attribute name="space-before">14pt</xsl:attribute>
3403
-
3196
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
3197
+ <xsl:attribute name="space-before">14pt</xsl:attribute>
3404
3198
  </xsl:attribute-set>
3405
3199
 
3406
3200
  <xsl:attribute-set name="preferred-term-style">
3407
3201
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3408
3202
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3409
-
3410
3203
  </xsl:attribute-set>
3411
3204
 
3412
3205
  <xsl:attribute-set name="domain-style">
3413
-
3414
3206
  </xsl:attribute-set>
3415
3207
 
3416
3208
  <xsl:attribute-set name="admitted-style">
3417
-
3418
3209
  </xsl:attribute-set>
3419
3210
 
3420
3211
  <xsl:attribute-set name="deprecates-style">
3421
-
3422
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3423
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3424
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3425
-
3212
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3213
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3214
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3426
3215
  </xsl:attribute-set>
3427
3216
 
3428
3217
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
3429
3218
  </xsl:attribute-set>
3430
3219
 
3431
3220
  <xsl:attribute-set name="definition-style">
3432
-
3433
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3434
-
3221
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3435
3222
  </xsl:attribute-set>
3436
3223
 
3437
3224
  <xsl:variable name="color-added-text">
3438
3225
  <xsl:text>rgb(0, 255, 0)</xsl:text>
3439
3226
  </xsl:variable>
3440
3227
  <xsl:attribute-set name="add-style">
3441
-
3442
- <xsl:attribute name="color">red</xsl:attribute>
3443
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
3444
- <!-- <xsl:attribute name="color">black</xsl:attribute>
3228
+ <xsl:attribute name="color">red</xsl:attribute>
3229
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
3230
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
3445
3231
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
3446
3232
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
3447
3233
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
3448
-
3449
3234
  </xsl:attribute-set>
3450
3235
 
3451
3236
  <xsl:variable name="add-style">
@@ -3465,57 +3250,43 @@
3465
3250
 
3466
3251
  <xsl:attribute-set name="mathml-style">
3467
3252
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
3468
-
3469
3253
  </xsl:attribute-set>
3470
3254
 
3471
3255
  <xsl:template name="refine_mathml-style">
3472
-
3473
3256
  </xsl:template>
3474
3257
 
3475
3258
  <xsl:attribute-set name="list-style">
3476
-
3477
- <xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
3478
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3479
-
3259
+ <xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
3260
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3480
3261
  </xsl:attribute-set> <!-- list-style -->
3481
3262
 
3482
3263
  <xsl:template name="refine_list-style">
3483
-
3484
- <xsl:if test="ancestor::iec:ul or ancestor::iec:ol">
3485
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3486
- </xsl:if>
3487
-
3264
+ <xsl:if test="ancestor::iec:ul or ancestor::iec:ol">
3265
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3266
+ </xsl:if>
3488
3267
  </xsl:template> <!-- refine_list-style -->
3489
3268
 
3490
3269
  <xsl:attribute-set name="list-name-style">
3491
3270
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3492
-
3493
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3494
-
3271
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3495
3272
  </xsl:attribute-set> <!-- list-name-style -->
3496
3273
 
3497
3274
  <xsl:attribute-set name="list-item-style">
3498
-
3499
3275
  </xsl:attribute-set>
3500
3276
 
3501
3277
  <xsl:template name="refine_list-item-style">
3502
-
3503
3278
  </xsl:template> <!-- refine_list-item-style -->
3504
3279
 
3505
3280
  <xsl:attribute-set name="list-item-label-style">
3506
-
3507
3281
  </xsl:attribute-set>
3508
3282
 
3509
3283
  <xsl:template name="refine_list-item-label-style">
3510
-
3511
3284
  </xsl:template> <!-- refine_list-item-label-style -->
3512
3285
 
3513
3286
  <xsl:attribute-set name="list-item-body-style">
3514
-
3515
3287
  </xsl:attribute-set>
3516
3288
 
3517
3289
  <xsl:template name="refine_list-item-body-style">
3518
-
3519
3290
  </xsl:template> <!-- refine_list-item-body-style -->
3520
3291
 
3521
3292
  <xsl:attribute-set name="toc-style">
@@ -3529,12 +3300,10 @@
3529
3300
  </xsl:attribute-set>
3530
3301
 
3531
3302
  <xsl:template name="refine_fn-reference-style">
3532
-
3533
- <xsl:if test="ancestor::*[local-name()='table']">
3534
- <xsl:attribute name="font-weight">normal</xsl:attribute>
3535
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3536
- </xsl:if>
3537
-
3303
+ <xsl:if test="ancestor::*[local-name()='table']">
3304
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
3305
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3306
+ </xsl:if>
3538
3307
  </xsl:template> <!-- refine_fn-reference-style -->
3539
3308
 
3540
3309
  <xsl:attribute-set name="fn-style">
@@ -3543,141 +3312,107 @@
3543
3312
 
3544
3313
  <xsl:attribute-set name="fn-num-style">
3545
3314
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3546
-
3547
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3548
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3549
-
3315
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3316
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3550
3317
  </xsl:attribute-set>
3551
3318
 
3552
3319
  <xsl:attribute-set name="fn-body-style">
3553
3320
  <xsl:attribute name="font-weight">normal</xsl:attribute>
3554
3321
  <xsl:attribute name="font-style">normal</xsl:attribute>
3555
- <xsl:attribute name="text-indent">0</xsl:attribute>
3556
- <xsl:attribute name="start-indent">0</xsl:attribute>
3557
-
3558
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3559
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3560
-
3322
+ <xsl:attribute name="text-indent">0</xsl:attribute>
3323
+ <xsl:attribute name="start-indent">0</xsl:attribute>
3324
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3325
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3561
3326
  </xsl:attribute-set>
3562
3327
 
3563
3328
  <xsl:template name="refine_fn-body-style">
3564
-
3565
3329
  </xsl:template> <!-- refine_fn-body-style -->
3566
3330
 
3567
3331
  <xsl:attribute-set name="fn-body-num-style">
3568
3332
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3569
-
3570
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3571
- <xsl:attribute name="padding-right">3mm</xsl:attribute>
3572
-
3333
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3334
+ <xsl:attribute name="padding-right">3mm</xsl:attribute>
3573
3335
  </xsl:attribute-set> <!-- fn-body-num-style -->
3574
3336
 
3575
3337
  <xsl:template name="refine_fn-body-num-style">
3576
-
3577
3338
  </xsl:template> <!-- refine_fn-body-num-style -->
3578
3339
 
3579
3340
  <!-- admonition -->
3580
3341
  <xsl:attribute-set name="admonition-style">
3581
-
3582
- <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
3583
- <xsl:attribute name="margin-left">-2mm</xsl:attribute>
3584
- <xsl:attribute name="margin-right">-2mm</xsl:attribute>
3585
- <xsl:attribute name="space-before">18pt</xsl:attribute>
3586
- <xsl:attribute name="space-after">12pt</xsl:attribute>
3587
-
3342
+ <xsl:attribute name="border">0.5pt solid black</xsl:attribute>
3343
+ <xsl:attribute name="margin-left">-2mm</xsl:attribute>
3344
+ <xsl:attribute name="margin-right">-2mm</xsl:attribute>
3345
+ <xsl:attribute name="space-before">18pt</xsl:attribute>
3346
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
3588
3347
  </xsl:attribute-set> <!-- admonition-style -->
3589
3348
 
3590
3349
  <xsl:attribute-set name="admonition-container-style">
3591
3350
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
3592
3351
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
3593
-
3594
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3595
- <xsl:attribute name="padding">1mm</xsl:attribute>
3596
- <xsl:attribute name="padding-top">2mm</xsl:attribute>
3597
-
3352
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3353
+ <xsl:attribute name="padding">1mm</xsl:attribute>
3354
+ <xsl:attribute name="padding-top">2mm</xsl:attribute>
3598
3355
  </xsl:attribute-set> <!-- admonition-container-style -->
3599
3356
 
3600
3357
  <xsl:attribute-set name="admonition-name-style">
3601
3358
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3602
-
3603
3359
  </xsl:attribute-set> <!-- admonition-name-style -->
3604
3360
 
3605
3361
  <xsl:attribute-set name="admonition-p-style">
3606
-
3607
3362
  </xsl:attribute-set> <!-- admonition-p-style -->
3608
3363
  <!-- end admonition -->
3609
3364
 
3610
3365
  <!-- bibitem in Normative References (references/@normative="true") -->
3611
3366
  <xsl:attribute-set name="bibitem-normative-style">
3612
-
3613
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3614
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3615
-
3367
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3368
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3616
3369
  </xsl:attribute-set> <!-- bibitem-normative-style -->
3617
3370
 
3618
3371
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
3619
3372
  <xsl:attribute-set name="bibitem-normative-list-style">
3620
3373
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3621
3374
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3622
-
3623
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3624
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3625
-
3626
- <!-- <xsl:if test="$namespace = 'ieee'">
3627
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3628
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
3629
- </xsl:if> -->
3630
-
3375
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3376
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3631
3377
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
3632
3378
 
3633
3379
  <xsl:attribute-set name="bibitem-non-normative-style">
3634
-
3635
3380
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
3636
3381
 
3637
3382
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
3638
3383
  <xsl:attribute-set name="bibitem-non-normative-list-style">
3639
3384
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3640
3385
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3641
-
3642
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3643
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3644
-
3386
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3387
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3645
3388
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
3646
3389
 
3647
3390
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
3648
3391
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3649
-
3650
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3651
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3652
-
3392
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
3393
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
3653
3394
  </xsl:attribute-set>
3654
3395
 
3655
3396
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
3656
3397
  <xsl:attribute-set name="bibitem-normative-list-body-style">
3657
-
3658
3398
  </xsl:attribute-set>
3659
3399
 
3660
3400
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
3661
-
3662
3401
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
3663
3402
 
3664
3403
  <!-- footnote reference number for bibitem, in the text -->
3665
3404
  <xsl:attribute-set name="bibitem-note-fn-style">
3666
3405
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3667
3406
  <xsl:attribute name="font-size">65%</xsl:attribute>
3668
-
3669
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3670
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3671
-
3407
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3408
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3672
3409
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
3673
3410
 
3674
3411
  <!-- footnote number on the page bottom -->
3675
3412
  <xsl:attribute-set name="bibitem-note-fn-number-style">
3676
3413
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3677
-
3678
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3679
- <xsl:attribute name="padding-right">3mm</xsl:attribute>
3680
-
3414
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3415
+ <xsl:attribute name="padding-right">3mm</xsl:attribute>
3681
3416
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
3682
3417
 
3683
3418
  <!-- footnote body (text) on the page bottom -->
@@ -3685,14 +3420,11 @@
3685
3420
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3686
3421
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3687
3422
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
3688
-
3689
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3690
- <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3691
-
3423
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3424
+ <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
3692
3425
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
3693
3426
 
3694
3427
  <xsl:attribute-set name="references-non-normative-style">
3695
-
3696
3428
  </xsl:attribute-set> <!-- references-non-normative-style -->
3697
3429
 
3698
3430
  <!-- Highlight.js syntax GitHub styles -->
@@ -3852,20 +3584,16 @@
3852
3584
  <!-- Index section styles -->
3853
3585
  <xsl:attribute-set name="indexsect-title-style">
3854
3586
  <xsl:attribute name="role">H1</xsl:attribute>
3855
-
3856
- <xsl:attribute name="font-size">12pt</xsl:attribute>
3857
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3858
- <xsl:attribute name="margin-bottom">84pt</xsl:attribute>
3859
-
3587
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
3588
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3589
+ <xsl:attribute name="margin-bottom">84pt</xsl:attribute>
3860
3590
  </xsl:attribute-set>
3861
3591
 
3862
3592
  <xsl:attribute-set name="indexsect-clause-title-style">
3863
3593
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3864
-
3865
- <xsl:attribute name="font-size">10pt</xsl:attribute>
3866
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3867
- <xsl:attribute name="margin-bottom">3pt</xsl:attribute>
3868
-
3594
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
3595
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3596
+ <xsl:attribute name="margin-bottom">3pt</xsl:attribute>
3869
3597
  </xsl:attribute-set>
3870
3598
 
3871
3599
  <!-- End Index section styles -->
@@ -3942,47 +3670,47 @@
3942
3670
  </xsl:template>
3943
3671
 
3944
3672
  <xsl:template name="processTables_Contents">
3945
- <tables>
3673
+ <mn:tables>
3946
3674
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
3947
3675
  <xsl:choose>
3948
3676
  <xsl:when test="*[local-name() = 'fmt-name']">
3949
3677
  <xsl:variable name="fmt_name">
3950
3678
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3951
3679
  </xsl:variable>
3952
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3680
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3953
3681
  <xsl:copy-of select="$fmt_name"/>
3954
- </table>
3682
+ </mn:table>
3955
3683
  </xsl:when>
3956
3684
  <xsl:otherwise>
3957
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
3685
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
3958
3686
  <xsl:copy-of select="*[local-name() = 'name']"/>
3959
- </table>
3687
+ </mn:table>
3960
3688
  </xsl:otherwise>
3961
3689
  </xsl:choose>
3962
3690
  </xsl:for-each>
3963
- </tables>
3691
+ </mn:tables>
3964
3692
  </xsl:template>
3965
3693
 
3966
3694
  <xsl:template name="processFigures_Contents">
3967
- <figures>
3695
+ <mn:figures>
3968
3696
  <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) != '']">
3969
3697
  <xsl:choose>
3970
3698
  <xsl:when test="*[local-name() = 'fmt-name']">
3971
3699
  <xsl:variable name="fmt_name">
3972
3700
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3973
3701
  </xsl:variable>
3974
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3702
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3975
3703
  <xsl:copy-of select="$fmt_name"/>
3976
- </figure>
3704
+ </mn:figure>
3977
3705
  </xsl:when>
3978
3706
  <xsl:otherwise>
3979
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3707
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3980
3708
  <xsl:copy-of select="*[local-name() = 'name']"/>
3981
- </figure>
3709
+ </mn:figure>
3982
3710
  </xsl:otherwise>
3983
3711
  </xsl:choose>
3984
3712
  </xsl:for-each>
3985
- </figures>
3713
+ </mn:figures>
3986
3714
  </xsl:template>
3987
3715
 
3988
3716
  <xsl:template name="processPrefaceSectionsDefault">
@@ -4001,7 +3729,6 @@
4001
3729
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
4002
3730
  <xsl:sort select="@displayorder" data-type="number"/>
4003
3731
  <xsl:apply-templates select="."/>
4004
-
4005
3732
  </xsl:for-each>
4006
3733
 
4007
3734
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -4108,7 +3835,6 @@
4108
3835
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
4109
3836
  <xsl:sort select="@displayorder" data-type="number"/>
4110
3837
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
4111
-
4112
3838
  </xsl:for-each>
4113
3839
  </xsl:element>
4114
3840
  </xsl:element>
@@ -4242,7 +3968,6 @@
4242
3968
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
4243
3969
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
4244
3970
  </xsl:apply-templates>
4245
-
4246
3971
  </xsl:for-each>
4247
3972
  </xsl:element>
4248
3973
 
@@ -4282,19 +4007,17 @@
4282
4007
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
4283
4008
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
4284
4009
  <xsl:template match="text()" name="text">
4285
-
4286
- <xsl:choose>
4287
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
4288
- <xsl:otherwise>
4289
- <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))"/>
4290
- <xsl:call-template name="replace_fo_inline_tags">
4291
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
4292
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
4293
- <xsl:with-param name="text" select="$text"/>
4294
- </xsl:call-template>
4295
- </xsl:otherwise>
4296
- </xsl:choose>
4297
-
4010
+ <xsl:choose>
4011
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
4012
+ <xsl:otherwise>
4013
+ <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))"/>
4014
+ <xsl:call-template name="replace_fo_inline_tags">
4015
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
4016
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
4017
+ <xsl:with-param name="text" select="$text"/>
4018
+ </xsl:call-template>
4019
+ </xsl:otherwise>
4020
+ </xsl:choose>
4298
4021
  </xsl:template>
4299
4022
 
4300
4023
  <xsl:template name="replace_fo_inline_tags">
@@ -4348,7 +4071,7 @@
4348
4071
  <xsl:with-param name="keep_sep">true</xsl:with-param>
4349
4072
  </xsl:call-template>
4350
4073
  </xsl:variable>
4351
- <xsl:for-each select="xalan:nodeset($items)/item">
4074
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
4352
4075
  <xsl:choose>
4353
4076
  <xsl:when test=". = $sep">
4354
4077
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -4377,17 +4100,13 @@
4377
4100
  </xsl:template> <!-- copyright-statement -->
4378
4101
 
4379
4102
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
4380
-
4381
- <!-- process in the template 'title' -->
4382
- <xsl:call-template name="title"/>
4383
-
4103
+ <!-- process in the template 'title' -->
4104
+ <xsl:call-template name="title"/>
4384
4105
  </xsl:template> <!-- copyright-statement//title -->
4385
4106
 
4386
4107
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
4387
-
4388
- <!-- process in the template 'paragraph' -->
4389
- <xsl:call-template name="paragraph"/>
4390
-
4108
+ <!-- process in the template 'paragraph' -->
4109
+ <xsl:call-template name="paragraph"/>
4391
4110
  </xsl:template> <!-- copyright-statement//p -->
4392
4111
 
4393
4112
  <xsl:template match="*[local-name()='license-statement']">
@@ -4397,42 +4116,34 @@
4397
4116
  </xsl:template> <!-- license-statement -->
4398
4117
 
4399
4118
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
4400
-
4401
- <!-- process in the template 'title' -->
4402
- <xsl:call-template name="title"/>
4403
-
4119
+ <!-- process in the template 'title' -->
4120
+ <xsl:call-template name="title"/>
4404
4121
  </xsl:template> <!-- license-statement/title -->
4405
4122
 
4406
4123
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
4407
-
4408
- <!-- process in the template 'paragraph' -->
4409
- <xsl:call-template name="paragraph"/>
4410
-
4124
+ <!-- process in the template 'paragraph' -->
4125
+ <xsl:call-template name="paragraph"/>
4411
4126
  </xsl:template> <!-- license-statement/p -->
4412
4127
 
4413
4128
  <xsl:template match="*[local-name()='legal-statement']">
4414
4129
  <xsl:param name="isLegacy">false</xsl:param>
4415
4130
  <fo:block xsl:use-attribute-sets="legal-statement-style">
4416
-
4417
4131
  <xsl:apply-templates/>
4418
4132
  </fo:block>
4419
4133
  </xsl:template> <!-- legal-statement -->
4420
4134
 
4421
4135
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
4422
-
4423
- <!-- process in the template 'title' -->
4424
- <xsl:call-template name="title"/>
4136
+ <!-- process in the template 'title' -->
4137
+ <xsl:call-template name="title"/>
4425
4138
 
4426
4139
  </xsl:template> <!-- legal-statement/title -->
4427
4140
 
4428
4141
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
4429
4142
  <xsl:param name="margin"/>
4430
-
4431
- <!-- process in the template 'paragraph' -->
4432
- <xsl:call-template name="paragraph">
4433
- <xsl:with-param name="margin" select="$margin"/>
4434
- </xsl:call-template>
4435
-
4143
+ <!-- process in the template 'paragraph' -->
4144
+ <xsl:call-template name="paragraph">
4145
+ <xsl:with-param name="margin" select="$margin"/>
4146
+ </xsl:call-template>
4436
4147
  </xsl:template> <!-- legal-statement/p -->
4437
4148
 
4438
4149
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -4442,22 +4153,20 @@
4442
4153
  </xsl:template> <!-- feedback-statement -->
4443
4154
 
4444
4155
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
4445
-
4446
- <xsl:variable name="level">
4447
- <xsl:call-template name="getLevel"/>
4448
- </xsl:variable>
4449
- <fo:block role="H{$level}" xsl:use-attribute-sets="feedback-statement-title-style">
4450
- <xsl:apply-templates/>
4451
- </fo:block>
4156
+ <xsl:variable name="level">
4157
+ <xsl:call-template name="getLevel"/>
4158
+ </xsl:variable>
4159
+ <fo:block role="H{$level}" xsl:use-attribute-sets="feedback-statement-title-style">
4160
+ <xsl:apply-templates/>
4161
+ </fo:block>
4452
4162
 
4453
4163
  </xsl:template>
4454
4164
 
4455
4165
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
4456
4166
  <xsl:param name="margin"/>
4457
-
4458
- <fo:block xsl:use-attribute-sets="feedback-statement-p-style">
4459
- <xsl:apply-templates/>
4460
- </fo:block>
4167
+ <fo:block xsl:use-attribute-sets="feedback-statement-p-style">
4168
+ <xsl:apply-templates/>
4169
+ </fo:block>
4461
4170
 
4462
4171
  </xsl:template>
4463
4172
 
@@ -4511,7 +4220,6 @@
4511
4220
  <xsl:template match="*[local-name()='table']" name="table">
4512
4221
 
4513
4222
  <xsl:variable name="table-preamble">
4514
-
4515
4223
  </xsl:variable>
4516
4224
 
4517
4225
  <xsl:variable name="table">
@@ -4529,10 +4237,8 @@
4529
4237
 
4530
4238
  <!-- Display table's name before table as standalone block -->
4531
4239
  <!-- $namespace = 'iso' or -->
4532
-
4533
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
4534
-
4535
- <xsl:call-template name="table_name_fn_display"/>
4240
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
4241
+ <xsl:call-template name="table_name_fn_display"/>
4536
4242
 
4537
4243
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
4538
4244
 
@@ -4585,8 +4291,7 @@
4585
4291
 
4586
4292
  <xsl:variable name="table_width_default">100%</xsl:variable>
4587
4293
  <xsl:variable name="table_width">
4588
- <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
4589
- <xsl:value-of select="$table_width_default"/>
4294
+ <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --><xsl:value-of select="$table_width_default"/>
4590
4295
  </xsl:variable>
4591
4296
 
4592
4297
  <xsl:variable name="table_attributes">
@@ -4729,27 +4434,25 @@
4729
4434
  <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
4730
4435
 
4731
4436
  <!-- centered table when table name is centered (see table-name-style) -->
4732
-
4733
- <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
4734
-
4735
- <fo:table-column column-width="proportional-column-width(1)"/>
4736
- <fo:table-column column-width="{@width}"/>
4737
- <fo:table-column column-width="proportional-column-width(1)"/>
4738
- <fo:table-body role="SKIP">
4739
- <fo:table-row role="SKIP">
4740
- <fo:table-cell column-number="2" role="SKIP">
4741
- <xsl:copy-of select="$table-preamble"/>
4742
- <fo:block role="SKIP">
4743
- <xsl:call-template name="setTrackChangesStyles">
4744
- <xsl:with-param name="isAdded" select="$isAdded"/>
4745
- <xsl:with-param name="isDeleted" select="$isDeleted"/>
4746
- </xsl:call-template>
4747
- <xsl:copy-of select="$table"/>
4748
- </fo:block>
4749
- </fo:table-cell>
4750
- </fo:table-row>
4751
- </fo:table-body>
4752
- </fo:table>
4437
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
4438
+ <fo:table-column column-width="proportional-column-width(1)"/>
4439
+ <fo:table-column column-width="{@width}"/>
4440
+ <fo:table-column column-width="proportional-column-width(1)"/>
4441
+ <fo:table-body role="SKIP">
4442
+ <fo:table-row role="SKIP">
4443
+ <fo:table-cell column-number="2" role="SKIP">
4444
+ <xsl:copy-of select="$table-preamble"/>
4445
+ <fo:block role="SKIP">
4446
+ <xsl:call-template name="setTrackChangesStyles">
4447
+ <xsl:with-param name="isAdded" select="$isAdded"/>
4448
+ <xsl:with-param name="isDeleted" select="$isDeleted"/>
4449
+ </xsl:call-template>
4450
+ <xsl:copy-of select="$table"/>
4451
+ </fo:block>
4452
+ </fo:table-cell>
4453
+ </fo:table-row>
4454
+ </fo:table-body>
4455
+ </fo:table>
4753
4456
 
4754
4457
  </xsl:when>
4755
4458
  <xsl:otherwise>
@@ -4775,12 +4478,10 @@
4775
4478
  </xsl:template>
4776
4479
 
4777
4480
  <xsl:template name="setBordersTableArray">
4778
-
4779
- <xsl:if test="starts-with(@id, 'array_') or starts-with(ancestor::*[local-name() = 'table'][1]/@id, 'array_')">
4780
- <!-- array - table without borders -->
4781
- <xsl:attribute name="border">none</xsl:attribute>
4782
- </xsl:if>
4783
-
4481
+ <xsl:if test="starts-with(@id, 'array_') or starts-with(ancestor::*[local-name() = 'table'][1]/@id, 'array_')">
4482
+ <!-- array - table without borders -->
4483
+ <xsl:attribute name="border">none</xsl:attribute>
4484
+ </xsl:if>
4784
4485
  </xsl:template>
4785
4486
 
4786
4487
  <!-- table/name-->
@@ -4789,61 +4490,59 @@
4789
4490
  <xsl:param name="cols-count"/>
4790
4491
  <xsl:if test="normalize-space() != ''">
4791
4492
 
4792
- <fo:block xsl:use-attribute-sets="table-name-style">
4793
-
4794
- <xsl:call-template name="refine_table-name-style">
4795
- <xsl:with-param name="continued" select="$continued"/>
4796
- </xsl:call-template>
4797
-
4798
- <xsl:choose>
4799
- <xsl:when test="$continued = 'true'">
4493
+ <fo:block xsl:use-attribute-sets="table-name-style">
4800
4494
 
4801
- </xsl:when>
4802
- <xsl:otherwise>
4803
- <xsl:apply-templates/>
4804
- </xsl:otherwise>
4805
- </xsl:choose>
4495
+ <xsl:call-template name="refine_table-name-style">
4496
+ <xsl:with-param name="continued" select="$continued"/>
4497
+ </xsl:call-template>
4806
4498
 
4807
- <xsl:if test="$continued = 'true'">
4808
- <fo:inline font-weight="bold" font-style="normal" role="SKIP">
4809
- <fo:retrieve-table-marker retrieve-class-name="table_number"/>
4810
- </fo:inline>
4811
- <fo:inline font-weight="normal" font-style="italic" role="SKIP">
4812
- <xsl:text> </xsl:text>
4813
- <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4814
- </fo:inline>
4815
- </xsl:if>
4499
+ <xsl:choose>
4500
+ <xsl:when test="$continued = 'true'">
4501
+ </xsl:when>
4502
+ <xsl:otherwise>
4503
+ <xsl:apply-templates/>
4504
+ </xsl:otherwise>
4505
+ </xsl:choose>
4506
+ <xsl:if test="$continued = 'true'">
4507
+ <fo:inline font-weight="bold" font-style="normal" role="SKIP">
4508
+ <fo:retrieve-table-marker retrieve-class-name="table_number"/>
4509
+ </fo:inline>
4510
+ <fo:inline font-weight="normal" font-style="italic" role="SKIP">
4511
+ <xsl:text> </xsl:text>
4512
+ <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4513
+ </fo:inline>
4514
+ </xsl:if>
4816
4515
 
4817
- </fo:block>
4516
+ </fo:block>
4818
4517
 
4819
- <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4820
- <xsl:if test="$continued = 'true'">
4518
+ <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4519
+ <xsl:if test="$continued = 'true'">
4821
4520
 
4822
- <!-- to prevent the error 'THead element may contain only TR elements' -->
4521
+ <!-- to prevent the error 'THead element may contain only TR elements' -->
4823
4522
 
4824
- <xsl:choose>
4825
- <xsl:when test="string(number($cols-count)) != 'NaN'">
4826
- <fo:table width="100%" table-layout="fixed" role="SKIP">
4827
- <fo:table-body role="SKIP">
4828
- <fo:table-row>
4829
- <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4830
- <fo:block text-align="right" role="SKIP">
4831
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4832
- </fo:block>
4833
- </fo:table-cell>
4834
- </fo:table-row>
4835
- </fo:table-body>
4836
- </fo:table>
4837
- </xsl:when>
4838
- <xsl:otherwise>
4839
- <fo:block text-align="right">
4840
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4841
- </fo:block>
4842
- </xsl:otherwise>
4843
- </xsl:choose>
4523
+ <xsl:choose>
4524
+ <xsl:when test="string(number($cols-count)) != 'NaN'">
4525
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
4526
+ <fo:table-body role="SKIP">
4527
+ <fo:table-row>
4528
+ <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4529
+ <fo:block text-align="right" role="SKIP">
4530
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4531
+ </fo:block>
4532
+ </fo:table-cell>
4533
+ </fo:table-row>
4534
+ </fo:table-body>
4535
+ </fo:table>
4536
+ </xsl:when>
4537
+ <xsl:otherwise>
4538
+ <fo:block text-align="right">
4539
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4540
+ </fo:block>
4541
+ </xsl:otherwise>
4542
+ </xsl:choose>
4844
4543
 
4845
- </xsl:if>
4846
- <!-- </xsl:if> -->
4544
+ </xsl:if>
4545
+ <!-- </xsl:if> -->
4847
4546
 
4848
4547
  </xsl:if>
4849
4548
  </xsl:template> <!-- table/name -->
@@ -5218,11 +4917,9 @@
5218
4917
  <xsl:template match="*[local-name()='thead']">
5219
4918
  <xsl:param name="cols-count"/>
5220
4919
  <fo:table-header>
5221
-
5222
- <xsl:call-template name="table-header-title">
5223
- <xsl:with-param name="cols-count" select="$cols-count"/>
5224
- </xsl:call-template>
5225
-
4920
+ <xsl:call-template name="table-header-title">
4921
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4922
+ </xsl:call-template>
5226
4923
  <xsl:apply-templates/>
5227
4924
  </fo:table-header>
5228
4925
  </xsl:template> <!-- thead -->
@@ -5236,26 +4933,24 @@
5236
4933
 
5237
4934
  <xsl:call-template name="refine_table-header-title-style"/>
5238
4935
 
5239
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
5240
- <xsl:with-param name="continued">true</xsl:with-param>
5241
- <xsl:with-param name="cols-count" select="$cols-count"/>
5242
- </xsl:apply-templates>
4936
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4937
+ <xsl:with-param name="continued">true</xsl:with-param>
4938
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4939
+ </xsl:apply-templates>
5243
4940
 
5244
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
5245
- <fo:block role="SKIP"/>
5246
- </xsl:if>
4941
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4942
+ <fo:block role="SKIP"/>
4943
+ </xsl:if>
5247
4944
 
5248
4945
  </fo:table-cell>
5249
4946
  </fo:table-row>
5250
4947
  </xsl:template> <!-- table-header-title -->
5251
4948
 
5252
4949
  <xsl:template name="refine_table-header-title-style">
5253
-
5254
- <xsl:attribute name="border-left">1pt solid white</xsl:attribute>
5255
- <xsl:attribute name="border-right">1pt solid white</xsl:attribute>
5256
- <xsl:attribute name="border-top">1pt solid white</xsl:attribute>
5257
- <xsl:attribute name="border-bottom">none</xsl:attribute>
5258
-
4950
+ <xsl:attribute name="border-left">1pt solid white</xsl:attribute>
4951
+ <xsl:attribute name="border-right">1pt solid white</xsl:attribute>
4952
+ <xsl:attribute name="border-top">1pt solid white</xsl:attribute>
4953
+ <xsl:attribute name="border-bottom">none</xsl:attribute>
5259
4954
  </xsl:template> <!-- refine_table-header-title-style -->
5260
4955
 
5261
4956
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -5285,7 +4980,6 @@
5285
4980
  <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']"/>
5286
4981
 
5287
4982
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
5288
-
5289
4983
  </xsl:variable>
5290
4984
 
5291
4985
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -5347,31 +5041,22 @@
5347
5041
  <xsl:call-template name="setBordersTableArray"/>
5348
5042
 
5349
5043
  <!-- fn will be processed inside 'note' processing -->
5044
+ <xsl:if test="../*[local-name()='note'][not(@type = 'units')]">
5045
+ <fo:block margin-bottom="6pt" role="SKIP"> </fo:block>
5046
+ </xsl:if>
5047
+ <xsl:apply-templates select="../*[local-name()='p']"/>
5048
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
5049
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
5050
+ <xsl:apply-templates select="../*[local-name()='example']"/>
5051
+ <xsl:apply-templates select="../*[local-name()='source']"/>
5350
5052
 
5351
- <xsl:if test="../*[local-name()='note'][not(@type = 'units')]">
5352
- <fo:block margin-bottom="6pt" role="SKIP"> </fo:block>
5353
- </xsl:if>
5354
-
5355
- <!-- for BSI (not PAS) display Notes before footnotes -->
5356
-
5357
- <!-- except gb and bsi -->
5358
-
5359
- <xsl:apply-templates select="../*[local-name()='p']"/>
5360
- <xsl:apply-templates select="../*[local-name()='dl']"/>
5361
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
5362
- <xsl:apply-templates select="../*[local-name()='example']"/>
5363
- <xsl:apply-templates select="../*[local-name()='source']"/>
5364
-
5365
- <xsl:variable name="isDisplayRowSeparator">
5366
- true
5367
-
5053
+ <xsl:variable name="isDisplayRowSeparator">true
5368
5054
  </xsl:variable>
5369
5055
 
5370
5056
  <!-- horizontal row separator -->
5371
5057
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
5372
5058
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
5373
5059
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
5374
-
5375
5060
  <xsl:call-template name="setBordersTableArray"/>
5376
5061
  <fo:block font-size="1pt"> </fo:block>
5377
5062
  </fo:block-container>
@@ -5379,11 +5064,8 @@
5379
5064
  </xsl:if>
5380
5065
 
5381
5066
  <!-- fn processing -->
5382
-
5383
- <!-- <xsl:call-template name="table_fn_display" /> -->
5384
- <xsl:copy-of select="$table_fn_block"/>
5385
-
5386
- <!-- for PAS display Notes after footnotes -->
5067
+ <!-- <xsl:call-template name="table_fn_display" /> -->
5068
+ <xsl:copy-of select="$table_fn_block"/>
5387
5069
 
5388
5070
  </fo:table-cell>
5389
5071
  </fo:table-row>
@@ -5415,16 +5097,14 @@
5415
5097
  </xsl:otherwise>
5416
5098
  </xsl:choose>
5417
5099
  </xsl:variable>
5418
-
5419
- <!-- if there isn't 'thead' and there is a table's title -->
5420
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
5421
- <fo:table-header>
5422
-
5423
- <xsl:call-template name="table-header-title">
5424
- <xsl:with-param name="cols-count" select="$cols-count"/>
5425
- </xsl:call-template>
5426
- </fo:table-header>
5427
- </xsl:if>
5100
+ <!-- if there isn't 'thead' and there is a table's title -->
5101
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
5102
+ <fo:table-header>
5103
+ <xsl:call-template name="table-header-title">
5104
+ <xsl:with-param name="cols-count" select="$cols-count"/>
5105
+ </xsl:call-template>
5106
+ </fo:table-header>
5107
+ </xsl:if>
5428
5108
 
5429
5109
  <xsl:apply-templates select="../*[local-name()='thead']">
5430
5110
  <xsl:with-param name="cols-count" select="$cols-count"/>
@@ -5435,42 +5115,36 @@
5435
5115
  </xsl:call-template>
5436
5116
 
5437
5117
  <fo:table-body>
5118
+ <xsl:variable name="title_continued_">
5119
+ <xsl:call-template name="getLocalizedString">
5120
+ <xsl:with-param name="key">continued</xsl:with-param>
5121
+ </xsl:call-template>
5122
+ </xsl:variable>
5438
5123
 
5439
- <xsl:variable name="title_continued_">
5440
- <xsl:call-template name="getLocalizedString">
5441
- <xsl:with-param name="key">continued</xsl:with-param>
5442
- </xsl:call-template>
5443
- </xsl:variable>
5444
-
5445
- <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
5446
- <xsl:variable name="title_continued">
5447
- <xsl:value-of select="$title_continued_in_parenthesis"/>
5448
-
5449
- </xsl:variable>
5450
-
5451
- <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
5452
- <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
5124
+ <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
5125
+ <xsl:variable name="title_continued"><xsl:value-of select="$title_continued_in_parenthesis"/>
5126
+ </xsl:variable>
5453
5127
 
5454
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5455
- <fo:table-cell role="SKIP">
5128
+ <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
5129
+ <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
5456
5130
 
5457
- <fo:marker marker-class-name="table_number"/>
5458
- <fo:marker marker-class-name="table_continued"/>
5131
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5132
+ <fo:table-cell role="SKIP">
5133
+ <fo:marker marker-class-name="table_number"/>
5134
+ <fo:marker marker-class-name="table_continued"/>
5459
5135
 
5136
+ <fo:block role="SKIP"/>
5137
+ </fo:table-cell>
5138
+ </fo:table-row>
5139
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5140
+ <fo:table-cell role="SKIP">
5141
+ <fo:marker marker-class-name="table_number"><xsl:value-of select="normalize-space(translate($table_number, ' ', ' '))"/></fo:marker>
5142
+ <fo:marker marker-class-name="table_continued">
5143
+ <xsl:value-of select="$title_continued"/>
5144
+ </fo:marker>
5460
5145
  <fo:block role="SKIP"/>
5461
- </fo:table-cell>
5462
- </fo:table-row>
5463
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5464
- <fo:table-cell role="SKIP">
5465
-
5466
- <fo:marker marker-class-name="table_number"><xsl:value-of select="normalize-space(translate($table_number, ' ', ' '))"/></fo:marker>
5467
-
5468
- <fo:marker marker-class-name="table_continued">
5469
- <xsl:value-of select="$title_continued"/>
5470
- </fo:marker>
5471
- <fo:block role="SKIP"/>
5472
- </fo:table-cell>
5473
- </fo:table-row>
5146
+ </fo:table-cell>
5147
+ </fo:table-row>
5474
5148
 
5475
5149
  <xsl:apply-templates/>
5476
5150
 
@@ -5556,7 +5230,7 @@
5556
5230
  <xsl:with-param name="pText" select="$border_under_row_"/>
5557
5231
  </xsl:call-template>
5558
5232
  </xsl:variable>
5559
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
5233
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
5560
5234
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
5561
5235
  </xsl:if>
5562
5236
  </xsl:when>
@@ -5673,7 +5347,7 @@
5673
5347
  </xsl:variable>
5674
5348
  <xsl:variable name="quot">"</xsl:variable>
5675
5349
  <xsl:variable name="styles_">
5676
- <xsl:for-each select="xalan:nodeset($styles__)/item">
5350
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
5677
5351
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5678
5352
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5679
5353
  <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'">
@@ -5723,9 +5397,7 @@
5723
5397
  <fo:block role="SKIP">
5724
5398
 
5725
5399
  <xsl:if test="$isGenerateTableIF = 'true'">
5726
-
5727
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5728
-
5400
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5729
5401
  </xsl:if>
5730
5402
 
5731
5403
  <xsl:apply-templates/>
@@ -5740,25 +5412,23 @@
5740
5412
 
5741
5413
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
5742
5414
  <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">
5415
+ <xsl:call-template name="setNamedDestination"/>
5416
+ <fo:block xsl:use-attribute-sets="table-note-style">
5417
+ <xsl:copy-of select="@id"/>
5743
5418
 
5744
- <xsl:call-template name="setNamedDestination"/>
5745
- <fo:block xsl:use-attribute-sets="table-note-style">
5746
- <xsl:copy-of select="@id"/>
5747
-
5748
- <xsl:call-template name="refine_table-note-style"/>
5749
-
5750
- <!-- Table's note/example name (NOTE, for example) -->
5751
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
5419
+ <xsl:call-template name="refine_table-note-style"/>
5752
5420
 
5753
- <xsl:call-template name="refine_table-note-name-style"/>
5421
+ <!-- Table's note/example name (NOTE, for example) -->
5422
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
5754
5423
 
5755
- <xsl:apply-templates select="*[local-name() = 'name']"/>
5424
+ <xsl:call-template name="refine_table-note-name-style"/>
5756
5425
 
5757
- </fo:inline>
5426
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
5758
5427
 
5759
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5760
- </fo:block>
5428
+ </fo:inline>
5761
5429
 
5430
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5431
+ </fo:block>
5762
5432
  </xsl:template> <!-- table/note -->
5763
5433
 
5764
5434
  <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">
@@ -5803,9 +5473,7 @@
5803
5473
  <xsl:variable name="current_fn_number" select="@reference"/>
5804
5474
 
5805
5475
  <xsl:variable name="current_fn_number_text">
5806
-
5807
- <xsl:value-of select="$current_fn_number"/>
5808
-
5476
+ <xsl:value-of select="$current_fn_number"/>
5809
5477
  </xsl:variable>
5810
5478
 
5811
5479
  <xsl:variable name="ref_id" select="@target"/>
@@ -5817,12 +5485,10 @@
5817
5485
  <xsl:choose>
5818
5486
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
5819
5487
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
5820
-
5821
5488
  </fn_styles>
5822
5489
  </xsl:when>
5823
5490
  <xsl:otherwise>
5824
5491
  <fn_styles xsl:use-attribute-sets="fn-num-style">
5825
-
5826
5492
  </fn_styles>
5827
5493
  </xsl:otherwise>
5828
5494
  </xsl:choose>
@@ -5840,7 +5506,6 @@
5840
5506
  <xsl:with-param name="element">
5841
5507
  <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 -->
5842
5508
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
5843
-
5844
5509
  <xsl:copy-of select="$current_fn_number_text"/>
5845
5510
 
5846
5511
  </fo:inline>
@@ -5878,10 +5543,9 @@
5878
5543
  <here><xsl:copy-of select="$footnotes"/></here> -->
5879
5544
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
5880
5545
  </xsl:variable>
5881
-
5882
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5883
- <xsl:copy-of select="$fn_block"/>
5884
- </fo:block>
5546
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5547
+ <xsl:copy-of select="$fn_block"/>
5548
+ </fo:block>
5885
5549
 
5886
5550
  </fo:block-container>
5887
5551
  </fo:footnote-body>
@@ -5958,21 +5622,20 @@
5958
5622
  <xsl:variable name="reference" select="@reference"/>
5959
5623
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
5960
5624
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
5625
+ <fo:block xsl:use-attribute-sets="table-fn-style">
5626
+ <xsl:copy-of select="@id"/>
5627
+ <xsl:call-template name="refine_table-fn-style"/>
5961
5628
 
5962
- <fo:block xsl:use-attribute-sets="table-fn-style">
5963
- <xsl:copy-of select="@id"/>
5964
- <xsl:call-template name="refine_table-fn-style"/>
5965
-
5966
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5967
- <xsl:with-param name="process">true</xsl:with-param>
5968
- </xsl:apply-templates>
5969
-
5970
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5971
- <!-- <xsl:copy-of select="./node()"/> -->
5972
- <xsl:apply-templates/>
5973
- </fo:inline>
5629
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5630
+ <xsl:with-param name="process">true</xsl:with-param>
5631
+ </xsl:apply-templates>
5974
5632
 
5975
- </fo:block>
5633
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5634
+ <!-- <xsl:copy-of select="./node()"/> -->
5635
+ <xsl:apply-templates/>
5636
+ </fo:inline>
5637
+
5638
+ </fo:block>
5976
5639
 
5977
5640
  <!-- </xsl:if> -->
5978
5641
  </xsl:for-each>
@@ -6025,7 +5688,6 @@
6025
5688
  <xsl:param name="process">false</xsl:param>
6026
5689
  <xsl:if test="$process = 'true'">
6027
5690
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
6028
-
6029
5691
  </xsl:if>
6030
5692
  </xsl:template>
6031
5693
 
@@ -6108,8 +5770,7 @@
6108
5770
 
6109
5771
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
6110
5772
 
6111
- <xsl:variable name="key_iso">
6112
- true
5773
+ <xsl:variable name="key_iso">true
6113
5774
  </xsl:variable>
6114
5775
 
6115
5776
  <fo:block>
@@ -6155,9 +5816,7 @@
6155
5816
  <fo:table width="95%" table-layout="fixed">
6156
5817
  <xsl:if test="normalize-space($key_iso) = 'true'">
6157
5818
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6158
-
6159
- <xsl:attribute name="font-size">8pt</xsl:attribute>
6160
-
5819
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
6161
5820
  </xsl:if>
6162
5821
  <xsl:choose>
6163
5822
  <!-- if there 'dl', then set same columns width -->
@@ -6181,21 +5840,18 @@
6181
5840
  <fo:table-row>
6182
5841
  <fo:table-cell>
6183
5842
  <fo:block>
6184
-
6185
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
6186
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
6187
- <!-- <xsl:value-of select="@reference"/> -->
6188
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
6189
- </fo:inline>
5843
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
5844
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
5845
+ <!-- <xsl:value-of select="@reference"/> -->
5846
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
5847
+ </fo:inline>
6190
5848
 
6191
5849
  </fo:block>
6192
5850
  </fo:table-cell>
6193
5851
  <fo:table-cell>
6194
5852
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
6195
5853
  <xsl:if test="normalize-space($key_iso) = 'true'">
6196
-
6197
5854
  </xsl:if>
6198
-
6199
5855
  <!-- <xsl:copy-of select="./node()"/> -->
6200
5856
  <xsl:apply-templates/>
6201
5857
  </fo:block>
@@ -6244,14 +5900,11 @@
6244
5900
  <!-- figure's footnote label -->
6245
5901
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
6246
5902
  <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">
6247
- <xsl:variable name="key_iso">
6248
- true
5903
+ <xsl:variable name="key_iso">true
6249
5904
  </xsl:variable>
6250
5905
  <xsl:if test="normalize-space($key_iso) = 'true'">
6251
5906
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6252
-
6253
- <xsl:attribute name="font-size">8pt</xsl:attribute>
6254
-
5907
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
6255
5908
  </xsl:if>
6256
5909
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
6257
5910
  <!-- <xsl:value-of select="@reference"/> -->
@@ -6297,8 +5950,7 @@
6297
5950
  <xsl:text>※</xsl:text>
6298
5951
  </xsl:if> -->
6299
5952
  <!-- <xsl:value-of select="@reference"/> -->
6300
-
6301
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
5953
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
6302
5954
 
6303
5955
  <!-- <xsl:if test="$namespace = 'bsi'">
6304
5956
  <xsl:text>)</xsl:text>
@@ -6370,10 +6022,9 @@
6370
6022
  </xsl:if>
6371
6023
 
6372
6024
  <xsl:call-template name="setBlockSpanAll"/>
6373
-
6374
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
6375
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6376
- </xsl:if>
6025
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
6026
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
6027
+ </xsl:if>
6377
6028
 
6378
6029
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
6379
6030
  <!-- set font-size as sourcecode font-size -->
@@ -6394,7 +6045,6 @@
6394
6045
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6395
6046
  </xsl:choose>
6396
6047
  </xsl:attribute>
6397
-
6398
6048
  </xsl:if>
6399
6049
 
6400
6050
  <xsl:call-template name="setTrackChangesStyles">
@@ -6403,41 +6053,33 @@
6403
6053
  </xsl:call-template>
6404
6054
 
6405
6055
  <fo:block-container margin-left="0mm" role="SKIP">
6406
-
6407
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
6056
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
6408
6057
 
6409
6058
  <xsl:variable name="parent" select="local-name(..)"/>
6410
6059
 
6411
6060
  <xsl:variable name="key_iso">
6412
-
6413
- <xsl:if test="$parent = 'figure' or $parent = 'formula' or ../@key = 'true'">true</xsl:if>
6414
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
6061
+ <xsl:if test="$parent = 'figure' or $parent = 'formula' or ../@key = 'true'">true</xsl:if> <!-- and (not(../@class) or ../@class !='pseudocode') -->
6415
6062
  </xsl:variable>
6416
6063
 
6417
6064
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
6418
6065
 
6419
6066
  <xsl:choose>
6420
6067
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
6421
-
6422
- <fo:block text-align="left">
6423
-
6424
- <xsl:attribute name="margin-bottom">15pt</xsl:attribute>
6425
-
6426
- <!-- <xsl:variable name="title-where">
6068
+ <fo:block text-align="left">
6069
+ <xsl:attribute name="margin-bottom">15pt</xsl:attribute>
6070
+ <!-- <xsl:variable name="title-where">
6427
6071
  <xsl:call-template name="getLocalizedString">
6428
6072
  <xsl:with-param name="key">where</xsl:with-param>
6429
6073
  </xsl:call-template>
6430
6074
  </xsl:variable>
6431
6075
  <xsl:value-of select="$title-where"/> -->
6432
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
6433
- </fo:block>
6434
- <fo:block>
6435
-
6436
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
6437
-
6438
- <xsl:text> </xsl:text>
6439
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
6440
- </fo:block>
6076
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
6077
+ </fo:block>
6078
+ <fo:block>
6079
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
6080
+ <xsl:text> </xsl:text>
6081
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
6082
+ </fo:block>
6441
6083
 
6442
6084
  </xsl:when> <!-- END: only one component -->
6443
6085
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
@@ -6458,19 +6100,17 @@
6458
6100
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
6459
6101
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
6460
6102
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
6103
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6461
6104
 
6462
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6463
-
6464
- <xsl:call-template name="refine_figure_key_style"/>
6465
-
6466
- <xsl:variable name="title-key">
6467
- <xsl:call-template name="getLocalizedString">
6468
- <xsl:with-param name="key">key</xsl:with-param>
6469
- </xsl:call-template>
6470
- </xsl:variable>
6471
- <xsl:value-of select="$title-key"/>
6472
- </fo:block>
6105
+ <xsl:call-template name="refine_figure_key_style"/>
6473
6106
 
6107
+ <xsl:variable name="title-key">
6108
+ <xsl:call-template name="getLocalizedString">
6109
+ <xsl:with-param name="key">key</xsl:with-param>
6110
+ </xsl:call-template>
6111
+ </xsl:variable>
6112
+ <xsl:value-of select="$title-key"/>
6113
+ </fo:block>
6474
6114
  </xsl:if>
6475
6115
  </xsl:when> <!-- END: definition list in a figure -->
6476
6116
  </xsl:choose>
@@ -6503,14 +6143,11 @@
6503
6143
  <xsl:if test="$isGenerateTableIF = 'true'">
6504
6144
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
6505
6145
  </xsl:if>
6506
-
6507
6146
  <xsl:choose>
6508
6147
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
6509
6148
  <xsl:when test="normalize-space($key_iso) = 'true'">
6510
6149
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6511
-
6512
- <xsl:attribute name="font-size">8pt</xsl:attribute>
6513
-
6150
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
6514
6151
  </xsl:when>
6515
6152
  </xsl:choose>
6516
6153
 
@@ -6615,17 +6252,15 @@
6615
6252
  <xsl:call-template name="getMaxLength_dt"/>
6616
6253
  </xsl:variable>
6617
6254
 
6618
- <xsl:variable name="isContainsKeepTogetherTag_">
6619
- false
6255
+ <xsl:variable name="isContainsKeepTogetherTag_">false
6620
6256
  </xsl:variable>
6621
6257
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
6622
6258
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
6623
-
6624
- <xsl:call-template name="setColumnWidth_dl">
6625
- <xsl:with-param name="colwidths" select="$colwidths"/>
6626
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
6627
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
6628
- </xsl:call-template>
6259
+ <xsl:call-template name="setColumnWidth_dl">
6260
+ <xsl:with-param name="colwidths" select="$colwidths"/>
6261
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
6262
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
6263
+ </xsl:call-template>
6629
6264
 
6630
6265
  <fo:table-body>
6631
6266
 
@@ -6676,26 +6311,20 @@
6676
6311
  </xsl:template>
6677
6312
 
6678
6313
  <xsl:template name="refine_dl_formula_where_style">
6679
-
6680
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
6681
-
6314
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
6682
6315
  </xsl:template> <!-- refine_dl_formula_where_style -->
6683
6316
 
6684
6317
  <xsl:template name="refine_figure_key_style">
6685
-
6686
- <xsl:attribute name="font-size">8pt</xsl:attribute>
6687
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
6688
-
6318
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
6319
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
6689
6320
  </xsl:template> <!-- refine_figure_key_style -->
6690
6321
 
6691
6322
  <xsl:template name="refine_multicomponent_style">
6692
6323
  <xsl:variable name="parent" select="local-name(..)"/>
6693
-
6694
6324
  </xsl:template> <!-- refine_multicomponent_style -->
6695
6325
 
6696
6326
  <xsl:template name="refine_multicomponent_block_style">
6697
6327
  <xsl:variable name="parent" select="local-name(..)"/>
6698
-
6699
6328
  </xsl:template> <!-- refine_multicomponent_block_style -->
6700
6329
 
6701
6330
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -6882,14 +6511,11 @@
6882
6511
  <xsl:attribute name="id">
6883
6512
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
6884
6513
  </xsl:attribute>
6885
-
6886
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6887
- <xsl:with-param name="process">true</xsl:with-param>
6888
- </xsl:apply-templates>
6889
-
6514
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6515
+ <xsl:with-param name="process">true</xsl:with-param>
6516
+ </xsl:apply-templates>
6890
6517
  </td>
6891
6518
  </tr>
6892
-
6893
6519
  </xsl:template>
6894
6520
 
6895
6521
  <!-- Definition's term -->
@@ -6898,7 +6524,6 @@
6898
6524
  <xsl:param name="split_keep-within-line"/>
6899
6525
 
6900
6526
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
6901
-
6902
6527
  <xsl:call-template name="insert_dt_cell">
6903
6528
  <xsl:with-param name="key_iso" select="$key_iso"/>
6904
6529
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -6920,7 +6545,6 @@
6920
6545
  <!-- border is mandatory, to calculate real width -->
6921
6546
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
6922
6547
  <xsl:attribute name="text-align">left</xsl:attribute>
6923
-
6924
6548
  </xsl:if>
6925
6549
 
6926
6550
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -6930,9 +6554,7 @@
6930
6554
 
6931
6555
  <xsl:choose>
6932
6556
  <xsl:when test="$isGenerateTableIF = 'true'">
6933
-
6934
- <xsl:copy-of select="@id"/>
6935
-
6557
+ <xsl:copy-of select="@id"/>
6936
6558
  </xsl:when>
6937
6559
  <xsl:otherwise>
6938
6560
  <xsl:copy-of select="@id"/>
@@ -6969,9 +6591,7 @@
6969
6591
  <fo:block role="SKIP">
6970
6592
 
6971
6593
  <xsl:if test="$isGenerateTableIF = 'true'">
6972
-
6973
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6974
-
6594
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6975
6595
  </xsl:if>
6976
6596
 
6977
6597
  <xsl:choose>
@@ -7119,7 +6739,6 @@
7119
6739
  </xsl:template>
7120
6740
 
7121
6741
  <xsl:template name="refine_italic_style">
7122
-
7123
6742
  </xsl:template>
7124
6743
 
7125
6744
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -7135,7 +6754,6 @@
7135
6754
  </xsl:template>
7136
6755
 
7137
6756
  <xsl:template name="refine_strong_style">
7138
-
7139
6757
  <xsl:if test="ancestor::*['preferred']">
7140
6758
  <xsl:attribute name="role">SKIP</xsl:attribute>
7141
6759
  </xsl:if>
@@ -7160,12 +6778,7 @@
7160
6778
  <xsl:template match="*[local-name()='tt']">
7161
6779
  <fo:inline xsl:use-attribute-sets="tt-style">
7162
6780
 
7163
- <xsl:variable name="_font-size">
7164
-
7165
- 10
7166
-
7167
- <!-- inherit -->
7168
-
6781
+ <xsl:variable name="_font-size">10 <!-- inherit -->
7169
6782
  </xsl:variable>
7170
6783
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
7171
6784
  <xsl:if test="$font-size != ''">
@@ -7381,8 +6994,7 @@
7381
6994
  </xsl:otherwise>
7382
6995
  </xsl:choose>
7383
6996
  </xsl:variable>
7384
- <xsl:variable name="ratio_">
7385
- 0.75
6997
+ <xsl:variable name="ratio_">0.75
7386
6998
  </xsl:variable>
7387
6999
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
7388
7000
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -7460,77 +7072,76 @@
7460
7072
  <fo:block> </fo:block>
7461
7073
  <fo:block break-after="page"/>
7462
7074
  </xsl:template>
7075
+ <!-- ================================================================ -->
7076
+ <!-- landscape/portrait orientation processing (post-processing step) -->
7077
+ <!-- ================================================================ -->
7078
+ <xsl:template match="@*|node()" mode="landscape_portrait">
7079
+ <xsl:copy>
7080
+ <xsl:apply-templates select="@*|node()" mode="landscape_portrait"/>
7081
+ </xsl:copy>
7082
+ </xsl:template>
7463
7083
 
7464
- <!-- ================================================================ -->
7465
- <!-- landscape/portrait orientation processing (post-processing step) -->
7466
- <!-- ================================================================ -->
7467
- <xsl:template match="@*|node()" mode="landscape_portrait">
7468
- <xsl:copy>
7469
- <xsl:apply-templates select="@*|node()" mode="landscape_portrait"/>
7470
- </xsl:copy>
7471
- </xsl:template>
7472
-
7473
- <xsl:template match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="landscape_portrait">
7474
-
7475
- <!-- determine pagebreak is last element before </fo:flow> or not -->
7476
- <xsl:variable name="isLast">
7477
- <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]">
7478
- <xsl:if test="following-sibling::*">false</xsl:if>
7479
- </xsl:for-each>
7480
- </xsl:variable>
7084
+ <xsl:template match="*[local-name() = 'pagebreak'][not(following-sibling::*[1][local-name() = 'pagebreak'])]" mode="landscape_portrait">
7481
7085
 
7482
- <xsl:if test="contains($isLast, 'false')">
7086
+ <!-- determine pagebreak is last element before </fo:flow> or not -->
7087
+ <xsl:variable name="isLast">
7088
+ <xsl:for-each select="ancestor-or-self::*[ancestor::fo:flow]">
7089
+ <xsl:if test="following-sibling::*">false</xsl:if>
7090
+ </xsl:for-each>
7091
+ </xsl:variable>
7483
7092
 
7484
- <xsl:variable name="orientation" select="normalize-space(@orientation)"/>
7093
+ <xsl:if test="contains($isLast, 'false')">
7485
7094
 
7486
- <xsl:variable name="tree_">
7487
- <xsl:for-each select="ancestor::*[ancestor::fo:flow]">
7488
- <element pos="{position()}">
7489
- <xsl:value-of select="name()"/>
7490
- </element>
7491
- </xsl:for-each>
7492
- </xsl:variable>
7493
- <xsl:variable name="tree" select="xalan:nodeset($tree_)"/>
7095
+ <xsl:variable name="orientation" select="normalize-space(@orientation)"/>
7494
7096
 
7495
- <!-- close fo:page-sequence (closing preceding fo elements) -->
7496
- <xsl:for-each select="$tree//element">
7497
- <xsl:sort data-type="number" order="descending" select="@pos"/>
7498
- <xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
7499
- <xsl:value-of select="."/>
7500
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
7097
+ <xsl:variable name="tree_">
7098
+ <xsl:for-each select="ancestor::*[ancestor::fo:flow]">
7099
+ <element pos="{position()}">
7100
+ <xsl:value-of select="name()"/>
7101
+ </element>
7501
7102
  </xsl:for-each>
7502
- <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text>
7503
- <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text>
7103
+ </xsl:variable>
7104
+ <xsl:variable name="tree" select="xalan:nodeset($tree_)"/>
7504
7105
 
7505
- <!-- <pagebreak/> -->
7506
- <!-- create a new fo:page-sequence (opening fo elements) -->
7507
- <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
7508
- <fo:static-content flow-name="xsl-footnote-separator">
7509
- <fo:block>
7510
- <fo:leader leader-pattern="rule" leader-length="30%"/>
7511
- </fo:block>
7512
- </fo:static-content>
7513
- <xsl:call-template name="insertHeaderFooter"/>
7514
- <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text>
7106
+ <!-- close fo:page-sequence (closing preceding fo elements) -->
7107
+ <xsl:for-each select="$tree//element">
7108
+ <xsl:sort data-type="number" order="descending" select="@pos"/>
7109
+ <xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
7110
+ <xsl:value-of select="."/>
7111
+ <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
7112
+ </xsl:for-each>
7113
+ <xsl:text disable-output-escaping="yes">&lt;/fo:flow&gt;</xsl:text>
7114
+ <xsl:text disable-output-escaping="yes">&lt;/fo:page-sequence&gt;</xsl:text>
7115
+
7116
+ <!-- <pagebreak/> -->
7117
+ <!-- create a new fo:page-sequence (opening fo elements) -->
7118
+ <xsl:text disable-output-escaping="yes">&lt;fo:page-sequence master-reference="document</xsl:text><xsl:if test="$orientation != ''">-<xsl:value-of select="$orientation"/></xsl:if><xsl:text disable-output-escaping="yes">"&gt;</xsl:text>
7119
+ <fo:static-content flow-name="xsl-footnote-separator">
7120
+ <fo:block>
7121
+ <fo:leader leader-pattern="rule" leader-length="30%"/>
7122
+ </fo:block>
7123
+ </fo:static-content>
7124
+ <xsl:call-template name="insertHeaderFooter"/>
7125
+ <xsl:text disable-output-escaping="yes">&lt;fo:flow flow-name="xsl-region-body"&gt;</xsl:text>
7515
7126
 
7516
- <xsl:for-each select="$tree//element">
7517
- <xsl:text disable-output-escaping="yes">&lt;</xsl:text>
7127
+ <xsl:for-each select="$tree//element">
7128
+ <xsl:text disable-output-escaping="yes">&lt;</xsl:text>
7129
+ <xsl:value-of select="."/>
7130
+ <xsl:for-each select="@*[local-name() != 'pos']">
7131
+ <xsl:text> </xsl:text>
7132
+ <xsl:value-of select="local-name()"/>
7133
+ <xsl:text>="</xsl:text>
7518
7134
  <xsl:value-of select="."/>
7519
- <xsl:for-each select="@*[local-name() != 'pos']">
7520
- <xsl:text> </xsl:text>
7521
- <xsl:value-of select="local-name()"/>
7522
- <xsl:text>="</xsl:text>
7523
- <xsl:value-of select="."/>
7524
- <xsl:text>"</xsl:text>
7525
- </xsl:for-each>
7526
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
7527
- </xsl:for-each>
7135
+ <xsl:text>"</xsl:text>
7136
+ </xsl:for-each>
7137
+ <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
7138
+ </xsl:for-each>
7528
7139
 
7529
- </xsl:if>
7530
- </xsl:template>
7531
- <!-- ================================================================ -->
7532
- <!-- END: landscape/portrait orientation processing (post-processing step) -->
7533
- <!-- ================================================================ -->
7140
+ </xsl:if>
7141
+ </xsl:template>
7142
+ <!-- ================================================================ -->
7143
+ <!-- END: landscape/portrait orientation processing (post-processing step) -->
7144
+ <!-- ================================================================ -->
7534
7145
 
7535
7146
  <!-- Example: <span style="font-family:&quot;Noto Sans JP&quot;">styled text</span> -->
7536
7147
  <xsl:template match="*[local-name() = 'span'][@style]" priority="2">
@@ -7543,7 +7154,7 @@
7543
7154
 
7544
7155
  <xsl:variable name="quot">"</xsl:variable>
7545
7156
  <xsl:variable name="styles_">
7546
- <xsl:for-each select="xalan:nodeset($styles__)/item">
7157
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
7547
7158
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7548
7159
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
7549
7160
  <xsl:variable name="value">
@@ -7555,7 +7166,7 @@
7555
7166
  </xsl:otherwise>
7556
7167
  </xsl:choose>
7557
7168
  </xsl:variable>
7558
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
7169
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
7559
7170
  <style name="{$key}"><xsl:value-of select="$value"/></style>
7560
7171
  </xsl:if>
7561
7172
  <xsl:if test="$key = 'text-indent'">
@@ -7569,7 +7180,6 @@
7569
7180
  <fo:inline>
7570
7181
  <xsl:for-each select="$styles/style">
7571
7182
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
7572
-
7573
7183
  </xsl:for-each>
7574
7184
  <xsl:apply-templates/>
7575
7185
  </fo:inline>
@@ -8556,10 +8166,9 @@
8556
8166
  <xsl:variable name="mathml_content">
8557
8167
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
8558
8168
  </xsl:variable>
8559
-
8560
- <xsl:call-template name="mathml_instream_object">
8561
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
8562
- </xsl:call-template>
8169
+ <xsl:call-template name="mathml_instream_object">
8170
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
8171
+ </xsl:call-template>
8563
8172
 
8564
8173
  </fo:inline>
8565
8174
  </xsl:template>
@@ -8593,7 +8202,6 @@
8593
8202
  <xsl:template name="getMathml_asciimath_text">
8594
8203
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
8595
8204
  <xsl:variable name="latexmath">
8596
-
8597
8205
  </xsl:variable>
8598
8206
  <xsl:variable name="asciimath_text_following">
8599
8207
  <xsl:choose>
@@ -8666,7 +8274,6 @@
8666
8274
  </xsl:template>
8667
8275
 
8668
8276
  <xsl:template name="refine_mathml_insteam_object_style">
8669
-
8670
8277
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
8671
8278
 
8672
8279
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -9064,7 +8671,6 @@
9064
8671
  <xsl:variable name="annotation-id" select="@id"/>
9065
8672
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
9066
8673
  <fo:block id="{$annotation-id}" white-space="nowrap">
9067
-
9068
8674
  <fo:inline>
9069
8675
  <xsl:apply-templates>
9070
8676
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -9093,7 +8699,6 @@
9093
8699
  <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'])">
9094
8700
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
9095
8701
  </xsl:if>
9096
-
9097
8702
  <xsl:if test="parent::*[local-name() = 'add']">
9098
8703
  <xsl:call-template name="append_add-style"/>
9099
8704
  </xsl:if>
@@ -9104,8 +8709,7 @@
9104
8709
  </xsl:template>
9105
8710
 
9106
8711
  <!-- command between two xref points to non-standard bibitem -->
9107
- <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']]]">
9108
- <xsl:value-of select="."/>
8712
+ <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="."/>
9109
8713
  </xsl:template>
9110
8714
 
9111
8715
  <!-- ====== -->
@@ -9120,7 +8724,6 @@
9120
8724
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
9121
8725
  </xsl:choose>
9122
8726
  </xsl:attribute>
9123
-
9124
8727
  </xsl:if>
9125
8728
  <fo:block-container margin-left="0mm" role="SKIP">
9126
8729
  <xsl:call-template name="setNamedDestination"/>
@@ -9210,53 +8813,49 @@
9210
8813
 
9211
8814
  <xsl:template match="*[local-name() = 'note']" name="note">
9212
8815
 
9213
- <xsl:call-template name="setNamedDestination"/>
9214
-
9215
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
9216
-
9217
- <xsl:call-template name="setBlockSpanAll"/>
9218
-
9219
- <xsl:call-template name="refine_note-style"/>
8816
+ <xsl:call-template name="setNamedDestination"/>
9220
8817
 
9221
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8818
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
9222
8819
 
9223
- <fo:block>
8820
+ <xsl:call-template name="setBlockSpanAll"/>
9224
8821
 
9225
- <xsl:call-template name="refine_note_block_style"/>
8822
+ <xsl:call-template name="refine_note-style"/>
9226
8823
 
9227
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
8824
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8825
+ <fo:block>
9228
8826
 
9229
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
8827
+ <xsl:call-template name="refine_note_block_style"/>
9230
8828
 
9231
- <xsl:call-template name="refine_note-name-style"/>
8829
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
9232
8830
 
9233
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
9234
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
9235
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
9236
- <xsl:call-template name="append_add-style"/>
9237
- </xsl:if>
8831
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
9238
8832
 
9239
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
9240
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
9241
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
9242
- <xsl:with-param name="skip">false</xsl:with-param>
9243
- </xsl:apply-templates>
9244
- </xsl:if>
8833
+ <xsl:call-template name="refine_note-name-style"/>
9245
8834
 
9246
- <xsl:apply-templates select="*[local-name() = 'name']"/>
8835
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8836
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
8837
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8838
+ <xsl:call-template name="append_add-style"/>
8839
+ </xsl:if>
9247
8840
 
9248
- </fo:inline>
8841
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
8842
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8843
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8844
+ <xsl:with-param name="skip">false</xsl:with-param>
8845
+ </xsl:apply-templates>
8846
+ </xsl:if>
9249
8847
 
9250
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
9251
- </fo:block>
8848
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
9252
8849
 
9253
- </fo:block-container>
9254
- </fo:block-container>
8850
+ </fo:inline>
9255
8851
 
8852
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8853
+ </fo:block>
8854
+ </fo:block-container>
8855
+ </fo:block-container>
9256
8856
  </xsl:template>
9257
8857
 
9258
8858
  <xsl:template name="refine_note_block_style">
9259
-
9260
8859
  </xsl:template> <!-- refine_note_block_style -->
9261
8860
 
9262
8861
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -9309,7 +8908,6 @@
9309
8908
  <xsl:value-of select="$sfx"/>
9310
8909
  </xsl:when>
9311
8910
  <xsl:otherwise>
9312
-
9313
8911
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
9314
8912
  <!-- <xsl:if test="$namespace = 'ieee'">
9315
8913
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -9317,7 +8915,6 @@
9317
8915
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
9318
8916
  <xsl:text>:</xsl:text>
9319
8917
  </xsl:if> -->
9320
-
9321
8918
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
9322
8919
  <xsl:text> – </xsl:text> en dash &#x2013;
9323
8920
  </xsl:if> -->
@@ -9338,7 +8935,6 @@
9338
8935
  <xsl:value-of select="$sfx"/>
9339
8936
  </xsl:when>
9340
8937
  <xsl:otherwise>
9341
-
9342
8938
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
9343
8939
  <!-- <xsl:if test="$namespace = 'ieee'">
9344
8940
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -9394,7 +8990,6 @@
9394
8990
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
9395
8991
 
9396
8992
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
9397
-
9398
8993
  </xsl:if>
9399
8994
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
9400
8995
  </fo:block>
@@ -9434,8 +9029,7 @@
9434
9029
  <!-- Example: Dimensions in millimeters -->
9435
9030
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
9436
9031
 
9437
- <xsl:variable name="show_figure_key_in_block_container">
9438
- true
9032
+ <xsl:variable name="show_figure_key_in_block_container">true
9439
9033
  </xsl:variable>
9440
9034
 
9441
9035
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -9450,11 +9044,9 @@
9450
9044
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
9451
9045
  <xsl:call-template name="showFigureKey"/>
9452
9046
  </xsl:if>
9453
-
9454
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
9047
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
9455
9048
 
9456
9049
  </fo:block-container>
9457
-
9458
9050
  </xsl:template>
9459
9051
 
9460
9052
  <xsl:template name="showFigureKey">
@@ -9492,15 +9084,15 @@
9492
9084
  <!-- SOURCE: ... -->
9493
9085
  <!-- figure/source -->
9494
9086
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
9495
-
9496
- <fo:block xsl:use-attribute-sets="figure-source-style">
9497
- <xsl:apply-templates/>
9498
- </fo:block>
9087
+ <fo:block xsl:use-attribute-sets="figure-source-style">
9088
+ <xsl:apply-templates/>
9089
+ </fo:block>
9499
9090
 
9500
9091
  </xsl:template>
9501
9092
 
9502
9093
  <xsl:template match="*[local-name() = 'image']">
9503
9094
  <xsl:param name="indent">0</xsl:param>
9095
+ <xsl:param name="logo_width"/>
9504
9096
  <xsl:variable name="isAdded" select="../@added"/>
9505
9097
  <xsl:variable name="isDeleted" select="../@deleted"/>
9506
9098
  <xsl:choose>
@@ -9522,9 +9114,18 @@
9522
9114
 
9523
9115
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
9524
9116
 
9525
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
9526
9117
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
9527
9118
 
9119
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
9120
+ <xsl:attribute name="width">100%</xsl:attribute>
9121
+ <xsl:if test="normalize-space($logo_width) != ''">
9122
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
9123
+ </xsl:if>
9124
+ <xsl:attribute name="content-height">100%</xsl:attribute>
9125
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
9126
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
9127
+ </xsl:if>
9128
+
9528
9129
  <xsl:variable name="width">
9529
9130
  <xsl:call-template name="setImageWidth"/>
9530
9131
  </xsl:variable>
@@ -9602,8 +9203,7 @@
9602
9203
  </xsl:call-template>
9603
9204
  </xsl:variable>
9604
9205
 
9605
- <xsl:variable name="scaleRatio">
9606
- 1
9206
+ <xsl:variable name="scaleRatio">1
9607
9207
  </xsl:variable>
9608
9208
 
9609
9209
  <xsl:if test="number($scale) &lt; 100">
@@ -9714,18 +9314,14 @@
9714
9314
  </xsl:variable>
9715
9315
 
9716
9316
  <xsl:variable name="image_width_effective">
9717
-
9718
- <xsl:value-of select="$width_effective - number($indent_left)"/>
9719
-
9317
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
9720
9318
  </xsl:variable>
9721
9319
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
9722
9320
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
9723
9321
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
9724
9322
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
9725
9323
  <xsl:variable name="scale">
9726
-
9727
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9728
-
9324
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9729
9325
  </xsl:variable>
9730
9326
  <xsl:value-of select="$scale"/>
9731
9327
  </xsl:template>
@@ -9746,7 +9342,8 @@
9746
9342
  </xsl:when>
9747
9343
  <xsl:when test="not(starts-with(@src, 'data:'))">
9748
9344
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
9749
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
9345
+ <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>
9346
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
9750
9347
  </xsl:when>
9751
9348
  <xsl:otherwise>
9752
9349
  <xsl:value-of select="@src"/>
@@ -10042,8 +9639,8 @@
10042
9639
  </xsl:call-template>
10043
9640
  </xsl:variable>
10044
9641
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
10045
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
10046
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
9642
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
9643
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
10047
9644
 
10048
9645
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
10049
9646
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -10115,8 +9712,8 @@
10115
9712
  </xsl:variable>
10116
9713
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
10117
9714
  <xsl:variable name="att_name" select="local-name()"/>
10118
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
10119
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
9715
+ <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>
9716
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
10120
9717
  </xsl:template>
10121
9718
 
10122
9719
  <!-- ============== -->
@@ -10189,13 +9786,13 @@
10189
9786
  </xsl:call-template>
10190
9787
  </xsl:variable>
10191
9788
  <xsl:variable name="x_coords">
10192
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
9789
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
10193
9790
  <xsl:sort select="." data-type="number"/>
10194
9791
  <x><xsl:value-of select="."/></x>
10195
9792
  </xsl:for-each>
10196
9793
  </xsl:variable>
10197
9794
  <xsl:variable name="y_coords">
10198
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
9795
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
10199
9796
  <xsl:sort select="." data-type="number"/>
10200
9797
  <y><xsl:value-of select="."/></y>
10201
9798
  </xsl:for-each>
@@ -10400,11 +9997,11 @@
10400
9997
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
10401
9998
  </xsl:variable>
10402
9999
 
10403
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
10404
- <title>
10000
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
10001
+ <mn:title>
10405
10002
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
10406
- </title>
10407
- </item>
10003
+ </mn:title>
10004
+ </mn:item>
10408
10005
  </xsl:if>
10409
10006
  </xsl:template>
10410
10007
 
@@ -10475,12 +10072,12 @@
10475
10072
  <xsl:param name="contents"/>
10476
10073
  <xsl:param name="contents_addon"/>
10477
10074
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10478
- <xsl:if test="$contents_nodes//item">
10075
+ <xsl:if test="$contents_nodes//mn:item">
10479
10076
  <fo:bookmark-tree>
10480
10077
  <xsl:choose>
10481
- <xsl:when test="$contents_nodes/doc">
10078
+ <xsl:when test="$contents_nodes/mn:doc">
10482
10079
  <xsl:choose>
10483
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
10080
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
10484
10081
 
10485
10082
  <xsl:if test="$contents_nodes/collection">
10486
10083
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -10488,8 +10085,8 @@
10488
10085
  </fo:bookmark>
10489
10086
  </xsl:if>
10490
10087
 
10491
- <xsl:for-each select="$contents_nodes/doc">
10492
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
10088
+ <xsl:for-each select="$contents_nodes/mn:doc">
10089
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
10493
10090
  <xsl:if test="@bundle = 'true'">
10494
10091
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
10495
10092
  </xsl:if>
@@ -10523,14 +10120,14 @@
10523
10120
  </xsl:choose>
10524
10121
  </fo:bookmark-title>
10525
10122
 
10526
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
10123
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
10527
10124
 
10528
10125
  <xsl:call-template name="insertFigureBookmarks">
10529
- <xsl:with-param name="contents" select="contents"/>
10126
+ <xsl:with-param name="contents" select="mn:contents"/>
10530
10127
  </xsl:call-template>
10531
10128
 
10532
10129
  <xsl:call-template name="insertTableBookmarks">
10533
- <xsl:with-param name="contents" select="contents"/>
10130
+ <xsl:with-param name="contents" select="mn:contents"/>
10534
10131
  <xsl:with-param name="lang" select="@lang"/>
10535
10132
  </xsl:call-template>
10536
10133
 
@@ -10539,16 +10136,16 @@
10539
10136
  </xsl:for-each>
10540
10137
  </xsl:when>
10541
10138
  <xsl:otherwise>
10542
- <xsl:for-each select="$contents_nodes/doc">
10139
+ <xsl:for-each select="$contents_nodes/mn:doc">
10543
10140
 
10544
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
10141
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
10545
10142
 
10546
10143
  <xsl:call-template name="insertFigureBookmarks">
10547
- <xsl:with-param name="contents" select="contents"/>
10144
+ <xsl:with-param name="contents" select="mn:contents"/>
10548
10145
  </xsl:call-template>
10549
10146
 
10550
10147
  <xsl:call-template name="insertTableBookmarks">
10551
- <xsl:with-param name="contents" select="contents"/>
10148
+ <xsl:with-param name="contents" select="mn:contents"/>
10552
10149
  <xsl:with-param name="lang" select="@lang"/>
10553
10150
  </xsl:call-template>
10554
10151
 
@@ -10557,14 +10154,14 @@
10557
10154
  </xsl:choose>
10558
10155
  </xsl:when>
10559
10156
  <xsl:otherwise>
10560
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
10157
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
10561
10158
 
10562
10159
  <xsl:call-template name="insertFigureBookmarks">
10563
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
10160
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10564
10161
  </xsl:call-template>
10565
10162
 
10566
10163
  <xsl:call-template name="insertTableBookmarks">
10567
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
10164
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10568
10165
  <xsl:with-param name="lang" select="@lang"/>
10569
10166
  </xsl:call-template>
10570
10167
 
@@ -10581,89 +10178,81 @@
10581
10178
  <xsl:template name="insertFigureBookmarks">
10582
10179
  <xsl:param name="contents"/>
10583
10180
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10584
- <xsl:if test="$contents_nodes/figure">
10585
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
10181
+ <xsl:if test="$contents_nodes/mn:figure">
10182
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
10586
10183
  <fo:bookmark-title>Figures</fo:bookmark-title>
10587
- <xsl:for-each select="$contents_nodes/figure">
10184
+ <xsl:for-each select="$contents_nodes/mn:figure">
10588
10185
  <fo:bookmark internal-destination="{@id}">
10589
10186
  <fo:bookmark-title>
10590
- <xsl:value-of select="normalize-space(title)"/>
10187
+ <xsl:value-of select="normalize-space(mn:title)"/>
10591
10188
  </fo:bookmark-title>
10592
10189
  </fo:bookmark>
10593
10190
  </xsl:for-each>
10594
10191
  </fo:bookmark>
10595
10192
  </xsl:if>
10193
+ <xsl:if test="$contents_nodes//mn:figures/mn:figure">
10194
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10195
+ <xsl:attribute name="internal-destination">
10196
+ <xsl:value-of select="$contents_nodes//mn:figures/mn:figure[1]/@id"/>
10197
+ </xsl:attribute>
10596
10198
 
10597
- <xsl:if test="$contents_nodes//figures/figure">
10598
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10599
-
10600
- <xsl:attribute name="internal-destination">
10601
- <xsl:value-of select="$contents_nodes//figures/figure[1]/@id"/>
10602
- </xsl:attribute>
10603
-
10604
- <xsl:variable name="bookmark-title">
10605
- Figures
10606
- </xsl:variable>
10607
- <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
10608
- <xsl:for-each select="$contents_nodes//figures/figure">
10609
- <fo:bookmark internal-destination="{@id}">
10610
- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
10611
- </fo:bookmark>
10612
- </xsl:for-each>
10199
+ <xsl:variable name="bookmark-title">Figures
10200
+ </xsl:variable>
10201
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
10202
+ <xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
10203
+ <fo:bookmark internal-destination="{@id}">
10204
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
10613
10205
  </fo:bookmark>
10614
- </xsl:if>
10615
-
10206
+ </xsl:for-each>
10207
+ </fo:bookmark>
10208
+ </xsl:if>
10616
10209
  </xsl:template> <!-- insertFigureBookmarks -->
10617
10210
 
10618
10211
  <xsl:template name="insertTableBookmarks">
10619
10212
  <xsl:param name="contents"/>
10620
10213
  <xsl:param name="lang"/>
10621
10214
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10622
- <xsl:if test="$contents_nodes/table">
10623
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
10215
+ <xsl:if test="$contents_nodes/mn:table">
10216
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
10624
10217
  <fo:bookmark-title>
10625
10218
  <xsl:choose>
10626
10219
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
10627
10220
  <xsl:otherwise>Tables</xsl:otherwise>
10628
10221
  </xsl:choose>
10629
10222
  </fo:bookmark-title>
10630
- <xsl:for-each select="$contents_nodes/table">
10223
+ <xsl:for-each select="$contents_nodes/mn:table">
10631
10224
  <fo:bookmark internal-destination="{@id}">
10632
10225
  <fo:bookmark-title>
10633
- <xsl:value-of select="normalize-space(title)"/>
10226
+ <xsl:value-of select="normalize-space(mn:title)"/>
10634
10227
  </fo:bookmark-title>
10635
10228
  </fo:bookmark>
10636
10229
  </xsl:for-each>
10637
10230
  </fo:bookmark>
10638
10231
  </xsl:if>
10232
+ <xsl:if test="$contents_nodes//mn:tables/mn:table">
10233
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10234
+ <xsl:attribute name="internal-destination">
10235
+ <xsl:value-of select="$contents_nodes//mn:tables/mn:table[1]/@id"/>
10236
+ </xsl:attribute>
10639
10237
 
10640
- <xsl:if test="$contents_nodes//tables/table">
10641
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10642
-
10643
- <xsl:attribute name="internal-destination">
10644
- <xsl:value-of select="$contents_nodes//tables/table[1]/@id"/>
10645
- </xsl:attribute>
10646
-
10647
- <xsl:variable name="bookmark-title">
10648
-
10649
- <xsl:choose>
10650
- <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
10651
- <xsl:otherwise>Tables</xsl:otherwise>
10652
- </xsl:choose>
10238
+ <xsl:variable name="bookmark-title">
10239
+ <xsl:choose>
10240
+ <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
10241
+ <xsl:otherwise>Tables</xsl:otherwise>
10242
+ </xsl:choose>
10653
10243
 
10654
- </xsl:variable>
10244
+ </xsl:variable>
10655
10245
 
10656
- <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
10246
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
10657
10247
 
10658
- <xsl:for-each select="$contents_nodes//tables/table">
10659
- <fo:bookmark internal-destination="{@id}">
10660
- <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
10661
- <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
10662
- </fo:bookmark>
10663
- </xsl:for-each>
10248
+ <xsl:for-each select="$contents_nodes//mn:tables/mn:table">
10249
+ <fo:bookmark internal-destination="{@id}">
10250
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
10251
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
10664
10252
  </fo:bookmark>
10665
- </xsl:if>
10666
-
10253
+ </xsl:for-each>
10254
+ </fo:bookmark>
10255
+ </xsl:if>
10667
10256
  </xsl:template> <!-- insertTableBookmarks -->
10668
10257
  <!-- End Bookmarks -->
10669
10258
 
@@ -10692,20 +10281,16 @@
10692
10281
  <xsl:param name="doctype" select="''"/>
10693
10282
  <xsl:param name="title" select="''"/>
10694
10283
  <xsl:choose>
10695
- <xsl:when test="$lang = 'en'">
10696
- English
10697
-
10284
+ <xsl:when test="$lang = 'en'">English
10698
10285
  </xsl:when>
10699
- <xsl:when test="$lang = 'fr'">
10700
- Français
10701
-
10286
+ <xsl:when test="$lang = 'fr'">Français
10702
10287
  </xsl:when>
10703
10288
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
10704
10289
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
10705
10290
  </xsl:choose>
10706
10291
  </xsl:template>
10707
10292
 
10708
- <xsl:template match="item" mode="bookmark">
10293
+ <xsl:template match="mn:item" mode="bookmark">
10709
10294
  <xsl:choose>
10710
10295
  <xsl:when test="@id != ''">
10711
10296
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -10715,7 +10300,7 @@
10715
10300
  <xsl:text> </xsl:text>
10716
10301
  </xsl:if>
10717
10302
  <xsl:variable name="title">
10718
- <xsl:for-each select="title/node()">
10303
+ <xsl:for-each select="mn:title/node()">
10719
10304
  <xsl:choose>
10720
10305
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
10721
10306
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -10733,7 +10318,7 @@
10733
10318
  </xsl:choose>
10734
10319
  </xsl:template>
10735
10320
 
10736
- <xsl:template match="title" mode="bookmark"/>
10321
+ <xsl:template match="mn:title" mode="bookmark"/>
10737
10322
  <xsl:template match="text()" mode="bookmark"/>
10738
10323
 
10739
10324
  <!-- figure/name -->
@@ -10962,9 +10547,9 @@
10962
10547
  <xsl:template match="text()" mode="contents_item">
10963
10548
  <xsl:variable name="text">
10964
10549
  <!-- to split by '_' and other chars -->
10965
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
10550
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
10966
10551
  </xsl:variable>
10967
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
10552
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
10968
10553
  <xsl:call-template name="keep_together_standard_number"/>
10969
10554
  </xsl:for-each>
10970
10555
  </xsl:template>
@@ -10997,16 +10582,7 @@
10997
10582
 
10998
10583
  <xsl:template name="get_sourcecode_attributes">
10999
10584
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
11000
- <xsl:variable name="_font-size">
11001
-
11002
- 9
11003
-
11004
- <!-- inherit -->
11005
-
11006
- <!-- <xsl:if test="$namespace = 'ieee'">
11007
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
11008
- </xsl:if> -->
11009
-
10585
+ <xsl:variable name="_font-size">9<!-- inherit -->
11010
10586
  </xsl:variable>
11011
10587
 
11012
10588
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -11062,7 +10638,6 @@
11062
10638
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
11063
10639
  </xsl:choose>
11064
10640
  </xsl:attribute>
11065
-
11066
10641
  </xsl:if>
11067
10642
  <fo:block-container margin-left="0mm" role="SKIP">
11068
10643
 
@@ -11086,8 +10661,7 @@
11086
10661
  </fo:block>
11087
10662
 
11088
10663
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
11089
-
11090
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
10664
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
11091
10665
 
11092
10666
  </fo:block-container>
11093
10667
  </fo:block-container>
@@ -11264,25 +10838,6 @@
11264
10838
  </xsl:choose>
11265
10839
  </xsl:template>
11266
10840
 
11267
- <!-- insert 'char' between each character in the string -->
11268
- <xsl:template name="interspers">
11269
- <xsl:param name="str"/>
11270
- <xsl:param name="char" select="$zero_width_space"/>
11271
- <xsl:if test="$str != ''">
11272
- <xsl:value-of select="substring($str, 1, 1)"/>
11273
-
11274
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
11275
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
11276
- <xsl:value-of select="$char"/>
11277
- </xsl:if>
11278
-
11279
- <xsl:call-template name="interspers">
11280
- <xsl:with-param name="str" select="substring($str, 2)"/>
11281
- <xsl:with-param name="char" select="$char"/>
11282
- </xsl:call-template>
11283
- </xsl:if>
11284
- </xsl:template>
11285
-
11286
10841
  <xsl:template name="interspers-java">
11287
10842
  <xsl:param name="str"/>
11288
10843
  <xsl:param name="char" select="$zero_width_space"/>
@@ -11379,7 +10934,7 @@
11379
10934
  </xsl:variable>
11380
10935
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
11381
10936
 
11382
- <xsl:for-each select="$classes/item">
10937
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
11383
10938
  <xsl:variable name="class_name" select="."/>
11384
10939
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
11385
10940
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -11462,12 +11017,9 @@
11462
11017
 
11463
11018
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
11464
11019
  <xsl:if test="normalize-space() != ''">
11465
-
11466
- <fo:block xsl:use-attribute-sets="permission-name-style">
11467
- <xsl:apply-templates/>
11468
-
11469
- </fo:block>
11470
-
11020
+ <fo:block xsl:use-attribute-sets="permission-name-style">
11021
+ <xsl:apply-templates/>
11022
+ </fo:block>
11471
11023
  </xsl:if>
11472
11024
  </xsl:template>
11473
11025
 
@@ -11493,15 +11045,12 @@
11493
11045
  </fo:block>
11494
11046
  </xsl:template>
11495
11047
 
11496
- <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
11497
- <xsl:if test="normalize-space() != ''">
11498
-
11499
- <fo:block xsl:use-attribute-sets="requirement-name-style">
11500
-
11501
- <xsl:apply-templates/>
11502
-
11503
- </fo:block>
11048
+ <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
11049
+ <xsl:if test="normalize-space() != ''">
11504
11050
 
11051
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
11052
+ <xsl:apply-templates/>
11053
+ </fo:block>
11505
11054
  </xsl:if>
11506
11055
  </xsl:template>
11507
11056
 
@@ -11540,11 +11089,9 @@
11540
11089
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
11541
11090
  <xsl:if test="normalize-space() != ''">
11542
11091
 
11543
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
11544
- <xsl:apply-templates/>
11545
-
11546
- </fo:block>
11547
-
11092
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
11093
+ <xsl:apply-templates/>
11094
+ </fo:block>
11548
11095
  </xsl:if>
11549
11096
  </xsl:template>
11550
11097
 
@@ -11670,7 +11217,6 @@
11670
11217
 
11671
11218
  <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 ')">
11672
11219
  <xsl:attribute name="font-weight">bold</xsl:attribute>
11673
-
11674
11220
  </xsl:if>
11675
11221
 
11676
11222
  <xsl:apply-templates mode="requirement"/>
@@ -11715,7 +11261,6 @@
11715
11261
 
11716
11262
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
11717
11263
  <fo:block font-size="11pt">
11718
-
11719
11264
  <xsl:apply-templates/>
11720
11265
  </fo:block>
11721
11266
  </xsl:template>
@@ -11755,7 +11300,6 @@
11755
11300
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
11756
11301
  <xsl:variable name="element">inline
11757
11302
 
11758
-
11759
11303
  </xsl:variable>
11760
11304
  <xsl:choose>
11761
11305
  <xsl:when test="contains($element, 'block')">
@@ -11787,116 +11331,111 @@
11787
11331
  text line 2
11788
11332
  -->
11789
11333
  <xsl:template match="*[local-name() = 'example']" name="example">
11334
+ <xsl:call-template name="setNamedDestination"/>
11335
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
11790
11336
 
11791
- <xsl:call-template name="setNamedDestination"/>
11792
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
11793
-
11794
- <xsl:call-template name="setBlockSpanAll"/>
11337
+ <xsl:call-template name="setBlockSpanAll"/>
11795
11338
 
11796
- <xsl:call-template name="refine_example-style"/>
11339
+ <xsl:call-template name="refine_example-style"/>
11797
11340
 
11798
- <xsl:variable name="fo_element">
11799
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
11341
+ <xsl:variable name="fo_element">
11342
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
11343
+ <xsl:choose>
11344
+ <!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
11345
+ <xsl:when test="count(*[not(local-name() = 'name')]) = 1">inline</xsl:when>
11346
+ <xsl:otherwise>block</xsl:otherwise>
11347
+ </xsl:choose>
11800
11348
 
11801
- <xsl:choose>
11802
- <!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
11803
- <xsl:when test="count(*[not(local-name() = 'name')]) = 1">inline</xsl:when>
11804
- <xsl:otherwise>block</xsl:otherwise>
11805
- </xsl:choose>
11349
+ </xsl:variable>
11806
11350
 
11807
- </xsl:variable>
11351
+ <fo:block-container margin-left="0mm" role="SKIP">
11808
11352
 
11809
- <fo:block-container margin-left="0mm" role="SKIP">
11353
+ <xsl:choose>
11810
11354
 
11811
- <xsl:choose>
11355
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
11812
11356
 
11813
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
11357
+ <!-- display name 'EXAMPLE' in a separate block -->
11358
+ <fo:block>
11359
+ <xsl:apply-templates select="*[local-name()='name']">
11360
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11361
+ </xsl:apply-templates>
11362
+ </fo:block>
11814
11363
 
11815
- <!-- display name 'EXAMPLE' in a separate block -->
11816
- <fo:block>
11817
- <xsl:apply-templates select="*[local-name()='name']">
11364
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11365
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11366
+ <xsl:variable name="example_body">
11367
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11818
11368
  <xsl:with-param name="fo_element" select="$fo_element"/>
11819
11369
  </xsl:apply-templates>
11820
- </fo:block>
11821
-
11822
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11823
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11824
- <xsl:variable name="example_body">
11825
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11826
- <xsl:with-param name="fo_element" select="$fo_element"/>
11827
- </xsl:apply-templates>
11828
- </xsl:variable>
11829
- <xsl:choose>
11830
- <xsl:when test="xalan:nodeset($example_body)/*">
11831
- <xsl:copy-of select="$example_body"/>
11832
- </xsl:when>
11833
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11834
- </xsl:choose>
11835
- </fo:block-container>
11836
- </fo:block-container>
11837
- </xsl:when> <!-- end block -->
11838
-
11839
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
11840
-
11841
- <xsl:variable name="provisional_distance_between_starts_">
11842
- 7
11843
11370
  </xsl:variable>
11844
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11845
- <xsl:variable name="indent_">
11846
- 0
11847
- </xsl:variable>
11848
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
11371
+ <xsl:choose>
11372
+ <xsl:when test="xalan:nodeset($example_body)/*">
11373
+ <xsl:copy-of select="$example_body"/>
11374
+ </xsl:when>
11375
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11376
+ </xsl:choose>
11377
+ </fo:block-container>
11378
+ </fo:block-container>
11379
+ </xsl:when> <!-- end block -->
11849
11380
 
11850
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11851
- <fo:list-item>
11852
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11853
- <fo:block>
11854
- <xsl:apply-templates select="*[local-name()='name']">
11855
- <xsl:with-param name="fo_element">block</xsl:with-param>
11856
- </xsl:apply-templates>
11857
- </fo:block>
11858
- </fo:list-item-label>
11859
- <fo:list-item-body start-indent="body-start()">
11860
- <fo:block>
11861
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11862
- <xsl:with-param name="fo_element" select="$fo_element"/>
11863
- </xsl:apply-templates>
11864
- </fo:block>
11865
- </fo:list-item-body>
11866
- </fo:list-item>
11867
- </fo:list-block>
11868
- </xsl:when> <!-- end list -->
11381
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
11869
11382
 
11870
- <xsl:otherwise> <!-- inline -->
11383
+ <xsl:variable name="provisional_distance_between_starts_">7
11384
+ </xsl:variable>
11385
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11386
+ <xsl:variable name="indent_">0
11387
+ </xsl:variable>
11388
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
11871
11389
 
11872
- <!-- display 'EXAMPLE' and first element in the same line -->
11873
- <fo:block>
11874
- <xsl:apply-templates select="*[local-name()='name']">
11875
- <xsl:with-param name="fo_element" select="$fo_element"/>
11876
- </xsl:apply-templates>
11877
- <fo:inline>
11878
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11390
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11391
+ <fo:list-item>
11392
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11393
+ <fo:block>
11394
+ <xsl:apply-templates select="*[local-name()='name']">
11395
+ <xsl:with-param name="fo_element">block</xsl:with-param>
11396
+ </xsl:apply-templates>
11397
+ </fo:block>
11398
+ </fo:list-item-label>
11399
+ <fo:list-item-body start-indent="body-start()">
11400
+ <fo:block>
11401
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11879
11402
  <xsl:with-param name="fo_element" select="$fo_element"/>
11880
11403
  </xsl:apply-templates>
11881
- </fo:inline>
11882
- </fo:block>
11404
+ </fo:block>
11405
+ </fo:list-item-body>
11406
+ </fo:list-item>
11407
+ </fo:list-block>
11408
+ </xsl:when> <!-- end list -->
11883
11409
 
11884
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11885
- <!-- display further elements in blocks -->
11886
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11887
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11888
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11889
- <xsl:with-param name="fo_element" select="'block'"/>
11890
- </xsl:apply-templates>
11891
- </fo:block-container>
11892
- </fo:block-container>
11893
- </xsl:if>
11894
- </xsl:otherwise> <!-- end inline -->
11410
+ <xsl:otherwise> <!-- inline -->
11895
11411
 
11896
- </xsl:choose>
11897
- </fo:block-container>
11898
- </fo:block-container>
11412
+ <!-- display 'EXAMPLE' and first element in the same line -->
11413
+ <fo:block>
11414
+ <xsl:apply-templates select="*[local-name()='name']">
11415
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11416
+ </xsl:apply-templates>
11417
+ <fo:inline>
11418
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11419
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11420
+ </xsl:apply-templates>
11421
+ </fo:inline>
11422
+ </fo:block>
11423
+
11424
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11425
+ <!-- display further elements in blocks -->
11426
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11427
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11428
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11429
+ <xsl:with-param name="fo_element" select="'block'"/>
11430
+ </xsl:apply-templates>
11431
+ </fo:block-container>
11432
+ </fo:block-container>
11433
+ </xsl:if>
11434
+ </xsl:otherwise> <!-- end inline -->
11899
11435
 
11436
+ </xsl:choose>
11437
+ </fo:block-container>
11438
+ </fo:block-container>
11900
11439
  </xsl:template>
11901
11440
 
11902
11441
  <!-- example/name -->
@@ -11911,7 +11450,6 @@
11911
11450
  </xsl:when>
11912
11451
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
11913
11452
  <fo:block xsl:use-attribute-sets="example-name-style">
11914
-
11915
11453
  <xsl:apply-templates/>
11916
11454
  </fo:block>
11917
11455
  </xsl:when>
@@ -11928,7 +11466,6 @@
11928
11466
  <!-- table/example/name, table/tfoot//example/name -->
11929
11467
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
11930
11468
  <fo:inline xsl:use-attribute-sets="example-name-style">
11931
-
11932
11469
  <xsl:apply-templates/>
11933
11470
  </fo:inline>
11934
11471
  </xsl:template>
@@ -11938,7 +11475,6 @@
11938
11475
 
11939
11476
  <xsl:variable name="num"><xsl:number/></xsl:variable>
11940
11477
  <xsl:variable name="element">
11941
-
11942
11478
  <xsl:value-of select="$fo_element"/>
11943
11479
  </xsl:variable>
11944
11480
  <xsl:choose>
@@ -12056,7 +11592,7 @@
12056
11592
  </xsl:call-template>
12057
11593
  </xsl:variable>
12058
11594
 
12059
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
11595
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
12060
11596
  <xsl:choose>
12061
11597
  <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>
12062
11598
  <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>
@@ -12093,7 +11629,6 @@
12093
11629
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
12094
11630
  </xsl:if>
12095
11631
  </xsl:if>
12096
-
12097
11632
  <fo:block-container margin-left="0mm" role="SKIP">
12098
11633
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
12099
11634
 
@@ -12176,7 +11711,6 @@
12176
11711
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
12177
11712
  <xsl:attribute name="vertical-align">super</xsl:attribute>
12178
11713
  <xsl:attribute name="font-size">80%</xsl:attribute>
12179
-
12180
11714
  </xsl:if>
12181
11715
 
12182
11716
  <xsl:call-template name="refine_eref-style"/>
@@ -12225,7 +11759,6 @@
12225
11759
  </xsl:template>
12226
11760
 
12227
11761
  <xsl:template name="refine_basic_link_style">
12228
-
12229
11762
  </xsl:template> <!-- refine_basic_link_style -->
12230
11763
 
12231
11764
  <!-- ====== -->
@@ -12242,14 +11775,12 @@
12242
11775
  </xsl:variable>
12243
11776
 
12244
11777
  <xsl:variable name="padding">
12245
-
12246
- <xsl:choose>
12247
- <xsl:when test="parent::iec:appendix">5</xsl:when>
12248
- <xsl:when test="$depth = 2 and ancestor::iec:annex">6</xsl:when>
12249
- <xsl:when test="$depth = 2">7</xsl:when>
12250
- <xsl:otherwise>5</xsl:otherwise>
12251
- </xsl:choose>
12252
-
11778
+ <xsl:choose>
11779
+ <xsl:when test="parent::iec:appendix">5</xsl:when>
11780
+ <xsl:when test="$depth = 2 and ancestor::iec:annex">6</xsl:when>
11781
+ <xsl:when test="$depth = 2">7</xsl:when>
11782
+ <xsl:otherwise>5</xsl:otherwise>
11783
+ </xsl:choose>
12253
11784
  </xsl:variable>
12254
11785
 
12255
11786
  <xsl:variable name="padding-right">
@@ -12260,7 +11791,6 @@
12260
11791
  </xsl:otherwise>
12261
11792
  </xsl:choose>
12262
11793
  </xsl:variable>
12263
-
12264
11794
  <xsl:choose>
12265
11795
  <xsl:when test="$lang = 'zh'">
12266
11796
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -12284,9 +11814,7 @@
12284
11814
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
12285
11815
 
12286
11816
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
12287
-
12288
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
12289
-
11817
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
12290
11818
  </xsl:template>
12291
11819
 
12292
11820
  <xsl:template name="insertNonBreakSpaces">
@@ -12304,17 +11832,15 @@
12304
11832
  <xsl:variable name="level">
12305
11833
  <xsl:call-template name="getLevel"/>
12306
11834
  </xsl:variable>
12307
- <xsl:variable name="font-size">
12308
- inherit
11835
+ <xsl:variable name="font-size">inherit
12309
11836
  </xsl:variable>
12310
11837
  <xsl:variable name="levelTerm">
12311
11838
  <xsl:call-template name="getLevelTermName"/>
12312
11839
  </xsl:variable>
12313
11840
  <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
12314
-
12315
- <xsl:if test="preceding-sibling::*[1][self::iec:preferred]">
12316
- <xsl:attribute name="space-before">1pt</xsl:attribute>
12317
- </xsl:if>
11841
+ <xsl:if test="preceding-sibling::*[1][self::iec:preferred]">
11842
+ <xsl:attribute name="space-before">1pt</xsl:attribute>
11843
+ </xsl:if>
12318
11844
 
12319
11845
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
12320
11846
 
@@ -12361,11 +11887,9 @@
12361
11887
  </xsl:template>
12362
11888
 
12363
11889
  <xsl:template name="setStyle_preferred">
12364
-
12365
- <xsl:if test="*[local-name() = 'strong']">
12366
- <xsl:attribute name="font-weight">normal</xsl:attribute>
12367
- </xsl:if>
12368
-
11890
+ <xsl:if test="*[local-name() = 'strong']">
11891
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11892
+ </xsl:if>
12369
11893
  </xsl:template>
12370
11894
 
12371
11895
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -12442,7 +11966,6 @@
12442
11966
 
12443
11967
  <!-- main sections -->
12444
11968
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
12445
-
12446
11969
  <xsl:call-template name="setNamedDestination"/>
12447
11970
  <fo:block>
12448
11971
  <xsl:call-template name="setId"/>
@@ -12477,13 +12000,10 @@
12477
12000
  </xsl:template>
12478
12001
 
12479
12002
  <xsl:template name="sections_element_style">
12480
-
12481
12003
  </xsl:template> <!-- sections_element_style -->
12482
12004
 
12483
12005
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
12484
-
12485
- <fo:block break-after="page"/>
12486
-
12006
+ <fo:block break-after="page"/>
12487
12007
  <xsl:call-template name="setNamedDestination"/>
12488
12008
  <fo:block>
12489
12009
  <xsl:call-template name="setId"/>
@@ -12532,7 +12052,6 @@
12532
12052
  </xsl:template>
12533
12053
 
12534
12054
  <xsl:template name="refine_clause_style">
12535
-
12536
12055
  </xsl:template> <!-- refine_clause_style -->
12537
12056
 
12538
12057
  <xsl:template match="*[local-name() = 'definitions']">
@@ -12572,7 +12091,6 @@
12572
12091
  </xsl:template>
12573
12092
 
12574
12093
  <xsl:template name="refine_annex_style">
12575
-
12576
12094
  </xsl:template>
12577
12095
 
12578
12096
  <!-- document text (not figures, or tables) footnotes -->
@@ -12676,17 +12194,15 @@
12676
12194
  <!-- Lists processing -->
12677
12195
  <!-- ===================================== -->
12678
12196
  <xsl:variable name="ul_labels_">
12679
-
12680
- <label level="1" font-size="10pt">•</label>
12681
- <label level="2" font-size="10pt">—</label><!-- em dash -->
12682
- <label level="3" font-size="75%">o</label> <!-- white circle -->
12197
+ <label level="1" font-size="10pt">•</label>
12198
+ <label level="2" font-size="10pt">—</label><!-- em dash -->
12199
+ <label level="3" font-size="75%">o</label> <!-- white circle -->
12683
12200
 
12684
12201
  </xsl:variable>
12685
12202
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
12686
12203
 
12687
12204
  <xsl:template name="setULLabel">
12688
- <xsl:variable name="list_level__">
12689
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
12205
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
12690
12206
  </xsl:variable>
12691
12207
  <xsl:variable name="list_level_" select="number($list_level__)"/>
12692
12208
  <xsl:variable name="list_level">
@@ -12743,28 +12259,22 @@
12743
12259
  <xsl:variable name="label">
12744
12260
 
12745
12261
  <xsl:variable name="style_prefix_">
12746
- <xsl:if test="$type = 'roman'">
12747
- <!-- Example: (i) -->
12262
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
12748
12263
  </xsl:if>
12749
12264
  <xsl:if test="$type = 'alphabet'">
12750
-
12751
12265
  </xsl:if>
12752
12266
  </xsl:variable>
12753
12267
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
12754
12268
 
12755
12269
  <xsl:variable name="style_suffix_">
12756
12270
  <xsl:choose>
12757
- <xsl:when test="$type = 'arabic'">
12758
- )
12271
+ <xsl:when test="$type = 'arabic'">)
12759
12272
  </xsl:when>
12760
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12761
- )
12273
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
12762
12274
  </xsl:when>
12763
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12764
- .
12275
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
12765
12276
  </xsl:when>
12766
- <xsl:when test="$type = 'roman'">
12767
- )
12277
+ <xsl:when test="$type = 'roman'">)
12768
12278
  </xsl:when>
12769
12279
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
12770
12280
  </xsl:choose>
@@ -12781,8 +12291,7 @@
12781
12291
  <xsl:value-of select="$style_suffix"/>
12782
12292
  </xsl:if>
12783
12293
  </xsl:variable>
12784
-
12785
- <xsl:value-of select="normalize-space($label)"/>
12294
+ <xsl:value-of select="normalize-space($label)"/>
12786
12295
 
12787
12296
  </xsl:when>
12788
12297
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -12839,17 +12348,13 @@
12839
12348
 
12840
12349
  <xsl:variable name="format">
12841
12350
  <xsl:choose>
12842
- <xsl:when test="$type = 'arabic'">
12843
- 1)
12351
+ <xsl:when test="$type = 'arabic'">1)
12844
12352
  </xsl:when>
12845
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12846
- a)
12353
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
12847
12354
  </xsl:when>
12848
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12849
- A.
12355
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
12850
12356
  </xsl:when>
12851
- <xsl:when test="$type = 'roman'">
12852
- i)
12357
+ <xsl:when test="$type = 'roman'">i)
12853
12358
  </xsl:when>
12854
12359
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
12855
12360
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -12886,19 +12391,16 @@
12886
12391
  </fo:block-container>
12887
12392
  </xsl:when>
12888
12393
  <xsl:otherwise>
12889
-
12890
- <fo:block role="SKIP">
12891
- <xsl:apply-templates select="." mode="list">
12892
- <xsl:with-param name="indent" select="$indent"/>
12893
- </xsl:apply-templates>
12894
- </fo:block>
12895
-
12394
+ <fo:block role="SKIP">
12395
+ <xsl:apply-templates select="." mode="list">
12396
+ <xsl:with-param name="indent" select="$indent"/>
12397
+ </xsl:apply-templates>
12398
+ </fo:block>
12896
12399
  </xsl:otherwise>
12897
12400
  </xsl:choose>
12898
12401
  </xsl:template>
12899
12402
 
12900
12403
  <xsl:template name="refine_list_container_style">
12901
-
12902
12404
  </xsl:template> <!-- refine_list_container_style -->
12903
12405
 
12904
12406
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -12962,11 +12464,9 @@
12962
12464
  </xsl:template>
12963
12465
 
12964
12466
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
12965
-
12966
- <xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
12967
- <xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
12968
- </xsl:if>
12969
-
12467
+ <xsl:if test="ancestor::iec:legal-statement or ancestor::iec:clause[@type = 'boilerplate_legal']">
12468
+ <xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
12469
+ </xsl:if>
12970
12470
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
12971
12471
 
12972
12472
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -13251,7 +12751,6 @@
13251
12751
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
13252
12752
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
13253
12753
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
13254
-
13255
12754
  <xsl:apply-templates/>
13256
12755
  </fo:block>
13257
12756
  </xsl:template>
@@ -13303,7 +12802,6 @@
13303
12802
  <fo:table-column column-width="15mm"/>
13304
12803
  <fo:table-body>
13305
12804
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
13306
-
13307
12805
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
13308
12806
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
13309
12807
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -13339,7 +12837,6 @@
13339
12837
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
13340
12838
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
13341
12839
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
13342
-
13343
12840
  </xsl:template>
13344
12841
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
13345
12842
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -13350,16 +12847,13 @@
13350
12847
  <xsl:call-template name="setNamedDestination"/>
13351
12848
  <fo:block id="{@id}">
13352
12849
  <xsl:apply-templates/>
13353
-
13354
12850
  </fo:block>
13355
12851
  </xsl:template>
13356
12852
 
13357
12853
  <!-- Bibliography (non-normative references) -->
13358
12854
  <xsl:template match="*[local-name() = 'references']">
13359
12855
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
13360
-
13361
- <fo:block break-after="page"/>
13362
-
12856
+ <fo:block break-after="page"/>
13363
12857
  </xsl:if>
13364
12858
 
13365
12859
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -13375,14 +12869,11 @@
13375
12869
 
13376
12870
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
13377
12871
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
13378
-
13379
12872
  </fo:block>
13380
-
13381
- <!-- horizontal line -->
13382
- <fo:block-container text-align="center" margin-top="10mm">
13383
- <fo:block>_____________</fo:block>
13384
- </fo:block-container>
13385
-
12873
+ <!-- horizontal line -->
12874
+ <fo:block-container text-align="center" margin-top="10mm">
12875
+ <fo:block>_____________</fo:block>
12876
+ </fo:block-container>
13386
12877
  </xsl:template> <!-- references -->
13387
12878
 
13388
12879
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -13392,44 +12883,39 @@
13392
12883
  <!-- Normative references -->
13393
12884
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
13394
12885
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13395
-
13396
- <xsl:call-template name="setNamedDestination"/>
13397
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
13398
-
13399
- <xsl:call-template name="processBibitem"/>
13400
- </fo:block>
12886
+ <xsl:call-template name="setNamedDestination"/>
12887
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
12888
+ <xsl:call-template name="processBibitem"/>
12889
+ </fo:block>
13401
12890
 
13402
12891
  </xsl:template> <!-- bibitem -->
13403
12892
 
13404
12893
  <!-- Bibliography (non-normative references) -->
13405
12894
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
13406
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13407
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
12895
+ <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
13408
12896
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
13409
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
13410
- <xsl:call-template name="setNamedDestination"/>
13411
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
13412
-
13413
- <fo:list-item>
13414
- <fo:list-item-label end-indent="label-end()">
13415
- <fo:block role="SKIP">
13416
- <fo:inline role="SKIP">
13417
-
13418
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13419
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
13420
- </xsl:apply-templates>
13421
- </fo:inline>
13422
- </fo:block>
13423
- </fo:list-item-label>
13424
- <fo:list-item-body start-indent="body-start()">
13425
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
13426
- <xsl:call-template name="processBibitem">
13427
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
13428
- </xsl:call-template>
13429
- </fo:block>
13430
- </fo:list-item-body>
13431
- </fo:list-item>
13432
- </fo:list-block>
12897
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
12898
+ <xsl:call-template name="setNamedDestination"/>
12899
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
12900
+ <fo:list-item>
12901
+ <fo:list-item-label end-indent="label-end()">
12902
+ <fo:block role="SKIP">
12903
+ <fo:inline role="SKIP">
12904
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12905
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
12906
+ </xsl:apply-templates>
12907
+ </fo:inline>
12908
+ </fo:block>
12909
+ </fo:list-item-label>
12910
+ <fo:list-item-body start-indent="body-start()">
12911
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
12912
+ <xsl:call-template name="processBibitem">
12913
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
12914
+ </xsl:call-template>
12915
+ </fo:block>
12916
+ </fo:list-item-body>
12917
+ </fo:list-item>
12918
+ </fo:list-block>
13433
12919
 
13434
12920
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
13435
12921
 
@@ -13439,7 +12925,6 @@
13439
12925
  <xsl:otherwise>
13440
12926
  <xsl:call-template name="setNamedDestination"/>
13441
12927
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
13442
-
13443
12928
  <fo:list-item-label end-indent="label-end()">
13444
12929
  <fo:block role="SKIP">
13445
12930
  <fo:inline role="SKIP">
@@ -13466,18 +12951,16 @@
13466
12951
 
13467
12952
  <xsl:template name="processBibitem">
13468
12953
  <xsl:param name="biblio_tag_part">both</xsl:param>
12954
+ <!-- start bibitem processing -->
12955
+ <xsl:if test=".//*[local-name() = 'fn']">
12956
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
12957
+ </xsl:if>
13469
12958
 
13470
- <!-- start bibitem processing -->
13471
- <xsl:if test=".//*[local-name() = 'fn']">
13472
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
13473
- </xsl:if>
13474
-
13475
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13476
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
13477
- </xsl:apply-templates>
13478
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
13479
- <!-- end bibitem processing -->
13480
-
12959
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12960
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
12961
+ </xsl:apply-templates>
12962
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
12963
+ <!-- end bibitem processing -->
13481
12964
  </xsl:template> <!-- processBibitem (bibitem) -->
13482
12965
 
13483
12966
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -13620,8 +13103,7 @@
13620
13103
  <xsl:choose>
13621
13104
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
13622
13105
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
13623
- <xsl:otherwise><!-- default value -->
13624
- 3
13106
+ <xsl:otherwise><!-- default value -->3
13625
13107
  </xsl:otherwise>
13626
13108
  </xsl:choose>
13627
13109
  </xsl:variable>
@@ -13829,29 +13311,23 @@
13829
13311
  <!-- ================ -->
13830
13312
  <!-- Admonition -->
13831
13313
  <!-- ================ -->
13832
- <xsl:template match="*[local-name() = 'admonition']">
13833
-
13834
- <!-- text in the box -->
13835
- <xsl:call-template name="setNamedDestination"/>
13836
- <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
13837
-
13838
- <xsl:call-template name="setBlockSpanAll"/>
13839
-
13840
- <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
13314
+ <xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
13315
+ <xsl:call-template name="setNamedDestination"/>
13316
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
13841
13317
 
13842
- <fo:block text-align="justify">
13843
- <fo:inline>
13844
- <xsl:call-template name="displayAdmonitionName"/>
13845
- <!-- <xsl:with-param name="sep"> – </xsl:with-param>
13318
+ <xsl:call-template name="setBlockSpanAll"/>
13319
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
13320
+ <fo:block text-align="justify">
13321
+ <fo:inline>
13322
+ <xsl:call-template name="displayAdmonitionName"/>
13323
+ <!-- <xsl:with-param name="sep"> – </xsl:with-param>
13846
13324
  </xsl:call-template> -->
13847
- </fo:inline>
13848
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
13849
- </fo:block>
13850
-
13851
- </fo:block-container>
13852
-
13853
- </fo:block-container>
13325
+ </fo:inline>
13326
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
13327
+ </fo:block>
13854
13328
 
13329
+ </fo:block-container>
13330
+ </fo:block-container>
13855
13331
  </xsl:template>
13856
13332
 
13857
13333
  <xsl:template name="displayAdmonitionName">
@@ -13898,9 +13374,8 @@
13898
13374
  </xsl:if>
13899
13375
  </xsl:template> -->
13900
13376
 
13901
- <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
13902
- <!-- processing for admonition/p found in the template for 'p' -->
13903
- <xsl:call-template name="paragraph"/>
13377
+ <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']"> <!-- processing for admonition/p found in the template for 'p' -->
13378
+ <xsl:call-template name="paragraph"/>
13904
13379
 
13905
13380
  </xsl:template>
13906
13381
 
@@ -13937,11 +13412,9 @@
13937
13412
 
13938
13413
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
13939
13414
  <xsl:variable name="updated_xml_step2">
13940
-
13941
- <xsl:if test="$table_if = 'false'">
13942
- <xsl:copy-of select="$updated_xml_step1"/>
13943
- </xsl:if>
13944
-
13415
+ <xsl:if test="$table_if = 'false'">
13416
+ <xsl:copy-of select="$updated_xml_step1"/>
13417
+ </xsl:if>
13945
13418
  </xsl:variable>
13946
13419
 
13947
13420
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -14416,7 +13889,6 @@
14416
13889
  </xsl:template>
14417
13890
 
14418
13891
  <xsl:template name="addNamedDestinationAttribute">
14419
-
14420
13892
  </xsl:template>
14421
13893
 
14422
13894
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -14911,7 +14383,6 @@
14911
14383
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
14912
14384
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
14913
14385
  <!-- if EXPRESS reference -->
14914
-
14915
14386
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
14916
14387
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
14917
14388
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -14965,8 +14436,7 @@
14965
14436
 
14966
14437
  <xsl:variable name="text2">
14967
14438
  <xsl:element name="text" namespace="{$namespace_full}">
14968
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
14969
- <xsl:copy-of select="."/>
14439
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
14970
14440
  </xsl:for-each>
14971
14441
  </xsl:element>
14972
14442
  </xsl:variable>
@@ -15258,9 +14728,7 @@
15258
14728
  </xsl:attribute>
15259
14729
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
15260
14730
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
15261
-
15262
- <xsl:value-of select="$skip_footnote_body_"/>
15263
-
14731
+ <xsl:value-of select="$skip_footnote_body_"/>
15264
14732
  </xsl:attribute>
15265
14733
  <xsl:attribute name="ref_id">
15266
14734
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -15349,7 +14817,6 @@
15349
14817
 
15350
14818
  <xsl:template name="printEdition">
15351
14819
  <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
15352
-
15353
14820
  <xsl:choose>
15354
14821
  <xsl:when test="$edition_i18n != ''">
15355
14822
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -15578,16 +15045,32 @@
15578
15045
  <dc:title>
15579
15046
  <xsl:variable name="title">
15580
15047
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15581
-
15582
- <xsl:choose>
15583
- <xsl:when test="*[local-name() = 'title'][@language = $lang and @type = 'main']">
15584
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
15585
- </xsl:when>
15586
- <xsl:otherwise>
15587
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
15588
- </xsl:otherwise>
15589
- </xsl:choose>
15590
-
15048
+ <xsl:choose>
15049
+ <xsl:when test="*[local-name() = 'title'][@language = $lang and @type = 'main']">
15050
+ <!-- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/> -->
15051
+ <xsl:variable name="bibdata_doctype" select="*[local-name() = 'ext']/*[local-name() = 'doctype']"/>
15052
+ <xsl:if test="$bibdata_doctype = 'amendment'">
15053
+ <xsl:variable name="bibdata_doctype_localized" select="*[local-name() = 'ext']/*[local-name() = 'doctype'][@language = $lang]"/>
15054
+ <xsl:variable name="bibdata_amendment_number" select="*[local-name() = 'ext']/*[local-name() = 'structuredidentifier']/*[local-name() = 'project-number']/@amendment"/>
15055
+ <xsl:value-of select="normalize-space(concat($bibdata_doctype_localized, ' ', $bibdata_amendment_number))"/>
15056
+ <xsl:text> — </xsl:text>
15057
+ </xsl:if>
15058
+ <xsl:variable name="partnumber" select="*[local-name() = 'ext']/*[local-name() = 'structuredidentifier']/*[local-name() = 'project-number']/@part"/>
15059
+ <xsl:for-each select="*[local-name() = 'title'][@language = $lang and @type = 'title-intro'] | *[local-name() = 'title'][@language = $lang and @type = 'title-main'] | *[local-name() = 'title'][@language = $lang and @type = 'title-complementary'] | *[local-name() = 'title'][@language = $lang and @type = 'title-part']">
15060
+ <xsl:if test="@type = 'title-part'">
15061
+ <xsl:call-template name="getLocalizedString"><xsl:with-param name="key">locality.part</xsl:with-param></xsl:call-template>
15062
+ <xsl:text> </xsl:text>
15063
+ <xsl:value-of select="$partnumber"/>
15064
+ <xsl:text>: </xsl:text>
15065
+ </xsl:if>
15066
+ <xsl:value-of select="."/>
15067
+ <xsl:if test="position() != last()"><xsl:text> — </xsl:text></xsl:if>
15068
+ </xsl:for-each>
15069
+ </xsl:when>
15070
+ <xsl:otherwise>
15071
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
15072
+ </xsl:otherwise>
15073
+ </xsl:choose>
15591
15074
  </xsl:for-each>
15592
15075
  </xsl:variable>
15593
15076
  <rdf:Alt>
@@ -15605,16 +15088,14 @@
15605
15088
  </dc:title>
15606
15089
  <xsl:variable name="dc_creator">
15607
15090
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15608
-
15609
- <rdf:Seq>
15610
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
15611
- <rdf:li>
15612
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
15613
- </rdf:li>
15614
- <!-- <xsl:if test="position() != last()">; </xsl:if> -->
15615
- </xsl:for-each>
15616
- </rdf:Seq>
15617
-
15091
+ <rdf:Seq>
15092
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
15093
+ <rdf:li>
15094
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
15095
+ </rdf:li>
15096
+ <!-- <xsl:if test="position() != last()">; </xsl:if> -->
15097
+ </xsl:for-each>
15098
+ </rdf:Seq>
15618
15099
  </xsl:for-each>
15619
15100
  </xsl:variable>
15620
15101
  <xsl:if test="normalize-space($dc_creator) != ''">
@@ -15625,9 +15106,7 @@
15625
15106
 
15626
15107
  <xsl:variable name="dc_description">
15627
15108
  <xsl:variable name="abstract">
15628
-
15629
- <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'])]"/>
15630
-
15109
+ <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'])]"/>
15631
15110
  </xsl:variable>
15632
15111
  <rdf:Alt>
15633
15112
  <rdf:li xml:lang="x-default">
@@ -15692,7 +15171,9 @@
15692
15171
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
15693
15172
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
15694
15173
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
15695
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
15174
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
15175
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
15176
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
15696
15177
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
15697
15178
  <!-- Todo: need update -->
15698
15179
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -15857,7 +15338,7 @@
15857
15338
  <xsl:param name="normalize-space" select="'true'"/>
15858
15339
  <xsl:param name="keep_sep" select="'false'"/>
15859
15340
  <xsl:if test="string-length($pText) &gt;0">
15860
- <item>
15341
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
15861
15342
  <xsl:choose>
15862
15343
  <xsl:when test="$normalize-space = 'true'">
15863
15344
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -15866,8 +15347,8 @@
15866
15347
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
15867
15348
  </xsl:otherwise>
15868
15349
  </xsl:choose>
15869
- </item>
15870
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
15350
+ </xsl:element>
15351
+ <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>
15871
15352
  <xsl:call-template name="split">
15872
15353
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
15873
15354
  <xsl:with-param name="sep" select="$sep"/>
@@ -15885,30 +15366,6 @@
15885
15366
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
15886
15367
  </xsl:template>
15887
15368
 
15888
- <xsl:template name="namespaceCheck">
15889
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
15890
- <xsl:variable name="XSLNS">
15891
-
15892
- <xsl:value-of select="document('')//*/namespace::iec"/>
15893
-
15894
- </xsl:variable>
15895
- <!-- <xsl:if test="$documentNS != $XSLNS">
15896
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
15897
- </xsl:if> -->
15898
- </xsl:template> <!-- namespaceCheck -->
15899
-
15900
- <xsl:template name="getLanguage">
15901
- <xsl:param name="lang"/>
15902
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
15903
- <xsl:choose>
15904
- <xsl:when test="$language = 'en'">English</xsl:when>
15905
- <xsl:when test="$language = 'fr'">French</xsl:when>
15906
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
15907
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
15908
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
15909
- </xsl:choose>
15910
- </xsl:template>
15911
-
15912
15369
  <xsl:template name="setId">
15913
15370
  <xsl:param name="prefix"/>
15914
15371
  <xsl:attribute name="id">