metanorma-ogc 2.7.7 → 2.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +793 -1346
  3. data/lib/isodoc/ogc/ogc.best-practice.xsl +793 -1346
  4. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +793 -1346
  5. data/lib/isodoc/ogc/ogc.community-practice.xsl +793 -1346
  6. data/lib/isodoc/ogc/ogc.community-standard.xsl +793 -1346
  7. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +793 -1346
  8. data/lib/isodoc/ogc/ogc.draft-standard.xsl +793 -1346
  9. data/lib/isodoc/ogc/ogc.engineering-report.xsl +793 -1346
  10. data/lib/isodoc/ogc/ogc.other.xsl +793 -1346
  11. data/lib/isodoc/ogc/ogc.policy.xsl +793 -1346
  12. data/lib/isodoc/ogc/ogc.reference-model.xsl +793 -1346
  13. data/lib/isodoc/ogc/ogc.release-notes.xsl +793 -1346
  14. data/lib/isodoc/ogc/ogc.standard.xsl +793 -1346
  15. data/lib/isodoc/ogc/ogc.test-suite.xsl +793 -1346
  16. data/lib/isodoc/ogc/ogc.user-guide.xsl +793 -1346
  17. data/lib/isodoc/ogc/ogc.white-paper.xsl +755 -1286
  18. data/lib/isodoc/ogc/presentation_sections.rb +5 -5
  19. data/lib/isodoc/ogc/presentation_xml_convert.rb +9 -6
  20. data/lib/metanorma/ogc/cleanup.rb +2 -6
  21. data/lib/metanorma/ogc/converter.rb +2 -2
  22. data/lib/metanorma/ogc/isodoc.rng +19 -2
  23. data/lib/metanorma/ogc/version.rb +1 -1
  24. metadata +2 -2
data/lib/isodoc/ogc/ogc.policy.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:ogc="https://www.metanorma.org/ns/standoc" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns: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:ogc="https://www.metanorma.org/ns/standoc" xmlns:mn="https://www.metanorma.org/ns/xslt" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns: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 version="1.0" method="xml" encoding="UTF-8" indent="no"/>
4
4
 
@@ -219,7 +219,7 @@
219
219
  </xsl:variable>
220
220
 
221
221
  <xsl:variable name="contents_">
222
- <contents>
222
+ <mn:contents>
223
223
  <!-- Abstract, Keywords, Preface, Submitting Organizations, Submitters -->
224
224
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
225
225
 
@@ -229,12 +229,11 @@
229
229
  <xsl:call-template name="processTablesFigures_Contents">
230
230
  <xsl:with-param name="always">true</xsl:with-param>
231
231
  </xsl:call-template>
232
- </contents>
232
+ </mn:contents>
233
233
  </xsl:variable>
234
234
  <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
235
235
 
236
236
  <xsl:template match="/">
237
- <xsl:call-template name="namespaceCheck"/>
238
237
 
239
238
  <fo:root xml:lang="{$lang}">
240
239
  <xsl:variable name="root-style">
@@ -294,18 +293,18 @@
294
293
  <xsl:call-template name="addBookmarks">
295
294
  <xsl:with-param name="contents" select="$contents"/>
296
295
  <xsl:with-param name="contents_addon">
297
- <xsl:if test="$contents//tables/table or $contents//figures/figure or //*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
296
+ <xsl:if test="$contents//mn:tables/mn:table or $contents//mn:figures/mn:figure or //*[local-name() = 'table'][.//*[local-name() = 'p'][@class = 'RecommendationTitle']]">
298
297
  <fo:bookmark internal-destination="empty_bookmark">
299
298
  <fo:bookmark-title>—————</fo:bookmark-title>
300
299
  </fo:bookmark>
301
300
  </xsl:if>
302
301
 
303
- <xsl:if test="$contents//tables/table">
302
+ <xsl:if test="$contents//mn:tables/mn:table">
304
303
  <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
305
304
  <fo:bookmark-title>
306
305
  <xsl:value-of select="$title-list-tables"/>
307
306
  </fo:bookmark-title>
308
- <xsl:for-each select="$contents//tables/table">
307
+ <xsl:for-each select="$contents//mn:tables/mn:table">
309
308
  <fo:bookmark internal-destination="{@id}">
310
309
  <xsl:variable name="title">
311
310
  <xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/>
@@ -316,12 +315,12 @@
316
315
  </fo:bookmark>
317
316
  </xsl:if>
318
317
 
319
- <xsl:if test="$contents//figures/figure">
318
+ <xsl:if test="$contents//mn:figures/mn:figure">
320
319
  <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
321
320
  <fo:bookmark-title>
322
321
  <xsl:value-of select="$title-list-figures"/>
323
322
  </fo:bookmark-title>
324
- <xsl:for-each select="$contents//figures/figure">
323
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
325
324
  <fo:bookmark internal-destination="{@id}">
326
325
  <xsl:variable name="title">
327
326
  <xsl:apply-templates select="*[local-name() = 'name']" mode="bookmarks"/>
@@ -865,7 +864,7 @@
865
864
 
866
865
  <fo:block-container line-height="130%">
867
866
  <fo:block role="TOC">
868
- <xsl:for-each select="$contents//item[@display = 'true' and normalize-space(@id) != '']">
867
+ <xsl:for-each select="$contents//mn:item[@display = 'true' and normalize-space(@id) != '']">
869
868
 
870
869
  <fo:block role="TOCI">
871
870
  <xsl:if test="@level = 1">
@@ -894,7 +893,7 @@
894
893
  <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
895
894
  <fo:basic-link internal-destination="{@id}">
896
895
  <xsl:variable name="sectionTitle">
897
- <xsl:apply-templates select="title"/>
896
+ <xsl:apply-templates select="mn:title"/>
898
897
  </xsl:variable>
899
898
  <xsl:call-template name="setAltText">
900
899
  <xsl:with-param name="value" select="concat(@section, $sectionTitle)"/>
@@ -925,7 +924,7 @@
925
924
  </xsl:call-template>
926
925
  <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@section))"/>
927
926
  <xsl:text> </xsl:text>
928
- <xsl:apply-templates select="title"/>
927
+ <xsl:apply-templates select="mn:title"/>
929
928
  <xsl:text> </xsl:text>
930
929
  <fo:inline keep-together.within-line="always">
931
930
  <fo:leader leader-pattern="dots"/>
@@ -942,24 +941,24 @@
942
941
  </fo:block-container>
943
942
 
944
943
  <!-- List of Tables -->
945
- <xsl:if test="$contents//tables/table">
944
+ <xsl:if test="$contents//mn:tables/mn:table">
946
945
  <xsl:call-template name="insertListOf_Title">
947
946
  <xsl:with-param name="title" select="$title-list-tables"/>
948
947
  </xsl:call-template>
949
948
  <fo:block-container line-height="130%" role="TOC">
950
- <xsl:for-each select="$contents//tables/table">
949
+ <xsl:for-each select="$contents//mn:tables/mn:table">
951
950
  <xsl:call-template name="insertListOf_Item"/>
952
951
  </xsl:for-each>
953
952
  </fo:block-container>
954
953
  </xsl:if>
955
954
 
956
955
  <!-- List of Figures -->
957
- <xsl:if test="$contents//figures/figure">
956
+ <xsl:if test="$contents//mn:figures/mn:figure">
958
957
  <xsl:call-template name="insertListOf_Title">
959
958
  <xsl:with-param name="title" select="$title-list-figures"/>
960
959
  </xsl:call-template>
961
960
  <fo:block-container line-height="130%" role="TOC">
962
- <xsl:for-each select="$contents//figures/figure">
961
+ <xsl:for-each select="$contents//mn:figures/mn:figure">
963
962
  <xsl:call-template name="insertListOf_Item"/>
964
963
  </xsl:for-each>
965
964
  </fo:block-container>
@@ -1228,15 +1227,15 @@
1228
1227
  <xsl:value-of select="local-name()"/>
1229
1228
  </xsl:variable>
1230
1229
 
1231
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
1230
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
1232
1231
  <xsl:if test="ancestor::ogc:annex">
1233
1232
  <xsl:attribute name="parent">annex</xsl:attribute>
1234
1233
  </xsl:if>
1235
- <title>
1234
+ <mn:title>
1236
1235
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
1237
- </title>
1236
+ </mn:title>
1238
1237
  <xsl:apply-templates mode="contents"/>
1239
- </item>
1238
+ </mn:item>
1240
1239
  </xsl:if>
1241
1240
 
1242
1241
  </xsl:template>
@@ -1967,34 +1966,25 @@
1967
1966
  </fo:static-content>
1968
1967
  </xsl:template>
1969
1968
 
1970
- <!-- <xsl:strip-space elements="ogc:xref"/> -->
1969
+ <!-- https://www.metanorma.org/ns/standoc -->
1970
+ <xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
1971
1971
 
1972
- <xsl:variable name="namespace_full_">
1973
- <xsl:choose>
1974
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
1975
- <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
1976
- </xsl:choose>
1977
- </xsl:variable>
1978
- <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
1972
+ <!-- https://www.metanorma.org/ns/xsl -->
1973
+ <xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
1979
1974
 
1980
- <xsl:variable name="root_element_">
1981
- <xsl:choose>
1982
- <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
1983
- <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
1984
- </xsl:choose>
1985
- </xsl:variable>
1986
- <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
1975
+ <xsl:variable name="root_element">metanorma</xsl:variable>
1987
1976
 
1977
+ <!---examples: 2013, 2024 -->
1988
1978
  <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'])"/>
1989
1979
 
1990
1980
  <!-- external parameters -->
1991
-
1992
1981
  <xsl:param name="svg_images"/> <!-- svg images array -->
1993
1982
  <xsl:variable name="images" select="document($svg_images)"/>
1994
1983
  <xsl:param name="basepath"/> <!-- base path for images -->
1995
1984
  <xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
1996
1985
  <xsl:param name="inputxml_filename"/> <!-- input xml file name -->
1997
1986
  <xsl:param name="output_path"/> <!-- output PDF file name -->
1987
+ <xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
1998
1988
  <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
1999
1989
  <xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
2000
1990
  <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 -->
@@ -2041,20 +2031,13 @@
2041
2031
 
2042
2032
  <xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
2043
2033
 
2044
- <xsl:variable name="isApplyAutolayoutAlgorithm_">
2045
- true
2034
+ <!-- don't remove and rename this variable, it's using in mn2pdf tool -->
2035
+ <xsl:variable name="isApplyAutolayoutAlgorithm_">true
2046
2036
  </xsl:variable>
2047
2037
  <xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
2048
2038
 
2049
- <xsl:variable name="isGenerateTableIF_">
2050
- <xsl:choose>
2051
- <xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
2052
- <xsl:value-of select="normalize-space($table_if) = 'true'"/>
2053
- </xsl:when>
2054
- <xsl:otherwise>false</xsl:otherwise>
2055
- </xsl:choose>
2056
- </xsl:variable>
2057
- <xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
2039
+ <xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
2040
+ <!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
2058
2041
 
2059
2042
  <xsl:variable name="lang">
2060
2043
  <xsl:call-template name="getLang"/>
@@ -2106,8 +2089,7 @@
2106
2089
  <xsl:variable name="pageWidth_">
2107
2090
  <xsl:choose>
2108
2091
  <xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
2109
- <xsl:otherwise>
2110
- 215.9
2092
+ <xsl:otherwise>215.9
2111
2093
  </xsl:otherwise>
2112
2094
  </xsl:choose>
2113
2095
  </xsl:variable>
@@ -2117,8 +2099,7 @@
2117
2099
  <xsl:variable name="pageHeight_">
2118
2100
  <xsl:choose>
2119
2101
  <xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
2120
- <xsl:otherwise>
2121
- 279.4
2102
+ <xsl:otherwise>279.4
2122
2103
  </xsl:otherwise>
2123
2104
  </xsl:choose>
2124
2105
  </xsl:variable>
@@ -2127,23 +2108,19 @@
2127
2108
  <!-- Page margins in mm (just digits, without 'mm')-->
2128
2109
  <!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
2129
2110
  for example, left margin on odd page and right margin on even page -->
2130
- <xsl:variable name="marginLeftRight1_">
2131
- 35
2111
+ <xsl:variable name="marginLeftRight1_">35
2132
2112
  </xsl:variable>
2133
2113
  <xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
2134
2114
 
2135
- <xsl:variable name="marginLeftRight2_">
2136
- 17
2115
+ <xsl:variable name="marginLeftRight2_">17
2137
2116
  </xsl:variable>
2138
2117
  <xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
2139
2118
 
2140
- <xsl:variable name="marginTop_">
2141
- 16.5
2119
+ <xsl:variable name="marginTop_">16.5
2142
2120
  </xsl:variable>
2143
2121
  <xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
2144
2122
 
2145
- <xsl:variable name="marginBottom_">
2146
- 22.5
2123
+ <xsl:variable name="marginBottom_">22.5
2147
2124
  </xsl:variable>
2148
2125
  <xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
2149
2126
 
@@ -2192,13 +2169,10 @@
2192
2169
  <title-toc lang="zh">目次</title-toc>
2193
2170
 
2194
2171
  <title-part lang="en">
2195
-
2196
2172
  </title-part>
2197
2173
  <title-part lang="fr">
2198
-
2199
2174
  </title-part>
2200
2175
  <title-part lang="ru">
2201
-
2202
2176
  </title-part>
2203
2177
  <title-part lang="zh">第 # 部分:</title-part>
2204
2178
 
@@ -2294,12 +2268,10 @@
2294
2268
  <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>
2295
2269
  <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>
2296
2270
  <xsl:attribute-set name="root-style">
2297
-
2298
- <xsl:attribute name="font-family">Lato, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
2299
- <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
2300
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2301
- <xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
2302
-
2271
+ <xsl:attribute name="font-family">Lato, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
2272
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
2273
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2274
+ <xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
2303
2275
  </xsl:attribute-set> <!-- root-style -->
2304
2276
 
2305
2277
  <xsl:template name="insertRootStyle">
@@ -2387,172 +2359,130 @@
2387
2359
 
2388
2360
  <!-- Preface sections styles -->
2389
2361
  <xsl:attribute-set name="copyright-statement-style">
2390
-
2391
- <xsl:attribute name="font-size">8pt</xsl:attribute>
2392
- <xsl:attribute name="line-height">125%</xsl:attribute>
2393
-
2362
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2363
+ <xsl:attribute name="line-height">125%</xsl:attribute>
2394
2364
  </xsl:attribute-set> <!-- copyright-statement-style -->
2395
2365
 
2396
2366
  <xsl:attribute-set name="copyright-statement-title-style">
2397
-
2398
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2399
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2400
- <xsl:attribute name="margin-top">24pt</xsl:attribute>
2401
-
2367
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2368
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2369
+ <xsl:attribute name="margin-top">24pt</xsl:attribute>
2402
2370
  </xsl:attribute-set> <!-- copyright-statement-title-style -->
2403
2371
 
2404
2372
  <xsl:attribute-set name="copyright-statement-p-style">
2405
-
2406
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2407
-
2373
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2408
2374
  </xsl:attribute-set> <!-- copyright-statement-p-style -->
2409
2375
 
2410
2376
  <xsl:attribute-set name="license-statement-style">
2411
-
2412
- <xsl:attribute name="font-size">8pt</xsl:attribute>
2413
- <xsl:attribute name="line-height">125%</xsl:attribute>
2414
-
2377
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2378
+ <xsl:attribute name="line-height">125%</xsl:attribute>
2415
2379
  </xsl:attribute-set>
2416
2380
 
2417
2381
  <xsl:attribute-set name="license-statement-title-style">
2418
2382
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2419
-
2420
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2421
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2422
-
2383
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2384
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2423
2385
  </xsl:attribute-set> <!-- license-statement-title-style -->
2424
2386
 
2425
2387
  <xsl:attribute-set name="license-statement-p-style">
2426
-
2427
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2428
-
2388
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2429
2389
  </xsl:attribute-set> <!-- license-statement-p-style -->
2430
2390
 
2431
2391
  <xsl:attribute-set name="legal-statement-style">
2432
-
2433
- <xsl:attribute name="font-size">8pt</xsl:attribute>
2392
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2434
2393
 
2435
2394
  </xsl:attribute-set> <!-- legal-statement-style -->
2436
2395
 
2437
2396
  <xsl:attribute-set name="legal-statement-title-style">
2438
2397
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2439
-
2440
2398
  </xsl:attribute-set> <!-- legal-statement-title-style -->
2441
2399
 
2442
2400
  <xsl:attribute-set name="legal-statement-p-style">
2443
-
2444
2401
  </xsl:attribute-set> <!-- legal-statement-p-style -->
2445
2402
 
2446
2403
  <xsl:attribute-set name="feedback-statement-style">
2447
-
2448
- <xsl:attribute name="font-size">8pt</xsl:attribute>
2449
- <xsl:attribute name="line-height">125%</xsl:attribute>
2450
-
2404
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
2405
+ <xsl:attribute name="line-height">125%</xsl:attribute>
2451
2406
  </xsl:attribute-set> <!-- feedback-statement-style -->
2452
2407
 
2453
2408
  <xsl:attribute-set name="feedback-statement-title-style">
2454
2409
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2455
-
2456
2410
  </xsl:attribute-set> <!-- feedback-statement-title-style -->
2457
2411
 
2458
2412
  <xsl:attribute-set name="feedback-statement-p-style">
2459
-
2460
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2461
-
2413
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2462
2414
  </xsl:attribute-set> <!-- feedback-statement-p-style -->
2463
2415
 
2464
2416
  <!-- End Preface sections styles -->
2465
2417
 
2466
2418
  <xsl:attribute-set name="link-style">
2467
-
2468
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
2469
-
2419
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
2470
2420
  </xsl:attribute-set>
2471
2421
 
2472
2422
  <xsl:template name="refine_link-style">
2473
-
2474
2423
  </xsl:template> <!-- refine_link-style -->
2475
2424
 
2476
2425
  <xsl:attribute-set name="sourcecode-container-style">
2477
-
2478
2426
  </xsl:attribute-set>
2479
2427
 
2480
2428
  <xsl:attribute-set name="sourcecode-style">
2481
2429
  <xsl:attribute name="white-space">pre</xsl:attribute>
2482
2430
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
2483
2431
  <xsl:attribute name="role">Code</xsl:attribute>
2484
-
2485
- <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2486
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2487
- <xsl:attribute name="line-height">113%</xsl:attribute>
2488
-
2432
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2433
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2434
+ <xsl:attribute name="line-height">113%</xsl:attribute>
2489
2435
  </xsl:attribute-set>
2490
2436
 
2491
2437
  <xsl:template name="refine_sourcecode-style">
2492
-
2493
- <xsl:if test="parent::*[local-name() = 'example']">
2494
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2495
- </xsl:if>
2496
-
2438
+ <xsl:if test="parent::*[local-name() = 'example']">
2439
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2440
+ </xsl:if>
2497
2441
  </xsl:template> <!-- refine_sourcecode-style -->
2498
2442
 
2499
2443
  <xsl:attribute-set name="pre-style">
2500
2444
  <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2501
2445
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2502
-
2503
- <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2504
- <xsl:attribute name="line-height">113%</xsl:attribute>
2505
-
2446
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2447
+ <xsl:attribute name="line-height">113%</xsl:attribute>
2506
2448
  </xsl:attribute-set>
2507
2449
 
2508
2450
  <xsl:attribute-set name="permission-style">
2509
-
2510
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2511
-
2451
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2512
2452
  </xsl:attribute-set>
2513
2453
 
2514
2454
  <xsl:attribute-set name="permission-name-style">
2515
-
2516
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2517
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2518
- <xsl:attribute name="text-align">center</xsl:attribute>
2519
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2520
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2521
- <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2522
- <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2523
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
2524
-
2455
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2456
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2457
+ <xsl:attribute name="text-align">center</xsl:attribute>
2458
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2459
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2460
+ <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2461
+ <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2462
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
2525
2463
  </xsl:attribute-set>
2526
2464
 
2527
2465
  <xsl:attribute-set name="permission-label-style">
2528
-
2529
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2530
-
2466
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2531
2467
  </xsl:attribute-set>
2532
2468
 
2533
2469
  <xsl:attribute-set name="requirement-style">
2534
-
2535
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2536
-
2470
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2537
2471
  </xsl:attribute-set>
2538
2472
 
2539
2473
  <xsl:attribute-set name="requirement-name-style">
2540
2474
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2541
-
2542
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2543
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2544
- <xsl:attribute name="text-align">center</xsl:attribute>
2545
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2546
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2547
- <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2548
- <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2549
-
2475
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2476
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2477
+ <xsl:attribute name="text-align">center</xsl:attribute>
2478
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2479
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2480
+ <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2481
+ <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2550
2482
  </xsl:attribute-set>
2551
2483
 
2552
2484
  <xsl:attribute-set name="requirement-label-style">
2553
-
2554
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2555
-
2485
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2556
2486
  </xsl:attribute-set>
2557
2487
 
2558
2488
  <xsl:attribute-set name="subject-style">
@@ -2580,140 +2510,109 @@
2580
2510
  </xsl:attribute-set>
2581
2511
 
