metanorma-iec 2.6.6 → 2.6.8

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