metanorma-bipm 2.6.8 → 2.6.9

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 (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/base_convert.rb +14 -12
  3. data/lib/isodoc/bipm/bipm.brochure.xsl +817 -1322
  4. data/lib/isodoc/bipm/bipm.guide.xsl +817 -1322
  5. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +817 -1322
  6. data/lib/isodoc/bipm/bipm.rapport.xsl +817 -1322
  7. data/lib/isodoc/bipm/html_convert.rb +8 -8
  8. data/lib/isodoc/bipm/jcgm.standard.xsl +753 -1290
  9. data/lib/isodoc/bipm/{doccontrol.rb → presentation_doccontrol.rb} +19 -19
  10. data/lib/isodoc/bipm/presentation_xml_convert.rb +21 -9
  11. data/lib/metanorma/bipm/version.rb +1 -1
  12. metadata +3 -3
data/lib/isodoc/bipm/jcgm.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:jcgm="https://www.metanorma.org/ns/standoc" xmlns:bipm="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:redirect="http://xml.apache.org/xalan/redirect" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java redirect" 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:jcgm="https://www.metanorma.org/ns/standoc" xmlns:bipm="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:redirect="http://xml.apache.org/xalan/redirect" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java redirect" extension-element-prefixes="redirect" version="1.0">
2
2
 
3
3
  <xsl:output method="xml" encoding="UTF-8" indent="no"/>
4
4
 
@@ -97,8 +97,8 @@
97
97
  <xsl:variable name="docid">
98
98
  <xsl:call-template name="getDocumentId"/>
99
99
  </xsl:variable>
100
- <doc id="{$docid}" lang="{$lang}">
101
- <contents>
100
+ <mn:doc id="{$docid}" lang="{$lang}">
101
+ <mn:contents>
102
102
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
103
103
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
104
104
  <!-- Index -->
@@ -106,8 +106,8 @@
106
106
  <xsl:apply-templates select="//jcgm:indexsect" mode="contents"/>
107
107
 
108
108
  <xsl:call-template name="processTablesFigures_Contents"/>
109
- </contents>
110
- </doc>
109
+ </mn:contents>
110
+ </mn:doc>
111
111
  </xsl:for-each>
112
112
  </xsl:for-each>
113
113
  </xsl:variable>
@@ -599,8 +599,8 @@
599
599
  <xsl:call-template name="getDocumentId"/>
600
600
  </xsl:variable>
601
601
 
602
- <xsl:for-each select="$contents/doc[@id=$docid]//item[@display = 'true']"> <!-- and not (@type = 'annex') and not (@type = 'references') -->
603
- <xsl:if test="@type = 'annex' and not(preceding-sibling::item[@display = 'true' and @type = 'annex'])">
602
+ <xsl:for-each select="$contents/mn:doc[@id=$docid]//mn:item[@display = 'true']"> <!-- and not (@type = 'annex') and not (@type = 'references') -->
603
+ <xsl:if test="@type = 'annex' and not(preceding-sibling::mn:item[@display = 'true' and @type = 'annex'])">
604
604
  <fo:block font-size="12pt" space-before="16pt" font-weight="bold" role="TOCI">
605
605
  <xsl:call-template name="getLocalizedString">
606
606
  <xsl:with-param name="key">Annex.pl</xsl:with-param>
@@ -611,21 +611,21 @@
611
611
  </xsl:for-each>
612
612
 
613
613
  <!-- List of Tables -->
614
- <xsl:if test="$contents//tables/table">
614
+ <xsl:if test="$contents//mn:tables/mn:table">
615
615
  <xsl:call-template name="insertListOf_Title">
616
616
  <xsl:with-param name="title" select="$title-list-tables"/>
617
617
  </xsl:call-template>
618
- <xsl:for-each select="$contents//tables/table">
618
+ <xsl:for-each select="$contents//mn:tables/mn:table">
619
619
  <xsl:call-template name="insertListOf_Item"/>
620
620
  </xsl:for-each>
621
621
  </xsl:if>
622
622
 
623
623
  <!-- List of Figures -->
624
- <xsl:if test="$contents//figures/figure">
624
+ <xsl:if test="$contents//mn:figures/mn:figure">
625
625
  <xsl:call-template name="insertListOf_Title">
626
626
  <xsl:with-param name="title" select="$title-list-figures"/>
627
627
  </xsl:call-template>
628
- <xsl:for-each select="$contents//figures/figure">
628
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
629
629
  <xsl:call-template name="insertListOf_Item"/>
630
630
  </xsl:for-each>
631
631
  </xsl:if>
@@ -733,17 +733,17 @@
733
733
  <xsl:if test="ancestor-or-self::*[local-name()='annex']">annex</xsl:if>
734
734
  </xsl:variable>
735
735
 
736
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
736
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
737
737
  <xsl:if test="$type = 'index'">
738
738
  <xsl:attribute name="level">1</xsl:attribute>
739
739
  </xsl:if>
740
- <title>
740
+ <mn:title>
741
741
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
742
- </title>
742
+ </mn:title>
743
743
  <xsl:if test="$type != 'index'">
744
744
  <xsl:apply-templates mode="contents"/>
745
745
  </xsl:if>
746
- </item>
746
+ </mn:item>
747
747
  </xsl:if>
748
748
  </xsl:template>
749
749
 
@@ -983,12 +983,12 @@
983
983
  </fo:list-item-label>
984
984
  <fo:list-item-body start-indent="body-start()">
985
985
  <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
986
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
986
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
987
987
  <fo:inline>
988
988
  <xsl:if test="@level = 1">
989
989
  <xsl:attribute name="font-weight">bold</xsl:attribute>
990
990
  </xsl:if>
991
- <xsl:apply-templates select="title"/>
991
+ <xsl:apply-templates select="mn:title"/>
992
992
  </fo:inline>
993
993
  <xsl:text> </xsl:text>
994
994
  <fo:inline keep-together.within-line="always" font-weight="normal">
@@ -1949,34 +1949,25 @@
1949
1949
  </fo:block-container>
1950
1950
  </xsl:template>
1951
1951
 
1952
- <!-- <xsl:strip-space elements="jcgm:xref"/> -->
1952
+ <!-- https://www.metanorma.org/ns/standoc -->
1953
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
1953
1954
 
1954
- <xsl:variable name="namespace_full_">
1955
- <xsl:choose>
1956
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
1957
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
1958
- </xsl:choose>
1959
- </xsl:variable>
1960
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
1955
+ <!-- https://www.metanorma.org/ns/xsl -->
1956
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
1961
1957
 
1962
- <xsl:variable name="root_element_">
1963
- <xsl:choose>
1964
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
1965
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
1966
- </xsl:choose>
1967
- </xsl:variable>
1968
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
1958
+ <xsl:variable name="root_element">metanorma</xsl:variable>
1969
1959
 
1960
+ <!---examples: 2013, 2024 -->
1970
1961
  <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'])"/>
1971
1962
 
1972
1963
  <!-- external parameters -->
1973
-
1974
1964
  <xsl:param name="svg_images"/> <!-- svg images array -->
1975
1965
  <xsl:variable name="images" select="document($svg_images)"/>
1976
1966
  <xsl:param name="basepath"/> <!-- base path for images -->
1977
1967
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
1978
1968
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
1979
1969
  <xsl:param name="output_path"/> <!-- output PDF file name -->
1970
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
1980
1971
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
1981
1972
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
1982
1973
  <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 -->
@@ -2023,20 +2014,13 @@
2023
2014
 
2024
2015
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
2025
2016
 
2026
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
2027
- true
2017
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
2018
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
2028
2019
  </xsl:variable>
2029
2020
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
2030
2021
 
2031
- <xsl:variable name="isGenerateTableIF_">
2032
- <xsl:choose>
2033
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
2034
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
2035
- </xsl:when>
2036
- <xsl:otherwise>false</xsl:otherwise>
2037
- </xsl:choose>
2038
- </xsl:variable>
2039
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
2022
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
2023
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
2040
2024
 
2041
2025
  <xsl:variable name="lang">
2042
2026
  <xsl:call-template name="getLang"/>
@@ -2088,8 +2072,7 @@
2088
2072
  <xsl:variable name="pageWidth_">
2089
2073
  <xsl:choose>
2090
2074
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
2091
- <xsl:otherwise>
2092
- 210
2075
+ <xsl:otherwise>210
2093
2076
  </xsl:otherwise>
2094
2077
  </xsl:choose>
2095
2078
  </xsl:variable>
@@ -2099,8 +2082,7 @@
2099
2082
  <xsl:variable name="pageHeight_">
2100
2083
  <xsl:choose>
2101
2084
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
2102
- <xsl:otherwise>
2103
- 297
2085
+ <xsl:otherwise>297
2104
2086
  </xsl:otherwise>
2105
2087
  </xsl:choose>
2106
2088
  </xsl:variable>
@@ -2109,23 +2091,19 @@
2109
2091
  <!-- Page margins in mm (just digits, without 'mm')-->
2110
2092
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
2111
2093
  for example, left margin on odd page and right margin on even page -->
2112
- <xsl:variable name="marginLeftRight1_">
2113
- 25
2094
+ <xsl:variable name="marginLeftRight1_">25
2114
2095
  </xsl:variable>
2115
2096
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
2116
2097
 
2117
- <xsl:variable name="marginLeftRight2_">
2118
- 15
2098
+ <xsl:variable name="marginLeftRight2_">15
2119
2099
  </xsl:variable>
2120
2100
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
2121
2101
 
2122
- <xsl:variable name="marginTop_">
2123
- 29.5
2102
+ <xsl:variable name="marginTop_">29.5
2124
2103
  </xsl:variable>
2125
2104
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
2126
2105
 
2127
- <xsl:variable name="marginBottom_">
2128
- 23.5
2106
+ <xsl:variable name="marginBottom_">23.5
2129
2107
  </xsl:variable>
2130
2108
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
2131
2109
 
@@ -2174,13 +2152,10 @@
2174
2152
  <title-toc lang="zh">目次</title-toc>
2175
2153
 
2176
2154
  <title-part lang="en">
2177
-
2178
2155
  </title-part>
2179
2156
  <title-part lang="fr">
2180
-
2181
2157
  </title-part>
2182
2158
  <title-part lang="ru">
2183
-
2184
2159
  </title-part>
2185
2160
  <title-part lang="zh">第 # 部分:</title-part>
2186
2161
 
@@ -2276,11 +2251,9 @@
2276
2251
  <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>
2277
2252
  <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>
2278
2253
  <xsl:attribute-set name="root-style">
2279
-
2280
- <xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
2281
- <xsl:attribute name="font-family-generic">Serif</xsl:attribute>
2282
- <xsl:attribute name="font-size">10.5pt</xsl:attribute>
2283
-
2254
+ <xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
2255
+ <xsl:attribute name="font-family-generic">Serif</xsl:attribute>
2256
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
2284
2257
  </xsl:attribute-set> <!-- root-style -->
2285
2258
 
2286
2259
  <xsl:template name="insertRootStyle">
@@ -2368,28 +2341,22 @@
2368
2341
 
2369
2342
  <!-- Preface sections styles -->
2370
2343
  <xsl:attribute-set name="copyright-statement-style">
2371
-
2372
2344
  </xsl:attribute-set> <!-- copyright-statement-style -->
2373
2345
 
2374
2346
  <xsl:attribute-set name="copyright-statement-title-style">
2375
-
2376
2347
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
2377
2348
 
2378
2349
  <xsl:attribute-set name="copyright-statement-p-style">
2379
-
2380
2350
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
2381
2351
 
2382
2352
  <xsl:attribute-set name="license-statement-style">
2383
-
2384
2353
  </xsl:attribute-set>
2385
2354
 
2386
2355
  <xsl:attribute-set name="license-statement-title-style">
2387
2356
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2388
-
2389
2357
  </xsl:attribute-set> <!-- license-statement-title-style -->
2390
2358
 
2391
2359
  <xsl:attribute-set name="license-statement-p-style">
2392
-
2393
2360
  </xsl:attribute-set> <!-- license-statement-p-style -->
2394
2361
 
2395
2362
  <xsl:attribute-set name="legal-statement-style">
@@ -2398,88 +2365,68 @@
2398
2365
 
2399
2366
  <xsl:attribute-set name="legal-statement-title-style">
2400
2367
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2401
-
2402
2368
  </xsl:attribute-set> <!-- legal-statement-title-style -->
2403
2369
 
2404
2370
  <xsl:attribute-set name="legal-statement-p-style">
2405
-
2406
2371
  </xsl:attribute-set> <!-- legal-statement-p-style -->
2407
2372
 
2408
2373
  <xsl:attribute-set name="feedback-statement-style">
2409
-
2410
2374
  </xsl:attribute-set> <!-- feedback-statement-style -->
2411
2375
 
2412
2376
  <xsl:attribute-set name="feedback-statement-title-style">
2413
2377
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2414
-
2415
2378
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
2416
2379
 
2417
2380
  <xsl:attribute-set name="feedback-statement-p-style">
2418
-
2419
2381
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
2420
2382
 
2421
2383
  <!-- End Preface sections styles -->
2422
2384
 
2423
2385
  <xsl:attribute-set name="link-style">
2424
-
2425
- <xsl:attribute name="color">blue</xsl:attribute>
2426
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
2427
-
2386
+ <xsl:attribute name="color">blue</xsl:attribute>
2387
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2428
2388
  </xsl:attribute-set>
2429
2389
 
2430
2390
  <xsl:template name="refine_link-style">
2431
-
2432
2391
  </xsl:template> <!-- refine_link-style -->
2433
2392
 
2434
2393
  <xsl:attribute-set name="sourcecode-container-style">
2435
-
2436
2394
  </xsl:attribute-set>
2437
2395
 
2438
2396
  <xsl:attribute-set name="sourcecode-style">
2439
2397
  <xsl:attribute name="white-space">pre</xsl:attribute>
2440
2398
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
2441
2399
  <xsl:attribute name="role">Code</xsl:attribute>
2442
-
2443
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2444
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2445
-
2400
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2401
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2446
2402
  </xsl:attribute-set>
2447
2403
 
2448
2404
  <xsl:template name="refine_sourcecode-style">
2449
-
2450
2405
  </xsl:template> <!-- refine_sourcecode-style -->
2451
2406
 
2452
2407
  <xsl:attribute-set name="pre-style">
2453
2408
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2454
2409
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2455
-
2456
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2457
-
2410
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2458
2411
  </xsl:attribute-set>
2459
2412
 
2460
2413
  <xsl:attribute-set name="permission-style">
2461
-
2462
2414
  </xsl:attribute-set>
2463
2415
 
2464
2416
  <xsl:attribute-set name="permission-name-style">
2465
-
2466
2417
  </xsl:attribute-set>
2467
2418
 
2468
2419
  <xsl:attribute-set name="permission-label-style">
2469
-
2470
2420
  </xsl:attribute-set>
2471
2421
 
2472
2422
  <xsl:attribute-set name="requirement-style">
2473
-
2474
2423
  </xsl:attribute-set>
2475
2424
 
2476
2425
  <xsl:attribute-set name="requirement-name-style">
2477
2426
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2478
-
2479
2427
  </xsl:attribute-set>
2480
2428
 
2481
2429
  <xsl:attribute-set name="requirement-label-style">
2482
-
2483
2430
  </xsl:attribute-set>
2484
2431
 
2485
2432
  <xsl:attribute-set name="subject-style">
@@ -2507,135 +2454,106 @@
2507
2454
  </xsl:attribute-set>
2508
2455
 
2509
2456
  <xsl:attribute-set name="recommendation-style">
2510
-
2511
2457
  </xsl:attribute-set>
2512
2458
 
2513
2459
  <xsl:attribute-set name="recommendation-name-style">
2514
-
2515
2460
  </xsl:attribute-set>
2516
2461
 
2517
2462
  <xsl:attribute-set name="recommendation-label-style">
2518
-
2519
2463
  </xsl:attribute-set>
2520
2464
 
2521
2465
  <xsl:attribute-set name="termexample-style">
2522
-
2523
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2524
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2525
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2526
- <xsl:attribute name="text-align">justify</xsl:attribute>
2527
-
2466
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2467
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2468
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2469
+ <xsl:attribute name="text-align">justify</xsl:attribute>
2528
2470
  </xsl:attribute-set>
2529
2471
 
2530
2472
  <xsl:template name="refine_termexample-style">
2531
-
2532
2473
  </xsl:template>
2533
2474
 
2534
2475
  <xsl:attribute-set name="example-style">
2535
-
2536
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2537
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2538
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2539
-
2476
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2477
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2478
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2540
2479
  </xsl:attribute-set> <!-- example-style -->
2541
2480
 
2542
2481
  <xsl:template name="refine_example-style">
2543
-
2544
2482
  </xsl:template> <!-- refine_example-style -->
2545
2483
 
2546
2484
  <xsl:attribute-set name="example-body-style">
2547
-
2548
2485
  </xsl:attribute-set> <!-- example-body-style -->
2549
2486
 
2550
2487
  <xsl:attribute-set name="example-name-style">
2551
-
2552
- <xsl:attribute name="padding-right">5mm</xsl:attribute>
2553
-
2488
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
2554
2489
  </xsl:attribute-set> <!-- example-name-style -->
2555
2490
 
2556
2491
  <xsl:template name="refine_example-name-style">
2557
-
2558
2492
  </xsl:template>
2559
2493
 
2560
2494
  <xsl:attribute-set name="example-p-style">
2561
-
2562
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2563
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2564
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2495
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2496
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2497
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2565
2498
 
2566
2499
  </xsl:attribute-set> <!-- example-p-style -->
2567
2500
 
2568
2501
  <xsl:template name="refine_example-p-style">
2569
-
2570
2502
  </xsl:template> <!-- refine_example-p-style -->
2571
2503
 
2572
2504
  <xsl:attribute-set name="termexample-name-style">
2573
-
2574
- <xsl:attribute name="padding-right">5mm</xsl:attribute>
2575
-
2505
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
2576
2506
  </xsl:attribute-set> <!-- termexample-name-style -->
2577
2507
 
2578
2508
  <xsl:template name="refine_termexample-name-style">
2579
-
2580
2509
  </xsl:template>
2581
2510
 
2582
2511
  <!-- ========================== -->
2583
2512
  <!-- Table styles -->
2584
2513
  <!-- ========================== -->
2585
2514
  <xsl:variable name="table-border_">
2586
-
2587
2515
  </xsl:variable>
2588
2516
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
2589
2517
 
2590
2518
  <xsl:variable name="table-cell-border_">
2591
-
2592
2519
  </xsl:variable>
2593
2520
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
2594
2521
 
2595
2522
  <xsl:attribute-set name="table-container-style">
2596
2523
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2597
2524
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
2598
-
2599
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2600
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
2601
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2602
-
2525
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2526
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2527
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2603
2528
  </xsl:attribute-set> <!-- table-container-style -->
2604
2529
 
2605
2530
  <xsl:template name="refine_table-container-style">
2606
2531
  <xsl:param name="margin-side"/>
2607
-
2608
2532
  <!-- end table block-container attributes -->
2609
2533
  </xsl:template> <!-- refine_table-container-style -->
2610
2534
 
2611
2535
  <xsl:attribute-set name="table-style">
2612
2536
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
2613
2537
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
2614
-
2615
- <xsl:attribute name="border">1.5pt solid black</xsl:attribute>
2616
-
2538
+ <xsl:attribute name="border">1.5pt solid black</xsl:attribute>
2617
2539
  </xsl:attribute-set><!-- table-style -->
2618
2540
 
2619
2541
  <xsl:template name="refine_table-style">
2620
2542
  <xsl:param name="margin-side"/>
2621
2543
 
2622
2544
  <xsl:call-template name="setBordersTableArray"/>
2623
-
2624
- <xsl:if test="*[local-name()='thead']">
2625
- <xsl:attribute name="border-top">1pt solid black</xsl:attribute>
2626
- </xsl:if>
2627
-
2545
+ <xsl:if test="*[local-name()='thead']">
2546
+ <xsl:attribute name="border-top">1pt solid black</xsl:attribute>
2547
+ </xsl:if>
2628
2548
  </xsl:template> <!-- refine_table-style -->
2629
2549
 
2630
2550
  <xsl:attribute-set name="table-name-style">
2631
2551
  <xsl:attribute name="role">Caption</xsl:attribute>
2632
2552
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2633
-
2634
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2635
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2636
- <xsl:attribute name="text-align">center</xsl:attribute>
2637
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2638
-
2553
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2554
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2555
+ <xsl:attribute name="text-align">center</xsl:attribute>
2556
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2639
2557
  </xsl:attribute-set> <!-- table-name-style -->
2640
2558
 
2641
2559
  <xsl:template name="refine_table-name-style">
@@ -2643,49 +2561,40 @@
2643
2561
  <xsl:if test="$continued = 'true'">
2644
2562
  <xsl:attribute name="role">SKIP</xsl:attribute>
2645
2563
  </xsl:if>
2646
-
2647
2564
  </xsl:template> <!-- refine_table-name-style -->
2648
2565
 
2649
2566
  <xsl:attribute-set name="table-row-style">
2650
2567
  <xsl:attribute name="min-height">4mm</xsl:attribute>
2651
-
2652
2568
  </xsl:attribute-set>
2653
2569
 
2654
2570
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
2655
2571
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2656
-
2657
- <xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
2658
- <xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
2659
-
2572
+ <xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
2573
+ <xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
2660
2574
  </xsl:attribute-set>
2661
2575
 
2662
2576
  <xsl:template name="refine_table-header-row-style">
2663
2577
 
2664
2578
  <xsl:call-template name="setBordersTableArray"/>
2665
-
2666
- <xsl:choose>
2667
- <xsl:when test="position() = 1">
2668
- <xsl:attribute name="border-top">solid black 1.5pt</xsl:attribute>
2669
- <xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
2670
- </xsl:when>
2671
- <xsl:when test="position() = last()">
2672
- <xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
2673
- <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
2674
- </xsl:when>
2675
- </xsl:choose>
2676
-
2579
+ <xsl:choose>
2580
+ <xsl:when test="position() = 1">
2581
+ <xsl:attribute name="border-top">solid black 1.5pt</xsl:attribute>
2582
+ <xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
2583
+ </xsl:when>
2584
+ <xsl:when test="position() = last()">
2585
+ <xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
2586
+ <xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
2587
+ </xsl:when>
2588
+ </xsl:choose>
2677
2589
  </xsl:template> <!-- refine_table-header-row-style -->
2678
2590
 
2679
2591
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
2680
-
2681
- <xsl:attribute name="font-size">9pt</xsl:attribute>
2682
- <xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
2683
- <xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
2684
-
2592
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
2593
+ <xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
2594
+ <xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
2685
2595
  </xsl:attribute-set>
2686
2596
 
2687
2597
  <xsl:template name="refine_table-footer-row-style">
2688
-
2689
2598
  </xsl:template> <!-- refine_table-footer-row-style -->
2690
2599
 
2691
2600
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -2695,7 +2604,6 @@
2695
2604
  <xsl:template name="refine_table-body-row-style">
2696
2605
 
2697
2606
  <xsl:call-template name="setBordersTableArray"/>
2698
-
2699
2607
  </xsl:template> <!-- refine_table-body-row-style -->
2700
2608
 
2701
2609
  <xsl:attribute-set name="table-header-cell-style">
@@ -2703,10 +2611,8 @@
2703
2611
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2704
2612
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2705
2613
  <xsl:attribute name="display-align">center</xsl:attribute>
2706
-
2707
- <xsl:attribute name="border">solid black 1pt</xsl:attribute>
2708
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
2709
-
2614
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
2615
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
2710
2616
  </xsl:attribute-set> <!-- table-header-cell-style -->
2711
2617
 
2712
2618
  <xsl:template name="refine_table-header-cell-style">
@@ -2718,17 +2624,14 @@
2718
2624
  </xsl:if>
2719
2625
 
2720
2626
  <xsl:call-template name="setTableCellAttributes"/>
2721
-
2722
2627
  </xsl:template> <!-- refine_table-header-cell-style -->
2723
2628
 
2724
2629
  <xsl:attribute-set name="table-cell-style">
2725
2630
  <xsl:attribute name="display-align">center</xsl:attribute>
2726
2631
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2727
2632
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2728
-
2729
- <xsl:attribute name="border">solid black 1pt</xsl:attribute>
2730
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2731
-
2633
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
2634
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2732
2635
  </xsl:attribute-set> <!-- table-cell-style -->
2733
2636
 
2734
2637
  <xsl:template name="refine_table-cell-style">
@@ -2737,16 +2640,13 @@
2737
2640
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2738
2641
  </xsl:if>
2739
2642
 
2740
- <!-- bsi -->
2741
-
2742
2643
  <xsl:call-template name="setBordersTableArray"/>
2743
-
2744
- <xsl:if test="count(*) = 1 and (local-name(*[1]) = 'stem' or local-name(*[1]) = 'figure')">
2745
- <xsl:attribute name="padding-left">0mm</xsl:attribute>
2746
- </xsl:if>
2747
- <xsl:if test="ancestor::*[local-name() = 'tfoot']">
2748
- <xsl:attribute name="border">solid black 0</xsl:attribute>
2749
- </xsl:if>
2644
+ <xsl:if test="count(*) = 1 and (local-name(*[1]) = 'stem' or local-name(*[1]) = 'figure')">
2645
+ <xsl:attribute name="padding-left">0mm</xsl:attribute>
2646
+ </xsl:if>
2647
+ <xsl:if test="ancestor::*[local-name() = 'tfoot']">
2648
+ <xsl:attribute name="border">solid black 0</xsl:attribute>
2649
+ </xsl:if>
2750
2650
 
2751
2651
  </xsl:template> <!-- refine_table-cell-style -->
2752
2652
 
@@ -2755,64 +2655,49 @@
2755
2655
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2756
2656
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2757
2657
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
2758
-
2759
- <xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
2760
-
2658
+ <xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
2761
2659
  </xsl:attribute-set> <!-- table-footer-cell-style -->
2762
2660
 
2763
2661
  <xsl:template name="refine_table-footer-cell-style">
2764
-
2765
2662
  </xsl:template> <!-- refine_table-footer-cell-style -->
2766
2663
 
2767
2664
  <xsl:attribute-set name="table-note-style">
2768
2665
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2769
2666
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2770
-
2771
- <xsl:attribute name="font-size">9pt</xsl:attribute>
2772
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2773
-
2667
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
2668
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2774
2669
  </xsl:attribute-set><!-- table-note-style -->
2775
2670
 
2776
2671
  <xsl:template name="refine_table-note-style">
2777
-
2778
2672
  </xsl:template> <!-- refine_table-note-style -->
2779
2673
 
2780
2674
  <xsl:attribute-set name="table-fn-style">
2781
2675
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2782
-
2783
- <xsl:attribute name="font-size">9pt</xsl:attribute>
2784
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2785
-
2676
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
2677
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2786
2678
  </xsl:attribute-set> <!-- table-fn-style -->
2787
2679
 
2788
2680
  <xsl:template name="refine_table-fn-style">
2789
-
2790
2681
  </xsl:template>
2791
2682
 
2792
2683
  <xsl:attribute-set name="table-fn-number-style">
2793
2684
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
2794
-
2795
2685
  </xsl:attribute-set> <!-- table-fn-number-style -->
2796
2686
 
2797
2687
  <xsl:attribute-set name="table-fmt-fn-label-style">
2798
2688
  <xsl:attribute name="font-size">80%</xsl:attribute>
2799
-
2800
- <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
2801
-
2689
+ <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
2802
2690
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
2803
2691
 
2804
2692
  <xsl:template name="refine_table-fmt-fn-label-style">
2805
-
2806
2693
  </xsl:template>
2807
2694
 
2808
2695
  <xsl:attribute-set name="fn-container-body-style">
2809
2696
  <xsl:attribute name="text-indent">0</xsl:attribute>
2810
2697
  <xsl:attribute name="start-indent">0</xsl:attribute>
2811
-
2812
2698
  </xsl:attribute-set>
2813
2699
 
2814
2700
  <xsl:attribute-set name="table-fn-body-style">
2815
-
2816
2701
  </xsl:attribute-set>
2817
2702
 
2818
2703
  <xsl:attribute-set name="figure-fn-number-style">
@@ -2822,17 +2707,14 @@
2822
2707
  <xsl:attribute-set name="figure-fmt-fn-label-style">
2823
2708
  <xsl:attribute name="font-size">80%</xsl:attribute>
2824
2709
  <xsl:attribute name="vertical-align">super</xsl:attribute>
2825
-
2826
2710
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
2827
2711
 
2828
2712
  <xsl:template name="refine_figure-fmt-fn-label-style">
2829
-
2830
2713
  </xsl:template>
2831
2714
 
2832
2715
  <xsl:attribute-set name="figure-fn-body-style">
2833
2716
  <xsl:attribute name="text-align">justify</xsl:attribute>
2834
2717
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2835
-
2836
2718
  </xsl:attribute-set>
2837
2719
  <!-- ========================== -->
2838
2720
  <!-- END Table styles -->
@@ -2843,45 +2725,35 @@
2843
2725
  <!-- ========================== -->
2844
2726
 
2845
2727
  <xsl:attribute-set name="dl-block-style">
2846
-
2847
2728
  </xsl:attribute-set>
2848
2729
 
2849
2730
  <xsl:attribute-set name="dt-row-style">
2850
-
2851
2731
  </xsl:attribute-set>
2852
2732
 
2853
2733
  <xsl:attribute-set name="dt-cell-style">
2854
-
2855
2734
  </xsl:attribute-set>
2856
2735
 
2857
2736
  <xsl:template name="refine_dt-cell-style">
2858
-
2859
2737
  </xsl:template> <!-- refine_dt-cell-style -->
2860
2738
 
2861
2739
  <xsl:attribute-set name="dt-block-style">
2862
2740
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
2863
-
2864
2741
  </xsl:attribute-set>
2865
2742
 
2866
2743
  <xsl:template name="refine_dt-block-style">
2867
-
2868
2744
  </xsl:template> <!-- refine_dt-block-style -->
2869
2745
 
2870
2746
  <xsl:attribute-set name="dl-name-style">
2871
2747
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2872
2748
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2873
-
2874
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2875
-
2749
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2876
2750
  </xsl:attribute-set> <!-- dl-name-style -->
2877
2751
 
2878
2752
  <xsl:attribute-set name="dd-cell-style">
2879
2753
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
2880
-
2881
2754
  </xsl:attribute-set>
2882
2755
 
2883
2756
  <xsl:template name="refine_dd-cell-style">
2884
-
2885
2757
  </xsl:template> <!-- refine_dd-cell-style -->
2886
2758
 
2887
2759
  <!-- ========================== -->
@@ -2889,255 +2761,193 @@
2889
2761
  <!-- ========================== -->
2890
2762
 
2891
2763
  <xsl:attribute-set name="appendix-style">
2892
-
2893
- <xsl:attribute name="font-size">12pt</xsl:attribute>
2894
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2895
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
2896
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2897
-
2764
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
2765
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2766
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2767
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2898
2768
  </xsl:attribute-set>
2899
2769
 
2900
2770
  <xsl:attribute-set name="appendix-example-style">
2901
-
2902
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2903
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2904
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2905
-
2771
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2772
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2773
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2906
2774
  </xsl:attribute-set>
2907
2775
 
2908
2776
  <xsl:attribute-set name="xref-style">
2909
-
2910
- <xsl:attribute name="color">blue</xsl:attribute>
2911
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
2912
-
2777
+ <xsl:attribute name="color">blue</xsl:attribute>
2778
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2913
2779
  </xsl:attribute-set>
2914
2780
 
2915
2781
  <xsl:attribute-set name="eref-style">
2916
-
2917
2782
  </xsl:attribute-set>
2918
2783
 
2919
2784
  <xsl:template name="refine_eref-style">
2920
2785
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
2921
2786
  <xsl:variable name="text" select="normalize-space()"/>
2922
-
2923
2787
  </xsl:template> <!-- refine_eref-style -->
2924
2788
 
2925
2789
  <xsl:attribute-set name="note-style">
2926
-
2927
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2928
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2929
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2930
- <xsl:attribute name="text-align">justify</xsl:attribute>
2931
-
2790
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2791
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2792
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2793
+ <xsl:attribute name="text-align">justify</xsl:attribute>
2932
2794
  </xsl:attribute-set>
2933
2795
 
2934
2796
  <xsl:template name="refine_note-style">
2935
-
2936
2797
  </xsl:template>
2937
2798
 
2938
2799
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
2939
2800
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
2940
2801
 
2941
2802
  <xsl:attribute-set name="note-name-style">
2942
-
2943
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
2944
-
2803
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
2945
2804
  </xsl:attribute-set>
2946
2805
 
2947
2806
  <xsl:template name="refine_note-name-style">
2948
-
2949
2807
  </xsl:template> <!-- refine_note-name-style -->
2950
2808
 
2951
2809
  <xsl:attribute-set name="table-note-name-style">
2952
2810
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
2953
-
2954
2811
  </xsl:attribute-set>
2955
2812
 
2956
2813
  <xsl:template name="refine_table-note-name-style">
2957
-
2958
2814
  </xsl:template> <!-- refine_table-note-name-style -->
2959
2815
 
2960
2816
  <xsl:attribute-set name="note-p-style">
2961
-
2962
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2963
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2964
-
2817
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2818
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2965
2819
  </xsl:attribute-set>
2966
2820
 
2967
2821
  <xsl:attribute-set name="termnote-style">
2968
-
2969
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2970
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
2971
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2972
- <xsl:attribute name="text-align">justify</xsl:attribute>
2973
-
2822
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2823
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2824
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2825
+ <xsl:attribute name="text-align">justify</xsl:attribute>
2974
2826
  </xsl:attribute-set>
2975
2827
 
2976
2828
  <xsl:template name="refine_termnote-style">
2977
-
2978
2829
  </xsl:template> <!-- refine_termnote-style -->
2979
2830
 
2980
2831
  <xsl:attribute-set name="termnote-name-style">
2981
-
2982
2832
  </xsl:attribute-set>
2983
2833
 
2984
2834
  <xsl:template name="refine_termnote-name-style">
2985
-
2986
- <!-- <xsl:if test="$namespace = 'ieee'">
2987
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
2988
- </xsl:if> -->
2989
-
2990
2835
  </xsl:template>
2991
2836
 
2992
2837
  <xsl:attribute-set name="termnote-p-style">
2993
-
2994
2838
  </xsl:attribute-set>
2995
2839
 
2996
2840
  <xsl:attribute-set name="quote-style">
2997
2841
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
2998
2842
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
2999
-
3000
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3001
- <xsl:attribute name="font-style">italic</xsl:attribute>
3002
- <xsl:attribute name="text-align">justify</xsl:attribute>
3003
-
2843
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2844
+ <xsl:attribute name="font-style">italic</xsl:attribute>
2845
+ <xsl:attribute name="text-align">justify</xsl:attribute>
3004
2846
  </xsl:attribute-set>
3005
2847
 
3006
2848
  <xsl:template name="refine_quote-style">
3007
-
3008
- <xsl:if test="ancestor::*[local-name() = 'boilerplate']">
3009
- <xsl:attribute name="margin-left">7mm</xsl:attribute>
3010
- <xsl:attribute name="margin-right">7mm</xsl:attribute>
3011
- <xsl:attribute name="font-style">normal</xsl:attribute>
3012
- </xsl:if>
3013
-
2849
+ <xsl:if test="ancestor::*[local-name() = 'boilerplate']">
2850
+ <xsl:attribute name="margin-left">7mm</xsl:attribute>
2851
+ <xsl:attribute name="margin-right">7mm</xsl:attribute>
2852
+ <xsl:attribute name="font-style">normal</xsl:attribute>
2853
+ </xsl:if>
3014
2854
  </xsl:template>
3015
2855
 
3016
2856
  <xsl:attribute-set name="quote-source-style">
3017
2857
  <xsl:attribute name="text-align">right</xsl:attribute>
3018
-
3019
2858
  </xsl:attribute-set>
3020
2859
 
3021
2860
  <xsl:attribute-set name="termsource-style">
3022
-
3023
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3024
-
2861
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3025
2862
  </xsl:attribute-set>
3026
2863
 
3027
2864
  <xsl:template name="refine_termsource-style">
3028
-
3029
2865
  </xsl:template> <!-- refine_termsource-style -->
3030
2866
 
3031
2867
  <xsl:attribute-set name="termsource-text-style">
3032
-
3033
2868
  </xsl:attribute-set>
3034
2869
 
3035
2870
  <xsl:attribute-set name="origin-style">
3036
-
3037
2871
  </xsl:attribute-set>
3038
2872
 
3039
2873
  <xsl:attribute-set name="term-style">
3040
-
3041
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3042
-
2874
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3043
2875
  </xsl:attribute-set>
3044
2876
 
3045
2877
  <xsl:attribute-set name="term-name-style">
3046
2878
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3047
2879
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3048
-
3049
2880
  </xsl:attribute-set>
3050
2881
 
3051
2882
  <xsl:attribute-set name="figure-block-style">
3052
2883
  <xsl:attribute name="role">SKIP</xsl:attribute>
3053
-
3054
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3055
-
2884
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3056
2885
  </xsl:attribute-set>
3057
2886
 
3058
2887
  <xsl:template name="refine_figure-block-style">
3059
-
3060
2888
  </xsl:template>
3061
2889
 
3062
2890
  <xsl:attribute-set name="figure-style">
3063
-
3064
2891
  </xsl:attribute-set>
3065
2892
 
3066
2893
  <xsl:attribute-set name="figure-name-style">
3067
2894
  <xsl:attribute name="role">Caption</xsl:attribute>
3068
-
3069
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3070
- <xsl:attribute name="text-align">center</xsl:attribute>
3071
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3072
- <xsl:attribute name="space-after">12pt</xsl:attribute>
3073
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3074
-
2895
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2896
+ <xsl:attribute name="text-align">center</xsl:attribute>
2897
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2898
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
2899
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3075
2900
  </xsl:attribute-set>
3076
2901
 
3077
2902
  <xsl:template name="refine_figure-name-style">
3078
-
3079
2903
  </xsl:template> <!-- refine_figure-name-style -->
3080
2904
 
3081
2905
  <xsl:attribute-set name="figure-source-style">
3082
-
3083
2906
  </xsl:attribute-set>
3084
2907
 
3085
2908
  <!-- Formula's styles -->
3086
2909
  <xsl:attribute-set name="formula-style">
3087
2910
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
3088
2911
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3089
-
3090
2912
  </xsl:attribute-set> <!-- formula-style -->
3091
2913
 
3092
2914
  <xsl:attribute-set name="formula-stem-block-style">
3093
2915
  <xsl:attribute name="text-align">center</xsl:attribute>
3094
-
3095
- <xsl:attribute name="text-align">left</xsl:attribute>
3096
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
3097
-
2916
+ <xsl:attribute name="text-align">left</xsl:attribute>
2917
+ <xsl:attribute name="margin-left">25mm</xsl:attribute>
3098
2918
  </xsl:attribute-set> <!-- formula-stem-block-style -->
3099
2919
 
3100
2920
  <xsl:template name="refine_formula-stem-block-style">
3101
-
3102
2921
  </xsl:template> <!-- refine_formula-stem-block-style -->
3103
2922
 
3104
2923
  <xsl:attribute-set name="formula-stem-number-style">
3105
2924
  <xsl:attribute name="text-align">right</xsl:attribute>
3106
-
3107
2925
  </xsl:attribute-set> <!-- formula-stem-number-style -->
3108
2926
  <!-- End Formula's styles -->
3109
2927
 
3110
2928
  <xsl:template name="refine_formula-stem-number-style">
3111
-
3112
2929
  </xsl:template>
3113
2930
 
3114
2931
  <xsl:attribute-set name="image-style">
3115
2932
  <xsl:attribute name="role">SKIP</xsl:attribute>
3116
2933
  <xsl:attribute name="text-align">center</xsl:attribute>
3117
-
3118
2934
  </xsl:attribute-set>
3119
2935
 
3120
2936
  <xsl:template name="refine_image-style">
3121
-
3122
2937
  </xsl:template>
3123
2938
 
3124
2939
  <xsl:attribute-set name="figure-pseudocode-p-style">
3125
-
3126
2940
  </xsl:attribute-set>
3127
2941
 
3128
2942
  <xsl:attribute-set name="image-graphic-style">
3129
2943
  <xsl:attribute name="width">100%</xsl:attribute>
3130
2944
  <xsl:attribute name="content-height">100%</xsl:attribute>
3131
2945
  <xsl:attribute name="scaling">uniform</xsl:attribute>
3132
-
3133
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3134
-
2946
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3135
2947
  </xsl:attribute-set>
3136
2948
 
3137
2949
  <xsl:attribute-set name="tt-style">
3138
-
3139
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3140
-
2950
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3141
2951
  </xsl:attribute-set>
3142
2952
 
3143
2953
  <xsl:attribute-set name="sourcecode-name-style">
@@ -3146,56 +2956,44 @@
3146
2956
  <xsl:attribute name="text-align">center</xsl:attribute>
3147
2957
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3148
2958
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3149
-
3150
2959
  </xsl:attribute-set>
3151
2960
 
3152
2961
  <xsl:attribute-set name="preferred-block-style">
3153
-
3154
- <xsl:attribute name="line-height">1.1</xsl:attribute>
3155
-
2962
+ <xsl:attribute name="line-height">1.1</xsl:attribute>
3156
2963
  </xsl:attribute-set>
3157
2964
 
3158
2965
  <xsl:attribute-set name="preferred-term-style">
3159
2966
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3160
2967
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3161
-
3162
2968
  </xsl:attribute-set>
3163
2969
 
3164
2970
  <xsl:attribute-set name="domain-style">
3165
-
3166
2971
  </xsl:attribute-set>
3167
2972
 
3168
2973
  <xsl:attribute-set name="admitted-style">
3169
-
3170
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3171
-
2974
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3172
2975
  </xsl:attribute-set>
3173
2976
 
3174
2977
  <xsl:attribute-set name="deprecates-style">
3175
-
3176
2978
  </xsl:attribute-set>
3177
2979
 
3178
2980
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
3179
2981
  </xsl:attribute-set>
3180
2982
 
3181
2983
  <xsl:attribute-set name="definition-style">
3182
-
3183
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3184
-
2984
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3185
2985
  </xsl:attribute-set>
3186
2986
 
3187
2987
  <xsl:variable name="color-added-text">
3188
2988
  <xsl:text>rgb(0, 255, 0)</xsl:text>
3189
2989
  </xsl:variable>
3190
2990
  <xsl:attribute-set name="add-style">
3191
-
3192
- <xsl:attribute name="color">red</xsl:attribute>
3193
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
3194
- <!-- <xsl:attribute name="color">black</xsl:attribute>
2991
+ <xsl:attribute name="color">red</xsl:attribute>
2992
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2993
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
3195
2994
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
3196
2995
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
3197
2996
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
3198
-
3199
2997
  </xsl:attribute-set>
3200
2998
 
3201
2999
  <xsl:variable name="add-style">
@@ -3215,56 +3013,42 @@
3215
3013
 
3216
3014
  <xsl:attribute-set name="mathml-style">
3217
3015
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
3218
-
3219
- <xsl:attribute name="font-family">Cambria Math</xsl:attribute>
3220
-
3016
+ <xsl:attribute name="font-family">Cambria Math</xsl:attribute>
3221
3017
  </xsl:attribute-set>
3222
3018
 
3223
3019
  <xsl:template name="refine_mathml-style">
3224
-
3225
3020
  </xsl:template>
3226
3021
 
3227
3022
  <xsl:attribute-set name="list-style">
3228
-
3229
- <xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
3230
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
3231
-
3023
+ <xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
3024
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
3232
3025
  </xsl:attribute-set> <!-- list-style -->
3233
3026
 
3234
3027
  <xsl:template name="refine_list-style">
3235
-
3236
3028
  </xsl:template> <!-- refine_list-style -->
3237
3029
 
3238
3030
  <xsl:attribute-set name="list-name-style">
3239
3031
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3240
-
3241
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
3242
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3243
-
3032
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
3033
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3244
3034
  </xsl:attribute-set> <!-- list-name-style -->
3245
3035
 
3246
3036
  <xsl:attribute-set name="list-item-style">
3247
-
3248
3037
  </xsl:attribute-set>
3249
3038
 
3250
3039
  <xsl:template name="refine_list-item-style">
3251
-
3252
3040
  </xsl:template> <!-- refine_list-item-style -->
3253
3041
 
3254
3042
  <xsl:attribute-set name="list-item-label-style">
3255
-
3256
3043
  </xsl:attribute-set>
3257
3044
 
3258
3045
  <xsl:template name="refine_list-item-label-style">
3259
-
3260
3046
  </xsl:template> <!-- refine_list-item-label-style -->
3261
3047
 
3262
3048
  <xsl:attribute-set name="list-item-body-style">
3263
-
3264
3049
  </xsl:attribute-set>
3265
3050
 
3266
3051
  <xsl:template name="refine_list-item-body-style">
3267
-
3268
3052
  </xsl:template> <!-- refine_list-item-body-style -->
3269
3053
 
3270
3054
  <xsl:attribute-set name="toc-style">
@@ -3278,12 +3062,10 @@
3278
3062
  </xsl:attribute-set>
3279
3063
 
3280
3064
  <xsl:template name="refine_fn-reference-style">
3281
-
3282
- <xsl:if test="ancestor::*[local-name()='table']">
3283
- <xsl:attribute name="font-weight">normal</xsl:attribute>
3284
- <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3285
- </xsl:if>
3286
-
3065
+ <xsl:if test="ancestor::*[local-name()='table']">
3066
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
3067
+ <xsl:attribute name="baseline-shift">15%</xsl:attribute>
3068
+ </xsl:if>
3287
3069
  </xsl:template> <!-- refine_fn-reference-style -->
3288
3070
 
3289
3071
  <xsl:attribute-set name="fn-style">
@@ -3292,10 +3074,8 @@
3292
3074
 
3293
3075
  <xsl:attribute-set name="fn-num-style">
3294
3076
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3295
-
3296
- <xsl:attribute name="font-size">65%</xsl:attribute>
3297
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3298
-
3077
+ <xsl:attribute name="font-size">65%</xsl:attribute>
3078
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3299
3079
  </xsl:attribute-set>
3300
3080
 
3301
3081
  <xsl:attribute-set name="fn-body-style">
@@ -3303,122 +3083,91 @@
3303
3083
  <xsl:attribute name="font-style">normal</xsl:attribute>
3304
3084
  <xsl:attribute name="text-indent">0</xsl:attribute>
3305
3085
  <xsl:attribute name="start-indent">0</xsl:attribute>
3306
-
3307
- <xsl:attribute name="font-size">9pt</xsl:attribute>
3308
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3309
- <xsl:attribute name="line-height">124%</xsl:attribute>
3310
- <xsl:attribute name="text-align">justify</xsl:attribute>
3311
-
3086
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
3087
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3088
+ <xsl:attribute name="line-height">124%</xsl:attribute>
3089
+ <xsl:attribute name="text-align">justify</xsl:attribute>
3312
3090
  </xsl:attribute-set>
3313
3091
 
3314
3092
  <xsl:template name="refine_fn-body-style">
3315
-
3316
3093
  </xsl:template> <!-- refine_fn-body-style -->
3317
3094
 
3318
3095
  <xsl:attribute-set name="fn-body-num-style">
3319
3096
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3320
-
3321
- <xsl:attribute name="font-size">60%</xsl:attribute>
3322
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3323
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
3324
-
3097
+ <xsl:attribute name="font-size">60%</xsl:attribute>
3098
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3099
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
3325
3100
  </xsl:attribute-set> <!-- fn-body-num-style -->
3326
3101
 
3327
3102
  <xsl:template name="refine_fn-body-num-style">
3328
-
3329
3103
  </xsl:template> <!-- refine_fn-body-num-style -->
3330
3104
 
3331
3105
  <!-- admonition -->
3332
3106
  <xsl:attribute-set name="admonition-style">
3333
-
3334
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3335
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3336
-
3107
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3108
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3337
3109
  </xsl:attribute-set> <!-- admonition-style -->
3338
3110
 
3339
3111
  <xsl:attribute-set name="admonition-container-style">
3340
3112
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
3341
3113
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
3342
-
3343
3114
  </xsl:attribute-set> <!-- admonition-container-style -->
3344
3115
 
3345
3116
  <xsl:attribute-set name="admonition-name-style">
3346
3117
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3347
-
3348
3118
  </xsl:attribute-set> <!-- admonition-name-style -->
3349
3119
 
3350
3120
  <xsl:attribute-set name="admonition-p-style">
3351
-
3352
3121
  </xsl:attribute-set> <!-- admonition-p-style -->
3353
3122
  <!-- end admonition -->
3354
3123
 
3355
3124
  <!-- bibitem in Normative References (references/@normative="true") -->
3356
3125
  <xsl:attribute-set name="bibitem-normative-style">
3357
-
3358
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3359
-
3126
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3360
3127
  </xsl:attribute-set> <!-- bibitem-normative-style -->
3361
3128
 
3362
3129
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
3363
3130
  <xsl:attribute-set name="bibitem-normative-list-style">
3364
3131
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3365
3132
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3366
-
3367
- <!-- <xsl:if test="$namespace = 'ieee'">
3368
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3369
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
3370
- </xsl:if> -->
3371
-
3372
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3373
-
3133
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3374
3134
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
3375
3135
 
3376
3136
  <xsl:attribute-set name="bibitem-non-normative-style">
3377
-
3378
3137
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
3379
3138
 
3380
3139
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
3381
3140
  <xsl:attribute-set name="bibitem-non-normative-list-style">
3382
3141
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3383
3142
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3384
-
3385
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3386
-
3143
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3387
3144
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
3388
3145
 
3389
3146
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
3390
3147
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3391
-
3392
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3393
-
3148
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3394
3149
  </xsl:attribute-set>
3395
3150
 
3396
3151
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
3397
3152
  <xsl:attribute-set name="bibitem-normative-list-body-style">
3398
-
3399
3153
  </xsl:attribute-set>
3400
3154
 
3401
3155
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
3402
-
3403
3156
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
3404
3157
 
3405
3158
  <!-- footnote reference number for bibitem, in the text -->
3406
3159
  <xsl:attribute-set name="bibitem-note-fn-style">
3407
3160
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3408
3161
  <xsl:attribute name="font-size">65%</xsl:attribute>
3409
-
3410
- <xsl:attribute name="font-size">8pt</xsl:attribute>
3411
- <xsl:attribute name="baseline-shift">30%</xsl:attribute>
3412
-
3162
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
3163
+ <xsl:attribute name="baseline-shift">30%</xsl:attribute>
3413
3164
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
3414
3165
 
3415
3166
  <!-- footnote number on the page bottom -->
3416
3167
  <xsl:attribute-set name="bibitem-note-fn-number-style">
3417
3168
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3418
-
3419
- <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
3420
- <xsl:attribute name="padding-right">3mm</xsl:attribute>
3421
-
3169
+ <xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
3170
+ <xsl:attribute name="padding-right">3mm</xsl:attribute>
3422
3171
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
3423
3172
 
3424
3173
  <!-- footnote body (text) on the page bottom -->
@@ -3426,13 +3175,10 @@
3426
3175
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3427
3176
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3428
3177
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
3429
-
3430
- <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
3431
-
3178
+ <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
3432
3179
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
3433
3180
 
3434
3181
  <xsl:attribute-set name="references-non-normative-style">
3435
-
3436
3182
  </xsl:attribute-set> <!-- references-non-normative-style -->
3437
3183
 
3438
3184
  <!-- Highlight.js syntax GitHub styles -->
@@ -3592,18 +3338,14 @@
3592
3338
  <!-- Index section styles -->
3593
3339
  <xsl:attribute-set name="indexsect-title-style">
3594
3340
  <xsl:attribute name="role">H1</xsl:attribute>
3595
-
3596
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3597
- <xsl:attribute name="span">all</xsl:attribute>
3598
-
3341
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3342
+ <xsl:attribute name="span">all</xsl:attribute>
3599
3343
  </xsl:attribute-set>
3600
3344
 
3601
3345
  <xsl:attribute-set name="indexsect-clause-title-style">
3602
3346
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3603
-
3604
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3605
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
3606
-
3347
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3348
+ <xsl:attribute name="margin-left">25mm</xsl:attribute>
3607
3349
  </xsl:attribute-set>
3608
3350
 
3609
3351
  <!-- End Index section styles -->
@@ -3680,47 +3422,47 @@
3680
3422
  </xsl:template>
3681
3423
 
3682
3424
  <xsl:template name="processTables_Contents">
3683
- <tables>
3425
+ <mn:tables>
3684
3426
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
3685
3427
  <xsl:choose>
3686
3428
  <xsl:when test="*[local-name() = 'fmt-name']">
3687
3429
  <xsl:variable name="fmt_name">
3688
3430
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3689
3431
  </xsl:variable>
3690
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3432
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3691
3433
  <xsl:copy-of select="$fmt_name"/>
3692
- </table>
3434
+ </mn:table>
3693
3435
  </xsl:when>
3694
3436
  <xsl:otherwise>
3695
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
3437
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
3696
3438
  <xsl:copy-of select="*[local-name() = 'name']"/>
3697
- </table>
3439
+ </mn:table>
3698
3440
  </xsl:otherwise>
3699
3441
  </xsl:choose>
3700
3442
  </xsl:for-each>
3701
- </tables>
3443
+ </mn:tables>
3702
3444
  </xsl:template>
3703
3445
 
3704
3446
  <xsl:template name="processFigures_Contents">
3705
- <figures>
3447
+ <mn:figures>
3706
3448
  <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) != '']">