2582
2512
  <xsl:attribute-set name="recommendation-style">
2583
-
2584
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
2585
-
2513
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2586
2514
  </xsl:attribute-set>
2587
2515
 
2588
2516
  <xsl:attribute-set name="recommendation-name-style">
2589
-
2590
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2591
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2592
- <xsl:attribute name="text-align">center</xsl:attribute>
2593
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2594
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2595
- <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2596
- <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2597
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
2598
-
2517
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2518
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2519
+ <xsl:attribute name="text-align">center</xsl:attribute>
2520
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2521
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2522
+ <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
2523
+ <xsl:attribute name="background-color">rgb(165,165,165)</xsl:attribute>
2524
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
2599
2525
  </xsl:attribute-set>
2600
2526
 
2601
2527
  <xsl:attribute-set name="recommendation-label-style">
2602
-
2603
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2604
-
2528
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2605
2529
  </xsl:attribute-set>
2606
2530
 
2607
2531
  <xsl:attribute-set name="termexample-style">
2608
-
2609
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2610
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2611
-
2532
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2533
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2612
2534
  </xsl:attribute-set>
2613
2535
 
2614
2536
  <xsl:template name="refine_termexample-style">
2615
-
2616
2537
  </xsl:template>
2617
2538
 
2618
2539
  <xsl:attribute-set name="example-style">
2619
-
2620
- <xsl:attribute name="margin-top">10pt</xsl:attribute>
2621
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
2622
-
2540
+ <xsl:attribute name="margin-top">10pt</xsl:attribute>
2541
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
2623
2542
  </xsl:attribute-set> <!-- example-style -->
2624
2543
 
2625
2544
  <xsl:template name="refine_example-style">
2626
-
2627
2545
  </xsl:template> <!-- refine_example-style -->
2628
2546
 
2629
2547
  <xsl:attribute-set name="example-body-style">
2630
-
2631
2548
  </xsl:attribute-set> <!-- example-body-style -->
2632
2549
 
2633
2550
  <xsl:attribute-set name="example-name-style">
2634
-
2635
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2636
-
2551
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2637
2552
  </xsl:attribute-set> <!-- example-name-style -->
2638
2553
 
2639
2554
  <xsl:template name="refine_example-name-style">
2640
-
2641
2555
  </xsl:template>
2642
2556
 
2643
2557
  <xsl:attribute-set name="example-p-style">
2644
-
2645
- <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
2558
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
2646
2559
 
2647
2560
  </xsl:attribute-set> <!-- example-p-style -->
2648
2561
 
2649
2562
  <xsl:template name="refine_example-p-style">
2650
-
2651
2563
  </xsl:template> <!-- refine_example-p-style -->
2652
2564
 
2653
2565
  <xsl:attribute-set name="termexample-name-style">
2654
-
2655
- <xsl:attribute name="padding-right">10mm</xsl:attribute>
2656
-
2566
+ <xsl:attribute name="padding-right">10mm</xsl:attribute>
2657
2567
  </xsl:attribute-set> <!-- termexample-name-style -->
2658
2568
 
2659
2569
  <xsl:template name="refine_termexample-name-style">
2660
-
2661
2570
  </xsl:template>
2662
2571
 
2663
2572
  <!-- ========================== -->
2664
2573
  <!-- Table styles -->
2665
2574
  <!-- ========================== -->
2666
2575
  <xsl:variable name="table-border_">
2667
-
2668
2576
  </xsl:variable>
2669
2577
  <xsl:variable name="table-border" select="normalize-space($table-border_)"/>
2670
2578
 
2671
2579
  <xsl:variable name="table-cell-border_">
2672
-
2673
2580
  </xsl:variable>
2674
2581
  <xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
2675
2582
 
2676
2583
  <xsl:attribute-set name="table-container-style">
2677
2584
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2678
2585
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
2679
-
2680
- <xsl:attribute name="space-after">12pt</xsl:attribute>
2681
-
2586
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
2682
2587
  </xsl:attribute-set> <!-- table-container-style -->
2683
2588
 
2684
2589
  <xsl:template name="refine_table-container-style">
2685
2590
  <xsl:param name="margin-side"/>
2686
-
2687
- <!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
2688
- <xsl:attribute name="font-size">9pt</xsl:attribute>
2689
- <!-- </xsl:if> -->
2690
-
2591
+ <!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
2592
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
2593
+ <!-- </xsl:if> -->
2691
2594
  <!-- end table block-container attributes -->
2692
2595
  </xsl:template> <!-- refine_table-container-style -->
2693
2596
 
2694
2597
  <xsl:attribute-set name="table-style">
2695
2598
  <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
2696
2599
  <xsl:attribute name="table-layout">fixed</xsl:attribute>
2697
-
2698
2600
  </xsl:attribute-set><!-- table-style -->
2699
2601
 
2700
2602
  <xsl:template name="refine_table-style">
2701
2603
  <xsl:param name="margin-side"/>
2702
2604
 
2703
2605
  <xsl:call-template name="setBordersTableArray"/>
2704
-
2705
2606
  </xsl:template> <!-- refine_table-style -->
2706
2607
 
2707
2608
  <xsl:attribute-set name="table-name-style">
2708
2609
  <xsl:attribute name="role">Caption</xsl:attribute>
2709
2610
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2710
-
2711
- <xsl:attribute name="text-align">left</xsl:attribute>
2712
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2713
- <xsl:attribute name="font-weight">normal</xsl:attribute>
2714
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2715
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2716
-
2611
+ <xsl:attribute name="text-align">left</xsl:attribute>
2612
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2613
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
2614
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2615
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
2717
2616
  </xsl:attribute-set> <!-- table-name-style -->
2718
2617
 
2719
2618
  <xsl:template name="refine_table-name-style">
@@ -2721,36 +2620,28 @@
2721
2620
  <xsl:if test="$continued = 'true'">
2722
2621
  <xsl:attribute name="role">SKIP</xsl:attribute>
2723
2622
  </xsl:if>
2724
-
2725
2623
  </xsl:template> <!-- refine_table-name-style -->
2726
2624
 
2727
2625
  <xsl:attribute-set name="table-row-style">
2728
2626
  <xsl:attribute name="min-height">4mm</xsl:attribute>
2729
-
2730
- <xsl:attribute name="min-height">8.5mm</xsl:attribute>
2731
-
2627
+ <xsl:attribute name="min-height">8.5mm</xsl:attribute>
2732
2628
  </xsl:attribute-set>
2733
2629
 
2734
2630
  <xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
2735
2631
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2736
-
2737
- <xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
2738
- <xsl:attribute name="color">white</xsl:attribute>
2739
-
2632
+ <xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
2633
+ <xsl:attribute name="color">white</xsl:attribute>
2740
2634
  </xsl:attribute-set>
2741
2635
 
2742
2636
  <xsl:template name="refine_table-header-row-style">
2743
2637
 
2744
2638
  <xsl:call-template name="setBordersTableArray"/>
2745
-
2746
2639
  </xsl:template> <!-- refine_table-header-row-style -->
2747
2640
 
2748
2641
  <xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
2749
-
2750
2642
  </xsl:attribute-set>
2751
2643
 
2752
2644
  <xsl:template name="refine_table-footer-row-style">
2753
-
2754
2645
  </xsl:template> <!-- refine_table-footer-row-style -->
2755
2646
 
2756
2647
  <xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -2760,15 +2651,13 @@
2760
2651
  <xsl:template name="refine_table-body-row-style">
2761
2652
 
2762
2653
  <xsl:call-template name="setBordersTableArray"/>
2763
-
2764
- <xsl:variable name="number"><xsl:number/></xsl:variable>
2765
- <xsl:attribute name="background-color">
2766
- <xsl:choose>
2767
- <xsl:when test="$number mod 2 = 0"><xsl:value-of select="$color_table_row_even"/></xsl:when>
2768
- <xsl:otherwise><xsl:value-of select="$color_table_row_odd"/></xsl:otherwise>
2769
- </xsl:choose>
2770
- </xsl:attribute>
2771
-
2654
+ <xsl:variable name="number"><xsl:number/></xsl:variable>
2655
+ <xsl:attribute name="background-color">
2656
+ <xsl:choose>
2657
+ <xsl:when test="$number mod 2 = 0"><xsl:value-of select="$color_table_row_even"/></xsl:when>
2658
+ <xsl:otherwise><xsl:value-of select="$color_table_row_odd"/></xsl:otherwise>
2659
+ </xsl:choose>
2660
+ </xsl:attribute>
2772
2661
  </xsl:template> <!-- refine_table-body-row-style -->
2773
2662
 
2774
2663
  <xsl:attribute-set name="table-header-cell-style">
@@ -2776,40 +2665,34 @@
2776
2665
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2777
2666
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2778
2667
  <xsl:attribute name="display-align">center</xsl:attribute>
2779
-
2780
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
2781
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2782
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2783
-
2668
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
2669
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2670
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2784
2671
  </xsl:attribute-set> <!-- table-header-cell-style -->
2785
2672
 
2786
2673
  <xsl:template name="refine_table-header-cell-style">
2787
2674
 
2788
2675
  <xsl:call-template name="setBordersTableArray"/>
2789
-
2790
- <xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
2791
- <xsl:call-template name="setTextAlignment">
2792
- <xsl:with-param name="default">left</xsl:with-param>
2793
- </xsl:call-template>
2794
- </xsl:if>
2676
+ <xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
2677
+ <xsl:call-template name="setTextAlignment">
2678
+ <xsl:with-param name="default">left</xsl:with-param>
2679
+ </xsl:call-template>
2680
+ </xsl:if>
2795
2681
 
2796
2682
  <xsl:if test="$lang = 'ar'">
2797
2683
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2798
2684
  </xsl:if>
2799
2685
 
2800
2686
  <xsl:call-template name="setTableCellAttributes"/>
2801
-
2802
2687
  </xsl:template> <!-- refine_table-header-cell-style -->
2803
2688
 
2804
2689
  <xsl:attribute-set name="table-cell-style">
2805
2690
  <xsl:attribute name="display-align">center</xsl:attribute>
2806
2691
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2807
2692
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2808
-
2809
- <xsl:attribute name="border">solid 0pt white</xsl:attribute>
2810
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
2811
- <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2812
-
2693
+ <xsl:attribute name="border">solid 0pt white</xsl:attribute>
2694
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
2695
+ <xsl:attribute name="padding-bottom">1mm</xsl:attribute>
2813
2696
  </xsl:attribute-set> <!-- table-cell-style -->
2814
2697
 
2815
2698
  <xsl:template name="refine_table-cell-style">
@@ -2818,8 +2701,6 @@
2818
2701
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2819
2702
  </xsl:if>
2820
2703
 
2821
- <!-- bsi -->
2822
-
2823
2704
  <xsl:call-template name="setBordersTableArray"/>
2824
2705
 
2825
2706
  </xsl:template> <!-- refine_table-cell-style -->
@@ -2829,58 +2710,45 @@
2829
2710
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
2830
2711
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
2831
2712
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
2832
-
2833
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2834
-
2713
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
2835
2714
  </xsl:attribute-set> <!-- table-footer-cell-style -->
2836
2715
 
2837
2716
  <xsl:template name="refine_table-footer-cell-style">
2838
-
2839
2717
  </xsl:template> <!-- refine_table-footer-cell-style -->
2840
2718
 
2841
2719
  <xsl:attribute-set name="table-note-style">
2842
2720
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2843
2721
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2844
-
2845
2722
  </xsl:attribute-set><!-- table-note-style -->
2846
2723
 
2847
2724
  <xsl:template name="refine_table-note-style">
2848
-
2849
2725
  </xsl:template> <!-- refine_table-note-style -->
2850
2726
 
2851
2727
  <xsl:attribute-set name="table-fn-style">
2852
2728
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2853
-
2854
2729
  </xsl:attribute-set> <!-- table-fn-style -->
2855
2730
 
2856
2731
  <xsl:template name="refine_table-fn-style">
2857
-
2858
2732
  </xsl:template>
2859
2733
 
2860
2734
  <xsl:attribute-set name="table-fn-number-style">
2861
2735
  <!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
2862
-
2863
2736
  </xsl:attribute-set> <!-- table-fn-number-style -->
2864
2737
 
2865
2738
  <xsl:attribute-set name="table-fmt-fn-label-style">
2866
2739
  <xsl:attribute name="font-size">80%</xsl:attribute>
2867
-
2868
- <xsl:attribute name="vertical-align">super</xsl:attribute>
2869
-
2740
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
2870
2741
  </xsl:attribute-set> <!-- table-fmt-fn-label-style -->
2871
2742
 
2872
2743
  <xsl:template name="refine_table-fmt-fn-label-style">
2873
-
2874
2744
  </xsl:template>
2875
2745
 
2876
2746
  <xsl:attribute-set name="fn-container-body-style">
2877
2747
  <xsl:attribute name="text-indent">0</xsl:attribute>
2878
2748
  <xsl:attribute name="start-indent">0</xsl:attribute>
2879
-
2880
2749
  </xsl:attribute-set>
2881
2750
 
2882
2751
  <xsl:attribute-set name="table-fn-body-style">
2883
-
2884
2752
  </xsl:attribute-set>
2885
2753
 
2886
2754
  <xsl:attribute-set name="figure-fn-number-style">
@@ -2890,17 +2758,14 @@
2890
2758
  <xsl:attribute-set name="figure-fmt-fn-label-style">
2891
2759
  <xsl:attribute name="font-size">80%</xsl:attribute>
2892
2760
  <xsl:attribute name="vertical-align">super</xsl:attribute>
2893
-
2894
2761
  </xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
2895
2762
 
2896
2763
  <xsl:template name="refine_figure-fmt-fn-label-style">
2897
-
2898
2764
  </xsl:template>
2899
2765
 
2900
2766
  <xsl:attribute-set name="figure-fn-body-style">
2901
2767
  <xsl:attribute name="text-align">justify</xsl:attribute>
2902
2768
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2903
-
2904
2769
  </xsl:attribute-set>
2905
2770
  <!-- ========================== -->
2906
2771
  <!-- END Table styles -->
@@ -2911,74 +2776,56 @@
2911
2776
  <!-- ========================== -->
2912
2777
 
2913
2778
  <xsl:attribute-set name="dl-block-style">
2914
-
2915
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2916
-
2779
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
2917
2780
  </xsl:attribute-set>
2918
2781
 
2919
2782
  <xsl:attribute-set name="dt-row-style">
2920
-
2921
- <xsl:attribute name="min-height">8.5mm</xsl:attribute>
2922
-
2783
+ <xsl:attribute name="min-height">8.5mm</xsl:attribute>
2923
2784
  </xsl:attribute-set>
2924
2785
 
2925
2786
  <xsl:attribute-set name="dt-cell-style">
2926
-
2927
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2928
- <xsl:attribute name="padding-right">5mm</xsl:attribute>
2929
- <xsl:attribute name="padding-left">1mm</xsl:attribute>
2930
-
2787
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2788
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
2789
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
2931
2790
  </xsl:attribute-set>
2932
2791
 
2933
2792
  <xsl:template name="refine_dt-cell-style">
2934
-
2935
- <xsl:if test="not(ancestor::ogc:sourcecode)">
2936
- <!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
2937
- <xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
2938
- </xsl:if>
2939
-
2793
+ <xsl:if test="not(ancestor::ogc:sourcecode)">
2794
+ <!-- <xsl:attribute name="border-left">1pt solid <xsl:value-of select="$color_design"/></xsl:attribute> -->
2795
+ <xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dt"/></xsl:attribute>
2796
+ </xsl:if>
2940
2797
  </xsl:template> <!-- refine_dt-cell-style -->
2941
2798
 
2942
2799
  <xsl:attribute-set name="dt-block-style">
2943
2800
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
2944
-
2945
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2946
-
2801
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2947
2802
  </xsl:attribute-set>
2948
2803
 
2949
2804
  <xsl:template name="refine_dt-block-style">
2950
-
2951
- <xsl:if test="ancestor::ogc:sourcecode">
2952
- <xsl:attribute name="margin-bottom">2pt</xsl:attribute>
2953
- </xsl:if>
2954
- <xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
2955
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
2956
- </xsl:if>
2957
-
2805
+ <xsl:if test="ancestor::ogc:sourcecode">
2806
+ <xsl:attribute name="margin-bottom">2pt</xsl:attribute>
2807
+ </xsl:if>
2808
+ <xsl:if test="not(following-sibling::ogc:dt)"> <!-- last dt -->
2809
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
2810
+ </xsl:if>
2958
2811
  </xsl:template> <!-- refine_dt-block-style -->
2959
2812
 
2960
2813
  <xsl:attribute-set name="dl-name-style">
2961
2814
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2962
2815
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2963
-
2964
- <xsl:attribute name="font-weight">normal</xsl:attribute>
2965
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2966
-
2816
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
2817
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2967
2818
  </xsl:attribute-set> <!-- dl-name-style -->
2968
2819
 
2969
2820
  <xsl:attribute-set name="dd-cell-style">
2970
2821
  <xsl:attribute name="padding-left">2mm</xsl:attribute>
2971
-
2972
- <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2973
-
2822
+ <xsl:attribute name="padding-top">0.5mm</xsl:attribute>
2974
2823
  </xsl:attribute-set>
2975
2824
 
2976
2825
  <xsl:template name="refine_dd-cell-style">
2977
-
2978
- <xsl:if test="not(ancestor::ogc:sourcecode)">
2979
- <xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
2980
- </xsl:if>
2981
-
2826
+ <xsl:if test="not(ancestor::ogc:sourcecode)">
2827
+ <xsl:attribute name="background-color"><xsl:value-of select="$color_dl_dd"/></xsl:attribute>
2828
+ </xsl:if>
2982
2829
  </xsl:template> <!-- refine_dd-cell-style -->
2983
2830
 
2984
2831
  <!-- ========================== -->
@@ -2986,258 +2833,193 @@
2986
2833
  <!-- ========================== -->
2987
2834
 
2988
2835
  <xsl:attribute-set name="appendix-style">
2989
-
2990
- <xsl:attribute name="font-size">12pt</xsl:attribute>
2991
- <xsl:attribute name="font-weight">bold</xsl:attribute>
2992
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
2993
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2994
-
2836
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
2837
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2838
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2839
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2995
2840
  </xsl:attribute-set>
2996
2841
 
2997
2842
  <xsl:attribute-set name="appendix-example-style">
2998
-
2999
- <xsl:attribute name="font-size">10pt</xsl:attribute>
3000
- <xsl:attribute name="margin-top">8pt</xsl:attribute>
3001
- <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3002
-
2843
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
2844
+ <xsl:attribute name="margin-top">8pt</xsl:attribute>
2845
+ <xsl:attribute name="margin-bottom">8pt</xsl:attribute>
3003
2846
  </xsl:attribute-set>
3004
2847
 
3005
2848
  <xsl:attribute-set name="xref-style">
3006
-
3007
2849
  </xsl:attribute-set>
3008
2850
 
3009
2851
  <xsl:attribute-set name="eref-style">
3010
-
3011
2852
  </xsl:attribute-set>
3012
2853
 
3013
2854
  <xsl:template name="refine_eref-style">
3014
2855
  <xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
3015
2856
  <xsl:variable name="text" select="normalize-space()"/>
3016
-
3017
2857
  </xsl:template> <!-- refine_eref-style -->
3018
2858
 
3019
2859
  <xsl:attribute-set name="note-style">
3020
-
3021
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3022
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3023
-
2860
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2861
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3024
2862
  </xsl:attribute-set>
3025
2863
 
3026
2864
  <xsl:template name="refine_note-style">
3027
-
3028
- <xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol and not(ancestor::ogc:note[1]/following-sibling::*)">
3029
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3030
- </xsl:if>
3031
-
2865
+ <xsl:if test="ancestor::ogc:ul or ancestor::ogc:ol and not(ancestor::ogc:note[1]/following-sibling::*)">
2866
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
2867
+ </xsl:if>
3032
2868
  </xsl:template>
3033
2869
 
3034
2870
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
3035
2871
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
3036
2872
 
3037
2873
  <xsl:attribute-set name="note-name-style">
3038
-
3039
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3040
- <!-- <xsl:attribute name="padding-right">1mm</xsl:attribute> -->
3041
-
2874
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2875
+ <!-- <xsl:attribute name="padding-right">1mm</xsl:attribute> -->
3042
2876
  </xsl:attribute-set>
3043
2877
 
3044
2878
  <xsl:template name="refine_note-name-style">
3045
-
3046
2879
  </xsl:template> <!-- refine_note-name-style -->
3047
2880
 
3048
2881
  <xsl:attribute-set name="table-note-name-style">
3049
2882
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3050
-
3051
2883
  </xsl:attribute-set>
3052
2884
 
3053
2885
  <xsl:template name="refine_table-note-name-style">
3054
-
3055
2886
  </xsl:template> <!-- refine_table-note-name-style -->
3056
2887
 
3057
2888
  <xsl:attribute-set name="note-p-style">
3058
-
3059
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3060
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3061
-
2889
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2890
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3062
2891
  </xsl:attribute-set>
3063
2892
 
3064
2893
  <xsl:attribute-set name="termnote-style">
