metanorma-ieee 1.4.9 → 1.5.1
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/ieee/base_convert.rb +1 -24
- data/lib/isodoc/ieee/html/ieee.css +12 -6
- data/lib/isodoc/ieee/html/ieee.scss +12 -6
- data/lib/isodoc/ieee/ieee.amendment.xsl +828 -625
- data/lib/isodoc/ieee/ieee.standard.xsl +828 -625
- data/lib/isodoc/ieee/presentation_concepts.rb +9 -8
- data/lib/isodoc/ieee/presentation_xml_convert.rb +0 -5
- data/lib/isodoc/ieee/word_cleanup_blocks.rb +92 -2
- data/lib/isodoc/ieee/word_convert.rb +6 -5
- data/lib/metanorma/ieee/basicdoc.rng +5 -5
- data/lib/metanorma/ieee/front.rb +1 -1
- data/lib/metanorma/ieee/isodoc.rng +57 -6
- data/lib/metanorma/ieee/version.rb +1 -1
- metadata +2 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<xsl:output method="xml" encoding="UTF-8" indent="no"/>
|
|
4
4
|
|
|
5
5
|
<!-- mandatory 'key' -->
|
|
6
|
-
<xsl:key name="kfn" match="mn:fn[not(ancestor::*[self::mn:table or self::mn:figure or self::mn:localized-strings] and not(ancestor::mn:name))]" use="@reference"/>
|
|
6
|
+
<xsl:key name="kfn" match="mn:fn[not(ancestor::*[self::mn:table or self::mn:figure or self::mn:localized-strings] and not(ancestor::mn:fmt-name))]" use="@reference"/>
|
|
7
7
|
|
|
8
8
|
<!-- mandatory variable -->
|
|
9
9
|
|
|
@@ -112,6 +112,173 @@
|
|
|
112
112
|
|
|
113
113
|
<xsl:variable name="line-height">1.8</xsl:variable>
|
|
114
114
|
|
|
115
|
+
<xsl:template name="layout-master-set">
|
|
116
|
+
<fo:layout-master-set>
|
|
117
|
+
|
|
118
|
+
<!-- IEEE template for:
|
|
119
|
+
- draft documents
|
|
120
|
+
- non standard documents (whitepaper, ICAP whitepaper, industry connection report)
|
|
121
|
+
- standard documents
|
|
122
|
+
-->
|
|
123
|
+
|
|
124
|
+
<!-- ======================== -->
|
|
125
|
+
<!-- IEEE pages -->
|
|
126
|
+
<!-- ======================== -->
|
|
127
|
+
<!-- IEEE cover page -->
|
|
128
|
+
|
|
129
|
+
<!-- IEEE standard cover page -->
|
|
130
|
+
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
131
|
+
<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
|
|
132
|
+
<fo:region-before region-name="header" extent="62mm" precedence="true"/>
|
|
133
|
+
<fo:region-after region-name="footer" extent="25mm"/>
|
|
134
|
+
<fo:region-start region-name="left-region" extent="21.2mm"/>
|
|
135
|
+
<fo:region-end region-name="right-region" extent="25mm"/>
|
|
136
|
+
</fo:simple-page-master>
|
|
137
|
+
<!-- IEEE standard back page -->
|
|
138
|
+
<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
139
|
+
<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
|
|
140
|
+
<fo:region-before region-name="header" extent="62mm" precedence="true"/>
|
|
141
|
+
<fo:region-after region-name="footer" extent="25mm"/>
|
|
142
|
+
<fo:region-start region-name="left-region" extent="21.2mm"/>
|
|
143
|
+
<fo:region-end region-name="right-region" extent="25mm"/>
|
|
144
|
+
</fo:simple-page-master>
|
|
145
|
+
|
|
146
|
+
<!-- IEEE industry connection report cover page -->
|
|
147
|
+
<fo:simple-page-master master-name="cover-and-back-page-industry-connection-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
148
|
+
<fo:region-body margin-top="116mm" margin-bottom="15mm" margin-left="62mm" margin-right="35mm"/>
|
|
149
|
+
<fo:region-before region-name="header" extent="116mm"/>
|
|
150
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
151
|
+
<fo:region-start region-name="left-region" extent="62mm" precedence="true"/>
|
|
152
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
153
|
+
</fo:simple-page-master>
|
|
154
|
+
|
|
155
|
+
<!-- ================== -->
|
|
156
|
+
<!-- IEEE whitepaper, ICAP whitepaper, connection-report -->
|
|
157
|
+
<!-- ================== -->
|
|
158
|
+
<fo:simple-page-master master-name="cover-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
159
|
+
<fo:region-body margin-top="115mm" margin-bottom="15mm" margin-left="64mm" margin-right="35mm"/>
|
|
160
|
+
<fo:region-before region-name="header" extent="115mm"/>
|
|
161
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
162
|
+
<fo:region-start region-name="left-region" extent="64mm" precedence="true"/>
|
|
163
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
164
|
+
</fo:simple-page-master>
|
|
165
|
+
|
|
166
|
+
<fo:simple-page-master master-name="document-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
167
|
+
<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="19mm" margin-right="19mm"/>
|
|
168
|
+
<fo:region-before region-name="header" extent="25.4mm"/>
|
|
169
|
+
<fo:region-after region-name="footer" extent="25.4mm"/>
|
|
170
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
171
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
172
|
+
</fo:simple-page-master>
|
|
173
|
+
|
|
174
|
+
<!-- landscape -->
|
|
175
|
+
<fo:simple-page-master master-name="document-nonstandard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
176
|
+
<fo:region-body margin-top="19mm" margin-bottom="19mm" margin-left="25.4mm" margin-right="25.4mm"/>
|
|
177
|
+
<fo:region-before region-name="header" extent="19mm" precedence="true"/>
|
|
178
|
+
<fo:region-after region-name="footer" extent="19mm" precedence="true"/>
|
|
179
|
+
<fo:region-start region-name="left-region-landscape" extent="25.4mm"/>
|
|
180
|
+
<fo:region-end region-name="right-region-landscape" extent="25.4mm"/>
|
|
181
|
+
</fo:simple-page-master>
|
|
182
|
+
|
|
183
|
+
<fo:simple-page-master master-name="back-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
184
|
+
<fo:region-body margin-top="73mm" margin-bottom="15mm" margin-left="63.5mm" margin-right="35mm"/>
|
|
185
|
+
<fo:region-before region-name="header" extent="73mm"/>
|
|
186
|
+
<fo:region-after region-name="footer" extent="15mm"/>
|
|
187
|
+
<fo:region-start region-name="left-region" extent="63.5mm" precedence="true"/>
|
|
188
|
+
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
189
|
+
</fo:simple-page-master>
|
|
190
|
+
<!-- ================== -->
|
|
191
|
+
<!-- End: IEEE whitepaper -->
|
|
192
|
+
<!-- ================== -->
|
|
193
|
+
|
|
194
|
+
<!-- ToC for non-standards (whitepaper, icap-whitepaper, industry-connection-report) -->
|
|
195
|
+
<fo:simple-page-master master-name="page-toc-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
196
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
197
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
198
|
+
<fo:region-after region-name="footer_empty" extent="{$marginBottom}mm"/> <!-- empty footer for 1st ToC page -->
|
|
199
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
200
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
201
|
+
</fo:simple-page-master>
|
|
202
|
+
<fo:simple-page-master master-name="page-toc-any" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
203
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
204
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
205
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
206
|
+
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
207
|
+
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
208
|
+
</fo:simple-page-master>
|
|
209
|
+
<fo:page-sequence-master master-name="page-toc">
|
|
210
|
+
<fo:repeatable-page-master-alternatives>
|
|
211
|
+
<fo:conditional-page-master-reference page-position="first" master-reference="page-toc-first"/>
|
|
212
|
+
<fo:conditional-page-master-reference page-position="any" master-reference="page-toc-any"/>
|
|
213
|
+
</fo:repeatable-page-master-alternatives>
|
|
214
|
+
</fo:page-sequence-master>
|
|
215
|
+
|
|
216
|
+
<!-- =================== -->
|
|
217
|
+
<!-- Drafts pages -->
|
|
218
|
+
<!-- =================== -->
|
|
219
|
+
<fo:simple-page-master master-name="document-draft" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
220
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
221
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
222
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
223
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
224
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
225
|
+
</fo:simple-page-master>
|
|
226
|
+
|
|
227
|
+
<!-- landscape -->
|
|
228
|
+
<fo:simple-page-master master-name="document-draft-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
229
|
+
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
230
|
+
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
231
|
+
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
232
|
+
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
233
|
+
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
234
|
+
</fo:simple-page-master>
|
|
235
|
+
<!-- =================== -->
|
|
236
|
+
<!-- =================== -->
|
|
237
|
+
|
|
238
|
+
<!-- ======================= -->
|
|
239
|
+
<!-- Standard document pages -->
|
|
240
|
+
<!-- ======================= -->
|
|
241
|
+
<fo:simple-page-master master-name="document-standard-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
242
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
243
|
+
<fo:region-before region-name="header_empty" extent="{$marginTop}mm"/>
|
|
244
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
245
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
246
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
247
|
+
</fo:simple-page-master>
|
|
248
|
+
<fo:page-sequence-master master-name="document-standard">
|
|
249
|
+
<fo:repeatable-page-master-alternatives>
|
|
250
|
+
<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first"/>
|
|
251
|
+
<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
|
|
252
|
+
</fo:repeatable-page-master-alternatives>
|
|
253
|
+
</fo:page-sequence-master>
|
|
254
|
+
|
|
255
|
+
<!-- landscape -->
|
|
256
|
+
<fo:simple-page-master master-name="document-standard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
257
|
+
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
258
|
+
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
259
|
+
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
260
|
+
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
261
|
+
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
262
|
+
</fo:simple-page-master>
|
|
263
|
+
<!-- ======================= -->
|
|
264
|
+
<!-- ======================= -->
|
|
265
|
+
|
|
266
|
+
<!-- Index pages -->
|
|
267
|
+
<fo:simple-page-master master-name="index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
268
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
|
|
269
|
+
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
270
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
271
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
272
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
273
|
+
</fo:simple-page-master>
|
|
274
|
+
|
|
275
|
+
<!-- ======================== -->
|
|
276
|
+
<!-- END IEEE pages -->
|
|
277
|
+
<!-- ======================== -->
|
|
278
|
+
|
|
279
|
+
</fo:layout-master-set>
|
|
280
|
+
</xsl:template> <!-- END: layout-master-set -->
|
|
281
|
+
|
|
115
282
|
<xsl:template match="/">
|
|
116
283
|
<fo:root xml:lang="{$lang}">
|
|
117
284
|
<xsl:variable name="root-style">
|
|
@@ -130,162 +297,7 @@
|
|
|
130
297
|
<xsl:processing-instruction name="add_line_numbers">true</xsl:processing-instruction>
|
|
131
298
|
</xsl:if>
|
|
132
299
|
|
|
133
|
-
<
|
|
134
|
-
|
|
135
|
-
<!-- IEEE template for:
|
|
136
|
-
- draft documents
|
|
137
|
-
- non standard documents (whitepaper, ICAP whitepaper, industry connection report)
|
|
138
|
-
- standard documents
|
|
139
|
-
-->
|
|
140
|
-
|
|
141
|
-
<!-- ======================== -->
|
|
142
|
-
<!-- IEEE pages -->
|
|
143
|
-
<!-- ======================== -->
|
|
144
|
-
<!-- IEEE cover page -->
|
|
145
|
-
|
|
146
|
-
<!-- IEEE standard cover page -->
|
|
147
|
-
<fo:simple-page-master master-name="cover-and-back-page-standard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
148
|
-
<fo:region-body margin-top="62mm" margin-bottom="25mm" margin-left="21.2mm" margin-right="25mm"/>
|
|
149
|
-
<fo:region-before region-name="header" extent="62mm" precedence="true"/>
|
|
150
|
-
<fo:region-after region-name="footer" extent="25mm"/>
|
|
151
|
-
<fo:region-start region-name="left-region" extent="21.2mm"/>
|
|
152
|
-
<fo:region-end region-name="right-region" extent="25mm"/>
|
|
153
|
-
</fo:simple-page-master>
|
|
154
|
-
|
|
155
|
-
<!-- IEEE industry connection report cover page -->
|
|
156
|
-
<fo:simple-page-master master-name="cover-and-back-page-industry-connection-report" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
157
|
-
<fo:region-body margin-top="116mm" margin-bottom="15mm" margin-left="62mm" margin-right="35mm"/>
|
|
158
|
-
<fo:region-before region-name="header" extent="116mm"/>
|
|
159
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
160
|
-
<fo:region-start region-name="left-region" extent="62mm" precedence="true"/>
|
|
161
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
162
|
-
</fo:simple-page-master>
|
|
163
|
-
|
|
164
|
-
<!-- ================== -->
|
|
165
|
-
<!-- IEEE whitepaper, ICAP whitepaper, connection-report -->
|
|
166
|
-
<!-- ================== -->
|
|
167
|
-
<fo:simple-page-master master-name="cover-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
168
|
-
<fo:region-body margin-top="115mm" margin-bottom="15mm" margin-left="64mm" margin-right="35mm"/>
|
|
169
|
-
<fo:region-before region-name="header" extent="115mm"/>
|
|
170
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
171
|
-
<fo:region-start region-name="left-region" extent="64mm" precedence="true"/>
|
|
172
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
173
|
-
</fo:simple-page-master>
|
|
174
|
-
|
|
175
|
-
<fo:simple-page-master master-name="document-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
176
|
-
<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="19mm" margin-right="19mm"/>
|
|
177
|
-
<fo:region-before region-name="header" extent="25.4mm"/>
|
|
178
|
-
<fo:region-after region-name="footer" extent="25.4mm"/>
|
|
179
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
180
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
181
|
-
</fo:simple-page-master>
|
|
182
|
-
|
|
183
|
-
<!-- landscape -->
|
|
184
|
-
<fo:simple-page-master master-name="document-nonstandard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
185
|
-
<fo:region-body margin-top="19mm" margin-bottom="19mm" margin-left="25.4mm" margin-right="25.4mm"/>
|
|
186
|
-
<fo:region-before region-name="header" extent="19mm" precedence="true"/>
|
|
187
|
-
<fo:region-after region-name="footer" extent="19mm" precedence="true"/>
|
|
188
|
-
<fo:region-start region-name="left-region-landscape" extent="25.4mm"/>
|
|
189
|
-
<fo:region-end region-name="right-region-landscape" extent="25.4mm"/>
|
|
190
|
-
</fo:simple-page-master>
|
|
191
|
-
|
|
192
|
-
<fo:simple-page-master master-name="back-page-nonstandard" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
193
|
-
<fo:region-body margin-top="73mm" margin-bottom="15mm" margin-left="63.5mm" margin-right="35mm"/>
|
|
194
|
-
<fo:region-before region-name="header" extent="73mm"/>
|
|
195
|
-
<fo:region-after region-name="footer" extent="15mm"/>
|
|
196
|
-
<fo:region-start region-name="left-region" extent="63.5mm" precedence="true"/>
|
|
197
|
-
<fo:region-end region-name="right-region" extent="35mm"/>
|
|
198
|
-
</fo:simple-page-master>
|
|
199
|
-
<!-- ================== -->
|
|
200
|
-
<!-- End: IEEE whitepaper -->
|
|
201
|
-
<!-- ================== -->
|
|
202
|
-
|
|
203
|
-
<!-- ToC for non-standards (whitepaper, icap-whitepaper, industry-connection-report) -->
|
|
204
|
-
<fo:simple-page-master master-name="page-toc-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
205
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
206
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
207
|
-
<fo:region-after region-name="footer_empty" extent="{$marginBottom}mm"/> <!-- empty footer for 1st ToC page -->
|
|
208
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
209
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
210
|
-
</fo:simple-page-master>
|
|
211
|
-
<fo:simple-page-master master-name="page-toc-any" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
212
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
|
|
213
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm" precedence="true"/>
|
|
214
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
215
|
-
<fo:region-start region-name="left-region" extent="19mm"/>
|
|
216
|
-
<fo:region-end region-name="right-region" extent="19mm"/>
|
|
217
|
-
</fo:simple-page-master>
|
|
218
|
-
<fo:page-sequence-master master-name="page-toc">
|
|
219
|
-
<fo:repeatable-page-master-alternatives>
|
|
220
|
-
<fo:conditional-page-master-reference page-position="first" master-reference="page-toc-first"/>
|
|
221
|
-
<fo:conditional-page-master-reference page-position="any" master-reference="page-toc-any"/>
|
|
222
|
-
</fo:repeatable-page-master-alternatives>
|
|
223
|
-
</fo:page-sequence-master>
|
|
224
|
-
|
|
225
|
-
<!-- =================== -->
|
|
226
|
-
<!-- Drafts pages -->
|
|
227
|
-
<!-- =================== -->
|
|
228
|
-
<fo:simple-page-master master-name="document-draft" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
229
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
230
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
231
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
232
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
233
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
234
|
-
</fo:simple-page-master>
|
|
235
|
-
|
|
236
|
-
<!-- landscape -->
|
|
237
|
-
<fo:simple-page-master master-name="document-draft-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
238
|
-
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
239
|
-
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
240
|
-
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
241
|
-
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
242
|
-
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
243
|
-
</fo:simple-page-master>
|
|
244
|
-
<!-- =================== -->
|
|
245
|
-
<!-- =================== -->
|
|
246
|
-
|
|
247
|
-
<!-- ======================= -->
|
|
248
|
-
<!-- Standard document pages -->
|
|
249
|
-
<!-- ======================= -->
|
|
250
|
-
<fo:simple-page-master master-name="document-standard-first" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
251
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
252
|
-
<fo:region-before region-name="header_empty" extent="{$marginTop}mm"/>
|
|
253
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
254
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
255
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
256
|
-
</fo:simple-page-master>
|
|
257
|
-
<fo:page-sequence-master master-name="document-standard">
|
|
258
|
-
<fo:repeatable-page-master-alternatives>
|
|
259
|
-
<fo:conditional-page-master-reference page-position="first" master-reference="document-standard-first"/>
|
|
260
|
-
<fo:conditional-page-master-reference page-position="any" master-reference="document-draft"/>
|
|
261
|
-
</fo:repeatable-page-master-alternatives>
|
|
262
|
-
</fo:page-sequence-master>
|
|
263
|
-
|
|
264
|
-
<!-- landscape -->
|
|
265
|
-
<fo:simple-page-master master-name="document-standard-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
266
|
-
<fo:region-body margin-top="{$marginLeftRight1}mm" margin-bottom="{$marginLeftRight2}mm" margin-left="{$marginBottom}mm" margin-right="{$marginTop}mm"/>
|
|
267
|
-
<fo:region-before region-name="header" extent="{$marginLeftRight1}mm" precedence="true"/>
|
|
268
|
-
<fo:region-after region-name="footer" extent="{$marginLeftRight2}mm" precedence="true"/>
|
|
269
|
-
<fo:region-start region-name="left-region-landscape" extent="{$marginBottom}mm"/>
|
|
270
|
-
<fo:region-end region-name="right-region-landscape" extent="{$marginTop}mm"/>
|
|
271
|
-
</fo:simple-page-master>
|
|
272
|
-
<!-- ======================= -->
|
|
273
|
-
<!-- ======================= -->
|
|
274
|
-
|
|
275
|
-
<!-- Index pages -->
|
|
276
|
-
<fo:simple-page-master master-name="page-index" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
277
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
|
|
278
|
-
<fo:region-before region-name="header" extent="{$marginTop}mm"/>
|
|
279
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
280
|
-
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
281
|
-
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
282
|
-
</fo:simple-page-master>
|
|
283
|
-
|
|
284
|
-
<!-- ======================== -->
|
|
285
|
-
<!-- END IEEE pages -->
|
|
286
|
-
<!-- ======================== -->
|
|
287
|
-
|
|
288
|
-
</fo:layout-master-set>
|
|
300
|
+
<xsl:call-template name="layout-master-set"/>
|
|
289
301
|
|
|
290
302
|
<fo:declarations>
|
|
291
303
|
<xsl:call-template name="addPDFUAmeta"/>
|
|
@@ -414,20 +426,6 @@
|
|
|
414
426
|
</xsl:call-template>
|
|
415
427
|
</xsl:variable>
|
|
416
428
|
|
|
417
|
-
<xsl:variable name="cutoff_date">
|
|
418
|
-
<xsl:call-template name="convertDate">
|
|
419
|
-
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'feedback-ended'])"/>
|
|
420
|
-
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
421
|
-
</xsl:call-template>
|
|
422
|
-
</xsl:variable>
|
|
423
|
-
|
|
424
|
-
<xsl:variable name="expiration_date">
|
|
425
|
-
<xsl:call-template name="convertDate">
|
|
426
|
-
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'obsoleted'])"/>
|
|
427
|
-
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
428
|
-
</xsl:call-template>
|
|
429
|
-
</xsl:variable>
|
|
430
|
-
|
|
431
429
|
<!-- Example: Revision of IEEE Std 802.1X™-2010
|
|
432
430
|
Incorporating IEEE Std 802.1Xbx™-2014
|
|
433
431
|
and IEEE Std 802.1Xck™-2018 -->
|
|
@@ -470,150 +468,23 @@
|
|
|
470
468
|
</fo:flow>
|
|
471
469
|
</fo:page-sequence> -->
|
|
472
470
|
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
<xsl:
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
491
|
-
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
492
|
-
<xsl:with-param name="hideFooter">true</xsl:with-param>
|
|
493
|
-
</xsl:call-template>
|
|
494
|
-
|
|
495
|
-
<fo:flow flow-name="xsl-region-body">
|
|
496
|
-
<fo:block-container margin-top="18mm" id="firstpage_id_{$num}">
|
|
497
|
-
<fo:block font-family="Arial">
|
|
498
|
-
<fo:block font-size="23pt" font-weight="bold" margin-top="50pt" margin-bottom="36pt">
|
|
499
|
-
<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
|
|
500
|
-
<xsl:attribute name="font-size">24pt</xsl:attribute>
|
|
501
|
-
</xsl:if>
|
|
502
|
-
<xsl:text>P</xsl:text>
|
|
503
|
-
<xsl:value-of select="$designation"/>
|
|
504
|
-
<xsl:text>™/D</xsl:text>
|
|
505
|
-
<xsl:value-of select="$draft_number"/>
|
|
506
|
-
<xsl:value-of select="$linebreak"/>
|
|
507
|
-
<xsl:copy-of select="$title_prefix"/>
|
|
508
|
-
<xsl:copy-of select="$title"/>
|
|
509
|
-
|
|
510
|
-
<!-- <xsl:copy-of select="$draft_title_part"/> -->
|
|
511
|
-
</fo:block>
|
|
512
|
-
<fo:block>Developed by the</fo:block>
|
|
513
|
-
<fo:block> </fo:block>
|
|
514
|
-
<fo:block font-size="11pt" font-weight="bold">
|
|
515
|
-
<!-- <Committee Name> -->
|
|
516
|
-
<xsl:value-of select="$committee"/>
|
|
517
|
-
</fo:block>
|
|
518
|
-
<fo:block>of the</fo:block>
|
|
519
|
-
<fo:block font-size="11pt" font-weight="bold">
|
|
520
|
-
<!-- IEEE <Society Name> -->
|
|
521
|
-
<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
|
|
522
|
-
</fo:block>
|
|
523
|
-
<fo:block> </fo:block>
|
|
524
|
-
<fo:block> </fo:block>
|
|
525
|
-
<fo:block>
|
|
526
|
-
<!-- Approved <Date Approved> -->
|
|
527
|
-
<xsl:text>Approved </xsl:text>
|
|
528
|
-
<xsl:value-of select="$approved_date"/>
|
|
529
|
-
</fo:block>
|
|
530
|
-
<fo:block> </fo:block>
|
|
531
|
-
<!-- Example: IEEE SA Standards Board -->
|
|
532
|
-
<fo:block font-size="11pt" font-weight="bold"><xsl:value-of select="$approved_by"/></fo:block>
|
|
533
|
-
|
|
534
|
-
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
535
|
-
<fo:block> </fo:block>
|
|
536
|
-
<fo:block>
|
|
537
|
-
<xsl:text>Cutoff date </xsl:text>
|
|
538
|
-
<xsl:value-of select="$cutoff_date"/>
|
|
539
|
-
</fo:block>
|
|
540
|
-
</xsl:if>
|
|
541
|
-
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
542
|
-
<fo:block> </fo:block>
|
|
543
|
-
<fo:block>
|
|
544
|
-
<xsl:text>Expiration date </xsl:text>
|
|
545
|
-
<xsl:value-of select="$expiration_date"/>
|
|
546
|
-
</fo:block>
|
|
547
|
-
</xsl:if>
|
|
548
|
-
</fo:block>
|
|
549
|
-
|
|
550
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
|
|
551
|
-
|
|
552
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:license-statement"/>
|
|
553
|
-
|
|
554
|
-
<fo:block break-after="page"/>
|
|
555
|
-
|
|
556
|
-
<!-- Second page -->
|
|
557
|
-
|
|
558
|
-
<fo:block font-family="Arial" text-align="justify">
|
|
559
|
-
<fo:block>
|
|
560
|
-
<fo:inline font-weight="bold">
|
|
561
|
-
<xsl:call-template name="getLocalizedString">
|
|
562
|
-
<xsl:with-param name="key">abstract</xsl:with-param>
|
|
563
|
-
</xsl:call-template>
|
|
564
|
-
<xsl:text>: </xsl:text>
|
|
565
|
-
</fo:inline>
|
|
566
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:title = 'Abstract']/node()[not(self::mn:title)]"/>
|
|
567
|
-
</fo:block>
|
|
568
|
-
<fo:block> </fo:block>
|
|
569
|
-
<fo:block>
|
|
570
|
-
<fo:inline font-weight="bold">Keywords: </fo:inline>
|
|
571
|
-
<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:keyword">
|
|
572
|
-
<xsl:value-of select="."/>
|
|
573
|
-
<xsl:if test="position() != last()">, </xsl:if>
|
|
574
|
-
</xsl:for-each>
|
|
575
|
-
</fo:block>
|
|
576
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements"/>
|
|
577
|
-
</fo:block>
|
|
578
|
-
|
|
579
|
-
<!-- Example:
|
|
580
|
-
The Institute of Electrical and Electronics Engineers, Inc.
|
|
581
|
-
3 Park Avenue, New York, NY 10016-5997, USA
|
|
582
|
-
...
|
|
583
|
-
PDF: ISBN 978-0-XXXX-XXXX-X STDXXXXX
|
|
584
|
-
Print: ISBN 978-0-XXXX-XXXX-X STDPDXXXXX
|
|
585
|
-
-->
|
|
586
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
|
|
587
|
-
|
|
588
|
-
</fo:block-container>
|
|
589
|
-
</fo:flow>
|
|
590
|
-
</fo:page-sequence> <!-- End: 'Draft' first page -->
|
|
591
|
-
</xsl:when>
|
|
592
|
-
|
|
593
|
-
<xsl:when test="$current_template = 'standard'">
|
|
594
|
-
<xsl:call-template name="insertCoverPage_Standard">
|
|
595
|
-
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
596
|
-
<xsl:with-param name="title_main" select="$title_main"/>
|
|
597
|
-
<xsl:with-param name="society" select="$society"/>
|
|
598
|
-
<xsl:with-param name="committee" select="$committee"/>
|
|
599
|
-
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
600
|
-
<xsl:with-param name="history" select="$history_text"/>
|
|
601
|
-
<xsl:with-param name="standard_title_prefix" select="$title_prefix"/>
|
|
602
|
-
<xsl:with-param name="cutoff_date" select="$cutoff_date"/>
|
|
603
|
-
<xsl:with-param name="expiration_date" select="$expiration_date"/>
|
|
604
|
-
</xsl:call-template>
|
|
605
|
-
</xsl:when>
|
|
606
|
-
|
|
607
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
608
|
-
<xsl:call-template name="insertCoverPage_NonStandard">
|
|
609
|
-
<xsl:with-param name="title" select="$title"/>
|
|
610
|
-
</xsl:call-template>
|
|
611
|
-
</xsl:when>
|
|
612
|
-
|
|
613
|
-
</xsl:choose>
|
|
614
|
-
<!-- ======================= -->
|
|
615
|
-
<!-- END Cover page -->
|
|
616
|
-
<!-- ======================= -->
|
|
471
|
+
<xsl:call-template name="cover-page">
|
|
472
|
+
<xsl:with-param name="num" select="$num"/>
|
|
473
|
+
<xsl:with-param name="document_id" select="$document_id"/>
|
|
474
|
+
<xsl:with-param name="title" select="$title"/>
|
|
475
|
+
<xsl:with-param name="society" select="$society"/>
|
|
476
|
+
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
477
|
+
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
478
|
+
<xsl:with-param name="designation" select="$designation"/>
|
|
479
|
+
<xsl:with-param name="draft_number" select="$draft_number"/>
|
|
480
|
+
<xsl:with-param name="committee" select="$committee"/>
|
|
481
|
+
<xsl:with-param name="approved_date" select="$approved_date"/>
|
|
482
|
+
<xsl:with-param name="approved_by" select="$approved_by"/>
|
|
483
|
+
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
484
|
+
<xsl:with-param name="title_main" select="$title_main"/>
|
|
485
|
+
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
486
|
+
<xsl:with-param name="history_text" select="$history_text"/>
|
|
487
|
+
</xsl:call-template>
|
|
617
488
|
|
|
618
489
|
<xsl:variable name="title_standard_coverpage_">
|
|
619
490
|
<xsl:choose>
|
|
@@ -726,7 +597,7 @@
|
|
|
726
597
|
</xsl:call-template>
|
|
727
598
|
<xsl:text>: </xsl:text>
|
|
728
599
|
</fo:inline>
|
|
729
|
-
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:title)] |
|
|
600
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:fmt-title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:fmt-title = 'Abstract']/node()[not(self::mn:fmt-title)]"/>
|
|
730
601
|
</fo:block>
|
|
731
602
|
<fo:block> </fo:block>
|
|
732
603
|
<fo:block>
|
|
@@ -791,7 +662,7 @@
|
|
|
791
662
|
<fo:block>
|
|
792
663
|
<!-- TRADEMARKS AND DISCLAIMERS -->
|
|
793
664
|
<!-- ACKNOWLEDGEMENTS -->
|
|
794
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[@id = 'boilerplate-tm' or mn:title = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or mn:title = 'Acknowledgements']" mode="whitepaper"/>
|
|
665
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[@id = 'boilerplate-tm' or normalize-space(mn:fmt-title) = 'Trademarks and Disclaimers' or @id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Acknowledgements']" mode="whitepaper"/>
|
|
795
666
|
</fo:block>
|
|
796
667
|
|
|
797
668
|
<!-- Example:
|
|
@@ -805,7 +676,7 @@
|
|
|
805
676
|
|
|
806
677
|
<!-- NOTICE AND DISCLAIMER OF LIABILITY CONCERNING THE USE OF IEEE SA DOCUMENTS -->
|
|
807
678
|
<fo:block break-after="page"/>
|
|
808
|
-
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[not(@id = 'boilerplate-tm') and not(mn:title = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(mn:title = 'Acknowledgements')]"/>
|
|
679
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement/*[not(@id = 'boilerplate-tm') and not(normalize-space(mn:fmt-title) = 'Trademarks and Disclaimers') and not(@id = 'boilerplate-participants') and not(normalize-space(mn:title) = 'Acknowledgements')]"/>
|
|
809
680
|
|
|
810
681
|
</fo:block-container>
|
|
811
682
|
</fo:flow>
|
|
@@ -1040,7 +911,7 @@
|
|
|
1040
911
|
<xsl:attribute name="initial-page-number">1</xsl:attribute>
|
|
1041
912
|
</xsl:if> -->
|
|
1042
913
|
<xsl:if test=".//mn:indexsect">
|
|
1043
|
-
<xsl:attribute name="master-reference">
|
|
914
|
+
<xsl:attribute name="master-reference">index</xsl:attribute>
|
|
1044
915
|
</xsl:if>
|
|
1045
916
|
|
|
1046
917
|
<xsl:call-template name="insertFootnoteSeparator"/>
|
|
@@ -1118,21 +989,8 @@
|
|
|
1118
989
|
<!-- End IEEE pages -->
|
|
1119
990
|
<!-- ===================== -->
|
|
1120
991
|
|
|
1121
|
-
|
|
1122
|
-
<!-- Back page -->
|
|
1123
|
-
<!-- ======================= -->
|
|
1124
|
-
<xsl:choose>
|
|
1125
|
-
<xsl:when test="$current_template = 'standard'">
|
|
1126
|
-
<xsl:call-template name="insertBackPage_Standard"/>
|
|
1127
|
-
</xsl:when>
|
|
992
|
+
<xsl:call-template name="back-page"/>
|
|
1128
993
|
|
|
1129
|
-
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1130
|
-
<xsl:call-template name="insertBackPage_NonStandard"/>
|
|
1131
|
-
</xsl:when>
|
|
1132
|
-
</xsl:choose>
|
|
1133
|
-
<!-- ======================= -->
|
|
1134
|
-
<!-- END Back page -->
|
|
1135
|
-
<!-- ======================= -->
|
|
1136
994
|
<xsl:if test="not(xalan:nodeset($paged_xml)/mn:page[*])">
|
|
1137
995
|
<fo:page-sequence master-reference="document-nonstandard" force-page-count="no-force">
|
|
1138
996
|
<fo:flow flow-name="xsl-region-body">
|
|
@@ -1155,12 +1013,191 @@
|
|
|
1155
1013
|
</fo:root>
|
|
1156
1014
|
</xsl:template>
|
|
1157
1015
|
|
|
1016
|
+
<xsl:template name="cover-page">
|
|
1017
|
+
<xsl:param name="num"/>
|
|
1018
|
+
<xsl:param name="document_id"/>
|
|
1019
|
+
<xsl:param name="title"/>
|
|
1020
|
+
<xsl:param name="society"/>
|
|
1021
|
+
<xsl:param name="copyright_holder"/>
|
|
1022
|
+
<xsl:param name="copyright_year"/>
|
|
1023
|
+
<xsl:param name="designation"/>
|
|
1024
|
+
<xsl:param name="draft_number"/>
|
|
1025
|
+
<xsl:param name="committee"/>
|
|
1026
|
+
<xsl:param name="approved_date"/>
|
|
1027
|
+
<xsl:param name="approved_by"/>
|
|
1028
|
+
<xsl:param name="title_intro"/>
|
|
1029
|
+
<xsl:param name="title_main"/>
|
|
1030
|
+
<xsl:param name="standard_number"/>
|
|
1031
|
+
<xsl:param name="history_text"/>
|
|
1032
|
+
|
|
1033
|
+
<!-- ======================= -->
|
|
1034
|
+
<!-- Cover page -->
|
|
1035
|
+
<!-- ======================= -->
|
|
1036
|
+
|
|
1037
|
+
<xsl:variable name="cutoff_date">
|
|
1038
|
+
<xsl:call-template name="convertDate">
|
|
1039
|
+
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'feedback-ended'])"/>
|
|
1040
|
+
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
1041
|
+
</xsl:call-template>
|
|
1042
|
+
</xsl:variable>
|
|
1043
|
+
|
|
1044
|
+
<xsl:variable name="expiration_date">
|
|
1045
|
+
<xsl:call-template name="convertDate">
|
|
1046
|
+
<xsl:with-param name="date" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'obsoleted'])"/>
|
|
1047
|
+
<xsl:with-param name="format" select="'ddMMyyyy'"/>
|
|
1048
|
+
</xsl:call-template>
|
|
1049
|
+
</xsl:variable>
|
|
1050
|
+
|
|
1051
|
+
<xsl:choose>
|
|
1052
|
+
|
|
1053
|
+
<xsl:when test="$current_template = 'draft'">
|
|
1054
|
+
|
|
1055
|
+
<!-- 'Draft' first page -->
|
|
1056
|
+
<fo:page-sequence master-reference="document-draft" force-page-count="no-force">
|
|
1057
|
+
|
|
1058
|
+
<xsl:call-template name="insertFootnoteSeparator"/>
|
|
1059
|
+
|
|
1060
|
+
<xsl:call-template name="insertHeaderFooter">
|
|
1061
|
+
<xsl:with-param name="document_id" select="$document_id"/>
|
|
1062
|
+
<xsl:with-param name="title_prefix" select="$title_prefix"/>
|
|
1063
|
+
<xsl:with-param name="title" select="$title"/>
|
|
1064
|
+
<xsl:with-param name="doctype" select="$doctype"/>
|
|
1065
|
+
|
|
1066
|
+
<xsl:with-param name="copyright_year" select="$copyright_year"/>
|
|
1067
|
+
<xsl:with-param name="copyright_holder" select="$copyright_holder"/>
|
|
1068
|
+
<xsl:with-param name="hideFooter">true</xsl:with-param>
|
|
1069
|
+
</xsl:call-template>
|
|
1070
|
+
|
|
1071
|
+
<fo:flow flow-name="xsl-region-body">
|
|
1072
|
+
<fo:block-container margin-top="18mm" id="firstpage_id_{$num}">
|
|
1073
|
+
<fo:block font-family="Arial">
|
|
1074
|
+
<fo:block font-size="23pt" font-weight="bold" margin-top="50pt" margin-bottom="36pt">
|
|
1075
|
+
<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
|
|
1076
|
+
<xsl:attribute name="font-size">24pt</xsl:attribute>
|
|
1077
|
+
</xsl:if>
|
|
1078
|
+
<xsl:text>P</xsl:text>
|
|
1079
|
+
<xsl:value-of select="$designation"/>
|
|
1080
|
+
<xsl:text>™/D</xsl:text>
|
|
1081
|
+
<xsl:value-of select="$draft_number"/>
|
|
1082
|
+
<xsl:value-of select="$linebreak"/>
|
|
1083
|
+
<xsl:copy-of select="$title_prefix"/>
|
|
1084
|
+
<xsl:copy-of select="$title"/>
|
|
1085
|
+
|
|
1086
|
+
<!-- <xsl:copy-of select="$draft_title_part"/> -->
|
|
1087
|
+
</fo:block>
|
|
1088
|
+
<fo:block>Developed by the</fo:block>
|
|
1089
|
+
<fo:block> </fo:block>
|
|
1090
|
+
<fo:block font-size="11pt" font-weight="bold">
|
|
1091
|
+
<!-- <Committee Name> -->
|
|
1092
|
+
<xsl:value-of select="$committee"/>
|
|
1093
|
+
</fo:block>
|
|
1094
|
+
<fo:block>of the</fo:block>
|
|
1095
|
+
<fo:block font-size="11pt" font-weight="bold">
|
|
1096
|
+
<!-- IEEE <Society Name> -->
|
|
1097
|
+
<xsl:text>IEEE </xsl:text><xsl:value-of select="$society"/>
|
|
1098
|
+
</fo:block>
|
|
1099
|
+
<fo:block> </fo:block>
|
|
1100
|
+
<fo:block> </fo:block>
|
|
1101
|
+
<fo:block>
|
|
1102
|
+
<!-- Approved <Date Approved> -->
|
|
1103
|
+
<xsl:text>Approved </xsl:text>
|
|
1104
|
+
<xsl:value-of select="$approved_date"/>
|
|
1105
|
+
</fo:block>
|
|
1106
|
+
<fo:block> </fo:block>
|
|
1107
|
+
<!-- Example: IEEE SA Standards Board -->
|
|
1108
|
+
<fo:block font-size="11pt" font-weight="bold"><xsl:value-of select="$approved_by"/></fo:block>
|
|
1109
|
+
|
|
1110
|
+
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
1111
|
+
<fo:block> </fo:block>
|
|
1112
|
+
<fo:block>
|
|
1113
|
+
<xsl:text>Cutoff date </xsl:text>
|
|
1114
|
+
<xsl:value-of select="$cutoff_date"/>
|
|
1115
|
+
</fo:block>
|
|
1116
|
+
</xsl:if>
|
|
1117
|
+
<xsl:if test="normalize-space($cutoff_date) != ''">
|
|
1118
|
+
<fo:block> </fo:block>
|
|
1119
|
+
<fo:block>
|
|
1120
|
+
<xsl:text>Expiration date </xsl:text>
|
|
1121
|
+
<xsl:value-of select="$expiration_date"/>
|
|
1122
|
+
</fo:block>
|
|
1123
|
+
</xsl:if>
|
|
1124
|
+
</fo:block>
|
|
1125
|
+
|
|
1126
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
|
|
1127
|
+
|
|
1128
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:license-statement"/>
|
|
1129
|
+
|
|
1130
|
+
<fo:block break-after="page"/>
|
|
1131
|
+
|
|
1132
|
+
<!-- Second page -->
|
|
1133
|
+
|
|
1134
|
+
<fo:block font-family="Arial" text-align="justify">
|
|
1135
|
+
<fo:block>
|
|
1136
|
+
<fo:inline font-weight="bold">
|
|
1137
|
+
<xsl:call-template name="getLocalizedString">
|
|
1138
|
+
<xsl:with-param name="key">abstract</xsl:with-param>
|
|
1139
|
+
</xsl:call-template>
|
|
1140
|
+
<xsl:text>: </xsl:text>
|
|
1141
|
+
</fo:inline>
|
|
1142
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract/node()[not(self::mn:fmt-title)] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or normalize-space(mn:fmt-title) = 'Abstract']/node()[not(self::mn:fmt-title)]"/>
|
|
1143
|
+
</fo:block>
|
|
1144
|
+
<fo:block> </fo:block>
|
|
1145
|
+
<fo:block>
|
|
1146
|
+
<fo:inline font-weight="bold">Keywords: </fo:inline>
|
|
1147
|
+
<xsl:for-each select="/mn:metanorma/mn:bibdata/mn:keyword">
|
|
1148
|
+
<xsl:value-of select="."/>
|
|
1149
|
+
<xsl:if test="position() != last()">, </xsl:if>
|
|
1150
|
+
</xsl:for-each>
|
|
1151
|
+
</fo:block>
|
|
1152
|
+
<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:acknowledgements"/>
|
|
1153
|
+
</fo:block>
|
|
1154
|
+
|
|
1155
|
+
<!-- Example:
|
|
1156
|
+
The Institute of Electrical and Electronics Engineers, Inc.
|
|
1157
|
+
3 Park Avenue, New York, NY 10016-5997, USA
|
|
1158
|
+
...
|
|
1159
|
+
PDF: ISBN 978-0-XXXX-XXXX-X STDXXXXX
|
|
1160
|
+
Print: ISBN 978-0-XXXX-XXXX-X STDPDXXXXX
|
|
1161
|
+
-->
|
|
1162
|
+
<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
|
|
1163
|
+
|
|
1164
|
+
</fo:block-container>
|
|
1165
|
+
</fo:flow>
|
|
1166
|
+
</fo:page-sequence> <!-- End: 'Draft' first page -->
|
|
1167
|
+
</xsl:when>
|
|
1168
|
+
|
|
1169
|
+
<xsl:when test="$current_template = 'standard'">
|
|
1170
|
+
<xsl:call-template name="insertCoverPage_Standard">
|
|
1171
|
+
<xsl:with-param name="title_intro" select="$title_intro"/>
|
|
1172
|
+
<xsl:with-param name="title_main" select="$title_main"/>
|
|
1173
|
+
<xsl:with-param name="society" select="$society"/>
|
|
1174
|
+
<xsl:with-param name="committee" select="$committee"/>
|
|
1175
|
+
<xsl:with-param name="standard_number" select="$standard_number"/>
|
|
1176
|
+
<xsl:with-param name="history" select="$history_text"/>
|
|
1177
|
+
<xsl:with-param name="standard_title_prefix" select="$title_prefix"/>
|
|
1178
|
+
<xsl:with-param name="cutoff_date" select="$cutoff_date"/>
|
|
1179
|
+
<xsl:with-param name="expiration_date" select="$expiration_date"/>
|
|
1180
|
+
</xsl:call-template>
|
|
1181
|
+
</xsl:when>
|
|
1182
|
+
|
|
1183
|
+
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1184
|
+
<xsl:call-template name="insertCoverPage_NonStandard">
|
|
1185
|
+
<xsl:with-param name="title" select="$title"/>
|
|
1186
|
+
</xsl:call-template>
|
|
1187
|
+
</xsl:when>
|
|
1188
|
+
|
|
1189
|
+
</xsl:choose>
|
|
1190
|
+
<!-- ======================= -->
|
|
1191
|
+
<!-- END Cover page -->
|
|
1192
|
+
<!-- ======================= -->
|
|
1193
|
+
</xsl:template> <!-- END: cover-page -->
|
|
1194
|
+
|
|
1158
1195
|
<xsl:template match="mn:preface/mn:clause[@type = 'toc']" priority="3">
|
|
1159
1196
|
<xsl:param name="num"/>
|
|
1160
1197
|
|
|
1161
1198
|
<xsl:apply-templates/>
|
|
1162
1199
|
|
|
1163
|
-
<xsl:if test="count(*) = 1 and mn:title"> <!-- if there isn't user ToC -->
|
|
1200
|
+
<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
|
|
1164
1201
|
<fo:block role="TOC">
|
|
1165
1202
|
<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:item[@display = 'true']">
|
|
1166
1203
|
<xsl:choose>
|
|
@@ -1370,7 +1407,7 @@
|
|
|
1370
1407
|
</xsl:if>
|
|
1371
1408
|
</xsl:template>
|
|
1372
1409
|
|
|
1373
|
-
<xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:title" priority="3">
|
|
1410
|
+
<xsl:template match="mn:preface/mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
|
1374
1411
|
<xsl:choose>
|
|
1375
1412
|
<xsl:when test="$current_template = 'standard' or $current_template = 'draft'">
|
|
1376
1413
|
<fo:block font-family="Arial" font-size="12pt" role="H1" font-weight="bold" margin-top="12pt" margin-bottom="24pt">
|
|
@@ -1443,21 +1480,21 @@
|
|
|
1443
1480
|
<xsl:apply-templates/>
|
|
1444
1481
|
</xsl:template>
|
|
1445
1482
|
|
|
1446
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants']" priority="2">
|
|
1483
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']" priority="2">
|
|
1447
1484
|
<fo:block break-after="page"/>
|
|
1448
1485
|
<fo:block id="{@id}">
|
|
1449
1486
|
<xsl:apply-templates/>
|
|
1450
1487
|
</fo:block>
|
|
1451
1488
|
</xsl:template>
|
|
1452
1489
|
|
|
1453
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants']/mn:clause" priority="2">
|
|
1490
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants']/mn:clause" priority="2">
|
|
1454
1491
|
<fo:block id="{@id}" space-before="12pt">
|
|
1455
1492
|
<xsl:apply-templates/>
|
|
1456
1493
|
</fo:block>
|
|
1457
1494
|
</xsl:template>
|
|
1458
1495
|
|
|
1459
1496
|
<!-- Example: Important Notices and Disclaimers Concerning IEEE Standards Documents -->
|
|
1460
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement//mn:title" priority="3">
|
|
1497
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement//mn:fmt-title" priority="3">
|
|
1461
1498
|
<xsl:variable name="level">
|
|
1462
1499
|
<xsl:call-template name="getLevel"/>
|
|
1463
1500
|
</xsl:variable>
|
|
@@ -1587,7 +1624,7 @@
|
|
|
1587
1624
|
|
|
1588
1625
|
<xsl:variable name="attributes_">
|
|
1589
1626
|
<attributes>
|
|
1590
|
-
<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or mn:title = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
|
|
1627
|
+
<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
|
|
1591
1628
|
<xsl:attribute name="space-after">0</xsl:attribute>
|
|
1592
1629
|
</xsl:if>
|
|
1593
1630
|
<xsl:call-template name="setTextAlignment">
|
|
@@ -1626,11 +1663,11 @@
|
|
|
1626
1663
|
<xsl:apply-templates mode="whitepaper"/>
|
|
1627
1664
|
</xsl:template>
|
|
1628
1665
|
|
|
1629
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:title" mode="whitepaper">
|
|
1666
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:fmt-title" mode="whitepaper">
|
|
1630
1667
|
<fo:block font-family="Arial Black" font-size="13pt"><xsl:apply-templates mode="whitepaper"/></fo:block>
|
|
1631
1668
|
</xsl:template>
|
|
1632
1669
|
|
|
1633
|
-
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:title//text()" mode="whitepaper">
|
|
1670
|
+
<xsl:template match="mn:boilerplate/mn:legal-statement/mn:clause/mn:fmt-title//text()" mode="whitepaper">
|
|
1634
1671
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
|
|
1635
1672
|
</xsl:template>
|
|
1636
1673
|
|
|
@@ -1666,7 +1703,7 @@
|
|
|
1666
1703
|
</xsl:template>
|
|
1667
1704
|
|
|
1668
1705
|
<!-- for 'draft' -->
|
|
1669
|
-
<xsl:template match="mn:preface/mn:abstract/mn:p[1] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or mn:title = 'Abstract']/mn:p[1]" priority="2">
|
|
1706
|
+
<xsl:template match="mn:preface/mn:abstract/mn:p[1] | /mn:metanorma/mn:preface/mn:clause[@id = '_abstract' or normalize-space(mn:fmt-title) = 'Abstract']/mn:p[1]" priority="2">
|
|
1670
1707
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
1671
1708
|
</xsl:template>
|
|
1672
1709
|
|
|
@@ -1886,18 +1923,18 @@
|
|
|
1886
1923
|
</xsl:if>
|
|
1887
1924
|
</xsl:template>
|
|
1888
1925
|
|
|
1889
|
-
<xsl:template match="mn:figure[mn:name] | mn:table[mn:name and not(@unnumbered = 'true' and java:endsWith(java:java.lang.String.new(mn:name),'Key'))]" priority="2" mode="contents">
|
|
1926
|
+
<xsl:template match="mn:figure[mn:fmt-name] | mn:table[mn:fmt-name and not(@unnumbered = 'true' and java:endsWith(java:java.lang.String.new(mn:fmt-name),'Key'))]" priority="2" mode="contents">
|
|
1890
1927
|
<xsl:if test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
1891
1928
|
<xsl:variable name="level">
|
|
1892
1929
|
<xsl:for-each select="ancestor::mn:clause[1] | ancestor::mn:annex[1]">
|
|
1893
1930
|
<xsl:call-template name="getLevel">
|
|
1894
|
-
<xsl:with-param name="depth" select="mn:title/@depth"/>
|
|
1931
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
|
1895
1932
|
</xsl:call-template>
|
|
1896
1933
|
</xsl:for-each>
|
|
1897
1934
|
</xsl:variable>
|
|
1898
1935
|
<mnx:item id="{@id}" level="{$level}" section="" type="{local-name()}" root="" display="true">
|
|
1899
1936
|
<xsl:variable name="name">
|
|
1900
|
-
<xsl:apply-templates select="mn:name" mode="contents_item">
|
|
1937
|
+
<xsl:apply-templates select="mn:fmt-name" mode="contents_item">
|
|
1901
1938
|
<xsl:with-param name="mode">contents</xsl:with-param>
|
|
1902
1939
|
</xsl:apply-templates>
|
|
1903
1940
|
</xsl:variable>
|
|
@@ -1911,7 +1948,7 @@
|
|
|
1911
1948
|
</xsl:if>
|
|
1912
1949
|
</xsl:template>
|
|
1913
1950
|
|
|
1914
|
-
<xsl:template match="mn:add[parent::mn:name and ancestor::mn:figure and normalize-space(following-sibling::node()) = '']" mode="contents_item" priority="2"/>
|
|
1951
|
+
<xsl:template match="mn:add[parent::mn:fmt-name and ancestor::mn:figure and normalize-space(following-sibling::node()) = '']" mode="contents_item" priority="2"/>
|
|
1915
1952
|
|
|
1916
1953
|
<xsl:template match="text()" mode="contents_item">
|
|
1917
1954
|
<xsl:choose>
|
|
@@ -1990,7 +2027,7 @@
|
|
|
1990
2027
|
|
|
1991
2028
|
</xsl:template>
|
|
1992
2029
|
|
|
1993
|
-
<xsl:template match="
|
|
2030
|
+
<xsl:template match="mnx:figures/mnx:figure/mn:fmt-name/text()[1] | mnx:tables/mnx:table/mn:fmt-name/text()[1]" mode="contents" priority="3">
|
|
1994
2031
|
<xsl:choose>
|
|
1995
2032
|
<xsl:when test="$current_template = 'standard' and contains(.,'—')"><xsl:value-of select="substring-after(.,'—')"/></xsl:when>
|
|
1996
2033
|
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
@@ -2075,7 +2112,7 @@
|
|
|
2075
2112
|
<xsl:apply-templates select="mn:term" mode="flatxml"/>
|
|
2076
2113
|
</xsl:template>
|
|
2077
2114
|
|
|
2078
|
-
<xsl:template match="mn:introduction//mn:title | mn:foreword//mn:title | mn:sections//mn:title | mn:annex//mn:title | mn:bibliography/mn:clause/mn:title | mn:references/mn:title" mode="flatxml" priority="2"> <!-- | mn:term -->
|
|
2115
|
+
<xsl:template match="mn:introduction//mn:fmt-title | mn:foreword//mn:fmt-title | mn:sections//mn:fmt-title | mn:annex//mn:fmt-title | mn:bibliography/mn:clause/mn:fmt-title | mn:references/mn:fmt-title" mode="flatxml" priority="2"> <!-- | mn:term -->
|
|
2079
2116
|
<xsl:copy>
|
|
2080
2117
|
<xsl:apply-templates select="@*" mode="flatxml"/>
|
|
2081
2118
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
@@ -2126,7 +2163,7 @@
|
|
|
2126
2163
|
|
|
2127
2164
|
<!-- add @to = figure, table, clause -->
|
|
2128
2165
|
<!-- add @depth = from -->
|
|
2129
|
-
<xsl:template match="mn:xref" mode="flatxml">
|
|
2166
|
+
<xsl:template match="mn:fmt-xref" mode="flatxml">
|
|
2130
2167
|
<xsl:copy>
|
|
2131
2168
|
<xsl:apply-templates select="@*" mode="flatxml"/>
|
|
2132
2169
|
<xsl:variable name="target" select="@target"/>
|
|
@@ -2134,7 +2171,7 @@
|
|
|
2134
2171
|
<xsl:value-of select="local-name(//*[@id = current()/@target][1])"/>
|
|
2135
2172
|
</xsl:attribute>
|
|
2136
2173
|
<xsl:attribute name="depth">
|
|
2137
|
-
<xsl:value-of select="//*[@id = current()/@target][1]/mn:title/@depth"/>
|
|
2174
|
+
<xsl:value-of select="//*[@id = current()/@target][1]/mn:fmt-title/@depth"/>
|
|
2138
2175
|
</xsl:attribute>
|
|
2139
2176
|
<xsl:apply-templates select="node()" mode="flatxml"/>
|
|
2140
2177
|
</xsl:copy>
|
|
@@ -2176,7 +2213,7 @@
|
|
|
2176
2213
|
</fn>
|
|
2177
2214
|
-->
|
|
2178
2215
|
|
|
2179
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" mode="flatxml">
|
|
2216
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" mode="flatxml">
|
|
2180
2217
|
<xsl:variable name="p_fn_">
|
|
2181
2218
|
<xsl:call-template name="get_fn_list"/>
|
|
2182
2219
|
</xsl:variable>
|
|
@@ -2240,7 +2277,7 @@
|
|
|
2240
2277
|
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
2241
2278
|
<xsl:otherwise>
|
|
2242
2279
|
<xsl:choose>
|
|
2243
|
-
<xsl:when test="self::mn:title or self::mn:term">
|
|
2280
|
+
<xsl:when test="self::mn:fmt-title or self::mn:term">
|
|
2244
2281
|
<xsl:apply-templates select="."/>
|
|
2245
2282
|
</xsl:when>
|
|
2246
2283
|
<!-- <xsl:when test="not(node()) and @mainsection = 'true'"> -->
|
|
@@ -2297,13 +2334,13 @@
|
|
|
2297
2334
|
</xsl:template> -->
|
|
2298
2335
|
|
|
2299
2336
|
<!-- Bibliography -->
|
|
2300
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:title">
|
|
2337
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
|
|
2301
2338
|
<fo:block font-size="16pt" font-weight="bold" margin-top="6pt" margin-bottom="36pt" keep-with-next="always" role="H1">
|
|
2302
2339
|
<xsl:apply-templates/>
|
|
2303
2340
|
</fo:block>
|
|
2304
2341
|
</xsl:template>
|
|
2305
2342
|
|
|
2306
|
-
<xsl:template match="mn:title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
|
|
2343
|
+
<xsl:template match="mn:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
|
|
2307
2344
|
<fo:block>
|
|
2308
2345
|
<xsl:attribute name="space-before">
|
|
2309
2346
|
<xsl:call-template name="getTitleMarginTop"/>
|
|
@@ -2369,7 +2406,7 @@
|
|
|
2369
2406
|
</xsl:choose>
|
|
2370
2407
|
</xsl:template>
|
|
2371
2408
|
|
|
2372
|
-
<xsl:template match="mn:title" priority="2" name="title">
|
|
2409
|
+
<xsl:template match="mn:fmt-title" priority="2" name="title">
|
|
2373
2410
|
|
|
2374
2411
|
<xsl:variable name="level">
|
|
2375
2412
|
<xsl:call-template name="getLevel"/>
|
|
@@ -2544,7 +2581,7 @@
|
|
|
2544
2581
|
</xsl:template>
|
|
2545
2582
|
|
|
2546
2583
|
<!-- add blue box after first break in Annex title -->
|
|
2547
|
-
<xsl:template match="mn:br[not(preceding-sibling::mn:br)][ancestor::mn:title[preceding-sibling::*[1][self::mn:annex]]]" priority="2">
|
|
2584
|
+
<xsl:template match="mn:br[not(preceding-sibling::mn:br)][ancestor::mn:fmt-title[preceding-sibling::*[1][self::mn:annex]]]" priority="2">
|
|
2548
2585
|
<xsl:choose>
|
|
2549
2586
|
<xsl:when test="($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') ">
|
|
2550
2587
|
<xsl:call-template name="addBlueBox"/>
|
|
@@ -2588,35 +2625,35 @@
|
|
|
2588
2625
|
<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
|
|
2589
2626
|
</xsl:if>
|
|
2590
2627
|
<!-- term/name -->
|
|
2591
|
-
<xsl:apply-templates select="mn:name"/>
|
|
2628
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
2592
2629
|
<xsl:text> </xsl:text>
|
|
2593
|
-
<xsl:apply-templates select="mn:preferred"/>
|
|
2594
|
-
<xsl:for-each select="mn:admitted">
|
|
2630
|
+
<xsl:apply-templates select="mn:fmt-preferred"/>
|
|
2631
|
+
<xsl:for-each select="mn:fmt-admitted">
|
|
2595
2632
|
<xsl:if test="position() = 1"><xsl:text> (</xsl:text></xsl:if>
|
|
2596
2633
|
<xsl:apply-templates/>
|
|
2597
2634
|
<xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
|
|
2598
2635
|
<xsl:if test="position() = last()"><xsl:text>)</xsl:text></xsl:if>
|
|
2599
2636
|
</xsl:for-each>
|
|
2600
2637
|
</fo:block>
|
|
2601
|
-
<xsl:apply-templates select="*[not(self::mn:preferred) and not(self::mn:admitted) and not(self::mn:name)]"/> <!-- further processing child elements -->
|
|
2638
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-preferred) and not(self::mn:fmt-admitted) and not(self::mn:fmt-name)]"/> <!-- further processing child elements -->
|
|
2602
2639
|
</fo:block>
|
|
2603
2640
|
|
|
2604
2641
|
</xsl:template>
|
|
2605
2642
|
|
|
2606
|
-
<xsl:template match="mn:preferred" priority="2">
|
|
2643
|
+
<xsl:template match="mn:fmt-preferred" priority="2">
|
|
2607
2644
|
<xsl:apply-templates/>
|
|
2608
2645
|
</xsl:template>
|
|
2609
2646
|
|
|
2610
|
-
<xsl:template match="mn:term/mn:definition" priority="2">
|
|
2647
|
+
<xsl:template match="mn:term/mn:fmt-definition" priority="2">
|
|
2611
2648
|
<fo:block xsl:use-attribute-sets="definition-style">
|
|
2612
2649
|
<xsl:apply-templates/>
|
|
2613
2650
|
</fo:block>
|
|
2614
2651
|
<!-- change termsource order - show after definition before termnote -->
|
|
2615
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:termsource">
|
|
2652
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-termsource">
|
|
2616
2653
|
<xsl:call-template name="termsource"/>
|
|
2617
2654
|
</xsl:for-each>
|
|
2618
2655
|
</xsl:template>
|
|
2619
|
-
<xsl:template match="mn:term/mn:termsource" priority="2">
|
|
2656
|
+
<xsl:template match="mn:term/mn:fmt-termsource" priority="2">
|
|
2620
2657
|
<xsl:call-template name="termsource"/>
|
|
2621
2658
|
</xsl:template>
|
|
2622
2659
|
|
|
@@ -2641,7 +2678,7 @@
|
|
|
2641
2678
|
|
|
2642
2679
|
<xsl:choose>
|
|
2643
2680
|
|
|
2644
|
-
<xsl:when test="preceding-sibling::*[1][self::mn:title]/@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
|
|
2681
|
+
<xsl:when test="preceding-sibling::*[1][self::mn:fmt-title]/@inline-header = 'true' and $inline-header = 'false'"/> <!-- paragraph displayed in title template -->
|
|
2645
2682
|
|
|
2646
2683
|
<xsl:otherwise>
|
|
2647
2684
|
|
|
@@ -2729,7 +2766,7 @@
|
|
|
2729
2766
|
</xsl:choose>
|
|
2730
2767
|
</xsl:template>
|
|
2731
2768
|
|
|
2732
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" priority="3">
|
|
2769
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" priority="3">
|
|
2733
2770
|
<xsl:call-template name="fn"/>
|
|
2734
2771
|
</xsl:template>
|
|
2735
2772
|
|
|
@@ -2794,7 +2831,7 @@
|
|
|
2794
2831
|
</xsl:choose>
|
|
2795
2832
|
</xsl:template> -->
|
|
2796
2833
|
|
|
2797
|
-
<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:image]/mn:name/node()[1][self::text()]" priority="2">
|
|
2834
|
+
<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:image]/mn:fmt-name/node()[1][self::text()]" priority="2">
|
|
2798
2835
|
<xsl:choose>
|
|
2799
2836
|
<xsl:when test="contains(., '—')">
|
|
2800
2837
|
<xsl:variable name="substring_after" select="substring-after(., '—')"/>
|
|
@@ -2872,7 +2909,7 @@
|
|
|
2872
2909
|
</xsl:template> -->
|
|
2873
2910
|
|
|
2874
2911
|
<!-- remove space after 'NOTE' without number -->
|
|
2875
|
-
<xsl:template match="*[self::mn:note or self::mn:termnote]/mn:name/text()" priority="2">
|
|
2912
|
+
<xsl:template match="*[self::mn:note or self::mn:termnote]/mn:fmt-name/text()" priority="2">
|
|
2876
2913
|
<xsl:value-of select="normalize-space()"/>
|
|
2877
2914
|
</xsl:template>
|
|
2878
2915
|
|
|
@@ -2894,7 +2931,7 @@
|
|
|
2894
2931
|
</fo:block>
|
|
2895
2932
|
</xsl:template>
|
|
2896
2933
|
|
|
2897
|
-
<xsl:template match="mn:xref" priority="2">
|
|
2934
|
+
<xsl:template match="mn:xref | mn:fmt-xref" priority="2">
|
|
2898
2935
|
<xsl:if test="@target and @target != ''">
|
|
2899
2936
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
|
2900
2937
|
|
|
@@ -2936,11 +2973,11 @@
|
|
|
2936
2973
|
</xsl:template>
|
|
2937
2974
|
|
|
2938
2975
|
<!-- Figure 1 to Figure <bold>1</bold> -->
|
|
2939
|
-
<xsl:template match="mn:xref[@to = 'figure' or @to = 'table']/text()" priority="2">
|
|
2976
|
+
<xsl:template match="mn:fmt-xref[@to = 'figure' or @to = 'table']/text()" priority="2">
|
|
2940
2977
|
<xsl:value-of select="."/>
|
|
2941
2978
|
</xsl:template>
|
|
2942
2979
|
|
|
2943
|
-
<xsl:template match="mn:td/mn:xref/mn:strong" priority="2">
|
|
2980
|
+
<xsl:template match="mn:td/mn:fmt-xref/mn:strong" priority="2">
|
|
2944
2981
|
<xsl:apply-templates/>
|
|
2945
2982
|
</xsl:template>
|
|
2946
2983
|
|
|
@@ -2948,7 +2985,7 @@
|
|
|
2948
2985
|
<!-- End of Index processing -->
|
|
2949
2986
|
<!-- =================== -->
|
|
2950
2987
|
|
|
2951
|
-
<xsl:template match="mn:origin" priority="3">
|
|
2988
|
+
<xsl:template match="mn:fmt-origin" priority="3">
|
|
2952
2989
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
2953
2990
|
<xsl:variable name="bibitemid">
|
|
2954
2991
|
<xsl:choose>
|
|
@@ -3310,7 +3347,7 @@
|
|
|
3310
3347
|
<xsl:param name="cutoff_date"/>
|
|
3311
3348
|
<xsl:param name="expiration_date"/>
|
|
3312
3349
|
|
|
3313
|
-
<fo:page-sequence master-reference="cover-
|
|
3350
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
|
|
3314
3351
|
|
|
3315
3352
|
<fo:static-content flow-name="header" role="artifact">
|
|
3316
3353
|
<fo:block-container position="absolute" left="14mm" top="17.8mm">
|
|
@@ -3624,8 +3661,20 @@
|
|
|
3624
3661
|
<!-- =============================== -->
|
|
3625
3662
|
<!-- Back Pages -->
|
|
3626
3663
|
<!-- =============================== -->
|
|
3664
|
+
<xsl:template name="back-page">
|
|
3665
|
+
<xsl:choose>
|
|
3666
|
+
<xsl:when test="$current_template = 'standard'">
|
|
3667
|
+
<xsl:call-template name="insertBackPage_Standard"/>
|
|
3668
|
+
</xsl:when>
|
|
3669
|
+
|
|
3670
|
+
<xsl:when test="$current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report'">
|
|
3671
|
+
<xsl:call-template name="insertBackPage_NonStandard"/>
|
|
3672
|
+
</xsl:when>
|
|
3673
|
+
</xsl:choose>
|
|
3674
|
+
</xsl:template> <!-- END: back-page -->
|
|
3675
|
+
|
|
3627
3676
|
<xsl:template name="insertBackPage_Standard">
|
|
3628
|
-
<fo:page-sequence master-reference="
|
|
3677
|
+
<fo:page-sequence master-reference="back-page" force-page-count="no-force">
|
|
3629
3678
|
|
|
3630
3679
|
<fo:static-content flow-name="header" role="artifact">
|
|
3631
3680
|
<fo:block-container position="absolute" left="14mm" top="17.8mm">
|
|
@@ -3938,10 +3987,6 @@
|
|
|
3938
3987
|
<title-part lang="ru">
|
|
3939
3988
|
</title-part>
|
|
3940
3989
|
<title-part lang="zh">第 # 部分:</title-part>
|
|
3941
|
-
|
|
3942
|
-
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
3943
|
-
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
3944
|
-
|
|
3945
3990
|
</xsl:variable>
|
|
3946
3991
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
3947
3992
|
|
|
@@ -4395,7 +4440,8 @@
|
|
|
4395
4440
|
<xsl:template match="mn:stem" mode="update_xml_step1"/>
|
|
4396
4441
|
|
|
4397
4442
|
<xsl:template match="mn:fmt-stem" mode="update_xml_step1">
|
|
4398
|
-
<xsl:element name="stem" namespace="{$namespace_full}">
|
|
4443
|
+
<!-- <xsl:element name="stem" namespace="{$namespace_full}"> -->
|
|
4444
|
+
<xsl:copy>
|
|
4399
4445
|
<xsl:copy-of select="@*"/>
|
|
4400
4446
|
<xsl:choose>
|
|
4401
4447
|
<xsl:when test="mn:semx and count(node()) = 1">
|
|
@@ -4419,7 +4465,8 @@
|
|
|
4419
4465
|
</xsl:choose>
|
|
4420
4466
|
</xsl:otherwise>
|
|
4421
4467
|
</xsl:choose>
|
|
4422
|
-
</xsl:
|
|
4468
|
+
</xsl:copy>
|
|
4469
|
+
<!-- </xsl:element> -->
|
|
4423
4470
|
</xsl:template>
|
|
4424
4471
|
|
|
4425
4472
|
<xsl:template match="mn:image[not(.//mn:passthrough)] | mn:bibdata[not(.//mn:passthrough)] | mn:localized-strings" mode="update_xml_step1">
|
|
@@ -4581,12 +4628,14 @@
|
|
|
4581
4628
|
</xsl:template>
|
|
4582
4629
|
|
|
4583
4630
|
<xsl:template match="mn:fmt-title" mode="update_xml_step1">
|
|
4584
|
-
<xsl:element name="title" namespace="{$namespace_full}">
|
|
4631
|
+
<!-- <xsl:element name="title" namespace="{$namespace_full}"> -->
|
|
4632
|
+
<xsl:copy>
|
|
4585
4633
|
<xsl:copy-of select="@*"/>
|
|
4586
4634
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4587
4635
|
|
|
4588
4636
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4589
|
-
</xsl:
|
|
4637
|
+
</xsl:copy>
|
|
4638
|
+
<!-- </xsl:element> -->
|
|
4590
4639
|
</xsl:template>
|
|
4591
4640
|
|
|
4592
4641
|
<xsl:template name="addNamedDestinationAttribute">
|
|
@@ -4598,12 +4647,14 @@
|
|
|
4598
4647
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4599
4648
|
</xsl:when>
|
|
4600
4649
|
<xsl:otherwise>
|
|
4601
|
-
<xsl:element name="name" namespace="{$namespace_full}">
|
|
4650
|
+
<!-- <xsl:element name="name" namespace="{$namespace_full}"> -->
|
|
4651
|
+
<xsl:copy>
|
|
4602
4652
|
<xsl:copy-of select="@*"/>
|
|
4603
4653
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4604
4654
|
|
|
4605
4655
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4606
|
-
</xsl:
|
|
4656
|
+
</xsl:copy>
|
|
4657
|
+
<!-- </xsl:element> -->
|
|
4607
4658
|
</xsl:otherwise>
|
|
4608
4659
|
</xsl:choose>
|
|
4609
4660
|
</xsl:template>
|
|
@@ -4618,7 +4669,7 @@
|
|
|
4618
4669
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4619
4670
|
</xsl:template>
|
|
4620
4671
|
<xsl:template match="mn:fmt-preferred[not(mn:p)] | mn:fmt-preferred/mn:p" mode="update_xml_step1">
|
|
4621
|
-
<xsl:element name="preferred" namespace="{$namespace_full}">
|
|
4672
|
+
<xsl:element name="fmt-preferred" namespace="{$namespace_full}">
|
|
4622
4673
|
<xsl:copy-of select="@*"/>
|
|
4623
4674
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4624
4675
|
</xsl:element>
|
|
@@ -4628,7 +4679,7 @@
|
|
|
4628
4679
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4629
4680
|
</xsl:template>
|
|
4630
4681
|
<xsl:template match="mn:fmt-admitted[not(mn:p)] | mn:fmt-admitted/mn:p" mode="update_xml_step1">
|
|
4631
|
-
<xsl:element name="admitted" namespace="{$namespace_full}">
|
|
4682
|
+
<xsl:element name="fmt-admitted" namespace="{$namespace_full}">
|
|
4632
4683
|
<xsl:copy-of select="@*"/>
|
|
4633
4684
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4634
4685
|
</xsl:element>
|
|
@@ -4638,32 +4689,32 @@
|
|
|
4638
4689
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4639
4690
|
</xsl:template>
|
|
4640
4691
|
<xsl:template match="mn:fmt-deprecates[not(mn:p)] | mn:fmt-deprecates/mn:p" mode="update_xml_step1">
|
|
4641
|
-
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
|
4692
|
+
<xsl:element name="fmt-deprecates" namespace="{$namespace_full}">
|
|
4642
4693
|
<xsl:copy-of select="@*"/>
|
|
4643
4694
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4644
4695
|
</xsl:element>
|
|
4645
4696
|
</xsl:template>
|
|
4646
4697
|
|
|
4647
|
-
<xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4698
|
+
<!-- <xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4648
4699
|
<xsl:element name="definition" namespace="{$namespace_full}">
|
|
4649
4700
|
<xsl:copy-of select="@*"/>
|
|
4650
4701
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4651
4702
|
</xsl:element>
|
|
4652
4703
|
</xsl:template>
|
|
4653
|
-
|
|
4704
|
+
|
|
4654
4705
|
<xsl:template match="mn:fmt-termsource" mode="update_xml_step1">
|
|
4655
4706
|
<xsl:element name="termsource" namespace="{$namespace_full}">
|
|
4656
4707
|
<xsl:copy-of select="@*"/>
|
|
4657
4708
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4658
4709
|
</xsl:element>
|
|
4659
4710
|
</xsl:template>
|
|
4660
|
-
|
|
4711
|
+
|
|
4661
4712
|
<xsl:template match="mn:fmt-source" mode="update_xml_step1">
|
|
4662
4713
|
<xsl:element name="source" namespace="{$namespace_full}">
|
|
4663
4714
|
<xsl:copy-of select="@*"/>
|
|
4664
4715
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4665
4716
|
</xsl:element>
|
|
4666
|
-
</xsl:template>
|
|
4717
|
+
</xsl:template> -->
|
|
4667
4718
|
|
|
4668
4719
|
<xsl:template match="mn:span[ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
|
|
4669
4720
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -4686,12 +4737,12 @@
|
|
|
4686
4737
|
</xsl:template>
|
|
4687
4738
|
|
|
4688
4739
|
<xsl:template match="mn:identifier" mode="update_xml_step1"/>
|
|
4689
|
-
<xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4740
|
+
<!-- <xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4690
4741
|
<xsl:element name="identifier" namespace="{$namespace_full}">
|
|
4691
4742
|
<xsl:copy-of select="@*"/>
|
|
4692
4743
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4693
4744
|
</xsl:element>
|
|
4694
|
-
</xsl:template>
|
|
4745
|
+
</xsl:template> -->
|
|
4695
4746
|
|
|
4696
4747
|
<xsl:template match="mn:concept" mode="update_xml_step1"/>
|
|
4697
4748
|
|
|
@@ -4701,51 +4752,53 @@
|
|
|
4701
4752
|
|
|
4702
4753
|
<xsl:template match="mn:eref" mode="update_xml_step1"/>
|
|
4703
4754
|
|
|
4704
|
-
<xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4755
|
+
<!-- <xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4705
4756
|
<xsl:element name="eref" namespace="{$namespace_full}">
|
|
4706
4757
|
<xsl:copy-of select="@*"/>
|
|
4707
4758
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4708
4759
|
</xsl:element>
|
|
4709
|
-
</xsl:template>
|
|
4760
|
+
</xsl:template> -->
|
|
4710
4761
|
|
|
4711
4762
|
<xsl:template match="mn:xref" mode="update_xml_step1"/>
|
|
4712
4763
|
|
|
4713
|
-
<xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4764
|
+
<!-- <xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4714
4765
|
<xsl:element name="xref" namespace="{$namespace_full}">
|
|
4715
4766
|
<xsl:copy-of select="@*"/>
|
|
4716
4767
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4717
4768
|
</xsl:element>
|
|
4718
|
-
</xsl:template>
|
|
4769
|
+
</xsl:template> -->
|
|
4719
4770
|
|
|
4720
4771
|
<xsl:template match="mn:link" mode="update_xml_step1"/>
|
|
4721
4772
|
|
|
4722
|
-
<xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4773
|
+
<!-- <xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4723
4774
|
<xsl:element name="link" namespace="{$namespace_full}">
|
|
4724
4775
|
<xsl:copy-of select="@*"/>
|
|
4725
4776
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4726
4777
|
</xsl:element>
|
|
4727
|
-
</xsl:template>
|
|
4778
|
+
</xsl:template> -->
|
|
4728
4779
|
|
|
4729
4780
|
<xsl:template match="mn:origin" mode="update_xml_step1"/>
|
|
4730
4781
|
|
|
4731
|
-
<xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4782
|
+
<!-- <xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4732
4783
|
<xsl:element name="origin" namespace="{$namespace_full}">
|
|
4733
4784
|
<xsl:copy-of select="@*"/>
|
|
4734
4785
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4735
4786
|
</xsl:element>
|
|
4736
|
-
</xsl:template>
|
|
4787
|
+
</xsl:template> -->
|
|
4737
4788
|
|
|
4738
4789
|
<xsl:template match="mn:erefstack" mode="update_xml_step1"/>
|
|
4739
4790
|
|
|
4740
4791
|
<xsl:template match="mn:svgmap" mode="update_xml_step1"/>
|
|
4741
4792
|
|
|
4742
|
-
<xsl:template match="mn:
|
|
4793
|
+
<xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
|
|
4743
4794
|
|
|
4744
|
-
|
|
4745
|
-
|
|
4746
|
-
|
|
4747
|
-
|
|
4748
|
-
|
|
4795
|
+
<xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1">
|
|
4796
|
+
<xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
|
|
4797
|
+
<xsl:value-of select="."/>
|
|
4798
|
+
</xsl:element>
|
|
4799
|
+
</xsl:template>
|
|
4800
|
+
|
|
4801
|
+
<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
|
|
4749
4802
|
|
|
4750
4803
|
<!-- END: update new Presentation XML -->
|
|
4751
4804
|
|
|
@@ -4938,7 +4991,7 @@
|
|
|
4938
4991
|
</xsl:variable>
|
|
4939
4992
|
|
|
4940
4993
|
<!-- add 'fn' after eref and origin, to reference bibitem with note = 'Withdrawn.' or 'Cancelled and replaced...' -->
|
|
4941
|
-
<xsl:template match="mn:eref | mn:origin" mode="update_xml_step2">
|
|
4994
|
+
<xsl:template match="mn:fmt-eref | mn:fmt-origin" mode="update_xml_step2">
|
|
4942
4995
|
<xsl:copy-of select="."/>
|
|
4943
4996
|
|
|
4944
4997
|
<xsl:variable name="bibitemid" select="@bibitemid"/>
|
|
@@ -5007,7 +5060,7 @@
|
|
|
5007
5060
|
</xsl:call-template>
|
|
5008
5061
|
</xsl:template>
|
|
5009
5062
|
|
|
5010
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_step2">
|
|
5063
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_step2">
|
|
5011
5064
|
<xsl:copy-of select="."/>
|
|
5012
5065
|
</xsl:template>
|
|
5013
5066
|
|
|
@@ -5044,7 +5097,7 @@
|
|
|
5044
5097
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
5045
5098
|
<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
|
|
5046
5099
|
|
|
5047
|
-
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:link[not(contains(
|
|
5100
|
+
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
|
|
5048
5101
|
|
|
5049
5102
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
5050
5103
|
|
|
@@ -5163,7 +5216,7 @@
|
|
|
5163
5216
|
</xsl:if>
|
|
5164
5217
|
</xsl:template>
|
|
5165
5218
|
|
|
5166
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5219
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5167
5220
|
<xsl:copy-of select="."/>
|
|
5168
5221
|
</xsl:template>
|
|
5169
5222
|
|
|
@@ -5490,7 +5543,7 @@
|
|
|
5490
5543
|
</fo:block>
|
|
5491
5544
|
</xsl:template> <!-- copyright-statement -->
|
|
5492
5545
|
|
|
5493
|
-
<xsl:template match="mn:copyright-statement//mn:title">
|
|
5546
|
+
<xsl:template match="mn:copyright-statement//mn:fmt-title">
|
|
5494
5547
|
<!-- process in the template 'title' -->
|
|
5495
5548
|
<xsl:call-template name="title"/>
|
|
5496
5549
|
</xsl:template> <!-- copyright-statement//title -->
|
|
@@ -5506,7 +5559,7 @@
|
|
|
5506
5559
|
</fo:block>
|
|
5507
5560
|
</xsl:template> <!-- license-statement -->
|
|
5508
5561
|
|
|
5509
|
-
<xsl:template match="mn:license-statement//mn:title">
|
|
5562
|
+
<xsl:template match="mn:license-statement//mn:fmt-title">
|
|
5510
5563
|
<!-- process in the template 'title' -->
|
|
5511
5564
|
<xsl:call-template name="title"/>
|
|
5512
5565
|
</xsl:template> <!-- license-statement/title -->
|
|
@@ -5523,7 +5576,7 @@
|
|
|
5523
5576
|
</fo:block>
|
|
5524
5577
|
</xsl:template> <!-- legal-statement -->
|
|
5525
5578
|
|
|
5526
|
-
<xsl:template match="mn:legal-statement//mn:title">
|
|
5579
|
+
<xsl:template match="mn:legal-statement//mn:fmt-title">
|
|
5527
5580
|
<!-- process in the template 'title' -->
|
|
5528
5581
|
<xsl:call-template name="title"/>
|
|
5529
5582
|
|
|
@@ -5543,7 +5596,7 @@
|
|
|
5543
5596
|
</fo:block>
|
|
5544
5597
|
</xsl:template> <!-- feedback-statement -->
|
|
5545
5598
|
|
|
5546
|
-
<xsl:template match="mn:feedback-statement//mn:title">
|
|
5599
|
+
<xsl:template match="mn:feedback-statement//mn:fmt-title">
|
|
5547
5600
|
<!-- process in the template 'title' -->
|
|
5548
5601
|
<xsl:call-template name="title"/>
|
|
5549
5602
|
</xsl:template>
|
|
@@ -5579,7 +5632,7 @@
|
|
|
5579
5632
|
</xsl:if>
|
|
5580
5633
|
</xsl:template> <!-- refine_link-style -->
|
|
5581
5634
|
|
|
5582
|
-
<xsl:template match="mn:link" name="link">
|
|
5635
|
+
<xsl:template match="mn:fmt-link" name="link">
|
|
5583
5636
|
<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
|
|
5584
5637
|
<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
|
|
5585
5638
|
<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
|
|
@@ -5800,7 +5853,7 @@
|
|
|
5800
5853
|
<xsl:value-of select="."/>
|
|
5801
5854
|
</xsl:attribute>
|
|
5802
5855
|
</xsl:for-each>
|
|
5803
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
5856
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
5804
5857
|
</xsl:when>
|
|
5805
5858
|
|
|
5806
5859
|
<xsl:otherwise>
|
|
@@ -5842,11 +5895,11 @@
|
|
|
5842
5895
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5843
5896
|
</xsl:if>
|
|
5844
5897
|
|
|
5845
|
-
<xsl:apply-templates select="node()[not(self::mn:name or self::mn:dl)]"/>
|
|
5898
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl)]"/>
|
|
5846
5899
|
</fo:block>
|
|
5847
5900
|
|
|
5848
5901
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
5849
|
-
<xsl:apply-templates select="mn:name"/> <!-- show sourcecode's name AFTER content -->
|
|
5902
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
5850
5903
|
|
|
5851
5904
|
</fo:block-container>
|
|
5852
5905
|
</fo:block-container>
|
|
@@ -6147,7 +6200,7 @@
|
|
|
6147
6200
|
|
|
6148
6201
|
<!-- end mode="syntax_highlight" -->
|
|
6149
6202
|
|
|
6150
|
-
<xsl:template match="mn:sourcecode/mn:name">
|
|
6203
|
+
<xsl:template match="mn:sourcecode/mn:fmt-name">
|
|
6151
6204
|
<xsl:if test="normalize-space() != ''">
|
|
6152
6205
|
<fo:block xsl:use-attribute-sets="sourcecode-name-style">
|
|
6153
6206
|
<xsl:apply-templates/>
|
|
@@ -6165,7 +6218,7 @@
|
|
|
6165
6218
|
</xsl:choose>
|
|
6166
6219
|
</xsl:template>
|
|
6167
6220
|
|
|
6168
|
-
<xsl:template match="mn:annotation">
|
|
6221
|
+
<xsl:template match="mn:callout-annotation">
|
|
6169
6222
|
<xsl:variable name="annotation-id" select="@id"/>
|
|
6170
6223
|
<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
|
|
6171
6224
|
<fo:block id="{$annotation-id}" white-space="nowrap">
|
|
@@ -6177,7 +6230,7 @@
|
|
|
6177
6230
|
</fo:block>
|
|
6178
6231
|
</xsl:template>
|
|
6179
6232
|
|
|
6180
|
-
<xsl:template match="mn:annotation/mn:p">
|
|
6233
|
+
<xsl:template match="mn:callout-annotation/mn:p">
|
|
6181
6234
|
<xsl:param name="callout"/>
|
|
6182
6235
|
<fo:inline id="{@id}">
|
|
6183
6236
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -6330,7 +6383,7 @@
|
|
|
6330
6383
|
<xsl:when test="starts-with(., $ace_tag) or self::mn:change-open-tag or self::mn:change-close-tag"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
|
|
6331
6384
|
<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
|
|
6332
6385
|
<xsl:choose>
|
|
6333
|
-
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (
|
|
6386
|
+
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (parent::mn:fmt-title and preceding-sibling::node()[1][self::mn:tab]) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][self::mn:add][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
|
|
6334
6387
|
<xsl:otherwise>
|
|
6335
6388
|
<xsl:variable name="tag">
|
|
6336
6389
|
<xsl:call-template name="insertTag">
|
|
@@ -6731,12 +6784,12 @@
|
|
|
6731
6784
|
<xsl:template match="mn:permission">
|
|
6732
6785
|
<xsl:call-template name="setNamedDestination"/>
|
|
6733
6786
|
<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
|
|
6734
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6735
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6787
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6788
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6736
6789
|
</fo:block>
|
|
6737
6790
|
</xsl:template>
|
|
6738
6791
|
|
|
6739
|
-
<xsl:template match="mn:permission/mn:name">
|
|
6792
|
+
<xsl:template match="mn:permission/mn:fmt-name">
|
|
6740
6793
|
<xsl:if test="normalize-space() != ''">
|
|
6741
6794
|
<fo:block xsl:use-attribute-sets="permission-name-style">
|
|
6742
6795
|
<xsl:apply-templates/>
|
|
@@ -6758,15 +6811,15 @@
|
|
|
6758
6811
|
<xsl:template match="mn:requirement">
|
|
6759
6812
|
<xsl:call-template name="setNamedDestination"/>
|
|
6760
6813
|
<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
|
|
6761
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6814
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6762
6815
|
<xsl:apply-templates select="mn:label"/>
|
|
6763
6816
|
<xsl:apply-templates select="@obligation"/>
|
|
6764
6817
|
<xsl:apply-templates select="mn:subject"/>
|
|
6765
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6818
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6766
6819
|
</fo:block>
|
|
6767
6820
|
</xsl:template>
|
|
6768
6821
|
|
|
6769
|
-
<xsl:template match="mn:requirement/mn:name">
|
|
6822
|
+
<xsl:template match="mn:requirement/mn:fmt-name">
|
|
6770
6823
|
<xsl:if test="normalize-space() != ''">
|
|
6771
6824
|
|
|
6772
6825
|
<fo:block xsl:use-attribute-sets="requirement-name-style">
|
|
@@ -6802,12 +6855,12 @@
|
|
|
6802
6855
|
<xsl:template match="mn:recommendation">
|
|
6803
6856
|
<xsl:call-template name="setNamedDestination"/>
|
|
6804
6857
|
<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
|
|
6805
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6806
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6858
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6859
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6807
6860
|
</fo:block>
|
|
6808
6861
|
</xsl:template>
|
|
6809
6862
|
|
|
6810
|
-
<xsl:template match="mn:recommendation/mn:name">
|
|
6863
|
+
<xsl:template match="mn:recommendation/mn:fmt-name">
|
|
6811
6864
|
<xsl:if test="normalize-space() != ''">
|
|
6812
6865
|
|
|
6813
6866
|
<fo:block xsl:use-attribute-sets="recommendation-name-style">
|
|
@@ -7056,11 +7109,11 @@
|
|
|
7056
7109
|
|
|
7057
7110
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
|
|
7058
7111
|
</xsl:if>
|
|
7059
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7112
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7060
7113
|
</fo:block>
|
|
7061
7114
|
</xsl:template>
|
|
7062
7115
|
|
|
7063
|
-
<xsl:template match="mn:term/mn:name">
|
|
7116
|
+
<xsl:template match="mn:term/mn:fmt-name">
|
|
7064
7117
|
<xsl:if test="normalize-space() != ''">
|
|
7065
7118
|
<!-- <xsl:variable name="level">
|
|
7066
7119
|
<xsl:call-template name="getLevelTermName"/>
|
|
@@ -7079,7 +7132,7 @@
|
|
|
7079
7132
|
<!-- origin -->
|
|
7080
7133
|
<!-- modification -->
|
|
7081
7134
|
<!-- ====== -->
|
|
7082
|
-
<xsl:template match="mn:termsource" name="termsource">
|
|
7135
|
+
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
7083
7136
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
7084
7137
|
|
|
7085
7138
|
<xsl:call-template name="refine_termsource-style"/>
|
|
@@ -7118,24 +7171,24 @@
|
|
|
7118
7171
|
</fo:block>
|
|
7119
7172
|
</xsl:template>
|
|
7120
7173
|
|
|
7121
|
-
<xsl:template match="mn:termsource/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
|
|
7174
|
+
<xsl:template match="mn:fmt-termsource/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
|
|
7122
7175
|
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
|
7123
7176
|
</xsl:template>
|
|
7124
7177
|
|
|
7125
|
-
<xsl:template match="mn:termsource/text()">
|
|
7178
|
+
<xsl:template match="mn:fmt-termsource/text()">
|
|
7126
7179
|
<xsl:if test="normalize-space() != ''">
|
|
7127
7180
|
<xsl:value-of select="."/>
|
|
7128
7181
|
</xsl:if>
|
|
7129
7182
|
</xsl:template>
|
|
7130
7183
|
|
|
7131
7184
|
<!-- text SOURCE: -->
|
|
7132
|
-
<xsl:template match="mn:termsource/mn:strong[1][following-sibling::*[1][self::mn:origin]]/text()">
|
|
7185
|
+
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
7133
7186
|
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
7134
7187
|
<xsl:value-of select="."/>
|
|
7135
7188
|
</fo:inline>
|
|
7136
7189
|
</xsl:template>
|
|
7137
7190
|
|
|
7138
|
-
<xsl:template match="mn:origin">
|
|
7191
|
+
<xsl:template match="mn:fmt-origin">
|
|
7139
7192
|
<xsl:call-template name="insert_basic_link">
|
|
7140
7193
|
<xsl:with-param name="element">
|
|
7141
7194
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -7181,7 +7234,7 @@
|
|
|
7181
7234
|
<!-- ====== -->
|
|
7182
7235
|
|
|
7183
7236
|
<!-- Preferred, admitted, deprecated -->
|
|
7184
|
-
<xsl:template match="mn:preferred">
|
|
7237
|
+
<xsl:template match="mn:fmt-preferred">
|
|
7185
7238
|
<xsl:variable name="level">
|
|
7186
7239
|
<xsl:call-template name="getLevel"/>
|
|
7187
7240
|
</xsl:variable>
|
|
@@ -7192,15 +7245,15 @@
|
|
|
7192
7245
|
</xsl:variable>
|
|
7193
7246
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
7194
7247
|
|
|
7195
|
-
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7248
|
+
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7196
7249
|
|
|
7197
7250
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
7198
7251
|
|
|
7199
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:name"><!-- change context -->
|
|
7252
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
7200
7253
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7201
7254
|
</xsl:for-each>
|
|
7202
7255
|
|
|
7203
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
7256
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
7204
7257
|
</fo:block>
|
|
7205
7258
|
</xsl:if>
|
|
7206
7259
|
|
|
@@ -7224,13 +7277,13 @@
|
|
|
7224
7277
|
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
|
7225
7278
|
<xsl:template match="mn:domain"/>
|
|
7226
7279
|
|
|
7227
|
-
<xsl:template match="mn:admitted">
|
|
7280
|
+
<xsl:template match="mn:fmt-admitted">
|
|
7228
7281
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
7229
7282
|
<xsl:apply-templates/>
|
|
7230
7283
|
</fo:block>
|
|
7231
7284
|
</xsl:template>
|
|
7232
7285
|
|
|
7233
|
-
<xsl:template match="mn:deprecates">
|
|
7286
|
+
<xsl:template match="mn:fmt-deprecates">
|
|
7234
7287
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
7235
7288
|
<xsl:apply-templates/>
|
|
7236
7289
|
</fo:block>
|
|
@@ -7244,7 +7297,7 @@
|
|
|
7244
7297
|
|
|
7245
7298
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
|
7246
7299
|
<!-- in metanorma xml preferred terms delimited by semicolons -->
|
|
7247
|
-
<xsl:template match="mn:preferred/text()[contains(., ';')] | mn:preferred/mn:strong/text()[contains(., ';')]">
|
|
7300
|
+
<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
|
|
7248
7301
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
|
7249
7302
|
</xsl:template>
|
|
7250
7303
|
<!-- End Preferred, admitted, deprecated -->
|
|
@@ -7263,16 +7316,16 @@
|
|
|
7263
7316
|
<!-- ========== -->
|
|
7264
7317
|
<!-- definition -->
|
|
7265
7318
|
<!-- ========== -->
|
|
7266
|
-
<xsl:template match="mn:definition">
|
|
7319
|
+
<xsl:template match="mn:fmt-definition">
|
|
7267
7320
|
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
7268
7321
|
<xsl:apply-templates/>
|
|
7269
7322
|
</fo:block>
|
|
7270
7323
|
</xsl:template>
|
|
7271
7324
|
|
|
7272
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]">
|
|
7325
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]">
|
|
7273
7326
|
<xsl:apply-templates/>
|
|
7274
7327
|
</xsl:template>
|
|
7275
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7328
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7276
7329
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
7277
7330
|
<fo:block/>
|
|
7278
7331
|
</xsl:template>
|
|
@@ -7345,12 +7398,12 @@
|
|
|
7345
7398
|
<xsl:call-template name="refine_termexample-style"/>
|
|
7346
7399
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
7347
7400
|
|
|
7348
|
-
<xsl:apply-templates select="mn:name"/>
|
|
7349
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7401
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
7402
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7350
7403
|
</fo:block>
|
|
7351
7404
|
</xsl:template>
|
|
7352
7405
|
|
|
7353
|
-
<xsl:template match="mn:termexample/mn:name">
|
|
7406
|
+
<xsl:template match="mn:termexample/mn:fmt-name">
|
|
7354
7407
|
<xsl:if test="normalize-space() != ''">
|
|
7355
7408
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
|
7356
7409
|
<xsl:call-template name="refine_termexample-name-style"/>
|
|
@@ -7404,7 +7457,7 @@
|
|
|
7404
7457
|
<xsl:call-template name="refine_example-style"/>
|
|
7405
7458
|
|
|
7406
7459
|
<xsl:variable name="fo_element">
|
|
7407
|
-
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7460
|
+
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7408
7461
|
</xsl:variable>
|
|
7409
7462
|
|
|
7410
7463
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
@@ -7415,7 +7468,7 @@
|
|
|
7415
7468
|
|
|
7416
7469
|
<!-- display name 'EXAMPLE' in a separate block -->
|
|
7417
7470
|
<fo:block>
|
|
7418
|
-
<xsl:apply-templates select="mn:name">
|
|
7471
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7419
7472
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7420
7473
|
</xsl:apply-templates>
|
|
7421
7474
|
</fo:block>
|
|
@@ -7423,7 +7476,7 @@
|
|
|
7423
7476
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7424
7477
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7425
7478
|
<xsl:variable name="example_body">
|
|
7426
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7479
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7427
7480
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7428
7481
|
</xsl:apply-templates>
|
|
7429
7482
|
</xsl:variable>
|
|
@@ -7450,14 +7503,14 @@
|
|
|
7450
7503
|
<fo:list-item>
|
|
7451
7504
|
<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
|
|
7452
7505
|
<fo:block>
|
|
7453
|
-
<xsl:apply-templates select="mn:name">
|
|
7506
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7454
7507
|
<xsl:with-param name="fo_element">block</xsl:with-param>
|
|
7455
7508
|
</xsl:apply-templates>
|
|
7456
7509
|
</fo:block>
|
|
7457
7510
|
</fo:list-item-label>
|
|
7458
7511
|
<fo:list-item-body start-indent="body-start()">
|
|
7459
7512
|
<fo:block>
|
|
7460
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7513
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7461
7514
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7462
7515
|
</xsl:apply-templates>
|
|
7463
7516
|
</fo:block>
|
|
@@ -7470,21 +7523,21 @@
|
|
|
7470
7523
|
|
|
7471
7524
|
<!-- display 'EXAMPLE' and first element in the same line -->
|
|
7472
7525
|
<fo:block>
|
|
7473
|
-
<xsl:apply-templates select="mn:name">
|
|
7526
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7474
7527
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7475
7528
|
</xsl:apply-templates>
|
|
7476
7529
|
<fo:inline>
|
|
7477
|
-
<xsl:apply-templates select="*[not(self::mn:name)][1]">
|
|
7530
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][1]">
|
|
7478
7531
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7479
7532
|
</xsl:apply-templates>
|
|
7480
7533
|
</fo:inline>
|
|
7481
7534
|
</fo:block>
|
|
7482
7535
|
|
|
7483
|
-
<xsl:if test="*[not(self::mn:name)][position() > 1]">
|
|
7536
|
+
<xsl:if test="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7484
7537
|
<!-- display further elements in blocks -->
|
|
7485
7538
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7486
7539
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7487
|
-
<xsl:apply-templates select="*[not(self::mn:name)][position() > 1]">
|
|
7540
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7488
7541
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
7489
7542
|
</xsl:apply-templates>
|
|
7490
7543
|
</fo:block-container>
|
|
@@ -7498,7 +7551,7 @@
|
|
|
7498
7551
|
</xsl:template>
|
|
7499
7552
|
|
|
7500
7553
|
<!-- example/name -->
|
|
7501
|
-
<xsl:template match="mn:example/mn:name">
|
|
7554
|
+
<xsl:template match="mn:example/mn:fmt-name">
|
|
7502
7555
|
<xsl:param name="fo_element">block</xsl:param>
|
|
7503
7556
|
|
|
7504
7557
|
<xsl:choose>
|
|
@@ -7523,7 +7576,7 @@
|
|
|
7523
7576
|
</xsl:template>
|
|
7524
7577
|
|
|
7525
7578
|
<!-- table/example/name, table/tfoot//example/name -->
|
|
7526
|
-
<xsl:template match="mn:table/mn:example/mn:name | mn:table/mn:tfoot//mn:example/mn:name">
|
|
7579
|
+
<xsl:template match="mn:table/mn:example/mn:fmt-name | mn:table/mn:tfoot//mn:example/mn:fmt-name">
|
|
7527
7580
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
7528
7581
|
<xsl:apply-templates/>
|
|
7529
7582
|
</fo:inline>
|
|
@@ -7872,7 +7925,7 @@
|
|
|
7872
7925
|
|
|
7873
7926
|
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
7874
7927
|
|
|
7875
|
-
<xsl:for-each select="mn:name">
|
|
7928
|
+
<xsl:for-each select="mn:fmt-name">
|
|
7876
7929
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7877
7930
|
</xsl:for-each>
|
|
7878
7931
|
|
|
@@ -7909,6 +7962,10 @@
|
|
|
7909
7962
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
7910
7963
|
</xsl:call-template>
|
|
7911
7964
|
|
|
7965
|
+
<xsl:call-template name="setTableStyles">
|
|
7966
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
7967
|
+
</xsl:call-template>
|
|
7968
|
+
|
|
7912
7969
|
</xsl:element>
|
|
7913
7970
|
</xsl:variable>
|
|
7914
7971
|
|
|
@@ -7929,7 +7986,7 @@
|
|
|
7929
7986
|
</xsl:attribute>
|
|
7930
7987
|
</xsl:for-each>
|
|
7931
7988
|
|
|
7932
|
-
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[
|
|
7989
|
+
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[not(parent::mn:fmt-name)] or ./mn:fmt-source"/>
|
|
7933
7990
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
7934
7991
|
<!-- <xsl:choose>
|
|
7935
7992
|
<xsl:when test="$namespace = 'plateau'"></xsl:when>
|
|
@@ -7985,7 +8042,7 @@
|
|
|
7985
8042
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
7986
8043
|
</xsl:when>
|
|
7987
8044
|
<xsl:otherwise>
|
|
7988
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:source) and not(self::mn:p) and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
|
8045
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note) and not(self::mn:example) and not(self::mn:dl) and not(self::mn:fmt-source) and not(self::mn:p) and not(self::mn:thead) and not(self::mn:tfoot) and not(self::mn:fmt-footnote-container)]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
|
|
7989
8046
|
</xsl:otherwise>
|
|
7990
8047
|
</xsl:choose>
|
|
7991
8048
|
|
|
@@ -8063,7 +8120,7 @@
|
|
|
8063
8120
|
</xsl:template>
|
|
8064
8121
|
|
|
8065
8122
|
<!-- table/name-->
|
|
8066
|
-
<xsl:template match="*[local-name()='table']/mn:name">
|
|
8123
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-name">
|
|
8067
8124
|
<xsl:param name="continued"/>
|
|
8068
8125
|
<xsl:param name="cols-count"/>
|
|
8069
8126
|
<xsl:if test="normalize-space() != ''">
|
|
@@ -8092,7 +8149,7 @@
|
|
|
8092
8149
|
</xsl:template>
|
|
8093
8150
|
|
|
8094
8151
|
<!-- SOURCE: ... -->
|
|
8095
|
-
<xsl:template match="*[local-name()='table']/mn:source" priority="2">
|
|
8152
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-source" priority="2">
|
|
8096
8153
|
<xsl:call-template name="termsource"/>
|
|
8097
8154
|
</xsl:template>
|
|
8098
8155
|
|
|
@@ -8257,11 +8314,11 @@
|
|
|
8257
8314
|
<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
|
|
8258
8315
|
</xsl:template>
|
|
8259
8316
|
|
|
8260
|
-
<xsl:template match="mn:termsource" mode="td_text">
|
|
8261
|
-
<xsl:value-of select="
|
|
8317
|
+
<xsl:template match="mn:fmt-termsource" mode="td_text">
|
|
8318
|
+
<xsl:value-of select="mn:fmt-origin/@citeas"/>
|
|
8262
8319
|
</xsl:template>
|
|
8263
8320
|
|
|
8264
|
-
<xsl:template match="mn:link" mode="td_text">
|
|
8321
|
+
<xsl:template match="mn:fmt-link" mode="td_text">
|
|
8265
8322
|
<xsl:value-of select="@target"/>
|
|
8266
8323
|
</xsl:template>
|
|
8267
8324
|
|
|
@@ -8472,7 +8529,7 @@
|
|
|
8472
8529
|
|
|
8473
8530
|
<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
|
|
8474
8531
|
|
|
8475
|
-
<xsl:apply-templates select="ancestor::mn:table/mn:name">
|
|
8532
|
+
<xsl:apply-templates select="ancestor::mn:table/mn:fmt-name">
|
|
8476
8533
|
<xsl:with-param name="continued">true</xsl:with-param>
|
|
8477
8534
|
</xsl:apply-templates>
|
|
8478
8535
|
|
|
@@ -8513,7 +8570,7 @@
|
|
|
8513
8570
|
<xsl:param name="colwidths"/>
|
|
8514
8571
|
<xsl:param name="colgroup"/>
|
|
8515
8572
|
|
|
8516
|
-
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[
|
|
8573
|
+
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
|
|
8517
8574
|
|
|
8518
8575
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
8519
8576
|
</xsl:variable>
|
|
@@ -8554,6 +8611,12 @@
|
|
|
8554
8611
|
</xsl:choose>
|
|
8555
8612
|
</xsl:for-each>
|
|
8556
8613
|
|
|
8614
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8615
|
+
<xsl:call-template name="setTableStyles">
|
|
8616
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8617
|
+
</xsl:call-template>
|
|
8618
|
+
</xsl:for-each>
|
|
8619
|
+
|
|
8557
8620
|
<xsl:choose>
|
|
8558
8621
|
<xsl:when test="xalan:nodeset($colgroup)//mn:col">
|
|
8559
8622
|
<xsl:for-each select="xalan:nodeset($colgroup)//mn:col">
|
|
@@ -8570,10 +8633,22 @@
|
|
|
8570
8633
|
|
|
8571
8634
|
<fo:table-body role="SKIP">
|
|
8572
8635
|
<fo:table-row role="SKIP">
|
|
8636
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8637
|
+
<xsl:call-template name="setTableStyles">
|
|
8638
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8639
|
+
</xsl:call-template>
|
|
8640
|
+
</xsl:for-each>
|
|
8641
|
+
|
|
8573
8642
|
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
|
|
8574
8643
|
|
|
8575
8644
|
<xsl:call-template name="refine_table-footer-cell-style"/>
|
|
8576
8645
|
|
|
8646
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8647
|
+
<xsl:call-template name="setTableStyles">
|
|
8648
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8649
|
+
</xsl:call-template>
|
|
8650
|
+
</xsl:for-each>
|
|
8651
|
+
|
|
8577
8652
|
<xsl:call-template name="setBordersTableArray"/>
|
|
8578
8653
|
|
|
8579
8654
|
<!-- fn will be processed inside 'note' processing -->
|
|
@@ -8581,7 +8656,7 @@
|
|
|
8581
8656
|
<xsl:apply-templates select="../mn:dl"/>
|
|
8582
8657
|
<xsl:apply-templates select="../mn:note[not(@type = 'units')]"/>
|
|
8583
8658
|
<xsl:apply-templates select="../mn:example"/>
|
|
8584
|
-
<xsl:apply-templates select="../mn:source"/>
|
|
8659
|
+
<xsl:apply-templates select="../mn:fmt-source"/>
|
|
8585
8660
|
|
|
8586
8661
|
<xsl:variable name="isDisplayRowSeparator">
|
|
8587
8662
|
</xsl:variable>
|
|
@@ -8631,7 +8706,7 @@
|
|
|
8631
8706
|
</xsl:choose>
|
|
8632
8707
|
</xsl:variable>
|
|
8633
8708
|
<!-- if there isn't 'thead' and there is a table's title -->
|
|
8634
|
-
<xsl:if test="not(ancestor::mn:table/mn:thead) and ancestor::mn:table/mn:name">
|
|
8709
|
+
<xsl:if test="not(ancestor::mn:table/mn:thead) and ancestor::mn:table/mn:fmt-name">
|
|
8635
8710
|
<fo:table-header>
|
|
8636
8711
|
<xsl:call-template name="table-header-title">
|
|
8637
8712
|
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
@@ -8658,7 +8733,7 @@
|
|
|
8658
8733
|
<xsl:variable name="title_continued"><xsl:value-of select="$title_continued_in_parenthesis"/>
|
|
8659
8734
|
</xsl:variable>
|
|
8660
8735
|
|
|
8661
|
-
<xsl:variable name="title_start" select="ancestor::mn:table[1]/mn:name/node()[1][self::text()]"/>
|
|
8736
|
+
<xsl:variable name="title_start" select="ancestor::mn:table[1]/mn:fmt-name/node()[1][self::text()]"/>
|
|
8662
8737
|
<xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
|
|
8663
8738
|
|
|
8664
8739
|
<fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
|
|
@@ -8806,7 +8881,12 @@
|
|
|
8806
8881
|
|
|
8807
8882
|
<xsl:template name="setTableRowAttributes">
|
|
8808
8883
|
|
|
8809
|
-
<xsl:
|
|
8884
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8885
|
+
<xsl:call-template name="setTableStyles">
|
|
8886
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8887
|
+
</xsl:call-template>
|
|
8888
|
+
</xsl:for-each>
|
|
8889
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8810
8890
|
|
|
8811
8891
|
</xsl:template> <!-- setTableRowAttributes -->
|
|
8812
8892
|
<!-- ===================== -->
|
|
@@ -8859,7 +8939,13 @@
|
|
|
8859
8939
|
</xsl:attribute>
|
|
8860
8940
|
</xsl:if>
|
|
8861
8941
|
<xsl:call-template name="display-align"/>
|
|
8862
|
-
|
|
8942
|
+
|
|
8943
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8944
|
+
<xsl:call-template name="setTableStyles">
|
|
8945
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8946
|
+
</xsl:call-template>
|
|
8947
|
+
</xsl:for-each>
|
|
8948
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8863
8949
|
</xsl:template>
|
|
8864
8950
|
|
|
8865
8951
|
<xsl:template name="display-align">
|
|
@@ -8875,7 +8961,8 @@
|
|
|
8875
8961
|
</xsl:if>
|
|
8876
8962
|
</xsl:template>
|
|
8877
8963
|
|
|
8878
|
-
<xsl:template name="
|
|
8964
|
+
<xsl:template name="setTableStyles">
|
|
8965
|
+
<xsl:param name="scope">cell</xsl:param>
|
|
8879
8966
|
<xsl:variable name="styles__">
|
|
8880
8967
|
<xsl:call-template name="split">
|
|
8881
8968
|
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
|
@@ -8884,19 +8971,35 @@
|
|
|
8884
8971
|
</xsl:variable>
|
|
8885
8972
|
<xsl:variable name="quot">"</xsl:variable>
|
|
8886
8973
|
<xsl:variable name="styles_">
|
|
8974
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
|
8975
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
|
8976
|
+
<style name="border-top">none</style>
|
|
8977
|
+
<style name="border-right">none</style>
|
|
8978
|
+
<style name="border-left">none</style>
|
|
8979
|
+
<style name="border-bottom">none</style>
|
|
8980
|
+
<style name="color">inherit</style>
|
|
8981
|
+
<style name="background-color">transparent</style>
|
|
8982
|
+
</xsl:if>
|
|
8983
|
+
|
|
8887
8984
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
8888
8985
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
8889
8986
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
8890
|
-
<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'">
|
|
8987
|
+
<xsl:if test="($key = 'color' and ($scope = 'cell' or $scope = 'table')) or ($key = 'background-color' and ($scope = 'cell' or $scope = 'ancestor_table')) 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'">
|
|
8891
8988
|
<style name="{$key}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), 'currentColor', 'inherit')"/></style>
|
|
8892
8989
|
</xsl:if>
|
|
8990
|
+
<xsl:if test="$key = 'border' and ($scope = 'table' or $scope = 'ancestor_table' or $scope = 'ancestor_table_borders_only')">
|
|
8991
|
+
<style name="{$key}-top"><xsl:value-of select="$value"/></style>
|
|
8992
|
+
<style name="{$key}-right"><xsl:value-of select="$value"/></style>
|
|
8993
|
+
<style name="{$key}-left"><xsl:value-of select="$value"/></style>
|
|
8994
|
+
<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
|
|
8995
|
+
</xsl:if>
|
|
8893
8996
|
</xsl:for-each>
|
|
8894
8997
|
</xsl:variable>
|
|
8895
8998
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
8896
8999
|
<xsl:for-each select="$styles/style">
|
|
8897
9000
|
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
|
8898
9001
|
</xsl:for-each>
|
|
8899
|
-
</xsl:template> <!--
|
|
9002
|
+
</xsl:template> <!-- setTableStyles -->
|
|
8900
9003
|
|
|
8901
9004
|
<!-- cell in table body, footer -->
|
|
8902
9005
|
<xsl:template match="*[local-name()='td']" name="td">
|
|
@@ -8960,11 +9063,11 @@
|
|
|
8960
9063
|
|
|
8961
9064
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
8962
9065
|
|
|
8963
|
-
<xsl:apply-templates select="mn:name"/>
|
|
9066
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
8964
9067
|
|
|
8965
9068
|
</fo:inline>
|
|
8966
9069
|
|
|
8967
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
9070
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
8968
9071
|
</fo:block>
|
|
8969
9072
|
</xsl:template> <!-- table/note -->
|
|
8970
9073
|
|
|
@@ -9103,7 +9206,7 @@
|
|
|
9103
9206
|
|
|
9104
9207
|
<!-- footnotes for table's name rendering -->
|
|
9105
9208
|
<xsl:template name="table_name_fn_display">
|
|
9106
|
-
<xsl:for-each select="mn:name//mn:fn">
|
|
9209
|
+
<xsl:for-each select="mn:fmt-name//mn:fn">
|
|
9107
9210
|
<xsl:variable name="reference" select="@reference"/>
|
|
9108
9211
|
<fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
|
|
9109
9212
|
<fo:block margin-bottom="12pt">
|
|
@@ -9760,7 +9863,7 @@
|
|
|
9760
9863
|
</xsl:if> -->
|
|
9761
9864
|
|
|
9762
9865
|
<xsl:variable name="words">
|
|
9763
|
-
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
9866
|
+
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'fmt-stem']">
|
|
9764
9867
|
<word>
|
|
9765
9868
|
<xsl:copy-of select="."/>
|
|
9766
9869
|
</word>
|
|
@@ -9819,7 +9922,7 @@
|
|
|
9819
9922
|
</xsl:copy>
|
|
9820
9923
|
</xsl:template>
|
|
9821
9924
|
|
|
9822
|
-
<xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9925
|
+
<xsl:template match="*[local-name() = 'fmt-stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9823
9926
|
|
|
9824
9927
|
<xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting">
|
|
9825
9928
|
<xsl:variable name="formatting_tags">
|
|
@@ -9854,7 +9957,7 @@
|
|
|
9854
9957
|
</xsl:call-template>
|
|
9855
9958
|
</xsl:template>
|
|
9856
9959
|
|
|
9857
|
-
<xsl:template match="mn:link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9960
|
+
<xsl:template match="mn:fmt-link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9858
9961
|
<xsl:variable name="link">
|
|
9859
9962
|
<link_updated>
|
|
9860
9963
|
<xsl:variable name="target_text">
|
|
@@ -10071,7 +10174,7 @@
|
|
|
10071
10174
|
|
|
10072
10175
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
10073
10176
|
|
|
10074
|
-
<xsl:apply-templates select="mn:name">
|
|
10177
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
10075
10178
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
10076
10179
|
</xsl:apply-templates>
|
|
10077
10180
|
|
|
@@ -10254,7 +10357,7 @@
|
|
|
10254
10357
|
</xsl:template> <!-- refine_multicomponent_block_style -->
|
|
10255
10358
|
|
|
10256
10359
|
<!-- dl/name -->
|
|
10257
|
-
<xsl:template match="mn:dl/mn:name">
|
|
10360
|
+
<xsl:template match="mn:dl/mn:fmt-name">
|
|
10258
10361
|
<xsl:param name="process">false</xsl:param>
|
|
10259
10362
|
<xsl:if test="$process = 'true'">
|
|
10260
10363
|
<fo:block xsl:use-attribute-sets="dl-name-style">
|
|
@@ -10665,12 +10768,12 @@
|
|
|
10665
10768
|
<xsl:template match="mn:appendix">
|
|
10666
10769
|
<xsl:call-template name="setNamedDestination"/>
|
|
10667
10770
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
|
|
10668
|
-
<xsl:apply-templates select="mn:title"/>
|
|
10771
|
+
<xsl:apply-templates select="mn:fmt-title"/>
|
|
10669
10772
|
</fo:block>
|
|
10670
|
-
<xsl:apply-templates select="node()[not(
|
|
10773
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
|
|
10671
10774
|
</xsl:template>
|
|
10672
10775
|
|
|
10673
|
-
<xsl:template match="mn:appendix/mn:title" priority="2">
|
|
10776
|
+
<xsl:template match="mn:appendix/mn:fmt-title" priority="2">
|
|
10674
10777
|
<xsl:variable name="level">
|
|
10675
10778
|
<xsl:call-template name="getLevel"/>
|
|
10676
10779
|
</xsl:variable>
|
|
@@ -10683,9 +10786,9 @@
|
|
|
10683
10786
|
<xsl:template match="mn:appendix//mn:example" priority="2">
|
|
10684
10787
|
<xsl:call-template name="setNamedDestination"/>
|
|
10685
10788
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
|
10686
|
-
<xsl:apply-templates select="mn:name"/>
|
|
10789
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10687
10790
|
</fo:block>
|
|
10688
|
-
<xsl:apply-templates select="node()[not(
|
|
10791
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10689
10792
|
</xsl:template>
|
|
10690
10793
|
|
|
10691
10794
|
<xsl:attribute-set name="xref-style">
|
|
@@ -10693,7 +10796,7 @@
|
|
|
10693
10796
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
10694
10797
|
</xsl:attribute-set>
|
|
10695
10798
|
|
|
10696
|
-
<xsl:template match="mn:xref">
|
|
10799
|
+
<xsl:template match="mn:fmt-xref">
|
|
10697
10800
|
<xsl:call-template name="insert_basic_link">
|
|
10698
10801
|
<xsl:with-param name="element">
|
|
10699
10802
|
<xsl:variable name="alt_text">
|
|
@@ -10713,7 +10816,7 @@
|
|
|
10713
10816
|
</xsl:template> <!-- xref -->
|
|
10714
10817
|
|
|
10715
10818
|
<!-- command between two xref points to non-standard bibitem -->
|
|
10716
|
-
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][self::mn:sup][mn:xref[@type = 'footnote']] and following-sibling::node()[1][self::mn:sup][mn:xref[@type = 'footnote']]]"><xsl:value-of select="."/>
|
|
10819
|
+
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][self::mn:sup][mn:fmt-xref[@type = 'footnote']] and following-sibling::node()[1][self::mn:sup][mn:fmt-xref[@type = 'footnote']]]"><xsl:value-of select="."/>
|
|
10717
10820
|
</xsl:template>
|
|
10718
10821
|
|
|
10719
10822
|
<xsl:attribute-set name="eref-style">
|
|
@@ -10750,7 +10853,7 @@
|
|
|
10750
10853
|
<!-- ====== -->
|
|
10751
10854
|
<!-- eref -->
|
|
10752
10855
|
<!-- ====== -->
|
|
10753
|
-
<xsl:template match="mn:eref" name="eref">
|
|
10856
|
+
<xsl:template match="mn:fmt-eref" name="eref">
|
|
10754
10857
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
10755
10858
|
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/mn:uri[@type = 'citation'])"/> -->
|
|
10756
10859
|
<xsl:variable name="external-destination" select="normalize-space($bibitems/mn:bibitem[@id = $current_bibitemid]/mn:uri[@type = 'citation'])"/>
|
|
@@ -10875,7 +10978,10 @@
|
|
|
10875
10978
|
|
|
10876
10979
|
<xsl:call-template name="setNamedDestination"/>
|
|
10877
10980
|
|
|
10878
|
-
<fo:block-container
|
|
10981
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
|
10982
|
+
<xsl:if test="not(parent::mn:references)">
|
|
10983
|
+
<xsl:copy-of select="@id"/>
|
|
10984
|
+
</xsl:if>
|
|
10879
10985
|
|
|
10880
10986
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
10881
10987
|
|
|
@@ -10888,28 +10994,28 @@
|
|
|
10888
10994
|
|
|
10889
10995
|
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
10890
10996
|
|
|
10891
|
-
<xsl:apply-templates select="mn:name/mn:tab" mode="tab"/>
|
|
10997
|
+
<xsl:apply-templates select="mn:fmt-name/mn:tab" mode="tab"/>
|
|
10892
10998
|
|
|
10893
10999
|
<xsl:call-template name="refine_note-name-style"/>
|
|
10894
11000
|
|
|
10895
11001
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
10896
11002
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10897
|
-
<xsl:if test="*[not(
|
|
11003
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
10898
11004
|
<xsl:call-template name="append_add-style"/>
|
|
10899
11005
|
</xsl:if>
|
|
10900
11006
|
|
|
10901
11007
|
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
|
10902
|
-
<xsl:if test="count(*[not(self::mn:name)]) = 1 and *[not(self::mn:name)]/node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10903
|
-
<xsl:apply-templates select="*[not(self::mn:name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11008
|
+
<xsl:if test="count(*[not(self::mn:fmt-name)]) = 1 and *[not(self::mn:fmt-name)]/node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11009
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
10904
11010
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10905
11011
|
</xsl:apply-templates>
|
|
10906
11012
|
</xsl:if>
|
|
10907
11013
|
|
|
10908
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11014
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10909
11015
|
|
|
10910
11016
|
</fo:inline>
|
|
10911
11017
|
|
|
10912
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11018
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10913
11019
|
</fo:block>
|
|
10914
11020
|
</fo:block-container>
|
|
10915
11021
|
</fo:block-container>
|
|
@@ -10948,19 +11054,19 @@
|
|
|
10948
11054
|
|
|
10949
11055
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
10950
11056
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
10951
|
-
<xsl:if test="*[not(
|
|
11057
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
10952
11058
|
<xsl:call-template name="append_add-style"/>
|
|
10953
11059
|
</xsl:if>
|
|
10954
11060
|
|
|
10955
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11061
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10956
11062
|
|
|
10957
11063
|
</fo:inline>
|
|
10958
11064
|
|
|
10959
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11065
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10960
11066
|
</fo:block>
|
|
10961
11067
|
</xsl:template>
|
|
10962
11068
|
|
|
10963
|
-
<xsl:template match="mn:note/mn:name">
|
|
11069
|
+
<xsl:template match="mn:note/mn:fmt-name">
|
|
10964
11070
|
<xsl:param name="sfx"/>
|
|
10965
11071
|
<xsl:variable name="suffix">
|
|
10966
11072
|
<xsl:choose>
|
|
@@ -10987,7 +11093,7 @@
|
|
|
10987
11093
|
</xsl:if>
|
|
10988
11094
|
</xsl:template>
|
|
10989
11095
|
|
|
10990
|
-
<xsl:template match="mn:termnote/mn:name">
|
|
11096
|
+
<xsl:template match="mn:termnote/mn:fmt-name">
|
|
10991
11097
|
<xsl:param name="sfx"/>
|
|
10992
11098
|
<xsl:variable name="suffix">
|
|
10993
11099
|
<xsl:choose>
|
|
@@ -11067,15 +11173,15 @@
|
|
|
11067
11173
|
|
|
11068
11174
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
11069
11175
|
<fo:block role="BlockQuote">
|
|
11070
|
-
<xsl:apply-templates select="./node()[not(self::mn:author) and not(self::mn:source) and not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
|
|
11176
|
+
<xsl:apply-templates select="./node()[not(self::mn:author) and not(self::mn:fmt-source) and not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
|
|
11071
11177
|
</fo:block>
|
|
11072
11178
|
</fo:block-container>
|
|
11073
11179
|
</fo:block-container>
|
|
11074
|
-
<xsl:if test="mn:author or mn:source or mn:attribution">
|
|
11180
|
+
<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
|
|
11075
11181
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
11076
11182
|
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
11077
11183
|
<xsl:apply-templates select="mn:author"/>
|
|
11078
|
-
<xsl:apply-templates select="mn:source"/>
|
|
11184
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
11079
11185
|
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
11080
11186
|
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
11081
11187
|
</fo:block>
|
|
@@ -11085,17 +11191,32 @@
|
|
|
11085
11191
|
</fo:block-container>
|
|
11086
11192
|
</xsl:template>
|
|
11087
11193
|
|
|
11088
|
-
<xsl:template match="mn:source">
|
|
11194
|
+
<xsl:template match="mn:fmt-source">
|
|
11089
11195
|
<xsl:if test="../mn:author">
|
|
11090
11196
|
<xsl:text>, </xsl:text>
|
|
11091
11197
|
</xsl:if>
|
|
11092
|
-
<xsl:
|
|
11093
|
-
<xsl:
|
|
11094
|
-
<fo:
|
|
11095
|
-
<xsl:
|
|
11096
|
-
|
|
11097
|
-
|
|
11098
|
-
|
|
11198
|
+
<xsl:choose>
|
|
11199
|
+
<xsl:when test="not(parent::quote)">
|
|
11200
|
+
<fo:block>
|
|
11201
|
+
<xsl:call-template name="insert_basic_link">
|
|
11202
|
+
<xsl:with-param name="element">
|
|
11203
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11204
|
+
<xsl:apply-templates/>
|
|
11205
|
+
</fo:basic-link>
|
|
11206
|
+
</xsl:with-param>
|
|
11207
|
+
</xsl:call-template>
|
|
11208
|
+
</fo:block>
|
|
11209
|
+
</xsl:when>
|
|
11210
|
+
<xsl:otherwise>
|
|
11211
|
+
<xsl:call-template name="insert_basic_link">
|
|
11212
|
+
<xsl:with-param name="element">
|
|
11213
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11214
|
+
<xsl:apply-templates/>
|
|
11215
|
+
</fo:basic-link>
|
|
11216
|
+
</xsl:with-param>
|
|
11217
|
+
</xsl:call-template>
|
|
11218
|
+
</xsl:otherwise>
|
|
11219
|
+
</xsl:choose>
|
|
11099
11220
|
</xsl:template>
|
|
11100
11221
|
|
|
11101
11222
|
<xsl:template match="mn:author">
|
|
@@ -11176,7 +11297,7 @@
|
|
|
11176
11297
|
<ancestor><xsl:copy-of select="ancestor::mn:figure[.//mn:name[.//mn:fn]]"/></ancestor> -->
|
|
11177
11298
|
<xsl:choose>
|
|
11178
11299
|
<!-- skip figure/name/fn -->
|
|
11179
|
-
<xsl:when test="ancestor::mn:figure[.//mn:name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11300
|
+
<xsl:when test="ancestor::mn:figure[.//mn:fmt-name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11180
11301
|
<xsl:otherwise>
|
|
11181
11302
|
<xsl:element name="figure" namespace="{$namespace_full}">
|
|
11182
11303
|
<xsl:element name="fmt-footnote-container" namespace="{$namespace_full}">
|
|
@@ -11372,17 +11493,17 @@
|
|
|
11372
11493
|
|
|
11373
11494
|
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
11374
11495
|
|
|
11375
|
-
<xsl:for-each select="mn:name"> <!-- set context -->
|
|
11496
|
+
<xsl:for-each select="mn:fmt-name"> <!-- set context -->
|
|
11376
11497
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
11377
11498
|
</xsl:for-each>
|
|
11378
11499
|
|
|
11379
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note and @type = 'units')]"/>
|
|
11500
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note and @type = 'units')]"/>
|
|
11380
11501
|
</fo:block>
|
|
11381
11502
|
|
|
11382
11503
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11383
11504
|
<xsl:call-template name="showFigureKey"/>
|
|
11384
11505
|
</xsl:if>
|
|
11385
|
-
<xsl:apply-templates select="mn:name"/> <!-- show figure's name AFTER image -->
|
|
11506
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
11386
11507
|
|
|
11387
11508
|
</fo:block-container>
|
|
11388
11509
|
</xsl:template>
|
|
@@ -11408,9 +11529,9 @@
|
|
|
11408
11529
|
<xsl:template match="mn:figure[@class = 'pseudocode']">
|
|
11409
11530
|
<xsl:call-template name="setNamedDestination"/>
|
|
11410
11531
|
<fo:block id="{@id}">
|
|
11411
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11532
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11412
11533
|
</fo:block>
|
|
11413
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11534
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11414
11535
|
</xsl:template>
|
|
11415
11536
|
|
|
11416
11537
|
<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
|
|
@@ -11421,7 +11542,7 @@
|
|
|
11421
11542
|
|
|
11422
11543
|
<!-- SOURCE: ... -->
|
|
11423
11544
|
<!-- figure/source -->
|
|
11424
|
-
<xsl:template match="mn:figure/mn:source" priority="2">
|
|
11545
|
+
<xsl:template match="mn:figure/mn:fmt-source" priority="2">
|
|
11425
11546
|
<xsl:call-template name="termsource"/>
|
|
11426
11547
|
</xsl:template>
|
|
11427
11548
|
|
|
@@ -11431,7 +11552,7 @@
|
|
|
11431
11552
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
11432
11553
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
11433
11554
|
<xsl:choose>
|
|
11434
|
-
<xsl:when test="ancestor::mn:title or not(parent::mn:figure) or parent::mn:p"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
|
|
11555
|
+
<xsl:when test="ancestor::mn:fmt-title or not(parent::mn:figure) or parent::mn:p"> <!-- inline image ( 'image:path' in adoc, with one colon after image) -->
|
|
11435
11556
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
11436
11557
|
<xsl:if test="not(parent::mn:figure) or parent::mn:p">
|
|
11437
11558
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
@@ -11452,13 +11573,26 @@
|
|
|
11452
11573
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
11453
11574
|
|
|
11454
11575
|
<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
|
|
11455
|
-
<xsl:attribute name="
|
|
11576
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
11577
|
+
<xsl:choose>
|
|
11578
|
+
<xsl:when test="@width and not(@height)">
|
|
11579
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
11580
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11581
|
+
</xsl:when>
|
|
11582
|
+
<xsl:when test="@height and not(@width)">
|
|
11583
|
+
<xsl:attribute name="height">100%</xsl:attribute>
|
|
11584
|
+
<xsl:attribute name="content-height"><xsl:value-of select="@height"/></xsl:attribute>
|
|
11585
|
+
</xsl:when>
|
|
11586
|
+
<xsl:when test="not(@width) and not(@height)">
|
|
11587
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11588
|
+
</xsl:when>
|
|
11589
|
+
</xsl:choose>
|
|
11590
|
+
|
|
11456
11591
|
<xsl:if test="normalize-space($logo_width) != ''">
|
|
11457
11592
|
<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
|
|
11458
11593
|
</xsl:if>
|
|
11459
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11460
11594
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
11461
|
-
<xsl:attribute name="
|
|
11595
|
+
<xsl:attribute name="vertical-align">top</xsl:attribute>
|
|
11462
11596
|
</xsl:if>
|
|
11463
11597
|
|
|
11464
11598
|
<xsl:variable name="width">
|
|
@@ -11747,7 +11881,7 @@
|
|
|
11747
11881
|
<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
|
|
11748
11882
|
<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
|
|
11749
11883
|
|
|
11750
|
-
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:name/mn:bookmark" priority="2"/>
|
|
11884
|
+
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:fmt-name/mn:bookmark" priority="2"/>
|
|
11751
11885
|
<xsl:template match="mn:figure[not(mn:image)]/*[local-name() = 'svg']" priority="2" name="image_svg">
|
|
11752
11886
|
<xsl:param name="name"/>
|
|
11753
11887
|
|
|
@@ -11757,8 +11891,8 @@
|
|
|
11757
11891
|
|
|
11758
11892
|
<xsl:variable name="alt-text">
|
|
11759
11893
|
<xsl:choose>
|
|
11760
|
-
<xsl:when test="normalize-space(../mn:name) != ''">
|
|
11761
|
-
<xsl:value-of select="../mn:name"/>
|
|
11894
|
+
<xsl:when test="normalize-space(../mn:fmt-name) != ''">
|
|
11895
|
+
<xsl:value-of select="../mn:fmt-name"/>
|
|
11762
11896
|
</xsl:when>
|
|
11763
11897
|
<xsl:when test="normalize-space($name) != ''">
|
|
11764
11898
|
<xsl:value-of select="$name"/>
|
|
@@ -11767,7 +11901,7 @@
|
|
|
11767
11901
|
</xsl:choose>
|
|
11768
11902
|
</xsl:variable>
|
|
11769
11903
|
|
|
11770
|
-
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:title] and 1 = 1)"/>
|
|
11904
|
+
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:fmt-title] and 1 = 1)"/>
|
|
11771
11905
|
|
|
11772
11906
|
<xsl:choose>
|
|
11773
11907
|
<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
|
|
@@ -11816,9 +11950,9 @@
|
|
|
11816
11950
|
<fo:table-cell column-number="2">
|
|
11817
11951
|
<fo:block>
|
|
11818
11952
|
<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
|
|
11819
|
-
<xsl:if test="../mn:name/mn:bookmark">
|
|
11953
|
+
<xsl:if test="../mn:fmt-name/mn:bookmark">
|
|
11820
11954
|
<fo:block line-height="0" font-size="0">
|
|
11821
|
-
<xsl:for-each select="../mn:name/mn:bookmark">
|
|
11955
|
+
<xsl:for-each select="../mn:fmt-name/mn:bookmark">
|
|
11822
11956
|
<xsl:call-template name="bookmark"/>
|
|
11823
11957
|
</xsl:for-each>
|
|
11824
11958
|
</fo:block>
|
|
@@ -12058,7 +12192,7 @@
|
|
|
12058
12192
|
|
|
12059
12193
|
<!-- image with svg and emf -->
|
|
12060
12194
|
<xsl:template match="mn:figure/mn:image[*[local-name() = 'svg']]" priority="3">
|
|
12061
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12195
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12062
12196
|
<xsl:for-each select="*[local-name() = 'svg']">
|
|
12063
12197
|
<xsl:call-template name="image_svg">
|
|
12064
12198
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12075,7 +12209,7 @@
|
|
|
12075
12209
|
|
|
12076
12210
|
<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
12077
12211
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
12078
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12212
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12079
12213
|
<xsl:for-each select="xalan:nodeset($svg_content)/node()">
|
|
12080
12214
|
<xsl:call-template name="image_svg">
|
|
12081
12215
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12198,7 +12332,7 @@
|
|
|
12198
12332
|
<xsl:template match="mn:emf"/>
|
|
12199
12333
|
|
|
12200
12334
|
<!-- figure/name -->
|
|
12201
|
-
<xsl:template match="mn:figure/mn:name | mn:image/mn:name">
|
|
12335
|
+
<xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
|
|
12202
12336
|
<xsl:if test="normalize-space() != ''">
|
|
12203
12337
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
12204
12338
|
|
|
@@ -12270,25 +12404,25 @@
|
|
|
12270
12404
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
12271
12405
|
<xsl:call-template name="setNamedDestination"/>
|
|
12272
12406
|
<fo:block id="{@id}">
|
|
12273
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12407
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12274
12408
|
</fo:block>
|
|
12275
12409
|
</fo:block-container>
|
|
12276
12410
|
</fo:block-container>
|
|
12277
12411
|
</xsl:template>
|
|
12278
12412
|
|
|
12279
|
-
<xsl:template match="mn:formula/mn:dt/mn:stem">
|
|
12413
|
+
<xsl:template match="mn:formula/mn:dt/mn:fmt-stem">
|
|
12280
12414
|
<fo:inline>
|
|
12281
12415
|
<xsl:apply-templates/>
|
|
12282
12416
|
</fo:inline>
|
|
12283
12417
|
</xsl:template>
|
|
12284
12418
|
|
|
12285
|
-
<xsl:template match="mn:admitted/mn:stem">
|
|
12419
|
+
<xsl:template match="mn:fmt-admitted/mn:fmt-stem">
|
|
12286
12420
|
<fo:inline>
|
|
12287
12421
|
<xsl:apply-templates/>
|
|
12288
12422
|
</fo:inline>
|
|
12289
12423
|
</xsl:template>
|
|
12290
12424
|
|
|
12291
|
-
<xsl:template match="mn:formula/mn:name"> <!-- show in 'stem' template -->
|
|
12425
|
+
<xsl:template match="mn:formula/mn:fmt-name"> <!-- show in 'stem' template -->
|
|
12292
12426
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
|
12293
12427
|
<xsl:if test="normalize-space() != ''">
|
|
12294
12428
|
<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
|
|
@@ -12297,7 +12431,7 @@
|
|
|
12297
12431
|
</xsl:template>
|
|
12298
12432
|
|
|
12299
12433
|
<!-- stem inside formula with name (with formula's number) -->
|
|
12300
|
-
<xsl:template match="mn:formula[mn:name]/mn:stem">
|
|
12434
|
+
<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
|
|
12301
12435
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12302
12436
|
|
|
12303
12437
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -12317,13 +12451,13 @@
|
|
|
12317
12451
|
|
|
12318
12452
|
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
|
12319
12453
|
|
|
12320
|
-
<xsl:for-each select="../mn:name">
|
|
12454
|
+
<xsl:for-each select="../mn:fmt-name">
|
|
12321
12455
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
12322
12456
|
</xsl:for-each>
|
|
12323
12457
|
|
|
12324
12458
|
<xsl:call-template name="refine_formula-stem-number-style"/>
|
|
12325
12459
|
|
|
12326
|
-
<xsl:apply-templates select="../mn:name"/>
|
|
12460
|
+
<xsl:apply-templates select="../mn:fmt-name"/>
|
|
12327
12461
|
</fo:block>
|
|
12328
12462
|
</fo:table-cell>
|
|
12329
12463
|
</fo:table-row>
|
|
@@ -12333,7 +12467,7 @@
|
|
|
12333
12467
|
</xsl:template>
|
|
12334
12468
|
|
|
12335
12469
|
<!-- stem inside formula without name (without formula's number) -->
|
|
12336
|
-
<xsl:template match="mn:formula[not(mn:name)]/mn:stem">
|
|
12470
|
+
<xsl:template match="mn:formula[not(mn:fmt-name)]/mn:fmt-stem">
|
|
12337
12471
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12338
12472
|
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
12339
12473
|
<xsl:apply-templates/>
|
|
@@ -12688,7 +12822,7 @@
|
|
|
12688
12822
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
12689
12823
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
12690
12824
|
-->
|
|
12691
|
-
<xsl:template match="mn:stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12825
|
+
<xsl:template match="mn:fmt-stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:fmt-stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12692
12826
|
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
12693
12827
|
|
|
12694
12828
|
<xsl:call-template name="refine_mathml-style"/>
|
|
@@ -12971,7 +13105,7 @@
|
|
|
12971
13105
|
|
|
12972
13106
|
<xsl:template match="mn:ul | mn:ol" mode="list" name="list">
|
|
12973
13107
|
|
|
12974
|
-
<xsl:apply-templates select="mn:name">
|
|
13108
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
12975
13109
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
12976
13110
|
</xsl:apply-templates>
|
|
12977
13111
|
|
|
@@ -13017,7 +13151,7 @@
|
|
|
13017
13151
|
|
|
13018
13152
|
<xsl:call-template name="refine_list-style"/>
|
|
13019
13153
|
|
|
13020
|
-
<xsl:if test="mn:name">
|
|
13154
|
+
<xsl:if test="mn:fmt-name">
|
|
13021
13155
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
13022
13156
|
</xsl:if>
|
|
13023
13157
|
|
|
@@ -13032,7 +13166,7 @@
|
|
|
13032
13166
|
<xsl:template name="refine_list-style_provisional-distance-between-starts">
|
|
13033
13167
|
</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
|
|
13034
13168
|
|
|
13035
|
-
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:name">
|
|
13169
|
+
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:fmt-name">
|
|
13036
13170
|
<xsl:param name="process">false</xsl:param>
|
|
13037
13171
|
<xsl:if test="$process = 'true'">
|
|
13038
13172
|
<fo:block xsl:use-attribute-sets="list-name-style">
|
|
@@ -13169,7 +13303,7 @@
|
|
|
13169
13303
|
-->
|
|
13170
13304
|
<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
|
|
13171
13305
|
<!-- fn in text -->
|
|
13172
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" priority="2" name="fn">
|
|
13306
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" priority="2" name="fn">
|
|
13173
13307
|
<xsl:param name="footnote_body_from_table">false</xsl:param>
|
|
13174
13308
|
|
|
13175
13309
|
<!-- list of unique footnotes -->
|
|
@@ -13293,7 +13427,7 @@
|
|
|
13293
13427
|
<!-- commented:
|
|
13294
13428
|
.//mn:bibitem[ancestor::mn:references]/mn:note |
|
|
13295
13429
|
because 'fn' there is in biblio-tag -->
|
|
13296
|
-
<xsl:for-each select=".//mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
|
13430
|
+
<xsl:for-each select=".//mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
|
|
13297
13431
|
<!-- copy unique fn -->
|
|
13298
13432
|
<fn gen_id="{generate-id(.)}">
|
|
13299
13433
|
<xsl:copy-of select="@*"/>
|
|
@@ -13391,7 +13525,7 @@
|
|
|
13391
13525
|
<xsl:with-param name="sep">: </xsl:with-param>
|
|
13392
13526
|
</xsl:call-template>
|
|
13393
13527
|
</fo:inline>
|
|
13394
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
13528
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
13395
13529
|
</fo:block>
|
|
13396
13530
|
</fo:block-container>
|
|
13397
13531
|
|
|
@@ -13418,7 +13552,7 @@
|
|
|
13418
13552
|
</xsl:otherwise>
|
|
13419
13553
|
</xsl:choose> -->
|
|
13420
13554
|
<xsl:variable name="name">
|
|
13421
|
-
<xsl:apply-templates select="mn:name"/>
|
|
13555
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
13422
13556
|
</xsl:variable>
|
|
13423
13557
|
<xsl:copy-of select="$name"/>
|
|
13424
13558
|
<xsl:if test="normalize-space($name) != ''">
|
|
@@ -13426,7 +13560,7 @@
|
|
|
13426
13560
|
</xsl:if>
|
|
13427
13561
|
</xsl:template>
|
|
13428
13562
|
|
|
13429
|
-
<xsl:template match="mn:admonition/mn:name">
|
|
13563
|
+
<xsl:template match="mn:admonition/mn:fmt-name">
|
|
13430
13564
|
<xsl:apply-templates/>
|
|
13431
13565
|
</xsl:template>
|
|
13432
13566
|
|
|
@@ -13562,10 +13696,10 @@
|
|
|
13562
13696
|
<xsl:call-template name="setNamedDestination"/>
|
|
13563
13697
|
<fo:block id="{@id}"/>
|
|
13564
13698
|
|
|
13565
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
13699
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
13566
13700
|
|
|
13567
13701
|
<fo:block xsl:use-attribute-sets="references-non-normative-style">
|
|
13568
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
13702
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
13569
13703
|
</fo:block>
|
|
13570
13704
|
</xsl:template> <!-- references -->
|
|
13571
13705
|
|
|
@@ -13584,8 +13718,8 @@
|
|
|
13584
13718
|
</xsl:template> <!-- bibitem -->
|
|
13585
13719
|
|
|
13586
13720
|
<!-- Bibliography (non-normative references) -->
|
|
13587
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
|
13588
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
|
13721
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
|
13722
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
|
13589
13723
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
|
13590
13724
|
<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
|
|
13591
13725
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -13648,7 +13782,7 @@
|
|
|
13648
13782
|
</fo:list-item>
|
|
13649
13783
|
</xsl:otherwise>
|
|
13650
13784
|
</xsl:choose>
|
|
13651
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
|
13785
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
|
13652
13786
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
13653
13787
|
</xsl:apply-templates>
|
|
13654
13788
|
</xsl:template>
|
|
@@ -13665,8 +13799,26 @@
|
|
|
13665
13799
|
</xsl:apply-templates>
|
|
13666
13800
|
<xsl:apply-templates select="mn:formattedref"/>
|
|
13667
13801
|
<!-- end bibitem processing -->
|
|
13802
|
+
|
|
13803
|
+
<xsl:call-template name="processBibliographyNote"/>
|
|
13668
13804
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
|
13669
13805
|
|
|
13806
|
+
<xsl:template name="processBibliographyNote">
|
|
13807
|
+
<xsl:if test="self::mn:note">
|
|
13808
|
+
<xsl:variable name="note_node">
|
|
13809
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
|
13810
|
+
<xsl:copy> <!-- skip @id -->
|
|
13811
|
+
<xsl:copy-of select="node()"/>
|
|
13812
|
+
</xsl:copy>
|
|
13813
|
+
</xsl:element>
|
|
13814
|
+
</xsl:variable>
|
|
13815
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
|
13816
|
+
<xsl:call-template name="note"/>
|
|
13817
|
+
</xsl:for-each> -->
|
|
13818
|
+
<xsl:call-template name="note"/>
|
|
13819
|
+
</xsl:if>
|
|
13820
|
+
</xsl:template>
|
|
13821
|
+
|
|
13670
13822
|
<xsl:template match="mn:title" mode="title">
|
|
13671
13823
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
13672
13824
|
</xsl:template>
|
|
@@ -13892,7 +14044,8 @@
|
|
|
13892
14044
|
</xsl:copy>
|
|
13893
14045
|
</xsl:template>
|
|
13894
14046
|
|
|
13895
|
-
<xsl:template match="mn:xref" mode="index_add_id"
|
|
14047
|
+
<xsl:template match="mn:xref" mode="index_add_id"/>
|
|
14048
|
+
<xsl:template match="mn:fmt-xref" mode="index_add_id">
|
|
13896
14049
|
<xsl:param name="docid"/>
|
|
13897
14050
|
<xsl:variable name="id">
|
|
13898
14051
|
<xsl:call-template name="generateIndexXrefId">
|
|
@@ -13934,7 +14087,7 @@
|
|
|
13934
14087
|
<xsl:template match="mn:indexsect//mn:li" mode="index_update">
|
|
13935
14088
|
<xsl:copy>
|
|
13936
14089
|
<xsl:apply-templates select="@*" mode="index_update"/>
|
|
13937
|
-
<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
|
|
14090
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
|
|
13938
14091
|
</xsl:copy>
|
|
13939
14092
|
</xsl:template>
|
|
13940
14093
|
|
|
@@ -13955,11 +14108,11 @@
|
|
|
13955
14108
|
<xsl:value-of select="."/>
|
|
13956
14109
|
<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
|
|
13957
14110
|
</xsl:when>
|
|
13958
|
-
<xsl:when test="self::* and local-name(.) = 'xref'">
|
|
14111
|
+
<xsl:when test="self::* and local-name(.) = 'fmt-xref'">
|
|
13959
14112
|
<xsl:variable name="id" select="@id"/>
|
|
13960
14113
|
|
|
13961
|
-
<xsl:variable name="id_next" select="following-sibling::mn:xref[1]/@id"/>
|
|
13962
|
-
<xsl:variable name="id_prev" select="preceding-sibling::mn:xref[1]/@id"/>
|
|
14114
|
+
<xsl:variable name="id_next" select="following-sibling::mn:fmt-xref[1]/@id"/>
|
|
14115
|
+
<xsl:variable name="id_prev" select="preceding-sibling::mn:fmt-xref[1]/@id"/>
|
|
13963
14116
|
|
|
13964
14117
|
<xsl:variable name="pages_">
|
|
13965
14118
|
<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
|
|
@@ -14055,18 +14208,18 @@
|
|
|
14055
14208
|
<xsl:variable name="item_number">
|
|
14056
14209
|
<xsl:number count="mn:li[ancestor::mn:indexsect]" level="any"/>
|
|
14057
14210
|
</xsl:variable>
|
|
14058
|
-
<xsl:variable name="xref_number"><xsl:number count="mn:xref"/></xsl:variable>
|
|
14211
|
+
<xsl:variable name="xref_number"><xsl:number count="mn:fmt-xref"/></xsl:variable>
|
|
14059
14212
|
<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
|
|
14060
14213
|
</xsl:template>
|
|
14061
14214
|
|
|
14062
|
-
<xsl:template match="mn:indexsect/mn:title" priority="4">
|
|
14215
|
+
<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
|
|
14063
14216
|
<fo:block xsl:use-attribute-sets="indexsect-title-style">
|
|
14064
14217
|
<!-- Index -->
|
|
14065
14218
|
<xsl:apply-templates/>
|
|
14066
14219
|
</fo:block>
|
|
14067
14220
|
</xsl:template>
|
|
14068
14221
|
|
|
14069
|
-
<xsl:template match="mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14222
|
+
<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14070
14223
|
<!-- Letter A, B, C, ... -->
|
|
14071
14224
|
<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
|
|
14072
14225
|
<xsl:apply-templates/>
|
|
@@ -14107,12 +14260,12 @@
|
|
|
14107
14260
|
<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
|
|
14108
14261
|
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
|
14109
14262
|
<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
|
|
14110
|
-
<xsl:when test="1 = 2 and preceding-sibling::node()[self::mn:fmt-
|
|
14263
|
+
<xsl:when test="1 = 2 and preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]">
|
|
14111
14264
|
<!-- skip here, see the template 'fmt-review-start' -->
|
|
14112
14265
|
</xsl:when>
|
|
14113
14266
|
<xsl:otherwise>
|
|
14114
14267
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
|
14115
|
-
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-
|
|
14268
|
+
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
|
|
14116
14269
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
|
14117
14270
|
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
|
14118
14271
|
</xsl:otherwise>
|
|
@@ -14211,6 +14364,48 @@
|
|
|
14211
14364
|
<!-- End Form's elements processing -->
|
|
14212
14365
|
<!-- =================== -->
|
|
14213
14366
|
|
|
14367
|
+
<xsl:attribute-set name="toc-style">
|
|
14368
|
+
</xsl:attribute-set>
|
|
14369
|
+
|
|
14370
|
+
<xsl:template name="refine_toc-style">
|
|
14371
|
+
</xsl:template>
|
|
14372
|
+
|
|
14373
|
+
<xsl:attribute-set name="toc-title-style">
|
|
14374
|
+
</xsl:attribute-set>
|
|
14375
|
+
|
|
14376
|
+
<xsl:attribute-set name="toc-title-page-style">
|
|
14377
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
|
14378
|
+
|
|
14379
|
+
<xsl:attribute-set name="toc-item-block-style">
|
|
14380
|
+
</xsl:attribute-set>
|
|
14381
|
+
|
|
14382
|
+
<xsl:template name="refine_toc-item-block-style">
|
|
14383
|
+
</xsl:template>
|
|
14384
|
+
|
|
14385
|
+
<xsl:attribute-set name="toc-item-style">
|
|
14386
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
|
14387
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
|
14388
|
+
|
|
14389
|
+
<xsl:template name="refine_toc-item-style">
|
|
14390
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
|
14391
|
+
|
|
14392
|
+
<xsl:attribute-set name="toc-leader-style">
|
|
14393
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
|
14394
|
+
|
|
14395
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
|
14396
|
+
</xsl:attribute-set>
|
|
14397
|
+
|
|
14398
|
+
<!-- List of Figures, Tables -->
|
|
14399
|
+
<xsl:attribute-set name="toc-listof-title-style">
|
|
14400
|
+
</xsl:attribute-set>
|
|
14401
|
+
|
|
14402
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
|
14403
|
+
</xsl:attribute-set>
|
|
14404
|
+
|
|
14405
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
|
14406
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
|
14407
|
+
</xsl:attribute-set>
|
|
14408
|
+
|
|
14214
14409
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
14215
14410
|
<xsl:variable name="nodes_preface_">
|
|
14216
14411
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
|
@@ -14276,7 +14471,7 @@
|
|
|
14276
14471
|
|
|
14277
14472
|
<xsl:template name="processTables_Contents">
|
|
14278
14473
|
<mnx:tables>
|
|
14279
|
-
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:name and normalize-space(@id) != '']">
|
|
14474
|
+
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:fmt-name and normalize-space(@id) != '']">
|
|
14280
14475
|
<xsl:choose>
|
|
14281
14476
|
<xsl:when test="mn:fmt-name">
|
|
14282
14477
|
<xsl:variable name="fmt_name">
|
|
@@ -14298,7 +14493,7 @@
|
|
|
14298
14493
|
|
|
14299
14494
|
<xsl:template name="processFigures_Contents">
|
|
14300
14495
|
<mnx:figures>
|
|
14301
|
-
<xsl:for-each select="//mn:figure[@id and mn:name and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(mn:name, 'Figure ') and normalize-space(@id) != '']">
|
|
14496
|
+
<xsl:for-each select="//mn:figure[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(mn:name, 'Figure ') and normalize-space(@id) != '']">
|
|
14302
14497
|
<xsl:choose>
|
|
14303
14498
|
<xsl:when test="mn:fmt-name">
|
|
14304
14499
|
<xsl:variable name="fmt_name">
|
|
@@ -14327,7 +14522,7 @@
|
|
|
14327
14522
|
|
|
14328
14523
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
|
|
14329
14524
|
|
|
14330
|
-
<xsl:template match="mn:figure/mn:fmt-name |
|
|
14525
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
|
|
14331
14526
|
<xsl:apply-templates mode="contents"/>
|
|
14332
14527
|
<xsl:text> </xsl:text>
|
|
14333
14528
|
</xsl:template>
|
|
@@ -14339,7 +14534,7 @@
|
|
|
14339
14534
|
</xsl:if>
|
|
14340
14535
|
</xsl:template>
|
|
14341
14536
|
|
|
14342
|
-
<xsl:template match="mn:figure/mn:fmt-name | mn:table/mn:fmt-name |
|
|
14537
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
|
|
14343
14538
|
<xsl:apply-templates mode="bookmarks"/>
|
|
14344
14539
|
<xsl:text> </xsl:text>
|
|
14345
14540
|
</xsl:template>
|
|
@@ -14350,7 +14545,7 @@
|
|
|
14350
14545
|
</xsl:if>
|
|
14351
14546
|
</xsl:template>
|
|
14352
14547
|
|
|
14353
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
14548
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
14354
14549
|
<xsl:value-of select="."/>
|
|
14355
14550
|
</xsl:template>
|
|
14356
14551
|
|
|
@@ -14360,7 +14555,7 @@
|
|
|
14360
14555
|
</xsl:if>
|
|
14361
14556
|
</xsl:template>
|
|
14362
14557
|
|
|
14363
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
14558
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
14364
14559
|
<xsl:value-of select="."/>
|
|
14365
14560
|
</xsl:template>
|
|
14366
14561
|
|
|
@@ -14821,7 +15016,7 @@
|
|
|
14821
15016
|
<xsl:value-of select="."/>
|
|
14822
15017
|
</xsl:template>
|
|
14823
15018
|
|
|
14824
|
-
<xsl:template match="mn:
|
|
15019
|
+
<xsl:template match="mn:annotation" mode="contents_item"/>
|
|
14825
15020
|
|
|
14826
15021
|
<xsl:template match="mn:tab" mode="contents_item">
|
|
14827
15022
|
<xsl:text> </xsl:text>
|
|
@@ -14981,7 +15176,7 @@
|
|
|
14981
15176
|
<xsl:apply-templates/>
|
|
14982
15177
|
</xsl:template>
|
|
14983
15178
|
|
|
14984
|
-
<xsl:template match="mn:toc//mn:xref" priority="3">
|
|
15179
|
+
<xsl:template match="mn:toc//mn:xref | mn:toc//mn:fmt-xref" priority="3">
|
|
14985
15180
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
14986
15181
|
<!-- New format: one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
14987
15182
|
<!-- <test><xsl:copy-of select="."/></test> -->
|
|
@@ -15049,8 +15244,8 @@
|
|
|
15049
15244
|
<xsl:apply-templates mode="toc_table_width"/>
|
|
15050
15245
|
</xsl:template>
|
|
15051
15246
|
|
|
15052
|
-
<xsl:template match="mn:clause[@type = 'toc']/mn:title" mode="toc_table_width"/>
|
|
15053
|
-
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:title" mode="toc_table_width"/>
|
|
15247
|
+
<xsl:template match="mn:clause[@type = 'toc']/mn:fmt-title" mode="toc_table_width"/>
|
|
15248
|
+
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:fmt-title" mode="toc_table_width"/>
|
|
15054
15249
|
|
|
15055
15250
|
<xsl:template match="mn:li" mode="toc_table_width">
|
|
15056
15251
|
<mn:tr>
|
|
@@ -15058,7 +15253,7 @@
|
|
|
15058
15253
|
</mn:tr>
|
|
15059
15254
|
</xsl:template>
|
|
15060
15255
|
|
|
15061
|
-
<xsl:template match="mn:xref" mode="toc_table_width">
|
|
15256
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width">
|
|
15062
15257
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15063
15258
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15064
15259
|
<xsl:for-each select="mn:tab">
|
|
@@ -15132,10 +15327,10 @@
|
|
|
15132
15327
|
|
|
15133
15328
|
</xsl:template> <!-- tab -->
|
|
15134
15329
|
|
|
15135
|
-
<xsl:template match="mn:note/mn:name/mn:tab" priority="2"/>
|
|
15136
|
-
<xsl:template match="mn:termnote/mn:name/mn:tab" priority="2"/>
|
|
15330
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" priority="2"/>
|
|
15331
|
+
<xsl:template match="mn:termnote/mn:fmt-name/mn:tab" priority="2"/>
|
|
15137
15332
|
|
|
15138
|
-
<xsl:template match="mn:note/mn:name/mn:tab" mode="tab">
|
|
15333
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" mode="tab">
|
|
15139
15334
|
</xsl:template>
|
|
15140
15335
|
|
|
15141
15336
|
<xsl:template name="insertNonBreakSpaces">
|
|
@@ -15149,13 +15344,13 @@
|
|
|
15149
15344
|
</xsl:template>
|
|
15150
15345
|
|
|
15151
15346
|
<xsl:variable name="reviews_">
|
|
15152
|
-
<xsl:for-each select="//mn:
|
|
15347
|
+
<xsl:for-each select="//mn:annotation[not(parent::mn:annotation-container)][@from]">
|
|
15153
15348
|
<xsl:copy>
|
|
15154
15349
|
<xsl:copy-of select="@from"/>
|
|
15155
15350
|
<xsl:copy-of select="@id"/>
|
|
15156
15351
|
</xsl:copy>
|
|
15157
15352
|
</xsl:for-each>
|
|
15158
|
-
<xsl:for-each select="//mn:fmt-
|
|
15353
|
+
<xsl:for-each select="//mn:fmt-annotation-start[@source]">
|
|
15159
15354
|
<xsl:copy>
|
|
15160
15355
|
<xsl:copy-of select="@source"/>
|
|
15161
15356
|
<xsl:copy-of select="@id"/>
|
|
@@ -15169,7 +15364,7 @@
|
|
|
15169
15364
|
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
|
15170
15365
|
<xsl:variable name="curr_id" select="@id"/>
|
|
15171
15366
|
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
|
15172
|
-
<xsl:for-each select="$reviews//mn:
|
|
15367
|
+
<xsl:for-each select="$reviews//mn:annotation[@from = $curr_id]"> <!-- $reviews//mn:fmt-review-start[@source = $curr_id] -->
|
|
15173
15368
|
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
|
15174
15369
|
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
|
15175
15370
|
<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
|
|
@@ -15184,7 +15379,7 @@
|
|
|
15184
15379
|
|
|
15185
15380
|
<!-- document text (not figures, or tables) footnotes -->
|
|
15186
15381
|
<xsl:variable name="reviews_container_">
|
|
15187
|
-
<xsl:for-each select="//mn:
|
|
15382
|
+
<xsl:for-each select="//mn:annotation-container/mn:fmt-annotation-body">
|
|
15188
15383
|
<xsl:variable name="update_xml_step1">
|
|
15189
15384
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
15190
15385
|
</xsl:variable>
|
|
@@ -15193,10 +15388,10 @@
|
|
|
15193
15388
|
</xsl:variable>
|
|
15194
15389
|
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
|
15195
15390
|
|
|
15196
|
-
<xsl:template match="mn:
|
|
15391
|
+
<xsl:template match="mn:annotation-container"/>
|
|
15197
15392
|
|
|
15198
15393
|
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
|
15199
|
-
<xsl:template match="mn:
|
|
15394
|
+
<xsl:template match="mn:annotation[not(parent::mn:annotation-container)]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15200
15395
|
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
|
15201
15396
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
15202
15397
|
<xsl:choose>
|
|
@@ -15216,7 +15411,7 @@
|
|
|
15216
15411
|
</xsl:template>
|
|
15217
15412
|
|
|
15218
15413
|
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
|
15219
|
-
<xsl:template match="mn:fmt-
|
|
15414
|
+
<xsl:template match="mn:fmt-annotation-start" name="fmt-annotation-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15220
15415
|
<!-- comment 2019-11-29 -->
|
|
15221
15416
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
|
15222
15417
|
<xsl:apply-templates /> -->
|
|
@@ -15272,7 +15467,7 @@
|
|
|
15272
15467
|
</xsl:template>
|
|
15273
15468
|
|
|
15274
15469
|
<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
|
|
15275
|
-
<xsl:template match="mn:
|
|
15470
|
+
<xsl:template match="mn:annotation[@type = 'other']"/>
|
|
15276
15471
|
|
|
15277
15472
|
<!-- ============ -->
|
|
15278
15473
|
<!-- errata -->
|
|
@@ -15665,9 +15860,12 @@
|
|
|
15665
15860
|
<xsl:choose>
|
|
15666
15861
|
<xsl:when test="mn:fmt-title">
|
|
15667
15862
|
<xsl:variable name="fmt_title_section">
|
|
15668
|
-
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:
|
|
15863
|
+
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:annotation)]"/>
|
|
15669
15864
|
</xsl:variable>
|
|
15670
15865
|
<xsl:value-of select="normalize-space($fmt_title_section)"/>
|
|
15866
|
+
<xsl:if test="normalize-space($fmt_title_section) = ''">
|
|
15867
|
+
<xsl:value-of select="mn:fmt-title/mn:tab[1]/preceding-sibling::node()"/>
|
|
15868
|
+
</xsl:if>
|
|
15671
15869
|
</xsl:when>
|
|
15672
15870
|
<xsl:otherwise>
|
|
15673
15871
|
<xsl:value-of select="mn:title/mn:tab[1]/preceding-sibling::node()"/>
|
|
@@ -15680,6 +15878,9 @@
|
|
|
15680
15878
|
<xsl:when test="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab]">
|
|
15681
15879
|
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/following-sibling::node()"/>
|
|
15682
15880
|
</xsl:when>
|
|
15881
|
+
<xsl:when test="mn:fmt-title/mn:tab">
|
|
15882
|
+
<xsl:copy-of select="mn:fmt-title/mn:tab[1]/following-sibling::node()"/>
|
|
15883
|
+
</xsl:when>
|
|
15683
15884
|
<xsl:when test="mn:fmt-title">
|
|
15684
15885
|
<xsl:copy-of select="mn:fmt-title/node()"/>
|
|
15685
15886
|
</xsl:when>
|
|
@@ -15817,10 +16018,10 @@
|
|
|
15817
16018
|
|
|
15818
16019
|
</fo:block>
|
|
15819
16020
|
|
|
15820
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
16021
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
15821
16022
|
|
|
15822
16023
|
<fo:block>
|
|
15823
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
16024
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
15824
16025
|
</fo:block>
|
|
15825
16026
|
</xsl:otherwise>
|
|
15826
16027
|
</xsl:choose>
|
|
@@ -15829,7 +16030,7 @@
|
|
|
15829
16030
|
<xsl:template name="refine_annex_style">
|
|
15830
16031
|
</xsl:template>
|
|
15831
16032
|
|
|
15832
|
-
<xsl:template match="mn:name/text()">
|
|
16033
|
+
<xsl:template match="mn:name/text() | mn:fmt-name/text()">
|
|
15833
16034
|
<!-- 0xA0 to space replacement -->
|
|
15834
16035
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15835
16036
|
</xsl:template>
|
|
@@ -15885,28 +16086,28 @@
|
|
|
15885
16086
|
<xsl:template match="mn:amend"/>
|
|
15886
16087
|
|
|
15887
16088
|
<!-- fmt-title renamed to title in update_xml_step1 -->
|
|
15888
|
-
<xsl:template match="mn:fmt-title"/>
|
|
16089
|
+
<!-- <xsl:template match="mn:fmt-title" /> -->
|
|
15889
16090
|
|
|
15890
16091
|
<!-- fmt-name renamed to name in update_xml_step1 -->
|
|
15891
|
-
<xsl:template match="mn:fmt-name"/>
|
|
16092
|
+
<!-- <xsl:template match="mn:fmt-name" /> -->
|
|
15892
16093
|
|
|
15893
16094
|
<!-- fmt-preferred renamed to preferred in update_xml_step1 -->
|
|
15894
|
-
<xsl:template match="mn:fmt-preferred"/>
|
|
16095
|
+
<!-- <xsl:template match="mn:fmt-preferred" /> -->
|
|
15895
16096
|
|
|
15896
16097
|
<!-- fmt-admitted renamed to admitted in update_xml_step1 -->
|
|
15897
|
-
<xsl:template match="mn:fmt-admitted"/>
|
|
16098
|
+
<!-- <xsl:template match="mn:fmt-admitted" /> -->
|
|
15898
16099
|
|
|
15899
16100
|
<!-- fmt-deprecates renamed to deprecates in update_xml_step1 -->
|
|
15900
|
-
<xsl:template match="mn:fmt-deprecates"/>
|
|
16101
|
+
<!-- <xsl:template match="mn:fmt-deprecates" /> -->
|
|
15901
16102
|
|
|
15902
16103
|
<!-- fmt-definition renamed to definition in update_xml_step1 -->
|
|
15903
|
-
<xsl:template match="mn:fmt-definition"/>
|
|
16104
|
+
<!-- <xsl:template match="mn:fmt-definition" /> -->
|
|
15904
16105
|
|
|
15905
16106
|
<!-- fmt-termsource renamed to termsource in update_xml_step1 -->
|
|
15906
|
-
<xsl:template match="mn:fmt-termsource"/>
|
|
16107
|
+
<!-- <xsl:template match="mn:fmt-termsource" /> -->
|
|
15907
16108
|
|
|
15908
16109
|
<!-- fmt-source renamed to source in update_xml_step1 -->
|
|
15909
|
-
<xsl:template match="mn:fmt-source"/>
|
|
16110
|
+
<!-- <xsl:template match="mn:fmt-source" /> -->
|
|
15910
16111
|
|
|
15911
16112
|
<xsl:template match="mn:semx">
|
|
15912
16113
|
<xsl:apply-templates/>
|
|
@@ -16350,12 +16551,12 @@
|
|
|
16350
16551
|
<xsl:when test="ancestor::mn:preface">
|
|
16351
16552
|
<xsl:value-of select="$level_total - 2"/>
|
|
16352
16553
|
</xsl:when>
|
|
16353
|
-
<xsl:when test="ancestor::mn:sections and self::mn:title">
|
|
16554
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-title">
|
|
16354
16555
|
<!-- determine 'depth' depends on upper clause with title/@depth -->
|
|
16355
16556
|
<!-- <xsl:message>title=<xsl:value-of select="."/></xsl:message> -->
|
|
16356
|
-
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:title/@depth][1]/mn:title/@depth"/>
|
|
16557
|
+
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:fmt-title/@depth][1]/mn:fmt-title/@depth"/>
|
|
16357
16558
|
<!-- <xsl:message>clause_with_depth_depth=<xsl:value-of select="$clause_with_depth_depth"/></xsl:message> -->
|
|
16358
|
-
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:title/@depth][1]/ancestor::*)"/>
|
|
16559
|
+
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:fmt-title/@depth][1]/ancestor::*)"/>
|
|
16359
16560
|
<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
|
|
16360
16561
|
<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
|
|
16361
16562
|
<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
|
|
@@ -16371,8 +16572,8 @@
|
|
|
16371
16572
|
</xsl:otherwise>
|
|
16372
16573
|
</xsl:choose>
|
|
16373
16574
|
</xsl:when>
|
|
16374
|
-
<xsl:when test="ancestor::mn:sections and self::mn:name and parent::mn:term">
|
|
16375
|
-
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:title/@depth)"/>
|
|
16575
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-name and parent::mn:term">
|
|
16576
|
+
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:fmt-title/@depth)"/>
|
|
16376
16577
|
<xsl:choose>
|
|
16377
16578
|
<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
|
|
16378
16579
|
<xsl:value-of select="number($upper_terms_depth + 1)"/>
|
|
@@ -16383,7 +16584,7 @@
|
|
|
16383
16584
|
</xsl:choose>
|
|
16384
16585
|
</xsl:when>
|
|
16385
16586
|
<xsl:when test="ancestor::mn:sections">
|
|
16386
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:title/@depth)"/>
|
|
16587
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:fmt-title/@depth)"/>
|
|
16387
16588
|
<xsl:choose>
|
|
16388
16589
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16389
16590
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16399,8 +16600,8 @@
|
|
|
16399
16600
|
<xsl:when test="parent::mn:annex">
|
|
16400
16601
|
<xsl:value-of select="$level_total - 1"/>
|
|
16401
16602
|
</xsl:when>
|
|
16402
|
-
<xsl:when test="ancestor::mn:annex and self::mn:title">
|
|
16403
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:title/@depth)"/>
|
|
16603
|
+
<xsl:when test="ancestor::mn:annex and self::mn:fmt-title">
|
|
16604
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:fmt-title/@depth)"/>
|
|
16404
16605
|
<xsl:choose>
|
|
16405
16606
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16406
16607
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16433,7 +16634,7 @@
|
|
|
16433
16634
|
</xsl:when>
|
|
16434
16635
|
<xsl:otherwise>
|
|
16435
16636
|
<xsl:variable name="title_level_">
|
|
16436
|
-
<xsl:for-each select="../preceding-sibling::mn:title[1]">
|
|
16637
|
+
<xsl:for-each select="../preceding-sibling::mn:fmt-title[1]">
|
|
16437
16638
|
<xsl:call-template name="getLevel"/>
|
|
16438
16639
|
</xsl:for-each>
|
|
16439
16640
|
</xsl:variable>
|
|
@@ -16510,15 +16711,17 @@
|
|
|
16510
16711
|
</xsl:template>
|
|
16511
16712
|
|
|
16512
16713
|
<xsl:template name="setNamedDestination">
|
|
16513
|
-
|
|
16514
|
-
|
|
16515
|
-
<
|
|
16516
|
-
|
|
16517
|
-
<xsl:for-each select=". | mn:title | mn:name">
|
|
16518
|
-
<xsl:if test="@named_dest">
|
|
16519
|
-
<fox:destination internal-destination="{@named_dest}"/>
|
|
16714
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
16715
|
+
<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
|
|
16716
|
+
<xsl:if test="@id and normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">
|
|
16717
|
+
<fox:destination internal-destination="{@id}"/>
|
|
16520
16718
|
</xsl:if>
|
|
16521
|
-
|
|
16719
|
+
<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
|
|
16720
|
+
<xsl:if test="@named_dest">
|
|
16721
|
+
<fox:destination internal-destination="{@named_dest}"/>
|
|
16722
|
+
</xsl:if>
|
|
16723
|
+
</xsl:for-each>
|
|
16724
|
+
</xsl:if>
|
|
16522
16725
|
</xsl:template>
|
|
16523
16726
|
|
|
16524
16727
|
<xsl:template name="add-letter-spacing">
|
|
@@ -16866,7 +17069,7 @@
|
|
|
16866
17069
|
</xsl:when>
|
|
16867
17070
|
<xsl:otherwise>
|
|
16868
17071
|
<!-- namespace-uri(ancestor::mn:title) != '' to skip title from $contents -->
|
|
16869
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
17072
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
16870
17073
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
16871
17074
|
</xsl:if>
|
|
16872
17075
|
<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm" role="SKIP" text-align-last="center">
|
|
@@ -16900,7 +17103,7 @@
|
|
|
16900
17103
|
</fo:block>
|
|
16901
17104
|
</fo:block-container>
|
|
16902
17105
|
</fo:inline-container>
|
|
16903
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17106
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
16904
17107
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
16905
17108
|
</xsl:if>
|
|
16906
17109
|
</xsl:otherwise>
|