3707
3449
  <xsl:choose>
3708
3450
  <xsl:when test="*[local-name() = 'fmt-name']">
3709
3451
  <xsl:variable name="fmt_name">
3710
3452
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3711
3453
  </xsl:variable>
3712
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3454
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3713
3455
  <xsl:copy-of select="$fmt_name"/>
3714
- </figure>
3456
+ </mn:figure>
3715
3457
  </xsl:when>
3716
3458
  <xsl:otherwise>
3717
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3459
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3718
3460
  <xsl:copy-of select="*[local-name() = 'name']"/>
3719
- </figure>
3461
+ </mn:figure>
3720
3462
  </xsl:otherwise>
3721
3463
  </xsl:choose>
3722
3464
  </xsl:for-each>
3723
- </figures>
3465
+ </mn:figures>
3724
3466
  </xsl:template>
3725
3467
 
3726
3468
  <xsl:template name="processPrefaceSectionsDefault">
@@ -3739,7 +3481,6 @@
3739
3481
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3740
3482
  <xsl:sort select="@displayorder" data-type="number"/>
3741
3483
  <xsl:apply-templates select="."/>
3742
-
3743
3484
  </xsl:for-each>
3744
3485
 
3745
3486
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -3846,7 +3587,6 @@
3846
3587
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3847
3588
  <xsl:sort select="@displayorder" data-type="number"/>