3065
-
3066
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3067
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3068
-
2894
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2895
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3069
2896
  </xsl:attribute-set>
3070
2897
 
3071
2898
  <xsl:template name="refine_termnote-style">
3072
-
3073
2899
  </xsl:template> <!-- refine_termnote-style -->
3074
2900
 
3075
2901
  <xsl:attribute-set name="termnote-name-style">
3076
-
3077
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3078
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
3079
-
2902
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
2903
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
3080
2904
  </xsl:attribute-set>
3081
2905
 
3082
2906
  <xsl:template name="refine_termnote-name-style">
3083
-
3084
- <!-- <xsl:if test="$namespace = 'ieee'">
3085
- <xsl:attribute name="padding-right">0mm</xsl:attribute>
3086
- </xsl:if> -->
3087
-
3088
2907
  </xsl:template>
3089
2908
 
3090
2909
  <xsl:attribute-set name="termnote-p-style">
3091
-
3092
- <xsl:attribute name="space-before">4pt</xsl:attribute>
3093
-
2910
+ <xsl:attribute name="space-before">4pt</xsl:attribute>
3094
2911
  </xsl:attribute-set>
3095
2912
 
3096
2913
  <xsl:attribute-set name="quote-style">
3097
2914
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
3098
2915
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
3099
-
3100
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3101
- <xsl:attribute name="margin-left">13mm</xsl:attribute>
3102
-
2916
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
2917
+ <xsl:attribute name="margin-left">13mm</xsl:attribute>
3103
2918
  </xsl:attribute-set>
3104
2919
 
3105
2920
  <xsl:template name="refine_quote-style">
3106
-
3107
2921
  </xsl:template>
3108
2922
 
3109
2923
  <xsl:attribute-set name="quote-source-style">
3110
2924
  <xsl:attribute name="text-align">right</xsl:attribute>
3111
-
3112
- <xsl:attribute name="margin-right">25mm</xsl:attribute>
3113
-
2925
+ <xsl:attribute name="margin-right">25mm</xsl:attribute>
3114
2926
  </xsl:attribute-set>
3115
2927
 
3116
2928
  <xsl:attribute-set name="termsource-style">
3117
-
3118
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3119
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3120
-
2929
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2930
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3121
2931
  </xsl:attribute-set>
3122
2932
 
3123
2933
  <xsl:template name="refine_termsource-style">
3124
-
3125
2934
  </xsl:template> <!-- refine_termsource-style -->
3126
2935
 
3127
2936
  <xsl:attribute-set name="termsource-text-style">
3128
-
3129
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
3130
-
2937
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
3131
2938
  </xsl:attribute-set>
3132
2939
 
3133
2940
  <xsl:attribute-set name="origin-style">
3134
-
3135
2941
  </xsl:attribute-set>
3136
2942
 
3137
2943
  <xsl:attribute-set name="term-style">
3138
-
3139
2944
  </xsl:attribute-set>
3140
2945
 
3141
2946
  <xsl:attribute-set name="term-name-style">
3142
2947
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3143
2948
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3144
-
3145
2949
  </xsl:attribute-set>
3146
2950
 
3147
2951
  <xsl:attribute-set name="figure-block-style">
3148
2952
  <xsl:attribute name="role">SKIP</xsl:attribute>
3149
-
3150
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3151
-
2953
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3152
2954
  </xsl:attribute-set>
3153
2955
 
3154
2956
  <xsl:template name="refine_figure-block-style">
3155
-
3156
2957
  </xsl:template>
3157
2958
 
3158
2959
  <xsl:attribute-set name="figure-style">
3159
-
3160
2960
  </xsl:attribute-set>
3161
2961
 
3162
2962
  <xsl:attribute-set name="figure-name-style">
3163
2963
  <xsl:attribute name="role">Caption</xsl:attribute>
3164
-
3165
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
3166
- <!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
3167
- <xsl:attribute name="margin-top">6pt</xsl:attribute>
3168
- <xsl:attribute name="space-after">12pt</xsl:attribute>
3169
- <!-- <xsl:attribute name="keep-with-next">always</xsl:attribute> -->
3170
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3171
- <xsl:attribute name="text-align">center</xsl:attribute>
3172
-
2964
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
2965
+ <!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
2966
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
2967
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
2968
+ <!-- <xsl:attribute name="keep-with-next">always</xsl:attribute> -->
2969
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
2970
+ <xsl:attribute name="text-align">center</xsl:attribute>
3173
2971
  </xsl:attribute-set>
3174
2972
 
3175
2973
  <xsl:template name="refine_figure-name-style">
3176
-
3177
2974
  </xsl:template> <!-- refine_figure-name-style -->
3178
2975
 
3179
2976
  <xsl:attribute-set name="figure-source-style">
3180
-
3181
2977
  </xsl:attribute-set>
3182
2978
 
3183
2979
  <!-- Formula's styles -->
3184
2980
  <xsl:attribute-set name="formula-style">
3185
2981
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
3186
2982
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3187
-
3188
2983
  </xsl:attribute-set> <!-- formula-style -->
3189
2984
 
3190
2985
  <xsl:attribute-set name="formula-stem-block-style">
3191
2986
  <xsl:attribute name="text-align">center</xsl:attribute>
3192
-
3193
- <xsl:attribute name="text-align">left</xsl:attribute>
3194
-
2987
+ <xsl:attribute name="text-align">left</xsl:attribute>
3195
2988
  </xsl:attribute-set> <!-- formula-stem-block-style -->
3196
2989
 
3197
2990
  <xsl:template name="refine_formula-stem-block-style">
3198
-
3199
2991
  </xsl:template> <!-- refine_formula-stem-block-style -->
3200
2992
 
3201
2993
  <xsl:attribute-set name="formula-stem-number-style">
3202
2994
  <xsl:attribute name="text-align">right</xsl:attribute>
3203
-
3204
2995
  </xsl:attribute-set> <!-- formula-stem-number-style -->
3205
2996
  <!-- End Formula's styles -->
3206
2997
 
3207
2998
  <xsl:template name="refine_formula-stem-number-style">
3208
-
3209
2999
  </xsl:template>
3210
3000
 
3211
3001
  <xsl:attribute-set name="image-style">
3212
3002
  <xsl:attribute name="role">SKIP</xsl:attribute>
3213
3003
  <xsl:attribute name="text-align">center</xsl:attribute>
3214
-
3215
- <xsl:attribute name="space-before">12pt</xsl:attribute>
3216
- <xsl:attribute name="space-after">6pt</xsl:attribute>
3217
-
3004
+ <xsl:attribute name="space-before">12pt</xsl:attribute>
3005
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
3218
3006
  </xsl:attribute-set>
3219
3007
 
3220
3008
  <xsl:template name="refine_image-style">
3221
-
3222
3009
  </xsl:template>
3223
3010
 
3224
3011
  <xsl:attribute-set name="figure-pseudocode-p-style">
3225
-
3226
3012
  </xsl:attribute-set>
3227
3013
 
3228
3014
  <xsl:attribute-set name="image-graphic-style">
3229
3015
  <xsl:attribute name="width">100%</xsl:attribute>
3230
3016
  <xsl:attribute name="content-height">100%</xsl:attribute>
3231
3017
  <xsl:attribute name="scaling">uniform</xsl:attribute>
3232
-
3233
- <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3234
-
3018
+ <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
3235
3019
  </xsl:attribute-set>
3236
3020
 
3237
3021
  <xsl:attribute-set name="tt-style">
3238
-
3239
- <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3240
-
3022
+ <xsl:attribute name="font-family">Fira Code, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
3241
3023
  </xsl:attribute-set>
3242
3024
 
3243
3025
  <xsl:attribute-set name="sourcecode-name-style">
@@ -3246,54 +3028,43 @@
3246
3028
  <xsl:attribute name="text-align">center</xsl:attribute>
3247
3029
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3248
3030
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
3249
-
3250
3031
  </xsl:attribute-set>
3251
3032
 
3252
3033
  <xsl:attribute-set name="preferred-block-style">
3253
-
3254
3034
  </xsl:attribute-set>
3255
3035
 
3256
3036
  <xsl:attribute-set name="preferred-term-style">
3257
3037
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3258
3038
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3259
-
3260
3039
  </xsl:attribute-set>
3261
3040
 
3262
3041
  <xsl:attribute-set name="domain-style">
3263
-
3264
3042
  </xsl:attribute-set>
3265
3043
 
3266
3044
  <xsl:attribute-set name="admitted-style">
3267
-
3268
- <xsl:attribute name="font-size">11pt</xsl:attribute>
3269
-
3045
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
3270
3046
  </xsl:attribute-set>
3271
3047
 
3272
3048
  <xsl:attribute-set name="deprecates-style">
3273
-
3274
3049
  </xsl:attribute-set>
3275
3050
 
3276
3051
  <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
3277
3052
  </xsl:attribute-set>
3278
3053
 
3279
3054
  <xsl:attribute-set name="definition-style">
3280
-
3281
- <xsl:attribute name="space-after">6pt</xsl:attribute>
3282
-
3055
+ <xsl:attribute name="space-after">6pt</xsl:attribute>
3283
3056
  </xsl:attribute-set>
3284
3057
 
3285
3058
  <xsl:variable name="color-added-text">
3286
3059
  <xsl:text>rgb(0, 255, 0)</xsl:text>
3287
3060
  </xsl:variable>
3288
3061
  <xsl:attribute-set name="add-style">
3289
-
3290
- <xsl:attribute name="color">red</xsl:attribute>
3291
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
3292
- <!-- <xsl:attribute name="color">black</xsl:attribute>
3062
+ <xsl:attribute name="color">red</xsl:attribute>
3063
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
3064
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
3293
3065
  <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
3294
3066
  <xsl:attribute name="padding-top">1mm</xsl:attribute>
3295
3067
  <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
3296
-
3297
3068
  </xsl:attribute-set>
3298
3069
 
3299
3070
  <xsl:variable name="add-style">
@@ -3313,65 +3084,50 @@
3313
3084
 
3314
3085
  <xsl:attribute-set name="mathml-style">
3315
3086
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
3316
-
3317
3087
  </xsl:attribute-set>
3318
3088
 
3319
3089
  <xsl:template name="refine_mathml-style">
3320
-
3321
3090
  </xsl:template>
3322
3091
 
3323
3092
  <xsl:attribute-set name="list-style">
3324
-
3325
- <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3326
- <xsl:attribute name="space-after">12pt</xsl:attribute>
3327
- <xsl:attribute name="line-height">115%</xsl:attribute>
3328
-
3093
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3094
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
3095
+ <xsl:attribute name="line-height">115%</xsl:attribute>
3329
3096
  </xsl:attribute-set> <!-- list-style -->
3330
3097
 
3331
3098
  <xsl:template name="refine_list-style">
3332
-
3333
3099
  </xsl:template> <!-- refine_list-style -->
3334
3100
 
3335
3101
  <xsl:attribute-set name="list-name-style">
3336
3102
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3337
-
3338
- <xsl:attribute name="font-weight">normal</xsl:attribute>
3339
- <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
3340
-
3103
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
3104
+ <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
3341
3105
  </xsl:attribute-set> <!-- list-name-style -->
3342
3106
 
3343
3107
  <xsl:attribute-set name="list-item-style">
3344
-
3345
3108
  </xsl:attribute-set>
3346
3109
 
3347
3110
  <xsl:template name="refine_list-item-style">
3348
-
3349
3111
  </xsl:template> <!-- refine_list-item-style -->
3350
3112
 
3351
3113
  <xsl:attribute-set name="list-item-label-style">
3352
-
3353
3114
  </xsl:attribute-set>
3354
3115
 
3355
3116
  <xsl:template name="refine_list-item-label-style">
3356
-
3357
3117
  </xsl:template> <!-- refine_list-item-label-style -->
3358
3118
 
3359
3119
  <xsl:attribute-set name="list-item-body-style">
3360
-
3361
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
3362
-
3120
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
3363
3121
  </xsl:attribute-set>
3364
3122
 
3365
3123
  <xsl:template name="refine_list-item-body-style">
3366
-
3367
- <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3368
- <xsl:if test="ancestor::ogc:table[not(@class)]">
3369
- <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
3370
- </xsl:if>
3371
- <xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
3372
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3373
- </xsl:if>
3374
-
3124
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
3125
+ <xsl:if test="ancestor::ogc:table[not(@class)]">
3126
+ <xsl:attribute name="margin-bottom">1mm</xsl:attribute>
3127
+ </xsl:if>
3128
+ <xsl:if test="not(following-sibling::*) and not(../following-sibling::*)">
3129
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3130
+ </xsl:if>
3375
3131
  </xsl:template> <!-- refine_list-item-body-style -->
3376
3132
 
3377
3133
  <xsl:attribute-set name="toc-style">
@@ -3381,13 +3137,11 @@
3381
3137
  <xsl:attribute-set name="fn-reference-style">
3382
3138
  <xsl:attribute name="font-size">80%</xsl:attribute>
3383
3139
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3384
-
3385
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3140
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3386
3141
 
3387
3142
  </xsl:attribute-set>
3388
3143
 
3389
3144
  <xsl:template name="refine_fn-reference-style">
3390
-
3391
3145
  </xsl:template> <!-- refine_fn-reference-style -->
3392
3146
 
3393
3147
  <xsl:attribute-set name="fn-style">
@@ -3396,10 +3150,8 @@
3396
3150
 
3397
3151
  <xsl:attribute-set name="fn-num-style">
3398
3152
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3399
-
3400
- <xsl:attribute name="font-size">65%</xsl:attribute>
3401
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3402
-
3153
+ <xsl:attribute name="font-size">65%</xsl:attribute>
3154
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3403
3155
  </xsl:attribute-set>
3404
3156
 
3405
3157
  <xsl:attribute-set name="fn-body-style">
@@ -3407,77 +3159,61 @@
3407
3159
  <xsl:attribute name="font-style">normal</xsl:attribute>
3408
3160
  <xsl:attribute name="text-indent">0</xsl:attribute>
3409
3161
  <xsl:attribute name="start-indent">0</xsl:attribute>
3410
-
3411
- <xsl:attribute name="font-size">10pt</xsl:attribute>
3412
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3413
- <xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
3414
- <xsl:attribute name="line-height">124%</xsl:attribute>
3415
- <xsl:attribute name="text-align">justify</xsl:attribute>
3416
-
3162
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
3163
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3164
+ <xsl:attribute name="color"><xsl:value-of select="$color_main"/></xsl:attribute>
3165
+ <xsl:attribute name="line-height">124%</xsl:attribute>
3166
+ <xsl:attribute name="text-align">justify</xsl:attribute>
3417
3167
  </xsl:attribute-set>
3418
3168
 
3419
3169
  <xsl:template name="refine_fn-body-style">
3420
-
3421
3170
  </xsl:template> <!-- refine_fn-body-style -->
3422
3171
 
3423
3172
  <xsl:attribute-set name="fn-body-num-style">
3424
3173
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3425
-
3426
- <xsl:attribute name="font-size">60%</xsl:attribute>
3427
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3428
-
3174
+ <xsl:attribute name="font-size">60%</xsl:attribute>
3175
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3429
3176
  </xsl:attribute-set> <!-- fn-body-num-style -->
3430
3177
 
3431
3178
  <xsl:template name="refine_fn-body-num-style">
3432
-
3433
3179
  </xsl:template> <!-- refine_fn-body-num-style -->
3434
3180
 
3435
3181
  <!-- admonition -->
3436
3182
  <xsl:attribute-set name="admonition-style">
3437
-
3438
- <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
3439
- <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
3440
- <xsl:attribute name="margin-left">16mm</xsl:attribute>
3441
- <xsl:attribute name="margin-right">16mm</xsl:attribute>
3442
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3443
-
3183
+ <xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
3184
+ <xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
3185
+ <xsl:attribute name="margin-left">16mm</xsl:attribute>
3186
+ <xsl:attribute name="margin-right">16mm</xsl:attribute>
3187
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3444
3188
  </xsl:attribute-set> <!-- admonition-style -->
3445
3189
 
3446
3190
  <xsl:attribute-set name="admonition-container-style">
3447
3191
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
3448
3192
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
3449
-
3450
- <xsl:attribute name="padding">2mm</xsl:attribute>
3451
- <xsl:attribute name="padding-top">3mm</xsl:attribute>
3452
-
3193
+ <xsl:attribute name="padding">2mm</xsl:attribute>
3194
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
3453
3195
  </xsl:attribute-set> <!-- admonition-container-style -->
3454
3196
 
3455
3197
  <xsl:attribute-set name="admonition-name-style">
3456
3198
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3457
-
3458
- <xsl:attribute name="font-size">11pt</xsl:attribute>
3459
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3460
- <xsl:attribute name="font-weight">bold</xsl:attribute>
3461
- <xsl:attribute name="font-style">italic</xsl:attribute>
3462
- <xsl:attribute name="text-align">center</xsl:attribute>
3463
-
3199
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
3200
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3201
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
3202
+ <xsl:attribute name="font-style">italic</xsl:attribute>
3203
+ <xsl:attribute name="text-align">center</xsl:attribute>
3464
3204
  </xsl:attribute-set> <!-- admonition-name-style -->
3465
3205
 
3466
3206
  <xsl:attribute-set name="admonition-p-style">
3467
-
3468
- <xsl:attribute name="font-style">italic</xsl:attribute>
3469
-
3207
+ <xsl:attribute name="font-style">italic</xsl:attribute>
3470
3208
  </xsl:attribute-set> <!-- admonition-p-style -->
3471
3209
  <!-- end admonition -->
3472
3210
 
3473
3211
  <!-- bibitem in Normative References (references/@normative="true") -->
3474
3212
  <xsl:attribute-set name="bibitem-normative-style">
3475
-
3476
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3477
- <xsl:attribute name="start-indent">25mm</xsl:attribute>
3478
- <xsl:attribute name="text-indent">-25mm</xsl:attribute>
3479
- <xsl:attribute name="line-height">115%</xsl:attribute>
3480
-
3213
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3214
+ <xsl:attribute name="start-indent">25mm</xsl:attribute>
3215
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute>
3216
+ <xsl:attribute name="line-height">115%</xsl:attribute>
3481
3217
  </xsl:attribute-set> <!-- bibitem-normative-style -->
3482
3218
 
3483
3219
  <!-- bibitem in Normative References (references/@normative="true"), renders as list -->
@@ -3485,58 +3221,42 @@
3485
3221
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3486
3222
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3487
3223
 
3488
- <!-- <xsl:if test="$namespace = 'ieee'">
3489
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3490
- <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
3491
- </xsl:if> -->
3492
-
3493
- <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
3494
-
3224
+ <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
3495
3225
  </xsl:attribute-set> <!-- bibitem-normative-list-style -->
3496
3226
 
3497
3227
  <xsl:attribute-set name="bibitem-non-normative-style">
3498
-
3499
3228
  </xsl:attribute-set> <!-- bibitem-non-normative-style -->
3500
3229
 
3501
3230
  <!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
3502
3231
  <xsl:attribute-set name="bibitem-non-normative-list-style">
3503
3232
  <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
3504
3233
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3505
-
3506
- <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
3507
-
3234
+ <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
3508
3235
  </xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
3509
3236
 
3510
3237
  <xsl:attribute-set name="bibitem-non-normative-list-item-style">
3511
3238
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3512
-
3513
3239
  </xsl:attribute-set>
3514
3240
 
3515
3241
  <!-- bibitem in bibliography section (references/@normative="false"), list body -->
3516
3242
  <xsl:attribute-set name="bibitem-normative-list-body-style">
3517
-
3518
3243
  </xsl:attribute-set>
3519
3244
 
3520
3245
  <xsl:attribute-set name="bibitem-non-normative-list-body-style">
3521
-
3522
3246
  </xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
3523
3247
 
3524
3248
  <!-- footnote reference number for bibitem, in the text -->
3525
3249
  <xsl:attribute-set name="bibitem-note-fn-style">
3526
3250
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
3527
3251
  <xsl:attribute name="font-size">65%</xsl:attribute>
3528
-
3529
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3530
-
3252
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3531
3253
  </xsl:attribute-set> <!-- bibitem-note-fn-style -->
3532
3254
 
3533
3255
  <!-- footnote number on the page bottom -->
3534
3256
  <xsl:attribute-set name="bibitem-note-fn-number-style">
3535
3257
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3536
-
3537
- <xsl:attribute name="font-size">60%</xsl:attribute>
3538
- <xsl:attribute name="vertical-align">super</xsl:attribute>
3539
-
3258
+ <xsl:attribute name="font-size">60%</xsl:attribute>
3259
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
3540
3260
  </xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
3541
3261
 
3542
3262
  <!-- footnote body (text) on the page bottom -->
@@ -3544,13 +3264,10 @@
3544
3264
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3545
3265
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3546
3266
  <xsl:attribute name="start-indent">0pt</xsl:attribute>
3547
-
3548
3267
  </xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
3549
3268
 
3550
3269
  <xsl:attribute-set name="references-non-normative-style">
3551
-
3552
- <xsl:attribute name="line-height">120%</xsl:attribute>
3553
-
3270
+ <xsl:attribute name="line-height">120%</xsl:attribute>
3554
3271
  </xsl:attribute-set> <!-- references-non-normative-style -->
