metanorma-bipm 2.6.8 → 2.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/bipm/base_convert.rb +14 -12
- data/lib/isodoc/bipm/bipm.brochure.xsl +817 -1322
- data/lib/isodoc/bipm/bipm.guide.xsl +817 -1322
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +817 -1322
- data/lib/isodoc/bipm/bipm.rapport.xsl +817 -1322
- data/lib/isodoc/bipm/html_convert.rb +8 -8
- data/lib/isodoc/bipm/jcgm.standard.xsl +753 -1290
- data/lib/isodoc/bipm/{doccontrol.rb → presentation_doccontrol.rb} +19 -19
- data/lib/isodoc/bipm/presentation_xml_convert.rb +21 -9
- data/lib/metanorma/bipm/version.rb +1 -1
- metadata +3 -3
|
@@ -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:bipm="https://www.metanorma.org/ns/standoc" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" 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:bipm="https://www.metanorma.org/ns/standoc" xmlns:mn="https://www.metanorma.org/ns/xslt" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:java="http://xml.apache.org/xalan/java" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" 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
|
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
<xsl:variable name="docid">
|
|
41
41
|
<xsl:call-template name="getDocumentId"/>
|
|
42
42
|
</xsl:variable>
|
|
43
|
-
<doc id="{$docid}" lang="{$lang}" doctype="{$doctype}" title-part="{$title-part}">
|
|
43
|
+
<mn:doc id="{$docid}" lang="{$lang}" doctype="{$doctype}" title-part="{$title-part}">
|
|
44
44
|
<xsl:call-template name="generateContents"/>
|
|
45
|
-
</doc>
|
|
45
|
+
</mn:doc>
|
|
46
46
|
</xsl:for-each>
|
|
47
47
|
</xsl:for-each>
|
|
48
48
|
</xsl:when>
|
|
@@ -57,9 +57,9 @@
|
|
|
57
57
|
<xsl:variable name="docid">
|
|
58
58
|
<xsl:call-template name="getDocumentId"/>
|
|
59
59
|
</xsl:variable>
|
|
60
|
-
<doc id="{$docid}" lang="{$lang}">
|
|
60
|
+
<mn:doc id="{$docid}" lang="{$lang}">
|
|
61
61
|
<xsl:call-template name="generateContents"/>
|
|
62
|
-
</doc>
|
|
62
|
+
</mn:doc>
|
|
63
63
|
</xsl:for-each>
|
|
64
64
|
</xsl:for-each>
|
|
65
65
|
</xsl:otherwise>
|
|
@@ -70,9 +70,9 @@
|
|
|
70
70
|
<xsl:variable name="docid">
|
|
71
71
|
<xsl:call-template name="getDocumentId"/>
|
|
72
72
|
</xsl:variable>
|
|
73
|
-
<doc id="{$docid}" lang="{$lang}">
|
|
73
|
+
<mn:doc id="{$docid}" lang="{$lang}">
|
|
74
74
|
<xsl:call-template name="generateContents"/>
|
|
75
|
-
</doc>
|
|
75
|
+
</mn:doc>
|
|
76
76
|
</xsl:otherwise>
|
|
77
77
|
</xsl:choose>
|
|
78
78
|
</xsl:variable>
|
|
@@ -174,7 +174,7 @@
|
|
|
174
174
|
<xsl:variable name="doctype" select="//bipm:metanorma/bipm:bibdata/bipm:ext/bipm:doctype"/>
|
|
175
175
|
|
|
176
176
|
<xsl:template name="generateContents">
|
|
177
|
-
<contents>
|
|
177
|
+
<mn:contents>
|
|
178
178
|
|
|
179
179
|
<xsl:apply-templates select="/*/bipm:preface/*[not(local-name() = 'note' or local-name() = 'admonition' or (local-name() = 'clause' and @type = 'toc'))][position() > 1]" mode="contents"/>
|
|
180
180
|
|
|
@@ -190,7 +190,7 @@
|
|
|
190
190
|
|
|
191
191
|
<xsl:call-template name="processTablesFigures_Contents"/>
|
|
192
192
|
|
|
193
|
-
</contents>
|
|
193
|
+
</mn:contents>
|
|
194
194
|
</xsl:template>
|
|
195
195
|
|
|
196
196
|
<xsl:variable name="mathml_attachments">
|
|
@@ -1028,9 +1028,6 @@
|
|
|
1028
1028
|
<xsl:variable name="curr_xml">
|
|
1029
1029
|
<xsl:copy-of select="."/>
|
|
1030
1030
|
</xsl:variable>
|
|
1031
|
-
<xsl:for-each select="xalan:nodeset($curr_xml)">
|
|
1032
|
-
<xsl:call-template name="namespaceCheck"/>
|
|
1033
|
-
</xsl:for-each>
|
|
1034
1031
|
|
|
1035
1032
|
<xsl:variable name="curr_lang" select="bipm:bibdata/bipm:language[@current = 'true']"/>
|
|
1036
1033
|
|
|
@@ -1184,12 +1181,12 @@
|
|
|
1184
1181
|
<fo:block role="TOC">
|
|
1185
1182
|
<!-- <xsl:copy-of select="$contents"/> -->
|
|
1186
1183
|
|
|
1187
|
-
<xsl:if test="$contents/doc[@id = $docid]//item[@display='true']">
|
|
1184
|
+
<xsl:if test="$contents/mn:doc[@id = $docid]//mn:item[@display='true']">
|
|
1188
1185
|
<fo:table table-layout="fixed" width="100%" id="__internal_layout__toc_{generate-id()}" role="SKIP">
|
|
1189
1186
|
<fo:table-column column-width="127mm"/>
|
|
1190
1187
|
<fo:table-column column-width="12mm"/>
|
|
1191
1188
|
<fo:table-body role="SKIP">
|
|
1192
|
-
<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
|
|
1189
|
+
<xsl:for-each select="$contents/mn:doc[@id = $docid]//mn:item[@display='true' and not(@type = 'annex') and not(@type = 'index') and not(@parent = 'annex')]">
|
|
1193
1190
|
<xsl:call-template name="insertContentItem"/>
|
|
1194
1191
|
</xsl:for-each>
|
|
1195
1192
|
<!-- insert page break between main sections and appendixes in ToC -->
|
|
@@ -1200,31 +1197,31 @@
|
|
|
1200
1197
|
</fo:table-cell>
|
|
1201
1198
|
</fo:table-row>
|
|
1202
1199
|
</xsl:if> -->
|
|
1203
|
-
<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'annex')]"> <!-- or (@level = 2 and @parent = 'annex') -->
|
|
1200
|
+
<xsl:for-each select="$contents/mn:doc[@id = $docid]//mn:item[@display='true' and (@type = 'annex')]"> <!-- or (@level = 2 and @parent = 'annex') -->
|
|
1204
1201
|
<xsl:call-template name="insertContentItem">
|
|
1205
1202
|
<xsl:with-param name="keep-with-next">true</xsl:with-param>
|
|
1206
1203
|
</xsl:call-template>
|
|
1207
1204
|
</xsl:for-each>
|
|
1208
|
-
<xsl:for-each select="$contents/doc[@id = $docid]//item[@display='true' and (@type = 'index')]">
|
|
1205
|
+
<xsl:for-each select="$contents/mn:doc[@id = $docid]//mn:item[@display='true' and (@type = 'index')]">
|
|
1209
1206
|
<xsl:call-template name="insertContentItem"/>
|
|
1210
1207
|
</xsl:for-each>
|
|
1211
1208
|
|
|
1212
1209
|
<!-- List of Tables -->
|
|
1213
|
-
<xsl:if test="$contents/doc[@id = $docid]//tables/table">
|
|
1210
|
+
<xsl:if test="$contents/mn:doc[@id = $docid]//mn:tables/mn:table">
|
|
1214
1211
|
<xsl:call-template name="insertListOf_Title">
|
|
1215
1212
|
<xsl:with-param name="title" select="$title-list-tables"/>
|
|
1216
1213
|
</xsl:call-template>
|
|
1217
|
-
<xsl:for-each select="$contents/doc[@id = $docid]//tables/table">
|
|
1214
|
+
<xsl:for-each select="$contents/mn:doc[@id = $docid]//mn:tables/mn:table">
|
|
1218
1215
|
<xsl:call-template name="insertListOf_Item"/>
|
|
1219
1216
|
</xsl:for-each>
|
|
1220
1217
|
</xsl:if>
|
|
1221
1218
|
|
|
1222
1219
|
<!-- List of Figures -->
|
|
1223
|
-
<xsl:if test="$contents/doc[@id = $docid]//figures/figure">
|
|
1220
|
+
<xsl:if test="$contents/doc[@id = $docid]//mn:figures/mn:figure">
|
|
1224
1221
|
<xsl:call-template name="insertListOf_Title">
|
|
1225
1222
|
<xsl:with-param name="title" select="$title-list-figures"/>
|
|
1226
1223
|
</xsl:call-template>
|
|
1227
|
-
<xsl:for-each select="$contents/doc[@id = $docid]//figures/figure">
|
|
1224
|
+
<xsl:for-each select="$contents/mn:doc[@id = $docid]//mn:figures/mn:figure">
|
|
1228
1225
|
<xsl:call-template name="insertListOf_Item"/>
|
|
1229
1226
|
</xsl:for-each>
|
|
1230
1227
|
</xsl:if>
|
|
@@ -1256,7 +1253,7 @@
|
|
|
1256
1253
|
</xsl:if>
|
|
1257
1254
|
|
|
1258
1255
|
<!-- Document Control -->
|
|
1259
|
-
<xsl:apply-templates select="bipm:doccontrol" mode="sections"/>
|
|
1256
|
+
<xsl:apply-templates select="bipm:doccontrol | bipm:colophon" mode="sections"/>
|
|
1260
1257
|
|
|
1261
1258
|
<!-- Index -->
|
|
1262
1259
|
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
|
|
@@ -1411,7 +1408,7 @@
|
|
|
1411
1408
|
</xsl:if>
|
|
1412
1409
|
|
|
1413
1410
|
<!-- Document Control -->
|
|
1414
|
-
<xsl:apply-templates select="bipm:doccontrol" mode="sections"/>
|
|
1411
|
+
<xsl:apply-templates select="bipm:doccontrol | bipm:colophon" mode="sections"/>
|
|
1415
1412
|
|
|
1416
1413
|
<!-- Index -->
|
|
1417
1414
|
<xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
|
|
@@ -1877,8 +1874,8 @@
|
|
|
1877
1874
|
<xsl:choose>
|
|
1878
1875
|
<xsl:when test="@level = 1 and @type = 'annex'">0pt</xsl:when>
|
|
1879
1876
|
<xsl:when test="@level = 1">6pt</xsl:when>
|
|
1880
|
-
<xsl:when test="@level = 2 and not(following-sibling::item[@display='true']) and not(item[@display='true']) and not(position() = last())">12pt</xsl:when>
|
|
1881
|
-
<xsl:when test="@level = 3 and not(following-sibling::item[@display='true']) and not(../following-sibling::item[@display='true']) and not(position() = last())">12pt</xsl:when>
|
|
1877
|
+
<xsl:when test="@level = 2 and not(following-sibling::mn:item[@display='true']) and not(mn:item[@display='true']) and not(position() = last())">12pt</xsl:when>
|
|
1878
|
+
<xsl:when test="@level = 3 and not(following-sibling::mn:item[@display='true']) and not(../following-sibling::mn:item[@display='true']) and not(position() = last())">12pt</xsl:when>
|
|
1882
1879
|
</xsl:choose>
|
|
1883
1880
|
</xsl:variable>
|
|
1884
1881
|
|
|
@@ -1944,13 +1941,13 @@
|
|
|
1944
1941
|
<xsl:attribute name="margin-left">11mm</xsl:attribute>
|
|
1945
1942
|
<xsl:attribute name="text-indent">-11mm</xsl:attribute>
|
|
1946
1943
|
</xsl:if>
|
|
1947
|
-
<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
|
|
1944
|
+
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}" role="SKIP">
|
|
1948
1945
|
<xsl:if test="@level >= 3">
|
|
1949
1946
|
<fo:inline padding-right="2mm" role="SKIP"><xsl:value-of select="@section"/></fo:inline>
|
|
1950
1947
|
</xsl:if>
|
|
1951
1948
|
|
|
1952
1949
|
<fo:inline role="SKIP">
|
|
1953
|
-
<xsl:apply-templates select="title"/>
|
|
1950
|
+
<xsl:apply-templates select="mn:title"/>
|
|
1954
1951
|
</fo:inline>
|
|
1955
1952
|
|
|
1956
1953
|
</fo:basic-link>
|
|
@@ -1968,7 +1965,7 @@
|
|
|
1968
1965
|
<xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
|
|
1969
1966
|
</xsl:if>
|
|
1970
1967
|
<fo:block role="SKIP">
|
|
1971
|
-
<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}" role="SKIP">
|
|
1968
|
+
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}" role="SKIP">
|
|
1972
1969
|
<fo:inline font-family="Arial" font-weight="bold" font-size="10pt" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
|
|
1973
1970
|
</fo:basic-link>
|
|
1974
1971
|
</fo:block>
|
|
@@ -2076,17 +2073,17 @@
|
|
|
2076
2073
|
</xsl:choose>
|
|
2077
2074
|
</xsl:variable>
|
|
2078
2075
|
|
|
2079
|
-
<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
|
|
2076
|
+
<mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
|
|
2080
2077
|
<xsl:if test="ancestor::bipm:annex">
|
|
2081
2078
|
<xsl:attribute name="parent">annex</xsl:attribute>
|
|
2082
2079
|
</xsl:if>
|
|
2083
|
-
<title>
|
|
2080
|
+
<mn:title>
|
|
2084
2081
|
<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
|
|
2085
|
-
</title>
|
|
2082
|
+
</mn:title>
|
|
2086
2083
|
<xsl:if test="$type != 'index'">
|
|
2087
2084
|
<xsl:apply-templates mode="contents"/>
|
|
2088
2085
|
</xsl:if>
|
|
2089
|
-
</item>
|
|
2086
|
+
</mn:item>
|
|
2090
2087
|
</xsl:if>
|
|
2091
2088
|
</xsl:template>
|
|
2092
2089
|
|
|
@@ -4011,34 +4008,25 @@
|
|
|
4011
4008
|
</xsl:if>
|
|
4012
4009
|
</xsl:template>
|
|
4013
4010
|
|
|
4014
|
-
|
|
4011
|
+
<!-- https://www.metanorma.org/ns/standoc -->
|
|
4012
|
+
<xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
|
|
4015
4013
|
|
|
4016
|
-
|
|
4017
|
-
|
|
4018
|
-
<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
|
|
4019
|
-
<xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
|
|
4020
|
-
</xsl:choose>
|
|
4021
|
-
</xsl:variable>
|
|
4022
|
-
<xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
|
|
4014
|
+
<!-- https://www.metanorma.org/ns/xsl -->
|
|
4015
|
+
<xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
|
|
4023
4016
|
|
|
4024
|
-
<xsl:variable name="
|
|
4025
|
-
<xsl:choose>
|
|
4026
|
-
<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
|
|
4027
|
-
<xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
|
|
4028
|
-
</xsl:choose>
|
|
4029
|
-
</xsl:variable>
|
|
4030
|
-
<xsl:variable name="root_element" select="normalize-space($root_element_)"/>
|
|
4017
|
+
<xsl:variable name="root_element">metanorma</xsl:variable>
|
|
4031
4018
|
|
|
4019
|
+
<!---examples: 2013, 2024 -->
|
|
4032
4020
|
<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'])"/>
|
|
4033
4021
|
|
|
4034
4022
|
<!-- external parameters -->
|
|
4035
|
-
|
|
4036
4023
|
<xsl:param name="svg_images"/> <!-- svg images array -->
|
|
4037
4024
|
<xsl:variable name="images" select="document($svg_images)"/>
|
|
4038
4025
|
<xsl:param name="basepath"/> <!-- base path for images -->
|
|
4039
4026
|
<xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
|
|
4040
4027
|
<xsl:param name="inputxml_filename"/> <!-- input xml file name -->
|
|
4041
4028
|
<xsl:param name="output_path"/> <!-- output PDF file name -->
|
|
4029
|
+
<xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
|
|
4042
4030
|
<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
|
|
4043
4031
|
<xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
|
|
4044
4032
|
<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 -->
|
|
@@ -4085,20 +4073,13 @@
|
|
|
4085
4073
|
|
|
4086
4074
|
<xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
|
|
4087
4075
|
|
|
4088
|
-
|
|
4089
|
-
|
|
4076
|
+
<!-- don't remove and rename this variable, it's using in mn2pdf tool -->
|
|
4077
|
+
<xsl:variable name="isApplyAutolayoutAlgorithm_">true
|
|
4090
4078
|
</xsl:variable>
|
|
4091
4079
|
<xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
|
|
4092
4080
|
|
|
4093
|
-
<xsl:variable name="
|
|
4094
|
-
|
|
4095
|
-
<xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
|
|
4096
|
-
<xsl:value-of select="normalize-space($table_if) = 'true'"/>
|
|
4097
|
-
</xsl:when>
|
|
4098
|
-
<xsl:otherwise>false</xsl:otherwise>
|
|
4099
|
-
</xsl:choose>
|
|
4100
|
-
</xsl:variable>
|
|
4101
|
-
<xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
|
|
4081
|
+
<xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
|
|
4082
|
+
<!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
|
|
4102
4083
|
|
|
4103
4084
|
<xsl:variable name="lang">
|
|
4104
4085
|
<xsl:call-template name="getLang"/>
|
|
@@ -4150,8 +4131,7 @@
|
|
|
4150
4131
|
<xsl:variable name="pageWidth_">
|
|
4151
4132
|
<xsl:choose>
|
|
4152
4133
|
<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
|
|
4153
|
-
<xsl:otherwise>
|
|
4154
|
-
210
|
|
4134
|
+
<xsl:otherwise>210
|
|
4155
4135
|
</xsl:otherwise>
|
|
4156
4136
|
</xsl:choose>
|
|
4157
4137
|
</xsl:variable>
|
|
@@ -4161,8 +4141,7 @@
|
|
|
4161
4141
|
<xsl:variable name="pageHeight_">
|
|
4162
4142
|
<xsl:choose>
|
|
4163
4143
|
<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
|
|
4164
|
-
<xsl:otherwise>
|
|
4165
|
-
297
|
|
4144
|
+
<xsl:otherwise>297
|
|
4166
4145
|
</xsl:otherwise>
|
|
4167
4146
|
</xsl:choose>
|
|
4168
4147
|
</xsl:variable>
|
|
@@ -4171,23 +4150,19 @@
|
|
|
4171
4150
|
<!-- Page margins in mm (just digits, without 'mm')-->
|
|
4172
4151
|
<!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
|
|
4173
4152
|
for example, left margin on odd page and right margin on even page -->
|
|
4174
|
-
<xsl:variable name="marginLeftRight1_">
|
|
4175
|
-
31.7
|
|
4153
|
+
<xsl:variable name="marginLeftRight1_">31.7
|
|
4176
4154
|
</xsl:variable>
|
|
4177
4155
|
<xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
|
|
4178
4156
|
|
|
4179
|
-
<xsl:variable name="marginLeftRight2_">
|
|
4180
|
-
40
|
|
4157
|
+
<xsl:variable name="marginLeftRight2_">40
|
|
4181
4158
|
</xsl:variable>
|
|
4182
4159
|
<xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
|
|
4183
4160
|
|
|
4184
|
-
<xsl:variable name="marginTop_">
|
|
4185
|
-
25.4
|
|
4161
|
+
<xsl:variable name="marginTop_">25.4
|
|
4186
4162
|
</xsl:variable>
|
|
4187
4163
|
<xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
|
|
4188
4164
|
|
|
4189
|
-
<xsl:variable name="marginBottom_">
|
|
4190
|
-
22
|
|
4165
|
+
<xsl:variable name="marginBottom_">22
|
|
4191
4166
|
</xsl:variable>
|
|
4192
4167
|
<xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
|
|
4193
4168
|
|
|
@@ -4236,17 +4211,12 @@
|
|
|
4236
4211
|
<title-toc lang="zh">目次</title-toc>
|
|
4237
4212
|
|
|
4238
4213
|
<title-part lang="en">
|
|
4239
|
-
|
|
4240
|
-
<xsl:text>Part #</xsl:text>
|
|
4241
|
-
|
|
4214
|
+
<xsl:text>Part #</xsl:text>
|
|
4242
4215
|
</title-part>
|
|
4243
4216
|
<title-part lang="fr">
|
|
4244
|
-
|
|
4245
|
-
<xsl:text>Partie #</xsl:text>
|
|
4246
|
-
|
|
4217
|
+
<xsl:text>Partie #</xsl:text>
|
|
4247
4218
|
</title-part>
|
|
4248
4219
|
<title-part lang="ru">
|
|
4249
|
-
|
|
4250
4220
|
</title-part>
|
|
4251
4221
|
<title-part lang="zh">第 # 部分:</title-part>
|
|
4252
4222
|
|
|
@@ -4342,11 +4312,9 @@
|
|
|
4342
4312
|
<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>
|
|
4343
4313
|
<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>
|
|
4344
4314
|
<xsl:attribute-set name="root-style">
|
|
4345
|
-
|
|
4346
|
-
|
|
4347
|
-
|
|
4348
|
-
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
4349
|
-
|
|
4315
|
+
<xsl:attribute name="font-family">Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_serif"/></xsl:attribute>
|
|
4316
|
+
<xsl:attribute name="font-family-generic">Serif</xsl:attribute>
|
|
4317
|
+
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
4350
4318
|
</xsl:attribute-set> <!-- root-style -->
|
|
4351
4319
|
|
|
4352
4320
|
<xsl:template name="insertRootStyle">
|
|
@@ -4434,37 +4402,28 @@
|
|
|
4434
4402
|
|
|
4435
4403
|
<!-- Preface sections styles -->
|
|
4436
4404
|
<xsl:attribute-set name="copyright-statement-style">
|
|
4437
|
-
|
|
4438
4405
|
</xsl:attribute-set> <!-- copyright-statement-style -->
|
|
4439
4406
|
|
|
4440
4407
|
<xsl:attribute-set name="copyright-statement-title-style">
|
|
4441
|
-
|
|
4442
4408
|
</xsl:attribute-set> <!-- copyright-statement-title-style -->
|
|
4443
4409
|
|
|
4444
4410
|
<xsl:attribute-set name="copyright-statement-p-style">
|
|
4445
|
-
|
|
4446
4411
|
</xsl:attribute-set> <!-- copyright-statement-p-style -->
|
|
4447
4412
|
|
|
4448
4413
|
<xsl:attribute-set name="license-statement-style">
|
|
4449
|
-
|
|
4450
|
-
|
|
4451
|
-
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
4452
|
-
|
|
4414
|
+
<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
|
|
4415
|
+
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
4453
4416
|
</xsl:attribute-set>
|
|
4454
4417
|
|
|
4455
4418
|
<xsl:attribute-set name="license-statement-title-style">
|
|
4456
4419
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4457
|
-
|
|
4458
|
-
|
|
4459
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4460
|
-
|
|
4420
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4421
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4461
4422
|
</xsl:attribute-set> <!-- license-statement-title-style -->
|
|
4462
4423
|
|
|
4463
4424
|
<xsl:attribute-set name="license-statement-p-style">
|
|
4464
|
-
|
|
4465
|
-
|
|
4466
|
-
<xsl:attribute name="line-height">135%</xsl:attribute>
|
|
4467
|
-
|
|
4425
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
4426
|
+
<xsl:attribute name="line-height">135%</xsl:attribute>
|
|
4468
4427
|
</xsl:attribute-set> <!-- license-statement-p-style -->
|
|
4469
4428
|
|
|
4470
4429
|
<xsl:attribute-set name="legal-statement-style">
|
|
@@ -4473,86 +4432,67 @@
|
|
|
4473
4432
|
|
|
4474
4433
|
<xsl:attribute-set name="legal-statement-title-style">
|
|
4475
4434
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4476
|
-
|
|
4477
4435
|
</xsl:attribute-set> <!-- legal-statement-title-style -->
|
|
4478
4436
|
|
|
4479
4437
|
<xsl:attribute-set name="legal-statement-p-style">
|
|
4480
|
-
|
|
4481
4438
|
</xsl:attribute-set> <!-- legal-statement-p-style -->
|
|
4482
4439
|
|
|
4483
4440
|
<xsl:attribute-set name="feedback-statement-style">
|
|
4484
|
-
|
|
4485
|
-
|
|
4486
|
-
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
4487
|
-
|
|
4441
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
4442
|
+
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
4488
4443
|
</xsl:attribute-set> <!-- feedback-statement-style -->
|
|
4489
4444
|
|
|
4490
4445
|
<xsl:attribute-set name="feedback-statement-title-style">
|
|
4491
4446
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4492
|
-
|
|
4493
4447
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
|
4494
4448
|
|
|
4495
4449
|
<xsl:attribute-set name="feedback-statement-p-style">
|
|
4496
|
-
|
|
4497
4450
|
</xsl:attribute-set> <!-- feedback-statement-p-style -->
|
|
4498
4451
|
|
|
4499
4452
|
<!-- End Preface sections styles -->
|
|
4500
4453
|
|
|
4501
4454
|
<xsl:attribute-set name="link-style">
|
|
4502
|
-
|
|
4503
|
-
|
|
4504
|
-
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4505
|
-
|
|
4455
|
+
<xsl:attribute name="color">blue</xsl:attribute>
|
|
4456
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4506
4457
|
</xsl:attribute-set>
|
|
4507
4458
|
|
|
4508
4459
|
<xsl:template name="refine_link-style">
|
|
4509
|
-
|
|
4510
4460
|
</xsl:template> <!-- refine_link-style -->
|
|
4511
4461
|
|
|
4512
4462
|
<xsl:attribute-set name="sourcecode-container-style">
|
|
4513
|
-
|
|
4514
4463
|
</xsl:attribute-set>
|
|
4515
4464
|
|
|
4516
4465
|
<xsl:attribute-set name="sourcecode-style">
|
|
4517
4466
|
<xsl:attribute name="white-space">pre</xsl:attribute>
|
|
4518
4467
|
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
|
|
4519
4468
|
<xsl:attribute name="role">Code</xsl:attribute>
|
|
4520
|
-
|
|
4521
4469
|
</xsl:attribute-set>
|
|
4522
4470
|
|
|
4523
4471
|
<xsl:template name="refine_sourcecode-style">
|
|
4524
|
-
|
|
4525
4472
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4526
4473
|
|
|
4527
4474
|
<xsl:attribute-set name="pre-style">
|
|
4528
4475
|
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
4529
4476
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4530
|
-
|
|
4531
4477
|
</xsl:attribute-set>
|
|
4532
4478
|
|
|
4533
4479
|
<xsl:attribute-set name="permission-style">
|
|
4534
|
-
|
|
4535
4480
|
</xsl:attribute-set>
|
|
4536
4481
|
|
|
4537
4482
|
<xsl:attribute-set name="permission-name-style">
|
|
4538
|
-
|
|
4539
4483
|
</xsl:attribute-set>
|
|
4540
4484
|
|
|
4541
4485
|
<xsl:attribute-set name="permission-label-style">
|
|
4542
|
-
|
|
4543
4486
|
</xsl:attribute-set>
|
|
4544
4487
|
|
|
4545
4488
|
<xsl:attribute-set name="requirement-style">
|
|
4546
|
-
|
|
4547
4489
|
</xsl:attribute-set>
|
|
4548
4490
|
|
|
4549
4491
|
<xsl:attribute-set name="requirement-name-style">
|
|
4550
4492
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4551
|
-
|
|
4552
4493
|
</xsl:attribute-set>
|
|
4553
4494
|
|
|
4554
4495
|
<xsl:attribute-set name="requirement-label-style">
|
|
4555
|
-
|
|
4556
4496
|
</xsl:attribute-set>
|
|
4557
4497
|
|
|
4558
4498
|
<xsl:attribute-set name="subject-style">
|
|
@@ -4580,48 +4520,36 @@
|
|
|
4580
4520
|
</xsl:attribute-set>
|
|
4581
4521
|
|
|
4582
4522
|
<xsl:attribute-set name="recommendation-style">
|
|
4583
|
-
|
|
4584
4523
|
</xsl:attribute-set>
|
|
4585
4524
|
|
|
4586
4525
|
<xsl:attribute-set name="recommendation-name-style">
|
|
4587
|
-
|
|
4588
4526
|
</xsl:attribute-set>
|
|
4589
4527
|
|
|
4590
4528
|
<xsl:attribute-set name="recommendation-label-style">
|
|
4591
|
-
|
|
4592
4529
|
</xsl:attribute-set>
|
|
4593
4530
|
|
|
4594
4531
|
<xsl:attribute-set name="termexample-style">
|
|
4595
|
-
|
|
4596
4532
|
</xsl:attribute-set>
|
|
4597
4533
|
|
|
4598
4534
|
<xsl:template name="refine_termexample-style">
|
|
4599
|
-
|
|
4600
4535
|
</xsl:template>
|
|
4601
4536
|
|
|
4602
4537
|
<xsl:attribute-set name="example-style">
|
|
4603
|
-
|
|
4604
|
-
|
|
4605
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4606
|
-
|
|
4538
|
+
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
4539
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4607
4540
|
</xsl:attribute-set> <!-- example-style -->
|
|
4608
4541
|
|
|
4609
4542
|
<xsl:template name="refine_example-style">
|
|
4610
|
-
|
|
4611
4543
|
</xsl:template> <!-- refine_example-style -->
|
|
4612
4544
|
|
|
4613
4545
|
<xsl:attribute-set name="example-body-style">
|
|
4614
|
-
|
|
4615
4546
|
</xsl:attribute-set> <!-- example-body-style -->
|
|
4616
4547
|
|
|
4617
4548
|
<xsl:attribute-set name="example-name-style">
|
|
4618
|
-
|
|
4619
|
-
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
4620
|
-
|
|
4549
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
4621
4550
|
</xsl:attribute-set> <!-- example-name-style -->
|
|
4622
4551
|
|
|
4623
4552
|
<xsl:template name="refine_example-name-style">
|
|
4624
|
-
|
|
4625
4553
|
</xsl:template>
|
|
4626
4554
|
|
|
4627
4555
|
<xsl:attribute-set name="example-p-style">
|
|
@@ -4629,84 +4557,69 @@
|
|
|
4629
4557
|
</xsl:attribute-set> <!-- example-p-style -->
|
|
4630
4558
|
|
|
4631
4559
|
<xsl:template name="refine_example-p-style">
|
|
4632
|
-
|
|
4633
4560
|
</xsl:template> <!-- refine_example-p-style -->
|
|
4634
4561
|
|
|
4635
4562
|
<xsl:attribute-set name="termexample-name-style">
|
|
4636
|
-
|
|
4637
|
-
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
4638
|
-
|
|
4563
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
4639
4564
|
</xsl:attribute-set> <!-- termexample-name-style -->
|
|
4640
4565
|
|
|
4641
4566
|
<xsl:template name="refine_termexample-name-style">
|
|
4642
|
-
|
|
4643
4567
|
</xsl:template>
|
|
4644
4568
|
|
|
4645
4569
|
<!-- ========================== -->
|
|
4646
4570
|
<!-- Table styles -->
|
|
4647
4571
|
<!-- ========================== -->
|
|
4648
4572
|
<xsl:variable name="table-border_">
|
|
4649
|
-
|
|
4650
4573
|
</xsl:variable>
|
|
4651
4574
|
<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
|
|
4652
4575
|
|
|
4653
4576
|
<xsl:variable name="table-cell-border_">
|
|
4654
|
-
|
|
4655
4577
|
</xsl:variable>
|
|
4656
4578
|
<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
|
|
4657
4579
|
|
|
4658
4580
|
<xsl:attribute-set name="table-container-style">
|
|
4659
4581
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
4660
4582
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
4661
|
-
|
|
4662
|
-
|
|
4663
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4664
|
-
|
|
4583
|
+
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
|
4584
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4665
4585
|
</xsl:attribute-set> <!-- table-container-style -->
|
|
4666
4586
|
|
|
4667
4587
|
<xsl:template name="refine_table-container-style">
|
|
4668
4588
|
<xsl:param name="margin-side"/>
|
|
4669
|
-
|
|
4670
|
-
<xsl:
|
|
4671
|
-
|
|
4672
|
-
|
|
4673
|
-
<xsl:
|
|
4674
|
-
|
|
4675
|
-
|
|
4676
|
-
</xsl:if>
|
|
4677
|
-
|
|
4589
|
+
<xsl:if test="not(ancestor::*[local-name()='note_side'])">
|
|
4590
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
4591
|
+
</xsl:if>
|
|
4592
|
+
<xsl:if test="ancestor-or-self::*[@parent-type = 'quote']">
|
|
4593
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
4594
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
4595
|
+
</xsl:if>
|
|
4678
4596
|
<!-- end table block-container attributes -->
|
|
4679
4597
|
</xsl:template> <!-- refine_table-container-style -->
|
|
4680
4598
|
|
|
4681
4599
|
<xsl:attribute-set name="table-style">
|
|
4682
4600
|
<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
|
|
4683
4601
|
<xsl:attribute name="table-layout">fixed</xsl:attribute>
|
|
4684
|
-
|
|
4685
4602
|
</xsl:attribute-set><!-- table-style -->
|
|
4686
4603
|
|
|
4687
4604
|
<xsl:template name="refine_table-style">
|
|
4688
4605
|
<xsl:param name="margin-side"/>
|
|
4689
|
-
|
|
4690
|
-
<xsl:
|
|
4691
|
-
|
|
4692
|
-
|
|
4693
|
-
</xsl:if>
|
|
4606
|
+
<xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol']) and not(ancestor::*[local-name() = 'colophon'])">
|
|
4607
|
+
<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
|
|
4608
|
+
<xsl:attribute name="border-bottom">0.5pt solid black</xsl:attribute>
|
|
4609
|
+
</xsl:if>
|
|
4694
4610
|
|
|
4695
4611
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4696
|
-
|
|
4697
4612
|
</xsl:template> <!-- refine_table-style -->
|
|
4698
4613
|
|
|
4699
4614
|
<xsl:attribute-set name="table-name-style">
|
|
4700
4615
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
4701
4616
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4702
|
-
|
|
4703
|
-
|
|
4704
|
-
|
|
4705
|
-
|
|
4706
|
-
<!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
|
|
4617
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4618
|
+
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
4619
|
+
<xsl:attribute name="margin-top">24pt</xsl:attribute>
|
|
4620
|
+
<!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
|
|
4707
4621
|
<xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
|
|
4708
|
-
|
|
4709
|
-
|
|
4622
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4710
4623
|
</xsl:attribute-set> <!-- table-name-style -->
|
|
4711
4624
|
|
|
4712
4625
|
<xsl:template name="refine_table-name-style">
|
|
@@ -4714,31 +4627,25 @@
|
|
|
4714
4627
|
<xsl:if test="$continued = 'true'">
|
|
4715
4628
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
4716
4629
|
</xsl:if>
|
|
4717
|
-
|
|
4718
4630
|
</xsl:template> <!-- refine_table-name-style -->
|
|
4719
4631
|
|
|
4720
4632
|
<xsl:attribute-set name="table-row-style">
|
|
4721
4633
|
<xsl:attribute name="min-height">4mm</xsl:attribute>
|
|
4722
|
-
|
|
4723
4634
|
</xsl:attribute-set>
|
|
4724
4635
|
|
|
4725
4636
|
<xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
|
|
4726
4637
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4727
|
-
|
|
4728
4638
|
</xsl:attribute-set>
|
|
4729
4639
|
|
|
4730
4640
|
<xsl:template name="refine_table-header-row-style">
|
|
4731
4641
|
|
|
4732
4642
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4733
|
-
|
|
4734
4643
|
</xsl:template> <!-- refine_table-header-row-style -->
|
|
4735
4644
|
|
|
4736
4645
|
<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
|
|
4737
|
-
|
|
4738
4646
|
</xsl:attribute-set>
|
|
4739
4647
|
|
|
4740
4648
|
<xsl:template name="refine_table-footer-row-style">
|
|
4741
|
-
|
|
4742
4649
|
</xsl:template> <!-- refine_table-footer-row-style -->
|
|
4743
4650
|
|
|
4744
4651
|
<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
|
|
@@ -4748,7 +4655,6 @@
|
|
|
4748
4655
|
<xsl:template name="refine_table-body-row-style">
|
|
4749
4656
|
|
|
4750
4657
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4751
|
-
|
|
4752
4658
|
</xsl:template> <!-- refine_table-body-row-style -->
|
|
4753
4659
|
|
|
4754
4660
|
<xsl:attribute-set name="table-header-cell-style">
|
|
@@ -4756,27 +4662,24 @@
|
|
|
4756
4662
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
|
4757
4663
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
4758
4664
|
<xsl:attribute name="display-align">center</xsl:attribute>
|
|
4759
|
-
|
|
4760
|
-
|
|
4761
|
-
|
|
4762
|
-
|
|
4763
|
-
|
|
4764
|
-
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
|
4765
|
-
|
|
4665
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
4666
|
+
<xsl:attribute name="border">solid black 0pt</xsl:attribute>
|
|
4667
|
+
<xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
|
|
4668
|
+
<xsl:attribute name="height">8mm</xsl:attribute>
|
|
4669
|
+
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
|
4766
4670
|
</xsl:attribute-set> <!-- table-header-cell-style -->
|
|
4767
4671
|
|
|
4768
4672
|
<xsl:template name="refine_table-header-cell-style">
|
|
4769
|
-
|
|
4770
|
-
<xsl:
|
|
4771
|
-
|
|
4772
|
-
|
|
4773
|
-
|
|
4774
|
-
<xsl:
|
|
4775
|
-
<xsl:
|
|
4776
|
-
|
|
4777
|
-
|
|
4778
|
-
|
|
4779
|
-
</xsl:if>
|
|
4673
|
+
<xsl:if test="(ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]) or ancestor::*[local-name() = 'doccontrol'] or ancestor::*[local-name() = 'colophon']"><!-- for Annex ToC -->
|
|
4674
|
+
<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
|
|
4675
|
+
<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
|
|
4676
|
+
</xsl:if>
|
|
4677
|
+
<xsl:if test="ancestor::*[local-name() = 'doccontrol'] or ancestor::*[local-name() = 'colophon']">
|
|
4678
|
+
<xsl:call-template name="setTextAlignment">
|
|
4679
|
+
<xsl:with-param name="default">left</xsl:with-param>
|
|
4680
|
+
</xsl:call-template>
|
|
4681
|
+
<xsl:attribute name="display-align">before</xsl:attribute>
|
|
4682
|
+
</xsl:if>
|
|
4780
4683
|
|
|
4781
4684
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4782
4685
|
|
|
@@ -4785,16 +4688,13 @@
|
|
|
4785
4688
|
</xsl:if>
|
|
4786
4689
|
|
|
4787
4690
|
<xsl:call-template name="setTableCellAttributes"/>
|
|
4788
|
-
|
|
4789
4691
|
</xsl:template> <!-- refine_table-header-cell-style -->
|
|
4790
4692
|
|
|
4791
4693
|
<xsl:attribute-set name="table-cell-style">
|
|
4792
4694
|
<xsl:attribute name="display-align">center</xsl:attribute>
|
|
4793
4695
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
|
4794
4696
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
4795
|
-
|
|
4796
|
-
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
4797
|
-
|
|
4697
|
+
<xsl:attribute name="border">solid 0pt white</xsl:attribute>
|
|
4798
4698
|
</xsl:attribute-set> <!-- table-cell-style -->
|
|
4799
4699
|
|
|
4800
4700
|
<xsl:template name="refine_table-cell-style">
|
|
@@ -4802,19 +4702,19 @@
|
|
|
4802
4702
|
<xsl:if test="$lang = 'ar'">
|
|
4803
4703
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
4804
4704
|
</xsl:if>
|
|
4805
|
-
|
|
4806
|
-
|
|
4807
|
-
<xsl:
|
|
4808
|
-
|
|
4809
|
-
|
|
4810
|
-
<xsl:
|
|
4811
|
-
|
|
4812
|
-
|
|
4813
|
-
<xsl:
|
|
4814
|
-
|
|
4815
|
-
|
|
4816
|
-
|
|
4817
|
-
|
|
4705
|
+
<xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
|
|
4706
|
+
<xsl:if test="$rownum = 1">
|
|
4707
|
+
<xsl:attribute name="padding-top">3mm</xsl:attribute>
|
|
4708
|
+
</xsl:if>
|
|
4709
|
+
<xsl:if test="preceding-sibling::*[local-name() = 'th']">
|
|
4710
|
+
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
|
4711
|
+
</xsl:if>
|
|
4712
|
+
<xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
|
|
4713
|
+
<xsl:attribute name="padding-bottom">2mm</xsl:attribute>
|
|
4714
|
+
</xsl:if>
|
|
4715
|
+
<xsl:if test="ancestor::*[local-name() = 'doccontrol'] or ancestor::*[local-name() = 'colophon']">
|
|
4716
|
+
<xsl:attribute name="display-align">before</xsl:attribute>
|
|
4717
|
+
</xsl:if>
|
|
4818
4718
|
|
|
4819
4719
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4820
4720
|
|
|
@@ -4825,72 +4725,56 @@
|
|
|
4825
4725
|
<xsl:attribute name="padding-left">1mm</xsl:attribute>
|
|
4826
4726
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
4827
4727
|
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
4828
|
-
|
|
4829
|
-
<xsl:attribute name="border">solid black 0pt</xsl:attribute>
|
|
4830
|
-
|
|
4728
|
+
<xsl:attribute name="border">solid black 0pt</xsl:attribute>
|
|
4831
4729
|
</xsl:attribute-set> <!-- table-footer-cell-style -->
|
|
4832
4730
|
|
|
4833
4731
|
<xsl:template name="refine_table-footer-cell-style">
|
|
4834
|
-
|
|
4835
4732
|
</xsl:template> <!-- refine_table-footer-cell-style -->
|
|
4836
4733
|
|
|
4837
4734
|
<xsl:attribute-set name="table-note-style">
|
|
4838
4735
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
4839
4736
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4840
|
-
|
|
4841
|
-
|
|
4842
|
-
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4843
|
-
|
|
4737
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
4738
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4844
4739
|
</xsl:attribute-set><!-- table-note-style -->
|
|
4845
4740
|
|
|
4846
4741
|
<xsl:template name="refine_table-note-style">
|
|
4847
|
-
|
|
4848
|
-
<xsl:
|
|
4849
|
-
|
|
4850
|
-
|
|
4851
|
-
</xsl:if>
|
|
4852
|
-
|
|
4742
|
+
<xsl:if test="ancestor::bipm:preface">
|
|
4743
|
+
<xsl:attribute name="margin-top">18pt</xsl:attribute>
|
|
4744
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4745
|
+
</xsl:if>
|
|
4853
4746
|
</xsl:template> <!-- refine_table-note-style -->
|
|
4854
4747
|
|
|
4855
4748
|
<xsl:attribute-set name="table-fn-style">
|
|
4856
4749
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4857
|
-
|
|
4858
|
-
|
|
4859
|
-
|
|
4860
|
-
|
|
4861
|
-
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4862
|
-
|
|
4750
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
4751
|
+
<xsl:attribute name="text-indent">-6.5mm</xsl:attribute>
|
|
4752
|
+
<xsl:attribute name="margin-left">6.5mm</xsl:attribute>
|
|
4753
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
4863
4754
|
</xsl:attribute-set> <!-- table-fn-style -->
|
|
4864
4755
|
|
|
4865
4756
|
<xsl:template name="refine_table-fn-style">
|
|
4866
|
-
|
|
4867
4757
|
</xsl:template>
|
|
4868
4758
|
|
|
4869
4759
|
<xsl:attribute-set name="table-fn-number-style">
|
|
4870
4760
|
<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
|
|
4871
|
-
|
|
4872
|
-
|
|
4873
|
-
<!-- <xsl:attribute name="padding-right">2.5mm</xsl:attribute> -->
|
|
4874
|
-
|
|
4761
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
4762
|
+
<!-- <xsl:attribute name="padding-right">2.5mm</xsl:attribute> -->
|
|
4875
4763
|
</xsl:attribute-set> <!-- table-fn-number-style -->
|
|
4876
4764
|
|
|
4877
4765
|
<xsl:attribute-set name="table-fmt-fn-label-style">
|
|
4878
4766
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
4879
|
-
|
|
4880
4767
|
</xsl:attribute-set> <!-- table-fmt-fn-label-style -->
|
|
4881
4768
|
|
|
4882
4769
|
<xsl:template name="refine_table-fmt-fn-label-style">
|
|
4883
|
-
|
|
4884
4770
|
</xsl:template>
|
|
4885
4771
|
|
|
4886
4772
|
<xsl:attribute-set name="fn-container-body-style">
|
|
4887
4773
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
|
4888
4774
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
|
4889
|
-
|
|
4890
4775
|
</xsl:attribute-set>
|
|
4891
4776
|
|
|
4892
4777
|
<xsl:attribute-set name="table-fn-body-style">
|
|
4893
|
-
|
|
4894
4778
|
</xsl:attribute-set>
|
|
4895
4779
|
|
|
4896
4780
|
<xsl:attribute-set name="figure-fn-number-style">
|
|
@@ -4900,17 +4784,14 @@
|
|
|
4900
4784
|
<xsl:attribute-set name="figure-fmt-fn-label-style">
|
|
4901
4785
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
4902
4786
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
4903
|
-
|
|
4904
4787
|
</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
|
|
4905
4788
|
|
|
4906
4789
|
<xsl:template name="refine_figure-fmt-fn-label-style">
|
|
4907
|
-
|
|
4908
4790
|
</xsl:template>
|
|
4909
4791
|
|
|
4910
4792
|
<xsl:attribute-set name="figure-fn-body-style">
|
|
4911
4793
|
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
4912
4794
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4913
|
-
|
|
4914
4795
|
</xsl:attribute-set>
|
|
4915
4796
|
<!-- ========================== -->
|
|
4916
4797
|
<!-- END Table styles -->
|
|
@@ -4921,47 +4802,36 @@
|
|
|
4921
4802
|
<!-- ========================== -->
|
|
4922
4803
|
|
|
4923
4804
|
<xsl:attribute-set name="dl-block-style">
|
|
4924
|
-
|
|
4925
4805
|
</xsl:attribute-set>
|
|
4926
4806
|
|
|
4927
4807
|
<xsl:attribute-set name="dt-row-style">
|
|
4928
|
-
|
|
4929
4808
|
</xsl:attribute-set>
|
|
4930
4809
|
|
|
4931
4810
|
<xsl:attribute-set name="dt-cell-style">
|
|
4932
|
-
|
|
4933
4811
|
</xsl:attribute-set>
|
|
4934
4812
|
|
|
4935
4813
|
<xsl:template name="refine_dt-cell-style">
|
|
4936
|
-
|
|
4937
4814
|
</xsl:template> <!-- refine_dt-cell-style -->
|
|
4938
4815
|
|
|
4939
4816
|
<xsl:attribute-set name="dt-block-style">
|
|
4940
4817
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
4941
|
-
|
|
4942
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4943
|
-
|
|
4818
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4944
4819
|
</xsl:attribute-set>
|
|
4945
4820
|
|
|
4946
4821
|
<xsl:template name="refine_dt-block-style">
|
|
4947
|
-
|
|
4948
4822
|
</xsl:template> <!-- refine_dt-block-style -->
|
|
4949
4823
|
|
|
4950
4824
|
<xsl:attribute-set name="dl-name-style">
|
|
4951
4825
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4952
4826
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4953
|
-
|
|
4954
|
-
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4955
|
-
|
|
4827
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4956
4828
|
</xsl:attribute-set> <!-- dl-name-style -->
|
|
4957
4829
|
|
|
4958
4830
|
<xsl:attribute-set name="dd-cell-style">
|
|
4959
4831
|
<xsl:attribute name="padding-left">2mm</xsl:attribute>
|
|
4960
|
-
|
|
4961
4832
|
</xsl:attribute-set>
|
|
4962
4833
|
|
|
4963
4834
|
<xsl:template name="refine_dd-cell-style">
|
|
4964
|
-
|
|
4965
4835
|
</xsl:template> <!-- refine_dd-cell-style -->
|
|
4966
4836
|
|
|
4967
4837
|
<!-- ========================== -->
|
|
@@ -4969,236 +4839,178 @@
|
|
|
4969
4839
|
<!-- ========================== -->
|
|
4970
4840
|
|
|
4971
4841
|
<xsl:attribute-set name="appendix-style">
|
|
4972
|
-
|
|
4973
4842
|
</xsl:attribute-set>
|
|
4974
4843
|
|
|
4975
4844
|
<xsl:attribute-set name="appendix-example-style">
|
|
4976
|
-
|
|
4977
4845
|
</xsl:attribute-set>
|
|
4978
4846
|
|
|
4979
4847
|
<xsl:attribute-set name="xref-style">
|
|
4980
|
-
|
|
4981
4848
|
</xsl:attribute-set>
|
|
4982
4849
|
|
|
4983
4850
|
<xsl:attribute-set name="eref-style">
|
|
4984
|
-
|
|
4985
4851
|
</xsl:attribute-set>
|
|
4986
4852
|
|
|
4987
4853
|
<xsl:template name="refine_eref-style">
|
|
4988
4854
|
<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
|
|
4989
4855
|
<xsl:variable name="text" select="normalize-space()"/>
|
|
4990
|
-
|
|
4991
4856
|
</xsl:template> <!-- refine_eref-style -->
|
|
4992
4857
|
|
|
4993
4858
|
<xsl:attribute-set name="note-style">
|
|
4994
|
-
|
|
4995
|
-
|
|
4996
|
-
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
4997
|
-
|
|
4859
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
4860
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
4998
4861
|
</xsl:attribute-set>
|
|
4999
4862
|
|
|
5000
4863
|
<xsl:template name="refine_note-style">
|
|
5001
|
-
|
|
5002
|
-
<xsl:
|
|
5003
|
-
|
|
5004
|
-
|
|
5005
|
-
</xsl:if>
|
|
5006
|
-
|
|
4864
|
+
<xsl:if test="parent::*[local-name() = 'li']">
|
|
4865
|
+
<xsl:attribute name="margin-top">4pt</xsl:attribute>
|
|
4866
|
+
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
4867
|
+
</xsl:if>
|
|
5007
4868
|
</xsl:template>
|
|
5008
4869
|
|
|
5009
4870
|
<xsl:variable name="note-body-indent">10mm</xsl:variable>
|
|
5010
4871
|
<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
|
|
5011
4872
|
|
|
5012
4873
|
<xsl:attribute-set name="note-name-style">
|
|
5013
|
-
|
|
5014
4874
|
</xsl:attribute-set>
|
|
5015
4875
|
|
|
5016
4876
|
<xsl:template name="refine_note-name-style">
|
|
5017
|
-
|
|
5018
4877
|
</xsl:template> <!-- refine_note-name-style -->
|
|
5019
4878
|
|
|
5020
4879
|
<xsl:attribute-set name="table-note-name-style">
|
|
5021
4880
|
<xsl:attribute name="padding-right">2mm</xsl:attribute>
|
|
5022
|
-
|
|
5023
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
5024
|
-
|
|
4881
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
5025
4882
|
</xsl:attribute-set>
|
|
5026
4883
|
|
|
5027
4884
|
<xsl:template name="refine_table-note-name-style">
|
|
5028
|
-
|
|
5029
|
-
<xsl:
|
|
5030
|
-
|
|
5031
|
-
</xsl:if>
|
|
5032
|
-
|
|
4885
|
+
<xsl:if test="ancestor::bipm:preface">
|
|
4886
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4887
|
+
</xsl:if>
|
|
5033
4888
|
</xsl:template> <!-- refine_table-note-name-style -->
|
|
5034
4889
|
|
|
5035
4890
|
<xsl:attribute-set name="note-p-style">
|
|
5036
|
-
|
|
5037
|
-
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5038
|
-
|
|
4891
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5039
4892
|
</xsl:attribute-set>
|
|
5040
4893
|
|
|
5041
4894
|
<xsl:attribute-set name="termnote-style">
|
|
5042
|
-
|
|
5043
|
-
|
|
5044
|
-
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5045
|
-
|
|
4895
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
4896
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5046
4897
|
</xsl:attribute-set>
|
|
5047
4898
|
|
|
5048
4899
|
<xsl:template name="refine_termnote-style">
|
|
5049
|
-
|
|
5050
4900
|
</xsl:template> <!-- refine_termnote-style -->
|
|
5051
4901
|
|
|
5052
4902
|
<xsl:attribute-set name="termnote-name-style">
|
|
5053
|
-
|
|
5054
|
-
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
5055
|
-
|
|
4903
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
5056
4904
|
</xsl:attribute-set>
|
|
5057
4905
|
|
|
5058
4906
|
<xsl:template name="refine_termnote-name-style">
|
|
5059
|
-
|
|
5060
|
-
<!-- <xsl:if test="$namespace = 'ieee'">
|
|
5061
|
-
<xsl:attribute name="padding-right">0mm</xsl:attribute>
|
|
5062
|
-
</xsl:if> -->
|
|
5063
|
-
|
|
5064
4907
|
</xsl:template>
|
|
5065
4908
|
|
|
5066
4909
|
<xsl:attribute-set name="termnote-p-style">
|
|
5067
|
-
|
|
5068
|
-
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5069
|
-
|
|
4910
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5070
4911
|
</xsl:attribute-set>
|
|
5071
4912
|
|
|
5072
4913
|
<xsl:attribute-set name="quote-style">
|
|
5073
4914
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
5074
4915
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
|
5075
|
-
|
|
5076
4916
|
</xsl:attribute-set>
|
|
5077
4917
|
|
|
5078
4918
|
<xsl:template name="refine_quote-style">
|
|
5079
|
-
|
|
5080
4919
|
</xsl:template>
|
|
5081
4920
|
|
|
5082
4921
|
<xsl:attribute-set name="quote-source-style">
|
|
5083
4922
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
5084
|
-
|
|
5085
4923
|
</xsl:attribute-set>
|
|
5086
4924
|
|
|
5087
4925
|
<xsl:attribute-set name="termsource-style">
|
|
5088
|
-
|
|
5089
4926
|
</xsl:attribute-set>
|
|
5090
4927
|
|
|
5091
4928
|
<xsl:template name="refine_termsource-style">
|
|
5092
|
-
|
|
5093
4929
|
</xsl:template> <!-- refine_termsource-style -->
|
|
5094
4930
|
|
|
5095
4931
|
<xsl:attribute-set name="termsource-text-style">
|
|
5096
|
-
|
|
5097
4932
|
</xsl:attribute-set>
|
|
5098
4933
|
|
|
5099
4934
|
<xsl:attribute-set name="origin-style">
|
|
5100
|
-
|
|
5101
4935
|
</xsl:attribute-set>
|
|
5102
4936
|
|
|
5103
4937
|
<xsl:attribute-set name="term-style">
|
|
5104
|
-
|
|
5105
4938
|
</xsl:attribute-set>
|
|
5106
4939
|
|
|
5107
4940
|
<xsl:attribute-set name="term-name-style">
|
|
5108
4941
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5109
4942
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5110
|
-
|
|
5111
4943
|
</xsl:attribute-set>
|
|
5112
4944
|
|
|
5113
4945
|
<xsl:attribute-set name="figure-block-style">
|
|
5114
4946
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
5115
|
-
|
|
5116
4947
|
</xsl:attribute-set>
|
|
5117
4948
|
|
|
5118
4949
|
<xsl:template name="refine_figure-block-style">
|
|
5119
|
-
|
|
5120
|
-
<xsl:
|
|
5121
|
-
|
|
5122
|
-
</xsl:if>
|
|
5123
|
-
|
|
4950
|
+
<xsl:if test="*[local-name() = 'name']">
|
|
4951
|
+
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
|
4952
|
+
</xsl:if>
|
|
5124
4953
|
</xsl:template>
|
|
5125
4954
|
|
|
5126
4955
|
<xsl:attribute-set name="figure-style">
|
|
5127
|
-
|
|
5128
4956
|
</xsl:attribute-set>
|
|
5129
4957
|
|
|
5130
4958
|
<xsl:attribute-set name="figure-name-style">
|
|
5131
4959
|
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
5132
|
-
|
|
5133
|
-
|
|
5134
|
-
|
|
5135
|
-
|
|
5136
|
-
|
|
5137
|
-
<xsl:attribute name="text-indent">-19mm</xsl:attribute>
|
|
5138
|
-
|
|
4960
|
+
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
|
4961
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
4962
|
+
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
4963
|
+
<xsl:attribute name="margin-left">19mm</xsl:attribute>
|
|
4964
|
+
<xsl:attribute name="text-indent">-19mm</xsl:attribute>
|
|
5139
4965
|
</xsl:attribute-set>
|
|
5140
4966
|
|
|
5141
4967
|
<xsl:template name="refine_figure-name-style">
|
|
5142
|
-
|
|
5143
4968
|
</xsl:template> <!-- refine_figure-name-style -->
|
|
5144
4969
|
|
|
5145
4970
|
<xsl:attribute-set name="figure-source-style">
|
|
5146
|
-
|
|
5147
4971
|
</xsl:attribute-set>
|
|
5148
4972
|
|
|
5149
4973
|
<!-- Formula's styles -->
|
|
5150
4974
|
<xsl:attribute-set name="formula-style">
|
|
5151
4975
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
5152
4976
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5153
|
-
|
|
5154
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
5155
|
-
|
|
4977
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
5156
4978
|
</xsl:attribute-set> <!-- formula-style -->
|
|
5157
4979
|
|
|
5158
4980
|
<xsl:attribute-set name="formula-stem-block-style">
|
|
5159
4981
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
5160
|
-
|
|
5161
4982
|
</xsl:attribute-set> <!-- formula-stem-block-style -->
|
|
5162
4983
|
|
|
5163
4984
|
<xsl:template name="refine_formula-stem-block-style">
|
|
5164
|
-
|
|
5165
4985
|
</xsl:template> <!-- refine_formula-stem-block-style -->
|
|
5166
4986
|
|
|
5167
4987
|
<xsl:attribute-set name="formula-stem-number-style">
|
|
5168
4988
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
5169
|
-
|
|
5170
4989
|
</xsl:attribute-set> <!-- formula-stem-number-style -->
|
|
5171
4990
|
<!-- End Formula's styles -->
|
|
5172
4991
|
|
|
5173
4992
|
<xsl:template name="refine_formula-stem-number-style">
|
|
5174
|
-
|
|
5175
4993
|
</xsl:template>
|
|
5176
4994
|
|
|
5177
4995
|
<xsl:attribute-set name="image-style">
|
|
5178
4996
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
5179
4997
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
5180
|
-
|
|
5181
4998
|
</xsl:attribute-set>
|
|
5182
4999
|
|
|
5183
5000
|
<xsl:template name="refine_image-style">
|
|
5184
|
-
|
|
5185
5001
|
</xsl:template>
|
|
5186
5002
|
|
|
5187
5003
|
<xsl:attribute-set name="figure-pseudocode-p-style">
|
|
5188
|
-
|
|
5189
5004
|
</xsl:attribute-set>
|
|
5190
5005
|
|
|
5191
5006
|
<xsl:attribute-set name="image-graphic-style">
|
|
5192
5007
|
<xsl:attribute name="width">100%</xsl:attribute>
|
|
5193
5008
|
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
5194
5009
|
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
5195
|
-
|
|
5196
|
-
<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
|
|
5197
|
-
|
|
5010
|
+
<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
|
|
5198
5011
|
</xsl:attribute-set>
|
|
5199
5012
|
|
|
5200
5013
|
<xsl:attribute-set name="tt-style">
|
|
5201
|
-
|
|
5202
5014
|
</xsl:attribute-set>
|
|
5203
5015
|
|
|
5204
5016
|
<xsl:attribute-set name="sourcecode-name-style">
|
|
@@ -5207,50 +5019,41 @@
|
|
|
5207
5019
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
5208
5020
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5209
5021
|
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
|
5210
|
-
|
|
5211
5022
|
</xsl:attribute-set>
|
|
5212
5023
|
|
|
5213
5024
|
<xsl:attribute-set name="preferred-block-style">
|
|
5214
|
-
|
|
5215
5025
|
</xsl:attribute-set>
|
|
5216
5026
|
|
|
5217
5027
|
<xsl:attribute-set name="preferred-term-style">
|
|
5218
5028
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5219
5029
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5220
|
-
|
|
5221
5030
|
</xsl:attribute-set>
|
|
5222
5031
|
|
|
5223
5032
|
<xsl:attribute-set name="domain-style">
|
|
5224
|
-
|
|
5225
5033
|
</xsl:attribute-set>
|
|
5226
5034
|
|
|
5227
5035
|
<xsl:attribute-set name="admitted-style">
|
|
5228
|
-
|
|
5229
5036
|
</xsl:attribute-set>
|
|
5230
5037
|
|
|
5231
5038
|
<xsl:attribute-set name="deprecates-style">
|
|
5232
|
-
|
|
5233
5039
|
</xsl:attribute-set>
|
|
5234
5040
|
|
|
5235
5041
|
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
|
5236
5042
|
</xsl:attribute-set>
|
|
5237
5043
|
|
|
5238
5044
|
<xsl:attribute-set name="definition-style">
|
|
5239
|
-
|
|
5240
5045
|
</xsl:attribute-set>
|
|
5241
5046
|
|
|
5242
5047
|
<xsl:variable name="color-added-text">
|
|
5243
5048
|
<xsl:text>rgb(0, 255, 0)</xsl:text>
|
|
5244
5049
|
</xsl:variable>
|
|
5245
5050
|
<xsl:attribute-set name="add-style">
|
|
5246
|
-
|
|
5247
|
-
|
|
5248
|
-
|
|
5249
|
-
<!-- <xsl:attribute name="color">black</xsl:attribute>
|
|
5051
|
+
<xsl:attribute name="color">red</xsl:attribute>
|
|
5052
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
5053
|
+
<!-- <xsl:attribute name="color">black</xsl:attribute>
|
|
5250
5054
|
<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
|
|
5251
5055
|
<xsl:attribute name="padding-top">1mm</xsl:attribute>
|
|
5252
5056
|
<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
|
|
5253
|
-
|
|
5254
5057
|
</xsl:attribute-set>
|
|
5255
5058
|
|
|
5256
5059
|
<xsl:variable name="add-style">
|
|
@@ -5270,54 +5073,41 @@
|
|
|
5270
5073
|
|
|
5271
5074
|
<xsl:attribute-set name="mathml-style">
|
|
5272
5075
|
<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
|
|
5273
|
-
|
|
5274
5076
|
</xsl:attribute-set>
|
|
5275
5077
|
|
|
5276
5078
|
<xsl:template name="refine_mathml-style">
|
|
5277
|
-
|
|
5278
|
-
<xsl:
|
|
5279
|
-
|
|
5280
|
-
</xsl:if>
|
|
5281
|
-
|
|
5079
|
+
<xsl:if test="ancestor::*[local-name()='table']">
|
|
5080
|
+
<xsl:attribute name="font-size">95%</xsl:attribute> <!-- base font in table is 10pt -->
|
|
5081
|
+
</xsl:if>
|
|
5282
5082
|
</xsl:template>
|
|
5283
5083
|
|
|
5284
5084
|
<xsl:attribute-set name="list-style">
|
|
5285
|
-
|
|
5286
5085
|
</xsl:attribute-set> <!-- list-style -->
|
|
5287
5086
|
|
|
5288
5087
|
<xsl:template name="refine_list-style">
|
|
5289
|
-
|
|
5290
5088
|
</xsl:template> <!-- refine_list-style -->
|
|
5291
5089
|
|
|
5292
5090
|
<xsl:attribute-set name="list-name-style">
|
|
5293
5091
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5294
|
-
|
|
5295
|
-
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5296
|
-
|
|
5092
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5297
5093
|
</xsl:attribute-set> <!-- list-name-style -->
|
|
5298
5094
|
|
|
5299
5095
|
<xsl:attribute-set name="list-item-style">
|
|
5300
|
-
|
|
5301
5096
|
</xsl:attribute-set>
|
|
5302
5097
|
|
|
5303
5098
|
<xsl:template name="refine_list-item-style">
|
|
5304
|
-
|
|
5305
5099
|
</xsl:template> <!-- refine_list-item-style -->
|
|
5306
5100
|
|
|
5307
5101
|
<xsl:attribute-set name="list-item-label-style">
|
|
5308
|
-
|
|
5309
5102
|
</xsl:attribute-set>
|
|
5310
5103
|
|
|
5311
5104
|
<xsl:template name="refine_list-item-label-style">
|
|
5312
|
-
|
|
5313
5105
|
</xsl:template> <!-- refine_list-item-label-style -->
|
|
5314
5106
|
|
|
5315
5107
|
<xsl:attribute-set name="list-item-body-style">
|
|
5316
|
-
|
|
5317
5108
|
</xsl:attribute-set>
|
|
5318
5109
|
|
|
5319
5110
|
<xsl:template name="refine_list-item-body-style">
|
|
5320
|
-
|
|
5321
5111
|
</xsl:template> <!-- refine_list-item-body-style -->
|
|
5322
5112
|
|
|
5323
5113
|
<xsl:attribute-set name="toc-style">
|
|
@@ -5327,15 +5117,13 @@
|
|
|
5327
5117
|
<xsl:attribute-set name="fn-reference-style">
|
|
5328
5118
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
5329
5119
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
5330
|
-
|
|
5331
|
-
|
|
5332
|
-
|
|
5333
|
-
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
5120
|
+
<xsl:attribute name="font-size">70%</xsl:attribute>
|
|
5121
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5122
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
5334
5123
|
|
|
5335
5124
|
</xsl:attribute-set>
|
|
5336
5125
|
|
|
5337
5126
|
<xsl:template name="refine_fn-reference-style">
|
|
5338
|
-
|
|
5339
5127
|
</xsl:template> <!-- refine_fn-reference-style -->
|
|
5340
5128
|
|
|
5341
5129
|
<xsl:attribute-set name="fn-style">
|
|
@@ -5344,10 +5132,8 @@
|
|
|
5344
5132
|
|
|
5345
5133
|
<xsl:attribute-set name="fn-num-style">
|
|
5346
5134
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
5347
|
-
|
|
5348
|
-
|
|
5349
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5350
|
-
|
|
5135
|
+
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
5136
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5351
5137
|
</xsl:attribute-set>
|
|
5352
5138
|
|
|
5353
5139
|
<xsl:attribute-set name="fn-body-style">
|
|
@@ -5355,135 +5141,102 @@
|
|
|
5355
5141
|
<xsl:attribute name="font-style">normal</xsl:attribute>
|
|
5356
5142
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
|
5357
5143
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
|
5358
|
-
|
|
5359
|
-
|
|
5360
|
-
|
|
5361
|
-
|
|
5362
|
-
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5363
|
-
|
|
5144
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
5145
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5146
|
+
<xsl:attribute name="line-height">124%</xsl:attribute>
|
|
5147
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
5364
5148
|
</xsl:attribute-set>
|
|
5365
5149
|
|
|
5366
5150
|
<xsl:template name="refine_fn-body-style">
|
|
5367
|
-
|
|
5368
5151
|
</xsl:template> <!-- refine_fn-body-style -->
|
|
5369
5152
|
|
|
5370
5153
|
<xsl:attribute-set name="fn-body-num-style">
|
|
5371
5154
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
5372
|
-
|
|
5373
|
-
|
|
5374
|
-
|
|
5375
|
-
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
5376
|
-
|
|
5155
|
+
<xsl:attribute name="font-size">60%</xsl:attribute>
|
|
5156
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5157
|
+
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
|
5377
5158
|
</xsl:attribute-set> <!-- fn-body-num-style -->
|
|
5378
5159
|
|
|
5379
5160
|
<xsl:template name="refine_fn-body-num-style">
|
|
5380
|
-
|
|
5381
5161
|
</xsl:template> <!-- refine_fn-body-num-style -->
|
|
5382
5162
|
|
|
5383
5163
|
<!-- admonition -->
|
|
5384
5164
|
<xsl:attribute-set name="admonition-style">
|
|
5385
|
-
|
|
5386
|
-
|
|
5387
|
-
|
|
5388
|
-
|
|
5389
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5390
|
-
|
|
5165
|
+
<xsl:attribute name="border">0.25pt solid black</xsl:attribute>
|
|
5166
|
+
<xsl:attribute name="margin-left">16mm</xsl:attribute>
|
|
5167
|
+
<xsl:attribute name="margin-right">16mm</xsl:attribute>
|
|
5168
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5391
5169
|
</xsl:attribute-set> <!-- admonition-style -->
|
|
5392
5170
|
|
|
5393
5171
|
<xsl:attribute-set name="admonition-container-style">
|
|
5394
5172
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
5395
5173
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
5396
|
-
|
|
5397
|
-
|
|
5398
|
-
<xsl:attribute name="padding-top">3mm</xsl:attribute>
|
|
5399
|
-
|
|
5174
|
+
<xsl:attribute name="padding">2mm</xsl:attribute>
|
|
5175
|
+
<xsl:attribute name="padding-top">3mm</xsl:attribute>
|
|
5400
5176
|
</xsl:attribute-set> <!-- admonition-container-style -->
|
|
5401
5177
|
|
|
5402
5178
|
<xsl:attribute-set name="admonition-name-style">
|
|
5403
5179
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5404
|
-
|
|
5405
|
-
|
|
5406
|
-
|
|
5407
|
-
|
|
5408
|
-
|
|
5409
|
-
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
5410
|
-
|
|
5180
|
+
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
5181
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
5182
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5183
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
5184
|
+
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
5411
5185
|
</xsl:attribute-set> <!-- admonition-name-style -->
|
|
5412
5186
|
|
|
5413
5187
|
<xsl:attribute-set name="admonition-p-style">
|
|
5414
|
-
|
|
5415
|
-
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
5416
|
-
|
|
5188
|
+
<xsl:attribute name="font-style">italic</xsl:attribute>
|
|
5417
5189
|
</xsl:attribute-set> <!-- admonition-p-style -->
|
|
5418
5190
|
<!-- end admonition -->
|
|
5419
5191
|
|
|
5420
5192
|
<!-- bibitem in Normative References (references/@normative="true") -->
|
|
5421
5193
|
<xsl:attribute-set name="bibitem-normative-style">
|
|
5422
|
-
|
|
5423
|
-
|
|
5424
|
-
|
|
5425
|
-
|
|
5426
|
-
<xsl:attribute name="line-height">115%</xsl:attribute>
|
|
5427
|
-
|
|
5194
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5195
|
+
<xsl:attribute name="start-indent">25mm</xsl:attribute>
|
|
5196
|
+
<xsl:attribute name="text-indent">-25mm</xsl:attribute>
|
|
5197
|
+
<xsl:attribute name="line-height">115%</xsl:attribute>
|
|
5428
5198
|
</xsl:attribute-set> <!-- bibitem-normative-style -->
|
|
5429
5199
|
|
|
5430
5200
|
<!-- bibitem in Normative References (references/@normative="true"), renders as list -->
|
|
5431
5201
|
<xsl:attribute-set name="bibitem-normative-list-style">
|
|
5432
5202
|
<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
|
|
5433
5203
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5434
|
-
|
|
5435
|
-
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
|
|
5436
|
-
|
|
5437
|
-
<!-- <xsl:if test="$namespace = 'ieee'">
|
|
5438
|
-
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
5439
|
-
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
|
5440
|
-
</xsl:if> -->
|
|
5441
|
-
|
|
5204
|
+
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
|
|
5442
5205
|
</xsl:attribute-set> <!-- bibitem-normative-list-style -->
|
|
5443
5206
|
|
|
5444
5207
|
<xsl:attribute-set name="bibitem-non-normative-style">
|
|
5445
|
-
|
|
5446
5208
|
</xsl:attribute-set> <!-- bibitem-non-normative-style -->
|
|
5447
5209
|
|
|
5448
5210
|
<!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
|
|
5449
5211
|
<xsl:attribute-set name="bibitem-non-normative-list-style">
|
|
5450
5212
|
<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
|
|
5451
5213
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5452
|
-
|
|
5453
|
-
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
|
|
5454
|
-
|
|
5214
|
+
<xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
|
|
5455
5215
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
|
|
5456
5216
|
|
|
5457
5217
|
<xsl:attribute-set name="bibitem-non-normative-list-item-style">
|
|
5458
5218
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5459
|
-
|
|
5460
5219
|
</xsl:attribute-set>
|
|
5461
5220
|
|
|
5462
5221
|
<!-- bibitem in bibliography section (references/@normative="false"), list body -->
|
|
5463
5222
|
<xsl:attribute-set name="bibitem-normative-list-body-style">
|
|
5464
|
-
|
|
5465
5223
|
</xsl:attribute-set>
|
|
5466
5224
|
|
|
5467
5225
|
<xsl:attribute-set name="bibitem-non-normative-list-body-style">
|
|
5468
|
-
|
|
5469
5226
|
</xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
|
|
5470
5227
|
|
|
5471
5228
|
<!-- footnote reference number for bibitem, in the text -->
|
|
5472
5229
|
<xsl:attribute-set name="bibitem-note-fn-style">
|
|
5473
5230
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
5474
5231
|
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
5475
|
-
|
|
5476
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5477
|
-
|
|
5232
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5478
5233
|
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
|
5479
5234
|
|
|
5480
5235
|
<!-- footnote number on the page bottom -->
|
|
5481
5236
|
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
|
5482
5237
|
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
5483
|
-
|
|
5484
|
-
|
|
5485
|
-
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5486
|
-
|
|
5238
|
+
<xsl:attribute name="font-size">60%</xsl:attribute>
|
|
5239
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
5487
5240
|
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
|
5488
5241
|
|
|
5489
5242
|
<!-- footnote body (text) on the page bottom -->
|
|
@@ -5491,13 +5244,10 @@
|
|
|
5491
5244
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
5492
5245
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
5493
5246
|
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
|
5494
|
-
|
|
5495
5247
|
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
|
5496
5248
|
|
|
5497
5249
|
<xsl:attribute-set name="references-non-normative-style">
|
|
5498
|
-
|
|
5499
|
-
<xsl:attribute name="line-height">120%</xsl:attribute>
|
|
5500
|
-
|
|
5250
|
+
<xsl:attribute name="line-height">120%</xsl:attribute>
|
|
5501
5251
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
|
5502
5252
|
|
|
5503
5253
|
<!-- Highlight.js syntax GitHub styles -->
|
|
@@ -5657,21 +5407,17 @@
|
|
|
5657
5407
|
<!-- Index section styles -->
|
|
5658
5408
|
<xsl:attribute-set name="indexsect-title-style">
|
|
5659
5409
|
<xsl:attribute name="role">H1</xsl:attribute>
|
|
5660
|
-
|
|
5661
|
-
|
|
5662
|
-
|
|
5663
|
-
|
|
5664
|
-
<xsl:attribute name="margin-left">-18mm</xsl:attribute>
|
|
5665
|
-
|
|
5410
|
+
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
5411
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5412
|
+
<xsl:attribute name="margin-bottom">84pt</xsl:attribute>
|
|
5413
|
+
<xsl:attribute name="margin-left">-18mm</xsl:attribute>
|
|
5666
5414
|
</xsl:attribute-set>
|
|
5667
5415
|
|
|
5668
5416
|
<xsl:attribute-set name="indexsect-clause-title-style">
|
|
5669
5417
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5670
|
-
|
|
5671
|
-
|
|
5672
|
-
|
|
5673
|
-
<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
|
|
5674
|
-
|
|
5418
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
5419
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5420
|
+
<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
|
|
5675
5421
|
</xsl:attribute-set>
|
|
5676
5422
|
|
|
5677
5423
|
<!-- End Index section styles -->
|
|
@@ -5748,47 +5494,47 @@
|
|
|
5748
5494
|
</xsl:template>
|
|
5749
5495
|
|
|
5750
5496
|
<xsl:template name="processTables_Contents">
|
|
5751
|
-
<tables>
|
|
5497
|
+
<mn:tables>
|
|
5752
5498
|
<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
|
|
5753
5499
|
<xsl:choose>
|
|
5754
5500
|
<xsl:when test="*[local-name() = 'fmt-name']">
|
|
5755
5501
|
<xsl:variable name="fmt_name">
|
|
5756
5502
|
<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
|
|
5757
5503
|
</xsl:variable>
|
|
5758
|
-
<table id="{@id}" alt-text="{normalize-space($fmt_name)}">
|
|
5504
|
+
<mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
|
|
5759
5505
|
<xsl:copy-of select="$fmt_name"/>
|
|
5760
|
-
</table>
|
|
5506
|
+
</mn:table>
|
|
5761
5507
|
</xsl:when>
|
|
5762
5508
|
<xsl:otherwise>
|
|
5763
|
-
<table id="{@id}" alt-text="{*[local-name() = 'name']}">
|
|
5509
|
+
<mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
|
|
5764
5510
|
<xsl:copy-of select="*[local-name() = 'name']"/>
|
|
5765
|
-
</table>
|
|
5511
|
+
</mn:table>
|
|
5766
5512
|
</xsl:otherwise>
|
|
5767
5513
|
</xsl:choose>
|
|
5768
5514
|
</xsl:for-each>
|
|
5769
|
-
</tables>
|
|
5515
|
+
</mn:tables>
|
|
5770
5516
|
</xsl:template>
|
|
5771
5517
|
|
|
5772
5518
|
<xsl:template name="processFigures_Contents">
|
|
5773
|
-
<figures>
|
|
5519
|
+
<mn:figures>
|
|
5774
5520
|
<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) != '']">
|
|
5775
5521
|
<xsl:choose>
|
|
5776
5522
|
<xsl:when test="*[local-name() = 'fmt-name']">
|
|
5777
5523
|
<xsl:variable name="fmt_name">
|
|
5778
5524
|
<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
|
|
5779
5525
|
</xsl:variable>
|
|
5780
|
-
<figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
|
|
5526
|
+
<mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
|
|
5781
5527
|
<xsl:copy-of select="$fmt_name"/>
|
|
5782
|
-
</figure>
|
|
5528
|
+
</mn:figure>
|
|
5783
5529
|
</xsl:when>
|
|
5784
5530
|
<xsl:otherwise>
|
|
5785
|
-
<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
|
|
5531
|
+
<mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
|
|
5786
5532
|
<xsl:copy-of select="*[local-name() = 'name']"/>
|
|
5787
|
-
</figure>
|
|
5533
|
+
</mn:figure>
|
|
5788
5534
|
</xsl:otherwise>
|
|
5789
5535
|
</xsl:choose>
|
|
5790
5536
|
</xsl:for-each>
|
|
5791
|
-
</figures>
|
|
5537
|
+
</mn:figures>
|
|
5792
5538
|
</xsl:template>
|
|
5793
5539
|
|
|
5794
5540
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
@@ -5807,7 +5553,6 @@
|
|
|
5807
5553
|
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
|
|
5808
5554
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
5809
5555
|
<xsl:apply-templates select="."/>
|
|
5810
|
-
|
|
5811
5556
|
</xsl:for-each>
|
|
5812
5557
|
|
|
5813
5558
|
<xsl:for-each select="/*/*[local-name()='annex']">
|
|
@@ -5914,7 +5659,6 @@
|
|
|
5914
5659
|
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
|
|
5915
5660
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
5916
5661
|
<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
|
|
5917
|
-
|
|
5918
5662
|
</xsl:for-each>
|
|
5919
5663
|
</xsl:element>
|
|
5920
5664
|
</xsl:element>
|
|
@@ -6048,7 +5792,6 @@
|
|
|
6048
5792
|
<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
|
|
6049
5793
|
<xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
|
|
6050
5794
|
</xsl:apply-templates>
|
|
6051
|
-
|
|
6052
5795
|
</xsl:for-each>
|
|
6053
5796
|
</xsl:element>
|
|
6054
5797
|
|
|
@@ -6088,19 +5831,17 @@
|
|
|
6088
5831
|
<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
|
|
6089
5832
|
<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
|
|
6090
5833
|
<xsl:template match="text()" name="text">
|
|
6091
|
-
|
|
6092
|
-
|
|
6093
|
-
|
|
6094
|
-
|
|
6095
|
-
|
|
6096
|
-
|
|
6097
|
-
|
|
6098
|
-
|
|
6099
|
-
|
|
6100
|
-
|
|
6101
|
-
|
|
6102
|
-
</xsl:choose>
|
|
6103
|
-
|
|
5834
|
+
<xsl:choose>
|
|
5835
|
+
<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
|
|
5836
|
+
<xsl:otherwise>
|
|
5837
|
+
<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))"/>
|
|
5838
|
+
<xsl:call-template name="replace_fo_inline_tags">
|
|
5839
|
+
<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
|
|
5840
|
+
<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
|
|
5841
|
+
<xsl:with-param name="text" select="$text"/>
|
|
5842
|
+
</xsl:call-template>
|
|
5843
|
+
</xsl:otherwise>
|
|
5844
|
+
</xsl:choose>
|
|
6104
5845
|
</xsl:template>
|
|
6105
5846
|
|
|
6106
5847
|
<xsl:template name="replace_fo_inline_tags">
|
|
@@ -6154,7 +5895,7 @@
|
|
|
6154
5895
|
<xsl:with-param name="keep_sep">true</xsl:with-param>
|
|
6155
5896
|
</xsl:call-template>
|
|
6156
5897
|
</xsl:variable>
|
|
6157
|
-
<xsl:for-each select="xalan:nodeset($items)/item">
|
|
5898
|
+
<xsl:for-each select="xalan:nodeset($items)/mn:item">
|
|
6158
5899
|
<xsl:choose>
|
|
6159
5900
|
<xsl:when test=". = $sep">
|
|
6160
5901
|
<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
|
|
@@ -6183,17 +5924,13 @@
|
|
|
6183
5924
|
</xsl:template> <!-- copyright-statement -->
|
|
6184
5925
|
|
|
6185
5926
|
<xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
|
|
6186
|
-
|
|
6187
|
-
|
|
6188
|
-
<xsl:call-template name="title"/>
|
|
6189
|
-
|
|
5927
|
+
<!-- process in the template 'title' -->
|
|
5928
|
+
<xsl:call-template name="title"/>
|
|
6190
5929
|
</xsl:template> <!-- copyright-statement//title -->
|
|
6191
5930
|
|
|
6192
5931
|
<xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
|
|
6193
|
-
|
|
6194
|
-
|
|
6195
|
-
<xsl:call-template name="paragraph"/>
|
|
6196
|
-
|
|
5932
|
+
<!-- process in the template 'paragraph' -->
|
|
5933
|
+
<xsl:call-template name="paragraph"/>
|
|
6197
5934
|
</xsl:template> <!-- copyright-statement//p -->
|
|
6198
5935
|
|
|
6199
5936
|
<xsl:template match="*[local-name()='license-statement']">
|
|
@@ -6203,48 +5940,42 @@
|
|
|
6203
5940
|
</xsl:template> <!-- license-statement -->
|
|
6204
5941
|
|
|
6205
5942
|
<xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
|
|
6206
|
-
|
|
6207
|
-
|
|
6208
|
-
|
|
6209
|
-
|
|
6210
|
-
|
|
6211
|
-
|
|
6212
|
-
</fo:block>
|
|
5943
|
+
<xsl:variable name="level">
|
|
5944
|
+
<xsl:call-template name="getLevel"/>
|
|
5945
|
+
</xsl:variable>
|
|
5946
|
+
<fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
|
|
5947
|
+
<xsl:apply-templates/>
|
|
5948
|
+
</fo:block>
|
|
6213
5949
|
|
|
6214
5950
|
</xsl:template> <!-- license-statement/title -->
|
|
6215
5951
|
|
|
6216
5952
|
<xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
|
|
5953
|
+
<fo:block xsl:use-attribute-sets="license-statement-p-style">
|
|
6217
5954
|
|
|
6218
|
-
|
|
6219
|
-
|
|
6220
|
-
<xsl:apply-templates/>
|
|
6221
|
-
</fo:block>
|
|
5955
|
+
<xsl:apply-templates/>
|
|
5956
|
+
</fo:block>
|
|
6222
5957
|
|
|
6223
5958
|
</xsl:template> <!-- license-statement/p -->
|
|
6224
5959
|
|
|
6225
5960
|
<xsl:template match="*[local-name()='legal-statement']">
|
|
6226
5961
|
<xsl:param name="isLegacy">false</xsl:param>
|
|
6227
5962
|
<fo:block xsl:use-attribute-sets="legal-statement-style">
|
|
6228
|
-
|
|
6229
5963
|
<xsl:apply-templates/>
|
|
6230
5964
|
</fo:block>
|
|
6231
5965
|
</xsl:template> <!-- legal-statement -->
|
|
6232
5966
|
|
|
6233
5967
|
<xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
|
|
6234
|
-
|
|
6235
|
-
|
|
6236
|
-
<xsl:call-template name="title"/>
|
|
5968
|
+
<!-- process in the template 'title' -->
|
|
5969
|
+
<xsl:call-template name="title"/>
|
|
6237
5970
|
|
|
6238
5971
|
</xsl:template> <!-- legal-statement/title -->
|
|
6239
5972
|
|
|
6240
5973
|
<xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
|
|
6241
5974
|
<xsl:param name="margin"/>
|
|
6242
|
-
|
|
6243
|
-
|
|
6244
|
-
|
|
6245
|
-
|
|
6246
|
-
</xsl:call-template>
|
|
6247
|
-
|
|
5975
|
+
<!-- process in the template 'paragraph' -->
|
|
5976
|
+
<xsl:call-template name="paragraph">
|
|
5977
|
+
<xsl:with-param name="margin" select="$margin"/>
|
|
5978
|
+
</xsl:call-template>
|
|
6248
5979
|
</xsl:template> <!-- legal-statement/p -->
|
|
6249
5980
|
|
|
6250
5981
|
<xsl:template match="*[local-name()='feedback-statement']">
|
|
@@ -6254,20 +5985,16 @@
|
|
|
6254
5985
|
</xsl:template> <!-- feedback-statement -->
|
|
6255
5986
|
|
|
6256
5987
|
<xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
|
|
6257
|
-
|
|
6258
|
-
|
|
6259
|
-
<xsl:call-template name="title"/>
|
|
6260
|
-
|
|
5988
|
+
<!-- process in the template 'title' -->
|
|
5989
|
+
<xsl:call-template name="title"/>
|
|
6261
5990
|
</xsl:template>
|
|
6262
5991
|
|
|
6263
5992
|
<xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
|
|
6264
5993
|
<xsl:param name="margin"/>
|
|
6265
|
-
|
|
6266
|
-
|
|
6267
|
-
|
|
6268
|
-
|
|
6269
|
-
</xsl:call-template>
|
|
6270
|
-
|
|
5994
|
+
<!-- process in the template 'paragraph' -->
|
|
5995
|
+
<xsl:call-template name="paragraph">
|
|
5996
|
+
<xsl:with-param name="margin" select="$margin"/>
|
|
5997
|
+
</xsl:call-template>
|
|
6271
5998
|
</xsl:template>
|
|
6272
5999
|
|
|
6273
6000
|
<!-- ================================= -->
|
|
@@ -6320,7 +6047,6 @@
|
|
|
6320
6047
|
<xsl:template match="*[local-name()='table']" name="table">
|
|
6321
6048
|
|
|
6322
6049
|
<xsl:variable name="table-preamble">
|
|
6323
|
-
|
|
6324
6050
|
</xsl:variable>
|
|
6325
6051
|
|
|
6326
6052
|
<xsl:variable name="table">
|
|
@@ -6338,10 +6064,8 @@
|
|
|
6338
6064
|
|
|
6339
6065
|
<!-- Display table's name before table as standalone block -->
|
|
6340
6066
|
<!-- $namespace = 'iso' or -->
|
|
6341
|
-
|
|
6342
|
-
|
|
6343
|
-
|
|
6344
|
-
<xsl:call-template name="table_name_fn_display"/>
|
|
6067
|
+
<xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
|
|
6068
|
+
<xsl:call-template name="table_name_fn_display"/>
|
|
6345
6069
|
|
|
6346
6070
|
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
|
|
6347
6071
|
|
|
@@ -6395,12 +6119,11 @@
|
|
|
6395
6119
|
<xsl:variable name="table_width_default">100%</xsl:variable>
|
|
6396
6120
|
<xsl:variable name="table_width">
|
|
6397
6121
|
<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
|
|
6398
|
-
|
|
6399
|
-
|
|
6400
|
-
|
|
6401
|
-
|
|
6402
|
-
|
|
6403
|
-
</xsl:choose>
|
|
6122
|
+
<xsl:choose>
|
|
6123
|
+
<xsl:when test="@width = 'full-page-width' or @width = 'text-width'">100%</xsl:when>
|
|
6124
|
+
<xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
|
|
6125
|
+
<xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
|
|
6126
|
+
</xsl:choose>
|
|
6404
6127
|
|
|
6405
6128
|
</xsl:variable>
|
|
6406
6129
|
|
|
@@ -6544,23 +6267,22 @@
|
|
|
6544
6267
|
<xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
|
|
6545
6268
|
|
|
6546
6269
|
<!-- centered table when table name is centered (see table-name-style) -->
|
|
6547
|
-
|
|
6548
|
-
<xsl:
|
|
6549
|
-
<xsl:
|
|
6550
|
-
|
|
6551
|
-
<
|
|
6552
|
-
<xsl:
|
|
6553
|
-
|
|
6554
|
-
|
|
6555
|
-
</xsl:call-template>
|
|
6556
|
-
<xsl:copy-of select="$table"/>
|
|
6557
|
-
</fo:block>
|
|
6558
|
-
</xsl:when>
|
|
6559
|
-
<xsl:otherwise>
|
|
6560
|
-
<xsl:copy-of select="$table-preamble"/>
|
|
6270
|
+
<xsl:choose>
|
|
6271
|
+
<xsl:when test="$isAdded = 'true' or $isDeleted = 'true'">
|
|
6272
|
+
<xsl:copy-of select="$table-preamble"/>
|
|
6273
|
+
<fo:block>
|
|
6274
|
+
<xsl:call-template name="setTrackChangesStyles">
|
|
6275
|
+
<xsl:with-param name="isAdded" select="$isAdded"/>
|
|
6276
|
+
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
6277
|
+
</xsl:call-template>
|
|
6561
6278
|
<xsl:copy-of select="$table"/>
|
|
6562
|
-
</
|
|
6563
|
-
</xsl:
|
|
6279
|
+
</fo:block>
|
|
6280
|
+
</xsl:when>
|
|
6281
|
+
<xsl:otherwise>
|
|
6282
|
+
<xsl:copy-of select="$table-preamble"/>
|
|
6283
|
+
<xsl:copy-of select="$table"/>
|
|
6284
|
+
</xsl:otherwise>
|
|
6285
|
+
</xsl:choose>
|
|
6564
6286
|
|
|
6565
6287
|
</xsl:when>
|
|
6566
6288
|
<xsl:otherwise>
|
|
@@ -6586,7 +6308,6 @@
|
|
|
6586
6308
|
</xsl:template>
|
|
6587
6309
|
|
|
6588
6310
|
<xsl:template name="setBordersTableArray">
|
|
6589
|
-
|
|
6590
6311
|
</xsl:template>
|
|
6591
6312
|
|
|
6592
6313
|
<!-- table/name-->
|
|
@@ -6594,39 +6315,38 @@
|
|
|
6594
6315
|
<xsl:param name="continued"/>
|
|
6595
6316
|
<xsl:param name="cols-count"/>
|
|
6596
6317
|
<xsl:if test="normalize-space() != ''">
|
|
6318
|
+
<fo:list-block xsl:use-attribute-sets="table-name-style">
|
|
6597
6319
|
|
|
6598
|
-
|
|
6599
|
-
|
|
6600
|
-
|
|
6601
|
-
|
|
6602
|
-
|
|
6603
|
-
|
|
6604
|
-
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
6605
|
-
</xsl:if>
|
|
6320
|
+
<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
|
|
6321
|
+
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
6322
|
+
</xsl:if>
|
|
6323
|
+
<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
|
|
6324
|
+
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
6325
|
+
</xsl:if>
|
|
6606
6326
|
|
|
6607
|
-
|
|
6327
|
+
<xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
|
|
6608
6328
|
|
|
6609
|
-
|
|
6610
|
-
|
|
6611
|
-
|
|
6612
|
-
|
|
6613
|
-
|
|
6614
|
-
|
|
6615
|
-
|
|
6616
|
-
|
|
6617
|
-
|
|
6618
|
-
|
|
6619
|
-
|
|
6620
|
-
|
|
6621
|
-
|
|
6622
|
-
|
|
6623
|
-
|
|
6624
|
-
|
|
6625
|
-
|
|
6626
|
-
|
|
6627
|
-
|
|
6628
|
-
|
|
6629
|
-
|
|
6329
|
+
<fo:list-item>
|
|
6330
|
+
<fo:list-item-label end-indent="label-end()">
|
|
6331
|
+
<fo:block>
|
|
6332
|
+
<xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
|
6333
|
+
</fo:block>
|
|
6334
|
+
</fo:list-item-label>
|
|
6335
|
+
<fo:list-item-body start-indent="body-start()">
|
|
6336
|
+
<fo:block>
|
|
6337
|
+
<xsl:choose>
|
|
6338
|
+
<xsl:when test="./*[local-name() = 'tab']">
|
|
6339
|
+
<xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
|
|
6340
|
+
</xsl:when>
|
|
6341
|
+
<xsl:otherwise>
|
|
6342
|
+
<xsl:apply-templates/>
|
|
6343
|
+
</xsl:otherwise>
|
|
6344
|
+
</xsl:choose>
|
|
6345
|
+
</fo:block>
|
|
6346
|
+
</fo:list-item-body>
|
|
6347
|
+
</fo:list-item>
|
|
6348
|
+
</fo:list-block>
|
|
6349
|
+
<!-- bipm -->
|
|
6630
6350
|
|
|
6631
6351
|
</xsl:if>
|
|
6632
6352
|
</xsl:template> <!-- table/name -->
|
|
@@ -7001,7 +6721,6 @@
|
|
|
7001
6721
|
<xsl:template match="*[local-name()='thead']">
|
|
7002
6722
|
<xsl:param name="cols-count"/>
|
|
7003
6723
|
<fo:table-header>
|
|
7004
|
-
|
|
7005
6724
|
<xsl:apply-templates/>
|
|
7006
6725
|
</fo:table-header>
|
|
7007
6726
|
</xsl:template> <!-- thead -->
|
|
@@ -7015,21 +6734,20 @@
|
|
|
7015
6734
|
|
|
7016
6735
|
<xsl:call-template name="refine_table-header-title-style"/>
|
|
7017
6736
|
|
|
7018
|
-
|
|
7019
|
-
|
|
7020
|
-
|
|
7021
|
-
|
|
6737
|
+
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
|
|
6738
|
+
<xsl:with-param name="continued">true</xsl:with-param>
|
|
6739
|
+
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
6740
|
+
</xsl:apply-templates>
|
|
7022
6741
|
|
|
7023
|
-
|
|
7024
|
-
|
|
7025
|
-
|
|
6742
|
+
<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
6743
|
+
<fo:block role="SKIP"/>
|
|
6744
|
+
</xsl:if>
|
|
7026
6745
|
|
|
7027
6746
|
</fo:table-cell>
|
|
7028
6747
|
</fo:table-row>
|
|
7029
6748
|
</xsl:template> <!-- table-header-title -->
|
|
7030
6749
|
|
|
7031
6750
|
<xsl:template name="refine_table-header-title-style">
|
|
7032
|
-
|
|
7033
6751
|
</xsl:template> <!-- refine_table-header-title-style -->
|
|
7034
6752
|
|
|
7035
6753
|
<xsl:template match="*[local-name()='thead']" mode="process_tbody">
|
|
@@ -7059,7 +6777,6 @@
|
|
|
7059
6777
|
<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']"/>
|
|
7060
6778
|
|
|
7061
6779
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
7062
|
-
|
|
7063
6780
|
</xsl:variable>
|
|
7064
6781
|
|
|
7065
6782
|
<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
|
|
@@ -7121,36 +6838,28 @@
|
|
|
7121
6838
|
<xsl:call-template name="setBordersTableArray"/>
|
|
7122
6839
|
|
|
7123
6840
|
<!-- fn will be processed inside 'note' processing -->
|
|
7124
|
-
|
|
7125
|
-
<
|
|
7126
|
-
<
|
|
7127
|
-
|
|
7128
|
-
<xsl:
|
|
7129
|
-
|
|
7130
|
-
|
|
7131
|
-
|
|
7132
|
-
|
|
7133
|
-
|
|
7134
|
-
|
|
7135
|
-
|
|
7136
|
-
|
|
7137
|
-
|
|
7138
|
-
|
|
7139
|
-
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
7140
|
-
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
7141
|
-
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
|
7142
|
-
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
7143
|
-
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
6841
|
+
<xsl:if test="count(ancestor::bipm:table//*[local-name()='note'][not(@type = 'units')]) > 1">
|
|
6842
|
+
<fo:block font-weight="bold" role="SKIP">
|
|
6843
|
+
<xsl:variable name="curr_lang" select="ancestor::bipm:metanorma/bipm:bibdata/bipm:language"/>
|
|
6844
|
+
<xsl:choose>
|
|
6845
|
+
<xsl:when test="$curr_lang = 'fr'">Remarques</xsl:when>
|
|
6846
|
+
<xsl:otherwise>Notes</xsl:otherwise>
|
|
6847
|
+
</xsl:choose>
|
|
6848
|
+
</fo:block>
|
|
6849
|
+
</xsl:if>
|
|
6850
|
+
<xsl:apply-templates select="../*[local-name()='p']"/>
|
|
6851
|
+
<xsl:apply-templates select="../*[local-name()='dl']"/>
|
|
6852
|
+
<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
|
|
6853
|
+
<xsl:apply-templates select="../*[local-name()='example']"/>
|
|
6854
|
+
<xsl:apply-templates select="../*[local-name()='source']"/>
|
|
7144
6855
|
|
|
7145
6856
|
<xsl:variable name="isDisplayRowSeparator">
|
|
7146
|
-
|
|
7147
6857
|
</xsl:variable>
|
|
7148
6858
|
|
|
7149
6859
|
<!-- horizontal row separator -->
|
|
7150
6860
|
<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
|
|
7151
6861
|
<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
|
|
7152
6862
|
<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
|
|
7153
|
-
|
|
7154
6863
|
<xsl:call-template name="setBordersTableArray"/>
|
|
7155
6864
|
<fo:block font-size="1pt"> </fo:block>
|
|
7156
6865
|
</fo:block-container>
|
|
@@ -7158,11 +6867,8 @@
|
|
|
7158
6867
|
</xsl:if>
|
|
7159
6868
|
|
|
7160
6869
|
<!-- fn processing -->
|
|
7161
|
-
|
|
7162
|
-
|
|
7163
|
-
<xsl:copy-of select="$table_fn_block"/>
|
|
7164
|
-
|
|
7165
|
-
<!-- for PAS display Notes after footnotes -->
|
|
6870
|
+
<!-- <xsl:call-template name="table_fn_display" /> -->
|
|
6871
|
+
<xsl:copy-of select="$table_fn_block"/>
|
|
7166
6872
|
|
|
7167
6873
|
</fo:table-cell>
|
|
7168
6874
|
</fo:table-row>
|
|
@@ -7289,7 +6995,7 @@
|
|
|
7289
6995
|
<xsl:with-param name="pText" select="$border_under_row_"/>
|
|
7290
6996
|
</xsl:call-template>
|
|
7291
6997
|
</xsl:variable>
|
|
7292
|
-
<xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
|
|
6998
|
+
<xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
|
|
7293
6999
|
<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
|
|
7294
7000
|
</xsl:if>
|
|
7295
7001
|
</xsl:when>
|
|
@@ -7327,13 +7033,12 @@
|
|
|
7327
7033
|
</xsl:template>
|
|
7328
7034
|
|
|
7329
7035
|
<xsl:template name="setTableRowAttributes">
|
|
7330
|
-
|
|
7331
|
-
<xsl:
|
|
7332
|
-
|
|
7036
|
+
<xsl:if test="count(*) = 1 and local-name(*[1]) = 'th'">
|
|
7037
|
+
<xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
|
|
7038
|
+
</xsl:if>
|
|
7039
|
+
<xsl:if test="not(ancestor::*[local-name()='note_side'])">
|
|
7040
|
+
<xsl:attribute name="min-height">5mm</xsl:attribute>
|
|
7333
7041
|
</xsl:if>
|
|
7334
|
-
<xsl:if test="not(ancestor::*[local-name()='note_side'])">
|
|
7335
|
-
<xsl:attribute name="min-height">5mm</xsl:attribute>
|
|
7336
|
-
</xsl:if>
|
|
7337
7042
|
|
|
7338
7043
|
<xsl:call-template name="setColors"/>
|
|
7339
7044
|
|
|
@@ -7413,7 +7118,7 @@
|
|
|
7413
7118
|
</xsl:variable>
|
|
7414
7119
|
<xsl:variable name="quot">"</xsl:variable>
|
|
7415
7120
|
<xsl:variable name="styles_">
|
|
7416
|
-
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
|
7121
|
+
<xsl:for-each select="xalan:nodeset($styles__)/mn:item">
|
|
7417
7122
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
7418
7123
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
7419
7124
|
<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'">
|
|
@@ -7463,19 +7168,16 @@
|
|
|
7463
7168
|
<fo:block role="SKIP">
|
|
7464
7169
|
|
|
7465
7170
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
7466
|
-
|
|
7467
|
-
|
|
7468
|
-
|
|
7171
|
+
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
7172
|
+
</xsl:if>
|
|
7173
|
+
<xsl:if test="not(.//bipm:image)">
|
|
7174
|
+
<xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
|
|
7175
|
+
</xsl:if>
|
|
7176
|
+
<!-- hanging indent for left column -->
|
|
7177
|
+
<xsl:if test="not(preceding-sibling::*[local-name() = 'td'])">
|
|
7178
|
+
<xsl:attribute name="text-indent">-3mm</xsl:attribute>
|
|
7179
|
+
<xsl:attribute name="start-indent">3mm</xsl:attribute>
|
|
7469
7180
|
</xsl:if>
|
|
7470
|
-
|
|
7471
|
-
<xsl:if test="not(.//bipm:image)">
|
|
7472
|
-
<xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
|
|
7473
|
-
</xsl:if>
|
|
7474
|
-
<!-- hanging indent for left column -->
|
|
7475
|
-
<xsl:if test="not(preceding-sibling::*[local-name() = 'td'])">
|
|
7476
|
-
<xsl:attribute name="text-indent">-3mm</xsl:attribute>
|
|
7477
|
-
<xsl:attribute name="start-indent">3mm</xsl:attribute>
|
|
7478
|
-
</xsl:if>
|
|
7479
7181
|
|
|
7480
7182
|
<xsl:apply-templates/>
|
|
7481
7183
|
|
|
@@ -7489,29 +7191,26 @@
|
|
|
7489
7191
|
|
|
7490
7192
|
<!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
|
|
7491
7193
|
<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">
|
|
7194
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
7195
|
+
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
7196
|
+
<xsl:copy-of select="@id"/>
|
|
7492
7197
|
|
|
7493
|
-
|
|
7494
|
-
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
7495
|
-
<xsl:copy-of select="@id"/>
|
|
7496
|
-
|
|
7497
|
-
<xsl:call-template name="refine_table-note-style"/>
|
|
7198
|
+
<xsl:call-template name="refine_table-note-style"/>
|
|
7498
7199
|
|
|
7499
|
-
|
|
7500
|
-
|
|
7200
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
7201
|
+
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
7501
7202
|
|
|
7502
|
-
|
|
7203
|
+
<xsl:call-template name="refine_table-note-name-style"/>
|
|
7503
7204
|
|
|
7504
|
-
|
|
7505
|
-
|
|
7506
|
-
</fo:inline>
|
|
7507
|
-
|
|
7508
|
-
<xsl:if test="ancestor::bipm:preface">
|
|
7509
|
-
<fo:block> </fo:block>
|
|
7510
|
-
</xsl:if>
|
|
7205
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
|
7511
7206
|
|
|
7512
|
-
|
|
7513
|
-
|
|
7207
|
+
</fo:inline>
|
|
7208
|
+
<xsl:if test="ancestor::bipm:preface">
|
|
7209
|
+
<fo:block> </fo:block>
|
|
7210
|
+
</xsl:if>
|
|
7514
7211
|
|
|
7212
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
7213
|
+
</fo:block>
|
|
7515
7214
|
</xsl:template> <!-- table/note -->
|
|
7516
7215
|
|
|
7517
7216
|
<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">
|
|
@@ -7556,9 +7255,7 @@
|
|
|
7556
7255
|
<xsl:variable name="current_fn_number" select="@reference"/>
|
|
7557
7256
|
|
|
7558
7257
|
<xsl:variable name="current_fn_number_text">
|
|
7559
|
-
|
|
7560
|
-
<xsl:value-of select="$current_fn_number"/>
|
|
7561
|
-
|
|
7258
|
+
<xsl:value-of select="$current_fn_number"/>
|
|
7562
7259
|
</xsl:variable>
|
|
7563
7260
|
|
|
7564
7261
|
<xsl:variable name="ref_id" select="@target"/>
|
|
@@ -7570,12 +7267,10 @@
|
|
|
7570
7267
|
<xsl:choose>
|
|
7571
7268
|
<xsl:when test="ancestor::*[local-name() = 'bibitem']">
|
|
7572
7269
|
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
|
7573
|
-
|
|
7574
7270
|
</fn_styles>
|
|
7575
7271
|
</xsl:when>
|
|
7576
7272
|
<xsl:otherwise>
|
|
7577
7273
|
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
|
7578
|
-
|
|
7579
7274
|
</fn_styles>
|
|
7580
7275
|
</xsl:otherwise>
|
|
7581
7276
|
</xsl:choose>
|
|
@@ -7593,7 +7288,6 @@
|
|
|
7593
7288
|
<xsl:with-param name="element">
|
|
7594
7289
|
<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 -->
|
|
7595
7290
|
<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
|
|
7596
|
-
|
|
7597
7291
|
<xsl:copy-of select="$current_fn_number_text"/>
|
|
7598
7292
|
|
|
7599
7293
|
</fo:inline>
|
|
@@ -7631,10 +7325,9 @@
|
|
|
7631
7325
|
<here><xsl:copy-of select="$footnotes"/></here> -->
|
|
7632
7326
|
<xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
|
|
7633
7327
|
</xsl:variable>
|
|
7634
|
-
|
|
7635
|
-
|
|
7636
|
-
|
|
7637
|
-
</fo:block>
|
|
7328
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
|
7329
|
+
<xsl:copy-of select="$fn_block"/>
|
|
7330
|
+
</fo:block>
|
|
7638
7331
|
|
|
7639
7332
|
</fo:block-container>
|
|
7640
7333
|
</fo:footnote-body>
|
|
@@ -7711,21 +7404,20 @@
|
|
|
7711
7404
|
<xsl:variable name="reference" select="@reference"/>
|
|
7712
7405
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
|
|
7713
7406
|
<xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
|
|
7407
|
+
<fo:block xsl:use-attribute-sets="table-fn-style">
|
|
7408
|
+
<xsl:copy-of select="@id"/>
|
|
7409
|
+
<xsl:call-template name="refine_table-fn-style"/>
|
|
7714
7410
|
|
|
7715
|
-
|
|
7716
|
-
|
|
7717
|
-
|
|
7718
|
-
|
|
7719
|
-
<xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
|
|
7720
|
-
<xsl:with-param name="process">true</xsl:with-param>
|
|
7721
|
-
</xsl:apply-templates>
|
|
7411
|
+
<xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
|
|
7412
|
+
<xsl:with-param name="process">true</xsl:with-param>
|
|
7413
|
+
</xsl:apply-templates>
|
|
7722
7414
|
|
|
7723
|
-
|
|
7724
|
-
|
|
7725
|
-
|
|
7726
|
-
|
|
7415
|
+
<fo:inline xsl:use-attribute-sets="table-fn-body-style">
|
|
7416
|
+
<!-- <xsl:copy-of select="./node()"/> -->
|
|
7417
|
+
<xsl:apply-templates/>
|
|
7418
|
+
</fo:inline>
|
|
7727
7419
|
|
|
7728
|
-
|
|
7420
|
+
</fo:block>
|
|
7729
7421
|
|
|
7730
7422
|
<!-- </xsl:if> -->
|
|
7731
7423
|
</xsl:for-each>
|
|
@@ -7778,9 +7470,7 @@
|
|
|
7778
7470
|
<xsl:param name="process">false</xsl:param>
|
|
7779
7471
|
<xsl:if test="$process = 'true'">
|
|
7780
7472
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
|
7781
|
-
|
|
7782
|
-
<xsl:attribute name="padding-right">2.5mm</xsl:attribute>
|
|
7783
|
-
|
|
7473
|
+
<xsl:attribute name="padding-right">2.5mm</xsl:attribute>
|
|
7784
7474
|
</xsl:if>
|
|
7785
7475
|
</xsl:template>
|
|
7786
7476
|
|
|
@@ -7864,7 +7554,6 @@
|
|
|
7864
7554
|
<xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
|
|
7865
7555
|
|
|
7866
7556
|
<xsl:variable name="key_iso">
|
|
7867
|
-
|
|
7868
7557
|
</xsl:variable>
|
|
7869
7558
|
|
|
7870
7559
|
<fo:block>
|
|
@@ -7910,7 +7599,6 @@
|
|
|
7910
7599
|
<fo:table width="95%" table-layout="fixed">
|
|
7911
7600
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
7912
7601
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
7913
|
-
|
|
7914
7602
|
</xsl:if>
|
|
7915
7603
|
<xsl:choose>
|
|
7916
7604
|
<!-- if there 'dl', then set same columns width -->
|
|
@@ -7934,23 +7622,19 @@
|
|
|
7934
7622
|
<fo:table-row>
|
|
7935
7623
|
<fo:table-cell>
|
|
7936
7624
|
<fo:block>
|
|
7937
|
-
|
|
7938
|
-
|
|
7939
|
-
|
|
7940
|
-
|
|
7941
|
-
|
|
7942
|
-
</fo:inline>
|
|
7625
|
+
<fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
|
|
7626
|
+
<!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
|
|
7627
|
+
<!-- <xsl:value-of select="@reference"/> -->
|
|
7628
|
+
<xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
|
|
7629
|
+
</fo:inline>
|
|
7943
7630
|
|
|
7944
7631
|
</fo:block>
|
|
7945
7632
|
</fo:table-cell>
|
|
7946
7633
|
<fo:table-cell>
|
|
7947
7634
|
<fo:block xsl:use-attribute-sets="figure-fn-body-style">
|
|
7948
7635
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
7949
|
-
|
|
7950
|
-
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
|
7951
|
-
|
|
7636
|
+
<xsl:attribute name="margin-bottom">0</xsl:attribute>
|
|
7952
7637
|
</xsl:if>
|
|
7953
|
-
|
|
7954
7638
|
<!-- <xsl:copy-of select="./node()"/> -->
|
|
7955
7639
|
<xsl:apply-templates/>
|
|
7956
7640
|
</fo:block>
|
|
@@ -8000,11 +7684,9 @@
|
|
|
8000
7684
|
<!-- figure/dl[@key = 'true']/dt/p/sup -->
|
|
8001
7685
|
<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">
|
|
8002
7686
|
<xsl:variable name="key_iso">
|
|
8003
|
-
|
|
8004
7687
|
</xsl:variable>
|
|
8005
7688
|
<xsl:if test="normalize-space($key_iso) = 'true'">
|
|
8006
7689
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
8007
|
-
|
|
8008
7690
|
</xsl:if>
|
|
8009
7691
|
<fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}" -->
|
|
8010
7692
|
<!-- <xsl:value-of select="@reference"/> -->
|
|
@@ -8050,11 +7732,10 @@
|
|
|
8050
7732
|
<xsl:text>※</xsl:text>
|
|
8051
7733
|
</xsl:if> -->
|
|
8052
7734
|
<!-- <xsl:value-of select="@reference"/> -->
|
|
8053
|
-
|
|
8054
|
-
|
|
8055
|
-
|
|
8056
|
-
|
|
8057
|
-
<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()"/>
|
|
7735
|
+
<fo:inline font-style="normal"> </fo:inline>
|
|
7736
|
+
<!-- Example: <fmt-fn-label><sup><span class="fmt-label-delim">(</span>a<span class="fmt-label-delim">)</span></sup></fmt-fn-label> -->
|
|
7737
|
+
<!-- to <fo:inline font-style="normal">(</fo:inline> ... -->
|
|
7738
|
+
<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()"/>
|
|
8058
7739
|
|
|
8059
7740
|
<!-- <xsl:if test="$namespace = 'bsi'">
|
|
8060
7741
|
<xsl:text>)</xsl:text>
|
|
@@ -8126,13 +7807,12 @@
|
|
|
8126
7807
|
</xsl:if>
|
|
8127
7808
|
|
|
8128
7809
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8129
|
-
|
|
8130
|
-
|
|
8131
|
-
|
|
8132
|
-
|
|
8133
|
-
|
|
8134
|
-
|
|
8135
|
-
</xsl:if>
|
|
7810
|
+
<xsl:if test="not(ancestor::*[local-name() = 'li'])">
|
|
7811
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
7812
|
+
</xsl:if>
|
|
7813
|
+
<xsl:if test="ancestor::*[local-name() = 'li']">
|
|
7814
|
+
<xsl:attribute name="margin-left">6.5mm</xsl:attribute><!-- 8 mm -->
|
|
7815
|
+
</xsl:if>
|
|
8136
7816
|
|
|
8137
7817
|
<xsl:if test="ancestor::*[local-name() = 'sourcecode']">
|
|
8138
7818
|
<!-- set font-size as sourcecode font-size -->
|
|
@@ -8153,7 +7833,6 @@
|
|
|
8153
7833
|
<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
|
|
8154
7834
|
</xsl:choose>
|
|
8155
7835
|
</xsl:attribute>
|
|
8156
|
-
|
|
8157
7836
|
</xsl:if>
|
|
8158
7837
|
|
|
8159
7838
|
<xsl:call-template name="setTrackChangesStyles">
|
|
@@ -8165,32 +7844,28 @@
|
|
|
8165
7844
|
|
|
8166
7845
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
8167
7846
|
|
|
8168
|
-
<xsl:variable name="key_iso">
|
|
8169
|
-
<!-- and (not(../@class) or ../@class !='pseudocode') -->
|
|
7847
|
+
<xsl:variable name="key_iso"> <!-- and (not(../@class) or ../@class !='pseudocode') -->
|
|
8170
7848
|
</xsl:variable>
|
|
8171
7849
|
|
|
8172
7850
|
<xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
|
|
8173
7851
|
|
|
8174
7852
|
<xsl:choose>
|
|
8175
7853
|
<xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
|
|
8176
|
-
|
|
8177
|
-
|
|
8178
|
-
|
|
8179
|
-
<!-- <xsl:variable name="title-where">
|
|
7854
|
+
<fo:block margin-bottom="12pt" text-align="left">
|
|
7855
|
+
<!-- <xsl:variable name="title-where">
|
|
8180
7856
|
<xsl:call-template name="getLocalizedString">
|
|
8181
7857
|
<xsl:with-param name="key">where</xsl:with-param>
|
|
8182
7858
|
</xsl:call-template>
|
|
8183
7859
|
</xsl:variable>
|
|
8184
7860
|
<xsl:value-of select="$title-where"/> -->
|
|
8185
|
-
|
|
8186
|
-
|
|
8187
|
-
|
|
8188
|
-
|
|
8189
|
-
|
|
8190
|
-
|
|
8191
|
-
|
|
8192
|
-
|
|
8193
|
-
|
|
7861
|
+
<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
|
|
7862
|
+
<xsl:text> </xsl:text>
|
|
7863
|
+
<xsl:apply-templates select="*[local-name()='dt']/*"/>
|
|
7864
|
+
<xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
|
|
7865
|
+
<xsl:text> </xsl:text>
|
|
7866
|
+
</xsl:if>
|
|
7867
|
+
<xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
|
|
7868
|
+
</fo:block>
|
|
8194
7869
|
</xsl:when> <!-- END: only one component -->
|
|
8195
7870
|
<xsl:when test="$parent = 'formula'"> <!-- a few components -->
|
|
8196
7871
|
<fo:block margin-bottom="12pt" text-align="left">
|
|
@@ -8210,19 +7885,17 @@
|
|
|
8210
7885
|
<xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
|
|
8211
7886
|
<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
|
|
8212
7887
|
<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
|
|
7888
|
+
<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
|
|
8213
7889
|
|
|
8214
|
-
|
|
8215
|
-
|
|
8216
|
-
<xsl:call-template name="refine_figure_key_style"/>
|
|
8217
|
-
|
|
8218
|
-
<xsl:variable name="title-key">
|
|
8219
|
-
<xsl:call-template name="getLocalizedString">
|
|
8220
|
-
<xsl:with-param name="key">key</xsl:with-param>
|
|
8221
|
-
</xsl:call-template>
|
|
8222
|
-
</xsl:variable>
|
|
8223
|
-
<xsl:value-of select="$title-key"/>
|
|
8224
|
-
</fo:block>
|
|
7890
|
+
<xsl:call-template name="refine_figure_key_style"/>
|
|
8225
7891
|
|
|
7892
|
+
<xsl:variable name="title-key">
|
|
7893
|
+
<xsl:call-template name="getLocalizedString">
|
|
7894
|
+
<xsl:with-param name="key">key</xsl:with-param>
|
|
7895
|
+
</xsl:call-template>
|
|
7896
|
+
</xsl:variable>
|
|
7897
|
+
<xsl:value-of select="$title-key"/>
|
|
7898
|
+
</fo:block>
|
|
8226
7899
|
</xsl:if>
|
|
8227
7900
|
</xsl:when> <!-- END: definition list in a figure -->
|
|
8228
7901
|
</xsl:choose>
|
|
@@ -8255,12 +7928,10 @@
|
|
|
8255
7928
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
8256
7929
|
<xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
|
|
8257
7930
|
</xsl:if>
|
|
8258
|
-
|
|
8259
7931
|
<xsl:choose>
|
|
8260
7932
|
<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
|
|
8261
7933
|
<xsl:when test="normalize-space($key_iso) = 'true'">
|
|
8262
7934
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
8263
|
-
|
|
8264
7935
|
</xsl:when>
|
|
8265
7936
|
</xsl:choose>
|
|
8266
7937
|
|
|
@@ -8365,17 +8036,15 @@
|
|
|
8365
8036
|
<xsl:call-template name="getMaxLength_dt"/>
|
|
8366
8037
|
</xsl:variable>
|
|
8367
8038
|
|
|
8368
|
-
<xsl:variable name="isContainsKeepTogetherTag_">
|
|
8369
|
-
false
|
|
8039
|
+
<xsl:variable name="isContainsKeepTogetherTag_">false
|
|
8370
8040
|
</xsl:variable>
|
|
8371
8041
|
<xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
|
|
8372
8042
|
<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
|
|
8373
|
-
|
|
8374
|
-
|
|
8375
|
-
|
|
8376
|
-
|
|
8377
|
-
|
|
8378
|
-
</xsl:call-template>
|
|
8043
|
+
<xsl:call-template name="setColumnWidth_dl">
|
|
8044
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
8045
|
+
<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
|
|
8046
|
+
<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
|
|
8047
|
+
</xsl:call-template>
|
|
8379
8048
|
|
|
8380
8049
|
<fo:table-body>
|
|
8381
8050
|
|
|
@@ -8426,21 +8095,17 @@
|
|
|
8426
8095
|
</xsl:template>
|
|
8427
8096
|
|
|
8428
8097
|
<xsl:template name="refine_dl_formula_where_style">
|
|
8429
|
-
|
|
8430
8098
|
</xsl:template> <!-- refine_dl_formula_where_style -->
|
|
8431
8099
|
|
|
8432
8100
|
<xsl:template name="refine_figure_key_style">
|
|
8433
|
-
|
|
8434
8101
|
</xsl:template> <!-- refine_figure_key_style -->
|
|
8435
8102
|
|
|
8436
8103
|
<xsl:template name="refine_multicomponent_style">
|
|
8437
8104
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
8438
|
-
|
|
8439
8105
|
</xsl:template> <!-- refine_multicomponent_style -->
|
|
8440
8106
|
|
|
8441
8107
|
<xsl:template name="refine_multicomponent_block_style">
|
|
8442
8108
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
8443
|
-
|
|
8444
8109
|
</xsl:template> <!-- refine_multicomponent_block_style -->
|
|
8445
8110
|
|
|
8446
8111
|
<!-- ignore 'p' with 'where' in formula, before 'dl' -->
|
|
@@ -8627,14 +8292,11 @@
|
|
|
8627
8292
|
<xsl:attribute name="id">
|
|
8628
8293
|
<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
|
|
8629
8294
|
</xsl:attribute>
|
|
8630
|
-
|
|
8631
|
-
|
|
8632
|
-
|
|
8633
|
-
</xsl:apply-templates>
|
|
8634
|
-
|
|
8295
|
+
<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
|
|
8296
|
+
<xsl:with-param name="process">true</xsl:with-param>
|
|
8297
|
+
</xsl:apply-templates>
|
|
8635
8298
|
</td>
|
|
8636
8299
|
</tr>
|
|
8637
|
-
|
|
8638
8300
|
</xsl:template>
|
|
8639
8301
|
|
|
8640
8302
|
<!-- Definition's term -->
|
|
@@ -8643,7 +8305,6 @@
|
|
|
8643
8305
|
<xsl:param name="split_keep-within-line"/>
|
|
8644
8306
|
|
|
8645
8307
|
<fo:table-row xsl:use-attribute-sets="dt-row-style">
|
|
8646
|
-
|
|
8647
8308
|
<xsl:call-template name="insert_dt_cell">
|
|
8648
8309
|
<xsl:with-param name="key_iso" select="$key_iso"/>
|
|
8649
8310
|
<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
|
|
@@ -8665,7 +8326,6 @@
|
|
|
8665
8326
|
<!-- border is mandatory, to calculate real width -->
|
|
8666
8327
|
<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
|
|
8667
8328
|
<xsl:attribute name="text-align">left</xsl:attribute>
|
|
8668
|
-
|
|
8669
8329
|
</xsl:if>
|
|
8670
8330
|
|
|
8671
8331
|
<xsl:call-template name="refine_dt-cell-style"/>
|
|
@@ -8675,9 +8335,7 @@
|
|
|
8675
8335
|
|
|
8676
8336
|
<xsl:choose>
|
|
8677
8337
|
<xsl:when test="$isGenerateTableIF = 'true'">
|
|
8678
|
-
|
|
8679
|
-
<xsl:copy-of select="@id"/>
|
|
8680
|
-
|
|
8338
|
+
<xsl:copy-of select="@id"/>
|
|
8681
8339
|
</xsl:when>
|
|
8682
8340
|
<xsl:otherwise>
|
|
8683
8341
|
<xsl:copy-of select="@id"/>
|
|
@@ -8714,9 +8372,7 @@
|
|
|
8714
8372
|
<fo:block role="SKIP">
|
|
8715
8373
|
|
|
8716
8374
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
8717
|
-
|
|
8718
|
-
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
8719
|
-
|
|
8375
|
+
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
8720
8376
|
</xsl:if>
|
|
8721
8377
|
|
|
8722
8378
|
<xsl:choose>
|
|
@@ -8864,7 +8520,6 @@
|
|
|
8864
8520
|
</xsl:template>
|
|
8865
8521
|
|
|
8866
8522
|
<xsl:template name="refine_italic_style">
|
|
8867
|
-
|
|
8868
8523
|
</xsl:template>
|
|
8869
8524
|
|
|
8870
8525
|
<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
|
|
@@ -8880,7 +8535,6 @@
|
|
|
8880
8535
|
</xsl:template>
|
|
8881
8536
|
|
|
8882
8537
|
<xsl:template name="refine_strong_style">
|
|
8883
|
-
|
|
8884
8538
|
<xsl:if test="ancestor::*['preferred']">
|
|
8885
8539
|
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
8886
8540
|
</xsl:if>
|
|
@@ -8905,10 +8559,7 @@
|
|
|
8905
8559
|
<xsl:template match="*[local-name()='tt']">
|
|
8906
8560
|
<fo:inline xsl:use-attribute-sets="tt-style">
|
|
8907
8561
|
|
|
8908
|
-
<xsl:variable name="_font-size">
|
|
8909
|
-
|
|
8910
|
-
<!-- inherit -->
|
|
8911
|
-
|
|
8562
|
+
<xsl:variable name="_font-size"> <!-- inherit -->
|
|
8912
8563
|
</xsl:variable>
|
|
8913
8564
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
8914
8565
|
<xsl:if test="$font-size != ''">
|
|
@@ -9124,8 +8775,7 @@
|
|
|
9124
8775
|
</xsl:otherwise>
|
|
9125
8776
|
</xsl:choose>
|
|
9126
8777
|
</xsl:variable>
|
|
9127
|
-
<xsl:variable name="ratio_">
|
|
9128
|
-
0.75
|
|
8778
|
+
<xsl:variable name="ratio_">0.75
|
|
9129
8779
|
</xsl:variable>
|
|
9130
8780
|
<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
|
|
9131
8781
|
<fo:inline font-size="{$ratio * 100}%" role="SKIP">
|
|
@@ -9215,7 +8865,7 @@
|
|
|
9215
8865
|
|
|
9216
8866
|
<xsl:variable name="quot">"</xsl:variable>
|
|
9217
8867
|
<xsl:variable name="styles_">
|
|
9218
|
-
<xsl:for-each select="xalan:nodeset($styles__)/item">
|
|
8868
|
+
<xsl:for-each select="xalan:nodeset($styles__)/mn:item">
|
|
9219
8869
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
9220
8870
|
<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
9221
8871
|
<xsl:variable name="value">
|
|
@@ -9227,7 +8877,7 @@
|
|
|
9227
8877
|
</xsl:otherwise>
|
|
9228
8878
|
</xsl:choose>
|
|
9229
8879
|
</xsl:variable>
|
|
9230
|
-
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
|
|
8880
|
+
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
|
|
9231
8881
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
|
9232
8882
|
</xsl:if>
|
|
9233
8883
|
<xsl:if test="$key = 'text-indent'">
|
|
@@ -9241,7 +8891,6 @@
|
|
|
9241
8891
|
<fo:inline>
|
|
9242
8892
|
<xsl:for-each select="$styles/style">
|
|
9243
8893
|
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
|
9244
|
-
|
|
9245
8894
|
</xsl:for-each>
|
|
9246
8895
|
<xsl:apply-templates/>
|
|
9247
8896
|
</fo:inline>
|
|
@@ -10228,35 +9877,34 @@
|
|
|
10228
9877
|
<xsl:variable name="mathml_content">
|
|
10229
9878
|
<xsl:apply-templates select="." mode="mathml_actual_text"/>
|
|
10230
9879
|
</xsl:variable>
|
|
10231
|
-
|
|
10232
|
-
|
|
10233
|
-
|
|
10234
|
-
|
|
10235
|
-
|
|
10236
|
-
|
|
10237
|
-
|
|
10238
|
-
|
|
10239
|
-
|
|
10240
|
-
|
|
10241
|
-
|
|
10242
|
-
|
|
10243
|
-
|
|
10244
|
-
|
|
10245
|
-
|
|
10246
|
-
|
|
10247
|
-
|
|
10248
|
-
|
|
10249
|
-
|
|
10250
|
-
|
|
10251
|
-
|
|
10252
|
-
|
|
10253
|
-
|
|
10254
|
-
|
|
10255
|
-
|
|
10256
|
-
|
|
10257
|
-
|
|
10258
|
-
|
|
10259
|
-
<!-- end BIPM -->
|
|
9880
|
+
<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
|
|
9881
|
+
<xsl:choose>
|
|
9882
|
+
<xsl:when test="$add_math_as_attachment = 'true' and normalize-space($filename) != ''">
|
|
9883
|
+
<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
|
|
9884
|
+
<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
|
|
9885
|
+
<xsl:variable name="asciimath_text">
|
|
9886
|
+
<!-- <xsl:call-template name="getMathml_comment_text"/> -->
|
|
9887
|
+
<xsl:call-template name="getMathml_asciimath_text"/>
|
|
9888
|
+
</xsl:variable>
|
|
9889
|
+
<xsl:if test="normalize-space($asciimath_text) != ''">
|
|
9890
|
+
<!-- put Mathin Alternate Text -->
|
|
9891
|
+
<xsl:attribute name="fox:alt-text">
|
|
9892
|
+
<xsl:value-of select="$asciimath_text"/>
|
|
9893
|
+
</xsl:attribute>
|
|
9894
|
+
</xsl:if>
|
|
9895
|
+
<xsl:call-template name="mathml_instream_object">
|
|
9896
|
+
<xsl:with-param name="asciimath_text" select="$asciimath_text"/>
|
|
9897
|
+
<xsl:with-param name="mathml_content" select="$mathml_content"/>
|
|
9898
|
+
</xsl:call-template>
|
|
9899
|
+
</fo:basic-link>
|
|
9900
|
+
</xsl:when>
|
|
9901
|
+
<xsl:otherwise>
|
|
9902
|
+
<xsl:call-template name="mathml_instream_object">
|
|
9903
|
+
<xsl:with-param name="mathml_content" select="$mathml_content"/>
|
|
9904
|
+
</xsl:call-template>
|
|
9905
|
+
</xsl:otherwise>
|
|
9906
|
+
</xsl:choose>
|
|
9907
|
+
<!-- end BIPM -->
|
|
10260
9908
|
|
|
10261
9909
|
</fo:inline>
|
|
10262
9910
|
</xsl:template>
|
|
@@ -10290,7 +9938,6 @@
|
|
|
10290
9938
|
<xsl:template name="getMathml_asciimath_text">
|
|
10291
9939
|
<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
|
|
10292
9940
|
<xsl:variable name="latexmath">
|
|
10293
|
-
|
|
10294
9941
|
</xsl:variable>
|
|
10295
9942
|
<xsl:variable name="asciimath_text_following">
|
|
10296
9943
|
<xsl:choose>
|
|
@@ -10363,14 +10010,12 @@
|
|
|
10363
10010
|
</xsl:template>
|
|
10364
10011
|
|
|
10365
10012
|
<xsl:template name="refine_mathml_insteam_object_style">
|
|
10366
|
-
|
|
10367
|
-
<xsl:
|
|
10368
|
-
|
|
10369
|
-
|
|
10370
|
-
|
|
10371
|
-
|
|
10372
|
-
</xsl:if>
|
|
10373
|
-
|
|
10013
|
+
<xsl:if test="local-name(../..) = 'formula'">
|
|
10014
|
+
<xsl:attribute name="width">95%</xsl:attribute>
|
|
10015
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
10016
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
10017
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
10018
|
+
</xsl:if>
|
|
10374
10019
|
</xsl:template> <!-- refine_mathml_insteam_object_style -->
|
|
10375
10020
|
|
|
10376
10021
|
<xsl:template match="mathml:*" mode="mathml_actual_text">
|
|
@@ -10768,7 +10413,6 @@
|
|
|
10768
10413
|
<xsl:variable name="annotation-id" select="@id"/>
|
|
10769
10414
|
<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
|
|
10770
10415
|
<fo:block id="{$annotation-id}" white-space="nowrap">
|
|
10771
|
-
|
|
10772
10416
|
<fo:inline>
|
|
10773
10417
|
<xsl:apply-templates>
|
|
10774
10418
|
<xsl:with-param name="callout" select="concat('<', $callout, '> ')"/>
|
|
@@ -10797,7 +10441,6 @@
|
|
|
10797
10441
|
<xsl:if test="string-length(normalize-space()) < 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
|
|
10798
10442
|
<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
|
|
10799
10443
|
</xsl:if>
|
|
10800
|
-
|
|
10801
10444
|
<xsl:if test="parent::*[local-name() = 'add']">
|
|
10802
10445
|
<xsl:call-template name="append_add-style"/>
|
|
10803
10446
|
</xsl:if>
|
|
@@ -10808,8 +10451,7 @@
|
|
|
10808
10451
|
</xsl:template>
|
|
10809
10452
|
|
|
10810
10453
|
<!-- command between two xref points to non-standard bibitem -->
|
|
10811
|
-
<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']]]"
|
|
10812
|
-
<xsl:value-of select="."/>
|
|
10454
|
+
<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="."/>
|
|
10813
10455
|
</xsl:template>
|
|
10814
10456
|
|
|
10815
10457
|
<!-- ====== -->
|
|
@@ -10824,7 +10466,6 @@
|
|
|
10824
10466
|
<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
|
|
10825
10467
|
</xsl:choose>
|
|
10826
10468
|
</xsl:attribute>
|
|
10827
|
-
|
|
10828
10469
|
</xsl:if>
|
|
10829
10470
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
10830
10471
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -10914,60 +10555,55 @@
|
|
|
10914
10555
|
|
|
10915
10556
|
<xsl:template match="*[local-name() = 'note']" name="note">
|
|
10916
10557
|
|
|
10917
|
-
|
|
10918
|
-
|
|
10919
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
|
10920
|
-
|
|
10921
|
-
<xsl:call-template name="setBlockSpanAll"/>
|
|
10922
|
-
|
|
10923
|
-
<xsl:call-template name="refine_note-style"/>
|
|
10558
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
10924
10559
|
|
|
10925
|
-
|
|
10560
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
|
|
10926
10561
|
|
|
10927
|
-
|
|
10562
|
+
<xsl:call-template name="setBlockSpanAll"/>
|
|
10928
10563
|
|
|
10929
|
-
|
|
10564
|
+
<xsl:call-template name="refine_note-style"/>
|
|
10930
10565
|
|
|
10931
|
-
|
|
10566
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10567
|
+
<fo:block>
|
|
10932
10568
|
|
|
10933
|
-
|
|
10569
|
+
<xsl:call-template name="refine_note_block_style"/>
|
|
10934
10570
|
|
|
10935
|
-
|
|
10571
|
+
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
10936
10572
|
|
|
10937
|
-
|
|
10938
|
-
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10939
|
-
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
|
10940
|
-
<xsl:call-template name="append_add-style"/>
|
|
10941
|
-
</xsl:if>
|
|
10573
|
+
<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
|
|
10942
10574
|
|
|
10943
|
-
|
|
10944
|
-
<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
|
10945
|
-
<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
|
10946
|
-
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10947
|
-
</xsl:apply-templates>
|
|
10948
|
-
</xsl:if>
|
|
10575
|
+
<xsl:call-template name="refine_note-name-style"/>
|
|
10949
10576
|
|
|
10950
|
-
|
|
10577
|
+
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
10578
|
+
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10579
|
+
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
|
10580
|
+
<xsl:call-template name="append_add-style"/>
|
|
10581
|
+
</xsl:if>
|
|
10951
10582
|
|
|
10952
|
-
|
|
10583
|
+
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
|
10584
|
+
<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
|
10585
|
+
<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
|
|
10586
|
+
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10587
|
+
</xsl:apply-templates>
|
|
10588
|
+
</xsl:if>
|
|
10953
10589
|
|
|
10954
|
-
|
|
10955
|
-
</fo:block>
|
|
10590
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
|
10956
10591
|
|
|
10957
|
-
|
|
10958
|
-
</fo:block-container>
|
|
10592
|
+
</fo:inline>
|
|
10959
10593
|
|
|
10594
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
10595
|
+
</fo:block>
|
|
10596
|
+
</fo:block-container>
|
|
10597
|
+
</fo:block-container>
|
|
10960
10598
|
</xsl:template>
|
|
10961
10599
|
|
|
10962
10600
|
<xsl:template name="refine_note_block_style">
|
|
10963
|
-
|
|
10964
|
-
<xsl:
|
|
10965
|
-
|
|
10966
|
-
|
|
10967
|
-
|
|
10968
|
-
|
|
10969
|
-
</xsl:if>
|
|
10970
|
-
|
|
10601
|
+
<xsl:if test="@parent-type = 'quote'">
|
|
10602
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
10603
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
10604
|
+
<xsl:attribute name="line-height">130%</xsl:attribute>
|
|
10605
|
+
<xsl:attribute name="text-align">justify</xsl:attribute>
|
|
10606
|
+
</xsl:if>
|
|
10971
10607
|
</xsl:template> <!-- refine_note_block_style -->
|
|
10972
10608
|
|
|
10973
10609
|
<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
|
|
@@ -11020,14 +10656,12 @@
|
|
|
11020
10656
|
<xsl:value-of select="$sfx"/>
|
|
11021
10657
|
</xsl:when>
|
|
11022
10658
|
<xsl:otherwise>
|
|
11023
|
-
|
|
11024
|
-
<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
|
|
10659
|
+
<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
|
|
11025
10660
|
<xsl:choose>
|
|
11026
10661
|
<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
|
|
11027
10662
|
<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
|
|
11028
10663
|
</xsl:choose> -->
|
|
11029
|
-
|
|
11030
|
-
|
|
10664
|
+
<xsl:text> </xsl:text>
|
|
11031
10665
|
<!-- https://github.com/metanorma/isodoc/issues/607 -->
|
|
11032
10666
|
<!-- <xsl:if test="$namespace = 'ieee'">
|
|
11033
10667
|
<xsl:text>—</xsl:text> em dash —
|
|
@@ -11035,7 +10669,6 @@
|
|
|
11035
10669
|
<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece' or $namespace = 'rsd'">
|
|
11036
10670
|
<xsl:text>:</xsl:text>
|
|
11037
10671
|
</xsl:if> -->
|
|
11038
|
-
|
|
11039
10672
|
<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp' or $namespace = 'nist-sp'">
|
|
11040
10673
|
<xsl:text> – </xsl:text> en dash –
|
|
11041
10674
|
</xsl:if> -->
|
|
@@ -11056,14 +10689,12 @@
|
|
|
11056
10689
|
<xsl:value-of select="$sfx"/>
|
|
11057
10690
|
</xsl:when>
|
|
11058
10691
|
<xsl:otherwise>
|
|
11059
|
-
|
|
11060
|
-
<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
|
|
10692
|
+
<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
|
|
11061
10693
|
<xsl:choose>
|
|
11062
10694
|
<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
|
|
11063
10695
|
<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
|
|
11064
10696
|
</xsl:choose> -->
|
|
11065
|
-
|
|
11066
|
-
|
|
10697
|
+
<xsl:text> </xsl:text>
|
|
11067
10698
|
<!-- https://github.com/metanorma/isodoc/issues/607 -->
|
|
11068
10699
|
<!-- <xsl:if test="$namespace = 'ieee'">
|
|
11069
10700
|
<xsl:text>—</xsl:text> em dash —
|
|
@@ -11119,7 +10750,6 @@
|
|
|
11119
10750
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
|
11120
10751
|
|
|
11121
10752
|
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
|
11122
|
-
|
|
11123
10753
|
</xsl:if>
|
|
11124
10754
|
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
11125
10755
|
</fo:block>
|
|
@@ -11159,8 +10789,7 @@
|
|
|
11159
10789
|
<!-- Example: Dimensions in millimeters -->
|
|
11160
10790
|
<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
|
|
11161
10791
|
|
|
11162
|
-
<xsl:variable name="show_figure_key_in_block_container">
|
|
11163
|
-
true
|
|
10792
|
+
<xsl:variable name="show_figure_key_in_block_container">true
|
|
11164
10793
|
</xsl:variable>
|
|
11165
10794
|
|
|
11166
10795
|
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
@@ -11175,11 +10804,9 @@
|
|
|
11175
10804
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11176
10805
|
<xsl:call-template name="showFigureKey"/>
|
|
11177
10806
|
</xsl:if>
|
|
11178
|
-
|
|
11179
|
-
<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
|
|
10807
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
|
|
11180
10808
|
|
|
11181
10809
|
</fo:block-container>
|
|
11182
|
-
|
|
11183
10810
|
</xsl:template>
|
|
11184
10811
|
|
|
11185
10812
|
<xsl:template name="showFigureKey">
|
|
@@ -11217,13 +10844,12 @@
|
|
|
11217
10844
|
<!-- SOURCE: ... -->
|
|
11218
10845
|
<!-- figure/source -->
|
|
11219
10846
|
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
|
|
11220
|
-
|
|
11221
|
-
<xsl:call-template name="termsource"/>
|
|
11222
|
-
|
|
10847
|
+
<xsl:call-template name="termsource"/>
|
|
11223
10848
|
</xsl:template>
|
|
11224
10849
|
|
|
11225
10850
|
<xsl:template match="*[local-name() = 'image']">
|
|
11226
10851
|
<xsl:param name="indent">0</xsl:param>
|
|
10852
|
+
<xsl:param name="logo_width"/>
|
|
11227
10853
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
11228
10854
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
11229
10855
|
<xsl:choose>
|
|
@@ -11245,9 +10871,18 @@
|
|
|
11245
10871
|
|
|
11246
10872
|
<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
|
|
11247
10873
|
|
|
11248
|
-
<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
|
|
11249
10874
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
11250
10875
|
|
|
10876
|
+
<xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
|
|
10877
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
10878
|
+
<xsl:if test="normalize-space($logo_width) != ''">
|
|
10879
|
+
<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
|
|
10880
|
+
</xsl:if>
|
|
10881
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
10882
|
+
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
10883
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
10884
|
+
</xsl:if>
|
|
10885
|
+
|
|
11251
10886
|
<xsl:variable name="width">
|
|
11252
10887
|
<xsl:call-template name="setImageWidth"/>
|
|
11253
10888
|
</xsl:variable>
|
|
@@ -11325,8 +10960,7 @@
|
|
|
11325
10960
|
</xsl:call-template>
|
|
11326
10961
|
</xsl:variable>
|
|
11327
10962
|
|
|
11328
|
-
<xsl:variable name="scaleRatio">
|
|
11329
|
-
1
|
|
10963
|
+
<xsl:variable name="scaleRatio">1
|
|
11330
10964
|
</xsl:variable>
|
|
11331
10965
|
|
|
11332
10966
|
<xsl:if test="number($scale) < 100">
|
|
@@ -11437,18 +11071,14 @@
|
|
|
11437
11071
|
</xsl:variable>
|
|
11438
11072
|
|
|
11439
11073
|
<xsl:variable name="image_width_effective">
|
|
11440
|
-
|
|
11441
|
-
<xsl:value-of select="$width_effective - number($indent_left)"/>
|
|
11442
|
-
|
|
11074
|
+
<xsl:value-of select="$width_effective - number($indent_left)"/>
|
|
11443
11075
|
</xsl:variable>
|
|
11444
11076
|
<xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
|
|
11445
11077
|
<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
|
|
11446
11078
|
<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
|
|
11447
11079
|
<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
|
|
11448
11080
|
<xsl:variable name="scale">
|
|
11449
|
-
|
|
11450
|
-
<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
11451
|
-
|
|
11081
|
+
<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
11452
11082
|
</xsl:variable>
|
|
11453
11083
|
<xsl:value-of select="$scale"/>
|
|
11454
11084
|
</xsl:template>
|
|
@@ -11469,7 +11099,8 @@
|
|
|
11469
11099
|
</xsl:when>
|
|
11470
11100
|
<xsl:when test="not(starts-with(@src, 'data:'))">
|
|
11471
11101
|
<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
|
|
11472
|
-
<xsl:
|
|
11102
|
+
<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>
|
|
11103
|
+
<xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
|
|
11473
11104
|
</xsl:when>
|
|
11474
11105
|
<xsl:otherwise>
|
|
11475
11106
|
<xsl:value-of select="@src"/>
|
|
@@ -11765,8 +11396,8 @@
|
|
|
11765
11396
|
</xsl:call-template>
|
|
11766
11397
|
</xsl:variable>
|
|
11767
11398
|
<xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
|
|
11768
|
-
<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
|
|
11769
|
-
<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
|
|
11399
|
+
<xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
|
|
11400
|
+
<xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
|
|
11770
11401
|
|
|
11771
11402
|
<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
|
|
11772
11403
|
<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
|
|
@@ -11838,8 +11469,8 @@
|
|
|
11838
11469
|
</xsl:variable>
|
|
11839
11470
|
<xsl:variable name="components" select="xalan:nodeset($components_)"/>
|
|
11840
11471
|
<xsl:variable name="att_name" select="local-name()"/>
|
|
11841
|
-
<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
|
|
11842
|
-
<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
|
|
11472
|
+
<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>
|
|
11473
|
+
<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
|
|
11843
11474
|
</xsl:template>
|
|
11844
11475
|
|
|
11845
11476
|
<!-- ============== -->
|
|
@@ -11912,13 +11543,13 @@
|
|
|
11912
11543
|
</xsl:call-template>
|
|
11913
11544
|
</xsl:variable>
|
|
11914
11545
|
<xsl:variable name="x_coords">
|
|
11915
|
-
<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
|
|
11546
|
+
<xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
|
|
11916
11547
|
<xsl:sort select="." data-type="number"/>
|
|
11917
11548
|
<x><xsl:value-of select="."/></x>
|
|
11918
11549
|
</xsl:for-each>
|
|
11919
11550
|
</xsl:variable>
|
|
11920
11551
|
<xsl:variable name="y_coords">
|
|
11921
|
-
<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
|
|
11552
|
+
<xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
|
|
11922
11553
|
<xsl:sort select="." data-type="number"/>
|
|
11923
11554
|
<y><xsl:value-of select="."/></y>
|
|
11924
11555
|
</xsl:for-each>
|
|
@@ -12123,11 +11754,11 @@
|
|
|
12123
11754
|
<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
|
|
12124
11755
|
</xsl:variable>
|
|
12125
11756
|
|
|
12126
|
-
<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
|
|
12127
|
-
<title>
|
|
11757
|
+
<mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
|
|
11758
|
+
<mn:title>
|
|
12128
11759
|
<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
|
|
12129
|
-
</title>
|
|
12130
|
-
</item>
|
|
11760
|
+
</mn:title>
|
|
11761
|
+
</mn:item>
|
|
12131
11762
|
</xsl:if>
|
|
12132
11763
|
</xsl:template>
|
|
12133
11764
|
|
|
@@ -12198,12 +11829,12 @@
|
|
|
12198
11829
|
<xsl:param name="contents"/>
|
|
12199
11830
|
<xsl:param name="contents_addon"/>
|
|
12200
11831
|
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
|
12201
|
-
<xsl:if test="$contents_nodes//item">
|
|
11832
|
+
<xsl:if test="$contents_nodes//mn:item">
|
|
12202
11833
|
<fo:bookmark-tree>
|
|
12203
11834
|
<xsl:choose>
|
|
12204
|
-
<xsl:when test="$contents_nodes/doc">
|
|
11835
|
+
<xsl:when test="$contents_nodes/mn:doc">
|
|
12205
11836
|
<xsl:choose>
|
|
12206
|
-
<xsl:when test="count($contents_nodes/doc) > 1">
|
|
11837
|
+
<xsl:when test="count($contents_nodes/mn:doc) > 1">
|
|
12207
11838
|
|
|
12208
11839
|
<xsl:if test="$contents_nodes/collection">
|
|
12209
11840
|
<fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
|
|
@@ -12211,8 +11842,8 @@
|
|
|
12211
11842
|
</fo:bookmark>
|
|
12212
11843
|
</xsl:if>
|
|
12213
11844
|
|
|
12214
|
-
<xsl:for-each select="$contents_nodes/doc">
|
|
12215
|
-
<fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
|
|
11845
|
+
<xsl:for-each select="$contents_nodes/mn:doc">
|
|
11846
|
+
<fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
|
|
12216
11847
|
<xsl:if test="@bundle = 'true'">
|
|
12217
11848
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
|
12218
11849
|
</xsl:if>
|
|
@@ -12246,14 +11877,14 @@
|
|
|
12246
11877
|
</xsl:choose>
|
|
12247
11878
|
</fo:bookmark-title>
|
|
12248
11879
|
|
|
12249
|
-
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
11880
|
+
<xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
|
|
12250
11881
|
|
|
12251
11882
|
<xsl:call-template name="insertFigureBookmarks">
|
|
12252
|
-
<xsl:with-param name="contents" select="contents"/>
|
|
11883
|
+
<xsl:with-param name="contents" select="mn:contents"/>
|
|
12253
11884
|
</xsl:call-template>
|
|
12254
11885
|
|
|
12255
11886
|
<xsl:call-template name="insertTableBookmarks">
|
|
12256
|
-
<xsl:with-param name="contents" select="contents"/>
|
|
11887
|
+
<xsl:with-param name="contents" select="mn:contents"/>
|
|
12257
11888
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12258
11889
|
</xsl:call-template>
|
|
12259
11890
|
|
|
@@ -12262,16 +11893,16 @@
|
|
|
12262
11893
|
</xsl:for-each>
|
|
12263
11894
|
</xsl:when>
|
|
12264
11895
|
<xsl:otherwise>
|
|
12265
|
-
<xsl:for-each select="$contents_nodes/doc">
|
|
11896
|
+
<xsl:for-each select="$contents_nodes/mn:doc">
|
|
12266
11897
|
|
|
12267
|
-
<xsl:apply-templates select="contents/item" mode="bookmark"/>
|
|
11898
|
+
<xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
|
|
12268
11899
|
|
|
12269
11900
|
<xsl:call-template name="insertFigureBookmarks">
|
|
12270
|
-
<xsl:with-param name="contents" select="contents"/>
|
|
11901
|
+
<xsl:with-param name="contents" select="mn:contents"/>
|
|
12271
11902
|
</xsl:call-template>
|
|
12272
11903
|
|
|
12273
11904
|
<xsl:call-template name="insertTableBookmarks">
|
|
12274
|
-
<xsl:with-param name="contents" select="contents"/>
|
|
11905
|
+
<xsl:with-param name="contents" select="mn:contents"/>
|
|
12275
11906
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12276
11907
|
</xsl:call-template>
|
|
12277
11908
|
|
|
@@ -12280,14 +11911,14 @@
|
|
|
12280
11911
|
</xsl:choose>
|
|
12281
11912
|
</xsl:when>
|
|
12282
11913
|
<xsl:otherwise>
|
|
12283
|
-
<xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
|
|
11914
|
+
<xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
|
|
12284
11915
|
|
|
12285
11916
|
<xsl:call-template name="insertFigureBookmarks">
|
|
12286
|
-
<xsl:with-param name="contents" select="$contents_nodes/contents"/>
|
|
11917
|
+
<xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
|
|
12287
11918
|
</xsl:call-template>
|
|
12288
11919
|
|
|
12289
11920
|
<xsl:call-template name="insertTableBookmarks">
|
|
12290
|
-
<xsl:with-param name="contents" select="$contents_nodes/contents"/>
|
|
11921
|
+
<xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
|
|
12291
11922
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12292
11923
|
</xsl:call-template>
|
|
12293
11924
|
|
|
@@ -12304,80 +11935,72 @@
|
|
|
12304
11935
|
<xsl:template name="insertFigureBookmarks">
|
|
12305
11936
|
<xsl:param name="contents"/>
|
|
12306
11937
|
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
|
12307
|
-
<xsl:if test="$contents_nodes/figure">
|
|
12308
|
-
<fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
|
|
11938
|
+
<xsl:if test="$contents_nodes/mn:figure">
|
|
11939
|
+
<fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
|
|
12309
11940
|
<fo:bookmark-title>Figures</fo:bookmark-title>
|
|
12310
|
-
<xsl:for-each select="$contents_nodes/figure">
|
|
11941
|
+
<xsl:for-each select="$contents_nodes/mn:figure">
|
|
12311
11942
|
<fo:bookmark internal-destination="{@id}">
|
|
12312
11943
|
<fo:bookmark-title>
|
|
12313
|
-
<xsl:value-of select="normalize-space(title)"/>
|
|
11944
|
+
<xsl:value-of select="normalize-space(mn:title)"/>
|
|
12314
11945
|
</fo:bookmark-title>
|
|
12315
11946
|
</fo:bookmark>
|
|
12316
11947
|
</xsl:for-each>
|
|
12317
11948
|
</fo:bookmark>
|
|
12318
11949
|
</xsl:if>
|
|
11950
|
+
<xsl:if test="$contents_nodes//mn:figures/mn:figure">
|
|
11951
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
|
|
12319
11952
|
|
|
12320
|
-
<xsl:
|
|
12321
|
-
|
|
12322
|
-
|
|
12323
|
-
|
|
12324
|
-
|
|
12325
|
-
|
|
12326
|
-
|
|
12327
|
-
</xsl:variable>
|
|
12328
|
-
<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
|
|
12329
|
-
<xsl:for-each select="$contents_nodes//figures/figure">
|
|
12330
|
-
<fo:bookmark internal-destination="{@id}">
|
|
12331
|
-
<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
|
|
12332
|
-
</fo:bookmark>
|
|
12333
|
-
</xsl:for-each>
|
|
11953
|
+
<xsl:variable name="bookmark-title">
|
|
11954
|
+
<xsl:value-of select="$title-list-figures"/>
|
|
11955
|
+
</xsl:variable>
|
|
11956
|
+
<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
|
|
11957
|
+
<xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
|
|
11958
|
+
<fo:bookmark internal-destination="{@id}">
|
|
11959
|
+
<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
|
|
12334
11960
|
</fo:bookmark>
|
|
12335
|
-
</xsl:
|
|
12336
|
-
|
|
11961
|
+
</xsl:for-each>
|
|
11962
|
+
</fo:bookmark>
|
|
11963
|
+
</xsl:if>
|
|
12337
11964
|
</xsl:template> <!-- insertFigureBookmarks -->
|
|
12338
11965
|
|
|
12339
11966
|
<xsl:template name="insertTableBookmarks">
|
|
12340
11967
|
<xsl:param name="contents"/>
|
|
12341
11968
|
<xsl:param name="lang"/>
|
|
12342
11969
|
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
|
12343
|
-
<xsl:if test="$contents_nodes/table">
|
|
12344
|
-
<fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
|
|
11970
|
+
<xsl:if test="$contents_nodes/mn:table">
|
|
11971
|
+
<fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
|
|
12345
11972
|
<fo:bookmark-title>
|
|
12346
11973
|
<xsl:choose>
|
|
12347
11974
|
<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
|
|
12348
11975
|
<xsl:otherwise>Tables</xsl:otherwise>
|
|
12349
11976
|
</xsl:choose>
|
|
12350
11977
|
</fo:bookmark-title>
|
|
12351
|
-
<xsl:for-each select="$contents_nodes/table">
|
|
11978
|
+
<xsl:for-each select="$contents_nodes/mn:table">
|
|
12352
11979
|
<fo:bookmark internal-destination="{@id}">
|
|
12353
11980
|
<fo:bookmark-title>
|
|
12354
|
-
<xsl:value-of select="normalize-space(title)"/>
|
|
11981
|
+
<xsl:value-of select="normalize-space(mn:title)"/>
|
|
12355
11982
|
</fo:bookmark-title>
|
|
12356
11983
|
</fo:bookmark>
|
|
12357
11984
|
</xsl:for-each>
|
|
12358
11985
|
</fo:bookmark>
|
|
12359
11986
|
</xsl:if>
|
|
11987
|
+
<xsl:if test="$contents_nodes//mn:tables/mn:table">
|
|
11988
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
|
|
12360
11989
|
|
|
12361
|
-
<xsl:
|
|
12362
|
-
|
|
12363
|
-
|
|
12364
|
-
<xsl:variable name="bookmark-title">
|
|
12365
|
-
|
|
12366
|
-
<xsl:value-of select="$title-list-tables"/>
|
|
12367
|
-
|
|
12368
|
-
</xsl:variable>
|
|
11990
|
+
<xsl:variable name="bookmark-title">
|
|
11991
|
+
<xsl:value-of select="$title-list-tables"/>
|
|
11992
|
+
</xsl:variable>
|
|
12369
11993
|
|
|
12370
|
-
|
|
11994
|
+
<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
|
|
12371
11995
|
|
|
12372
|
-
|
|
12373
|
-
|
|
12374
|
-
|
|
12375
|
-
|
|
12376
|
-
</fo:bookmark>
|
|
12377
|
-
</xsl:for-each>
|
|
11996
|
+
<xsl:for-each select="$contents_nodes//mn:tables/mn:table">
|
|
11997
|
+
<fo:bookmark internal-destination="{@id}">
|
|
11998
|
+
<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
|
|
11999
|
+
<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
|
|
12378
12000
|
</fo:bookmark>
|
|
12379
|
-
</xsl:
|
|
12380
|
-
|
|
12001
|
+
</xsl:for-each>
|
|
12002
|
+
</fo:bookmark>
|
|
12003
|
+
</xsl:if>
|
|
12381
12004
|
</xsl:template> <!-- insertTableBookmarks -->
|
|
12382
12005
|
<!-- End Bookmarks -->
|
|
12383
12006
|
|
|
@@ -12407,31 +12030,27 @@
|
|
|
12407
12030
|
<xsl:param name="title" select="''"/>
|
|
12408
12031
|
<xsl:choose>
|
|
12409
12032
|
<xsl:when test="$lang = 'en'">
|
|
12410
|
-
|
|
12411
|
-
<xsl:
|
|
12412
|
-
<xsl:
|
|
12413
|
-
|
|
12414
|
-
|
|
12415
|
-
|
|
12416
|
-
</xsl:choose>
|
|
12417
|
-
|
|
12033
|
+
<xsl:choose>
|
|
12034
|
+
<xsl:when test="$doctype = 'guide'">
|
|
12035
|
+
<xsl:value-of select="$title"/>
|
|
12036
|
+
</xsl:when>
|
|
12037
|
+
<xsl:otherwise>English version</xsl:otherwise>
|
|
12038
|
+
</xsl:choose>
|
|
12418
12039
|
</xsl:when>
|
|
12419
12040
|
<xsl:when test="$lang = 'fr'">
|
|
12420
|
-
|
|
12421
|
-
<xsl:
|
|
12422
|
-
<xsl:
|
|
12423
|
-
|
|
12424
|
-
|
|
12425
|
-
|
|
12426
|
-
</xsl:choose>
|
|
12427
|
-
|
|
12041
|
+
<xsl:choose>
|
|
12042
|
+
<xsl:when test="$doctype = 'guide'">
|
|
12043
|
+
<xsl:value-of select="$title"/>
|
|
12044
|
+
</xsl:when>
|
|
12045
|
+
<xsl:otherwise>Version française</xsl:otherwise>
|
|
12046
|
+
</xsl:choose>
|
|
12428
12047
|
</xsl:when>
|
|
12429
12048
|
<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
|
|
12430
12049
|
<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
|
|
12431
12050
|
</xsl:choose>
|
|
12432
12051
|
</xsl:template>
|
|
12433
12052
|
|
|
12434
|
-
<xsl:template match="item" mode="bookmark">
|
|
12053
|
+
<xsl:template match="mn:item" mode="bookmark">
|
|
12435
12054
|
<xsl:choose>
|
|
12436
12055
|
<xsl:when test="@id != ''">
|
|
12437
12056
|
<fo:bookmark internal-destination="{@id}" starting-state="hide">
|
|
@@ -12441,7 +12060,7 @@
|
|
|
12441
12060
|
<xsl:text> </xsl:text>
|
|
12442
12061
|
</xsl:if>
|
|
12443
12062
|
<xsl:variable name="title">
|
|
12444
|
-
<xsl:for-each select="title/node()">
|
|
12063
|
+
<xsl:for-each select="mn:title/node()">
|
|
12445
12064
|
<xsl:choose>
|
|
12446
12065
|
<xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
|
|
12447
12066
|
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
@@ -12459,7 +12078,7 @@
|
|
|
12459
12078
|
</xsl:choose>
|
|
12460
12079
|
</xsl:template>
|
|
12461
12080
|
|
|
12462
|
-
<xsl:template match="title" mode="bookmark"/>
|
|
12081
|
+
<xsl:template match="mn:title" mode="bookmark"/>
|
|
12463
12082
|
<xsl:template match="text()" mode="bookmark"/>
|
|
12464
12083
|
|
|
12465
12084
|
<!-- figure/name -->
|
|
@@ -12688,9 +12307,9 @@
|
|
|
12688
12307
|
<xsl:template match="text()" mode="contents_item">
|
|
12689
12308
|
<xsl:variable name="text">
|
|
12690
12309
|
<!-- to split by '_' and other chars -->
|
|
12691
|
-
<text><xsl:call-template name="add-zero-spaces-java"/></text>
|
|
12310
|
+
<mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
|
|
12692
12311
|
</xsl:variable>
|
|
12693
|
-
<xsl:for-each select="xalan:nodeset($text)/text/text()">
|
|
12312
|
+
<xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
|
|
12694
12313
|
<xsl:call-template name="keep_together_standard_number"/>
|
|
12695
12314
|
</xsl:for-each>
|
|
12696
12315
|
</xsl:template>
|
|
@@ -12723,14 +12342,7 @@
|
|
|
12723
12342
|
|
|
12724
12343
|
<xsl:template name="get_sourcecode_attributes">
|
|
12725
12344
|
<xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
|
|
12726
|
-
<xsl:variable name="_font-size"
|
|
12727
|
-
|
|
12728
|
-
<!-- inherit -->
|
|
12729
|
-
|
|
12730
|
-
<!-- <xsl:if test="$namespace = 'ieee'">
|
|
12731
|
-
<xsl:if test="$current_template = 'standard'">8</xsl:if>
|
|
12732
|
-
</xsl:if> -->
|
|
12733
|
-
|
|
12345
|
+
<xsl:variable name="_font-size"><!-- inherit -->
|
|
12734
12346
|
</xsl:variable>
|
|
12735
12347
|
|
|
12736
12348
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
@@ -12786,7 +12398,6 @@
|
|
|
12786
12398
|
<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
|
|
12787
12399
|
</xsl:choose>
|
|
12788
12400
|
</xsl:attribute>
|
|
12789
|
-
|
|
12790
12401
|
</xsl:if>
|
|
12791
12402
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
12792
12403
|
|
|
@@ -12810,8 +12421,7 @@
|
|
|
12810
12421
|
</fo:block>
|
|
12811
12422
|
|
|
12812
12423
|
<xsl:apply-templates select="*[local-name() = 'dl']"/> <!-- Key table -->
|
|
12813
|
-
|
|
12814
|
-
<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
|
|
12424
|
+
<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
|
|
12815
12425
|
|
|
12816
12426
|
</fo:block-container>
|
|
12817
12427
|
</fo:block-container>
|
|
@@ -12988,25 +12598,6 @@
|
|
|
12988
12598
|
</xsl:choose>
|
|
12989
12599
|
</xsl:template>
|
|
12990
12600
|
|
|
12991
|
-
<!-- insert 'char' between each character in the string -->
|
|
12992
|
-
<xsl:template name="interspers">
|
|
12993
|
-
<xsl:param name="str"/>
|
|
12994
|
-
<xsl:param name="char" select="$zero_width_space"/>
|
|
12995
|
-
<xsl:if test="$str != ''">
|
|
12996
|
-
<xsl:value-of select="substring($str, 1, 1)"/>
|
|
12997
|
-
|
|
12998
|
-
<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
|
|
12999
|
-
<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
|
|
13000
|
-
<xsl:value-of select="$char"/>
|
|
13001
|
-
</xsl:if>
|
|
13002
|
-
|
|
13003
|
-
<xsl:call-template name="interspers">
|
|
13004
|
-
<xsl:with-param name="str" select="substring($str, 2)"/>
|
|
13005
|
-
<xsl:with-param name="char" select="$char"/>
|
|
13006
|
-
</xsl:call-template>
|
|
13007
|
-
</xsl:if>
|
|
13008
|
-
</xsl:template>
|
|
13009
|
-
|
|
13010
12601
|
<xsl:template name="interspers-java">
|
|
13011
12602
|
<xsl:param name="str"/>
|
|
13012
12603
|
<xsl:param name="char" select="$zero_width_space"/>
|
|
@@ -13103,7 +12694,7 @@
|
|
|
13103
12694
|
</xsl:variable>
|
|
13104
12695
|
<xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
|
|
13105
12696
|
|
|
13106
|
-
<xsl:for-each select="$classes
|
|
12697
|
+
<xsl:for-each select="$classes/*[local-name() = 'item']">
|
|
13107
12698
|
<xsl:variable name="class_name" select="."/>
|
|
13108
12699
|
<xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
|
|
13109
12700
|
<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
|
|
@@ -13186,12 +12777,9 @@
|
|
|
13186
12777
|
|
|
13187
12778
|
<xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
|
|
13188
12779
|
<xsl:if test="normalize-space() != ''">
|
|
13189
|
-
|
|
13190
|
-
|
|
13191
|
-
|
|
13192
|
-
|
|
13193
|
-
</fo:block>
|
|
13194
|
-
|
|
12780
|
+
<fo:block xsl:use-attribute-sets="permission-name-style">
|
|
12781
|
+
<xsl:apply-templates/>
|
|
12782
|
+
</fo:block>
|
|
13195
12783
|
</xsl:if>
|
|
13196
12784
|
</xsl:template>
|
|
13197
12785
|
|
|
@@ -13220,12 +12808,9 @@
|
|
|
13220
12808
|
<xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
|
|
13221
12809
|
<xsl:if test="normalize-space() != ''">
|
|
13222
12810
|
|
|
13223
|
-
|
|
13224
|
-
|
|
13225
|
-
|
|
13226
|
-
|
|
13227
|
-
</fo:block>
|
|
13228
|
-
|
|
12811
|
+
<fo:block xsl:use-attribute-sets="requirement-name-style">
|
|
12812
|
+
<xsl:apply-templates/>
|
|
12813
|
+
</fo:block>
|
|
13229
12814
|
</xsl:if>
|
|
13230
12815
|
</xsl:template>
|
|
13231
12816
|
|
|
@@ -13264,11 +12849,9 @@
|
|
|
13264
12849
|
<xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
|
|
13265
12850
|
<xsl:if test="normalize-space() != ''">
|
|
13266
12851
|
|
|
13267
|
-
|
|
13268
|
-
|
|
13269
|
-
|
|
13270
|
-
</fo:block>
|
|
13271
|
-
|
|
12852
|
+
<fo:block xsl:use-attribute-sets="recommendation-name-style">
|
|
12853
|
+
<xsl:apply-templates/>
|
|
12854
|
+
</fo:block>
|
|
13272
12855
|
</xsl:if>
|
|
13273
12856
|
</xsl:template>
|
|
13274
12857
|
|
|
@@ -13394,7 +12977,6 @@
|
|
|
13394
12977
|
|
|
13395
12978
|
<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 ')">
|
|
13396
12979
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
13397
|
-
|
|
13398
12980
|
</xsl:if>
|
|
13399
12981
|
|
|
13400
12982
|
<xsl:apply-templates mode="requirement"/>
|
|
@@ -13439,7 +13021,6 @@
|
|
|
13439
13021
|
|
|
13440
13022
|
<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
|
13441
13023
|
<fo:block font-size="11pt">
|
|
13442
|
-
|
|
13443
13024
|
<xsl:apply-templates/>
|
|
13444
13025
|
</fo:block>
|
|
13445
13026
|
</xsl:template>
|
|
@@ -13479,7 +13060,6 @@
|
|
|
13479
13060
|
<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
|
13480
13061
|
<xsl:variable name="element">inline
|
|
13481
13062
|
|
|
13482
|
-
|
|
13483
13063
|
</xsl:variable>
|
|
13484
13064
|
<xsl:choose>
|
|
13485
13065
|
<xsl:when test="contains($element, 'block')">
|
|
@@ -13511,110 +13091,105 @@
|
|
|
13511
13091
|
text line 2
|
|
13512
13092
|
-->
|
|
13513
13093
|
<xsl:template match="*[local-name() = 'example']" name="example">
|
|
13094
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
13095
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
13514
13096
|
|
|
13515
|
-
|
|
13516
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
13097
|
+
<xsl:call-template name="setBlockSpanAll"/>
|
|
13517
13098
|
|
|
13518
|
-
|
|
13099
|
+
<xsl:call-template name="refine_example-style"/>
|
|
13519
13100
|
|
|
13520
|
-
|
|
13101
|
+
<xsl:variable name="fo_element">
|
|
13102
|
+
<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>block
|
|
13103
|
+
</xsl:variable>
|
|
13521
13104
|
|
|
13522
|
-
|
|
13523
|
-
<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
|
|
13524
|
-
block
|
|
13525
|
-
</xsl:variable>
|
|
13105
|
+
<fo:block-container margin-left="0mm" role="SKIP">
|
|
13526
13106
|
|
|
13527
|
-
|
|
13107
|
+
<xsl:choose>
|
|
13528
13108
|
|
|
13529
|
-
|
|
13109
|
+
<xsl:when test="contains(normalize-space($fo_element), 'block')">
|
|
13530
13110
|
|
|
13531
|
-
|
|
13111
|
+
<!-- display name 'EXAMPLE' in a separate block -->
|
|
13112
|
+
<fo:block>
|
|
13113
|
+
<xsl:apply-templates select="*[local-name()='name']">
|
|
13114
|
+
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13115
|
+
</xsl:apply-templates>
|
|
13116
|
+
</fo:block>
|
|
13532
13117
|
|
|
13533
|
-
|
|
13534
|
-
|
|
13535
|
-
|
|
13118
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
13119
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
13120
|
+
<xsl:variable name="example_body">
|
|
13121
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
13536
13122
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13537
13123
|
</xsl:apply-templates>
|
|
13538
|
-
</fo:block>
|
|
13539
|
-
|
|
13540
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
13541
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
13542
|
-
<xsl:variable name="example_body">
|
|
13543
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
13544
|
-
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13545
|
-
</xsl:apply-templates>
|
|
13546
|
-
</xsl:variable>
|
|
13547
|
-
<xsl:choose>
|
|
13548
|
-
<xsl:when test="xalan:nodeset($example_body)/*">
|
|
13549
|
-
<xsl:copy-of select="$example_body"/>
|
|
13550
|
-
</xsl:when>
|
|
13551
|
-
<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
|
|
13552
|
-
</xsl:choose>
|
|
13553
|
-
</fo:block-container>
|
|
13554
|
-
</fo:block-container>
|
|
13555
|
-
</xsl:when> <!-- end block -->
|
|
13556
|
-
|
|
13557
|
-
<xsl:when test="contains(normalize-space($fo_element), 'list')">
|
|
13558
|
-
|
|
13559
|
-
<xsl:variable name="provisional_distance_between_starts_">
|
|
13560
|
-
7
|
|
13561
|
-
</xsl:variable>
|
|
13562
|
-
<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
|
|
13563
|
-
<xsl:variable name="indent_">
|
|
13564
|
-
0
|
|
13565
13124
|
</xsl:variable>
|
|
13566
|
-
<xsl:
|
|
13567
|
-
|
|
13568
|
-
|
|
13569
|
-
|
|
13570
|
-
|
|
13571
|
-
|
|
13572
|
-
|
|
13573
|
-
|
|
13574
|
-
|
|
13575
|
-
</fo:block>
|
|
13576
|
-
</fo:list-item-label>
|
|
13577
|
-
<fo:list-item-body start-indent="body-start()">
|
|
13578
|
-
<fo:block>
|
|
13579
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
13580
|
-
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13581
|
-
</xsl:apply-templates>
|
|
13582
|
-
</fo:block>
|
|
13583
|
-
</fo:list-item-body>
|
|
13584
|
-
</fo:list-item>
|
|
13585
|
-
</fo:list-block>
|
|
13586
|
-
</xsl:when> <!-- end list -->
|
|
13125
|
+
<xsl:choose>
|
|
13126
|
+
<xsl:when test="xalan:nodeset($example_body)/*">
|
|
13127
|
+
<xsl:copy-of select="$example_body"/>
|
|
13128
|
+
</xsl:when>
|
|
13129
|
+
<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
|
|
13130
|
+
</xsl:choose>
|
|
13131
|
+
</fo:block-container>
|
|
13132
|
+
</fo:block-container>
|
|
13133
|
+
</xsl:when> <!-- end block -->
|
|
13587
13134
|
|
|
13588
|
-
|
|
13135
|
+
<xsl:when test="contains(normalize-space($fo_element), 'list')">
|
|
13589
13136
|
|
|
13590
|
-
|
|
13591
|
-
|
|
13592
|
-
|
|
13593
|
-
|
|
13594
|
-
|
|
13595
|
-
|
|
13596
|
-
|
|
13137
|
+
<xsl:variable name="provisional_distance_between_starts_">7
|
|
13138
|
+
</xsl:variable>
|
|
13139
|
+
<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
|
|
13140
|
+
<xsl:variable name="indent_">0
|
|
13141
|
+
</xsl:variable>
|
|
13142
|
+
<xsl:variable name="indent" select="normalize-space($indent_)"/>
|
|
13143
|
+
|
|
13144
|
+
<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
|
|
13145
|
+
<fo:list-item>
|
|
13146
|
+
<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
|
|
13147
|
+
<fo:block>
|
|
13148
|
+
<xsl:apply-templates select="*[local-name()='name']">
|
|
13149
|
+
<xsl:with-param name="fo_element">block</xsl:with-param>
|
|
13150
|
+
</xsl:apply-templates>
|
|
13151
|
+
</fo:block>
|
|
13152
|
+
</fo:list-item-label>
|
|
13153
|
+
<fo:list-item-body start-indent="body-start()">
|
|
13154
|
+
<fo:block>
|
|
13155
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]">
|
|
13597
13156
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13598
13157
|
</xsl:apply-templates>
|
|
13599
|
-
</fo:
|
|
13600
|
-
</fo:
|
|
13158
|
+
</fo:block>
|
|
13159
|
+
</fo:list-item-body>
|
|
13160
|
+
</fo:list-item>
|
|
13161
|
+
</fo:list-block>
|
|
13162
|
+
</xsl:when> <!-- end list -->
|
|
13601
13163
|
|
|
13602
|
-
|
|
13603
|
-
<!-- display further elements in blocks -->
|
|
13604
|
-
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
13605
|
-
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
13606
|
-
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
|
13607
|
-
<xsl:with-param name="fo_element" select="'block'"/>
|
|
13608
|
-
</xsl:apply-templates>
|
|
13609
|
-
</fo:block-container>
|
|
13610
|
-
</fo:block-container>
|
|
13611
|
-
</xsl:if>
|
|
13612
|
-
</xsl:otherwise> <!-- end inline -->
|
|
13164
|
+
<xsl:otherwise> <!-- inline -->
|
|
13613
13165
|
|
|
13614
|
-
|
|
13615
|
-
|
|
13616
|
-
|
|
13166
|
+
<!-- display 'EXAMPLE' and first element in the same line -->
|
|
13167
|
+
<fo:block>
|
|
13168
|
+
<xsl:apply-templates select="*[local-name()='name']">
|
|
13169
|
+
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13170
|
+
</xsl:apply-templates>
|
|
13171
|
+
<fo:inline>
|
|
13172
|
+
<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
|
|
13173
|
+
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
13174
|
+
</xsl:apply-templates>
|
|
13175
|
+
</fo:inline>
|
|
13176
|
+
</fo:block>
|
|
13617
13177
|
|
|
13178
|
+
<xsl:if test="*[not(local-name() = 'name')][position() > 1]">
|
|
13179
|
+
<!-- display further elements in blocks -->
|
|
13180
|
+
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
13181
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
13182
|
+
<xsl:apply-templates select="*[not(local-name() = 'name')][position() > 1]">
|
|
13183
|
+
<xsl:with-param name="fo_element" select="'block'"/>
|
|
13184
|
+
</xsl:apply-templates>
|
|
13185
|
+
</fo:block-container>
|
|
13186
|
+
</fo:block-container>
|
|
13187
|
+
</xsl:if>
|
|
13188
|
+
</xsl:otherwise> <!-- end inline -->
|
|
13189
|
+
|
|
13190
|
+
</xsl:choose>
|
|
13191
|
+
</fo:block-container>
|
|
13192
|
+
</fo:block-container>
|
|
13618
13193
|
</xsl:template>
|
|
13619
13194
|
|
|
13620
13195
|
<!-- example/name -->
|
|
@@ -13629,7 +13204,6 @@
|
|
|
13629
13204
|
</xsl:when>
|
|
13630
13205
|
<xsl:when test="contains(normalize-space($fo_element), 'block')">
|
|
13631
13206
|
<fo:block xsl:use-attribute-sets="example-name-style">
|
|
13632
|
-
|
|
13633
13207
|
<xsl:apply-templates/>
|
|
13634
13208
|
</fo:block>
|
|
13635
13209
|
</xsl:when>
|
|
@@ -13646,7 +13220,6 @@
|
|
|
13646
13220
|
<!-- table/example/name, table/tfoot//example/name -->
|
|
13647
13221
|
<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
|
|
13648
13222
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
13649
|
-
|
|
13650
13223
|
<xsl:apply-templates/>
|
|
13651
13224
|
</fo:inline>
|
|
13652
13225
|
</xsl:template>
|
|
@@ -13656,7 +13229,6 @@
|
|
|
13656
13229
|
|
|
13657
13230
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
|
13658
13231
|
<xsl:variable name="element">
|
|
13659
|
-
|
|
13660
13232
|
<xsl:value-of select="$fo_element"/>
|
|
13661
13233
|
</xsl:variable>
|
|
13662
13234
|
<xsl:choose>
|
|
@@ -13774,7 +13346,7 @@
|
|
|
13774
13346
|
</xsl:call-template>
|
|
13775
13347
|
</xsl:variable>
|
|
13776
13348
|
|
|
13777
|
-
|
|
13349
|
+
<xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
|
|
13778
13350
|
<xsl:choose>
|
|
13779
13351
|
<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>
|
|
13780
13352
|
<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>
|
|
@@ -13811,7 +13383,6 @@
|
|
|
13811
13383
|
<xsl:attribute name="margin-left">5mm</xsl:attribute>
|
|
13812
13384
|
</xsl:if>
|
|
13813
13385
|
</xsl:if>
|
|
13814
|
-
|
|
13815
13386
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
13816
13387
|
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
|
13817
13388
|
|
|
@@ -13894,7 +13465,6 @@
|
|
|
13894
13465
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
13895
13466
|
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
13896
13467
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
13897
|
-
|
|
13898
13468
|
</xsl:if>
|
|
13899
13469
|
|
|
13900
13470
|
<xsl:call-template name="refine_eref-style"/>
|
|
@@ -13943,16 +13513,14 @@
|
|
|
13943
13513
|
</xsl:template>
|
|
13944
13514
|
|
|
13945
13515
|
<xsl:template name="refine_basic_link_style">
|
|
13946
|
-
|
|
13947
|
-
|
|
13948
|
-
<xsl:
|
|
13949
|
-
|
|
13950
|
-
|
|
13951
|
-
<xsl:
|
|
13952
|
-
|
|
13953
|
-
|
|
13954
|
-
</xsl:if>
|
|
13955
|
-
|
|
13516
|
+
<xsl:attribute name="color">blue</xsl:attribute>
|
|
13517
|
+
<xsl:if test="not(parent::*[local-name() = 'title'])">
|
|
13518
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
13519
|
+
</xsl:if>
|
|
13520
|
+
<xsl:if test="parent::*[local-name() = 'title']">
|
|
13521
|
+
<xsl:attribute name="color">inherit</xsl:attribute>
|
|
13522
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
13523
|
+
</xsl:if>
|
|
13956
13524
|
</xsl:template> <!-- refine_basic_link_style -->
|
|
13957
13525
|
|
|
13958
13526
|
<!-- ====== -->
|
|
@@ -13969,12 +13537,10 @@
|
|
|
13969
13537
|
</xsl:variable>
|
|
13970
13538
|
|
|
13971
13539
|
<xsl:variable name="padding">
|
|
13972
|
-
|
|
13973
|
-
<xsl:
|
|
13974
|
-
|
|
13975
|
-
|
|
13976
|
-
</xsl:choose>
|
|
13977
|
-
|
|
13540
|
+
<xsl:choose>
|
|
13541
|
+
<xsl:when test="ancestor::bipm:annex">2</xsl:when>
|
|
13542
|
+
<xsl:otherwise>8</xsl:otherwise>
|
|
13543
|
+
</xsl:choose>
|
|
13978
13544
|
</xsl:variable>
|
|
13979
13545
|
|
|
13980
13546
|
<xsl:variable name="padding-right">
|
|
@@ -13985,7 +13551,6 @@
|
|
|
13985
13551
|
</xsl:otherwise>
|
|
13986
13552
|
</xsl:choose>
|
|
13987
13553
|
</xsl:variable>
|
|
13988
|
-
|
|
13989
13554
|
<xsl:choose>
|
|
13990
13555
|
<xsl:when test="$lang = 'zh'">
|
|
13991
13556
|
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
@@ -14009,7 +13574,6 @@
|
|
|
14009
13574
|
<xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
|
|
14010
13575
|
|
|
14011
13576
|
<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
|
|
14012
|
-
|
|
14013
13577
|
</xsl:template>
|
|
14014
13578
|
|
|
14015
13579
|
<xsl:template name="insertNonBreakSpaces">
|
|
@@ -14027,8 +13591,7 @@
|
|
|
14027
13591
|
<xsl:variable name="level">
|
|
14028
13592
|
<xsl:call-template name="getLevel"/>
|
|
14029
13593
|
</xsl:variable>
|
|
14030
|
-
<xsl:variable name="font-size">
|
|
14031
|
-
inherit
|
|
13594
|
+
<xsl:variable name="font-size">inherit
|
|
14032
13595
|
</xsl:variable>
|
|
14033
13596
|
<xsl:variable name="levelTerm">
|
|
14034
13597
|
<xsl:call-template name="getLevelTermName"/>
|
|
@@ -14080,11 +13643,9 @@
|
|
|
14080
13643
|
</xsl:template>
|
|
14081
13644
|
|
|
14082
13645
|
<xsl:template name="setStyle_preferred">
|
|
14083
|
-
|
|
14084
|
-
|
|
14085
|
-
|
|
14086
|
-
</xsl:if>
|
|
14087
|
-
|
|
13646
|
+
<xsl:if test="*[local-name() = 'strong']">
|
|
13647
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
13648
|
+
</xsl:if>
|
|
14088
13649
|
</xsl:template>
|
|
14089
13650
|
|
|
14090
13651
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
|
@@ -14161,7 +13722,6 @@
|
|
|
14161
13722
|
|
|
14162
13723
|
<!-- main sections -->
|
|
14163
13724
|
<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
|
|
14164
|
-
|
|
14165
13725
|
<xsl:call-template name="setNamedDestination"/>
|
|
14166
13726
|
<fo:block>
|
|
14167
13727
|
<xsl:call-template name="setId"/>
|
|
@@ -14196,13 +13756,10 @@
|
|
|
14196
13756
|
</xsl:template>
|
|
14197
13757
|
|
|
14198
13758
|
<xsl:template name="sections_element_style">
|
|
14199
|
-
|
|
14200
13759
|
</xsl:template> <!-- sections_element_style -->
|
|
14201
13760
|
|
|
14202
13761
|
<xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
|
|
14203
|
-
|
|
14204
|
-
<fo:block break-after="page"/>
|
|
14205
|
-
|
|
13762
|
+
<fo:block break-after="page"/>
|
|
14206
13763
|
<xsl:call-template name="setNamedDestination"/>
|
|
14207
13764
|
<fo:block>
|
|
14208
13765
|
<xsl:call-template name="setId"/>
|
|
@@ -14251,9 +13808,7 @@
|
|
|
14251
13808
|
</xsl:template>
|
|
14252
13809
|
|
|
14253
13810
|
<xsl:template name="refine_clause_style">
|
|
14254
|
-
|
|
14255
|
-
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
14256
|
-
|
|
13811
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
14257
13812
|
</xsl:template> <!-- refine_clause_style -->
|
|
14258
13813
|
|
|
14259
13814
|
<xsl:template match="*[local-name() = 'definitions']">
|
|
@@ -14293,7 +13848,6 @@
|
|
|
14293
13848
|
</xsl:template>
|
|
14294
13849
|
|
|
14295
13850
|
<xsl:template name="refine_annex_style">
|
|
14296
|
-
|
|
14297
13851
|
</xsl:template>
|
|
14298
13852
|
|
|
14299
13853
|
<!-- document text (not figures, or tables) footnotes -->
|
|
@@ -14397,17 +13951,15 @@
|
|
|
14397
13951
|
<!-- Lists processing -->
|
|
14398
13952
|
<!-- ===================================== -->
|
|
14399
13953
|
<xsl:variable name="ul_labels_">
|
|
14400
|
-
|
|
14401
|
-
|
|
14402
|
-
|
|
14403
|
-
<label level="3" font-size="75%">o</label> <!-- white circle -->
|
|
13954
|
+
<label level="1" font-size="15pt">•</label>
|
|
13955
|
+
<label level="2">−</label><!-- − - minus sign. — - en dash -->
|
|
13956
|
+
<label level="3" font-size="75%">o</label> <!-- white circle -->
|
|
14404
13957
|
|
|
14405
13958
|
</xsl:variable>
|
|
14406
13959
|
<xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
|
|
14407
13960
|
|
|
14408
13961
|
<xsl:template name="setULLabel">
|
|
14409
|
-
<xsl:variable name="list_level__"
|
|
14410
|
-
<xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
|
|
13962
|
+
<xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
|
|
14411
13963
|
</xsl:variable>
|
|
14412
13964
|
<xsl:variable name="list_level_" select="number($list_level__)"/>
|
|
14413
13965
|
<xsl:variable name="list_level">
|
|
@@ -14464,28 +14016,22 @@
|
|
|
14464
14016
|
<xsl:variable name="label">
|
|
14465
14017
|
|
|
14466
14018
|
<xsl:variable name="style_prefix_">
|
|
14467
|
-
<xsl:if test="$type = 'roman'">
|
|
14468
|
-
( <!-- Example: (i) -->
|
|
14019
|
+
<xsl:if test="$type = 'roman'">( <!-- Example: (i) -->
|
|
14469
14020
|
</xsl:if>
|
|
14470
14021
|
<xsl:if test="$type = 'alphabet'">
|
|
14471
|
-
|
|
14472
14022
|
</xsl:if>
|
|
14473
14023
|
</xsl:variable>
|
|
14474
14024
|
<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
|
|
14475
14025
|
|
|
14476
14026
|
<xsl:variable name="style_suffix_">
|
|
14477
14027
|
<xsl:choose>
|
|
14478
|
-
<xsl:when test="$type = 'arabic'"
|
|
14479
|
-
.
|
|
14028
|
+
<xsl:when test="$type = 'arabic'">.
|
|
14480
14029
|
</xsl:when>
|
|
14481
|
-
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
14482
|
-
)
|
|
14030
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">)
|
|
14483
14031
|
</xsl:when>
|
|
14484
|
-
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'"
|
|
14485
|
-
.
|
|
14032
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
|
|
14486
14033
|
</xsl:when>
|
|
14487
|
-
<xsl:when test="$type = 'roman'">
|
|
14488
|
-
)
|
|
14034
|
+
<xsl:when test="$type = 'roman'">)
|
|
14489
14035
|
</xsl:when>
|
|
14490
14036
|
<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
|
|
14491
14037
|
</xsl:choose>
|
|
@@ -14502,8 +14048,7 @@
|
|
|
14502
14048
|
<xsl:value-of select="$style_suffix"/>
|
|
14503
14049
|
</xsl:if>
|
|
14504
14050
|
</xsl:variable>
|
|
14505
|
-
|
|
14506
|
-
<xsl:value-of select="normalize-space($label)"/>
|
|
14051
|
+
<xsl:value-of select="normalize-space($label)"/>
|
|
14507
14052
|
|
|
14508
14053
|
</xsl:when>
|
|
14509
14054
|
<xsl:otherwise> <!-- for ordered lists 'ol' -->
|
|
@@ -14560,17 +14105,13 @@
|
|
|
14560
14105
|
|
|
14561
14106
|
<xsl:variable name="format">
|
|
14562
14107
|
<xsl:choose>
|
|
14563
|
-
<xsl:when test="$type = 'arabic'">
|
|
14564
|
-
1.
|
|
14108
|
+
<xsl:when test="$type = 'arabic'">1.
|
|
14565
14109
|
</xsl:when>
|
|
14566
|
-
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
|
|
14567
|
-
a)
|
|
14110
|
+
<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a)
|
|
14568
14111
|
</xsl:when>
|
|
14569
|
-
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
|
|
14570
|
-
A.
|
|
14112
|
+
<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
|
|
14571
14113
|
</xsl:when>
|
|
14572
|
-
<xsl:when test="$type = 'roman'">
|
|
14573
|
-
(i)
|
|
14114
|
+
<xsl:when test="$type = 'roman'">(i)
|
|
14574
14115
|
</xsl:when>
|
|
14575
14116
|
<xsl:when test="$type = 'roman_upper'">I.</xsl:when>
|
|
14576
14117
|
<xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
|
|
@@ -14607,21 +14148,17 @@
|
|
|
14607
14148
|
</fo:block-container>
|
|
14608
14149
|
</xsl:when>
|
|
14609
14150
|
<xsl:otherwise>
|
|
14610
|
-
|
|
14611
|
-
|
|
14612
|
-
|
|
14613
|
-
|
|
14614
|
-
|
|
14615
|
-
</fo:block>
|
|
14616
|
-
|
|
14151
|
+
<fo:block role="SKIP">
|
|
14152
|
+
<xsl:apply-templates select="." mode="list">
|
|
14153
|
+
<xsl:with-param name="indent" select="$indent"/>
|
|
14154
|
+
</xsl:apply-templates>
|
|
14155
|
+
</fo:block>
|
|
14617
14156
|
</xsl:otherwise>
|
|
14618
14157
|
</xsl:choose>
|
|
14619
14158
|
</xsl:template>
|
|
14620
14159
|
|
|
14621
14160
|
<xsl:template name="refine_list_container_style">
|
|
14622
|
-
|
|
14623
|
-
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
14624
|
-
|
|
14161
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
14625
14162
|
</xsl:template> <!-- refine_list_container_style -->
|
|
14626
14163
|
|
|
14627
14164
|
<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
|
|
@@ -14685,7 +14222,6 @@
|
|
|
14685
14222
|
</xsl:template>
|
|
14686
14223
|
|
|
14687
14224
|
<xsl:template name="refine_list-style_provisional-distance-between-starts">
|
|
14688
|
-
|
|
14689
14225
|
</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
|
|
14690
14226
|
|
|
14691
14227
|
<xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
|
|
@@ -14970,7 +14506,6 @@
|
|
|
14970
14506
|
<xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
|
|
14971
14507
|
<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
|
|
14972
14508
|
<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
|
|
14973
|
-
|
|
14974
14509
|
<xsl:apply-templates/>
|
|
14975
14510
|
</fo:block>
|
|
14976
14511
|
</xsl:template>
|
|
@@ -15022,7 +14557,6 @@
|
|
|
15022
14557
|
<fo:table-column column-width="15mm"/>
|
|
15023
14558
|
<fo:table-body>
|
|
15024
14559
|
<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
|
|
15025
|
-
|
|
15026
14560
|
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
|
|
15027
14561
|
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
|
|
15028
14562
|
<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
|
|
@@ -15058,7 +14592,6 @@
|
|
|
15058
14592
|
<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
|
|
15059
14593
|
<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
|
|
15060
14594
|
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
|
|
15061
|
-
|
|
15062
14595
|
</xsl:template>
|
|
15063
14596
|
<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
|
|
15064
14597
|
<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
|
|
@@ -15069,16 +14602,13 @@
|
|
|
15069
14602
|
<xsl:call-template name="setNamedDestination"/>
|
|
15070
14603
|
<fo:block id="{@id}">
|
|
15071
14604
|
<xsl:apply-templates/>
|
|
15072
|
-
|
|
15073
14605
|
</fo:block>
|
|
15074
14606
|
</xsl:template>
|
|
15075
14607
|
|
|
15076
14608
|
<!-- Bibliography (non-normative references) -->
|
|
15077
14609
|
<xsl:template match="*[local-name() = 'references']">
|
|
15078
14610
|
<xsl:if test="not(ancestor::*[local-name() = 'annex'])">
|
|
15079
|
-
|
|
15080
|
-
<fo:block break-after="page"/>
|
|
15081
|
-
|
|
14611
|
+
<fo:block break-after="page"/>
|
|
15082
14612
|
</xsl:if>
|
|
15083
14613
|
|
|
15084
14614
|
<!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
|
|
@@ -15094,9 +14624,7 @@
|
|
|
15094
14624
|
|
|
15095
14625
|
<fo:block xsl:use-attribute-sets="references-non-normative-style">
|
|
15096
14626
|
<xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
|
|
15097
|
-
|
|
15098
14627
|
</fo:block>
|
|
15099
|
-
|
|
15100
14628
|
</xsl:template> <!-- references -->
|
|
15101
14629
|
|
|
15102
14630
|
<xsl:template match="*[local-name() = 'bibitem']">
|
|
@@ -15106,42 +14634,39 @@
|
|
|
15106
14634
|
<!-- Normative references -->
|
|
15107
14635
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
|
15108
14636
|
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
15109
|
-
|
|
15110
|
-
|
|
15111
|
-
|
|
15112
|
-
|
|
15113
|
-
<xsl:call-template name="processBibitem"/>
|
|
15114
|
-
</fo:block>
|
|
14637
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
14638
|
+
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
|
14639
|
+
<xsl:call-template name="processBibitem"/>
|
|
14640
|
+
</fo:block>
|
|
15115
14641
|
|
|
15116
14642
|
</xsl:template> <!-- bibitem -->
|
|
15117
14643
|
|
|
15118
14644
|
<!-- Bibliography (non-normative references) -->
|
|
15119
14645
|
<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
|
15120
14646
|
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
15121
|
-
|
|
15122
|
-
|
|
15123
|
-
|
|
15124
|
-
|
|
15125
|
-
|
|
15126
|
-
|
|
15127
|
-
|
|
15128
|
-
|
|
15129
|
-
|
|
15130
|
-
|
|
15131
|
-
|
|
15132
|
-
|
|
15133
|
-
|
|
15134
|
-
|
|
15135
|
-
|
|
15136
|
-
|
|
15137
|
-
|
|
15138
|
-
|
|
15139
|
-
|
|
15140
|
-
|
|
15141
|
-
|
|
15142
|
-
|
|
15143
|
-
|
|
15144
|
-
<!-- END BIPM bibitem processing -->
|
|
14647
|
+
<!-- start BIPM bibitem processing -->
|
|
14648
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
14649
|
+
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
|
14650
|
+
<fo:list-item>
|
|
14651
|
+
<fo:list-item-label end-indent="label-end()">
|
|
14652
|
+
<fo:block>
|
|
14653
|
+
<fo:inline>
|
|
14654
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
14655
|
+
<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
|
|
14656
|
+
</xsl:apply-templates>
|
|
14657
|
+
</fo:inline>
|
|
14658
|
+
</fo:block>
|
|
14659
|
+
</fo:list-item-label>
|
|
14660
|
+
<fo:list-item-body start-indent="body-start()">
|
|
14661
|
+
<fo:block>
|
|
14662
|
+
<xsl:call-template name="processBibitem">
|
|
14663
|
+
<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
|
|
14664
|
+
</xsl:call-template>
|
|
14665
|
+
</fo:block>
|
|
14666
|
+
</fo:list-item-body>
|
|
14667
|
+
</fo:list-item>
|
|
14668
|
+
</fo:list-block>
|
|
14669
|
+
<!-- END BIPM bibitem processing -->
|
|
15145
14670
|
|
|
15146
14671
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
15147
14672
|
|
|
@@ -15151,7 +14676,6 @@
|
|
|
15151
14676
|
<xsl:otherwise>
|
|
15152
14677
|
<xsl:call-template name="setNamedDestination"/>
|
|
15153
14678
|
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
|
15154
|
-
|
|
15155
14679
|
<fo:list-item-label end-indent="label-end()">
|
|
15156
14680
|
<fo:block role="SKIP">
|
|
15157
14681
|
<fo:inline role="SKIP">
|
|
@@ -15178,18 +14702,16 @@
|
|
|
15178
14702
|
|
|
15179
14703
|
<xsl:template name="processBibitem">
|
|
15180
14704
|
<xsl:param name="biblio_tag_part">both</xsl:param>
|
|
14705
|
+
<!-- start bibitem processing -->
|
|
14706
|
+
<xsl:if test=".//*[local-name() = 'fn']">
|
|
14707
|
+
<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
|
|
14708
|
+
</xsl:if>
|
|
15181
14709
|
|
|
15182
|
-
|
|
15183
|
-
|
|
15184
|
-
|
|
15185
|
-
|
|
15186
|
-
|
|
15187
|
-
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
15188
|
-
<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
|
|
15189
|
-
</xsl:apply-templates>
|
|
15190
|
-
<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
|
|
15191
|
-
<!-- end bibitem processing -->
|
|
15192
|
-
|
|
14710
|
+
<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
|
|
14711
|
+
<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
|
|
14712
|
+
</xsl:apply-templates>
|
|
14713
|
+
<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
|
|
14714
|
+
<!-- end bibitem processing -->
|
|
15193
14715
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
|
15194
14716
|
|
|
15195
14717
|
<xsl:template match="*[local-name() = 'title']" mode="title">
|
|
@@ -15332,8 +14854,7 @@
|
|
|
15332
14854
|
<xsl:choose>
|
|
15333
14855
|
<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
|
15334
14856
|
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
|
15335
|
-
<xsl:otherwise><!-- default value -->
|
|
15336
|
-
3
|
|
14857
|
+
<xsl:otherwise><!-- default value -->3
|
|
15337
14858
|
</xsl:otherwise>
|
|
15338
14859
|
</xsl:choose>
|
|
15339
14860
|
</xsl:variable>
|
|
@@ -15541,27 +15062,21 @@
|
|
|
15541
15062
|
<!-- ================ -->
|
|
15542
15063
|
<!-- Admonition -->
|
|
15543
15064
|
<!-- ================ -->
|
|
15544
|
-
<xsl:template match="*[local-name() = 'admonition']">
|
|
15545
|
-
|
|
15546
|
-
|
|
15547
|
-
<xsl:call-template name="setNamedDestination"/>
|
|
15548
|
-
<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
|
|
15549
|
-
|
|
15550
|
-
<xsl:call-template name="setBlockSpanAll"/>
|
|
15551
|
-
|
|
15552
|
-
<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
|
|
15553
|
-
|
|
15554
|
-
<fo:block xsl:use-attribute-sets="admonition-name-style">
|
|
15555
|
-
<xsl:call-template name="displayAdmonitionName"/>
|
|
15556
|
-
</fo:block>
|
|
15557
|
-
<fo:block xsl:use-attribute-sets="admonition-p-style">
|
|
15558
|
-
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
15559
|
-
</fo:block>
|
|
15560
|
-
|
|
15561
|
-
</fo:block-container>
|
|
15065
|
+
<xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
|
|
15066
|
+
<xsl:call-template name="setNamedDestination"/>
|
|
15067
|
+
<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
|
|
15562
15068
|
|
|
15563
|
-
|
|
15069
|
+
<xsl:call-template name="setBlockSpanAll"/>
|
|
15070
|
+
<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
|
|
15071
|
+
<fo:block xsl:use-attribute-sets="admonition-name-style">
|
|
15072
|
+
<xsl:call-template name="displayAdmonitionName"/>
|
|
15073
|
+
</fo:block>
|
|
15074
|
+
<fo:block xsl:use-attribute-sets="admonition-p-style">
|
|
15075
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
15076
|
+
</fo:block>
|
|
15564
15077
|
|
|
15078
|
+
</fo:block-container>
|
|
15079
|
+
</fo:block-container>
|
|
15565
15080
|
</xsl:template>
|
|
15566
15081
|
|
|
15567
15082
|
<xsl:template name="displayAdmonitionName">
|
|
@@ -15609,12 +15124,10 @@
|
|
|
15609
15124
|
</xsl:template> -->
|
|
15610
15125
|
|
|
15611
15126
|
<xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
|
|
15127
|
+
<fo:block xsl:use-attribute-sets="admonition-p-style">
|
|
15612
15128
|
|
|
15613
|
-
|
|
15614
|
-
|
|
15615
|
-
<xsl:apply-templates/>
|
|
15616
|
-
</fo:block>
|
|
15617
|
-
|
|
15129
|
+
<xsl:apply-templates/>
|
|
15130
|
+
</fo:block>
|
|
15618
15131
|
</xsl:template>
|
|
15619
15132
|
|
|
15620
15133
|
<!-- ================ -->
|
|
@@ -15650,11 +15163,9 @@
|
|
|
15650
15163
|
|
|
15651
15164
|
<!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
|
|
15652
15165
|
<xsl:variable name="updated_xml_step2">
|
|
15653
|
-
|
|
15654
|
-
|
|
15655
|
-
|
|
15656
|
-
</xsl:if>
|
|
15657
|
-
|
|
15166
|
+
<xsl:if test="$table_if = 'false'">
|
|
15167
|
+
<xsl:copy-of select="$updated_xml_step1"/>
|
|
15168
|
+
</xsl:if>
|
|
15658
15169
|
</xsl:variable>
|
|
15659
15170
|
|
|
15660
15171
|
<xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
|
|
@@ -16129,7 +15640,6 @@
|
|
|
16129
15640
|
</xsl:template>
|
|
16130
15641
|
|
|
16131
15642
|
<xsl:template name="addNamedDestinationAttribute">
|
|
16132
|
-
|
|
16133
15643
|
</xsl:template>
|
|
16134
15644
|
|
|
16135
15645
|
<xsl:template match="*[local-name() = 'fmt-name']"/>
|
|
@@ -16624,7 +16134,6 @@
|
|
|
16624
16134
|
<!-- enclose standard's number into tag 'keep-together_within-line' -->
|
|
16625
16135
|
<xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
|
|
16626
16136
|
<!-- if EXPRESS reference -->
|
|
16627
|
-
|
|
16628
16137
|
<!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
|
|
16629
16138
|
<regex><xsl:value-of select="$regex_solidus_units"/></regex>
|
|
16630
16139
|
<!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
|
|
@@ -16678,8 +16187,7 @@
|
|
|
16678
16187
|
|
|
16679
16188
|
<xsl:variable name="text2">
|
|
16680
16189
|
<xsl:element name="text" namespace="{$namespace_full}">
|
|
16681
|
-
<xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"
|
|
16682
|
-
<xsl:copy-of select="."/>
|
|
16190
|
+
<xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
|
|
16683
16191
|
</xsl:for-each>
|
|
16684
16192
|
</xsl:element>
|
|
16685
16193
|
</xsl:variable>
|
|
@@ -16971,9 +16479,7 @@
|
|
|
16971
16479
|
</xsl:attribute>
|
|
16972
16480
|
<xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
|
|
16973
16481
|
<xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
|
|
16974
|
-
|
|
16975
|
-
<xsl:value-of select="$skip_footnote_body_"/>
|
|
16976
|
-
|
|
16482
|
+
<xsl:value-of select="$skip_footnote_body_"/>
|
|
16977
16483
|
</xsl:attribute>
|
|
16978
16484
|
<xsl:attribute name="ref_id">
|
|
16979
16485
|
<xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
|
|
@@ -17062,7 +16568,6 @@
|
|
|
17062
16568
|
|
|
17063
16569
|
<xsl:template name="printEdition">
|
|
17064
16570
|
<xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
|
|
17065
|
-
|
|
17066
16571
|
<xsl:choose>
|
|
17067
16572
|
<xsl:when test="$edition_i18n != ''">
|
|
17068
16573
|
<!-- Example: <edition language="fr">deuxième édition</edition> -->
|
|
@@ -17291,16 +16796,32 @@
|
|
|
17291
16796
|
<dc:title>
|
|
17292
16797
|
<xsl:variable name="title">
|
|
17293
16798
|
<xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
|
|
17294
|
-
|
|
17295
|
-
|
|
17296
|
-
|
|
17297
|
-
|
|
17298
|
-
|
|
17299
|
-
<xsl:
|
|
17300
|
-
|
|
17301
|
-
|
|
17302
|
-
|
|
17303
|
-
|
|
16799
|
+
<xsl:choose>
|
|
16800
|
+
<xsl:when test="*[local-name() = 'title'][@language = $lang and @type = 'main']">
|
|
16801
|
+
<!-- <xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/> -->
|
|
16802
|
+
<xsl:variable name="bibdata_doctype" select="*[local-name() = 'ext']/*[local-name() = 'doctype']"/>
|
|
16803
|
+
<xsl:if test="$bibdata_doctype = 'amendment'">
|
|
16804
|
+
<xsl:variable name="bibdata_doctype_localized" select="*[local-name() = 'ext']/*[local-name() = 'doctype'][@language = $lang]"/>
|
|
16805
|
+
<xsl:variable name="bibdata_amendment_number" select="*[local-name() = 'ext']/*[local-name() = 'structuredidentifier']/*[local-name() = 'project-number']/@amendment"/>
|
|
16806
|
+
<xsl:value-of select="normalize-space(concat($bibdata_doctype_localized, ' ', $bibdata_amendment_number))"/>
|
|
16807
|
+
<xsl:text> — </xsl:text>
|
|
16808
|
+
</xsl:if>
|
|
16809
|
+
<xsl:variable name="partnumber" select="*[local-name() = 'ext']/*[local-name() = 'structuredidentifier']/*[local-name() = 'project-number']/@part"/>
|
|
16810
|
+
<xsl:for-each select="*[local-name() = 'title'][@language = $lang and @type = 'title-intro'] | *[local-name() = 'title'][@language = $lang and @type = 'title-main'] | *[local-name() = 'title'][@language = $lang and @type = 'title-complementary'] | *[local-name() = 'title'][@language = $lang and @type = 'title-part']">
|
|
16811
|
+
<xsl:if test="@type = 'title-part'">
|
|
16812
|
+
<xsl:call-template name="getLocalizedString"><xsl:with-param name="key">locality.part</xsl:with-param></xsl:call-template>
|
|
16813
|
+
<xsl:text> </xsl:text>
|
|
16814
|
+
<xsl:value-of select="$partnumber"/>
|
|
16815
|
+
<xsl:text>: </xsl:text>
|
|
16816
|
+
</xsl:if>
|
|
16817
|
+
<xsl:value-of select="."/>
|
|
16818
|
+
<xsl:if test="position() != last()"><xsl:text> — </xsl:text></xsl:if>
|
|
16819
|
+
</xsl:for-each>
|
|
16820
|
+
</xsl:when>
|
|
16821
|
+
<xsl:otherwise>
|
|
16822
|
+
<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'title-main']"/>
|
|
16823
|
+
</xsl:otherwise>
|
|
16824
|
+
</xsl:choose>
|
|
17304
16825
|
</xsl:for-each>
|
|
17305
16826
|
</xsl:variable>
|
|
17306
16827
|
<rdf:Alt>
|
|
@@ -17318,16 +16839,14 @@
|
|
|
17318
16839
|
</dc:title>
|
|
17319
16840
|
<xsl:variable name="dc_creator">
|
|
17320
16841
|
<xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
|
|
17321
|
-
|
|
17322
|
-
|
|
17323
|
-
|
|
17324
|
-
|
|
17325
|
-
|
|
17326
|
-
|
|
17327
|
-
|
|
17328
|
-
|
|
17329
|
-
</rdf:Seq>
|
|
17330
|
-
|
|
16842
|
+
<rdf:Seq>
|
|
16843
|
+
<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
|
|
16844
|
+
<rdf:li>
|
|
16845
|
+
<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
|
|
16846
|
+
</rdf:li>
|
|
16847
|
+
<!-- <xsl:if test="position() != last()">; </xsl:if> -->
|
|
16848
|
+
</xsl:for-each>
|
|
16849
|
+
</rdf:Seq>
|
|
17331
16850
|
</xsl:for-each>
|
|
17332
16851
|
</xsl:variable>
|
|
17333
16852
|
<xsl:if test="normalize-space($dc_creator) != ''">
|
|
@@ -17338,9 +16857,7 @@
|
|
|
17338
16857
|
|
|
17339
16858
|
<xsl:variable name="dc_description">
|
|
17340
16859
|
<xsl:variable name="abstract">
|
|
17341
|
-
|
|
17342
|
-
<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'])]"/>
|
|
17343
|
-
|
|
16860
|
+
<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'])]"/>
|
|
17344
16861
|
</xsl:variable>
|
|
17345
16862
|
<rdf:Alt>
|
|
17346
16863
|
<rdf:li xml:lang="x-default">
|
|
@@ -17405,7 +16922,9 @@
|
|
|
17405
16922
|
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
|
|
17406
16923
|
<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
|
|
17407
16924
|
<xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
|
|
17408
|
-
<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
|
|
16925
|
+
<!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
|
|
16926
|
+
<!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
|
|
16927
|
+
<xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
|
|
17409
16928
|
<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
|
|
17410
16929
|
<!-- Todo: need update -->
|
|
17411
16930
|
<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
|
|
@@ -17570,7 +17089,7 @@
|
|
|
17570
17089
|
<xsl:param name="normalize-space" select="'true'"/>
|
|
17571
17090
|
<xsl:param name="keep_sep" select="'false'"/>
|
|
17572
17091
|
<xsl:if test="string-length($pText) >0">
|
|
17573
|
-
<item>
|
|
17092
|
+
<xsl:element name="item" namespace="{$namespace_mn_xsl}">
|
|
17574
17093
|
<xsl:choose>
|
|
17575
17094
|
<xsl:when test="$normalize-space = 'true'">
|
|
17576
17095
|
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
|
|
@@ -17579,8 +17098,8 @@
|
|
|
17579
17098
|
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
|
|
17580
17099
|
</xsl:otherwise>
|
|
17581
17100
|
</xsl:choose>
|
|
17582
|
-
</
|
|
17583
|
-
<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></
|
|
17101
|
+
</xsl:element>
|
|
17102
|
+
<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>
|
|
17584
17103
|
<xsl:call-template name="split">
|
|
17585
17104
|
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
|
|
17586
17105
|
<xsl:with-param name="sep" select="$sep"/>
|
|
@@ -17598,30 +17117,6 @@
|
|
|
17598
17117
|
<xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
|
|
17599
17118
|
</xsl:template>
|
|
17600
17119
|
|
|
17601
|
-
<xsl:template name="namespaceCheck">
|
|
17602
|
-
<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
|
|
17603
|
-
<xsl:variable name="XSLNS">
|
|
17604
|
-
|
|
17605
|
-
<xsl:value-of select="document('')//*/namespace::bipm"/>
|
|
17606
|
-
|
|
17607
|
-
</xsl:variable>
|
|
17608
|
-
<!-- <xsl:if test="$documentNS != $XSLNS">
|
|
17609
|
-
<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
|
|
17610
|
-
</xsl:if> -->
|
|
17611
|
-
</xsl:template> <!-- namespaceCheck -->
|
|
17612
|
-
|
|
17613
|
-
<xsl:template name="getLanguage">
|
|
17614
|
-
<xsl:param name="lang"/>
|
|
17615
|
-
<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
|
|
17616
|
-
<xsl:choose>
|
|
17617
|
-
<xsl:when test="$language = 'en'">English</xsl:when>
|
|
17618
|
-
<xsl:when test="$language = 'fr'">French</xsl:when>
|
|
17619
|
-
<xsl:when test="$language = 'de'">Deutsch</xsl:when>
|
|
17620
|
-
<xsl:when test="$language = 'cn'">Chinese</xsl:when>
|
|
17621
|
-
<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
|
|
17622
|
-
</xsl:choose>
|
|
17623
|
-
</xsl:template>
|
|
17624
|
-
|
|
17625
17120
|
<xsl:template name="setId">
|
|
17626
17121
|
<xsl:param name="prefix"/>
|
|
17627
17122
|
<xsl:attribute name="id">
|