3848
3589
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
3849
-
3850
3590
  </xsl:for-each>
3851
3591
  </xsl:element>
3852
3592
  </xsl:element>
@@ -3980,7 +3720,6 @@
3980
3720
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
3981
3721
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
3982
3722
  </xsl:apply-templates>
3983
-
3984
3723
  </xsl:for-each>
3985
3724
  </xsl:element>
3986
3725
 
@@ -4020,19 +3759,17 @@
4020
3759
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
4021
3760
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
4022
3761
  <xsl:template match="text()" name="text">
4023
-
4024
- <xsl:choose>
4025
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
4026
- <xsl:otherwise>
4027
- <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))"/>
4028
- <xsl:call-template name="replace_fo_inline_tags">
4029
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
4030
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
4031
- <xsl:with-param name="text" select="$text"/>
4032
- </xsl:call-template>
4033
- </xsl:otherwise>
4034
- </xsl:choose>
4035
-
3762
+ <xsl:choose>
3763
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
3764
+ <xsl:otherwise>
3765
+ <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))"/>
3766
+ <xsl:call-template name="replace_fo_inline_tags">
3767
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
3768
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
3769
+ <xsl:with-param name="text" select="$text"/>
3770
+ </xsl:call-template>
3771
+ </xsl:otherwise>
3772
+ </xsl:choose>
4036
3773
  </xsl:template>
4037
3774
 
4038
3775
  <xsl:template name="replace_fo_inline_tags">
@@ -4086,7 +3823,7 @@
4086
3823
  <xsl:with-param name="keep_sep">true</xsl:with-param>
4087
3824
  </xsl:call-template>
4088
3825
  </xsl:variable>
4089
- <xsl:for-each select="xalan:nodeset($items)/item">
3826
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
4090
3827
  <xsl:choose>
4091
3828
  <xsl:when test=". = $sep">
4092
3829
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -4115,17 +3852,13 @@
4115
3852
  </xsl:template> <!-- copyright-statement -->
4116
3853
 
4117
3854
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
4118
-
4119
- <!-- process in the template 'title' -->
4120
- <xsl:call-template name="title"/>
4121
-
3855
+ <!-- process in the template 'title' -->
3856
+ <xsl:call-template name="title"/>
4122
3857
  </xsl:template> <!-- copyright-statement//title -->
4123
3858
 
4124
3859
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
4125
-
4126
- <!-- process in the template 'paragraph' -->
4127
- <xsl:call-template name="paragraph"/>
4128
-
3860
+ <!-- process in the template 'paragraph' -->
3861
+ <xsl:call-template name="paragraph"/>
4129
3862
  </xsl:template> <!-- copyright-statement//p -->
4130
3863
 
4131
3864
  <xsl:template match="*[local-name()='license-statement']">
@@ -4135,42 +3868,34 @@
4135
3868
  </xsl:template> <!-- license-statement -->
4136
3869
 