3555
3272
 
3556
3273
  <!-- Highlight.js syntax GitHub styles -->
@@ -3710,12 +3427,10 @@
3710
3427
  <!-- Index section styles -->
3711
3428
  <xsl:attribute-set name="indexsect-title-style">
3712
3429
  <xsl:attribute name="role">H1</xsl:attribute>
3713
-
3714
3430
  </xsl:attribute-set>
3715
3431
 
3716
3432
  <xsl:attribute-set name="indexsect-clause-title-style">
3717
3433
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3718
-
3719
3434
  </xsl:attribute-set>
3720
3435
 
3721
3436
  <!-- End Index section styles -->
@@ -3792,47 +3507,47 @@
3792
3507
  </xsl:template>
3793
3508
 
3794
3509
  <xsl:template name="processTables_Contents">
3795
- <tables>
3510
+ <mn:tables>
3796
3511
  <xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
3797
3512
  <xsl:choose>
3798
3513
  <xsl:when test="*[local-name() = 'fmt-name']">
3799
3514
  <xsl:variable name="fmt_name">
3800
3515
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3801
3516
  </xsl:variable>
3802
- <table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3517
+ <mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
3803
3518
  <xsl:copy-of select="$fmt_name"/>
3804
- </table>
3519
+ </mn:table>
3805
3520
  </xsl:when>
3806
3521
  <xsl:otherwise>
3807
- <table id="{@id}" alt-text="{*[local-name() = 'name']}">
3522
+ <mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
3808
3523
  <xsl:copy-of select="*[local-name() = 'name']"/>
3809
- </table>
3524
+ </mn:table>
3810
3525
  </xsl:otherwise>
3811
3526
  </xsl:choose>
3812
3527
  </xsl:for-each>
3813
- </tables>
3528
+ </mn:tables>
3814
3529
  </xsl:template>
3815
3530
 
3816
3531
  <xsl:template name="processFigures_Contents">
3817
- <figures>
3532
+ <mn:figures>
3818
3533
  <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) != '']">
3819
3534
  <xsl:choose>
3820
3535
  <xsl:when test="*[local-name() = 'fmt-name']">
3821
3536
  <xsl:variable name="fmt_name">
3822
3537
  <xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
3823
3538
  </xsl:variable>
3824
- <figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3539
+ <mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
3825
3540
  <xsl:copy-of select="$fmt_name"/>
3826
- </figure>
3541
+ </mn:figure>
3827
3542
  </xsl:when>
3828
3543
  <xsl:otherwise>
3829
- <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3544
+ <mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
3830
3545
  <xsl:copy-of select="*[local-name() = 'name']"/>
3831
- </figure>
3546
+ </mn:figure>
3832
3547
  </xsl:otherwise>
3833
3548
  </xsl:choose>
3834
3549
  </xsl:for-each>
3835
- </figures>
3550
+ </mn:figures>
3836
3551
  </xsl:template>
3837
3552
 
3838
3553
  <xsl:template name="processPrefaceSectionsDefault">
@@ -3851,7 +3566,6 @@
3851
3566
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3852
3567
  <xsl:sort select="@displayorder" data-type="number"/>
3853
3568
  <xsl:apply-templates select="."/>
3854
-
3855
3569
  </xsl:for-each>
3856
3570
 
3857
3571
  <xsl:for-each select="/*/*[local-name()='annex']">
@@ -3958,7 +3672,6 @@
3958
3672
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
3959
3673
  <xsl:sort select="@displayorder" data-type="number"/>
3960
3674
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
3961
-
3962
3675
  </xsl:for-each>
3963
3676
  </xsl:element>
3964
3677
  </xsl:element>
@@ -4092,7 +3805,6 @@
4092
3805
  <xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
4093
3806
  <xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
4094
3807
  </xsl:apply-templates>
4095
-
4096
3808
  </xsl:for-each>
4097
3809
  </xsl:element>
4098
3810
 
@@ -4132,19 +3844,17 @@
4132
3844
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
4133
3845
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
4134
3846
  <xsl:template match="text()" name="text">
4135
-
4136
- <xsl:choose>
4137
- <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
4138
- <xsl:otherwise>
4139
- <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))"/>
4140
- <xsl:call-template name="replace_fo_inline_tags">
4141
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
4142
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
4143
- <xsl:with-param name="text" select="$text"/>
4144
- </xsl:call-template>
4145
- </xsl:otherwise>
4146
- </xsl:choose>
4147
-
3847
+ <xsl:choose>
3848
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
3849
+ <xsl:otherwise>
3850
+ <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))"/>
3851
+ <xsl:call-template name="replace_fo_inline_tags">
3852
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
3853
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
3854
+ <xsl:with-param name="text" select="$text"/>
3855
+ </xsl:call-template>
3856
+ </xsl:otherwise>
3857
+ </xsl:choose>
4148
3858
  </xsl:template>
4149
3859
 
4150
3860
  <xsl:template name="replace_fo_inline_tags">
@@ -4198,7 +3908,7 @@
4198
3908
  <xsl:with-param name="keep_sep">true</xsl:with-param>
4199
3909
  </xsl:call-template>
4200
3910
  </xsl:variable>
4201
- <xsl:for-each select="xalan:nodeset($items)/item">
3911
+ <xsl:for-each select="xalan:nodeset($items)/mn:item">
4202
3912
  <xsl:choose>
4203
3913
  <xsl:when test=". = $sep">
4204
3914
  <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -4227,22 +3937,20 @@
4227
3937
  </xsl:template> <!-- copyright-statement -->
4228
3938
 
4229
3939
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
4230
-
4231
- <xsl:variable name="level">
4232
- <xsl:call-template name="getLevel"/>
4233
- </xsl:variable>
4234
- <fo:block role="H{$level}" xsl:use-attribute-sets="copyright-statement-title-style">
4235
- <xsl:apply-templates/>
4236
- </fo:block>
3940
+ <xsl:variable name="level">
3941
+ <xsl:call-template name="getLevel"/>
3942
+ </xsl:variable>
3943
+ <fo:block role="H{$level}" xsl:use-attribute-sets="copyright-statement-title-style">
3944
+ <xsl:apply-templates/>
3945
+ </fo:block>
4237
3946
 
4238
3947
  </xsl:template> <!-- copyright-statement//title -->
4239
3948
 
4240
3949
  <xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
3950
+ <fo:block xsl:use-attribute-sets="copyright-statement-p-style">
4241
3951
 
4242
- <fo:block xsl:use-attribute-sets="copyright-statement-p-style">
4243
-
4244
- <xsl:apply-templates/>
4245
- </fo:block>
3952
+ <xsl:apply-templates/>
3953
+ </fo:block>
4246
3954
 
4247
3955
  </xsl:template> <!-- copyright-statement//p -->
4248
3956
 
@@ -4253,52 +3961,45 @@
4253
3961
  </xsl:template> <!-- license-statement -->
4254
3962
 
4255
3963
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
4256
-
4257
- <xsl:variable name="level">
4258
- <xsl:call-template name="getLevel"/>
4259
- </xsl:variable>
4260
- <fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
4261
- <xsl:apply-templates/>
4262
- </fo:block>
3964
+ <xsl:variable name="level">
3965
+ <xsl:call-template name="getLevel"/>
3966
+ </xsl:variable>
3967
+ <fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
3968
+ <xsl:apply-templates/>
3969
+ </fo:block>
4263
3970
 
4264
3971
  </xsl:template> <!-- license-statement/title -->
4265
3972
 
4266
3973
  <xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
3974
+ <fo:block xsl:use-attribute-sets="license-statement-p-style">
4267
3975
 
4268
- <fo:block xsl:use-attribute-sets="license-statement-p-style">
4269
-
4270
- <xsl:apply-templates/>
4271
- </fo:block>
3976
+ <xsl:apply-templates/>
3977
+ </fo:block>
4272
3978
 
4273
3979
  </xsl:template> <!-- license-statement/p -->
4274
3980
 
4275
3981
  <xsl:template match="*[local-name()='legal-statement']">
4276
3982
  <xsl:param name="isLegacy">false</xsl:param>
4277
3983
  <fo:block xsl:use-attribute-sets="legal-statement-style">
4278
-
4279
- <xsl:if test="$isLegacy = 'true'">
4280
- <xsl:attribute name="font-size">9pt</xsl:attribute>
4281
- </xsl:if>
4282
-
3984
+ <xsl:if test="$isLegacy = 'true'">
3985
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
3986
+ </xsl:if>
4283
3987
  <xsl:apply-templates/>
4284
3988
  </fo:block>
4285
3989
  </xsl:template> <!-- legal-statement -->
4286
3990
 
4287
3991
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
4288
-
4289
- <!-- process in the template 'title' -->
4290
- <xsl:call-template name="title"/>
3992
+ <!-- process in the template 'title' -->
3993
+ <xsl:call-template name="title"/>
4291
3994
 
4292
3995
  </xsl:template> <!-- legal-statement/title -->
4293
3996
 
4294
3997
  <xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
4295
3998
  <xsl:param name="margin"/>
4296
-
4297
- <!-- process in the template 'paragraph' -->
4298
- <xsl:call-template name="paragraph">
4299
- <xsl:with-param name="margin" select="$margin"/>
4300
- </xsl:call-template>
4301
-
3999
+ <!-- process in the template 'paragraph' -->
4000
+ <xsl:call-template name="paragraph">
4001
+ <xsl:with-param name="margin" select="$margin"/>
4002
+ </xsl:call-template>
4302
4003
  </xsl:template> <!-- legal-statement/p -->
4303
4004
 
4304
4005
  <xsl:template match="*[local-name()='feedback-statement']">
@@ -4308,18 +4009,15 @@
4308
4009
  </xsl:template> <!-- feedback-statement -->
4309
4010
 
4310
4011
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
4311
-
4312
- <!-- process in the template 'title' -->
4313
- <xsl:call-template name="title"/>
4314
-
4012
+ <!-- process in the template 'title' -->
4013
+ <xsl:call-template name="title"/>
4315
4014
  </xsl:template>
4316
4015
 
4317
4016
  <xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
4318
4017
  <xsl:param name="margin"/>
4319
-
4320
- <fo:block xsl:use-attribute-sets="feedback-statement-p-style">
4321
- <xsl:apply-templates/>
4322
- </fo:block>
4018
+ <fo:block xsl:use-attribute-sets="feedback-statement-p-style">
4019
+ <xsl:apply-templates/>
4020
+ </fo:block>
4323
4021
 
4324
4022
  </xsl:template>
4325
4023
 
@@ -4373,9 +4071,7 @@
4373
4071
  <xsl:template match="*[local-name()='table']" name="table">
4374
4072
 
4375
4073
  <xsl:variable name="table-preamble">
4376
-
4377
- <fo:block> </fo:block>
4378
-
4074
+ <fo:block> </fo:block>
4379
4075
  </xsl:variable>
4380
4076
 
4381
4077
  <xsl:variable name="table">
@@ -4393,10 +4089,8 @@
4393
4089
 
4394
4090
  <!-- Display table's name before table as standalone block -->
4395
4091
  <!-- $namespace = 'iso' or -->
4396
-
4397
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
4398
-
4399
- <xsl:call-template name="table_name_fn_display"/>
4092
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
4093
+ <xsl:call-template name="table_name_fn_display"/>
4400
4094
 
4401
4095
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
4402
4096
 
@@ -4450,12 +4144,11 @@
4450
4144
  <xsl:variable name="table_width_default">100%</xsl:variable>
4451
4145
  <xsl:variable name="table_width">
4452
4146
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
4453
-
4454
- <xsl:choose>
4455
- <xsl:when test="@width = 'full-page-width' or @width = 'text-width'">100%</xsl:when>
4456
- <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
4457
- <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
4458
- </xsl:choose>
4147
+ <xsl:choose>
4148
+ <xsl:when test="@width = 'full-page-width' or @width = 'text-width'">100%</xsl:when>
4149
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
4150
+ <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
4151
+ </xsl:choose>
4459
4152
 
4460
4153
  </xsl:variable>
4461
4154
 
@@ -4599,23 +4292,22 @@
4599
4292
  <xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
4600
4293
 
4601
4294
  <!-- centered table when table name is centered (see table-name-style) -->
4602
-
4603
- <xsl:choose>
4604
- <xsl:when test="$isAdded = 'true' or $isDeleted = 'true'">
4605
- <xsl:copy-of select="$table-preamble"/>
4606
- <fo:block>
4607
- <xsl:call-template name="setTrackChangesStyles">
4608
- <xsl:with-param name="isAdded" select="$isAdded"/>
4609
- <xsl:with-param name="isDeleted" select="$isDeleted"/>
4610
- </xsl:call-template>
4611
- <xsl:copy-of select="$table"/>
4612
- </fo:block>
4613
- </xsl:when>
4614
- <xsl:otherwise>
4615
- <xsl:copy-of select="$table-preamble"/>
4295
+ <xsl:choose>
4296
+ <xsl:when test="$isAdded = 'true' or $isDeleted = 'true'">
4297
+ <xsl:copy-of select="$table-preamble"/>
4298
+ <fo:block>
4299
+ <xsl:call-template name="setTrackChangesStyles">
4300
+ <xsl:with-param name="isAdded" select="$isAdded"/>
4301
+ <xsl:with-param name="isDeleted" select="$isDeleted"/>
4302
+ </xsl:call-template>
4616
4303
  <xsl:copy-of select="$table"/>
4617
- </xsl:otherwise>
4618
- </xsl:choose>
4304
+ </fo:block>
4305
+ </xsl:when>
4306
+ <xsl:otherwise>
4307
+ <xsl:copy-of select="$table-preamble"/>
4308
+ <xsl:copy-of select="$table"/>
4309
+ </xsl:otherwise>
4310
+ </xsl:choose>
4619
4311
 
4620
4312
  </xsl:when>
4621
4313
  <xsl:otherwise>
@@ -4641,7 +4333,6 @@
4641
4333
  </xsl:template>
4642
4334
 
4643
4335
  <xsl:template name="setBordersTableArray">
4644
-
4645
4336
  </xsl:template>
4646
4337
 
4647
4338
  <!-- table/name-->
@@ -4650,51 +4341,50 @@
4650
4341
  <xsl:param name="cols-count"/>
4651
4342
  <xsl:if test="normalize-space() != ''">
4652
4343
 
4653
- <fo:block xsl:use-attribute-sets="table-name-style">
4654
-
4655
- <xsl:call-template name="refine_table-name-style">
4656
- <xsl:with-param name="continued" select="$continued"/>
4657
- </xsl:call-template>
4658
-
4659
- <xsl:choose>
4660
- <xsl:when test="$continued = 'true'">
4661
-
4662
- </xsl:when>
4663
- <xsl:otherwise>
4664
- <xsl:apply-templates/>
4665
- </xsl:otherwise>
4666
- </xsl:choose>
4344
+ <fo:block xsl:use-attribute-sets="table-name-style">
4667
4345
 
4668
- </fo:block>
4346
+ <xsl:call-template name="refine_table-name-style">
4347
+ <xsl:with-param name="continued" select="$continued"/>
4348
+ </xsl:call-template>
4669
4349
 
4670
- <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4671
- <xsl:if test="$continued = 'true'">
4350
+ <xsl:choose>
4351
+ <xsl:when test="$continued = 'true'">
4352
+ </xsl:when>
4353
+ <xsl:otherwise>
4354
+ <xsl:apply-templates/>
4355
+ </xsl:otherwise>
4356
+ </xsl:choose>
4672
4357
 
4673
- <!-- to prevent the error 'THead element may contain only TR elements' -->
4358
+ </fo:block>
4674
4359
 
4675
- <xsl:choose>
4676
- <xsl:when test="string(number($cols-count)) != 'NaN'">
4677
- <fo:table width="100%" table-layout="fixed" role="SKIP">
4678
- <fo:table-body role="SKIP">
4679
- <fo:table-row>
4680
- <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4681
- <fo:block text-align="right" role="SKIP">
4682
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4683
- </fo:block>
4684
- </fo:table-cell>
4685
- </fo:table-row>
4686
- </fo:table-body>
4687
- </fo:table>
4688
- </xsl:when>
4689
- <xsl:otherwise>
4690
- <fo:block text-align="right">
4691
- <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4692
- </fo:block>
4693
- </xsl:otherwise>
4694
- </xsl:choose>
4360
+ <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
4361
+ <xsl:if test="$continued = 'true'">
4695
4362
 
4696
- </xsl:if>
4697
- <!-- </xsl:if> -->
4363
+ <!-- to prevent the error 'THead element may contain only TR elements' -->
4364
+
4365
+ <xsl:choose>
4366
+ <xsl:when test="string(number($cols-count)) != 'NaN'">
4367
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
4368
+ <fo:table-body role="SKIP">
4369
+ <fo:table-row>
4370
+ <fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
4371
+ <fo:block text-align="right" role="SKIP">
4372
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4373
+ </fo:block>
4374
+ </fo:table-cell>
4375
+ </fo:table-row>
4376
+ </fo:table-body>
4377
+ </fo:table>
4378
+ </xsl:when>
4379
+ <xsl:otherwise>
4380
+ <fo:block text-align="right">
4381
+ <xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
4382
+ </fo:block>
4383
+ </xsl:otherwise>
4384
+ </xsl:choose>
4385
+
4386
+ </xsl:if>
4387
+ <!-- </xsl:if> -->
4698
4388
 
4699
4389
  </xsl:if>
4700
4390
  </xsl:template> <!-- table/name -->
@@ -5069,7 +4759,6 @@
5069
4759
  <xsl:template match="*[local-name()='thead']">
5070
4760
  <xsl:param name="cols-count"/>
5071
4761
  <fo:table-header>
5072
-
5073
4762
  <xsl:apply-templates/>
5074
4763
  </fo:table-header>
5075
4764
  </xsl:template> <!-- thead -->
@@ -5083,21 +4772,20 @@
5083
4772
 
5084
4773
  <xsl:call-template name="refine_table-header-title-style"/>
5085
4774
 
5086
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
5087
- <xsl:with-param name="continued">true</xsl:with-param>
5088
- <xsl:with-param name="cols-count" select="$cols-count"/>
5089
- </xsl:apply-templates>
4775
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4776
+ <xsl:with-param name="continued">true</xsl:with-param>
4777
+ <xsl:with-param name="cols-count" select="$cols-count"/>
4778
+ </xsl:apply-templates>
5090
4779
 
5091
- <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
5092
- <fo:block role="SKIP"/>
5093
- </xsl:if>
4780
+ <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4781
+ <fo:block role="SKIP"/>
4782
+ </xsl:if>
5094
4783
 
5095
4784
  </fo:table-cell>
5096
4785
  </fo:table-row>
5097
4786
  </xsl:template> <!-- table-header-title -->
5098
4787
 
5099
4788
  <xsl:template name="refine_table-header-title-style">
5100
-
5101
4789
  </xsl:template> <!-- refine_table-header-title-style -->
5102
4790
 
5103
4791
  <xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -5127,7 +4815,6 @@
5127
4815
  <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']"/>
5128
4816
 
5129
4817
  <xsl:variable name="isNoteOrFnExistShowAfterTable">
5130
-
5131
4818
  </xsl:variable>
5132
4819
 
5133
4820
  <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -5189,26 +4876,19 @@
5189
4876
  <xsl:call-template name="setBordersTableArray"/>
5190
4877
 
5191
4878
  <!-- fn will be processed inside 'note' processing -->
5192
-
5193
- <!-- for BSI (not PAS) display Notes before footnotes -->
5194
-
5195
- <!-- except gb and bsi -->
5196
-
5197
- <xsl:apply-templates select="../*[local-name()='p']"/>
5198
- <xsl:apply-templates select="../*[local-name()='dl']"/>
5199
- <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
5200
- <xsl:apply-templates select="../*[local-name()='example']"/>
5201
- <xsl:apply-templates select="../*[local-name()='source']"/>
4879
+ <xsl:apply-templates select="../*[local-name()='p']"/>
4880
+ <xsl:apply-templates select="../*[local-name()='dl']"/>
4881
+ <xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
4882
+ <xsl:apply-templates select="../*[local-name()='example']"/>
4883
+ <xsl:apply-templates select="../*[local-name()='source']"/>
5202
4884
 
5203
4885
  <xsl:variable name="isDisplayRowSeparator">
5204
-
5205
4886
  </xsl:variable>
5206
4887
 
5207
4888
  <!-- horizontal row separator -->
5208
4889
  <xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
5209
4890
  <xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
5210
4891
  <fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
5211
-
5212
4892
  <xsl:call-template name="setBordersTableArray"/>
5213
4893
  <fo:block font-size="1pt"> </fo:block>
5214
4894
  </fo:block-container>
@@ -5216,11 +4896,8 @@
5216
4896
  </xsl:if>
5217
4897
 
5218
4898
  <!-- fn processing -->
5219
-
5220
- <!-- <xsl:call-template name="table_fn_display" /> -->
5221
- <xsl:copy-of select="$table_fn_block"/>
5222
-
5223
- <!-- for PAS display Notes after footnotes -->
4899
+ <!-- <xsl:call-template name="table_fn_display" /> -->
4900
+ <xsl:copy-of select="$table_fn_block"/>
5224
4901
 
