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