4137
3870
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
4138
-
4139
- <!-- process in the template 'title' -->
4140
- <xsl:call-template name="title"/>
4141
-
3871
+ <!-- process in the template 'title' -->
3872
+ <xsl:call-template name="title"/>
4142
3873
  </xsl:template> <!-- license-statement/title -->
4143
3874
 
4144
3875
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
4145
-
4146
- <!-- process in the template 'paragraph' -->
4147
- <xsl:call-template name="paragraph"/>
4148
-
3876
+ <!-- process in the template 'paragraph' -->
3877
+ <xsl:call-template name="paragraph"/>
4149
3878
  </xsl:template> <!-- license-statement/p -->
4150
3879
 
4151
3880
  <xsl:template match="*[local-name()='legal-statement']">
4152
3881
  <xsl:param name="isLegacy">false</xsl:param>
4153
3882
  <fo:block xsl:use-attribute-sets="legal-statement-style">
4154
-
4155
3883
  <xsl:apply-templates/>
4156
3884
  </fo:block>
4157
3885
  </xsl:template> <!-- legal-statement -->
4158
3886
 
4159
3887
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
4160
-
4161
- <!-- process in the template 'title' -->
4162
- <xsl:call-template name="title"/>
3888
+ <!-- process in the template 'title' -->
3889
+ <xsl:call-template name="title"/>
4163
3890
 
4164
3891
  </xsl:template> <!-- legal-statement/title -->
4165
3892
 
4166
3893
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
4167
3894
  <xsl:param name="margin"/>
4168
-
4169
- <!-- process in the template 'paragraph' -->
4170
- <xsl:call-template name="paragraph">
4171
- <xsl:with-param name="margin" select="$margin"/>
4172
- </xsl:call-template>
4173
-
3895
+ <!-- process in the template 'paragraph' -->
3896
+ <xsl:call-template name="paragraph">
3897
+ <xsl:with-param name="margin" select="$margin"/>
3898
+ </xsl:call-template>
4174
3899
  </xsl:template> <!-- legal-statement/p -->
4175
3900
 
4176
3901
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -4180,20 +3905,16 @@
4180
3905
  </xsl:template> <!-- feedback-statement -->
4181
3906
 
4182
3907
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
4183
-
4184
- <!-- process in the template 'title' -->
4185
- <xsl:call-template name="title"/>
4186
-
3908
+ <!-- process in the template 'title' -->
3909
+ <xsl:call-template name="title"/>
4187
3910
  </xsl:template>
4188
3911
 
4189
3912
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
4190
3913
  <xsl:param name="margin"/>
4191
-
4192
- <!-- process in the template 'paragraph' -->
4193
- <xsl:call-template name="paragraph">
4194
- <xsl:with-param name="margin" select="$margin"/>
4195
- </xsl:call-template>
4196
-
3914
+ <!-- process in the template 'paragraph' -->
3915
+ <xsl:call-template name="paragraph">
3916
+ <xsl:with-param name="margin" select="$margin"/>
3917
+ </xsl:call-template>
4197
3918
  </xsl:template>
4198
3919
 
4199
3920
  <!-- ================================= -->
@@ -4246,7 +3967,6 @@
4246
3967
  <xsl:template match="*[local-name()='table']" name="table">
4247
3968
 
4248
3969
  <xsl:variable name="table-preamble">
4249
-
4250
3970
  </xsl:variable>
4251
3971
 
4252
3972
  <xsl:variable name="table">
@@ -4316,8 +4036,7 @@
4316
4036
 
4317
4037
  <xsl:variable name="table_width_default">100%</xsl:variable>
4318
4038
  <xsl:variable name="table_width">
4319
- <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
4320
- <xsl:value-of select="$table_width_default"/>
4039
+ <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --><xsl:value-of select="$table_width_default"/>
4321
4040
  </xsl:variable>
4322
4041
 
4323
4042
  <xsl:variable name="table_attributes">
@@ -4460,27 +4179,25 @@
4460
4179
  <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
4461
4180
 
4462
4181
  <!-- centered table when table name is centered (see table-name-style) -->
4463
-
4464
- <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
4465
-
4466
- <fo:table-column column-width="proportional-column-width(1)"/>
4467
- <fo:table-column column-width="{@width}"/>
4468
- <fo:table-column column-width="proportional-column-width(1)"/>
4469
- <fo:table-body role="SKIP">
4470
- <fo:table-row role="SKIP">
4471
- <fo:table-cell column-number="2" role="SKIP">
4472
- <xsl:copy-of select="$table-preamble"/>
4473
- <fo:block role="SKIP">
4474
- <xsl:call-template name="setTrackChangesStyles">
4475
- <xsl:with-param name="isAdded" select="$isAdded"/>
4476
- <xsl:with-param name="isDeleted" select="$isDeleted"/>
4477
- </xsl:call-template>
4478
- <xsl:copy-of select="$table"/>
4479
- </fo:block>
4480
- </fo:table-cell>
4481
- </fo:table-row>
4482
- </fo:table-body>
4483
- </fo:table>
4182
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
4183
+ <fo:table-column column-width="proportional-column-width(1)"/>
4184
+ <fo:table-column column-width="{@width}"/>
4185
+ <fo:table-column column-width="proportional-column-width(1)"/>
4186
+ <fo:table-body role="SKIP">
4187
+ <fo:table-row role="SKIP">
4188
+ <fo:table-cell column-number="2" role="SKIP">
4189
+ <xsl:copy-of select="$table-preamble"/>
4190
+ <fo:block role="SKIP">
4191
+ <xsl:call-template name="setTrackChangesStyles">
4192
+ <xsl:with-param name="isAdded" select="$isAdded"/>
4193
+ <xsl:with-param name="isDeleted" select="$isDeleted"/>
4194
+ </xsl:call-template>
4195
+ <xsl:copy-of select="$table"/>
4196
+ </fo:block>
4197
+ </fo:table-cell>
4198
+ </fo:table-row>
4199
+ </fo:table-body>
4200
+ </fo:table>
4484
4201
 
4485
4202
  </xsl:when>
4486
4203
  <xsl:otherwise>
@@ -4506,7 +4223,6 @@
4506
4223
  </xsl:template>
4507
4224
 
4508
4225
  <xsl:template name="setBordersTableArray">
4509
-
4510
4226
  </xsl:template>
4511
4227
 
4512
4228
  <!-- table/name-->
@@ -4515,53 +4231,51 @@
4515
4231
  <xsl:param name="cols-count"/>
4516
4232
  <xsl:if test="normalize-space() != ''">
4517
4233
 
4518
- <fo:block xsl:use-attribute-sets="table-name-style">
4234
+ <fo:block xsl:use-attribute-sets="table-name-style">
4519
4235
 
4520
- <xsl:call-template name="refine_table-name-style">
4521
- <xsl:with-param name="continued" select="$continued"/>
4522
- </xsl:call-template>
4523
-
4524
- <xsl:choose>
4525
- <xsl:when test="$continued = 'true'">
4526
- <!-- $namespace = 'iso' or -->
4527
- <xsl:apply-templates/>
4236
+ <xsl:call-template name="refine_table-name-style">
4237
+ <xsl:with-param name="continued" select="$continued"/>
4238
+ </xsl:call-template>
4528
4239
 
4529
- </xsl:when>
4530
- <xsl:otherwise>
4531
- <xsl:apply-templates/>
4532
- </xsl:otherwise>
4533
- </xsl:choose>
4240
+ <xsl:choose>
4241
+ <xsl:when test="$continued = 'true'"> <!-- $namespace = 'iso' or -->
4242
+ <xsl:apply-templates/>
4243
+ </xsl:when>
4244
+ <xsl:otherwise>
4245
+ <xsl:apply-templates/>
4246
+ </xsl:otherwise>
4247
+ </xsl:choose>
4534
4248
 
4535
- </fo:block>
4249
+ </fo:block>
4536
4250
 
4537
- <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4538
- <xsl:if test="$continued = 'true'">
4251
+ <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4252
+ <xsl:if test="$continued = 'true'">
4539
4253
 
4540
- <!-- to prevent the error 'THead element may contain only TR elements' -->
4254
+ <!-- to prevent the error 'THead element may contain only TR elements' -->
4541
4255
 
4542
- <xsl:choose>
4543
- <xsl:when test="string(number($cols-count)) != 'NaN'">
4544
- <fo:table width="100%" table-layout="fixed" role="SKIP">
4545
- <fo:table-body role="SKIP">
4546
- <fo:table-row>
4547
- <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4548
- <fo:block text-align="right" role="SKIP">
4549
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4550
- </fo:block>
4551
- </fo:table-cell>
4552
- </fo:table-row>
4553
- </fo:table-body>
4554
- </fo:table>
4555
- </xsl:when>
4556
- <xsl:otherwise>
4557
- <fo:block text-align="right">
4558
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4559
- </fo:block>
4560
- </xsl:otherwise>
4561
- </xsl:choose>
4256
+ <xsl:choose>
4257
+ <xsl:when test="string(number($cols-count)) != 'NaN'">
4258
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
4259
+ <fo:table-body role="SKIP">
4260
+ <fo:table-row>
4261
+ <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4262
+ <fo:block text-align="right" role="SKIP">
4263
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4264
+ </fo:block>
4265
+ </fo:table-cell>
4266
+ </fo:table-row>
4267
+ </fo:table-body>
4268
+ </fo:table>
4269
+ </xsl:when>
4270
+ <xsl:otherwise>
4271
+ <fo:block text-align="right">
4272
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4273
+ </fo:block>
4274
+ </xsl:otherwise>
4275
+ </xsl:choose>
4562
4276
 
4563
- </xsl:if>
4564
- <!-- </xsl:if> -->
4277
+ </xsl:if>
4278
+ <!-- </xsl:if> -->
4565
4279
 
4566
4280
  </xsl:if>
4567
4281
  </xsl:template> <!-- table/name -->
@@ -4936,11 +4650,9 @@
4936
4650
  <xsl:template match="*[local-name()='thead']">
4937
4651
  <xsl:param name="cols-count"/>
4938
4652
  <fo:table-header>
4939
-
4940
- <xsl:call-template name="table-header-title">
4941
- <xsl:with-param name="cols-count" select="$cols-count"/>
4942
- </xsl:call-template>
4943
-
4653
+ <xsl:call-template name="table-header-title">
4654
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4655
+ </xsl:call-template>
4944
4656
  <xsl:apply-templates/>
4945
4657
  </fo:table-header>
4946
4658
  </xsl:template> <!-- thead -->
@@ -4954,30 +4666,28 @@
4954
4666
 
4955
4667
  <xsl:call-template name="refine_table-header-title-style"/>
4956
4668
 
4957
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4958
- <xsl:with-param name="continued">true</xsl:with-param>
4959
- <xsl:with-param name="cols-count" select="$cols-count"/>
4960
- </xsl:apply-templates>
4961
-
4962
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4963
- <fo:block role="SKIP"/>
4964
- </xsl:if>
4669
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4670
+ <xsl:with-param name="continued">true</xsl:with-param>
4671
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4672
+ </xsl:apply-templates>
4965
4673
 
4966
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
4967
- <xsl:call-template name="table_name_fn_display"/>
4968
- </xsl:for-each>
4674
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4675
+ <fo:block role="SKIP"/>
4676
+ </xsl:if>
4677
+ <xsl:for-each select="ancestor::*[local-name()='table'][1]">
4678
+ <xsl:call-template name="table_name_fn_display"/>
4679
+ </xsl:for-each>
4969
4680
 
4970
- <fo:block text-align="right" font-style="italic" role="SKIP">
4971
- <xsl:text> </xsl:text>
4972
- <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4973
- </fo:block>
4681
+ <fo:block text-align="right" font-style="italic" role="SKIP">
4682
+ <xsl:text> </xsl:text>
4683
+ <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4684
+ </fo:block>
4974
4685
 
4975
4686
  </fo:table-cell>
4976
4687
  </fo:table-row>
4977
4688
  </xsl:template> <!-- table-header-title -->
4978
4689
 
4979
4690
  <xsl:template name="refine_table-header-title-style">
4980
-
4981
4691
  </xsl:template> <!-- refine_table-header-title-style -->
4982
4692
 
4983
4693
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -5007,7 +4717,6 @@
5007
4717
  <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']"/>
5008
4718
 
5009
4719
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
5010
-
5011
4720
  </xsl:variable>
5012
4721
 
5013
4722
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -5069,26 +4778,19 @@
5069
4778
  <xsl:call-template name="setBordersTableArray"/>
5070
4779
 
5071
4780
  <!-- fn will be processed inside 'note' processing -->
5072
-
5073
- <!-- for BSI (not PAS) display Notes before footnotes -->
5074
-
5075
- <!-- except gb and bsi -->
5076
-
5077
- <xsl:apply-templates select="../*[local-name()='p']"/>
5078
- <xsl:apply-templates select="../*[local-name()='dl']"/>
5079
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
5080
- <xsl:apply-templates select="../*[local-name()='example']"/>
5081
- <xsl:apply-templates select="../*[local-name()='source']"/>
4781
+ <xsl:apply-templates select="../*[local-name()='p']"/>
4782
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
4783
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
4784
+ <xsl:apply-templates select="../*[local-name()='example']"/>
4785
+ <xsl:apply-templates select="../*[local-name()='source']"/>
5082
4786
 
5083
4787
  <xsl:variable name="isDisplayRowSeparator">
5084
-
5085
4788
  </xsl:variable>
5086
4789
 
5087
4790
  <!-- horizontal row separator -->
5088
4791
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
5089
4792
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
5090
4793
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
5091
-
5092
4794
  <xsl:call-template name="setBordersTableArray"/>
5093
4795
  <fo:block font-size="1pt"> </fo:block>
5094
4796
  </fo:block-container>
@@ -5096,11 +4798,8 @@
5096
4798
  </xsl:if>
5097
4799
 
5098
4800
  <!-- fn processing -->
5099
-
5100
- <!-- <xsl:call-template name="table_fn_display" /> -->
5101
- <xsl:copy-of select="$table_fn_block"/>
5102
-
5103
- <!-- for PAS display Notes after footnotes -->
4801
+ <!-- <xsl:call-template name="table_fn_display" /> -->
4802
+ <xsl:copy-of select="$table_fn_block"/>
5104
4803
 
5105
4804
  </fo:table-cell>
5106
4805
  </fo:table-row>
@@ -5132,18 +4831,15 @@
5132
4831
  </xsl:otherwise>
5133
4832
  </xsl:choose>
5134
4833
  </xsl:variable>
5135
-
5136
- <!-- if there isn't 'thead' and there is a table's title -->
5137
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
5138
- <fo:table-header>
5139
-
5140
- <xsl:attribute name="role">Caption</xsl:attribute>
5141
-
5142
- <xsl:call-template name="table-header-title">
5143
- <xsl:with-param name="cols-count" select="$cols-count"/>
5144
- </xsl:call-template>
5145
- </fo:table-header>
5146
- </xsl:if>
4834
+ <!-- if there isn't 'thead' and there is a table's title -->
4835
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
4836
+ <fo:table-header>
4837
+ <xsl:attribute name="role">Caption</xsl:attribute>
4838
+ <xsl:call-template name="table-header-title">
4839
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4840
+ </xsl:call-template>
4841
+ </fo:table-header>
4842
+ </xsl:if>
5147
4843
 
5148
4844
  <xsl:apply-templates select="../*[local-name()='thead']">
5149
4845
  <xsl:with-param name="cols-count" select="$cols-count"/>
@@ -5154,39 +4850,34 @@
5154
4850
  </xsl:call-template>
5155
4851
 
5156
4852
  <fo:table-body>
4853
+ <xsl:variable name="title_continued_">
4854
+ <xsl:call-template name="getLocalizedString">
4855
+ <xsl:with-param name="key">continued</xsl:with-param>
4856
+ </xsl:call-template>
4857
+ </xsl:variable>
5157
4858
 
5158
- <xsl:variable name="title_continued_">
5159
- <xsl:call-template name="getLocalizedString">
5160
- <xsl:with-param name="key">continued</xsl:with-param>
5161
- </xsl:call-template>
5162
- </xsl:variable>
5163
-
5164
- <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
5165
- <xsl:variable name="title_continued">
5166
- <xsl:value-of select="$title_continued_in_parenthesis"/>
5167
-
5168
- </xsl:variable>
5169
-
5170
- <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
5171
- <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
4859
+ <xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
4860
+ <xsl:variable name="title_continued"><xsl:value-of select="$title_continued_in_parenthesis"/>
4861
+ </xsl:variable>
5172
4862
 
5173
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5174
- <fo:table-cell role="SKIP">
4863
+ <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
4864
+ <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
5175
4865
 
5176
- <fo:marker marker-class-name="table_continued"/>
4866
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
4867
+ <fo:table-cell role="SKIP">
4868
+ <fo:marker marker-class-name="table_continued"/>
5177
4869
 
4870
+ <fo:block role="SKIP"/>
4871
+ </fo:table-cell>
4872
+ </fo:table-row>
4873
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
4874
+ <fo:table-cell role="SKIP">
4875
+ <fo:marker marker-class-name="table_continued">
4876
+ <xsl:value-of select="$title_continued"/>
4877
+ </fo:marker>
5178
4878
  <fo:block role="SKIP"/>
5179
- </fo:table-cell>
5180
- </fo:table-row>
5181
- <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
5182
- <fo:table-cell role="SKIP">
5183
-
5184
- <fo:marker marker-class-name="table_continued">
5185
- <xsl:value-of select="$title_continued"/>
5186
- </fo:marker>
5187
- <fo:block role="SKIP"/>
5188
- </fo:table-cell>
5189
- </fo:table-row>
4879
+ </fo:table-cell>
4880
+ </fo:table-row>
5190
4881
 
5191
4882
  <xsl:apply-templates/>
5192
4883
 
@@ -5272,7 +4963,7 @@
5272
4963
  <xsl:with-param name="pText" select="$border_under_row_"/>
5273
4964
  </xsl:call-template>
5274
4965
  </xsl:variable>
5275
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
4966
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
5276
4967
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
5277
4968
  </xsl:if>
5278
4969
  </xsl:when>
@@ -5389,7 +5080,7 @@
5389
5080
  </xsl:variable>
5390
5081
  <xsl:variable name="quot">"</xsl:variable>
5391
5082
  <xsl:variable name="styles_">
5392
- <xsl:for-each select="xalan:nodeset($styles__)/item">
5083
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
5393
5084
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5394
5085
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5395
5086
  <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'">
@@ -5439,9 +5130,7 @@
5439
5130
  <fo:block role="SKIP">
5440
5131
 
5441
5132
  <xsl:if test="$isGenerateTableIF = 'true'">
5442
-
5443
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5444
-
5133
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5445
5134
  </xsl:if>
5446
5135
 
5447
5136
  <xsl:apply-templates/>
@@ -5456,25 +5145,23 @@
5456
5145
 
5457
5146
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
5458
5147
  <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">
5148
+ <xsl:call-template name="setNamedDestination"/>
5149
+ <fo:block xsl:use-attribute-sets="table-note-style">
5150
+ <xsl:copy-of select="@id"/>
5459
5151
 
5460
- <xsl:call-template name="setNamedDestination"/>
5461
- <fo:block xsl:use-attribute-sets="table-note-style">
5462
- <xsl:copy-of select="@id"/>
5463
-
5464
- <xsl:call-template name="refine_table-note-style"/>
5465
-
5466
- <!-- Table's note/example name (NOTE, for example) -->
5467
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
5152
+ <xsl:call-template name="refine_table-note-style"/>
5468
5153
 