5225
4902
  </fo:table-cell>
5226
4903
  </fo:table-row>
@@ -5347,7 +5024,7 @@
5347
5024
  <xsl:with-param name="pText" select="$border_under_row_"/>
5348
5025
  </xsl:call-template>
5349
5026
  </xsl:variable>
5350
- <xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
5027
+ <xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
5351
5028
  <xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
5352
5029
  </xsl:if>
5353
5030
  </xsl:when>
@@ -5464,7 +5141,7 @@
5464
5141
  </xsl:variable>
5465
5142
  <xsl:variable name="quot">"</xsl:variable>
5466
5143
  <xsl:variable name="styles_">
5467
- <xsl:for-each select="xalan:nodeset($styles__)/item">
5144
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
5468
5145
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
5469
5146
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
5470
5147
  <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'">
@@ -5514,9 +5191,7 @@
5514
5191
  <fo:block role="SKIP">
5515
5192
 
5516
5193
  <xsl:if test="$isGenerateTableIF = 'true'">
5517
-
5518
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5519
-
5194
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
5520
5195
  </xsl:if>
5521
5196
 
5522
5197
  <xsl:apply-templates/>
@@ -5531,25 +5206,23 @@
5531
5206
 
5532
5207
  <!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
5533
5208
  <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">
5209
+ <xsl:call-template name="setNamedDestination"/>
5210
+ <fo:block xsl:use-attribute-sets="table-note-style">
5211
+ <xsl:copy-of select="@id"/>
5534
5212
 
5535
- <xsl:call-template name="setNamedDestination"/>
5536
- <fo:block xsl:use-attribute-sets="table-note-style">
5537
- <xsl:copy-of select="@id"/>
5538
-
5539
- <xsl:call-template name="refine_table-note-style"/>
5540
-
5541
- <!-- Table's note/example name (NOTE, for example) -->
5542
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
5213
+ <xsl:call-template name="refine_table-note-style"/>
5543
5214
 
5544
- <xsl:call-template name="refine_table-note-name-style"/>
5215
+ <!-- Table's note/example name (NOTE, for example) -->
5216
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
5545
5217
 
5546
- <xsl:apply-templates select="*[local-name() = 'name']"/>
5218
+ <xsl:call-template name="refine_table-note-name-style"/>
5547
5219
 
5548
- </fo:inline>
5220
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
5549
5221
 
5550
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5551
- </fo:block>
5222
+ </fo:inline>
5552
5223
 
5224
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5225
+ </fo:block>
5553
5226
  </xsl:template> <!-- table/note -->
5554
5227
 
5555
5228
  <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">
@@ -5594,9 +5267,7 @@
5594
5267
  <xsl:variable name="current_fn_number" select="@reference"/>
5595
5268
 
5596
5269
  <xsl:variable name="current_fn_number_text">
5597
-
5598
- <xsl:value-of select="$current_fn_number"/>
5599
-
5270
+ <xsl:value-of select="$current_fn_number"/>
5600
5271
  </xsl:variable>
5601
5272
 
5602
5273
  <xsl:variable name="ref_id" select="@target"/>
@@ -5608,12 +5279,10 @@
5608
5279
  <xsl:choose>
5609
5280
  <xsl:when test="ancestor::*[local-name() = 'bibitem']">
5610
5281
  <fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
5611
-
5612
5282
  </fn_styles>
5613
5283
  </xsl:when>
5614
5284
  <xsl:otherwise>
5615
5285
  <fn_styles xsl:use-attribute-sets="fn-num-style">
5616
-
5617
5286
  </fn_styles>
5618
5287
  </xsl:otherwise>
5619
5288
  </xsl:choose>
@@ -5631,7 +5300,6 @@
5631
5300
  <xsl:with-param name="element">
5632
5301
  <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 -->
5633
5302
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
5634
-
5635
5303
  <xsl:copy-of select="$current_fn_number_text"/>
5636
5304
 
5637
5305
  </fo:inline>
@@ -5669,10 +5337,9 @@
5669
5337
  <here><xsl:copy-of select="$footnotes"/></here> -->
5670
5338
  <xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
5671
5339
  </xsl:variable>
5672
-
5673
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5674
- <xsl:copy-of select="$fn_block"/>
5675
- </fo:block>
5340
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
5341
+ <xsl:copy-of select="$fn_block"/>
5342
+ </fo:block>
5676
5343
 
5677
5344
  </fo:block-container>
5678
5345
  </fo:footnote-body>
@@ -5749,21 +5416,20 @@
5749
5416
  <xsl:variable name="reference" select="@reference"/>
5750
5417
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
5751
5418
  <xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
5419
+ <fo:block xsl:use-attribute-sets="table-fn-style">
5420
+ <xsl:copy-of select="@id"/>
5421
+ <xsl:call-template name="refine_table-fn-style"/>
5752
5422
 
5753
- <fo:block xsl:use-attribute-sets="table-fn-style">
5754
- <xsl:copy-of select="@id"/>
5755
- <xsl:call-template name="refine_table-fn-style"/>
5756
-
5757
- <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5758
- <xsl:with-param name="process">true</xsl:with-param>
5759
- </xsl:apply-templates>
5423
+ <xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
5424
+ <xsl:with-param name="process">true</xsl:with-param>
5425
+ </xsl:apply-templates>
5760
5426
 
5761
- <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5762
- <!-- <xsl:copy-of select="./node()"/> -->
5763
- <xsl:apply-templates/>
5764
- </fo:inline>
5427
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
5428
+ <!-- <xsl:copy-of select="./node()"/> -->
5429
+ <xsl:apply-templates/>
5430
+ </fo:inline>
5765
5431
 
5766
- </fo:block>
5432
+ </fo:block>
5767
5433
 
5768
5434
  <!-- </xsl:if> -->
5769
5435
  </xsl:for-each>
@@ -5816,7 +5482,6 @@
5816
5482
  <xsl:param name="process">false</xsl:param>
5817
5483
  <xsl:if test="$process = 'true'">
5818
5484
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
5819
-
5820
5485
  </xsl:if>
5821
5486
  </xsl:template>
5822
5487
 
@@ -5900,7 +5565,6 @@
5900
5565
  <xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
5901
5566
 
5902
5567
  <xsl:variable name="key_iso">
5903
-
5904
5568
  </xsl:variable>
5905
5569
 
5906
5570
  <fo:block>
@@ -5946,7 +5610,6 @@
5946
5610
  <fo:table width="95%" table-layout="fixed">
5947
5611
  <xsl:if test="normalize-space($key_iso) = 'true'">
5948
5612
  <xsl:attribute name="font-size">10pt</xsl:attribute>
5949
-
5950
5613
  </xsl:if>
5951
5614
  <xsl:choose>
5952
5615
  <!-- if there 'dl', then set same columns width -->
@@ -5970,23 +5633,19 @@
5970
5633
  <fo:table-row>
5971
5634
  <fo:table-cell>
5972
5635
  <fo:block>
5973
-
5974
- <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
5975
- <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
5976
- <!-- <xsl:value-of select="@reference"/> -->
5977
- <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
5978
- </fo:inline>
5636
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
5637
+ <!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
5638
+ <!-- <xsl:value-of select="@reference"/> -->
5639
+ <xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
5640
+ </fo:inline>
5979
5641
 
5980
5642
  </fo:block>
5981
5643
  </fo:table-cell>
5982
5644
  <fo:table-cell>
5983
5645
  <fo:block xsl:use-attribute-sets="figure-fn-body-style">
5984
5646
  <xsl:if test="normalize-space($key_iso) = 'true'">
5985
-
5986
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
5987
-
5647
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
5988
5648
  </xsl:if>
5989
-
5990
5649
  <!-- <xsl:copy-of select="./node()"/> -->
5991
5650
  <xsl:apply-templates/>
5992
5651
  </fo:block>
@@ -6036,11 +5695,9 @@
6036
5695
  <!-- figure/dl[@key = 'true']/dt/p/sup -->
6037
5696
  <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">
6038
5697
  <xsl:variable name="key_iso">
6039
-
6040
5698
  </xsl:variable>
6041
5699
  <xsl:if test="normalize-space($key_iso) = 'true'">
6042
5700
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6043
-
6044
5701
  </xsl:if>
6045
5702
  <fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
6046
5703
  <!-- <xsl:value-of select="@reference"/> -->
@@ -6086,8 +5743,7 @@
6086
5743
  <xsl:text>※</xsl:text>
6087
5744
  </xsl:if> -->
6088
5745
  <!-- <xsl:value-of select="@reference"/> -->
6089
-
6090
- <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
5746
+ <xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
6091
5747
 
6092
5748
  <!-- <xsl:if test="$namespace = 'bsi'">
6093
5749
  <xsl:text>)</xsl:text>
@@ -6159,10 +5815,9 @@
6159
5815
  </xsl:if>
6160
5816
 
6161
5817
  <xsl:call-template name="setBlockSpanAll"/>
6162
-
6163
- <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
6164
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6165
- </xsl:if>
5818
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
5819
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
5820
+ </xsl:if>
6166
5821
 
6167
5822
  <xsl:if test="ancestor::*[local-name() = 'sourcecode']">
6168
5823
  <!-- set font-size as sourcecode font-size -->
@@ -6183,7 +5838,6 @@
6183
5838
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6184
5839
  </xsl:choose>
6185
5840
  </xsl:attribute>
6186
-
6187
5841
  </xsl:if>
6188
5842
 
6189
5843
  <xsl:call-template name="setTrackChangesStyles">
@@ -6192,37 +5846,32 @@
6192
5846
  </xsl:call-template>
6193
5847
 
6194
5848
  <fo:block-container margin-left="0mm" role="SKIP">
6195
-
6196
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
5849
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
6197
5850
 
6198
5851
  <xsl:variable name="parent" select="local-name(..)"/>
6199
5852
 
6200
- <xsl:variable name="key_iso">
6201
- <!-- and (not(../@class) or ../@class !='pseudocode') -->
5853
+ <xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') -->
6202
5854
  </xsl:variable>
6203
5855
 
6204
5856
  <xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
6205
5857
 
6206
5858
  <xsl:choose>
6207
5859
  <xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
6208
-
6209
- <fo:block margin-bottom="12pt" text-align="left">
6210
-
6211
- <!-- <xsl:variable name="title-where">
5860
+ <fo:block margin-bottom="12pt" text-align="left">
5861
+ <!-- <xsl:variable name="title-where">
6212
5862
  <xsl:call-template name="getLocalizedString">
6213
5863
  <xsl:with-param name="key">where</xsl:with-param>
6214
5864
  </xsl:call-template>
6215
5865
  </xsl:variable>
6216
5866
  <xsl:value-of select="$title-where"/> -->
6217
- <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
6218
- <xsl:text> </xsl:text>
6219
- <xsl:apply-templates select="*[local-name()='dt']/*"/>
6220
- <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
6221
- <xsl:text> </xsl:text>
6222
- </xsl:if>
6223
- <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
6224
- </fo:block>
6225
-
5867
+ <xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
5868
+ <xsl:text> </xsl:text>
5869
+ <xsl:apply-templates select="*[local-name()='dt']/*"/>
5870
+ <xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
5871
+ <xsl:text> </xsl:text>
5872
+ </xsl:if>
5873
+ <xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
5874
+ </fo:block>
6226
5875
  </xsl:when> <!-- END: only one component -->
6227
5876
  <xsl:when test="$parent = 'formula'"> <!-- a few components -->
6228
5877
  <fo:block margin-bottom="12pt" text-align="left">
@@ -6242,19 +5891,17 @@
6242
5891
  <xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
6243
5892
  <!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
6244
5893
  <xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
5894
+ <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6245
5895
 
6246
- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
6247
-
6248
- <xsl:call-template name="refine_figure_key_style"/>
6249
-
6250
- <xsl:variable name="title-key">
6251
- <xsl:call-template name="getLocalizedString">
6252
- <xsl:with-param name="key">key</xsl:with-param>
6253
- </xsl:call-template>
6254
- </xsl:variable>
6255
- <xsl:value-of select="$title-key"/>
6256
- </fo:block>
5896
+ <xsl:call-template name="refine_figure_key_style"/>
6257
5897
 
5898
+ <xsl:variable name="title-key">
5899
+ <xsl:call-template name="getLocalizedString">
5900
+ <xsl:with-param name="key">key</xsl:with-param>
5901
+ </xsl:call-template>
5902
+ </xsl:variable>
5903
+ <xsl:value-of select="$title-key"/>
5904
+ </fo:block>
6258
5905
  </xsl:if>
6259
5906
  </xsl:when> <!-- END: definition list in a figure -->
6260
5907
  </xsl:choose>
@@ -6287,12 +5934,10 @@
6287
5934
  <xsl:if test="$isGenerateTableIF = 'true'">
6288
5935
  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
6289
5936
  </xsl:if>
6290
-
6291
5937
  <xsl:choose>
6292
5938
  <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
6293
5939
  <xsl:when test="normalize-space($key_iso) = 'true'">
6294
5940
  <xsl:attribute name="font-size">10pt</xsl:attribute>
6295
-
6296
5941
  </xsl:when>
6297
5942
  </xsl:choose>
6298
5943
 
@@ -6397,17 +6042,15 @@
6397
6042
  <xsl:call-template name="getMaxLength_dt"/>
6398
6043
  </xsl:variable>
6399
6044
 
6400
- <xsl:variable name="isContainsKeepTogetherTag_">
6401
- false
6045
+ <xsl:variable name="isContainsKeepTogetherTag_">false
6402
6046
  </xsl:variable>
6403
6047
  <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
6404
6048
  <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
6405
-
6406
- <xsl:call-template name="setColumnWidth_dl">
6407
- <xsl:with-param name="colwidths" select="$colwidths"/>
6408
- <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
6409
- <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
6410
- </xsl:call-template>
6049
+ <xsl:call-template name="setColumnWidth_dl">
6050
+ <xsl:with-param name="colwidths" select="$colwidths"/>
6051
+ <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
6052
+ <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
6053
+ </xsl:call-template>
6411
6054
 
6412
6055
  <fo:table-body>
6413
6056
 
@@ -6458,21 +6101,17 @@
6458
6101
  </xsl:template>
6459
6102
 
6460
6103
  <xsl:template name="refine_dl_formula_where_style">
6461
-
6462
6104
  </xsl:template> <!-- refine_dl_formula_where_style -->
6463
6105
 
6464
6106
  <xsl:template name="refine_figure_key_style">
6465
-
6466
6107
  </xsl:template> <!-- refine_figure_key_style -->
6467
6108
 
6468
6109
  <xsl:template name="refine_multicomponent_style">
6469
6110
  <xsl:variable name="parent" select="local-name(..)"/>
6470
-
6471
6111
  </xsl:template> <!-- refine_multicomponent_style -->
6472
6112
 
6473
6113
  <xsl:template name="refine_multicomponent_block_style">
6474
6114
  <xsl:variable name="parent" select="local-name(..)"/>
6475
-
6476
6115
  </xsl:template> <!-- refine_multicomponent_block_style -->
6477
6116
 
6478
6117
  <!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -6659,14 +6298,11 @@
6659
6298
  <xsl:attribute name="id">
6660
6299
  <xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
6661
6300
  </xsl:attribute>
6662
-
6663
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6664
- <xsl:with-param name="process">true</xsl:with-param>
6665
- </xsl:apply-templates>
6666
-
6301
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6302
+ <xsl:with-param name="process">true</xsl:with-param>
6303
+ </xsl:apply-templates>
6667
6304
  </td>
6668
6305
  </tr>
6669
-
6670
6306
  </xsl:template>
6671
6307
 
6672
6308
  <!-- Definition's term -->
@@ -6675,11 +6311,9 @@
6675
6311
  <xsl:param name="split_keep-within-line"/>
6676
6312
 
6677
6313
  <fo:table-row xsl:use-attribute-sets="dt-row-style">
6678
-
6679
- <xsl:if test="not(following-sibling::ogc:dt) or ancestor::ogc:sourcecode"> <!-- last item -->
6680
- <xsl:attribute name="min-height">3mm</xsl:attribute>
6681
- </xsl:if>
6682
-
6314
+ <xsl:if test="not(following-sibling::ogc:dt) or ancestor::ogc:sourcecode"> <!-- last item -->
6315
+ <xsl:attribute name="min-height">3mm</xsl:attribute>
6316
+ </xsl:if>
6683
6317
  <xsl:call-template name="insert_dt_cell">
6684
6318
  <xsl:with-param name="key_iso" select="$key_iso"/>
6685
6319
  <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -6701,10 +6335,8 @@
6701
6335
  <!-- border is mandatory, to calculate real width -->
6702
6336
  <xsl:attribute name="border">0.1pt solid black</xsl:attribute>
6703
6337
  <xsl:attribute name="text-align">left</xsl:attribute>
6704
-
6705
- <xsl:attribute name="padding-left">6mm</xsl:attribute>
6706
- <!-- <xsl:attribute name="padding-left">6.5mm</xsl:attribute> -->
6707
-
6338
+ <xsl:attribute name="padding-left">6mm</xsl:attribute>
6339
+ <!-- <xsl:attribute name="padding-left">6.5mm</xsl:attribute> -->
6708
6340
  </xsl:if>
6709
6341
 
6710
6342
  <xsl:call-template name="refine_dt-cell-style"/>
@@ -6714,9 +6346,7 @@
6714
6346
 
6715
6347
  <xsl:choose>
6716
6348
  <xsl:when test="$isGenerateTableIF = 'true'">
6717
-
6718
- <xsl:copy-of select="@id"/>
6719
-
6349
+ <xsl:copy-of select="@id"/>
6720
6350
  </xsl:when>
6721
6351
  <xsl:otherwise>
6722
6352
  <xsl:copy-of select="@id"/>
@@ -6753,9 +6383,7 @@
6753
6383
  <fo:block role="SKIP">
6754
6384
 
6755
6385
  <xsl:if test="$isGenerateTableIF = 'true'">
6756
-
6757
- <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6758
-
6386
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
6759
6387
  </xsl:if>
6760
6388
 
6761
6389
  <xsl:choose>
@@ -6903,7 +6531,6 @@
6903
6531
  </xsl:template>
6904
6532
 
6905
6533
  <xsl:template name="refine_italic_style">
6906
-
6907
6534
  </xsl:template>
6908
6535
 
6909
6536
  <xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -6919,7 +6546,6 @@
6919
6546
  </xsl:template>
6920
6547
 
6921
6548
  <xsl:template name="refine_strong_style">
6922
-
6923
6549
  <xsl:if test="ancestor::*['preferred']">
6924
6550
  <xsl:attribute name="role">SKIP</xsl:attribute>
6925
6551
  </xsl:if>
@@ -6944,15 +6570,11 @@
6944
6570
  <xsl:template match="*[local-name()='tt']">
6945
6571
  <fo:inline xsl:use-attribute-sets="tt-style">
6946
6572
 
6947
- <xsl:variable name="_font-size">
6948
-
6949
- <!-- inherit -->
6950
-
6951
- <xsl:choose>
6952
- <xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
6953
- <xsl:otherwise>9.5</xsl:otherwise>
6954
- </xsl:choose>
6955
-
6573
+ <xsl:variable name="_font-size"> <!-- inherit -->
6574
+ <xsl:choose>
6575
+ <xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
6576
+ <xsl:otherwise>9.5</xsl:otherwise>
6577
+ </xsl:choose>
6956
6578
  </xsl:variable>
6957
6579
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
6958
6580
  <xsl:if test="$font-size != ''">
@@ -7168,8 +6790,7 @@
7168
6790
  </xsl:otherwise>
7169
6791
  </xsl:choose>
7170
6792
  </xsl:variable>
7171
- <xsl:variable name="ratio_">
7172
- 0.75
6793
+ <xsl:variable name="ratio_">0.75
7173
6794
  </xsl:variable>
7174
6795
  <xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
7175
6796
  <fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -7259,7 +6880,7 @@
7259
6880
 
7260
6881
  <xsl:variable name="quot">"</xsl:variable>
7261
6882
  <xsl:variable name="styles_">
7262
- <xsl:for-each select="xalan:nodeset($styles__)/item">
6883
+ <xsl:for-each select="xalan:nodeset($styles__)/mn:item">
7263
6884
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7264
6885
  <xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
7265
6886
  <xsl:variable name="value">
@@ -7271,7 +6892,7 @@
7271
6892
  </xsl:otherwise>
7272
6893
  </xsl:choose>
7273
6894
  </xsl:variable>
7274
- <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
6895
+ <xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
7275
6896
  <style name="{$key}"><xsl:value-of select="$value"/></style>
7276
6897
  </xsl:if>
7277
6898
  <xsl:if test="$key = 'text-indent'">
@@ -7285,7 +6906,6 @@
7285
6906
  <fo:inline>
7286
6907
  <xsl:for-each select="$styles/style">
7287
6908
  <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
7288
-
7289
6909
  </xsl:for-each>
7290
6910
  <xsl:apply-templates/>
7291
6911
  </fo:inline>
@@ -8272,10 +7892,9 @@
8272
7892
  <xsl:variable name="mathml_content">
8273
7893
  <xsl:apply-templates select="." mode="mathml_actual_text"/>
8274
7894
  </xsl:variable>
8275
-
8276
- <xsl:call-template name="mathml_instream_object">
8277
- <xsl:with-param name="mathml_content" select="$mathml_content"/>
8278
- </xsl:call-template>
7895
+ <xsl:call-template name="mathml_instream_object">
7896
+ <xsl:with-param name="mathml_content" select="$mathml_content"/>
7897
+ </xsl:call-template>
8279
7898
 
8280
7899
  </fo:inline>
8281
7900
  </xsl:template>
@@ -8309,7 +7928,6 @@
8309
7928
  <xsl:template name="getMathml_asciimath_text">
8310
7929
  <xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
8311
7930
  <xsl:variable name="latexmath">
8312
-
8313
7931
  </xsl:variable>
8314
7932
  <xsl:variable name="asciimath_text_following">
8315
7933
  <xsl:choose>
@@ -8382,7 +8000,6 @@
8382
8000
  </xsl:template>
8383
8001
 
8384
8002
  <xsl:template name="refine_mathml_insteam_object_style">
8385
-
8386
8003
  </xsl:template> <!-- refine_mathml_insteam_object_style -->
8387
8004
 
8388
8005
  <xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -8780,11 +8397,9 @@
8780
8397
  <xsl:variable name="annotation-id" select="@id"/>
8781
8398
  <xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
8782
8399
  <fo:block id="{$annotation-id}" white-space="nowrap">
8783
-
8784
- <xsl:if test="not(preceding-sibling::*[local-name() = 'annotation'])">
8785
- <xsl:attribute name="space-before">6pt</xsl:attribute>
8786
- </xsl:if>
8787
-
8400
+ <xsl:if test="not(preceding-sibling::*[local-name() = 'annotation'])">
8401
+ <xsl:attribute name="space-before">6pt</xsl:attribute>
8402
+ </xsl:if>
8788
8403
  <fo:inline>
8789
8404
  <xsl:apply-templates>
8790
8405
  <xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -8813,7 +8428,6 @@
8813
8428
  <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'])">
8814
8429
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
8815
8430
  </xsl:if>
8816
-
8817
8431
  <xsl:if test="parent::*[local-name() = 'add']">
8818
8432
  <xsl:call-template name="append_add-style"/>
8819
8433
  </xsl:if>
@@ -8824,8 +8438,7 @@
8824
8438
  </xsl:template>
8825
8439
 
8826
8440
  <!-- command between two xref points to non-standard bibitem -->
8827
- <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']]]">
8828
- <xsl:value-of select="."/>
8441
+ <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="."/>
8829
8442
  </xsl:template>
8830
8443
 
8831
8444
  <!-- ====== -->
@@ -8840,7 +8453,6 @@
8840
8453
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
8841
8454
  </xsl:choose>
8842
8455
  </xsl:attribute>
8843
-
8844
8456
  </xsl:if>
8845
8457
  <fo:block-container margin-left="0mm" role="SKIP">
8846
8458
  <xsl:call-template name="setNamedDestination"/>
@@ -8930,53 +8542,49 @@
8930
8542
 
8931
8543
  <xsl:template match="*[local-name() = 'note']" name="note">
8932
8544
 
8933
- <xsl:call-template name="setNamedDestination"/>
8934
-
8935
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
8936
-
8937
- <xsl:call-template name="setBlockSpanAll"/>
8938
-
8939
- <xsl:call-template name="refine_note-style"/>
8545
+ <xsl:call-template name="setNamedDestination"/>
8940
8546
 
8941
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8547
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
8942
8548
 
8943
- <fo:block>
8549
+ <xsl:call-template name="setBlockSpanAll"/>
8944
8550
 
8945
- <xsl:call-template name="refine_note_block_style"/>
8551
+ <xsl:call-template name="refine_note-style"/>
8946
8552
 
8947
- <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
8553
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
8554
+ <fo:block>
8948
8555
 
8949
- <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
8556
+ <xsl:call-template name="refine_note_block_style"/>
8950
8557
 
8951
- <xsl:call-template name="refine_note-name-style"/>
8558
+ <fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
8952
8559
 
8953
- <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8954
- <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
8955
- <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8956
- <xsl:call-template name="append_add-style"/>
8957
- </xsl:if>
8560
+ <xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
8958
8561
 
8959
- <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
8960
- <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8961
- <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8962
- <xsl:with-param name="skip">false</xsl:with-param>
8963
- </xsl:apply-templates>
8964
- </xsl:if>
8562
+ <xsl:call-template name="refine_note-name-style"/>
8965
8563
 
8966
- <xsl:apply-templates select="*[local-name() = 'name']"/>
8564
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8565
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
8566
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8567
+ <xsl:call-template name="append_add-style"/>
8568
+ </xsl:if>
8967
8569
 
8968
- </fo:inline>
8570
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
8571
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8572
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
8573
+ <xsl:with-param name="skip">false</xsl:with-param>
8574
+ </xsl:apply-templates>
8575
+ </xsl:if>
8969
8576
 
8970
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8971
- </fo:block>
8577
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
8972
8578
 
8973
- </fo:block-container>
8974
- </fo:block-container>
8579
+ </fo:inline>
8975
8580
 
8581
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8582
+ </fo:block>
8583
+ </fo:block-container>
8584
+ </fo:block-container>
8976
8585
  </xsl:template>
8977
8586
 
8978
8587
  <xsl:template name="refine_note_block_style">
8979
-
8980
8588
  </xsl:template> <!-- refine_note_block_style -->
8981
8589
 
8982
8590
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -9029,7 +8637,6 @@
9029
8637
  <xsl:value-of select="$sfx"/>
9030
8638
  </xsl:when>
9031
8639
  <xsl:otherwise>
9032
-
9033
8640
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
9034
8641
  <!-- <xsl:if test="$namespace = 'ieee'">
9035
8642
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -9037,7 +8644,6 @@
9037
8644
  <!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
9038
8645
  <xsl:text>:</xsl:text>
9039
8646
  </xsl:if> -->
9040
-
9041
8647
  <!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
9042
8648
  <xsl:text> – </xsl:text> en dash &#x2013;
9043
8649
  </xsl:if> -->
@@ -9058,7 +8664,6 @@
9058
8664
  <xsl:value-of select="$sfx"/>
9059
8665
  </xsl:when>
9060
8666
  <xsl:otherwise>
9061
-
9062
8667
  <!-- https://github.com/metanorma/isodoc/issues/607 -->
9063
8668
  <!-- <xsl:if test="$namespace = 'ieee'">
9064
8669
  <xsl:text>—</xsl:text> em dash &#x2014;
@@ -9112,11 +8717,9 @@
9112
8717
  <xsl:template match="*[local-name() = 'term']">
9113
8718
  <xsl:call-template name="setNamedDestination"/>
9114
8719
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
9115
-
9116
- <xsl:apply-templates select="ogc:name"/>
8720
+ <xsl:apply-templates select="ogc:name"/>
9117
8721
 
9118
8722
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
9119
-
9120
8723
  </xsl:if>
9121
8724
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
9122
8725
  </fo:block>
@@ -9156,8 +8759,7 @@
9156
8759
  <!-- Example: Dimensions in millimeters -->
9157
8760
  <xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
9158
8761
 
9159
- <xsl:variable name="show_figure_key_in_block_container">
9160
- true
8762
+ <xsl:variable name="show_figure_key_in_block_container">true
9161
8763
  </xsl:variable>
9162
8764
 
9163
8765
  <fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -9172,11 +8774,9 @@
9172
8774
  <xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
9173
8775
  <xsl:call-template name="showFigureKey"/>
9174
8776
  </xsl:if>
9175
-
9176
- <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
8777
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
9177
8778
 
9178
8779
  </fo:block-container>
9179
-
9180
8780
  </xsl:template>
9181
8781
 
9182
8782
  <xsl:template name="showFigureKey">
@@ -9214,13 +8814,12 @@
9214
8814
  <!-- SOURCE: ... -->
9215
8815
  <!-- figure/source -->
9216
8816
  <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
9217
-
9218
- <xsl:call-template name="termsource"/>
9219
-
8817
+ <xsl:call-template name="termsource"/>
9220
8818
  </xsl:template>
9221
8819
 
9222
8820
  <xsl:template match="*[local-name() = 'image']">
9223
8821
  <xsl:param name="indent">0</xsl:param>
8822
+ <xsl:param name="logo_width"/>
9224
8823
  <xsl:variable name="isAdded" select="../@added"/>
9225
8824
  <xsl:variable name="isDeleted" select="../@deleted"/>
9226
8825
  <xsl:choose>
@@ -9242,9 +8841,18 @@
9242
8841
 
9243
8842
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
9244
8843
 
9245
- <!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
9246
8844
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
9247
8845
 
8846
+ <xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
8847
+ <xsl:attribute name="width">100%</xsl:attribute>
8848
+ <xsl:if test="normalize-space($logo_width) != ''">
8849
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
8850
+ </xsl:if>
8851
+ <xsl:attribute name="content-height">100%</xsl:attribute>
8852
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
8853
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
8854
+ </xsl:if>
8855
+
9248
8856
  <xsl:variable name="width">
9249
8857
  <xsl:call-template name="setImageWidth"/>
9250
8858
  </xsl:variable>
@@ -9322,8 +8930,7 @@
9322
8930
  </xsl:call-template>
9323
8931
  </xsl:variable>
9324
8932
 
9325
- <xsl:variable name="scaleRatio">
9326
- 1
8933
+ <xsl:variable name="scaleRatio">1
9327
8934
  </xsl:variable>
9328
8935
 
9329
8936
  <xsl:if test="number($scale) &lt; 100">
@@ -9434,18 +9041,14 @@
9434
9041
  </xsl:variable>
9435
9042
 
9436
9043
  <xsl:variable name="image_width_effective">
9437
-
9438
- <xsl:value-of select="$width_effective - number($indent_left)"/>
9439
-
9044
+ <xsl:value-of select="$width_effective - number($indent_left)"/>
9440
9045
  </xsl:variable>
9441
9046
  <xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
9442
9047
  <!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
9443
9048
  <xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
9444
9049
  <xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
9445
9050
  <xsl:variable name="scale">
9446
-
9447
- <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9448
-
9051
+ <xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
9449
9052
  </xsl:variable>
9450
9053
  <xsl:value-of select="$scale"/>
9451
9054
  </xsl:template>
@@ -9466,7 +9069,8 @@
9466
9069
  </xsl:when>
9467
9070
  <xsl:when test="not(starts-with(@src, 'data:'))">
9468
9071
  <xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
9469
- <xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
9072
+ <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>
9073
+ <xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
9470
9074
  </xsl:when>
9471
9075
  <xsl:otherwise>
9472
9076
  <xsl:value-of select="@src"/>
@@ -9762,8 +9366,8 @@
9762
9366
  </xsl:call-template>
9763
9367
  </xsl:variable>
9764
9368
  <xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
9765
- <xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
9766
- <xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
9369
+ <xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
9370
+ <xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
9767
9371
 
9768
9372
  <xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
9769
9373
  <xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -9835,8 +9439,8 @@
9835
9439
  </xsl:variable>
9836
9440
  <xsl:variable name="components" select="xalan:nodeset($components_)"/>
9837
9441
  <xsl:variable name="att_name" select="local-name()"/>
9838
- <xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
9839
- <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
9442
+ <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>
9443
+ <xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
9840
9444
  </xsl:template>
9841
9445
 
9842
9446
  <!-- ============== -->
@@ -9909,13 +9513,13 @@
9909
9513
  </xsl:call-template>
9910
9514
  </xsl:variable>
9911
9515
  <xsl:variable name="x_coords">
9912
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
9516
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
9913
9517
  <xsl:sort select="." data-type="number"/>
9914
9518
  <x><xsl:value-of select="."/></x>
9915
9519
  </xsl:for-each>
9916
9520
  </xsl:variable>
9917
9521
  <xsl:variable name="y_coords">
9918
- <xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
9522
+ <xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
9919
9523
  <xsl:sort select="." data-type="number"/>
9920
9524
  <y><xsl:value-of select="."/></y>
9921
9525
  </xsl:for-each>
@@ -10120,11 +9724,11 @@
10120
9724
  <xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
10121
9725
  </xsl:variable>
10122
9726
 
10123
- <item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
10124
- <title>
9727
+ <mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
9728
+ <mn:title>
10125
9729
  <xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
10126
- </title>
10127
- </item>
9730
+ </mn:title>
9731
+ </mn:item>
10128
9732
  </xsl:if>
10129
9733
  </xsl:template>
10130
9734
 
@@ -10195,12 +9799,12 @@
10195
9799
  <xsl:param name="contents"/>
10196
9800
  <xsl:param name="contents_addon"/>
10197
9801
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10198
- <xsl:if test="$contents_nodes//item">
9802
+ <xsl:if test="$contents_nodes//mn:item">
10199
9803
  <fo:bookmark-tree>
10200
9804
  <xsl:choose>
10201
- <xsl:when test="$contents_nodes/doc">
9805
+ <xsl:when test="$contents_nodes/mn:doc">
10202
9806
  <xsl:choose>
10203
- <xsl:when test="count($contents_nodes/doc) &gt; 1">
9807
+ <xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
10204
9808
 
10205
9809
  <xsl:if test="$contents_nodes/collection">
10206
9810
  <fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -10208,8 +9812,8 @@
10208
9812
  </fo:bookmark>
10209
9813
  </xsl:if>
10210
9814
 
10211
- <xsl:for-each select="$contents_nodes/doc">
10212
- <fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
9815
+ <xsl:for-each select="$contents_nodes/mn:doc">
9816
+ <fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
10213
9817
  <xsl:if test="@bundle = 'true'">
10214
9818
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
10215
9819
  </xsl:if>
@@ -10243,14 +9847,14 @@
10243
9847
  </xsl:choose>
10244
9848
  </fo:bookmark-title>
10245
9849
 
10246
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
9850
+ <xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
10247
9851
 
10248
9852
  <xsl:call-template name="insertFigureBookmarks">
10249
- <xsl:with-param name="contents" select="contents"/>
9853
+ <xsl:with-param name="contents" select="mn:contents"/>
10250
9854
  </xsl:call-template>
10251
9855
 
10252
9856
  <xsl:call-template name="insertTableBookmarks">
10253
- <xsl:with-param name="contents" select="contents"/>
9857
+ <xsl:with-param name="contents" select="mn:contents"/>
10254
9858
  <xsl:with-param name="lang" select="@lang"/>
10255
9859
  </xsl:call-template>
10256
9860
 
@@ -10259,16 +9863,16 @@
10259
9863
  </xsl:for-each>
10260
9864
  </xsl:when>
10261
9865
  <xsl:otherwise>
10262
- <xsl:for-each select="$contents_nodes/doc">
9866
+ <xsl:for-each select="$contents_nodes/mn:doc">
10263
9867
 
10264
- <xsl:apply-templates select="contents/item" mode="bookmark"/>
9868
+ <xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
10265
9869
 
10266
9870
  <xsl:call-template name="insertFigureBookmarks">
10267
- <xsl:with-param name="contents" select="contents"/>
9871
+ <xsl:with-param name="contents" select="mn:contents"/>
10268
9872
  </xsl:call-template>
10269
9873
 
10270
9874
  <xsl:call-template name="insertTableBookmarks">
10271
- <xsl:with-param name="contents" select="contents"/>
9875
+ <xsl:with-param name="contents" select="mn:contents"/>
10272
9876
  <xsl:with-param name="lang" select="@lang"/>
10273
9877
  </xsl:call-template>
10274
9878
 
@@ -10277,14 +9881,14 @@
10277
9881
  </xsl:choose>
10278
9882
  </xsl:when>
10279
9883
  <xsl:otherwise>
10280
- <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
9884
+ <xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
10281
9885
 
10282
9886
  <xsl:call-template name="insertFigureBookmarks">
10283
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
9887
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10284
9888
  </xsl:call-template>
10285
9889
 
10286
9890
  <xsl:call-template name="insertTableBookmarks">
10287
- <xsl:with-param name="contents" select="$contents_nodes/contents"/>
9891
+ <xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
10288
9892
  <xsl:with-param name="lang" select="@lang"/>
10289
9893
  </xsl:call-template>
10290
9894
 
@@ -10301,45 +9905,41 @@
10301
9905
  <xsl:template name="insertFigureBookmarks">
10302
9906
  <xsl:param name="contents"/>
10303
9907
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10304
- <xsl:if test="$contents_nodes/figure">
10305
- <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
9908
+ <xsl:if test="$contents_nodes/mn:figure">
9909
+ <fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
10306
9910
  <fo:bookmark-title>Figures</fo:bookmark-title>
10307
- <xsl:for-each select="$contents_nodes/figure">
9911
+ <xsl:for-each select="$contents_nodes/mn:figure">
10308
9912
  <fo:bookmark internal-destination="{@id}">
10309
9913
  <fo:bookmark-title>
10310
- <xsl:value-of select="normalize-space(title)"/>
9914
+ <xsl:value-of select="normalize-space(mn:title)"/>
10311
9915
  </fo:bookmark-title>
10312
9916
  </fo:bookmark>
10313
9917
  </xsl:for-each>
10314
9918
  </fo:bookmark>
10315
- </xsl:if>
10316
-
10317
- <!-- see template addBookmarks -->
9919
+ </xsl:if><!-- see template addBookmarks -->
10318
9920
  </xsl:template> <!-- insertFigureBookmarks -->
10319
9921
 
10320
9922
  <xsl:template name="insertTableBookmarks">
10321
9923
  <xsl:param name="contents"/>
10322
9924
  <xsl:param name="lang"/>
10323
9925
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
10324
- <xsl:if test="$contents_nodes/table">
10325
- <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
9926
+ <xsl:if test="$contents_nodes/mn:table">
9927
+ <fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
10326
9928
  <fo:bookmark-title>
10327
9929
  <xsl:choose>
10328
9930
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
10329
9931
  <xsl:otherwise>Tables</xsl:otherwise>
10330
9932
  </xsl:choose>
10331
9933
  </fo:bookmark-title>
10332
- <xsl:for-each select="$contents_nodes/table">
9934
+ <xsl:for-each select="$contents_nodes/mn:table">
10333
9935
  <fo:bookmark internal-destination="{@id}">
10334
9936
  <fo:bookmark-title>
10335
- <xsl:value-of select="normalize-space(title)"/>
9937
+ <xsl:value-of select="normalize-space(mn:title)"/>
10336
9938
  </fo:bookmark-title>
10337
9939
  </fo:bookmark>
10338
9940
  </xsl:for-each>
10339
9941
  </fo:bookmark>
10340
- </xsl:if>
10341
-
10342
- <!-- see template addBookmarks -->
9942
+ </xsl:if><!-- see template addBookmarks -->
10343
9943
  </xsl:template> <!-- insertTableBookmarks -->
10344
9944
  <!-- End Bookmarks -->
10345
9945
 
@@ -10369,17 +9969,15 @@
10369
9969
  <xsl:param name="title" select="''"/>
10370
9970
  <xsl:choose>
10371
9971
  <xsl:when test="$lang = 'en'">
10372
-
10373
9972
  </xsl:when>
10374
9973
  <xsl:when test="$lang = 'fr'">
10375
-
10376
9974
  </xsl:when>
10377
9975
  <xsl:when test="$lang = 'de'">Deutsche</xsl:when>
10378
9976
  <xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
10379
9977
  </xsl:choose>
10380
9978
  </xsl:template>
10381
9979
 
10382
- <xsl:template match="item" mode="bookmark">
9980
+ <xsl:template match="mn:item" mode="bookmark">
10383
9981
  <xsl:choose>
10384
9982
  <xsl:when test="@id != ''">
10385
9983
  <fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -10389,7 +9987,7 @@
10389
9987
  <xsl:text> </xsl:text>
10390
9988
  </xsl:if>
10391
9989
  <xsl:variable name="title">
10392
- <xsl:for-each select="title/node()">
9990
+ <xsl:for-each select="mn:title/node()">
10393
9991
  <xsl:choose>
10394
9992
  <xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
10395
9993
  <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -10407,7 +10005,7 @@
10407
10005
  </xsl:choose>
10408
10006
  </xsl:template>
10409
10007
 
10410
- <xsl:template match="title" mode="bookmark"/>
10008
+ <xsl:template match="mn:title" mode="bookmark"/>
10411
10009
  <xsl:template match="text()" mode="bookmark"/>
10412
10010
 
10413
10011
  <!-- figure/name -->
@@ -10636,9 +10234,9 @@
10636
10234
  <xsl:template match="text()" mode="contents_item">
10637
10235
  <xsl:variable name="text">
10638
10236
  <!-- to split by '_' and other chars -->
10639
- <text><xsl:call-template name="add-zero-spaces-java"/></text>
10237
+ <mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
10640
10238
  </xsl:variable>
10641
- <xsl:for-each select="xalan:nodeset($text)/text/text()">
10239
+ <xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
10642
10240
  <xsl:call-template name="keep_together_standard_number"/>
10643
10241
  </xsl:for-each>
10644
10242
  </xsl:template>
@@ -10671,19 +10269,11 @@
10671
10269
 
10672
10270
  <xsl:template name="get_sourcecode_attributes">