5469
- <xsl:call-template name="refine_table-note-name-style"/>
5154
+ <!-- Table's note/example name (NOTE, for example) -->
5155
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
5470
5156
 
5471
- <xsl:apply-templates select="*[local-name() = 'name']"/>
5157
+ <xsl:call-template name="refine_table-note-name-style"/>
5472
5158
 
5473
- </fo:inline>
5159
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
5474
5160
 
5475
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5476
- </fo:block>
5161
+ </fo:inline>
5477
5162
 
5163
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5164
+ </fo:block>
5478
5165
  </xsl:template> <!-- table/note -->
5479
5166
 
5480
5167
  <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">
@@ -5519,9 +5206,7 @@
5519
5206
  <xsl:variable name="current_fn_number" select="@reference"/>
5520
5207
 
5521
5208
  <xsl:variable name="current_fn_number_text">
5522
-
5523
- <xsl:value-of select="$current_fn_number"/>
5524
-
5209
+ <xsl:value-of select="$current_fn_number"/>
5525
5210
  </xsl:variable>
5526
5211
 
5527
5212
  <xsl:variable name="ref_id" select="@target"/>
@@ -5533,12 +5218,10 @@
5533
5218
  <xsl:choose>
5534
5219
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
5535
5220
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
5536
-
5537
5221
  </fn_styles>
5538
5222
  </xsl:when>
5539
5223
  <xsl:otherwise>
5540
5224
  <fn_styles xsl:use-attribute-sets="fn-num-style">
5541
-
5542
5225
  </fn_styles>
5543
5226
  </xsl:otherwise>
5544
5227
  </xsl:choose>
@@ -5556,7 +5239,6 @@
5556
5239
  <xsl:with-param name="element">
5557
5240
  <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 -->
5558
5241
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
5559
-
5560
5242
  <xsl:copy-of select="$current_fn_number_text"/>
5561
5243
 
5562
5244
  </fo:inline>
@@ -5594,10 +5276,9 @@
5594
5276
  <here><xsl:copy-of select="$footnotes"/></here> -->
5595
5277
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
5596
5278
  </xsl:variable>
5597
-
5598
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5599
- <xsl:copy-of select="$fn_block"/>
5600
- </fo:block>
5279
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5280
+ <xsl:copy-of select="$fn_block"/>
5281
+ </fo:block>
5601
5282
 
5602
5283
  </fo:block-container>
5603
5284
  </fo:footnote-body>
@@ -5674,21 +5355,20 @@
5674
5355
  <xsl:variable name="reference" select="@reference"/>
5675
5356
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
5676
5357
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
5358
+ <fo:block xsl:use-attribute-sets="table-fn-style">
5359
+ <xsl:copy-of select="@id"/>
5360
+ <xsl:call-template name="refine_table-fn-style"/>
5677
5361
 
5678
- <fo:block xsl:use-attribute-sets="table-fn-style">
5679
- <xsl:copy-of select="@id"/>
5680
- <xsl:call-template name="refine_table-fn-style"/>
5681
-
5682
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5683
- <xsl:with-param name="process">true</xsl:with-param>
5684
- </xsl:apply-templates>
5362
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5363
+ <xsl:with-param name="process">true</xsl:with-param>
5364
+ </xsl:apply-templates>
5685
5365
 
5686
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5687
- <!-- <xsl:copy-of select="./node()"/> -->
5688
- <xsl:apply-templates/>
5689
- </fo:inline>
5366
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5367
+ <!-- <xsl:copy-of select="./node()"/> -->
5368
+ <xsl:apply-templates/>
5369
+ </fo:inline>
5690
5370
 
5691
- </fo:block>
5371
+ </fo:block>
5692
5372
 
5693
5373
  <!-- </xsl:if> -->
5694
5374
  </xsl:for-each>
@@ -5741,7 +5421,6 @@
5741
5421
  <xsl:param name="process">false</xsl:param>
5742
5422
  <xsl:if test="$process = 'true'">
5743
5423
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
5744
-
5745
5424
  </xsl:if>
5746
5425
  </xsl:template>
5747
5426
 
@@ -5824,8 +5503,7 @@
5824
5503
 
5825
5504
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
5826
5505
 
5827
- <xsl:variable name="key_iso">
5828
- true
5506
+ <xsl:variable name="key_iso">true
5829
5507
  </xsl:variable>
5830
5508
 
5831
5509
  <fo:block>
@@ -5871,7 +5549,6 @@
5871
5549
  <fo:table width="95%" table-layout="fixed">
5872
5550
  <xsl:if test="normalize-space($key_iso) = 'true'">
5873
5551
  <xsl:attribute name="font-size">10pt</xsl:attribute>
5874
-
5875
5552
  </xsl:if>
5876
5553
  <xsl:choose>
5877
5554
  <!-- if there 'dl', then set same columns width -->
@@ -5895,23 +5572,19 @@
5895
5572
  <fo:table-row>
5896
5573
  <fo:table-cell>
5897
5574
  <fo:block>
5898
-
5899
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
5900
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
5901
- <!-- <xsl:value-of select="@reference"/> -->
5902
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
5903
- </fo:inline>
5575
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
5576
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
5577
+ <!-- <xsl:value-of select="@reference"/> -->
5578
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
5579
+ </fo:inline>
5904
5580
 
5905
5581
  </fo:block>
5906
5582
  </fo:table-cell>
5907
5583
  <fo:table-cell>
5908
5584
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
5909
5585
  <xsl:if test="normalize-space($key_iso) = 'true'">
5910
-
5911
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
5912
-
5586
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
5913
5587
  </xsl:if>
5914
-
5915
5588
  <!-- <xsl:copy-of select="./node()"/> -->
5916
5589
  <xsl:apply-templates/>
5917
5590
  </fo:block>
@@ -5960,12 +5633,10 @@
5960
5633
  <!-- figure's footnote label -->
5961
5634
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
5962
5635
  <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">
5963
- <xsl:variable name="key_iso">
5964
- true
5636
+ <xsl:variable name="key_iso">true
5965
5637
  </xsl:variable>
5966
5638
  <xsl:if test="normalize-space($key_iso) = 'true'">
5967
5639
  <xsl:attribute name="font-size">10pt</xsl:attribute>
5968
-
5969
5640
  </xsl:if>
5970
5641
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
5971
5642
  <!-- <xsl:value-of select="@reference"/> -->
@@ -6011,8 +5682,7 @@
6011
5682
  <xsl:text>※</xsl:text>
6012
5683
  </xsl:if> -->
6013
5684
  <!-- <xsl:value-of select="@reference"/> -->
6014
-
6015
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
5685
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
6016
5686
 
6017
5687
  <!-- <xsl:if test="$namespace = 'bsi'">
6018
5688
  <xsl:text>)</xsl:text>
@@ -6084,10 +5754,9 @@
6084
5754
  </xsl:if>
6085
5755
 
6086
5756
  <xsl:call-template name="setBlockSpanAll"/>
6087
-
6088
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
6089
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6090
- </xsl:if>
5757
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
5758
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
5759
+ </xsl:if>
6091
5760
 
6092
5761
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
6093
5762
  <!-- set font-size as sourcecode font-size -->
@@ -6108,7 +5777,6 @@
6108
5777
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6109
5778
  </xsl:choose>
6110
5779
  </xsl:attribute>
6111
-
6112
5780
  </xsl:if>
6113
5781
 
6114
5782
  <xsl:call-template name="setTrackChangesStyles">
@@ -6117,41 +5785,34 @@
6117
5785
  </xsl:call-template>
6118
5786
 
6119
5787
  <fo:block-container margin-left="0mm" role="SKIP">
6120
-
6121
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
5788
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
6122
5789
 
6123
5790
  <xsl:variable name="parent" select="local-name(..)"/>
6124
5791
 
6125
5792
  <xsl:variable name="key_iso">
6126
-
6127
- <xsl:if test="$parent = 'figure' or $parent = 'formula' or ../@key = 'true'">true</xsl:if>
6128
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
5793
+ <xsl:if test="$parent = 'figure' or $parent = 'formula' or ../@key = 'true'">true</xsl:if> <!-- and (not(../@class) or ../@class !='pseudocode') -->
6129
5794
  </xsl:variable>
6130
5795
 
6131
5796
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
6132
5797
 
6133
5798
  <xsl:choose>
6134
5799
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
6135
-
6136
- <fo:block margin-bottom="12pt" text-align="left">
6137
-
6138
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
6139
-
6140
- <!-- <xsl:variable name="title-where">
5800
+ <fo:block margin-bottom="12pt" text-align="left">
5801
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
5802
+ <!-- <xsl:variable name="title-where">
6141
5803
  <xsl:call-template name="getLocalizedString">
6142
5804
  <xsl:with-param name="key">where</xsl:with-param>
6143
5805
  </xsl:call-template>
6144
5806
  </xsl:variable>
6145
5807
  <xsl:value-of select="$title-where"/> -->
6146
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
6147
- <xsl:text> </xsl:text>
6148
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
6149
- <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
6150
- <xsl:text> </xsl:text>
6151
- </xsl:if>
6152
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
6153
- </fo:block>
6154
-
5808
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
5809
+ <xsl:text> </xsl:text>
5810
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
5811
+ <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
5812
+ <xsl:text> </xsl:text>
5813
+ </xsl:if>
5814
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
5815
+ </fo:block>
6155
5816
  </xsl:when> <!-- END: only one component -->
6156
5817
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
6157
5818
  <fo:block margin-bottom="12pt" text-align="left">
@@ -6171,19 +5832,17 @@
6171
5832
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
6172
5833
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
6173
5834
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
5835
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6174
5836
 
6175
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6176
-
6177
- <xsl:call-template name="refine_figure_key_style"/>
6178
-
6179
- <xsl:variable name="title-key">
6180
- <xsl:call-template name="getLocalizedString">
6181
- <xsl:with-param name="key">key</xsl:with-param>
6182
- </xsl:call-template>
6183
- </xsl:variable>
6184
- <xsl:value-of select="$title-key"/>
6185
- </fo:block>
5837
+ <xsl:call-template name="refine_figure_key_style"/>
6186
5838
 
5839
+ <xsl:variable name="title-key">
5840
+ <xsl:call-template name="getLocalizedString">
5841
+ <xsl:with-param name="key">key</xsl:with-param>
5842
+ </xsl:call-template>
5843
+ </xsl:variable>
5844
+ <xsl:value-of select="$title-key"/>
5845
+ </fo:block>
6187
5846
  </xsl:if>
6188
5847
  </xsl:when> <!-- END: definition list in a figure -->
6189
5848
  </xsl:choose>
@@ -6216,12 +5875,10 @@
6216
5875
  <xsl:if test="$isGenerateTableIF = 'true'">
6217
5876
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
6218
5877
  </xsl:if>
6219
-
6220
5878
  <xsl:choose>
6221
5879
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
6222
5880
  <xsl:when test="normalize-space($key_iso) = 'true'">
6223
5881
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6224
-
6225
5882
  </xsl:when>
6226
5883
  </xsl:choose>
6227
5884
 
@@ -6326,17 +5983,15 @@
6326
5983
  <xsl:call-template name="getMaxLength_dt"/>
6327
5984
  </xsl:variable>
6328
5985
 
6329
- <xsl:variable name="isContainsKeepTogetherTag_">
6330
- false
5986
+ <xsl:variable name="isContainsKeepTogetherTag_">false
6331
5987
  </xsl:variable>
6332
5988
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
6333
5989
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
6334
-
6335
- <xsl:call-template name="setColumnWidth_dl">
6336
- <xsl:with-param name="colwidths" select="$colwidths"/>
6337
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
6338
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
6339
- </xsl:call-template>
5990
+ <xsl:call-template name="setColumnWidth_dl">
5991
+ <xsl:with-param name="colwidths" select="$colwidths"/>
5992
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
5993
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
5994
+ </xsl:call-template>
6340
5995
 
6341
5996
  <fo:table-body>
6342
5997
 
@@ -6387,31 +6042,24 @@
6387
6042
  </xsl:template>
6388
6043
 
6389
6044
  <xsl:template name="refine_dl_formula_where_style">
6390
-
6391
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
6392
-
6045
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
6393
6046
  </xsl:template> <!-- refine_dl_formula_where_style -->
6394
6047
 
6395
6048
  <xsl:template name="refine_figure_key_style">
6396
-
6397
- <xsl:attribute name="font-size">10pt</xsl:attribute>
6398
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
6399
-
6049
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
6050
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
6400
6051
  </xsl:template> <!-- refine_figure_key_style -->
6401
6052
 
6402
6053
  <xsl:template name="refine_multicomponent_style">
6403
6054
  <xsl:variable name="parent" select="local-name(..)"/>
6404
-
6405
- <xsl:if test="$parent = 'formula'">
6406
- <xsl:attribute name="margin-left">4mm</xsl:attribute>
6407
- </xsl:if>
6408
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
6409
-
6055
+ <xsl:if test="$parent = 'formula'">
6056
+ <xsl:attribute name="margin-left">4mm</xsl:attribute>
6057
+ </xsl:if>
6058
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
6410
6059
  </xsl:template> <!-- refine_multicomponent_style -->
6411
6060
 
6412
6061
  <xsl:template name="refine_multicomponent_block_style">
6413
6062
  <xsl:variable name="parent" select="local-name(..)"/>
6414
-
6415
6063
  </xsl:template> <!-- refine_multicomponent_block_style -->
6416
6064
 
6417
6065
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -6598,14 +6246,11 @@
6598
6246
  <xsl:attribute name="id">
6599
6247
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
6600
6248
  </xsl:attribute>
6601
-
6602
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6603
- <xsl:with-param name="process">true</xsl:with-param>
6604
- </xsl:apply-templates>
6605
-
6249
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6250
+ <xsl:with-param name="process">true</xsl:with-param>
6251
+ </xsl:apply-templates>
6606
6252
  </td>
6607
6253
  </tr>
6608
-
6609
6254
  </xsl:template>
6610
6255
 
6611
6256
  <!-- Definition's term -->
@@ -6614,7 +6259,6 @@
6614
6259
  <xsl:param name="split_keep-within-line"/>
6615
6260
 
6616
6261
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
6617
-
6618
6262
  <xsl:call-template name="insert_dt_cell">
6619
6263
  <xsl:with-param name="key_iso" select="$key_iso"/>
6620
6264
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -6636,7 +6280,6 @@
6636
6280
  <!-- border is mandatory, to calculate real width -->
6637
6281
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
6638
6282
  <xsl:attribute name="text-align">left</xsl:attribute>
6639
-
6640
6283
  </xsl:if>
6641
6284
 
6642
6285
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -6646,9 +6289,7 @@
6646
6289
 
6647
6290
  <xsl:choose>
6648
6291
  <xsl:when test="$isGenerateTableIF = 'true'">
6649
-
6650
- <xsl:copy-of select="@id"/>
6651
-
6292
+ <xsl:copy-of select="@id"/>
6652
6293
  </xsl:when>
6653
6294
  <xsl:otherwise>
6654
6295
  <xsl:copy-of select="@id"/>
@@ -6685,9 +6326,7 @@
6685
6326
  <fo:block role="SKIP">
6686
6327
 
6687
6328
  <xsl:if test="$isGenerateTableIF = 'true'">
6688
-
6689
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6690
-
6329
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6691
6330
  </xsl:if>
6692
6331
 
6693
6332
  <xsl:choose>
@@ -6835,7 +6474,6 @@
6835
6474
  </xsl:template>
6836
6475
 
6837
6476
  <xsl:template name="refine_italic_style">
6838
-
6839
6477
  </xsl:template>
6840
6478
 
6841
6479
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -6851,7 +6489,6 @@
6851
6489
  </xsl:template>
6852
6490
 
6853
6491
  <xsl:template name="refine_strong_style">
6854
-
6855
6492
  <xsl:if test="ancestor::*['preferred']">
6856
6493
  <xsl:attribute name="role">SKIP</xsl:attribute>
6857
6494
  </xsl:if>
@@ -6876,13 +6513,7 @@
6876
6513
  <xsl:template match="*[local-name()='tt']">
6877
6514
  <fo:inline xsl:use-attribute-sets="tt-style">
6878
6515
 
6879
- <xsl:variable name="_font-size">
6880
-
6881
- <!-- inherit -->
6882
-
6883
- 10
6884
-
6885
-
6516
+ <xsl:variable name="_font-size"> <!-- inherit -->10
6886
6517
  </xsl:variable>
6887
6518
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
6888
6519
  <xsl:if test="$font-size != ''">
@@ -7098,8 +6729,7 @@
7098
6729
  </xsl:otherwise>
7099
6730
  </xsl:choose>
7100
6731
  </xsl:variable>
7101
- <xsl:variable name="ratio_">
7102
- 0.75
6732
+ <xsl:variable name="ratio_">0.75
7103
6733
  </xsl:variable>
7104
6734
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
7105
6735
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -7189,7 +6819,7 @@
7189
6819
 
7190
6820
  <xsl:variable name="quot">"</xsl:variable>
7191
6821
  <xsl:variable name="styles_">
7192
- <xsl:for-each select="xalan:nodeset($styles__)/item">
6822
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
7193
6823
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7194
6824
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
7195
6825
  <xsl:variable name="value">
@@ -7201,7 +6831,7 @@
7201
6831
  </xsl:otherwise>
7202
6832
  </xsl:choose>
7203
6833
  </xsl:variable>
7204
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
6834
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
7205
6835
  <style name="{$key}"><xsl:value-of select="$value"/></style>
7206
6836
  </xsl:if>
7207
6837
  <xsl:if test="$key = 'text-indent'">
@@ -7215,7 +6845,6 @@
7215
6845
  <fo:inline>
7216
6846
  <xsl:for-each select="$styles/style">
7217
6847
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
7218
-
7219
6848
  </xsl:for-each>
7220
6849
  <xsl:apply-templates/>
7221
6850
  </fo:inline>
@@ -8202,10 +7831,9 @@
8202
7831
  <xsl:variable name="mathml_content">
8203
7832
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
8204
7833
  </xsl:variable>
8205
-
8206
- <xsl:call-template name="mathml_instream_object">
8207
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
8208
- </xsl:call-template>
7834
+ <xsl:call-template name="mathml_instream_object">
7835
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
7836
+ </xsl:call-template>
8209
7837
 
8210
7838
  </fo:inline>
8211
7839
  </xsl:template>
@@ -8239,7 +7867,6 @@
8239
7867
  <xsl:template name="getMathml_asciimath_text">
8240
7868
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
8241
7869
  <xsl:variable name="latexmath">
8242
-
8243
7870
  </xsl:variable>
8244
7871
  <xsl:variable name="asciimath_text_following">
8245
7872
  <xsl:choose>
@@ -8312,14 +7939,12 @@
8312
7939
  </xsl:template>
8313
7940
 
8314
7941
  <xsl:template name="refine_mathml_insteam_object_style">
8315
-
8316
- <xsl:if test="local-name(../..) = 'formula' or (local-name(../..) = 'td' and count(../../*) = 1)">
8317
- <xsl:attribute name="width">95%</xsl:attribute>
8318
- <xsl:attribute name="content-height">100%</xsl:attribute>
8319
- <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
8320
- <xsl:attribute name="scaling">uniform</xsl:attribute>
8321
- </xsl:if>
8322
-
7942
+ <xsl:if test="local-name(../..) = 'formula' or (local-name(../..) = 'td' and count(../../*) = 1)">
7943
+ <xsl:attribute name="width">95%</xsl:attribute>
7944
+ <xsl:attribute name="content-height">100%</xsl:attribute>
7945
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
7946
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
7947
+ </xsl:if>
8323
7948
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
8324
7949
 