10673
10271
  <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
10674
- <xsl:variable name="_font-size">
10675
-
10676
- <!-- inherit -->
10677
-
10678
- <!-- <xsl:if test="$namespace = 'ieee'">
10679
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
10680
- </xsl:if> -->
10681
-
10682
- <xsl:choose>
10683
- <xsl:when test="ancestor::*[local-name() = 'table'][not(parent::*[local-name() = 'sourcecode'][@linenums = 'true'])]">8.5</xsl:when>
10684
- <xsl:otherwise>9.5</xsl:otherwise>
10685
- </xsl:choose>
10686
-
10272
+ <xsl:variable name="_font-size"><!-- inherit -->
10273
+ <xsl:choose>
10274
+ <xsl:when test="ancestor::*[local-name() = 'table'][not(parent::*[local-name() = 'sourcecode'][@linenums = 'true'])]">8.5</xsl:when>
10275
+ <xsl:otherwise>9.5</xsl:otherwise>
10276
+ </xsl:choose>
10687
10277
  </xsl:variable>
10688
10278
 
10689
10279
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -10739,13 +10329,11 @@
10739
10329
  <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
10740
10330
  </xsl:choose>
10741
10331
  </xsl:attribute>
10742
-
10743
10332
  </xsl:if>
10744
10333
  <fo:block-container margin-left="0mm" role="SKIP">
10745
-
10746
- <xsl:if test="parent::*[local-name() = 'example']">
10747
- <fo:block font-size="1pt" line-height="10%" space-after="4pt"> </fo:block>
10748
- </xsl:if>
10334
+ <xsl:if test="parent::*[local-name() = 'example']">
10335
+ <fo:block font-size="1pt" line-height="10%" space-after="4pt"> </fo:block>
10336
+ </xsl:if>
10749
10337
 
10750
10338
  <fo:block xsl:use-attribute-sets="sourcecode-style">
10751
10339
 
@@ -10767,12 +10355,10 @@
10767
10355
  </fo:block>
10768
10356
 
10769
10357
  <xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
10770
-
10771
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
10772
-
10773
- <xsl:if test="parent::*[local-name() = 'example']">
10774
- <fo:block font-size="1pt" line-height="10%" space-before="6pt"> </fo:block>
10775
- </xsl:if>
10358
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
10359
+ <xsl:if test="parent::*[local-name() = 'example']">
10360
+ <fo:block font-size="1pt" line-height="10%" space-before="6pt"> </fo:block>
10361
+ </xsl:if>
10776
10362
 
10777
10363
  </fo:block-container>
10778
10364
  </fo:block-container>
@@ -10949,25 +10535,6 @@
10949
10535
  </xsl:choose>
10950
10536
  </xsl:template>
10951
10537
 
10952
- <!-- insert 'char' between each character in the string -->
10953
- <xsl:template name="interspers">
10954
- <xsl:param name="str"/>
10955
- <xsl:param name="char" select="$zero_width_space"/>
10956
- <xsl:if test="$str != ''">
10957
- <xsl:value-of select="substring($str, 1, 1)"/>
10958
-
10959
- <xsl:variable name="next_char" select="substring($str, 2, 1)"/>
10960
- <xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
10961
- <xsl:value-of select="$char"/>
10962
- </xsl:if>
10963
-
10964
- <xsl:call-template name="interspers">
10965
- <xsl:with-param name="str" select="substring($str, 2)"/>
10966
- <xsl:with-param name="char" select="$char"/>
10967
- </xsl:call-template>
10968
- </xsl:if>
10969
- </xsl:template>
10970
-
10971
10538
  <xsl:template name="interspers-java">
10972
10539
  <xsl:param name="str"/>
10973
10540
  <xsl:param name="char" select="$zero_width_space"/>
@@ -11064,7 +10631,7 @@
11064
10631
  </xsl:variable>
11065
10632
  <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
11066
10633
 
11067
- <xsl:for-each select="$classes/item">
10634
+ <xsl:for-each select="$classes/*[local-name() = 'item']">
11068
10635
  <xsl:variable name="class_name" select="."/>
11069
10636
  <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
11070
10637
  <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -11147,14 +10714,10 @@
11147
10714
 
11148
10715
  <xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
11149
10716
  <xsl:if test="normalize-space() != ''">
11150
-
11151
- <fo:block xsl:use-attribute-sets="permission-name-style">
11152
- <xsl:apply-templates/>
11153
-
11154
- <xsl:text>:</xsl:text>
11155
-
11156
- </fo:block>
11157
-
10717
+ <fo:block xsl:use-attribute-sets="permission-name-style">
10718
+ <xsl:apply-templates/>
10719
+ <xsl:text>:</xsl:text>
10720
+ </fo:block>
11158
10721
  </xsl:if>
11159
10722
  </xsl:template>
11160
10723
 
@@ -11175,26 +10738,21 @@
11175
10738
  <xsl:apply-templates select="*[local-name()='name']"/>
11176
10739
  <xsl:apply-templates select="*[local-name()='label']"/>
11177
10740
  <xsl:apply-templates select="@obligation"/>
11178
- <xsl:apply-templates select="*[local-name()='subject']"/>
11179
- <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
11180
- </fo:block>
11181
- </xsl:template>
11182
-
11183
- <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
11184
- <xsl:if test="normalize-space() != ''">
11185
-
11186
- <fo:block xsl:use-attribute-sets="requirement-name-style">
11187
-
11188
- <xsl:if test="../@type = 'class'">
11189
- <xsl:attribute name="background-color">white</xsl:attribute>
11190
- </xsl:if>
11191
-
11192
- <xsl:apply-templates/>
11193
-
11194
- <xsl:text>:</xsl:text>
10741
+ <xsl:apply-templates select="*[local-name()='subject']"/>
10742
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
10743
+ </fo:block>
10744
+ </xsl:template>
11195
10745
 
11196
- </fo:block>
10746
+ <xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
10747
+ <xsl:if test="normalize-space() != ''">
11197
10748
 
10749
+ <fo:block xsl:use-attribute-sets="requirement-name-style">
10750
+ <xsl:if test="../@type = 'class'">
10751
+ <xsl:attribute name="background-color">white</xsl:attribute>
10752
+ </xsl:if>
10753
+ <xsl:apply-templates/>
10754
+ <xsl:text>:</xsl:text>
10755
+ </fo:block>
11198
10756
  </xsl:if>
11199
10757
  </xsl:template>
11200
10758
 
@@ -11233,11 +10791,9 @@
11233
10791
  <xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
11234
10792
  <xsl:if test="normalize-space() != ''">
11235
10793
 
11236
- <fo:block xsl:use-attribute-sets="recommendation-name-style">
11237
- <xsl:apply-templates/>
11238
-
11239
- </fo:block>
11240
-
10794
+ <fo:block xsl:use-attribute-sets="recommendation-name-style">
10795
+ <xsl:apply-templates/>
10796
+ </fo:block>
11241
10797
  </xsl:if>
11242
10798
  </xsl:template>
11243
10799
 
@@ -11363,18 +10919,16 @@
11363
10919
 
11364
10920
  <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 ')">
11365
10921
  <xsl:attribute name="font-weight">bold</xsl:attribute>
11366
-
11367
- <xsl:attribute name="font-weight">normal</xsl:attribute>
11368
- <xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
11369
- <xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
11370
- </xsl:if>
11371
- <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
11372
- <xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
11373
- </xsl:if>
11374
- <xsl:if test="starts-with(*[local-name()='td'][1], 'Recommendation ')">
11375
- <xsl:attribute name="background-color">rgb(233, 235, 239)</xsl:attribute>
11376
- </xsl:if>
11377
-
10922
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10923
+ <xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
10924
+ <xsl:attribute name="background-color"><xsl:value-of select="$color_table_header_row"/></xsl:attribute>
10925
+ </xsl:if>
10926
+ <xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
10927
+ <xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
10928
+ </xsl:if>
10929
+ <xsl:if test="starts-with(*[local-name()='td'][1], 'Recommendation ')">
10930
+ <xsl:attribute name="background-color">rgb(233, 235, 239)</xsl:attribute>
10931
+ </xsl:if>
11378
10932
  </xsl:if>
11379
10933
 
11380
10934
  <xsl:apply-templates mode="requirement"/>
@@ -11419,10 +10973,8 @@
11419
10973
 
11420
10974
  <xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
11421
10975
  <fo:block font-size="11pt">
11422
-
11423
- <!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
11424
- <xsl:attribute name="color">white</xsl:attribute>
11425
-
10976
+ <!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
10977
+ <xsl:attribute name="color">white</xsl:attribute>
11426
10978
  <xsl:apply-templates/>
11427
10979
  </fo:block>
11428
10980
  </xsl:template>
@@ -11462,7 +11014,6 @@
11462
11014
  <xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
11463
11015
  <xsl:variable name="element">inline
11464
11016
 
11465
-
11466
11017
  </xsl:variable>
11467
11018
  <xsl:choose>
11468
11019
  <xsl:when test="contains($element, 'block')">
@@ -11494,110 +11045,105 @@
11494
11045
  text line 2
11495
11046
  -->
11496
11047
  <xsl:template match="*[local-name() = 'example']" name="example">
11048
+ <xsl:call-template name="setNamedDestination"/>
11049
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
11497
11050
 
11498
- <xsl:call-template name="setNamedDestination"/>
11499
- <fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
11051
+ <xsl:call-template name="setBlockSpanAll"/>
11500
11052
 
11501
- <xsl:call-template name="setBlockSpanAll"/>
11053
+ <xsl:call-template name="refine_example-style"/>
11502
11054
 
11503
- <xsl:call-template name="refine_example-style"/>
11055
+ <xsl:variable name="fo_element">
11056
+ <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>inline
11057
+ </xsl:variable>
11504
11058
 
11505
- <xsl:variable name="fo_element">
11506
- <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
11507
- inline
11508
- </xsl:variable>
11059
+ <fo:block-container margin-left="0mm" role="SKIP">
11509
11060
 
11510
- <fo:block-container margin-left="0mm" role="SKIP">
11061
+ <xsl:choose>
11511
11062
 
11512
- <xsl:choose>
11063
+ <xsl:when test="contains(normalize-space($fo_element), 'block')">
11513
11064
 
11514
- <xsl:when test="contains(normalize-space($fo_element), 'block')">
11065
+ <!-- display name 'EXAMPLE' in a separate block -->
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:block>
11515
11071
 
11516
- <!-- display name 'EXAMPLE' in a separate block -->
11517
- <fo:block>
11518
- <xsl:apply-templates select="*[local-name()='name']">
11072
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11073
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11074
+ <xsl:variable name="example_body">
11075
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11519
11076
  <xsl:with-param name="fo_element" select="$fo_element"/>
11520
11077
  </xsl:apply-templates>
11521
- </fo:block>
11522
-
11523
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11524
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11525
- <xsl:variable name="example_body">
11526
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11527
- <xsl:with-param name="fo_element" select="$fo_element"/>
11528
- </xsl:apply-templates>
11529
- </xsl:variable>
11530
- <xsl:choose>
11531
- <xsl:when test="xalan:nodeset($example_body)/*">
11532
- <xsl:copy-of select="$example_body"/>
11533
- </xsl:when>
11534
- <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11535
- </xsl:choose>
11536
- </fo:block-container>
11537
- </fo:block-container>
11538
- </xsl:when> <!-- end block -->
11539
-
11540
- <xsl:when test="contains(normalize-space($fo_element), 'list')">
11541
-
11542
- <xsl:variable name="provisional_distance_between_starts_">
11543
- 7
11544
- </xsl:variable>
11545
- <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11546
- <xsl:variable name="indent_">
11547
- 0
11548
11078
  </xsl:variable>
11549
- <xsl:variable name="indent" select="normalize-space($indent_)"/>
11079
+ <xsl:choose>
11080
+ <xsl:when test="xalan:nodeset($example_body)/*">
11081
+ <xsl:copy-of select="$example_body"/>
11082
+ </xsl:when>
11083
+ <xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
11084
+ </xsl:choose>
11085
+ </fo:block-container>
11086
+ </fo:block-container>
11087
+ </xsl:when> <!-- end block -->
11550
11088
 
11551
- <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11552
- <fo:list-item>
11553
- <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11554
- <fo:block>
11555
- <xsl:apply-templates select="*[local-name()='name']">
11556
- <xsl:with-param name="fo_element">block</xsl:with-param>
11557
- </xsl:apply-templates>
11558
- </fo:block>
11559
- </fo:list-item-label>
11560
- <fo:list-item-body start-indent="body-start()">
11561
- <fo:block>
11562
- <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11563
- <xsl:with-param name="fo_element" select="$fo_element"/>
11564
- </xsl:apply-templates>
11565
- </fo:block>
11566
- </fo:list-item-body>
11567
- </fo:list-item>
11568
- </fo:list-block>
11569
- </xsl:when> <!-- end list -->
11089
+ <xsl:when test="contains(normalize-space($fo_element), 'list')">
11570
11090
 
11571
- <xsl:otherwise> <!-- inline -->
11091
+ <xsl:variable name="provisional_distance_between_starts_">7
11092
+ </xsl:variable>
11093
+ <xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
11094
+ <xsl:variable name="indent_">0
11095
+ </xsl:variable>
11096
+ <xsl:variable name="indent" select="normalize-space($indent_)"/>
11572
11097
 
11573
- <!-- display 'EXAMPLE' and first element in the same line -->
11574
- <fo:block>
11575
- <xsl:apply-templates select="*[local-name()='name']">
11576
- <xsl:with-param name="fo_element" select="$fo_element"/>
11577
- </xsl:apply-templates>
11578
- <fo:inline>
11579
- <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11098
+ <fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
11099
+ <fo:list-item>
11100
+ <fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
11101
+ <fo:block>
11102
+ <xsl:apply-templates select="*[local-name()='name']">
11103
+ <xsl:with-param name="fo_element">block</xsl:with-param>
11104
+ </xsl:apply-templates>
11105
+ </fo:block>
11106
+ </fo:list-item-label>
11107
+ <fo:list-item-body start-indent="body-start()">
11108
+ <fo:block>
11109
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]">
11580
11110
  <xsl:with-param name="fo_element" select="$fo_element"/>
11581
11111
  </xsl:apply-templates>
11582
- </fo:inline>
11583
- </fo:block>
11112
+ </fo:block>
11113
+ </fo:list-item-body>
11114
+ </fo:list-item>
11115
+ </fo:list-block>
11116
+ </xsl:when> <!-- end list -->
11584
11117
 
11585
- <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11586
- <!-- display further elements in blocks -->
11587
- <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11588
- <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11589
- <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11590
- <xsl:with-param name="fo_element" select="'block'"/>
11591
- </xsl:apply-templates>
11592
- </fo:block-container>
11593
- </fo:block-container>
11594
- </xsl:if>
11595
- </xsl:otherwise> <!-- end inline -->
11118
+ <xsl:otherwise> <!-- inline -->
11596
11119
 
11597
- </xsl:choose>
11598
- </fo:block-container>
11599
- </fo:block-container>
11120
+ <!-- display 'EXAMPLE' and first element in the same line -->
11121
+ <fo:block>
11122
+ <xsl:apply-templates select="*[local-name()='name']">
11123
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11124
+ </xsl:apply-templates>
11125
+ <fo:inline>
11126
+ <xsl:apply-templates select="*[not(local-name() = 'name')][1]">
11127
+ <xsl:with-param name="fo_element" select="$fo_element"/>
11128
+ </xsl:apply-templates>
11129
+ </fo:inline>
11130
+ </fo:block>
11131
+
11132
+ <xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
11133
+ <!-- display further elements in blocks -->
11134
+ <fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
11135
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11136
+ <xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
11137
+ <xsl:with-param name="fo_element" select="'block'"/>
11138
+ </xsl:apply-templates>
11139
+ </fo:block-container>
11140
+ </fo:block-container>
11141
+ </xsl:if>
11142
+ </xsl:otherwise> <!-- end inline -->
11600
11143
 
11144
+ </xsl:choose>
11145
+ </fo:block-container>
11146
+ </fo:block-container>
11601
11147
  </xsl:template>
11602
11148
 
11603
11149
  <!-- example/name -->
@@ -11612,7 +11158,6 @@
11612
11158
  </xsl:when>
11613
11159
  <xsl:when test="contains(normalize-space($fo_element), 'block')">
11614
11160
  <fo:block xsl:use-attribute-sets="example-name-style">
11615
-
11616
11161
  <xsl:apply-templates/>
11617
11162
  </fo:block>
11618
11163
  </xsl:when>
@@ -11629,7 +11174,6 @@
11629
11174
  <!-- table/example/name, table/tfoot//example/name -->
11630
11175
  <xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
11631
11176
  <fo:inline xsl:use-attribute-sets="example-name-style">
11632
-
11633
11177
  <xsl:apply-templates/>
11634
11178
  </fo:inline>
11635
11179
  </xsl:template>
@@ -11639,7 +11183,6 @@
11639
11183
 
11640
11184
  <xsl:variable name="num"><xsl:number/></xsl:variable>
11641
11185
  <xsl:variable name="element">
11642
-
11643
11186
  <xsl:value-of select="$fo_element"/>
11644
11187
  </xsl:variable>
11645
11188
  <xsl:choose>
@@ -11757,7 +11300,7 @@
11757
11300
  </xsl:call-template>
11758
11301
  </xsl:variable>
11759
11302
 
11760
- <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
11303
+ <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
11761
11304
  <xsl:choose>
11762
11305
  <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>
11763
11306
  <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>
@@ -11794,7 +11337,6 @@
11794
11337
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
11795
11338
  </xsl:if>
11796
11339
  </xsl:if>
11797
-
11798
11340
  <fo:block-container margin-left="0mm" role="SKIP">
11799
11341
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11800
11342
 
@@ -11877,7 +11419,6 @@
11877
11419
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
11878
11420
  <xsl:attribute name="vertical-align">super</xsl:attribute>
11879
11421
  <xsl:attribute name="font-size">80%</xsl:attribute>
11880
-
11881
11422
  </xsl:if>
11882
11423
 
11883
11424
  <xsl:call-template name="refine_eref-style"/>
@@ -11926,7 +11467,6 @@
11926
11467
  </xsl:template>
11927
11468
 
11928
11469
  <xsl:template name="refine_basic_link_style">
11929
-
11930
11470
  </xsl:template> <!-- refine_basic_link_style -->
11931
11471
 
11932
11472
  <!-- ====== -->
@@ -11943,13 +11483,11 @@
11943
11483
  </xsl:variable>
11944
11484
 
11945
11485
  <xsl:variable name="padding">
11946
-
11947
- <xsl:choose>
11948
- <xsl:when test="ancestor::*[local-name() = 'note'] and ancestor::*[local-name() = 'name']">1</xsl:when>
11949
- <xsl:when test="$depth = 2">2</xsl:when>
11950
- <xsl:otherwise>1</xsl:otherwise>
11951
- </xsl:choose>
11952
-
11486
+ <xsl:choose>
11487
+ <xsl:when test="ancestor::*[local-name() = 'note'] and ancestor::*[local-name() = 'name']">1</xsl:when>
11488
+ <xsl:when test="$depth = 2">2</xsl:when>
11489
+ <xsl:otherwise>1</xsl:otherwise>
11490
+ </xsl:choose>
11953
11491
  </xsl:variable>
11954
11492
 
11955
11493
  <xsl:variable name="padding-right">
@@ -11960,7 +11498,6 @@
11960
11498
  </xsl:otherwise>
11961
11499
  </xsl:choose>
11962
11500
  </xsl:variable>
11963
-
11964
11501
  <xsl:choose>
11965
11502
  <xsl:when test="$lang = 'zh'">
11966
11503
  <fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -11984,9 +11521,7 @@
11984
11521
  <xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
11985
11522
 
11986
11523
  <xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
11987
-
11988
- <xsl:attribute name="padding-right">1mm</xsl:attribute>
11989
-
11524
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
11990
11525
  </xsl:template>
11991
11526
 
11992
11527
  <xsl:template name="insertNonBreakSpaces">
@@ -12004,8 +11539,7 @@
12004
11539
  <xsl:variable name="level">
12005
11540
  <xsl:call-template name="getLevel"/>
12006
11541
  </xsl:variable>
12007
- <xsl:variable name="font-size">
12008
- inherit
11542
+ <xsl:variable name="font-size">inherit
12009
11543
  </xsl:variable>
12010
11544
  <xsl:variable name="levelTerm">
12011
11545
  <xsl:call-template name="getLevelTermName"/>
@@ -12057,11 +11591,9 @@
12057
11591
  </xsl:template>
12058
11592
 
12059
11593
  <xsl:template name="setStyle_preferred">
12060
-
12061
- <xsl:if test="*[local-name() = 'strong']">
12062
- <xsl:attribute name="font-weight">normal</xsl:attribute>
12063
- </xsl:if>
12064
-
11594
+ <xsl:if test="*[local-name() = 'strong']">
11595
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11596
+ </xsl:if>
12065
11597
  </xsl:template>
12066
11598
 
12067
11599
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -12138,7 +11670,6 @@
12138
11670
 
12139
11671
  <!-- main sections -->
12140
11672
  <xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