8325
7950
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -8717,7 +8342,6 @@
8717
8342
  <xsl:variable name="annotation-id" select="@id"/>
8718
8343
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
8719
8344
  <fo:block id="{$annotation-id}" white-space="nowrap">
8720
-
8721
8345
  <fo:inline>
8722
8346
  <xsl:apply-templates>
8723
8347
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -8746,7 +8370,6 @@
8746
8370
  <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'])">
8747
8371
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
8748
8372
  </xsl:if>
8749
-
8750
8373
  <xsl:if test="parent::*[local-name() = 'add']">
8751
8374
  <xsl:call-template name="append_add-style"/>
8752
8375
  </xsl:if>
@@ -8757,8 +8380,7 @@
8757
8380
  </xsl:template>
8758
8381
 
8759
8382
  <!-- command between two xref points to non-standard bibitem -->
8760
- <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']]]">
8761
- <xsl:value-of select="."/>
8383
+ <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="."/>
8762
8384
  </xsl:template>
8763
8385
 
8764
8386
  <!-- ====== -->
@@ -8773,7 +8395,6 @@
8773
8395
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
8774
8396
  </xsl:choose>
8775
8397
  </xsl:attribute>
8776
-
8777
8398
  </xsl:if>
8778
8399
  <fo:block-container margin-left="0mm" role="SKIP">
8779
8400
  <xsl:call-template name="setNamedDestination"/>
@@ -8863,53 +8484,49 @@
8863
8484
 
8864
8485
  <xsl:template match="*[local-name() = 'note']" name="note">
8865
8486
 
8866
- <xsl:call-template name="setNamedDestination"/>
8867
-
8868
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
8869
-
8870
- <xsl:call-template name="setBlockSpanAll"/>
8871
-
8872
- <xsl:call-template name="refine_note-style"/>
8487
+ <xsl:call-template name="setNamedDestination"/>
8873
8488
 
8874
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8489
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
8875
8490
 
8876
- <fo:block>
8491
+ <xsl:call-template name="setBlockSpanAll"/>
8877
8492
 
8878
- <xsl:call-template name="refine_note_block_style"/>
8493
+ <xsl:call-template name="refine_note-style"/>
8879
8494
 
8880
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
8495
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8496
+ <fo:block>
8881
8497
 
8882
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
8498
+ <xsl:call-template name="refine_note_block_style"/>
8883
8499
 
8884
- <xsl:call-template name="refine_note-name-style"/>
8500
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
8885
8501
 
8886
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8887
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
8888
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8889
- <xsl:call-template name="append_add-style"/>
8890
- </xsl:if>
8502
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
8891
8503
 
8892
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
8893
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8894
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8895
- <xsl:with-param name="skip">false</xsl:with-param>
8896
- </xsl:apply-templates>
8897
- </xsl:if>
8504
+ <xsl:call-template name="refine_note-name-style"/>
8898
8505
 
8899
- <xsl:apply-templates select="*[local-name() = 'name']"/>
8506
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8507
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
8508
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8509
+ <xsl:call-template name="append_add-style"/>
8510
+ </xsl:if>
8900
8511
 
8901
- </fo:inline>
8512
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
8513
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8514
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8515
+ <xsl:with-param name="skip">false</xsl:with-param>
8516
+ </xsl:apply-templates>
8517
+ </xsl:if>
8902
8518
 
8903
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8904
- </fo:block>
8519
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
8905
8520
 
8906
- </fo:block-container>
8907
- </fo:block-container>
8521
+ </fo:inline>
8908
8522
 
8523
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8524
+ </fo:block>
8525
+ </fo:block-container>
8526
+ </fo:block-container>
8909
8527
  </xsl:template>
8910
8528
 
8911
8529
  <xsl:template name="refine_note_block_style">
8912
-
8913
8530
  </xsl:template> <!-- refine_note_block_style -->
8914
8531
 
8915
8532
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -8962,7 +8579,6 @@
8962
8579
  <xsl:value-of select="$sfx"/>
8963
8580
  </xsl:when>
8964
8581
  <xsl:otherwise>
8965
-
8966
8582
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
8967
8583
  <!-- <xsl:if test="$namespace = 'ieee'">
8968
8584
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -8970,7 +8586,6 @@
8970
8586
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
8971
8587
  <xsl:text>:</xsl:text>
8972
8588
  </xsl:if> -->
8973
-
8974
8589
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
8975
8590
  <xsl:text> – </xsl:text> en dash &#x2013;
8976
8591
  </xsl:if> -->
@@ -8991,7 +8606,6 @@
8991
8606
  <xsl:value-of select="$sfx"/>
8992
8607
  </xsl:when>
8993
8608
  <xsl:otherwise>
8994
-
8995
8609
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
8996
8610
  <!-- <xsl:if test="$namespace = 'ieee'">
8997
8611
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -9047,7 +8661,6 @@
9047
8661
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
9048
8662
 
9049
8663
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
9050
-
9051
8664
  </xsl:if>
9052
8665
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
9053
8666
  </fo:block>
@@ -9087,8 +8700,7 @@
9087
8700
  <!-- Example: Dimensions in millimeters -->
9088
8701
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
9089
8702
 
9090
- <xsl:variable name="show_figure_key_in_block_container">
9091
- true
8703
+ <xsl:variable name="show_figure_key_in_block_container">true
9092
8704
  </xsl:variable>
9093
8705
 
9094
8706
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -9103,11 +8715,9 @@
9103
8715
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
9104
8716
  <xsl:call-template name="showFigureKey"/>
9105
8717
  </xsl:if>
9106
-
9107
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
8718
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
9108
8719
 
9109
8720
  </fo:block-container>
9110
-
9111
8721
  </xsl:template>
9112
8722
 
9113
8723
  <xsl:template name="showFigureKey">
@@ -9145,13 +8755,12 @@
9145
8755
  <!-- SOURCE: ... -->
9146
8756
  <!-- figure/source -->
9147
8757
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
9148
-
9149
- <xsl:call-template name="termsource"/>
9150
-
8758
+ <xsl:call-template name="termsource"/>
9151
8759
  </xsl:template>
9152
8760
 
9153
8761
  <xsl:template match="*[local-name() = 'image']">
9154
8762
  <xsl:param name="indent">0</xsl:param>
8763
+ <xsl:param name="logo_width"/>
9155
8764
  <xsl:variable name="isAdded" select="../@added"/>
9156
8765
  <xsl:variable name="isDeleted" select="../@deleted"/>
9157
8766
  <xsl:choose>
@@ -9173,9 +8782,18 @@
9173
8782
 
9174
8783
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
9175
8784
 
9176
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
9177
8785
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
9178
8786
 
8787
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
8788
+ <xsl:attribute name="width">100%</xsl:attribute>
8789
+ <xsl:if test="normalize-space($logo_width) != ''">
8790
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
8791
+ </xsl:if>
8792
+ <xsl:attribute name="content-height">100%</xsl:attribute>
8793
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
8794
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
8795
+ </xsl:if>
8796
+
9179
8797
  <xsl:variable name="width">
9180
8798
  <xsl:call-template name="setImageWidth"/>
9181
8799
  </xsl:variable>
@@ -9253,8 +8871,7 @@
9253
8871
  </xsl:call-template>
9254
8872
  </xsl:variable>
9255
8873
 
9256
- <xsl:variable name="scaleRatio">
9257
- 1
8874
+ <xsl:variable name="scaleRatio">1
9258
8875
  </xsl:variable>
9259
8876
 
9260
8877
  <xsl:if test="number($scale) &lt; 100">
@@ -9365,18 +8982,14 @@
9365
8982
  </xsl:variable>
9366
8983
 
9367
8984
  <xsl:variable name="image_width_effective">
9368
-
9369
- <xsl:value-of select="$width_effective - number($indent_left)"/>
9370
-
8985
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
9371
8986
  </xsl:variable>
9372
8987
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
9373
8988
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
9374
8989
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
9375
8990
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
9376
8991
  <xsl:variable name="scale">
9377
-
9378
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9379
-
8992
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9380
8993
  </xsl:variable>
9381
8994
  <xsl:value-of select="$scale"/>
9382
8995
  </xsl:template>
@@ -9397,7 +9010,8 @@
9397
9010
  </xsl:when>
9398
9011
  <xsl:when test="not(starts-with(@src, 'data:'))">
9399
9012
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
9400
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
9013
+ <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>
9014
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
9401
9015
  </xsl:when>
9402
9016
  <xsl:otherwise>
9403
9017
  <xsl:value-of select="@src"/>
@@ -9693,8 +9307,8 @@
9693
9307
  </xsl:call-template>
9694
9308
  </xsl:variable>
9695
9309
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
9696
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
9697
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
9310
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
9311
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
9698
9312
 
9699
9313
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
9700
9314
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -9766,8 +9380,8 @@
9766
9380
  </xsl:variable>
9767
9381
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
9768
9382
  <xsl:variable name="att_name" select="local-name()"/>
9769
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
9770
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
9383
+ <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>
9384
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
9771
9385
  </xsl:template>
9772
9386
 
9773
9387
  <!-- ============== -->
@@ -9840,13 +9454,13 @@
9840
9454
  </xsl:call-template>
9841
9455
  </xsl:variable>
9842
9456
  <xsl:variable name="x_coords">
9843
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
9457
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
9844
9458
  <xsl:sort select="." data-type="number"/>
9845
9459
  <x><xsl:value-of select="."/></x>
9846
9460
  </xsl:for-each>
9847
9461
  </xsl:variable>
9848
9462
  <xsl:variable name="y_coords">
9849
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
9463
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
9850
9464
  <xsl:sort select="." data-type="number"/>
9851
9465
  <y><xsl:value-of select="."/></y>
9852
9466
  </xsl:for-each>
@@ -10051,11 +9665,11 @@
10051
9665
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
10052
9666
  </xsl:variable>
10053
9667
 
10054
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
10055
- <title>
9668
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
9669
+ <mn:title>
10056
9670
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
10057
- </title>
10058
- </item>
9671
+ </mn:title>
9672
+ </mn:item>
10059
9673
  </xsl:if>
10060
9674
  </xsl:template>
10061
9675
 
@@ -10126,12 +9740,12 @@
10126
9740
  <xsl:param name="contents"/>
10127
9741
  <xsl:param name="contents_addon"/>
10128
9742
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10129
- <xsl:if test="$contents_nodes//item">
9743
+ <xsl:if test="$contents_nodes//mn:item">
10130
9744
  <fo:bookmark-tree>
10131
9745
  <xsl:choose>
10132
- <xsl:when test="$contents_nodes/doc">
9746
+ <xsl:when test="$contents_nodes/mn:doc">
10133
9747
  <xsl:choose>
10134
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
9748
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
10135
9749
 
10136
9750
  <xsl:if test="$contents_nodes/collection">
10137
9751
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -10139,8 +9753,8 @@
10139
9753
  </fo:bookmark>
10140
9754
  </xsl:if>
10141
9755
 
10142
- <xsl:for-each select="$contents_nodes/doc">
10143
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
9756
+ <xsl:for-each select="$contents_nodes/mn:doc">
9757
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
10144
9758
  <xsl:if test="@bundle = 'true'">
10145
9759
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
10146
9760
  </xsl:if>
@@ -10174,14 +9788,14 @@
10174
9788
  </xsl:choose>
10175
9789
  </fo:bookmark-title>
10176
9790
 
10177
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
9791
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
10178
9792
 
10179
9793
  <xsl:call-template name="insertFigureBookmarks">
10180
- <xsl:with-param name="contents" select="contents"/>
9794
+ <xsl:with-param name="contents" select="mn:contents"/>
10181
9795
  </xsl:call-template>
10182
9796
 
10183
9797
  <xsl:call-template name="insertTableBookmarks">
10184
- <xsl:with-param name="contents" select="contents"/>
9798
+ <xsl:with-param name="contents" select="mn:contents"/>
10185
9799
  <xsl:with-param name="lang" select="@lang"/>
10186
9800
  </xsl:call-template>
10187
9801
 
@@ -10190,16 +9804,16 @@
10190
9804
  </xsl:for-each>
10191
9805
  </xsl:when>
10192
9806
  <xsl:otherwise>
10193
- <xsl:for-each select="$contents_nodes/doc">
9807
+ <xsl:for-each select="$contents_nodes/mn:doc">
10194
9808
 
10195
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
9809
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
10196
9810
 
10197
9811
  <xsl:call-template name="insertFigureBookmarks">
10198
- <xsl:with-param name="contents" select="contents"/>
9812
+ <xsl:with-param name="contents" select="mn:contents"/>
10199
9813
  </xsl:call-template>
10200
9814
 
10201
9815
  <xsl:call-template name="insertTableBookmarks">
10202
- <xsl:with-param name="contents" select="contents"/>
9816
+ <xsl:with-param name="contents" select="mn:contents"/>
10203
9817
  <xsl:with-param name="lang" select="@lang"/>
10204
9818
  </xsl:call-template>
10205
9819
 
@@ -10208,14 +9822,14 @@
10208
9822
  </xsl:choose>
10209
9823
  </xsl:when>
10210
9824
  <xsl:otherwise>
10211
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
9825
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
10212
9826
 
10213
9827
  <xsl:call-template name="insertFigureBookmarks">
10214
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
9828
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10215
9829
  </xsl:call-template>
10216
9830
 
10217
9831
  <xsl:call-template name="insertTableBookmarks">
10218
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
9832
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10219
9833
  <xsl:with-param name="lang" select="@lang"/>
10220
9834
  </xsl:call-template>
10221
9835
 
@@ -10232,80 +9846,72 @@
10232
9846
  <xsl:template name="insertFigureBookmarks">
10233
9847
  <xsl:param name="contents"/>
10234
9848
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10235
- <xsl:if test="$contents_nodes/figure">
10236
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
9849
+ <xsl:if test="$contents_nodes/mn:figure">
9850
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
10237
9851
  <fo:bookmark-title>Figures</fo:bookmark-title>
10238
- <xsl:for-each select="$contents_nodes/figure">
9852
+ <xsl:for-each select="$contents_nodes/mn:figure">
10239
9853
  <fo:bookmark internal-destination="{@id}">
10240
9854
  <fo:bookmark-title>
10241
- <xsl:value-of select="normalize-space(title)"/>
9855
+ <xsl:value-of select="normalize-space(mn:title)"/>
10242
9856
  </fo:bookmark-title>
10243
9857
  </fo:bookmark>
10244
9858
  </xsl:for-each>
10245
9859
  </fo:bookmark>
10246
9860
  </xsl:if>
9861
+ <xsl:if test="$contents_nodes//mn:figures/mn:figure">
9862
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10247
9863
 
10248
- <xsl:if test="$contents_nodes//figures/figure">
10249
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10250
-
10251
- <xsl:variable name="bookmark-title">
10252
-
10253
- <xsl:value-of select="$title-list-figures"/>
10254
-
10255
- </xsl:variable>
10256
- <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
10257
- <xsl:for-each select="$contents_nodes//figures/figure">
10258
- <fo:bookmark internal-destination="{@id}">
10259
- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
10260
- </fo:bookmark>
10261
- </xsl:for-each>
9864
+ <xsl:variable name="bookmark-title">
9865
+ <xsl:value-of select="$title-list-figures"/>
9866
+ </xsl:variable>
9867
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
9868
+ <xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
9869
+ <fo:bookmark internal-destination="{@id}">
9870
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
10262
9871
  </fo:bookmark>
10263
- </xsl:if>
10264
-
9872
+ </xsl:for-each>
9873
+ </fo:bookmark>
9874
+ </xsl:if>
10265
9875
  </xsl:template> <!-- insertFigureBookmarks -->
10266
9876
 
10267
9877
  <xsl:template name="insertTableBookmarks">
10268
9878
  <xsl:param name="contents"/>
10269
9879
  <xsl:param name="lang"/>
10270
9880
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10271
- <xsl:if test="$contents_nodes/table">
10272
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
9881
+ <xsl:if test="$contents_nodes/mn:table">
9882
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
10273
9883
  <fo:bookmark-title>
10274
9884
  <xsl:choose>
10275
9885
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
10276
9886
  <xsl:otherwise>Tables</xsl:otherwise>
10277
9887
  </xsl:choose>
10278
9888
  </fo:bookmark-title>
10279
- <xsl:for-each select="$contents_nodes/table">
9889
+ <xsl:for-each select="$contents_nodes/mn:table">
10280
9890
  <fo:bookmark internal-destination="{@id}">
10281
9891
  <fo:bookmark-title>
10282
- <xsl:value-of select="normalize-space(title)"/>
9892
+ <xsl:value-of select="normalize-space(mn:title)"/>
10283
9893
  </fo:bookmark-title>
10284
9894
  </fo:bookmark>
10285
9895
  </xsl:for-each>
10286
9896
  </fo:bookmark>
10287
9897
  </xsl:if>
9898
+ <xsl:if test="$contents_nodes//mn:tables/mn:table">
9899
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10288
9900
 
10289
- <xsl:if test="$contents_nodes//tables/table">
10290
- <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
10291
-
10292
- <xsl:variable name="bookmark-title">
10293
-
10294
- <xsl:value-of select="$title-list-tables"/>
10295
-
10296
- </xsl:variable>
9901
+ <xsl:variable name="bookmark-title">
9902
+ <xsl:value-of select="$title-list-tables"/>
9903
+ </xsl:variable>
10297
9904
 
10298
- <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
9905
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
10299
9906
 
10300
- <xsl:for-each select="$contents_nodes//tables/table">
10301
- <fo:bookmark internal-destination="{@id}">
10302
- <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
10303
- <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
10304
- </fo:bookmark>
10305
- </xsl:for-each>
9907
+ <xsl:for-each select="$contents_nodes//mn:tables/mn:table">
9908
+ <fo:bookmark internal-destination="{@id}">
9909
+ <!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
9910
+ <fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
10306
9911
  </fo:bookmark>
10307
- </xsl:if>
10308
-
9912
+ </xsl:for-each>
9913
+ </fo:bookmark>
9914
+ </xsl:if>
10309
9915
  </xsl:template> <!-- insertTableBookmarks -->
10310
9916
  <!-- End Bookmarks -->
10311
9917
 
@@ -10335,17 +9941,15 @@
10335
9941
  <xsl:param name="title" select="''"/>
10336
9942
  <xsl:choose>
10337
9943
  <xsl:when test="$lang = 'en'">
10338
-
10339
9944
  </xsl:when>
10340
9945
  <xsl:when test="$lang = 'fr'">
10341
-
10342
9946
  </xsl:when>
10343
9947
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
10344
9948
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
10345
9949
  </xsl:choose>
10346
9950
  </xsl:template>
10347
9951
 
10348
- <xsl:template match="item" mode="bookmark">
9952
+ <xsl:template match="mn:item" mode="bookmark">
10349
9953
  <xsl:choose>
10350
9954
  <xsl:when test="@id != ''">
10351
9955
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -10355,7 +9959,7 @@
10355
9959
  <xsl:text> </xsl:text>
10356
9960
  </xsl:if>
10357
9961
  <xsl:variable name="title">
10358
- <xsl:for-each select="title/node()">
9962
+ <xsl:for-each select="mn:title/node()">
10359
9963
  <xsl:choose>
10360
9964
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
10361
9965
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -10373,7 +9977,7 @@
10373
9977
  </xsl:choose>
10374
9978
  </xsl:template>
10375
9979
 
10376
- <xsl:template match="title" mode="bookmark"/>
9980
+ <xsl:template match="mn:title" mode="bookmark"/>
10377
9981
  <xsl:template match="text()" mode="bookmark"/>
10378
9982
 
10379
9983
  <!-- figure/name -->
@@ -10602,9 +10206,9 @@
10602
10206
  <xsl:template match="text()" mode="contents_item">
10603
10207
  <xsl:variable name="text">
10604
10208
  <!-- to split by '_' and other chars -->
10605
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
10209
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
10606
10210
  </xsl:variable>
10607
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
10211
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
10608
10212
  <xsl:call-template name="keep_together_standard_number"/>
10609
10213
  </xsl:for-each>
10610
10214
  </xsl:template>
@@ -10633,19 +10237,11 @@
10633
10237
  <xsl:attribute name="{@name}">
10634
10238
  <xsl:value-of select="@value"/>
10635
10239
  </xsl:attribute>
10636
- </xsl:template>
10637
-
10638
- <xsl:template name="get_sourcecode_attributes">
10639
- <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
10640
- <xsl:variable name="_font-size">
10641
-
10642
- <!-- inherit -->
10643
-
10644
- 9
10645
- <!-- <xsl:if test="$namespace = 'ieee'">
10646
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
10647
- </xsl:if> -->
10240
+ </xsl:template>
10648
10241
 
10242
+ <xsl:template name="get_sourcecode_attributes">
10243
+ <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
10244
+ <xsl:variable name="_font-size"><!-- inherit -->9
10649
10245
  </xsl:variable>
10650
10246
 
10651
10247
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -10701,7 +10297,6 @@
10701
10297
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
10702
10298
  </xsl:choose>
10703
10299
  </xsl:attribute>
10704
-
10705
10300
  </xsl:if>
10706
10301
  <fo:block-container margin-left="0mm" role="SKIP">
10707
10302
 
@@ -10725,8 +10320,7 @@
10725
10320
  </fo:block>
10726
10321
 
10727
10322
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
10728
-
10729
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
10323
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
10730
10324
 
10731
10325
  </fo:block-container>
10732
10326
  </fo:block-container>
@@ -10903,25 +10497,6 @@
10903
10497
  </xsl:choose>
10904
10498
  </xsl:template>
10905
10499
 
10906
- <!-- insert 'char' between each character in the string -->
10907
- <xsl:template name="interspers">
10908
- <xsl:param name="str"/>
10909
- <xsl:param name="char" select="$zero_width_space"/>
10910
- <xsl:if test="$str != ''">
10911
- <xsl:value-of select="substring($str, 1, 1)"/>
10912
-
10913
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
10914
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
10915
- <xsl:value-of select="$char"/>
10916
- </xsl:if>
10917
-
10918
- <xsl:call-template name="interspers">
10919
- <xsl:with-param name="str" select="substring($str, 2)"/>
10920
- <xsl:with-param name="char" select="$char"/>
10921
- </xsl:call-template>
10922
- </xsl:if>
10923
- </xsl:template>
10924
-
10925
10500
  <xsl:template name="interspers-java">
10926
10501
  <xsl:param name="str"/>
10927
10502
  <xsl:param name="char" select="$zero_width_space"/>
@@ -11018,7 +10593,7 @@
11018
10593
  </xsl:variable>
11019
10594
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
11020
10595
 
11021
- <xsl:for-each select="$classes/item">
10596
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
11022
10597
  <xsl:variable name="class_name" select="."/>
11023
10598
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
11024
10599
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -11101,12 +10676,9 @@
11101
10676
 
11102
10677
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
11103
10678
  <xsl:if test="normalize-space() != ''">
11104
-
11105
- <fo:block xsl:use-attribute-sets="permission-name-style">
11106
- <xsl:apply-templates/>
11107
-
11108
- </fo:block>
11109
-
10679
+ <fo:block xsl:use-attribute-sets="permission-name-style">
10680
+ <xsl:apply-templates/>
10681
+ </fo:block>
11110
10682
  </xsl:if>
11111
10683
  </xsl:template>
11112
10684
 
@@ -11135,12 +10707,9 @@
11135
10707
  <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
11136
10708
  <xsl:if test="normalize-space() != ''">
11137
10709
 
11138
- <fo:block xsl:use-attribute-sets="requirement-name-style">
11139
-
11140
- <xsl:apply-templates/>
11141
-
11142
- </fo:block>
11143
-
10710
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
10711
+ <xsl:apply-templates/>
10712
+ </fo:block>
11144
10713
  </xsl:if>
11145
10714
  </xsl:template>
11146
10715
 
@@ -11179,11 +10748,9 @@
11179
10748
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
11180
10749
  <xsl:if test="normalize-space() != ''">
11181
10750
 
11182
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
11183
- <xsl:apply-templates/>
11184
-
11185
- </fo:block>
11186
-
10751
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
10752
+ <xsl:apply-templates/>
10753
+ </fo:block>
11187
10754
  </xsl:if>
11188
10755
  </xsl:template>
11189
10756
 
@@ -11309,7 +10876,6 @@
11309
10876
 
11310
10877
  <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 ')">
11311
10878
  <xsl:attribute name="font-weight">bold</xsl:attribute>
11312
-
11313
10879
  </xsl:if>
11314
10880
 
11315
10881
  <xsl:apply-templates mode="requirement"/>
@@ -11354,7 +10920,6 @@
11354
10920
 
11355
10921
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
11356
10922
  <fo:block font-size="11pt">
11357
-
11358
10923
  <xsl:apply-templates/>
11359
10924
  </fo:block>
11360
10925
  </xsl:template>
@@ -11394,7 +10959,6 @@
11394
10959
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
11395
10960
  <xsl:variable name="element">inline
11396
10961
 
11397
-
11398
10962
  </xsl:variable>
11399
10963
  <xsl:choose>
11400
10964
  <xsl:when test="contains($element, 'block')">
@@ -11426,110 +10990,105 @@
11426
10990
  text line 2
11427
10991
  -->
11428
10992
  <xsl:template match="*[local-name() = 'example']" name="example">
10993
+ <xsl:call-template name="setNamedDestination"/>
10994
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
11429
10995
 
11430
- <xsl:call-template name="setNamedDestination"/>
11431
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
10996
+ <xsl:call-template name="setBlockSpanAll"/>
11432
10997
 
11433
- <xsl:call-template name="setBlockSpanAll"/>
10998
+ <xsl:call-template name="refine_example-style"/>
11434
10999
 
11435
- <xsl:call-template name="refine_example-style"/>
11000
+ <xsl:variable name="fo_element">
11001
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>inline
11002
+ </xsl:variable>
11436
11003
 
11437
- <xsl:variable name="fo_element">
11438
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
11439
- inline
11440
- </xsl:variable>
11004
+ <fo:block-container margin-left="0mm" role="SKIP">
11441
11005
 
11442
- <fo:block-container margin-left="0mm" role="SKIP">
11006
+ <xsl:choose>
11443
11007
 
11444
- <xsl:choose>
11008
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
11445
11009
 
11446
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
11010
+ <!-- display name 'EXAMPLE' in a separate block -->
11011
+ <fo:block>
11012
+ <xsl:apply-templates select="*[local-name()='name']">
11013
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11014
+ </xsl:apply-templates>
11015
+ </fo:block>
11447
11016
 
11448
- <!-- display name 'EXAMPLE' in a separate block -->
11449
- <fo:block>
11450
- <xsl:apply-templates select="*[local-name()='name']">
11017
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11018
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11019
+ <xsl:variable name="example_body">
11020
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11451
11021
  <xsl:with-param name="fo_element" select="$fo_element"/>
11452
11022
  </xsl:apply-templates>
11453
- </fo:block>
11454
-
11455
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11456
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11457
- <xsl:variable name="example_body">
11458
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11459
- <xsl:with-param name="fo_element" select="$fo_element"/>
11460
- </xsl:apply-templates>
11461
- </xsl:variable>
11462
- <xsl:choose>
11463
- <xsl:when test="xalan:nodeset($example_body)/*">
11464
- <xsl:copy-of select="$example_body"/>
11465
- </xsl:when>
11466
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11467
- </xsl:choose>
11468
- </fo:block-container>
11469
- </fo:block-container>
11470
- </xsl:when> <!-- end block -->
11471
-
11472
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
11473
-
11474
- <xsl:variable name="provisional_distance_between_starts_">
11475
- 7
11476
- </xsl:variable>
11477
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11478
- <xsl:variable name="indent_">
11479
- 0
11480
11023
  </xsl:variable>
11481
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
11482
-
11483
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11484
- <fo:list-item>
11485
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11486
- <fo:block>
11487
- <xsl:apply-templates select="*[local-name()='name']">
11488
- <xsl:with-param name="fo_element">block</xsl:with-param>
11489
- </xsl:apply-templates>
11490
- </fo:block>
11491
- </fo:list-item-label>
11492
- <fo:list-item-body start-indent="body-start()">
11493
- <fo:block>
11494
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11495
- <xsl:with-param name="fo_element" select="$fo_element"/>
11496
- </xsl:apply-templates>
11497
- </fo:block>
11498
- </fo:list-item-body>
11499
- </fo:list-item>
11500
- </fo:list-block>
11501
- </xsl:when> <!-- end list -->
11024
+ <xsl:choose>
11025
+ <xsl:when test="xalan:nodeset($example_body)/*">
11026
+ <xsl:copy-of select="$example_body"/>
11027
+ </xsl:when>
11028
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11029
+ </xsl:choose>
11030
+ </fo:block-container>
11031
+ </fo:block-container>
11032
+ </xsl:when> <!-- end block -->
11502
11033
 
11503
- <xsl:otherwise> <!-- inline -->
11034
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
11504
11035
 
11505
- <!-- display 'EXAMPLE' and first element in the same line -->
11506
- <fo:block>
11507
- <xsl:apply-templates select="*[local-name()='name']">
11508
- <xsl:with-param name="fo_element" select="$fo_element"/>
11509
- </xsl:apply-templates>
11510
- <fo:inline>
11511
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11036
+ <xsl:variable name="provisional_distance_between_starts_">7
11037
+ </xsl:variable>
11038
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11039
+ <xsl:variable name="indent_">0
11040
+ </xsl:variable>
11041
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
11042
+
11043
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11044
+ <fo:list-item>
11045
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11046
+ <fo:block>
11047
+ <xsl:apply-templates select="*[local-name()='name']">
11048
+ <xsl:with-param name="fo_element">block</xsl:with-param>
11049
+ </xsl:apply-templates>
11050
+ </fo:block>
11051
+ </fo:list-item-label>
11052
+ <fo:list-item-body start-indent="body-start()">
11053
+ <fo:block>
11054
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11512
11055
  <xsl:with-param name="fo_element" select="$fo_element"/>
11513
11056
  </xsl:apply-templates>
11514
- </fo:inline>
11515
- </fo:block>
11057
+ </fo:block>
11058
+ </fo:list-item-body>
11059
+ </fo:list-item>
11060
+ </fo:list-block>
11061
+ </xsl:when> <!-- end list -->
11516
11062
 
11517
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11518
- <!-- display further elements in blocks -->
11519
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11520
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11521
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11522
- <xsl:with-param name="fo_element" select="'block'"/>
11523
- </xsl:apply-templates>
11524
- </fo:block-container>
11525
- </fo:block-container>
11526
- </xsl:if>
11527
- </xsl:otherwise> <!-- end inline -->
11063
+ <xsl:otherwise> <!-- inline -->
11528
11064
 
11529
- </xsl:choose>
11530
- </fo:block-container>
11531
- </fo:block-container>
11065
+ <!-- display 'EXAMPLE' and first element in the same line -->
11066
+ <fo:block>
11067
+ <xsl:apply-templates select="*[local-name()='name']">
11068
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11069
+ </xsl:apply-templates>
11070
+ <fo:inline>
11071
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11072
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11073
+ </xsl:apply-templates>
11074
+ </fo:inline>
11075
+ </fo:block>
11532
11076
 
11077
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11078
+ <!-- display further elements in blocks -->
11079
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11080
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11081
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11082
+ <xsl:with-param name="fo_element" select="'block'"/>
11083
+ </xsl:apply-templates>
11084
+ </fo:block-container>
11085
+ </fo:block-container>
11086
+ </xsl:if>
11087
+ </xsl:otherwise> <!-- end inline -->
11088
+
11089
+ </xsl:choose>
11090
+ </fo:block-container>
11091
+ </fo:block-container>
11533
11092
  </xsl:template>
11534
11093
 
11535
11094
  <!-- example/name -->
@@ -11544,7 +11103,6 @@
11544
11103
  </xsl:when>
11545
11104
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
11546
11105
  <fo:block xsl:use-attribute-sets="example-name-style">
11547
-
11548
11106
  <xsl:apply-templates/>
11549
11107
  </fo:block>
11550
11108
  </xsl:when>
@@ -11561,7 +11119,6 @@
11561
11119
  <!-- table/example/name, table/tfoot//example/name -->
11562
11120
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
11563
11121
  <fo:inline xsl:use-attribute-sets="example-name-style">
11564
-
11565
11122
  <xsl:apply-templates/>
11566
11123
  </fo:inline>
11567
11124
  </xsl:template>
@@ -11571,12 +11128,10 @@
11571
11128
 
11572
11129
  <xsl:variable name="num"><xsl:number/></xsl:variable>
11573
11130
  <xsl:variable name="element">
11574
-
11575
- <xsl:choose>
11576
- <xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
11577
- <xsl:otherwise>block</xsl:otherwise>
11578
- </xsl:choose>
11579
-
11131
+ <xsl:choose>
11132
+ <xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
11133
+ <xsl:otherwise>block</xsl:otherwise>
11134
+ </xsl:choose>
11580
11135
  <xsl:value-of select="$fo_element"/>
11581
11136
  </xsl:variable>
11582
11137
  <xsl:choose>
@@ -11694,7 +11249,7 @@
11694
11249
  </xsl:call-template>
11695
11250
  </xsl:variable>
11696
11251
 
11697
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
11252
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
11698
11253
  <xsl:choose>
11699
11254
  <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>
11700
11255
  <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>
@@ -11731,11 +11286,9 @@
11731
11286
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
11732
11287
  </xsl:if>
11733
11288
  </xsl:if>
11734
-
11735
- <xsl:if test="not(*)">
11736
- <xsl:attribute name="space-after">12pt</xsl:attribute>
11737
- </xsl:if>
11738
-
11289
+ <xsl:if test="not(*)">
11290
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
11291
+ </xsl:if>
11739
11292
  <fo:block-container margin-left="0mm" role="SKIP">
11740
11293
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11741
11294
 
@@ -11818,7 +11371,6 @@
11818
11371
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
11819
11372
  <xsl:attribute name="vertical-align">super</xsl:attribute>
11820
11373
  <xsl:attribute name="font-size">80%</xsl:attribute>
11821
-
11822
11374
  </xsl:if>
11823
11375
 
11824
11376
  <xsl:call-template name="refine_eref-style"/>
@@ -11867,7 +11419,6 @@
11867
11419
  </xsl:template>
11868
11420
 
11869
11421
  <xsl:template name="refine_basic_link_style">
11870
-
11871
11422
  </xsl:template> <!-- refine_basic_link_style -->
11872
11423
 
11873
11424
  <!-- ====== -->
@@ -11884,12 +11435,10 @@
11884
11435
  </xsl:variable>
11885
11436
 
11886
11437
  <xsl:variable name="padding">
11887
-
11888
- <xsl:choose>
11889
- <xsl:when test="$depth = 2">3</xsl:when>
11890
- <xsl:otherwise>4</xsl:otherwise>
11891
- </xsl:choose>
11892
-
11438
+ <xsl:choose>
11439
+ <xsl:when test="$depth = 2">3</xsl:when>
11440
+ <xsl:otherwise>4</xsl:otherwise>
11441
+ </xsl:choose>
11893
11442
  </xsl:variable>
11894
11443
 
11895
11444
  <xsl:variable name="padding-right">
@@ -11900,7 +11449,6 @@
11900
11449
  </xsl:otherwise>
11901
11450
  </xsl:choose>
11902
11451
  </xsl:variable>
11903
-
11904
11452
  <xsl:choose>
11905
11453
  <xsl:when test="$lang = 'zh'">
11906
11454
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -11924,9 +11472,7 @@
11924
11472
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
11925
11473
 
11926
11474
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
11927
-
11928
- <xsl:attribute name="padding-right">6mm</xsl:attribute>
11929
-
11475
+ <xsl:attribute name="padding-right">6mm</xsl:attribute>
11930
11476
  </xsl:template>
11931
11477
 
11932
11478
  <xsl:template name="insertNonBreakSpaces">
@@ -11944,8 +11490,7 @@
11944
11490
  <xsl:variable name="level">
11945
11491
  <xsl:call-template name="getLevel"/>
11946
11492
  </xsl:variable>
11947
- <xsl:variable name="font-size">
11948
- inherit
11493
+ <xsl:variable name="font-size">inherit
11949
11494
  </xsl:variable>
11950
11495
  <xsl:variable name="levelTerm">
11951
11496
  <xsl:call-template name="getLevelTermName"/>
@@ -11997,11 +11542,9 @@
11997
11542
  </xsl:template>
11998
11543
 
11999
11544
  <xsl:template name="setStyle_preferred">
12000
-
12001
- <xsl:if test="*[local-name() = 'strong']">
12002
- <xsl:attribute name="font-weight">normal</xsl:attribute>
12003
- </xsl:if>
12004
-
11545
+ <xsl:if test="*[local-name() = 'strong']">
11546
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11547
+ </xsl:if>
12005
11548
  </xsl:template>
12006
11549
 
12007
11550
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -12078,7 +11621,6 @@
12078
11621
 
12079
11622
  <!-- main sections -->
12080
11623
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
12081
-
12082
11624
  <xsl:call-template name="setNamedDestination"/>
12083
11625
  <fo:block>
12084
11626
  <xsl:call-template name="setId"/>
@@ -12113,16 +11655,13 @@
12113
11655
  </xsl:template>
12114
11656
 
12115
11657
  <xsl:template name="sections_element_style">
12116
-
12117
- <xsl:variable name="pos"><xsl:number count="*"/></xsl:variable>
12118
- <xsl:if test="$pos &gt;= 2">
12119
- <xsl:attribute name="space-before">18pt</xsl:attribute>
12120
- </xsl:if>
12121
-
11658
+ <xsl:variable name="pos"><xsl:number count="*"/></xsl:variable>
11659
+ <xsl:if test="$pos &gt;= 2">
11660
+ <xsl:attribute name="space-before">18pt</xsl:attribute>
11661
+ </xsl:if>
12122
11662
  </xsl:template> <!-- sections_element_style -->
12123
11663
 
12124
11664
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
12125
-
12126
11665
  <xsl:call-template name="setNamedDestination"/>
12127
11666
  <fo:block>
12128
11667
  <xsl:call-template name="setId"/>
@@ -12171,11 +11710,9 @@
12171
11710
  </xsl:template>
12172
11711
 
12173
11712
  <xsl:template name="refine_clause_style">