12141
-
12142
11673
  <xsl:call-template name="setNamedDestination"/>
12143
11674
  <fo:block>
12144
11675
  <xsl:call-template name="setId"/>
@@ -12173,18 +11704,14 @@
12173
11704
  </xsl:template>
12174
11705
 
12175
11706
  <xsl:template name="sections_element_style">
12176
-
12177
- <xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!-- | ogc:sections/ogc:terms -->
12178
- <xsl:if test="$pos &gt;= 2">
12179
- <xsl:attribute name="space-before">18pt</xsl:attribute>
12180
- </xsl:if>
12181
-
11707
+ <xsl:variable name="pos"><xsl:number count="ogc:sections/ogc:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!-- | ogc:sections/ogc:terms -->
11708
+ <xsl:if test="$pos &gt;= 2">
11709
+ <xsl:attribute name="space-before">18pt</xsl:attribute>
11710
+ </xsl:if>
12182
11711
  </xsl:template> <!-- sections_element_style -->
12183
11712
 
12184
11713
  <xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
12185
-
12186
- <fo:block break-after="page"/>
12187
-
11714
+ <fo:block break-after="page"/>
12188
11715
  <xsl:call-template name="setNamedDestination"/>
12189
11716
  <fo:block>
12190
11717
  <xsl:call-template name="setId"/>
@@ -12233,7 +11760,6 @@
12233
11760
  </xsl:template>
12234
11761
 
12235
11762
  <xsl:template name="refine_clause_style">
12236
-
12237
11763
  </xsl:template> <!-- refine_clause_style -->
12238
11764
 
12239
11765
  <xsl:template match="*[local-name() = 'definitions']">
@@ -12273,7 +11799,6 @@
12273
11799
  </xsl:template>
12274
11800
 
12275
11801
  <xsl:template name="refine_annex_style">
12276
-
12277
11802
  </xsl:template>
12278
11803
 
12279
11804
  <!-- document text (not figures, or tables) footnotes -->
@@ -12377,15 +11902,13 @@
12377
11902
  <!-- Lists processing -->
12378
11903
  <!-- ===================================== -->
12379
11904
  <xsl:variable name="ul_labels_">
12380
-
12381
- <label color="{$color_design}">•</label>
11905
+ <label color="{$color_design}">•</label>
12382
11906
 
12383
11907
  </xsl:variable>
12384
11908
  <xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
12385
11909
 
12386
11910
  <xsl:template name="setULLabel">
12387
- <xsl:variable name="list_level__">
12388
- <xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
11911
+ <xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
12389
11912
  </xsl:variable>
12390
11913
  <xsl:variable name="list_level_" select="number($list_level__)"/>
12391
11914
  <xsl:variable name="list_level">
@@ -12442,28 +11965,22 @@
12442
11965
  <xsl:variable name="label">
12443
11966
 
12444
11967
  <xsl:variable name="style_prefix_">
12445
- <xsl:if test="$type = 'roman'">
12446
- <!-- Example: (i) -->
11968
+ <xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
12447
11969
  </xsl:if>
12448
11970
  <xsl:if test="$type = 'alphabet'">
12449
-
12450
11971
  </xsl:if>
12451
11972
  </xsl:variable>
12452
11973
  <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
12453
11974
 
12454
11975
  <xsl:variable name="style_suffix_">
12455
11976
  <xsl:choose>
12456
- <xsl:when test="$type = 'arabic'">
12457
- .
11977
+ <xsl:when test="$type = 'arabic'">.
12458
11978
  </xsl:when>
12459
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12460
- )
11979
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
12461
11980
  </xsl:when>
12462
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12463
- )
11981
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">)
12464
11982
  </xsl:when>
12465
- <xsl:when test="$type = 'roman'">
12466
- )
11983
+ <xsl:when test="$type = 'roman'">)
12467
11984
  </xsl:when>
12468
11985
  <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
12469
11986
  </xsl:choose>
@@ -12480,8 +11997,7 @@
12480
11997
  <xsl:value-of select="$style_suffix"/>
12481
11998
  </xsl:if>
12482
11999
  </xsl:variable>
12483
-
12484
- <xsl:value-of select="normalize-space($label)"/>
12000
+ <xsl:value-of select="normalize-space($label)"/>
12485
12001
 
12486
12002
  </xsl:when>
12487
12003
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -12538,17 +12054,13 @@
12538
12054
 
12539
12055
  <xsl:variable name="format">
12540
12056
  <xsl:choose>
12541
- <xsl:when test="$type = 'arabic'">
12542
- 1.
12057
+ <xsl:when test="$type = 'arabic'">1.
12543
12058
  </xsl:when>
12544
- <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
12545
- a)
12059
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
12546
12060
  </xsl:when>
12547
- <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
12548
- A)
12061
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A)
12549
12062
  </xsl:when>
12550
- <xsl:when test="$type = 'roman'">
12551
- i)
12063
+ <xsl:when test="$type = 'roman'">i)
12552
12064
  </xsl:when>
12553
12065
  <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
12554
12066
  <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -12585,19 +12097,16 @@
12585
12097
  </fo:block-container>
12586
12098
  </xsl:when>
12587
12099
  <xsl:otherwise>
12588
-
12589
- <fo:block role="SKIP">
12590
- <xsl:apply-templates select="." mode="list">
12591
- <xsl:with-param name="indent" select="$indent"/>
12592
- </xsl:apply-templates>
12593
- </fo:block>
12594
-
12100
+ <fo:block role="SKIP">
12101
+ <xsl:apply-templates select="." mode="list">
12102
+ <xsl:with-param name="indent" select="$indent"/>
12103
+ </xsl:apply-templates>
12104
+ </fo:block>
12595
12105
  </xsl:otherwise>
12596
12106
  </xsl:choose>
12597
12107
  </xsl:template>
12598
12108
 
12599
12109
  <xsl:template name="refine_list_container_style">
12600
-
12601
12110
  </xsl:template> <!-- refine_list_container_style -->
12602
12111
 
12603
12112
  <xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -12661,7 +12170,6 @@
12661
12170
  </xsl:template>
12662
12171
 
12663
12172
  <xsl:template name="refine_list-style_provisional-distance-between-starts">
12664
-
12665
12173
  </xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
12666
12174
 
12667
12175
  <xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -12946,7 +12454,6 @@
12946
12454
  <xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
12947
12455
  <xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
12948
12456
  <fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
12949
-
12950
12457
  <xsl:apply-templates/>
12951
12458
  </fo:block>
12952
12459
  </xsl:template>
@@ -12998,7 +12505,6 @@
12998
12505
  <fo:table-column column-width="15mm"/>
12999
12506
  <fo:table-body>
13000
12507
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
13001
-
13002
12508
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
13003
12509
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
13004
12510
  <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -13034,7 +12540,6 @@
13034
12540
  <xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
13035
12541
  <xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
13036
12542
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
13037
-
13038
12543
  </xsl:template>
13039
12544
  <!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
13040
12545
  <xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -13045,16 +12550,13 @@
13045
12550
  <xsl:call-template name="setNamedDestination"/>
13046
12551
  <fo:block id="{@id}">
13047
12552
  <xsl:apply-templates/>
13048
-
13049
12553
  </fo:block>
13050
12554
  </xsl:template>
13051
12555
 
13052
12556
  <!-- Bibliography (non-normative references) -->
13053
12557
  <xsl:template match="*[local-name() = 'references']">
13054
12558
  <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
13055
-
13056
- <fo:block break-after="page"/>
13057
-
12559
+ <fo:block break-after="page"/>
13058
12560
  </xsl:if>
13059
12561
 
13060
12562
  <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -13070,9 +12572,7 @@
13070
12572
 
13071
12573
  <fo:block xsl:use-attribute-sets="references-non-normative-style">
13072
12574
  <xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
13073
-
13074
12575
  </fo:block>
13075
-
13076
12576
  </xsl:template> <!-- references -->
13077
12577
 
13078
12578
  <xsl:template match="*[local-name() = 'bibitem']">
@@ -13082,44 +12582,39 @@
13082
12582
  <!-- Normative references -->
13083
12583
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
13084
12584
  <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13085
-
13086
- <xsl:call-template name="setNamedDestination"/>
13087
- <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
13088
-
13089
- <xsl:call-template name="processBibitem"/>
13090
- </fo:block>
12585
+ <xsl:call-template name="setNamedDestination"/>
12586
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
12587
+ <xsl:call-template name="processBibitem"/>
12588
+ </fo:block>
13091
12589
 
13092
12590
  </xsl:template> <!-- bibitem -->
13093
12591
 
13094
12592
  <!-- Bibliography (non-normative references) -->
13095
12593
  <xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
13096
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13097
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
12594
+ <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
13098
12595
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
13099
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
13100
- <xsl:call-template name="setNamedDestination"/>
13101
- <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
13102
-
13103
- <fo:list-item>
13104
- <fo:list-item-label end-indent="label-end()">
13105
- <fo:block role="SKIP">
13106
- <fo:inline role="SKIP">
13107
-
13108
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13109
- <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
13110
- </xsl:apply-templates>
13111
- </fo:inline>
13112
- </fo:block>
13113
- </fo:list-item-label>
13114
- <fo:list-item-body start-indent="body-start()">
13115
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
13116
- <xsl:call-template name="processBibitem">
13117
- <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
13118
- </xsl:call-template>
13119
- </fo:block>
13120
- </fo:list-item-body>
13121
- </fo:list-item>
13122
- </fo:list-block>
12596
+ <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
12597
+ <xsl:call-template name="setNamedDestination"/>
12598
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
12599
+ <fo:list-item>
12600
+ <fo:list-item-label end-indent="label-end()">
12601
+ <fo:block role="SKIP">
12602
+ <fo:inline role="SKIP">
12603
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12604
+ <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
12605
+ </xsl:apply-templates>
12606
+ </fo:inline>
12607
+ </fo:block>
12608
+ </fo:list-item-label>
12609
+ <fo:list-item-body start-indent="body-start()">
12610
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
12611
+ <xsl:call-template name="processBibitem">
12612
+ <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
12613
+ </xsl:call-template>
12614
+ </fo:block>
12615
+ </fo:list-item-body>
12616
+ </fo:list-item>
12617
+ </fo:list-block>
13123
12618
 
13124
12619
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
13125
12620
 
@@ -13129,7 +12624,6 @@
13129
12624
  <xsl:otherwise>
13130
12625
  <xsl:call-template name="setNamedDestination"/>
13131
12626
  <fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
13132
-
13133
12627
  <fo:list-item-label end-indent="label-end()">
13134
12628
  <fo:block role="SKIP">
13135
12629
  <fo:inline role="SKIP">
@@ -13156,18 +12650,16 @@
13156
12650
 
13157
12651
  <xsl:template name="processBibitem">
13158
12652
  <xsl:param name="biblio_tag_part">both</xsl:param>
12653
+ <!-- start bibitem processing -->
12654
+ <xsl:if test=".//*[local-name() = 'fn']">
12655
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
12656
+ </xsl:if>
13159
12657
 
13160
- <!-- start bibitem processing -->
13161
- <xsl:if test=".//*[local-name() = 'fn']">
13162
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
13163
- </xsl:if>
13164
-
13165
- <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
13166
- <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
13167
- </xsl:apply-templates>
13168
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
13169
- <!-- end bibitem processing -->
13170
-
12658
+ <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
12659
+ <xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
12660
+ </xsl:apply-templates>
12661
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
12662
+ <!-- end bibitem processing -->
13171
12663
  </xsl:template> <!-- processBibitem (bibitem) -->
13172
12664
 
13173
12665
  <xsl:template match="*[local-name() = 'title']" mode="title">
@@ -13310,8 +12802,7 @@
13310
12802
  <xsl:choose>
13311
12803
  <xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
13312
12804
  <xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
13313
- <xsl:otherwise><!-- default value -->
13314
- 2
12805
+ <xsl:otherwise><!-- default value -->2
13315
12806
  </xsl:otherwise>
13316
12807
  </xsl:choose>
13317
12808
  </xsl:variable>
@@ -13519,33 +13010,26 @@
13519
13010
  <!-- ================ -->
13520
13011
  <!-- Admonition -->
13521
13012
  <!-- ================ -->
13522
- <xsl:template match="*[local-name() = 'admonition']">
13523
-
13524
- <!-- text in the box -->
13525
- <xsl:call-template name="setNamedDestination"/>
13526
- <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
13527
-
13528
- <xsl:call-template name="setBlockSpanAll"/>
13529
-
13530
- <xsl:variable name="admonition_color" select="normalize-space(/ogc:metanorma/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = concat('color-admonition-', @type)]/ogc:value)"/>
13531
- <xsl:if test="$admonition_color != ''">
13532
- <xsl:attribute name="border">0.5pt solid <xsl:value-of select="$admonition_color"/></xsl:attribute>
13533
- <xsl:attribute name="color"><xsl:value-of select="$admonition_color"/></xsl:attribute>
13534
- </xsl:if>
13535
-
13536
- <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
13537
-
13538
- <fo:block xsl:use-attribute-sets="admonition-name-style">
13539
- <xsl:call-template name="displayAdmonitionName"/>
13540
- </fo:block>
13541
- <fo:block xsl:use-attribute-sets="admonition-p-style">
13542
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
13543
- </fo:block>
13544
-
13545
- </fo:block-container>
13013
+ <xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
13014
+ <xsl:call-template name="setNamedDestination"/>
13015
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
13546
13016
 
13547
- </fo:block-container>
13017
+ <xsl:call-template name="setBlockSpanAll"/>
13018
+ <xsl:variable name="admonition_color" select="normalize-space(/ogc:metanorma/ogc:metanorma-extension/ogc:presentation-metadata[ogc:name = concat('color-admonition-', @type)]/ogc:value)"/>
13019
+ <xsl:if test="$admonition_color != ''">
13020
+ <xsl:attribute name="border">0.5pt solid <xsl:value-of select="$admonition_color"/></xsl:attribute>
13021
+ <xsl:attribute name="color"><xsl:value-of select="$admonition_color"/></xsl:attribute>
13022
+ </xsl:if>
13023
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
13024
+ <fo:block xsl:use-attribute-sets="admonition-name-style">
13025
+ <xsl:call-template name="displayAdmonitionName"/>
13026
+ </fo:block>
13027
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
13028
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
13029
+ </fo:block>
13548
13030
 
13031
+ </fo:block-container>
13032
+ </fo:block-container>
13549
13033
  </xsl:template>
13550
13034
 
13551
13035
  <xsl:template name="displayAdmonitionName">
@@ -13593,12 +13077,10 @@
13593
13077
  </xsl:template> -->
13594
13078
 
13595
13079
  <xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
13080
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
13596
13081
 
13597
- <fo:block xsl:use-attribute-sets="admonition-p-style">
13598
-
13599
- <xsl:apply-templates/>
13600
- </fo:block>
13601
-
13082
+ <xsl:apply-templates/>
13083
+ </fo:block>
13602
13084
  </xsl:template>
13603
13085
 
13604
13086
  <!-- ================ -->
@@ -13634,11 +13116,9 @@
13634
13116
 
13635
13117
  <!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
13636
13118
  <xsl:variable name="updated_xml_step2">
13637
-
13638
- <xsl:if test="$table_if = 'false'">
13639
- <xsl:copy-of select="$updated_xml_step1"/>
13640
- </xsl:if>
13641
-
13119
+ <xsl:if test="$table_if = 'false'">
13120
+ <xsl:copy-of select="$updated_xml_step1"/>
13121
+ </xsl:if>
13642
13122
  </xsl:variable>
13643
13123
 
13644
13124
  <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -14113,7 +13593,6 @@
14113
13593
  </xsl:template>
14114
13594
 
14115
13595
  <xsl:template name="addNamedDestinationAttribute">
14116
-
14117
13596
  </xsl:template>
14118
13597
 
14119
13598
  <xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -14608,7 +14087,6 @@
14608
14087
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
14609
14088
  <xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
14610
14089
  <!-- if EXPRESS reference -->
14611
-
14612
14090
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
14613
14091
  <regex><xsl:value-of select="$regex_solidus_units"/></regex>
14614
14092
  <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
@@ -14662,8 +14140,7 @@
14662
14140
 
14663
14141
  <xsl:variable name="text2">
14664
14142
  <xsl:element name="text" namespace="{$namespace_full}">
14665
- <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
14666
- <xsl:copy-of select="."/>
14143
+ <xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
14667
14144
  </xsl:for-each>
14668
14145
  </xsl:element>
14669
14146
  </xsl:variable>
@@ -14955,9 +14432,7 @@
14955
14432
  </xsl:attribute>
14956
14433
  <xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
14957
14434
  <xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
14958
-
14959
- <xsl:value-of select="$skip_footnote_body_"/>
14960
-
14435
+ <xsl:value-of select="$skip_footnote_body_"/>
14961
14436
  </xsl:attribute>
14962
14437
  <xsl:attribute name="ref_id">
14963
14438
  <xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -15046,7 +14521,6 @@
15046
14521
 
15047
14522
  <xsl:template name="printEdition">
15048
14523
  <xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
15049
-
15050
14524
  <xsl:choose>
15051
14525
  <xsl:when test="$edition_i18n != ''">
15052
14526
  <!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -15275,8 +14749,7 @@
15275
14749
  <dc:title>
15276
14750
  <xsl:variable name="title">
15277
14751
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15278
-
15279
- <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
14752
+ <xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
15280
14753
 
15281
14754
  </xsl:for-each>
15282
14755
  </xsl:variable>
@@ -15295,16 +14768,14 @@
15295
14768
  </dc:title>
15296
14769
  <xsl:variable name="dc_creator">
15297
14770
  <xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
15298
-
15299
- <rdf:Seq>
15300
- <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
15301
- <rdf:li>
15302
- <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
15303
- </rdf:li>
15304
- <!-- <xsl:if test="position() != last()">; </xsl:if> -->
15305
- </xsl:for-each>
15306
- </rdf:Seq>
15307
-
14771
+ <rdf:Seq>
14772
+ <xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
14773
+ <rdf:li>
14774
+ <xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
14775
+ </rdf:li>
14776
+ <!-- <xsl:if test="position() != last()">; </xsl:if> -->
14777
+ </xsl:for-each>
14778
+ </rdf:Seq>
15308
14779
  </xsl:for-each>
15309
14780
  </xsl:variable>
15310
14781
  <xsl:if test="normalize-space($dc_creator) != ''">
@@ -15315,9 +14786,7 @@
15315
14786
 
15316
14787
  <xsl:variable name="dc_description">
15317
14788
  <xsl:variable name="abstract">
15318
-
15319
- <xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
15320
-
14789
+ <xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
15321
14790
  </xsl:variable>
15322
14791
  <rdf:Alt>
15323
14792
  <rdf:li xml:lang="x-default">
@@ -15382,7 +14851,9 @@
15382
14851
  <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
15383
14852
  <xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
15384
14853
  <xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
15385
- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
14854
+ <!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
14855
+ <!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
14856
+ <xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
15386
14857
  <xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
15387
14858
  <!-- Todo: need update -->
15388
14859
  <xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -15547,7 +15018,7 @@
15547
15018
  <xsl:param name="normalize-space" select="'true'"/>
15548
15019
  <xsl:param name="keep_sep" select="'false'"/>
15549
15020
  <xsl:if test="string-length($pText) &gt;0">
15550
- <item>
15021
+ <xsl:element name="item" namespace="{$namespace_mn_xsl}">
15551
15022
  <xsl:choose>
15552
15023
  <xsl:when test="$normalize-space = 'true'">
15553
15024
  <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -15556,8 +15027,8 @@
15556
15027
  <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
15557
15028
  </xsl:otherwise>
15558
15029
  </xsl:choose>
15559
- </item>
15560
- <xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
15030
+ </xsl:element>
15031
+ <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>
15561
15032
  <xsl:call-template name="split">
15562
15033
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
15563
15034
  <xsl:with-param name="sep" select="$sep"/>
@@ -15575,30 +15046,6 @@
15575
15046
  <xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
15576
15047
  </xsl:template>
15577
15048
 
15578
- <xsl:template name="namespaceCheck">
15579
- <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
15580
- <xsl:variable name="XSLNS">
15581
-
15582
- <xsl:value-of select="document('')//*/namespace::ogc"/>
15583
-
15584
- </xsl:variable>
15585
- <!-- <xsl:if test="$documentNS != $XSLNS">
15586
- <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
15587
- </xsl:if> -->
15588
- </xsl:template> <!-- namespaceCheck -->
15589
-
15590
- <xsl:template name="getLanguage">
15591
- <xsl:param name="lang"/>
15592
- <xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
15593
- <xsl:choose>
15594
- <xsl:when test="$language = 'en'">English</xsl:when>
15595
- <xsl:when test="$language = 'fr'">French</xsl:when>
15596
- <xsl:when test="$language = 'de'">Deutsch</xsl:when>
15597
- <xsl:when test="$language = 'cn'">Chinese</xsl:when>
15598
- <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
15599
- </xsl:choose>
15600
- </xsl:template>
15601
-
15602
15049
  <xsl:template name="setId">
15603
15050
  <xsl:param name="prefix"/>
15604
15051
  <xsl:attribute name="id">