12174
-
12175
- <xsl:if test="@inline-header='true'">
12176
- <xsl:attribute name="text-align">justify</xsl:attribute>
12177
- </xsl:if>
12178
-
11713
+ <xsl:if test="@inline-header='true'">
11714
+ <xsl:attribute name="text-align">justify</xsl:attribute>
11715
+ </xsl:if>
12179
11716
  </xsl:template> <!-- refine_clause_style -->
12180
11717
 
12181
11718
  <xsl:template match="*[local-name() = 'definitions']">
@@ -12215,7 +11752,6 @@
12215
11752
  </xsl:template>
12216
11753
 
12217
11754
  <xsl:template name="refine_annex_style">
12218
-
12219
11755
  </xsl:template>
12220
11756
 
12221
11757
  <!-- document text (not figures, or tables) footnotes -->
@@ -12319,17 +11855,15 @@
12319
11855
  <!-- Lists processing -->
12320
11856
  <!-- ===================================== -->
12321
11857
  <xsl:variable name="ul_labels_">
12322
-
12323
- <label level="1">—</label> <!-- em dash -->
12324
- <label level="2">−</label><!-- minus sign -->
12325
- <label level="3" font-size="75%">o</label> <!-- white circle -->
11858
+ <label level="1">—</label> <!-- em dash -->
11859
+ <label level="2">−</label><!-- minus sign -->
11860
+ <label level="3" font-size="75%">o</label> <!-- white circle -->
12326
11861
 
12327
11862
  </xsl:variable>
12328
11863
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
12329
11864
 
12330
11865
  <xsl:template name="setULLabel">
12331
- <xsl:variable name="list_level__">
12332
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
11866
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
12333
11867
  </xsl:variable>
12334
11868
  <xsl:variable name="list_level_" select="number($list_level__)"/>
12335
11869
  <xsl:variable name="list_level">
@@ -12386,28 +11920,22 @@
12386
11920
  <xsl:variable name="label">
12387
11921
 
12388
11922
  <xsl:variable name="style_prefix_">
12389
- <xsl:if test="$type = 'roman'">
12390
- <!-- Example: (i) -->
11923
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
12391
11924
  </xsl:if>
12392
11925
  <xsl:if test="$type = 'alphabet'">
12393
-
12394
11926
  </xsl:if>
12395
11927
  </xsl:variable>
12396
11928
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
12397
11929
 
12398
11930
  <xsl:variable name="style_suffix_">
12399
11931
  <xsl:choose>
12400
- <xsl:when test="$type = 'arabic'">
12401
- .
11932
+ <xsl:when test="$type = 'arabic'">.
12402
11933
  </xsl:when>
12403
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12404
- )
11934
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
12405
11935
  </xsl:when>
12406
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12407
- .
11936
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
12408
11937
  </xsl:when>
12409
- <xsl:when test="$type = 'roman'">
12410
- )
11938
+ <xsl:when test="$type = 'roman'">)
12411
11939
  </xsl:when>
12412
11940
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
12413
11941
  </xsl:choose>
@@ -12424,8 +11952,7 @@
12424
11952
  <xsl:value-of select="$style_suffix"/>
12425
11953
  </xsl:if>
12426
11954
  </xsl:variable>
12427
-
12428
- <xsl:value-of select="normalize-space($label)"/>
11955
+ <xsl:value-of select="normalize-space($label)"/>
12429
11956
 
12430
11957
  </xsl:when>
12431
11958
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -12482,17 +12009,13 @@
12482
12009
 
12483
12010
  <xsl:variable name="format">
12484
12011
  <xsl:choose>
12485
- <xsl:when test="$type = 'arabic'">
12486
- 1.
12012
+ <xsl:when test="$type = 'arabic'">1.
12487
12013
  </xsl:when>
12488
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12489
- a)
12014
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
12490
12015
  </xsl:when>
12491
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12492
- A.
12016
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
12493
12017
  </xsl:when>
12494
- <xsl:when test="$type = 'roman'">
12495
- i)
12018
+ <xsl:when test="$type = 'roman'">i)
12496
12019
  </xsl:when>
12497
12020
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
12498
12021
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -12529,19 +12052,16 @@
12529
12052
  </fo:block-container>
12530
12053
  </xsl:when>
12531
12054
  <xsl:otherwise>
12532
-
12533
- <fo:block role="SKIP">
12534
- <xsl:apply-templates select="." mode="list">
12535
- <xsl:with-param name="indent" select="$indent"/>
12536
- </xsl:apply-templates>
12537
- </fo:block>
12538
-
12055
+ <fo:block role="SKIP">
12056
+ <xsl:apply-templates select="." mode="list">
12057
+ <xsl:with-param name="indent" select="$indent"/>
12058
+ </xsl:apply-templates>
12059
+ </fo:block>
12539
12060
  </xsl:otherwise>
12540
12061
  </xsl:choose>
12541
12062
  </xsl:template>
12542
12063
 
12543
12064
  <xsl:template name="refine_list_container_style">
12544
-
12545
12065
  </xsl:template> <!-- refine_list_container_style -->
12546
12066
 
12547
12067
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -12605,7 +12125,6 @@
12605
12125
  </xsl:template>
12606
12126
 
12607
12127
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
12608
-
12609
12128
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
12610
12129
 
12611
12130
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -12890,7 +12409,6 @@
12890
12409
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
12891
12410
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
12892
12411
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
12893
-
12894
12412
  <xsl:apply-templates/>
12895
12413
  </fo:block>
12896
12414
  </xsl:template>
@@ -12942,7 +12460,6 @@
12942
12460
  <fo:table-column column-width="15mm"/>
12943
12461
  <fo:table-body>
12944
12462
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
12945
-
12946
12463
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
12947
12464
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
12948
12465
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -12978,7 +12495,6 @@
12978
12495
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
12979
12496
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
12980
12497
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
12981
-
12982
12498
  </xsl:template>
12983
12499
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
12984
12500
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -12989,16 +12505,13 @@
12989
12505
  <xsl:call-template name="setNamedDestination"/>
12990
12506
  <fo:block id="{@id}">
12991
12507
  <xsl:apply-templates/>
12992
-
12993
12508
  </fo:block>
12994
12509
  </xsl:template>
12995
12510
 
12996
12511
  <!-- Bibliography (non-normative references) -->
12997
12512
  <xsl:template match="*[local-name() = 'references']">
12998
12513
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
12999
-
13000
- <fo:block break-after="page"/>
13001
-
12514
+ <fo:block break-after="page"/>
13002
12515
  </xsl:if>
13003
12516
 
13004
12517
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -13014,9 +12527,7 @@
13014
12527
 
13015
12528
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
13016
12529
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
13017
-
13018
12530
  </fo:block>
13019
-
13020
12531
  </xsl:template> <!-- references -->
13021
12532
 
13022
12533
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -13026,44 +12537,39 @@
13026
12537
  <!-- Normative references -->
13027
12538
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
13028
12539
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13029
-
13030
- <xsl:call-template name="setNamedDestination"/>
13031
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
13032
-
13033
- <xsl:call-template name="processBibitem"/>
13034
- </fo:block>
12540
+ <xsl:call-template name="setNamedDestination"/>
12541
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
12542
+ <xsl:call-template name="processBibitem"/>
12543
+ </fo:block>
13035
12544
 
13036
12545
  </xsl:template> <!-- bibitem -->
13037
12546
 
13038
12547
  <!-- Bibliography (non-normative references) -->
13039
12548
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
13040
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13041
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
12549
+ <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
13042
12550
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
13043
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
13044
- <xsl:call-template name="setNamedDestination"/>
13045
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
13046
-
13047
- <fo:list-item>
13048
- <fo:list-item-label end-indent="label-end()">
13049
- <fo:block role="SKIP">
13050
- <fo:inline role="SKIP">
13051
-
13052
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13053
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
13054
- </xsl:apply-templates>
13055
- </fo:inline>
13056
- </fo:block>
13057
- </fo:list-item-label>
13058
- <fo:list-item-body start-indent="body-start()">
13059
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
13060
- <xsl:call-template name="processBibitem">
13061
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
13062
- </xsl:call-template>
13063
- </fo:block>
13064
- </fo:list-item-body>
13065
- </fo:list-item>
13066
- </fo:list-block>
12551
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
12552
+ <xsl:call-template name="setNamedDestination"/>
12553
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
12554
+ <fo:list-item>
12555
+ <fo:list-item-label end-indent="label-end()">
12556
+ <fo:block role="SKIP">
12557
+ <fo:inline role="SKIP">
12558
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12559
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
12560
+ </xsl:apply-templates>
12561
+ </fo:inline>
12562
+ </fo:block>
12563
+ </fo:list-item-label>
12564
+ <fo:list-item-body start-indent="body-start()">
12565
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
12566
+ <xsl:call-template name="processBibitem">
12567
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
12568
+ </xsl:call-template>
12569
+ </fo:block>
12570
+ </fo:list-item-body>
12571
+ </fo:list-item>
12572
+ </fo:list-block>
13067
12573
 
13068
12574
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
13069
12575
 
@@ -13073,7 +12579,6 @@
13073
12579
  <xsl:otherwise>
13074
12580
  <xsl:call-template name="setNamedDestination"/>
13075
12581
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
13076
-
13077
12582
  <fo:list-item-label end-indent="label-end()">
13078
12583
  <fo:block role="SKIP">
13079
12584
  <fo:inline role="SKIP">
@@ -13100,23 +12605,20 @@
13100
12605
 
13101
12606
  <xsl:template name="processBibitem">
13102
12607
  <xsl:param name="biblio_tag_part">both</xsl:param>
12608
+ <!-- start bibitem processing -->
12609
+ <xsl:if test=".//*[local-name() = 'fn']">
12610
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
12611
+ </xsl:if>
12612
+ <!-- move opening ace-tag before number -->
12613
+ <xsl:apply-templates select="*[local-name() = 'formattedref']/node()[1][local-name() = 'add' and contains(., '_start')]">
12614
+ <xsl:with-param name="skip">false</xsl:with-param>
12615
+ </xsl:apply-templates>
13103
12616
 
13104
- <!-- start bibitem processing -->
13105
- <xsl:if test=".//*[local-name() = 'fn']">
13106
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
13107
- </xsl:if>
13108
-
13109
- <!-- move opening ace-tag before number -->
13110
- <xsl:apply-templates select="*[local-name() = 'formattedref']/node()[1][local-name() = 'add' and contains(., '_start')]">
13111
- <xsl:with-param name="skip">false</xsl:with-param>
13112
- </xsl:apply-templates>
13113
-
13114
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13115
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
13116
- </xsl:apply-templates>
13117
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
13118
- <!-- end bibitem processing -->
13119
-
12617
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12618
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
12619
+ </xsl:apply-templates>
12620
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
12621
+ <!-- end bibitem processing -->
13120
12622
  </xsl:template> <!-- processBibitem (bibitem) -->
13121
12623
 
13122
12624
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -13259,8 +12761,7 @@
13259
12761
  <xsl:choose>
13260
12762
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
13261
12763
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
13262
- <xsl:otherwise><!-- default value -->
13263
- 3
12764
+ <xsl:otherwise><!-- default value -->3
13264
12765
  </xsl:otherwise>
13265
12766
  </xsl:choose>
13266
12767
  </xsl:variable>
@@ -13469,28 +12970,26 @@
13469
12970
  <!-- Admonition -->
13470
12971
  <!-- ================ -->
13471
12972
  <xsl:template match="*[local-name() = 'admonition']">
12973
+ <fo:block xsl:use-attribute-sets="admonition-style">
13472
12974
 
13473
- <fo:block xsl:use-attribute-sets="admonition-style">
13474
-
13475
- <xsl:call-template name="setBlockSpanAll"/>
12975
+ <xsl:call-template name="setBlockSpanAll"/>
13476
12976
 
13477
- <xsl:if test="@type = 'editorial'">
13478
- <xsl:attribute name="color">green</xsl:attribute>
13479
- <xsl:attribute name="font-weight">normal</xsl:attribute>
13480
- <!-- <xsl:variable name="note-style">
12977
+ <xsl:if test="@type = 'editorial'">
12978
+ <xsl:attribute name="color">green</xsl:attribute>
12979
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
12980
+ <!-- <xsl:variable name="note-style">
13481
12981
  <style xsl:use-attribute-sets="note-style"></style>
13482
12982
  </xsl:variable>
13483
12983
  <xsl:for-each select="xalan:nodeset($note-style)//style/@*">
13484
12984
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
13485
12985
  </xsl:for-each> -->
13486
- </xsl:if>
13487
-
13488
- <xsl:call-template name="displayAdmonitionName">
13489
- <xsl:with-param name="sep"> — </xsl:with-param>
13490
- </xsl:call-template>
12986
+ </xsl:if>
12987
+ <xsl:call-template name="displayAdmonitionName">
12988
+ <xsl:with-param name="sep"> — </xsl:with-param>
12989
+ </xsl:call-template>
13491
12990
 
13492
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
13493
- </fo:block>
12991
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
12992
+ </fo:block>
13494
12993
 
13495
12994
  </xsl:template>
13496
12995
 
@@ -13539,12 +13038,10 @@
13539
13038
  </xsl:template> -->
13540
13039
 
13541
13040
  <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
13041
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
13542
13042
 
13543
- <fo:block xsl:use-attribute-sets="admonition-p-style">
13544
-
13545
- <xsl:apply-templates/>
13546
- </fo:block>
13547
-
13043
+ <xsl:apply-templates/>
13044
+ </fo:block>
13548
13045
  </xsl:template>
13549
13046
 
13550
13047
  <!-- ================ -->
@@ -13580,11 +13077,9 @@
13580
13077
 
13581
13078
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
13582
13079
  <xsl:variable name="updated_xml_step2">
13583
-
13584
- <xsl:if test="$table_if = 'false'">
13585
- <xsl:copy-of select="$updated_xml_step1"/>
13586
- </xsl:if>
13587
-
13080
+ <xsl:if test="$table_if = 'false'">
13081
+ <xsl:copy-of select="$updated_xml_step1"/>
13082
+ </xsl:if>
13588
13083
  </xsl:variable>
13589
13084
 
13590
13085
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -14059,7 +13554,6 @@
14059
13554
  </xsl:template>
14060
13555
 
14061
13556
  <xsl:template name="addNamedDestinationAttribute">
14062
-
14063
13557
  </xsl:template>
14064
13558
 
14065
13559
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -14554,7 +14048,6 @@
14554
14048
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
14555
14049
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
14556
14050
  <!-- if EXPRESS reference -->
14557
-
14558
14051
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
14559
14052
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
14560
14053
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -14608,8 +14101,7 @@
14608
14101
 
14609
14102
  <xsl:variable name="text2">
14610
14103
  <xsl:element name="text" namespace="{$namespace_full}">
14611
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
14612
- <xsl:copy-of select="."/>
14104
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
14613
14105
  </xsl:for-each>
14614
14106
  </xsl:element>
14615
14107
  </xsl:variable>
@@ -14901,9 +14393,7 @@
14901
14393
  </xsl:attribute>
14902
14394
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
14903
14395
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
14904
-
14905
- <xsl:value-of select="$skip_footnote_body_"/>
14906
-
14396
+ <xsl:value-of select="$skip_footnote_body_"/>
14907
14397
  </xsl:attribute>
14908
14398
  <xsl:attribute name="ref_id">
14909
14399
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -14991,9 +14481,7 @@
14991
14481
  <!-- ===================================== -->
14992
14482
 
14993
14483
  <xsl:template name="printEdition">
14994
- <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
14995
- <xsl:text> </xsl:text>
14996
-
14484
+ <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/><xsl:text> </xsl:text>
14997
14485
  <xsl:choose>
14998
14486
  <xsl:when test="$edition_i18n != ''">
14999
14487
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -15222,8 +14710,7 @@
15222
14710
  <dc:title>
15223
14711
  <xsl:variable name="title">
15224
14712
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15225
-
15226
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-part']"/>
14713
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-part']"/>
15227
14714
 
15228
14715
  </xsl:for-each>
15229
14716
  </xsl:variable>
@@ -15242,12 +14729,11 @@
15242
14729
  </dc:title>
15243
14730
  <xsl:variable name="dc_creator">
15244
14731
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15245
-
15246
- <rdf:Seq>
15247
- <rdf:li>
15248
- <xsl:value-of select="normalize-space(*[local-name() = 'ext']/*[local-name() = 'editorialgroup']/*[local-name() = 'committee'])"/>
15249
- </rdf:li>
15250
- </rdf:Seq>
14732
+ <rdf:Seq>
14733
+ <rdf:li>
14734
+ <xsl:value-of select="normalize-space(*[local-name() = 'ext']/*[local-name() = 'editorialgroup']/*[local-name() = 'committee'])"/>
14735
+ </rdf:li>
14736
+ </rdf:Seq>
15251
14737
 
15252
14738
  </xsl:for-each>
15253
14739
  </xsl:variable>
@@ -15259,8 +14745,7 @@
15259
14745
 
15260
14746
  <xsl:variable name="dc_description">
15261
14747
  <xsl:variable name="abstract">
15262
-
15263
- <xsl:value-of select="//*[local-name() = 'metanorma']/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
14748
+ <xsl:value-of select="//*[local-name() = 'metanorma']/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
15264
14749
 
15265
14750
  </xsl:variable>
15266
14751
  <rdf:Alt>
@@ -15326,7 +14811,9 @@
15326
14811
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
15327
14812
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
15328
14813
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
15329
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
14814
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
14815
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
14816
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
15330
14817
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
15331
14818
  <!-- Todo: need update -->
15332
14819
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -15491,7 +14978,7 @@
15491
14978
  <xsl:param name="normalize-space" select="'true'"/>
15492
14979
  <xsl:param name="keep_sep" select="'false'"/>
15493
14980
  <xsl:if test="string-length($pText) &gt;0">
15494
- <item>
14981
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
15495
14982
  <xsl:choose>
15496
14983
  <xsl:when test="$normalize-space = 'true'">
15497
14984
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -15500,8 +14987,8 @@
15500
14987
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
15501
14988
  </xsl:otherwise>
15502
14989
  </xsl:choose>
15503
- </item>
15504
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
14990
+ </xsl:element>
14991
+ <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>
15505
14992
  <xsl:call-template name="split">
15506
14993
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
15507
14994
  <xsl:with-param name="sep" select="$sep"/>
@@ -15519,30 +15006,6 @@
15519
15006
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
15520
15007
  </xsl:template>
15521
15008
 
15522
- <xsl:template name="namespaceCheck">
15523
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
15524
- <xsl:variable name="XSLNS">
15525
-
15526
- <xsl:value-of select="document('')//*/namespace::bipm"/>
15527
-
15528
- </xsl:variable>
15529
- <!-- <xsl:if test="$documentNS != $XSLNS">
15530
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
15531
- </xsl:if> -->
15532
- </xsl:template> <!-- namespaceCheck -->
15533
-
15534
- <xsl:template name="getLanguage">
15535
- <xsl:param name="lang"/>
15536
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
15537
- <xsl:choose>
15538
- <xsl:when test="$language = 'en'">English</xsl:when>
15539
- <xsl:when test="$language = 'fr'">French</xsl:when>
15540
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
15541
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
15542
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
15543
- </xsl:choose>
15544
- </xsl:template>
15545
-
15546
15009
  <xsl:template name="setId">
15547
15010
  <xsl:param name="prefix"/>
15548
15011
  <xsl:attribute name="id">