metanorma-bipm 2.6.10 → 2.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/bipm/base_convert.rb +26 -0
- data/lib/isodoc/bipm/bipm.brochure.xsl +584 -463
- data/lib/isodoc/bipm/bipm.guide.xsl +584 -463
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +584 -463
- data/lib/isodoc/bipm/bipm.rapport.xsl +584 -463
- data/lib/isodoc/bipm/html_convert.rb +1 -10
- data/lib/isodoc/bipm/i18n-en.yaml +12 -2
- data/lib/isodoc/bipm/i18n-fr.yaml +12 -2
- data/lib/isodoc/bipm/jcgm.standard.xsl +553 -457
- data/lib/isodoc/bipm/metadata.rb +8 -4
- data/lib/isodoc/bipm/presentation_biblio.rb +44 -4
- data/lib/isodoc/bipm/presentation_xml_convert.rb +24 -0
- data/lib/isodoc/bipm/xref.rb +1 -0
- data/lib/metanorma/bipm/cleanup.rb +8 -21
- data/lib/metanorma/bipm/converter.rb +0 -4
- data/lib/metanorma/bipm/isodoc.rng +69 -7
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +1 -1
- metadata +4 -4
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<xsl:param name="add_math_as_attachment">true</xsl:param>
|
|
9
9
|
<xsl:param name="final_transform">true</xsl:param>
|
|
10
10
|
|
|
11
|
-
<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"/>
|
|
11
|
+
<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"/>
|
|
12
12
|
|
|
13
13
|
<xsl:variable name="first_pass" select="count($index//item) = 0"/>
|
|
14
14
|
|
|
@@ -226,6 +226,139 @@
|
|
|
226
226
|
</xsl:if>
|
|
227
227
|
</xsl:variable>
|
|
228
228
|
|
|
229
|
+
<xsl:template name="layout-master-set">
|
|
230
|
+
<fo:layout-master-set>
|
|
231
|
+
<!-- blank page -->
|
|
232
|
+
<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
233
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
234
|
+
<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
|
|
235
|
+
<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
|
|
236
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
237
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
238
|
+
</fo:simple-page-master>
|
|
239
|
+
|
|
240
|
+
<!-- Cover page -->
|
|
241
|
+
<fo:simple-page-master master-name="simple-cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
242
|
+
<fo:region-body margin-top="36mm" margin-bottom="43mm" margin-left="49mm" margin-right="48mm"/>
|
|
243
|
+
<fo:region-before region-name="header" extent="36mm"/>
|
|
244
|
+
<fo:region-after extent="43mm"/>
|
|
245
|
+
<fo:region-start extent="49mm"/>
|
|
246
|
+
<fo:region-end extent="48mm"/>
|
|
247
|
+
</fo:simple-page-master>
|
|
248
|
+
|
|
249
|
+
<fo:page-sequence-master master-name="cover-page">
|
|
250
|
+
<fo:repeatable-page-master-alternatives>
|
|
251
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
252
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="odd"/>
|
|
253
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="even"/>
|
|
254
|
+
</fo:repeatable-page-master-alternatives>
|
|
255
|
+
</fo:page-sequence-master>
|
|
256
|
+
|
|
257
|
+
<!-- Cover page -->
|
|
258
|
+
<fo:simple-page-master master-name="simple-cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
259
|
+
<fo:region-body margin-top="90mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="53mm"/>
|
|
260
|
+
<fo:region-before region-name="header" extent="60mm"/>
|
|
261
|
+
<fo:region-after extent="40mm"/>
|
|
262
|
+
<fo:region-start extent="12.5mm"/>
|
|
263
|
+
<fo:region-end extent="53mm"/>
|
|
264
|
+
</fo:simple-page-master>
|
|
265
|
+
|
|
266
|
+
<fo:page-sequence-master master-name="cover-page-appendix">
|
|
267
|
+
<fo:repeatable-page-master-alternatives>
|
|
268
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
269
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="odd"/>
|
|
270
|
+
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="even"/>
|
|
271
|
+
</fo:repeatable-page-master-alternatives>
|
|
272
|
+
</fo:page-sequence-master>
|
|
273
|
+
|
|
274
|
+
<!-- Title page -->
|
|
275
|
+
<fo:simple-page-master master-name="simple-title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
276
|
+
<fo:region-body margin-top="38mm" margin-bottom="25mm" margin-left="95mm" margin-right="12mm"/>
|
|
277
|
+
<fo:region-before region-name="header" extent="38mm"/>
|
|
278
|
+
<fo:region-after extent="25mm"/>
|
|
279
|
+
<fo:region-start extent="95mm"/>
|
|
280
|
+
<fo:region-end extent="12mm"/>
|
|
281
|
+
</fo:simple-page-master>
|
|
282
|
+
|
|
283
|
+
<fo:page-sequence-master master-name="title-page">
|
|
284
|
+
<fo:repeatable-page-master-alternatives>
|
|
285
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
286
|
+
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="odd"/>
|
|
287
|
+
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="even"/>
|
|
288
|
+
</fo:repeatable-page-master-alternatives>
|
|
289
|
+
</fo:page-sequence-master>
|
|
290
|
+
|
|
291
|
+
<!-- Document pages -->
|
|
292
|
+
<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
293
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
294
|
+
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
295
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
296
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
297
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
298
|
+
</fo:simple-page-master>
|
|
299
|
+
<fo:simple-page-master master-name="document-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
300
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
301
|
+
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
302
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
303
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
304
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
305
|
+
</fo:simple-page-master>
|
|
306
|
+
<fo:page-sequence-master master-name="document">
|
|
307
|
+
<fo:repeatable-page-master-alternatives>
|
|
308
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
309
|
+
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-even"/>
|
|
310
|
+
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-odd"/>
|
|
311
|
+
</fo:repeatable-page-master-alternatives>
|
|
312
|
+
</fo:page-sequence-master>
|
|
313
|
+
|
|
314
|
+
<!-- Document pages (landscape orientation) -->
|
|
315
|
+
<fo:simple-page-master master-name="document-landscape-odd" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
316
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
317
|
+
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
318
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
319
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
320
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
321
|
+
</fo:simple-page-master>
|
|
322
|
+
<fo:simple-page-master master-name="document-landscape-even" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
323
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
324
|
+
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
325
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
326
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
327
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
328
|
+
</fo:simple-page-master>
|
|
329
|
+
<fo:page-sequence-master master-name="document-landscape">
|
|
330
|
+
<fo:repeatable-page-master-alternatives>
|
|
331
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
332
|
+
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-landscape-even"/>
|
|
333
|
+
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-landscape-odd"/>
|
|
334
|
+
</fo:repeatable-page-master-alternatives>
|
|
335
|
+
</fo:page-sequence-master>
|
|
336
|
+
|
|
337
|
+
<!-- Index pages -->
|
|
338
|
+
<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
339
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
|
|
340
|
+
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
341
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
342
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
343
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
344
|
+
</fo:simple-page-master>
|
|
345
|
+
<fo:simple-page-master master-name="index-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
346
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
|
|
347
|
+
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
348
|
+
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
349
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
350
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
351
|
+
</fo:simple-page-master>
|
|
352
|
+
<fo:page-sequence-master master-name="index">
|
|
353
|
+
<fo:repeatable-page-master-alternatives>
|
|
354
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
355
|
+
<fo:conditional-page-master-reference odd-or-even="even" master-reference="index-even"/>
|
|
356
|
+
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="index-odd"/>
|
|
357
|
+
</fo:repeatable-page-master-alternatives>
|
|
358
|
+
</fo:page-sequence-master>
|
|
359
|
+
</fo:layout-master-set>
|
|
360
|
+
</xsl:template> <!-- END: layout-master-set -->
|
|
361
|
+
|
|
229
362
|
<xsl:template match="/">
|
|
230
363
|
<fo:root xml:lang="{$lang}">
|
|
231
364
|
<xsl:variable name="root-style">
|
|
@@ -234,138 +367,8 @@
|
|
|
234
367
|
<xsl:call-template name="insertRootStyle">
|
|
235
368
|
<xsl:with-param name="root-style" select="$root-style"/>
|
|
236
369
|
</xsl:call-template>
|
|
237
|
-
<fo:layout-master-set>
|
|
238
|
-
|
|
239
|
-
<!-- blank page -->
|
|
240
|
-
<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
241
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
242
|
-
<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
|
|
243
|
-
<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
|
|
244
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
245
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
246
|
-
</fo:simple-page-master>
|
|
247
|
-
|
|
248
|
-
<!-- Cover page -->
|
|
249
|
-
<fo:simple-page-master master-name="simple-cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
250
|
-
<fo:region-body margin-top="36mm" margin-bottom="43mm" margin-left="49mm" margin-right="48mm"/>
|
|
251
|
-
<fo:region-before region-name="header" extent="36mm"/>
|
|
252
|
-
<fo:region-after extent="43mm"/>
|
|
253
|
-
<fo:region-start extent="49mm"/>
|
|
254
|
-
<fo:region-end extent="48mm"/>
|
|
255
|
-
</fo:simple-page-master>
|
|
256
|
-
|
|
257
|
-
<fo:page-sequence-master master-name="cover-page">
|
|
258
|
-
<fo:repeatable-page-master-alternatives>
|
|
259
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
260
|
-
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="odd"/>
|
|
261
|
-
<fo:conditional-page-master-reference master-reference="simple-cover-page" odd-or-even="even"/>
|
|
262
|
-
</fo:repeatable-page-master-alternatives>
|
|
263
|
-
</fo:page-sequence-master>
|
|
264
|
-
|
|
265
|
-
<!-- Cover page -->
|
|
266
|
-
<fo:simple-page-master master-name="simple-cover-page-appendix" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
267
|
-
<fo:region-body margin-top="90mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="53mm"/>
|
|
268
|
-
<fo:region-before region-name="header" extent="60mm"/>
|
|
269
|
-
<fo:region-after extent="40mm"/>
|
|
270
|
-
<fo:region-start extent="12.5mm"/>
|
|
271
|
-
<fo:region-end extent="53mm"/>
|
|
272
|
-
</fo:simple-page-master>
|
|
273
|
-
|
|
274
|
-
<fo:page-sequence-master master-name="cover-page-appendix">
|
|
275
|
-
<fo:repeatable-page-master-alternatives>
|
|
276
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
277
|
-
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="odd"/>
|
|
278
|
-
<fo:conditional-page-master-reference master-reference="simple-cover-page-appendix" odd-or-even="even"/>
|
|
279
|
-
</fo:repeatable-page-master-alternatives>
|
|
280
|
-
</fo:page-sequence-master>
|
|
281
|
-
|
|
282
|
-
<!-- Title page -->
|
|
283
|
-
<fo:simple-page-master master-name="simple-title-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
284
|
-
<fo:region-body margin-top="38mm" margin-bottom="25mm" margin-left="95mm" margin-right="12mm"/>
|
|
285
|
-
<fo:region-before region-name="header" extent="38mm"/>
|
|
286
|
-
<fo:region-after extent="25mm"/>
|
|
287
|
-
<fo:region-start extent="95mm"/>
|
|
288
|
-
<fo:region-end extent="12mm"/>
|
|
289
|
-
</fo:simple-page-master>
|
|
290
|
-
|
|
291
|
-
<fo:page-sequence-master master-name="title-page">
|
|
292
|
-
<fo:repeatable-page-master-alternatives>
|
|
293
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
294
|
-
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="odd"/>
|
|
295
|
-
<fo:conditional-page-master-reference master-reference="simple-title-page" odd-or-even="even"/>
|
|
296
|
-
</fo:repeatable-page-master-alternatives>
|
|
297
|
-
</fo:page-sequence-master>
|
|
298
370
|
|
|
299
|
-
|
|
300
|
-
<fo:simple-page-master master-name="document-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
301
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
302
|
-
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
303
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
304
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
305
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
306
|
-
</fo:simple-page-master>
|
|
307
|
-
<fo:simple-page-master master-name="document-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
308
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
309
|
-
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
310
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
311
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
312
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
313
|
-
</fo:simple-page-master>
|
|
314
|
-
<fo:page-sequence-master master-name="document">
|
|
315
|
-
<fo:repeatable-page-master-alternatives>
|
|
316
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
317
|
-
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-even"/>
|
|
318
|
-
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-odd"/>
|
|
319
|
-
</fo:repeatable-page-master-alternatives>
|
|
320
|
-
</fo:page-sequence-master>
|
|
321
|
-
|
|
322
|
-
<!-- Document pages (landscape orientation) -->
|
|
323
|
-
<fo:simple-page-master master-name="document-landscape-odd" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
324
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
325
|
-
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
326
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
327
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
328
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
329
|
-
</fo:simple-page-master>
|
|
330
|
-
<fo:simple-page-master master-name="document-landscape-even" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
331
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
|
332
|
-
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
333
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/> <!-- debug: background-color="green" -->
|
|
334
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
335
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
336
|
-
</fo:simple-page-master>
|
|
337
|
-
<fo:page-sequence-master master-name="document-landscape">
|
|
338
|
-
<fo:repeatable-page-master-alternatives>
|
|
339
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
340
|
-
<fo:conditional-page-master-reference odd-or-even="even" master-reference="document-landscape-even"/>
|
|
341
|
-
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="document-landscape-odd"/>
|
|
342
|
-
</fo:repeatable-page-master-alternatives>
|
|
343
|
-
</fo:page-sequence-master>
|
|
344
|
-
|
|
345
|
-
<!-- Index pages -->
|
|
346
|
-
<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
347
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
|
|
348
|
-
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
|
|
349
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
350
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
351
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
352
|
-
</fo:simple-page-master>
|
|
353
|
-
<fo:simple-page-master master-name="index-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
354
|
-
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="41.7mm" column-count="2" column-gap="10mm"/>
|
|
355
|
-
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
356
|
-
<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
|
|
357
|
-
<fo:region-start region-name="left-region" extent="17mm"/>
|
|
358
|
-
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
|
359
|
-
</fo:simple-page-master>
|
|
360
|
-
<fo:page-sequence-master master-name="index">
|
|
361
|
-
<fo:repeatable-page-master-alternatives>
|
|
362
|
-
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
|
363
|
-
<fo:conditional-page-master-reference odd-or-even="even" master-reference="index-even"/>
|
|
364
|
-
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="index-odd"/>
|
|
365
|
-
</fo:repeatable-page-master-alternatives>
|
|
366
|
-
</fo:page-sequence-master>
|
|
367
|
-
|
|
368
|
-
</fo:layout-master-set>
|
|
371
|
+
<xsl:call-template name="layout-master-set"/>
|
|
369
372
|
|
|
370
373
|
<fo:declarations>
|
|
371
374
|
<xsl:call-template name="addPDFUAmeta"/>
|
|
@@ -404,21 +407,7 @@
|
|
|
404
407
|
</redirect:write>
|
|
405
408
|
</xsl:if>
|
|
406
409
|
|
|
407
|
-
<xsl:
|
|
408
|
-
|
|
409
|
-
<xsl:when test="$doctype = 'guide'">
|
|
410
|
-
<xsl:call-template name="insertCoverPageAppendix"/>
|
|
411
|
-
</xsl:when>
|
|
412
|
-
|
|
413
|
-
<xsl:when test="$independentAppendix = ''">
|
|
414
|
-
<xsl:call-template name="insertCoverPage"/>
|
|
415
|
-
<xsl:call-template name="insertInnerCoverPage"/>
|
|
416
|
-
</xsl:when>
|
|
417
|
-
|
|
418
|
-
<xsl:when test="$independentAppendix != ''">
|
|
419
|
-
<xsl:call-template name="insertCoverPageAppendix"/>
|
|
420
|
-
</xsl:when>
|
|
421
|
-
</xsl:choose>
|
|
410
|
+
<xsl:call-template name="cover-page"/>
|
|
422
411
|
|
|
423
412
|
<xsl:choose>
|
|
424
413
|
<xsl:when test="$root-element = 'metanorma-collection'">
|
|
@@ -584,21 +573,21 @@
|
|
|
584
573
|
<!-- ================================= -->
|
|
585
574
|
<!-- Move eref inside title -->
|
|
586
575
|
<!-- ================================= -->
|
|
587
|
-
<xsl:template match="@*|node()" mode="title_eref">
|
|
576
|
+
<!-- <xsl:template match="@*|node()" mode="title_eref">
|
|
588
577
|
<xsl:copy>
|
|
589
578
|
<xsl:apply-templates select="@*|node()" mode="title_eref"/>
|
|
590
579
|
</xsl:copy>
|
|
591
580
|
</xsl:template>
|
|
592
|
-
|
|
593
|
-
<xsl:template match="mn:title[following-sibling::*[1][self::mn:eref]]" mode="title_eref">
|
|
581
|
+
|
|
582
|
+
<xsl:template match="mn:fmt-title[following-sibling::*[1][self::mn:eref]]" mode="title_eref">
|
|
594
583
|
<xsl:copy>
|
|
595
584
|
<xsl:apply-templates select="@*|node()" mode="title_eref"/>
|
|
596
|
-
|
|
585
|
+
- - move next eref inside title - -
|
|
597
586
|
<xsl:copy-of select="following-sibling::*[1][self::mn:eref]"/>
|
|
598
587
|
</xsl:copy>
|
|
599
588
|
</xsl:template>
|
|
600
|
-
|
|
601
|
-
<xsl:template match="mn:eref[preceding-sibling::*[1][self::mn:title]]" mode="title_eref"/>
|
|
589
|
+
- - remove eref immediately after title - -
|
|
590
|
+
<xsl:template match="mn:eref[preceding-sibling::*[1][self::mn:fmt-title]]" mode="title_eref"/> -->
|
|
602
591
|
<!-- ================================= -->
|
|
603
592
|
<!-- END Move eref inside title -->
|
|
604
593
|
<!-- ================================= -->
|
|
@@ -689,7 +678,7 @@
|
|
|
689
678
|
</xsl:copy>
|
|
690
679
|
</xsl:template>
|
|
691
680
|
|
|
692
|
-
<xsl:template match="mn:annex/mn:title" mode="flatxml">
|
|
681
|
+
<xsl:template match="mn:annex/mn:fmt-title" mode="flatxml">
|
|
693
682
|
<xsl:copy>
|
|
694
683
|
<xsl:apply-templates select="@*" mode="flatxml"/>
|
|
695
684
|
<xsl:attribute name="depth">1</xsl:attribute>
|
|
@@ -717,7 +706,7 @@
|
|
|
717
706
|
</xsl:for-each>
|
|
718
707
|
|
|
719
708
|
<!-- if current node is title level is 3 with notes, and next level is 4 -->
|
|
720
|
-
<xsl:if test="self::mn:title and @depth = 3 and ../mn:clause/mn:title/@depth = 4 and count(following-sibling::*[1][self::mn:note]) > 0">
|
|
709
|
+
<xsl:if test="self::mn:fmt-title and @depth = 3 and ../mn:clause/mn:fmt-title/@depth = 4 and count(following-sibling::*[1][self::mn:note]) > 0">
|
|
721
710
|
<!-- then move here footnotes from clause level 4 -->
|
|
722
711
|
<xsl:for-each select="../mn:clause//mn:fn[ancestor::mn:quote or not(ancestor::mn:table)]">
|
|
723
712
|
<!-- <debug><xsl:for-each select="ancestor::*"><xsl:value-of select="local-name()"/>@<xsl:value-of select="@id"/><xsl:text>/</xsl:text></xsl:for-each>
|
|
@@ -740,7 +729,7 @@
|
|
|
740
729
|
<xsl:for-each select="following-sibling::mn:note">
|
|
741
730
|
<xsl:call-template name="change_note_kind"/>
|
|
742
731
|
</xsl:for-each>
|
|
743
|
-
<xsl:if test="@depth = 3 and local-name() = 'title' and ../mn:clause/mn:title/@depth = 4 and count(following-sibling::*[1][local-name() = 'note']) > 0"> <!-- it means that current node is title level is 3 with notes, next level is 4 -->
|
|
732
|
+
<xsl:if test="@depth = 3 and local-name() = 'fmt-title' and ../mn:clause/mn:fmt-title/@depth = 4 and count(following-sibling::*[1][local-name() = 'note']) > 0"> <!-- it means that current node is title level is 3 with notes, next level is 4 -->
|
|
744
733
|
<!-- <put_note_side_level4_here/> -->
|
|
745
734
|
<xsl:for-each select="../mn:clause//mn:fn[ancestor::mn:quote or not(ancestor::mn:table)]"> <!-- move here footnotes from clause level 4 -->
|
|
746
735
|
<xsl:call-template name="fn_to_note_side"/>
|
|
@@ -771,7 +760,7 @@
|
|
|
771
760
|
<xsl:template match="mn:fn[ancestor::mn:quote or not(ancestor::mn:table)]" mode="flatxml">
|
|
772
761
|
<xsl:choose>
|
|
773
762
|
<!-- see template above with @depth = 4 -->
|
|
774
|
-
<xsl:when test="ancestor::mn:clause[1]/mn:title/@depth = 4 and count(ancestor::mn:clause[2]/mn:title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0">
|
|
763
|
+
<xsl:when test="ancestor::mn:clause[1]/mn:fmt-title/@depth = 4 and count(ancestor::mn:clause[2]/mn:fmt-title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0">
|
|
775
764
|
<xsl:apply-templates select="." mode="fn_to_xref"/>
|
|
776
765
|
</xsl:when>
|
|
777
766
|
<xsl:when test="ancestor::mn:li">
|
|
@@ -788,7 +777,7 @@
|
|
|
788
777
|
<xsl:template match="mn:fn[ancestor::mn:quote or not(ancestor::mn:table)]" mode="flatxml_list">
|
|
789
778
|
<xsl:choose>
|
|
790
779
|
<!-- see template above with @depth = 4 -->
|
|
791
|
-
<xsl:when test="ancestor::mn:clause[1]/mn:title/@depth = 4 and count(ancestor::mn:clause[2]/mn:title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0">
|
|
780
|
+
<xsl:when test="ancestor::mn:clause[1]/mn:fmt-title/@depth = 4 and count(ancestor::mn:clause[2]/mn:fmt-title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0">
|
|
792
781
|
<xsl:apply-templates select="." mode="fn_to_xref"/>
|
|
793
782
|
</xsl:when>
|
|
794
783
|
<xsl:when test="ancestor::mn:li">
|
|
@@ -803,7 +792,7 @@
|
|
|
803
792
|
</xsl:template>
|
|
804
793
|
|
|
805
794
|
<xsl:template match="mn:fn" mode="fn_to_xref">
|
|
806
|
-
<xsl:element name="xref" namespace="{$namespace_full}">
|
|
795
|
+
<xsl:element name="fmt-xref" namespace="{$namespace_full}">
|
|
807
796
|
|
|
808
797
|
<xsl:copy-of select="@target"/>
|
|
809
798
|
|
|
@@ -884,7 +873,7 @@
|
|
|
884
873
|
|
|
885
874
|
<xsl:choose>
|
|
886
875
|
<!-- see template above with @depth = 4 -->
|
|
887
|
-
<xsl:when test="ancestor::mn:clause[1]/mn:title/@depth = 4 and count(ancestor::mn:clause[2]/mn:title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0"/>
|
|
876
|
+
<xsl:when test="ancestor::mn:clause[1]/mn:fmt-title/@depth = 4 and count(ancestor::mn:clause[2]/mn:fmt-title[@depth = 3]/following-sibling::*[1][self::mn:note]) > 0"/>
|
|
888
877
|
<xsl:otherwise>
|
|
889
878
|
|
|
890
879
|
<!-- move all footnotes in the current list (not only current list item) into first 'li' -->
|
|
@@ -1116,11 +1105,11 @@
|
|
|
1116
1105
|
|
|
1117
1106
|
<xsl:variable name="header-title">
|
|
1118
1107
|
<xsl:choose>
|
|
1119
|
-
<xsl:when test="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:title[1]/mn:tab">
|
|
1120
|
-
<xsl:apply-templates select="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:title[1]/mn:tab[1]/following-sibling::node()" mode="header"/>
|
|
1108
|
+
<xsl:when test="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:fmt-title[1]/mn:tab">
|
|
1109
|
+
<xsl:apply-templates select="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:fmt-title[1]/mn:tab[1]/following-sibling::node()" mode="header"/>
|
|
1121
1110
|
</xsl:when>
|
|
1122
1111
|
<xsl:otherwise>
|
|
1123
|
-
<xsl:apply-templates select="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:title[1]" mode="header"/>
|
|
1112
|
+
<xsl:apply-templates select="mn:preface/*[not(self::mn:note or self::mn:admonition)][1]/mn:fmt-title[1]" mode="header"/>
|
|
1124
1113
|
</xsl:otherwise>
|
|
1125
1114
|
</xsl:choose>
|
|
1126
1115
|
</xsl:variable>
|
|
@@ -1260,7 +1249,7 @@
|
|
|
1260
1249
|
<xsl:call-template name="insertSeparatorPage"/>
|
|
1261
1250
|
</xsl:if>
|
|
1262
1251
|
|
|
1263
|
-
</xsl:when>
|
|
1252
|
+
</xsl:when> <!-- EMD: $independentAppendix = '' and not($doctype = 'guide') -->
|
|
1264
1253
|
<xsl:otherwise> <!-- independentAppendix != '' -->
|
|
1265
1254
|
|
|
1266
1255
|
<xsl:variable name="docid">
|
|
@@ -1409,11 +1398,26 @@
|
|
|
1409
1398
|
<xsl:with-param name="lang" select="$curr_lang"/>
|
|
1410
1399
|
</xsl:apply-templates>
|
|
1411
1400
|
|
|
1412
|
-
</xsl:otherwise
|
|
1401
|
+
</xsl:otherwise><!-- END: independentAppendix != '' -->
|
|
1413
1402
|
</xsl:choose>
|
|
1414
1403
|
|
|
1415
1404
|
</xsl:template>
|
|
1416
1405
|
|
|
1406
|
+
<xsl:template name="cover-page">
|
|
1407
|
+
<xsl:choose>
|
|
1408
|
+
<xsl:when test="$doctype = 'guide'">
|
|
1409
|
+
<xsl:call-template name="insertCoverPageAppendix"/>
|
|
1410
|
+
</xsl:when>
|
|
1411
|
+
<xsl:when test="$independentAppendix = ''">
|
|
1412
|
+
<xsl:call-template name="insertCoverPage"/>
|
|
1413
|
+
<xsl:call-template name="insertInnerCoverPage"/>
|
|
1414
|
+
</xsl:when>
|
|
1415
|
+
<xsl:when test="$independentAppendix != ''">
|
|
1416
|
+
<xsl:call-template name="insertCoverPageAppendix"/>
|
|
1417
|
+
</xsl:when>
|
|
1418
|
+
</xsl:choose>
|
|
1419
|
+
</xsl:template> <!-- END: cover-page -->
|
|
1420
|
+
|
|
1417
1421
|
<!-- Cover Pages -->
|
|
1418
1422
|
<xsl:template name="insertCoverPage">
|
|
1419
1423
|
|
|
@@ -1569,11 +1573,17 @@
|
|
|
1569
1573
|
</xsl:choose>
|
|
1570
1574
|
</xsl:variable>
|
|
1571
1575
|
|
|
1576
|
+
<!-- see https://github.com/metanorma/metanorma-bipm/issues/99 -->
|
|
1577
|
+
<!-- Example: Appendix -->
|
|
1578
|
+
<xsl:variable name="title_level2_ancillary"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level2_ancillary</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1579
|
+
<!-- Example: Annexe -->
|
|
1580
|
+
<xsl:variable name="title_level2_ancillary_alt"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level2_ancillary_alt</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1581
|
+
|
|
1572
1582
|
<!-- Appendix titles processing -->
|
|
1573
1583
|
<xsl:variable name="appendix_num" select="normalize-space((//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:structuredidentifier/mn:appendix)"/>
|
|
1574
1584
|
<xsl:if test="$appendix_num != ''">
|
|
1575
|
-
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"
|
|
1576
|
-
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"
|
|
1585
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="concat($title_level2_ancillary_alt, ' ', $appendix_num)"/></fo:block>
|
|
1586
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="concat($title_level2_ancillary, ' ', $appendix_num)"/></fo:block>
|
|
1577
1587
|
</xsl:if>
|
|
1578
1588
|
|
|
1579
1589
|
<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type = 'title-appendix']">
|
|
@@ -1588,15 +1598,21 @@
|
|
|
1588
1598
|
</xsl:if>
|
|
1589
1599
|
<!-- End Appendix titles processing -->
|
|
1590
1600
|
|
|
1601
|
+
<!-- see https://github.com/metanorma/metanorma-bipm/issues/99 -->
|
|
1602
|
+
<!-- Example: Annex -->
|
|
1603
|
+
<xsl:variable name="title_level3_ancillary"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level3_ancillary</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1604
|
+
<!-- Example: Annexe -->
|
|
1605
|
+
<xsl:variable name="title_level3_ancillary_alt"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level3_ancillary_alt</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1606
|
+
|
|
1591
1607
|
<!-- Annex title processing -->
|
|
1592
1608
|
<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type = 'title-annex']">
|
|
1593
1609
|
<xsl:variable name="annex_num" select="normalize-space((//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:structuredidentifier/mn:annexid)"/>
|
|
1594
1610
|
<xsl:if test="$annex_num != ''">
|
|
1595
1611
|
<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
|
|
1596
1612
|
<!-- Annexe -->
|
|
1597
|
-
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"
|
|
1613
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="concat($title_level3_ancillary_alt, ' ', $annex_num)"/></fo:block>
|
|
1598
1614
|
<!-- Annex -->
|
|
1599
|
-
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"
|
|
1615
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="concat($title_level3_ancillary, ' ', $annex_num)"/></fo:block>
|
|
1600
1616
|
</xsl:if>
|
|
1601
1617
|
|
|
1602
1618
|
<fo:block font-size="{$font-size-factor * 30.4}pt">
|
|
@@ -1616,18 +1632,33 @@
|
|
|
1616
1632
|
</xsl:if>
|
|
1617
1633
|
<!-- End Annex titles processing -->
|
|
1618
1634
|
|
|
1635
|
+
<xsl:variable name="part_num_" select="normalize-space((//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:structuredidentifier/mn:part)"/>
|
|
1619
1636
|
<!-- Part titles processing -->
|
|
1620
1637
|
<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type = 'title-part']">
|
|
1621
|
-
<xsl:variable name="part_num"
|
|
1622
|
-
|
|
1638
|
+
<xsl:variable name="part_num">
|
|
1639
|
+
<xsl:choose>
|
|
1640
|
+
<xsl:when test="contains($part_num_, '.')"><xsl:value-of select="substring-before($part_num_, '.')"/></xsl:when>
|
|
1641
|
+
<xsl:otherwise><xsl:value-of select="$part_num_"/></xsl:otherwise>
|
|
1642
|
+
</xsl:choose>
|
|
1643
|
+
</xsl:variable>
|
|
1644
|
+
<xsl:if test="normalize-space($part_num) != ''">
|
|
1623
1645
|
<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
|
|
1646
|
+
|
|
1647
|
+
<!-- see https://github.com/metanorma/metanorma-bipm/issues/99 -->
|
|
1648
|
+
<!-- Example: Part -->
|
|
1649
|
+
<xsl:variable name="title_level4_ancillary"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level4_ancillary</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1650
|
+
<!-- Example: Partie -->
|
|
1651
|
+
<xsl:variable name="title_level4_ancillary_alt"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level4_ancillary_alt</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1652
|
+
|
|
1624
1653
|
<!-- Part -->
|
|
1625
1654
|
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}">
|
|
1626
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part_num)"/>
|
|
1655
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part_num)"/> -->
|
|
1656
|
+
<xsl:value-of select="concat($title_level4_ancillary_alt, ' ', $part_num)"/>
|
|
1627
1657
|
</fo:block>
|
|
1628
1658
|
<!-- Partie -->
|
|
1629
1659
|
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}">
|
|
1630
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part_num)"/>
|
|
1660
|
+
<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part_num)"/> -->
|
|
1661
|
+
<xsl:value-of select="concat($title_level4_ancillary, ' ', $part_num)"/>
|
|
1631
1662
|
</fo:block>
|
|
1632
1663
|
</xsl:if>
|
|
1633
1664
|
|
|
@@ -1650,13 +1681,24 @@
|
|
|
1650
1681
|
|
|
1651
1682
|
<!-- Sub-part titles processing -->
|
|
1652
1683
|
<xsl:if test="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type = 'title-subpart']">
|
|
1653
|
-
<xsl:variable name="subpart_num" select="normalize-space((//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:structuredidentifier/mn:subpart)"/>
|
|
1684
|
+
<!-- <xsl:variable name="subpart_num" select="normalize-space((//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:structuredidentifier/mn:subpart)"/> -->
|
|
1685
|
+
<xsl:variable name="subpart_num" select="normalize-space(substring-after($part_num_, '.'))"/>
|
|
1686
|
+
|
|
1654
1687
|
<xsl:if test="$subpart_num != ''">
|
|
1655
1688
|
<fo:block font-size="{$space-factor * 30.4}pt"> </fo:block>
|
|
1656
|
-
|
|
1657
|
-
|
|
1689
|
+
|
|
1690
|
+
<!-- see https://github.com/metanorma/metanorma-bipm/issues/99 -->
|
|
1691
|
+
<!-- Example: Part -->
|
|
1692
|
+
<xsl:variable name="title_level5_ancillary"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level5_ancillary</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1693
|
+
<!-- Example: Partie de sub -->
|
|
1694
|
+
<xsl:variable name="title_level5_ancillary_alt"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">level5_ancillary_alt</xsl:with-param></xsl:call-template></xsl:variable>
|
|
1695
|
+
|
|
1658
1696
|
<!-- Partie de sub -->
|
|
1659
|
-
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-
|
|
1697
|
+
<!-- <fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='fr']),'#',$subpart_num)"/> <xsl:value-of select="$subpart_num"/></fo:block> -->
|
|
1698
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-normal}"><xsl:value-of select="concat($title_level5_ancillary_alt, ' ', $subpart_num)"/></fo:block>
|
|
1699
|
+
<!-- Sub-part -->
|
|
1700
|
+
<!-- <fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang='en']),'#',$subpart_num)"/> <xsl:value-of select="$subpart_num"/></fo:block> -->
|
|
1701
|
+
<fo:block font-size="{$font-size-number-factor * 17}pt" font-weight="{$weight-bold}"><xsl:value-of select="concat($title_level5_ancillary, ' ', $subpart_num)"/></fo:block>
|
|
1660
1702
|
</xsl:if>
|
|
1661
1703
|
|
|
1662
1704
|
<fo:block font-size="{$font-size-factor * 30.4}pt">
|
|
@@ -1703,7 +1745,7 @@
|
|
|
1703
1745
|
|
|
1704
1746
|
</fo:flow>
|
|
1705
1747
|
</fo:page-sequence>
|
|
1706
|
-
</xsl:template>
|
|
1748
|
+
</xsl:template> <!-- END: insertCoverPageAppendix -->
|
|
1707
1749
|
|
|
1708
1750
|
<xsl:template name="insertCoverPageCommon">
|
|
1709
1751
|
<!-- background color -->
|
|
@@ -2101,20 +2143,20 @@
|
|
|
2101
2143
|
<xsl:choose>
|
|
2102
2144
|
<xsl:when test="parent::mn:sections">
|
|
2103
2145
|
<xsl:choose>
|
|
2104
|
-
<xsl:when test="./mn:title[1]/mn:tab">
|
|
2105
|
-
<xsl:apply-templates select="./mn:title[1]/mn:tab[1]/following-sibling::node()" mode="header"/>
|
|
2146
|
+
<xsl:when test="./mn:fmt-title[1]/mn:tab">
|
|
2147
|
+
<xsl:apply-templates select="./mn:fmt-title[1]/mn:tab[1]/following-sibling::node()" mode="header"/>
|
|
2106
2148
|
</xsl:when>
|
|
2107
2149
|
<xsl:otherwise>
|
|
2108
|
-
<xsl:apply-templates select="./mn:title[1]" mode="header"/>
|
|
2150
|
+
<xsl:apply-templates select="./mn:fmt-title[1]" mode="header"/>
|
|
2109
2151
|
</xsl:otherwise>
|
|
2110
2152
|
</xsl:choose>
|
|
2111
2153
|
</xsl:when>
|
|
2112
2154
|
|
|
2113
2155
|
<xsl:when test="self::mn:annex">
|
|
2114
2156
|
<xsl:choose>
|
|
2115
|
-
<xsl:when test="./*[1]/mn:title[1]/mn:tab">
|
|
2157
|
+
<xsl:when test="./*[1]/mn:fmt-title[1]/mn:tab">
|
|
2116
2158
|
<xsl:variable name="title_annex">
|
|
2117
|
-
<xsl:value-of select="normalize-space(./*[1]/mn:title[1]/mn:tab[1]/preceding-sibling::node())"/>
|
|
2159
|
+
<xsl:value-of select="normalize-space(./*[1]/mn:fmt-title[1]/mn:tab[1]/preceding-sibling::node())"/>
|
|
2118
2160
|
</xsl:variable>
|
|
2119
2161
|
<xsl:choose>
|
|
2120
2162
|
<xsl:when test="substring($title_annex, string-length($title_annex)) = '.'">
|
|
@@ -2126,13 +2168,13 @@
|
|
|
2126
2168
|
</xsl:choose>
|
|
2127
2169
|
</xsl:when>
|
|
2128
2170
|
<xsl:otherwise>
|
|
2129
|
-
<xsl:apply-templates select="./*[1]/mn:title[1]" mode="header"/>
|
|
2171
|
+
<xsl:apply-templates select="./*[1]/mn:fmt-title[1]" mode="header"/>
|
|
2130
2172
|
</xsl:otherwise>
|
|
2131
2173
|
</xsl:choose>
|
|
2132
2174
|
</xsl:when>
|
|
2133
2175
|
|
|
2134
2176
|
<xsl:otherwise>
|
|
2135
|
-
<xsl:apply-templates select="./mn:title[1]" mode="header"/>
|
|
2177
|
+
<xsl:apply-templates select="./mn:fmt-title[1]" mode="header"/>
|
|
2136
2178
|
</xsl:otherwise>
|
|
2137
2179
|
|
|
2138
2180
|
</xsl:choose>
|
|
@@ -2210,7 +2252,7 @@
|
|
|
2210
2252
|
<!-- title -->
|
|
2211
2253
|
<!-- ====== -->
|
|
2212
2254
|
|
|
2213
|
-
<xsl:template match="mn:title" name="title">
|
|
2255
|
+
<xsl:template match="mn:fmt-title" name="title">
|
|
2214
2256
|
|
|
2215
2257
|
<xsl:variable name="level">
|
|
2216
2258
|
<xsl:call-template name="getLevel"/>
|
|
@@ -2344,7 +2386,7 @@
|
|
|
2344
2386
|
<xsl:apply-templates mode="header"/>
|
|
2345
2387
|
</xsl:template>
|
|
2346
2388
|
|
|
2347
|
-
<xsl:template match="mn:stem" mode="header">
|
|
2389
|
+
<xsl:template match="mn:fmt-stem" mode="header">
|
|
2348
2390
|
<xsl:apply-templates/>
|
|
2349
2391
|
</xsl:template>
|
|
2350
2392
|
|
|
@@ -2503,7 +2545,7 @@
|
|
|
2503
2545
|
<xsl:template match="mn:sections/mn:clause | mn:annex/mn:clause" priority="3">
|
|
2504
2546
|
|
|
2505
2547
|
<xsl:variable name="space-before"> <!-- margin-top for title, see mn:title -->
|
|
2506
|
-
<xsl:if test="local-name(*[1]) = 'title'">
|
|
2548
|
+
<xsl:if test="local-name(*[1]) = 'fmt-title'">
|
|
2507
2549
|
<xsl:if test="*[1]/@depth = 1 and not(*[1]/ancestor::mn:annex) and $independentAppendix != ''">30pt</xsl:if>
|
|
2508
2550
|
<xsl:if test="*[1]/@depth = 2 and not(*[1]/ancestor::mn:annex)">30pt</xsl:if>
|
|
2509
2551
|
<xsl:if test="*[1]/@depth = 2 and *[1]/ancestor::mn:annex">18pt</xsl:if> <!-- 24pt -->
|
|
@@ -2615,7 +2657,7 @@
|
|
|
2615
2657
|
<xsl:variable name="start_row" select="xalan:nodeset($rows)/num[$curr_row_num]/@span_start"/>
|
|
2616
2658
|
<xsl:variable name="end_row" select="$start_row + xalan:nodeset($rows)/num[$curr_row_num]/@span_num - 1"/>
|
|
2617
2659
|
<fo:table-row> <!-- DEBUG border-top="1.5pt solid blue" border-bottom="1.5pt solid blue" -->
|
|
2618
|
-
<xsl:if test="local-name(*[$end_row]) = 'title'"> <!-- if last element is title, then keep row with next--> <!-- or local-name(*[$end_row]) = 'clause' or clause, then keep row with next -->
|
|
2660
|
+
<xsl:if test="local-name(*[$end_row]) = 'fmt-title'"> <!-- if last element is title, then keep row with next--> <!-- or local-name(*[$end_row]) = 'clause' or clause, then keep row with next -->
|
|
2619
2661
|
<xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
|
|
2620
2662
|
</xsl:if>
|
|
2621
2663
|
|
|
@@ -2623,7 +2665,7 @@
|
|
|
2623
2665
|
<xsl:variable name="start_row_next_num" select="number($start_row_next)"/>
|
|
2624
2666
|
|
|
2625
2667
|
<xsl:variable name="table-row-padding-bottom">
|
|
2626
|
-
<xsl:if test="$start_row_next != '' and local-name(*[$start_row_next_num]) = 'title'">
|
|
2668
|
+
<xsl:if test="$start_row_next != '' and local-name(*[$start_row_next_num]) = 'fmt-title'">
|
|
2627
2669
|
<xsl:if test="*[$start_row_next_num]/@depth = 2 and not(*[$start_row_next_num]/ancestor::mn:annex)">30pt</xsl:if>
|
|
2628
2670
|
<xsl:if test="*[$start_row_next_num]/@depth = 2 and *[$start_row_next_num]/ancestor::mn:annex">18pt</xsl:if> <!-- 24pt -->
|
|
2629
2671
|
<xsl:if test="*[$start_row_next_num]/@depth = 3 and not(*[$start_row_next_num]/ancestor::mn:annex)">20pt</xsl:if>
|
|
@@ -2724,7 +2766,7 @@
|
|
|
2724
2766
|
<xsl:choose>
|
|
2725
2767
|
<xsl:when test="count(./node()) = 0"> <!-- if empty clause, then move id into next title -->
|
|
2726
2768
|
<xsl:choose>
|
|
2727
|
-
<xsl:when test="local-name(following-sibling::*[1]) = 'title'"/> <!-- id will set in title -->
|
|
2769
|
+
<xsl:when test="local-name(following-sibling::*[1]) = 'fmt-title'"/> <!-- id will set in title -->
|
|
2728
2770
|
<xsl:otherwise>
|
|
2729
2771
|
<fo:block>
|
|
2730
2772
|
<xsl:call-template name="setId"/>
|
|
@@ -2761,7 +2803,7 @@
|
|
|
2761
2803
|
<xsl:variable name="num">
|
|
2762
2804
|
<xsl:number count="//mn:table[@id = $table_id]//mn:note_side" level="any"/>
|
|
2763
2805
|
</xsl:variable>
|
|
2764
|
-
<xsl:if test="$num = 1 and ancestor::mn:table[1]/mn:name/mn:tab">
|
|
2806
|
+
<xsl:if test="$num = 1 and ancestor::mn:table[1]/mn:fmt-name/mn:tab">
|
|
2765
2807
|
<xsl:attribute name="margin-top">48pt</xsl:attribute>
|
|
2766
2808
|
</xsl:if>
|
|
2767
2809
|
|
|
@@ -2770,13 +2812,13 @@
|
|
|
2770
2812
|
<xsl:call-template name="addReviewHelper"/>
|
|
2771
2813
|
|
|
2772
2814
|
<!-- if note relates to title, but not fn -->
|
|
2773
|
-
<xsl:if test="ancestor::mn:title and not(mn:sup_fn)"><fo:inline>* </fo:inline></xsl:if>
|
|
2815
|
+
<xsl:if test="ancestor::mn:fmt-title and not(mn:sup_fn)"><fo:inline>* </fo:inline></xsl:if>
|
|
2774
2816
|
|
|
2775
2817
|
<xsl:apply-templates mode="note_side"/>
|
|
2776
2818
|
</fo:block>
|
|
2777
2819
|
</xsl:template>
|
|
2778
2820
|
|
|
2779
|
-
<xsl:template match="mn:note_side/mn:name" mode="note_side" priority="2"/>
|
|
2821
|
+
<xsl:template match="mn:note_side/mn:fmt-name" mode="note_side" priority="2"/>
|
|
2780
2822
|
<xsl:template match="mn:note_side/*" mode="note_side">
|
|
2781
2823
|
<xsl:apply-templates select="."/>
|
|
2782
2824
|
</xsl:template>
|
|
@@ -2816,7 +2858,7 @@
|
|
|
2816
2858
|
<xsl:variable name="element-name">
|
|
2817
2859
|
<xsl:choose>
|
|
2818
2860
|
<xsl:when test="$inline = 'true'">fo:inline</xsl:when>
|
|
2819
|
-
<xsl:when test="../@inline-header = 'true' and $previous-element = 'title'">fo:inline</xsl:when> <!-- first paragraph after inline title -->
|
|
2861
|
+
<xsl:when test="../@inline-header = 'true' and $previous-element = 'fmt-title'">fo:inline</xsl:when> <!-- first paragraph after inline title -->
|
|
2820
2862
|
<xsl:when test="parent::mn:admonition">fo:inline</xsl:when>
|
|
2821
2863
|
<xsl:otherwise>fo:block</xsl:otherwise>
|
|
2822
2864
|
</xsl:choose>
|
|
@@ -2977,12 +3019,12 @@
|
|
|
2977
3019
|
<fo:table-row>
|
|
2978
3020
|
<fo:table-cell>
|
|
2979
3021
|
<fo:block>
|
|
2980
|
-
<xsl:apply-templates select="mn:name"/>
|
|
3022
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
2981
3023
|
</fo:block>
|
|
2982
3024
|
</fo:table-cell>
|
|
2983
3025
|
<fo:table-cell>
|
|
2984
3026
|
<fo:block>
|
|
2985
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
3027
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
2986
3028
|
</fo:block>
|
|
2987
3029
|
</fo:table-cell>
|
|
2988
3030
|
</fo:table-row>
|
|
@@ -2991,15 +3033,15 @@
|
|
|
2991
3033
|
</fo:block>
|
|
2992
3034
|
</xsl:template>
|
|
2993
3035
|
|
|
2994
|
-
<xsl:template match="mn:preferred" priority="2">
|
|
3036
|
+
<xsl:template match="mn:fmt-preferred" priority="2">
|
|
2995
3037
|
<fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
|
|
2996
3038
|
<xsl:call-template name="setStyle_preferred"/>
|
|
2997
|
-
<xsl:if test="ancestor::mn:term[1]/mn:name">
|
|
3039
|
+
<xsl:if test="ancestor::mn:term[1]/mn:fmt-name">
|
|
2998
3040
|
<xsl:variable name="level">
|
|
2999
3041
|
<xsl:call-template name="getLevelTermName"/>
|
|
3000
3042
|
</xsl:variable>
|
|
3001
3043
|
<fo:inline role="H{$level}" font-weight="bold" padding-right="2mm">
|
|
3002
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
3044
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
3003
3045
|
</fo:inline>
|
|
3004
3046
|
</xsl:if>
|
|
3005
3047
|
<xsl:apply-templates/>
|
|
@@ -3012,12 +3054,12 @@
|
|
|
3012
3054
|
<fo:block break-after="page"/>
|
|
3013
3055
|
</xsl:template>
|
|
3014
3056
|
|
|
3015
|
-
<xsl:template match="mn:xref" priority="2">
|
|
3057
|
+
<xsl:template match="mn:xref | mn:fmt-xref" priority="2">
|
|
3016
3058
|
<xsl:call-template name="insert_basic_link">
|
|
3017
3059
|
<xsl:with-param name="element">
|
|
3018
3060
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
|
|
3019
3061
|
|
|
3020
|
-
<xsl:if test="parent::mn:title">
|
|
3062
|
+
<xsl:if test="parent::mn:fmt-title">
|
|
3021
3063
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
3022
3064
|
</xsl:if>
|
|
3023
3065
|
|
|
@@ -3065,7 +3107,7 @@
|
|
|
3065
3107
|
</xsl:call-template>
|
|
3066
3108
|
</xsl:template>
|
|
3067
3109
|
|
|
3068
|
-
<xsl:template match="mn:eref[.//mn:locality[@type = 'anchor']]" priority="2">
|
|
3110
|
+
<xsl:template match="mn:fmt-eref[.//mn:locality[@type = 'anchor']]" priority="2">
|
|
3069
3111
|
<xsl:variable name="target" select=".//mn:locality[@type = 'anchor']/mn:referenceFrom"/>
|
|
3070
3112
|
<xsl:call-template name="insert_basic_link">
|
|
3071
3113
|
<xsl:with-param name="element">
|
|
@@ -3078,7 +3120,7 @@
|
|
|
3078
3120
|
</xsl:call-template>
|
|
3079
3121
|
</xsl:template>
|
|
3080
3122
|
|
|
3081
|
-
<xsl:template match="mn:note[not(ancestor::mn:preface)]/mn:name" priority="2">
|
|
3123
|
+
<xsl:template match="mn:note[not(ancestor::mn:preface)]/mn:fmt-name" priority="2">
|
|
3082
3124
|
<xsl:choose>
|
|
3083
3125
|
<xsl:when test="not(../preceding-sibling::mn:note) and not((../following-sibling::mn:note))">
|
|
3084
3126
|
<!-- <xsl:variable name="curr_lang" select="ancestor::mn:metanorma/mn:bibdata/mn:language[@current = 'true']"/>
|
|
@@ -3124,7 +3166,7 @@
|
|
|
3124
3166
|
</xsl:choose>
|
|
3125
3167
|
</xsl:template>
|
|
3126
3168
|
|
|
3127
|
-
<xsl:template match="mn:name/text()" priority="2">
|
|
3169
|
+
<xsl:template match="mn:fmt-name/text()" priority="2">
|
|
3128
3170
|
<xsl:value-of select="."/>
|
|
3129
3171
|
</xsl:template>
|
|
3130
3172
|
|
|
@@ -3341,7 +3383,7 @@
|
|
|
3341
3383
|
<xsl:template match="mn:clause[@type = 'toc']" priority="3">
|
|
3342
3384
|
<fo:block>
|
|
3343
3385
|
<xsl:copy-of select="@id"/>
|
|
3344
|
-
<xsl:apply-templates select="mn:title[1]"/>
|
|
3386
|
+
<xsl:apply-templates select="mn:fmt-title[1]"/>
|
|
3345
3387
|
|
|
3346
3388
|
<!-- create virtual table to determine column's width -->
|
|
3347
3389
|
<xsl:variable name="toc_table_simple">
|
|
@@ -3379,7 +3421,7 @@
|
|
|
3379
3421
|
<fo:table-row role="SKIP">
|
|
3380
3422
|
<fo:table-cell role="SKIP">
|
|
3381
3423
|
<fo:block role="SKIP">
|
|
3382
|
-
<xsl:variable name="title_id" select="generate-id(mn:title[1])"/>
|
|
3424
|
+
<xsl:variable name="title_id" select="generate-id(mn:fmt-title[1])"/>
|
|
3383
3425
|
<xsl:apply-templates select="*[not(generate-id() = $title_id)]">
|
|
3384
3426
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
3385
3427
|
</xsl:apply-templates>
|
|
@@ -3392,10 +3434,10 @@
|
|
|
3392
3434
|
</xsl:template>
|
|
3393
3435
|
|
|
3394
3436
|
<!-- ignore section number before tab -->
|
|
3395
|
-
<xsl:template match="mn:clause[@type = 'toc']//mn:title/text()[1][not(preceding-sibling::mn:tab) and following-sibling::*[1][self::mn:tab]]"/>
|
|
3396
|
-
<xsl:template match="mn:clause[@type = 'toc']//mn:title/mn:tab" priority="2"/>
|
|
3437
|
+
<xsl:template match="mn:clause[@type = 'toc']//mn:fmt-title/text()[1][not(preceding-sibling::mn:tab) and following-sibling::*[1][self::mn:tab]]"/>
|
|
3438
|
+
<xsl:template match="mn:clause[@type = 'toc']//mn:fmt-title/mn:tab" priority="2"/>
|
|
3397
3439
|
|
|
3398
|
-
<xsl:template match="mn:xref" mode="toc_table_width" priority="2">
|
|
3440
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width" priority="2">
|
|
3399
3441
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
3400
3442
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
3401
3443
|
<xsl:for-each select="mn:tab">
|
|
@@ -3663,7 +3705,7 @@
|
|
|
3663
3705
|
</fo:page-sequence>
|
|
3664
3706
|
</xsl:template>
|
|
3665
3707
|
|
|
3666
|
-
<xsl:template match="mn:stem/text()">
|
|
3708
|
+
<xsl:template match="mn:fmt-stem/text()">
|
|
3667
3709
|
<xsl:value-of select="normalize-space()"/>
|
|
3668
3710
|
</xsl:template>
|
|
3669
3711
|
|
|
@@ -4137,18 +4179,12 @@
|
|
|
4137
4179
|
<title-toc lang="zh">目次</title-toc>
|
|
4138
4180
|
|
|
4139
4181
|
<title-part lang="en">
|
|
4140
|
-
<xsl:text>Part #</xsl:text>
|
|
4141
4182
|
</title-part>
|
|
4142
4183
|
<title-part lang="fr">
|
|
4143
|
-
<xsl:text>Partie #</xsl:text>
|
|
4144
4184
|
</title-part>
|
|
4145
4185
|
<title-part lang="ru">
|
|
4146
4186
|
</title-part>
|
|
4147
4187
|
<title-part lang="zh">第 # 部分:</title-part>
|
|
4148
|
-
|
|
4149
|
-
<title-subpart lang="en">Sub-part #</title-subpart>
|
|
4150
|
-
<title-subpart lang="fr">Partie de sub #</title-subpart>
|
|
4151
|
-
|
|
4152
4188
|
</xsl:variable>
|
|
4153
4189
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
4154
4190
|
|
|
@@ -4601,7 +4637,8 @@
|
|
|
4601
4637
|
<xsl:template match="mn:stem" mode="update_xml_step1"/>
|
|
4602
4638
|
|
|
4603
4639
|
<xsl:template match="mn:fmt-stem" mode="update_xml_step1">
|
|
4604
|
-
<xsl:element name="stem" namespace="{$namespace_full}">
|
|
4640
|
+
<!-- <xsl:element name="stem" namespace="{$namespace_full}"> -->
|
|
4641
|
+
<xsl:copy>
|
|
4605
4642
|
<xsl:copy-of select="@*"/>
|
|
4606
4643
|
<xsl:choose>
|
|
4607
4644
|
<xsl:when test="mn:semx and count(node()) = 1">
|
|
@@ -4625,7 +4662,8 @@
|
|
|
4625
4662
|
</xsl:choose>
|
|
4626
4663
|
</xsl:otherwise>
|
|
4627
4664
|
</xsl:choose>
|
|
4628
|
-
</xsl:
|
|
4665
|
+
</xsl:copy>
|
|
4666
|
+
<!-- </xsl:element> -->
|
|
4629
4667
|
</xsl:template>
|
|
4630
4668
|
|
|
4631
4669
|
<xsl:template match="mn:image[not(.//mn:passthrough)] | mn:bibdata[not(.//mn:passthrough)] | mn:localized-strings" mode="update_xml_step1">
|
|
@@ -4787,12 +4825,14 @@
|
|
|
4787
4825
|
</xsl:template>
|
|
4788
4826
|
|
|
4789
4827
|
<xsl:template match="mn:fmt-title" mode="update_xml_step1">
|
|
4790
|
-
<xsl:element name="title" namespace="{$namespace_full}">
|
|
4828
|
+
<!-- <xsl:element name="title" namespace="{$namespace_full}"> -->
|
|
4829
|
+
<xsl:copy>
|
|
4791
4830
|
<xsl:copy-of select="@*"/>
|
|
4792
4831
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4793
4832
|
|
|
4794
4833
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4795
|
-
</xsl:
|
|
4834
|
+
</xsl:copy>
|
|
4835
|
+
<!-- </xsl:element> -->
|
|
4796
4836
|
</xsl:template>
|
|
4797
4837
|
|
|
4798
4838
|
<xsl:template name="addNamedDestinationAttribute">
|
|
@@ -4804,12 +4844,14 @@
|
|
|
4804
4844
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4805
4845
|
</xsl:when>
|
|
4806
4846
|
<xsl:otherwise>
|
|
4807
|
-
<xsl:element name="name" namespace="{$namespace_full}">
|
|
4847
|
+
<!-- <xsl:element name="name" namespace="{$namespace_full}"> -->
|
|
4848
|
+
<xsl:copy>
|
|
4808
4849
|
<xsl:copy-of select="@*"/>
|
|
4809
4850
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4810
4851
|
|
|
4811
4852
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4812
|
-
</xsl:
|
|
4853
|
+
</xsl:copy>
|
|
4854
|
+
<!-- </xsl:element> -->
|
|
4813
4855
|
</xsl:otherwise>
|
|
4814
4856
|
</xsl:choose>
|
|
4815
4857
|
</xsl:template>
|
|
@@ -4824,7 +4866,7 @@
|
|
|
4824
4866
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4825
4867
|
</xsl:template>
|
|
4826
4868
|
<xsl:template match="mn:fmt-preferred[not(mn:p)] | mn:fmt-preferred/mn:p" mode="update_xml_step1">
|
|
4827
|
-
<xsl:element name="preferred" namespace="{$namespace_full}">
|
|
4869
|
+
<xsl:element name="fmt-preferred" namespace="{$namespace_full}">
|
|
4828
4870
|
<xsl:copy-of select="@*"/>
|
|
4829
4871
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4830
4872
|
</xsl:element>
|
|
@@ -4834,7 +4876,7 @@
|
|
|
4834
4876
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4835
4877
|
</xsl:template>
|
|
4836
4878
|
<xsl:template match="mn:fmt-admitted[not(mn:p)] | mn:fmt-admitted/mn:p" mode="update_xml_step1">
|
|
4837
|
-
<xsl:element name="admitted" namespace="{$namespace_full}">
|
|
4879
|
+
<xsl:element name="fmt-admitted" namespace="{$namespace_full}">
|
|
4838
4880
|
<xsl:copy-of select="@*"/>
|
|
4839
4881
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4840
4882
|
</xsl:element>
|
|
@@ -4844,32 +4886,32 @@
|
|
|
4844
4886
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4845
4887
|
</xsl:template>
|
|
4846
4888
|
<xsl:template match="mn:fmt-deprecates[not(mn:p)] | mn:fmt-deprecates/mn:p" mode="update_xml_step1">
|
|
4847
|
-
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
|
4889
|
+
<xsl:element name="fmt-deprecates" namespace="{$namespace_full}">
|
|
4848
4890
|
<xsl:copy-of select="@*"/>
|
|
4849
4891
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4850
4892
|
</xsl:element>
|
|
4851
4893
|
</xsl:template>
|
|
4852
4894
|
|
|
4853
|
-
<xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4895
|
+
<!-- <xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4854
4896
|
<xsl:element name="definition" namespace="{$namespace_full}">
|
|
4855
4897
|
<xsl:copy-of select="@*"/>
|
|
4856
4898
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4857
4899
|
</xsl:element>
|
|
4858
4900
|
</xsl:template>
|
|
4859
|
-
|
|
4901
|
+
|
|
4860
4902
|
<xsl:template match="mn:fmt-termsource" mode="update_xml_step1">
|
|
4861
4903
|
<xsl:element name="termsource" namespace="{$namespace_full}">
|
|
4862
4904
|
<xsl:copy-of select="@*"/>
|
|
4863
4905
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4864
4906
|
</xsl:element>
|
|
4865
4907
|
</xsl:template>
|
|
4866
|
-
|
|
4908
|
+
|
|
4867
4909
|
<xsl:template match="mn:fmt-source" mode="update_xml_step1">
|
|
4868
4910
|
<xsl:element name="source" namespace="{$namespace_full}">
|
|
4869
4911
|
<xsl:copy-of select="@*"/>
|
|
4870
4912
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4871
4913
|
</xsl:element>
|
|
4872
|
-
</xsl:template>
|
|
4914
|
+
</xsl:template> -->
|
|
4873
4915
|
|
|
4874
4916
|
<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">
|
|
4875
4917
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -4892,12 +4934,12 @@
|
|
|
4892
4934
|
</xsl:template>
|
|
4893
4935
|
|
|
4894
4936
|
<xsl:template match="mn:identifier" mode="update_xml_step1"/>
|
|
4895
|
-
<xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4937
|
+
<!-- <xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4896
4938
|
<xsl:element name="identifier" namespace="{$namespace_full}">
|
|
4897
4939
|
<xsl:copy-of select="@*"/>
|
|
4898
4940
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4899
4941
|
</xsl:element>
|
|
4900
|
-
</xsl:template>
|
|
4942
|
+
</xsl:template> -->
|
|
4901
4943
|
|
|
4902
4944
|
<xsl:template match="mn:concept" mode="update_xml_step1"/>
|
|
4903
4945
|
|
|
@@ -4907,51 +4949,53 @@
|
|
|
4907
4949
|
|
|
4908
4950
|
<xsl:template match="mn:eref" mode="update_xml_step1"/>
|
|
4909
4951
|
|
|
4910
|
-
<xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4952
|
+
<!-- <xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4911
4953
|
<xsl:element name="eref" namespace="{$namespace_full}">
|
|
4912
4954
|
<xsl:copy-of select="@*"/>
|
|
4913
4955
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4914
4956
|
</xsl:element>
|
|
4915
|
-
</xsl:template>
|
|
4957
|
+
</xsl:template> -->
|
|
4916
4958
|
|
|
4917
4959
|
<xsl:template match="mn:xref" mode="update_xml_step1"/>
|
|
4918
4960
|
|
|
4919
|
-
<xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4961
|
+
<!-- <xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4920
4962
|
<xsl:element name="xref" namespace="{$namespace_full}">
|
|
4921
4963
|
<xsl:copy-of select="@*"/>
|
|
4922
4964
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4923
4965
|
</xsl:element>
|
|
4924
|
-
</xsl:template>
|
|
4966
|
+
</xsl:template> -->
|
|
4925
4967
|
|
|
4926
4968
|
<xsl:template match="mn:link" mode="update_xml_step1"/>
|
|
4927
4969
|
|
|
4928
|
-
<xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4970
|
+
<!-- <xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4929
4971
|
<xsl:element name="link" namespace="{$namespace_full}">
|
|
4930
4972
|
<xsl:copy-of select="@*"/>
|
|
4931
4973
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4932
4974
|
</xsl:element>
|
|
4933
|
-
</xsl:template>
|
|
4975
|
+
</xsl:template> -->
|
|
4934
4976
|
|
|
4935
4977
|
<xsl:template match="mn:origin" mode="update_xml_step1"/>
|
|
4936
4978
|
|
|
4937
|
-
<xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4979
|
+
<!-- <xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4938
4980
|
<xsl:element name="origin" namespace="{$namespace_full}">
|
|
4939
4981
|
<xsl:copy-of select="@*"/>
|
|
4940
4982
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4941
4983
|
</xsl:element>
|
|
4942
|
-
</xsl:template>
|
|
4984
|
+
</xsl:template> -->
|
|
4943
4985
|
|
|
4944
4986
|
<xsl:template match="mn:erefstack" mode="update_xml_step1"/>
|
|
4945
4987
|
|
|
4946
4988
|
<xsl:template match="mn:svgmap" mode="update_xml_step1"/>
|
|
4947
4989
|
|
|
4948
|
-
<xsl:template match="mn:
|
|
4990
|
+
<xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
|
|
4949
4991
|
|
|
4950
|
-
|
|
4951
|
-
|
|
4952
|
-
|
|
4953
|
-
|
|
4954
|
-
|
|
4992
|
+
<xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1">
|
|
4993
|
+
<xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
|
|
4994
|
+
<xsl:value-of select="."/>
|
|
4995
|
+
</xsl:element>
|
|
4996
|
+
</xsl:template>
|
|
4997
|
+
|
|
4998
|
+
<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
|
|
4955
4999
|
|
|
4956
5000
|
<!-- END: update new Presentation XML -->
|
|
4957
5001
|
|
|
@@ -5147,7 +5191,7 @@
|
|
|
5147
5191
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
5148
5192
|
<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>
|
|
5149
5193
|
|
|
5150
|
-
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:link[not(contains(
|
|
5194
|
+
<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">
|
|
5151
5195
|
|
|
5152
5196
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
5153
5197
|
|
|
@@ -5266,7 +5310,7 @@
|
|
|
5266
5310
|
</xsl:if>
|
|
5267
5311
|
</xsl:template>
|
|
5268
5312
|
|
|
5269
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5313
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5270
5314
|
<xsl:copy-of select="."/>
|
|
5271
5315
|
</xsl:template>
|
|
5272
5316
|
|
|
@@ -5601,7 +5645,7 @@
|
|
|
5601
5645
|
</fo:block>
|
|
5602
5646
|
</xsl:template> <!-- copyright-statement -->
|
|
5603
5647
|
|
|
5604
|
-
<xsl:template match="mn:copyright-statement//mn:title">
|
|
5648
|
+
<xsl:template match="mn:copyright-statement//mn:fmt-title">
|
|
5605
5649
|
<!-- process in the template 'title' -->
|
|
5606
5650
|
<xsl:call-template name="title"/>
|
|
5607
5651
|
</xsl:template> <!-- copyright-statement//title -->
|
|
@@ -5617,7 +5661,7 @@
|
|
|
5617
5661
|
</fo:block>
|
|
5618
5662
|
</xsl:template> <!-- license-statement -->
|
|
5619
5663
|
|
|
5620
|
-
<xsl:template match="mn:license-statement//mn:title">
|
|
5664
|
+
<xsl:template match="mn:license-statement//mn:fmt-title">
|
|
5621
5665
|
<xsl:variable name="level">
|
|
5622
5666
|
<xsl:call-template name="getLevel"/>
|
|
5623
5667
|
</xsl:variable>
|
|
@@ -5642,7 +5686,7 @@
|
|
|
5642
5686
|
</fo:block>
|
|
5643
5687
|
</xsl:template> <!-- legal-statement -->
|
|
5644
5688
|
|
|
5645
|
-
<xsl:template match="mn:legal-statement//mn:title">
|
|
5689
|
+
<xsl:template match="mn:legal-statement//mn:fmt-title">
|
|
5646
5690
|
<!-- process in the template 'title' -->
|
|
5647
5691
|
<xsl:call-template name="title"/>
|
|
5648
5692
|
|
|
@@ -5662,7 +5706,7 @@
|
|
|
5662
5706
|
</fo:block>
|
|
5663
5707
|
</xsl:template> <!-- feedback-statement -->
|
|
5664
5708
|
|
|
5665
|
-
<xsl:template match="mn:feedback-statement//mn:title">
|
|
5709
|
+
<xsl:template match="mn:feedback-statement//mn:fmt-title">
|
|
5666
5710
|
<!-- process in the template 'title' -->
|
|
5667
5711
|
<xsl:call-template name="title"/>
|
|
5668
5712
|
</xsl:template>
|
|
@@ -5687,7 +5731,7 @@
|
|
|
5687
5731
|
<xsl:template name="refine_link-style">
|
|
5688
5732
|
</xsl:template> <!-- refine_link-style -->
|
|
5689
5733
|
|
|
5690
|
-
<xsl:template match="mn:link" name="link">
|
|
5734
|
+
<xsl:template match="mn:fmt-link" name="link">
|
|
5691
5735
|
<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
|
|
5692
5736
|
<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
|
|
5693
5737
|
<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
|
|
@@ -5905,7 +5949,7 @@
|
|
|
5905
5949
|
<xsl:value-of select="."/>
|
|
5906
5950
|
</xsl:attribute>
|
|
5907
5951
|
</xsl:for-each>
|
|
5908
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
5952
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
5909
5953
|
</xsl:when>
|
|
5910
5954
|
|
|
5911
5955
|
<xsl:otherwise>
|
|
@@ -5947,11 +5991,11 @@
|
|
|
5947
5991
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5948
5992
|
</xsl:if>
|
|
5949
5993
|
|
|
5950
|
-
<xsl:apply-templates select="node()[not(self::mn:name or self::mn:dl)]"/>
|
|
5994
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl)]"/>
|
|
5951
5995
|
</fo:block>
|
|
5952
5996
|
|
|
5953
5997
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
5954
|
-
<xsl:apply-templates select="mn:name"/> <!-- show sourcecode's name AFTER content -->
|
|
5998
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
5955
5999
|
|
|
5956
6000
|
</fo:block-container>
|
|
5957
6001
|
</fo:block-container>
|
|
@@ -6252,7 +6296,7 @@
|
|
|
6252
6296
|
|
|
6253
6297
|
<!-- end mode="syntax_highlight" -->
|
|
6254
6298
|
|
|
6255
|
-
<xsl:template match="mn:sourcecode/mn:name">
|
|
6299
|
+
<xsl:template match="mn:sourcecode/mn:fmt-name">
|
|
6256
6300
|
<xsl:if test="normalize-space() != ''">
|
|
6257
6301
|
<fo:block xsl:use-attribute-sets="sourcecode-name-style">
|
|
6258
6302
|
<xsl:apply-templates/>
|
|
@@ -6270,7 +6314,7 @@
|
|
|
6270
6314
|
</xsl:choose>
|
|
6271
6315
|
</xsl:template>
|
|
6272
6316
|
|
|
6273
|
-
<xsl:template match="mn:annotation">
|
|
6317
|
+
<xsl:template match="mn:callout-annotation">
|
|
6274
6318
|
<xsl:variable name="annotation-id" select="@id"/>
|
|
6275
6319
|
<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
|
|
6276
6320
|
<fo:block id="{$annotation-id}" white-space="nowrap">
|
|
@@ -6282,7 +6326,7 @@
|
|
|
6282
6326
|
</fo:block>
|
|
6283
6327
|
</xsl:template>
|
|
6284
6328
|
|
|
6285
|
-
<xsl:template match="mn:annotation/mn:p">
|
|
6329
|
+
<xsl:template match="mn:callout-annotation/mn:p">
|
|
6286
6330
|
<xsl:param name="callout"/>
|
|
6287
6331
|
<fo:inline id="{@id}">
|
|
6288
6332
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -6432,7 +6476,7 @@
|
|
|
6432
6476
|
<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
|
|
6433
6477
|
<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
|
|
6434
6478
|
<xsl:choose>
|
|
6435
|
-
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (
|
|
6479
|
+
<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>
|
|
6436
6480
|
<xsl:otherwise>
|
|
6437
6481
|
<xsl:variable name="tag">
|
|
6438
6482
|
<xsl:call-template name="insertTag">
|
|
@@ -6833,12 +6877,12 @@
|
|
|
6833
6877
|
<xsl:template match="mn:permission">
|
|
6834
6878
|
<xsl:call-template name="setNamedDestination"/>
|
|
6835
6879
|
<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
|
|
6836
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6837
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6880
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6881
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6838
6882
|
</fo:block>
|
|
6839
6883
|
</xsl:template>
|
|
6840
6884
|
|
|
6841
|
-
<xsl:template match="mn:permission/mn:name">
|
|
6885
|
+
<xsl:template match="mn:permission/mn:fmt-name">
|
|
6842
6886
|
<xsl:if test="normalize-space() != ''">
|
|
6843
6887
|
<fo:block xsl:use-attribute-sets="permission-name-style">
|
|
6844
6888
|
<xsl:apply-templates/>
|
|
@@ -6860,15 +6904,15 @@
|
|
|
6860
6904
|
<xsl:template match="mn:requirement">
|
|
6861
6905
|
<xsl:call-template name="setNamedDestination"/>
|
|
6862
6906
|
<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
|
|
6863
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6907
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6864
6908
|
<xsl:apply-templates select="mn:label"/>
|
|
6865
6909
|
<xsl:apply-templates select="@obligation"/>
|
|
6866
6910
|
<xsl:apply-templates select="mn:subject"/>
|
|
6867
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6911
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6868
6912
|
</fo:block>
|
|
6869
6913
|
</xsl:template>
|
|
6870
6914
|
|
|
6871
|
-
<xsl:template match="mn:requirement/mn:name">
|
|
6915
|
+
<xsl:template match="mn:requirement/mn:fmt-name">
|
|
6872
6916
|
<xsl:if test="normalize-space() != ''">
|
|
6873
6917
|
|
|
6874
6918
|
<fo:block xsl:use-attribute-sets="requirement-name-style">
|
|
@@ -6904,12 +6948,12 @@
|
|
|
6904
6948
|
<xsl:template match="mn:recommendation">
|
|
6905
6949
|
<xsl:call-template name="setNamedDestination"/>
|
|
6906
6950
|
<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
|
|
6907
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6908
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
6951
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6952
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6909
6953
|
</fo:block>
|
|
6910
6954
|
</xsl:template>
|
|
6911
6955
|
|
|
6912
|
-
<xsl:template match="mn:recommendation/mn:name">
|
|
6956
|
+
<xsl:template match="mn:recommendation/mn:fmt-name">
|
|
6913
6957
|
<xsl:if test="normalize-space() != ''">
|
|
6914
6958
|
|
|
6915
6959
|
<fo:block xsl:use-attribute-sets="recommendation-name-style">
|
|
@@ -7158,11 +7202,11 @@
|
|
|
7158
7202
|
|
|
7159
7203
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
|
|
7160
7204
|
</xsl:if>
|
|
7161
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7205
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7162
7206
|
</fo:block>
|
|
7163
7207
|
</xsl:template>
|
|
7164
7208
|
|
|
7165
|
-
<xsl:template match="mn:term/mn:name">
|
|
7209
|
+
<xsl:template match="mn:term/mn:fmt-name">
|
|
7166
7210
|
<xsl:if test="normalize-space() != ''">
|
|
7167
7211
|
<!-- <xsl:variable name="level">
|
|
7168
7212
|
<xsl:call-template name="getLevelTermName"/>
|
|
@@ -7181,7 +7225,7 @@
|
|
|
7181
7225
|
<!-- origin -->
|
|
7182
7226
|
<!-- modification -->
|
|
7183
7227
|
<!-- ====== -->
|
|
7184
|
-
<xsl:template match="mn:termsource" name="termsource">
|
|
7228
|
+
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
7185
7229
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
7186
7230
|
|
|
7187
7231
|
<xsl:call-template name="refine_termsource-style"/>
|
|
@@ -7220,24 +7264,24 @@
|
|
|
7220
7264
|
</fo:block>
|
|
7221
7265
|
</xsl:template>
|
|
7222
7266
|
|
|
7223
|
-
<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">
|
|
7267
|
+
<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">
|
|
7224
7268
|
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
|
7225
7269
|
</xsl:template>
|
|
7226
7270
|
|
|
7227
|
-
<xsl:template match="mn:termsource/text()">
|
|
7271
|
+
<xsl:template match="mn:fmt-termsource/text()">
|
|
7228
7272
|
<xsl:if test="normalize-space() != ''">
|
|
7229
7273
|
<xsl:value-of select="."/>
|
|
7230
7274
|
</xsl:if>
|
|
7231
7275
|
</xsl:template>
|
|
7232
7276
|
|
|
7233
7277
|
<!-- text SOURCE: -->
|
|
7234
|
-
<xsl:template match="mn:termsource/mn:strong[1][following-sibling::*[1][self::mn:origin]]/text()">
|
|
7278
|
+
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
7235
7279
|
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
7236
7280
|
<xsl:value-of select="."/>
|
|
7237
7281
|
</fo:inline>
|
|
7238
7282
|
</xsl:template>
|
|
7239
7283
|
|
|
7240
|
-
<xsl:template match="mn:origin">
|
|
7284
|
+
<xsl:template match="mn:fmt-origin">
|
|
7241
7285
|
<xsl:call-template name="insert_basic_link">
|
|
7242
7286
|
<xsl:with-param name="element">
|
|
7243
7287
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -7283,7 +7327,7 @@
|
|
|
7283
7327
|
<!-- ====== -->
|
|
7284
7328
|
|
|
7285
7329
|
<!-- Preferred, admitted, deprecated -->
|
|
7286
|
-
<xsl:template match="mn:preferred">
|
|
7330
|
+
<xsl:template match="mn:fmt-preferred">
|
|
7287
7331
|
<xsl:variable name="level">
|
|
7288
7332
|
<xsl:call-template name="getLevel"/>
|
|
7289
7333
|
</xsl:variable>
|
|
@@ -7294,15 +7338,15 @@
|
|
|
7294
7338
|
</xsl:variable>
|
|
7295
7339
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
7296
7340
|
|
|
7297
|
-
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7341
|
+
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7298
7342
|
|
|
7299
7343
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
7300
7344
|
|
|
7301
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:name"><!-- change context -->
|
|
7345
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
7302
7346
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7303
7347
|
</xsl:for-each>
|
|
7304
7348
|
|
|
7305
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
7349
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
7306
7350
|
</fo:block>
|
|
7307
7351
|
</xsl:if>
|
|
7308
7352
|
|
|
@@ -7326,13 +7370,13 @@
|
|
|
7326
7370
|
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
|
7327
7371
|
<xsl:template match="mn:domain"/>
|
|
7328
7372
|
|
|
7329
|
-
<xsl:template match="mn:admitted">
|
|
7373
|
+
<xsl:template match="mn:fmt-admitted">
|
|
7330
7374
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
7331
7375
|
<xsl:apply-templates/>
|
|
7332
7376
|
</fo:block>
|
|
7333
7377
|
</xsl:template>
|
|
7334
7378
|
|
|
7335
|
-
<xsl:template match="mn:deprecates">
|
|
7379
|
+
<xsl:template match="mn:fmt-deprecates">
|
|
7336
7380
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
7337
7381
|
<xsl:apply-templates/>
|
|
7338
7382
|
</fo:block>
|
|
@@ -7346,7 +7390,7 @@
|
|
|
7346
7390
|
|
|
7347
7391
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
|
7348
7392
|
<!-- in metanorma xml preferred terms delimited by semicolons -->
|
|
7349
|
-
<xsl:template match="mn:preferred/text()[contains(., ';')] | mn:preferred/mn:strong/text()[contains(., ';')]">
|
|
7393
|
+
<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
|
|
7350
7394
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
|
7351
7395
|
</xsl:template>
|
|
7352
7396
|
<!-- End Preferred, admitted, deprecated -->
|
|
@@ -7365,16 +7409,16 @@
|
|
|
7365
7409
|
<!-- ========== -->
|
|
7366
7410
|
<!-- definition -->
|
|
7367
7411
|
<!-- ========== -->
|
|
7368
|
-
<xsl:template match="mn:definition">
|
|
7412
|
+
<xsl:template match="mn:fmt-definition">
|
|
7369
7413
|
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
7370
7414
|
<xsl:apply-templates/>
|
|
7371
7415
|
</fo:block>
|
|
7372
7416
|
</xsl:template>
|
|
7373
7417
|
|
|
7374
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]">
|
|
7418
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]">
|
|
7375
7419
|
<xsl:apply-templates/>
|
|
7376
7420
|
</xsl:template>
|
|
7377
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7421
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7378
7422
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
7379
7423
|
<fo:block/>
|
|
7380
7424
|
</xsl:template>
|
|
@@ -7436,12 +7480,12 @@
|
|
|
7436
7480
|
<xsl:call-template name="refine_termexample-style"/>
|
|
7437
7481
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
7438
7482
|
|
|
7439
|
-
<xsl:apply-templates select="mn:name"/>
|
|
7440
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7483
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
7484
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7441
7485
|
</fo:block>
|
|
7442
7486
|
</xsl:template>
|
|
7443
7487
|
|
|
7444
|
-
<xsl:template match="mn:termexample/mn:name">
|
|
7488
|
+
<xsl:template match="mn:termexample/mn:fmt-name">
|
|
7445
7489
|
<xsl:if test="normalize-space() != ''">
|
|
7446
7490
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
|
7447
7491
|
<xsl:call-template name="refine_termexample-name-style"/>
|
|
@@ -7492,7 +7536,7 @@
|
|
|
7492
7536
|
<xsl:call-template name="refine_example-style"/>
|
|
7493
7537
|
|
|
7494
7538
|
<xsl:variable name="fo_element">
|
|
7495
|
-
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7539
|
+
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7496
7540
|
</xsl:variable>
|
|
7497
7541
|
|
|
7498
7542
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
@@ -7503,7 +7547,7 @@
|
|
|
7503
7547
|
|
|
7504
7548
|
<!-- display name 'EXAMPLE' in a separate block -->
|
|
7505
7549
|
<fo:block>
|
|
7506
|
-
<xsl:apply-templates select="mn:name">
|
|
7550
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7507
7551
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7508
7552
|
</xsl:apply-templates>
|
|
7509
7553
|
</fo:block>
|
|
@@ -7511,7 +7555,7 @@
|
|
|
7511
7555
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7512
7556
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7513
7557
|
<xsl:variable name="example_body">
|
|
7514
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7558
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7515
7559
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7516
7560
|
</xsl:apply-templates>
|
|
7517
7561
|
</xsl:variable>
|
|
@@ -7538,14 +7582,14 @@
|
|
|
7538
7582
|
<fo:list-item>
|
|
7539
7583
|
<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
|
|
7540
7584
|
<fo:block>
|
|
7541
|
-
<xsl:apply-templates select="mn:name">
|
|
7585
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7542
7586
|
<xsl:with-param name="fo_element">block</xsl:with-param>
|
|
7543
7587
|
</xsl:apply-templates>
|
|
7544
7588
|
</fo:block>
|
|
7545
7589
|
</fo:list-item-label>
|
|
7546
7590
|
<fo:list-item-body start-indent="body-start()">
|
|
7547
7591
|
<fo:block>
|
|
7548
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7592
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7549
7593
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7550
7594
|
</xsl:apply-templates>
|
|
7551
7595
|
</fo:block>
|
|
@@ -7558,21 +7602,21 @@
|
|
|
7558
7602
|
|
|
7559
7603
|
<!-- display 'EXAMPLE' and first element in the same line -->
|
|
7560
7604
|
<fo:block>
|
|
7561
|
-
<xsl:apply-templates select="mn:name">
|
|
7605
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7562
7606
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7563
7607
|
</xsl:apply-templates>
|
|
7564
7608
|
<fo:inline>
|
|
7565
|
-
<xsl:apply-templates select="*[not(self::mn:name)][1]">
|
|
7609
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][1]">
|
|
7566
7610
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7567
7611
|
</xsl:apply-templates>
|
|
7568
7612
|
</fo:inline>
|
|
7569
7613
|
</fo:block>
|
|
7570
7614
|
|
|
7571
|
-
<xsl:if test="*[not(self::mn:name)][position() > 1]">
|
|
7615
|
+
<xsl:if test="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7572
7616
|
<!-- display further elements in blocks -->
|
|
7573
7617
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7574
7618
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7575
|
-
<xsl:apply-templates select="*[not(self::mn:name)][position() > 1]">
|
|
7619
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7576
7620
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
7577
7621
|
</xsl:apply-templates>
|
|
7578
7622
|
</fo:block-container>
|
|
@@ -7586,7 +7630,7 @@
|
|
|
7586
7630
|
</xsl:template>
|
|
7587
7631
|
|
|
7588
7632
|
<!-- example/name -->
|
|
7589
|
-
<xsl:template match="mn:example/mn:name">
|
|
7633
|
+
<xsl:template match="mn:example/mn:fmt-name">
|
|
7590
7634
|
<xsl:param name="fo_element">block</xsl:param>
|
|
7591
7635
|
|
|
7592
7636
|
<xsl:choose>
|
|
@@ -7611,7 +7655,7 @@
|
|
|
7611
7655
|
</xsl:template>
|
|
7612
7656
|
|
|
7613
7657
|
<!-- table/example/name, table/tfoot//example/name -->
|
|
7614
|
-
<xsl:template match="mn:table/mn:example/mn:name | mn:table/mn:tfoot//mn:example/mn:name">
|
|
7658
|
+
<xsl:template match="mn:table/mn:example/mn:fmt-name | mn:table/mn:tfoot//mn:example/mn:fmt-name">
|
|
7615
7659
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
7616
7660
|
<xsl:apply-templates/>
|
|
7617
7661
|
</fo:inline>
|
|
@@ -7692,7 +7736,7 @@
|
|
|
7692
7736
|
|
|
7693
7737
|
<xsl:template name="refine_table-style">
|
|
7694
7738
|
<xsl:param name="margin-side"/>
|
|
7695
|
-
<xsl:if test="not(ancestor::mn:preface) and not(ancestor::mn:note_side) and not(ancestor::mn:annex and .//mn:xref[@pagenumber]) and not(ancestor::mn:doccontrol) and not(ancestor::mn:colophon)">
|
|
7739
|
+
<xsl:if test="not(ancestor::mn:preface) and not(ancestor::mn:note_side) and not(ancestor::mn:annex and .//mn:fmt-xref[@pagenumber]) and not(ancestor::mn:doccontrol) and not(ancestor::mn:colophon)">
|
|
7696
7740
|
<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
|
|
7697
7741
|
<xsl:attribute name="border-bottom">0.5pt solid black</xsl:attribute>
|
|
7698
7742
|
</xsl:if>
|
|
@@ -7759,7 +7803,7 @@
|
|
|
7759
7803
|
</xsl:attribute-set> <!-- table-header-cell-style -->
|
|
7760
7804
|
|
|
7761
7805
|
<xsl:template name="refine_table-header-cell-style">
|
|
7762
|
-
<xsl:if test="(ancestor::mn:annex and ancestor::mn:table//mn:xref[@pagenumber]) or ancestor::mn:doccontrol or ancestor::mn:colophon"><!-- for Annex ToC -->
|
|
7806
|
+
<xsl:if test="(ancestor::mn:annex and ancestor::mn:table//mn:fmt-xref[@pagenumber]) or ancestor::mn:doccontrol or ancestor::mn:colophon"><!-- for Annex ToC -->
|
|
7763
7807
|
<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
|
|
7764
7808
|
<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
|
|
7765
7809
|
</xsl:if>
|
|
@@ -7928,7 +7972,7 @@
|
|
|
7928
7972
|
|
|
7929
7973
|
<!-- Display table's name before table as standalone block -->
|
|
7930
7974
|
<!-- $namespace = 'iso' or -->
|
|
7931
|
-
<xsl:apply-templates select="mn:name"/> <!-- table's title rendered before table -->
|
|
7975
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
|
|
7932
7976
|
<xsl:call-template name="table_name_fn_display"/>
|
|
7933
7977
|
|
|
7934
7978
|
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
|
|
@@ -7970,7 +8014,7 @@
|
|
|
7970
8014
|
|
|
7971
8015
|
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
7972
8016
|
|
|
7973
|
-
<xsl:for-each select="mn:name">
|
|
8017
|
+
<xsl:for-each select="mn:fmt-name">
|
|
7974
8018
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7975
8019
|
</xsl:for-each>
|
|
7976
8020
|
|
|
@@ -8006,6 +8050,10 @@
|
|
|
8006
8050
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
8007
8051
|
</xsl:call-template>
|
|
8008
8052
|
|
|
8053
|
+
<xsl:call-template name="setTableStyles">
|
|
8054
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8055
|
+
</xsl:call-template>
|
|
8056
|
+
|
|
8009
8057
|
</xsl:element>
|
|
8010
8058
|
</xsl:variable>
|
|
8011
8059
|
|
|
@@ -8026,7 +8074,7 @@
|
|
|
8026
8074
|
</xsl:attribute>
|
|
8027
8075
|
</xsl:for-each>
|
|
8028
8076
|
|
|
8029
|
-
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[
|
|
8077
|
+
<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"/>
|
|
8030
8078
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
8031
8079
|
<!-- <xsl:choose>
|
|
8032
8080
|
<xsl:when test="$namespace = 'plateau'"></xsl:when>
|
|
@@ -8082,7 +8130,7 @@
|
|
|
8082
8130
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
8083
8131
|
</xsl:when>
|
|
8084
8132
|
<xsl:otherwise>
|
|
8085
|
-
<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 -->
|
|
8133
|
+
<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 -->
|
|
8086
8134
|
</xsl:otherwise>
|
|
8087
8135
|
</xsl:choose>
|
|
8088
8136
|
|
|
@@ -8176,7 +8224,7 @@
|
|
|
8176
8224
|
</xsl:template>
|
|
8177
8225
|
|
|
8178
8226
|
<!-- table/name-->
|
|
8179
|
-
<xsl:template match="*[local-name()='table']/mn:name">
|
|
8227
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-name">
|
|
8180
8228
|
<xsl:param name="continued"/>
|
|
8181
8229
|
<xsl:param name="cols-count"/>
|
|
8182
8230
|
<xsl:if test="normalize-space() != ''">
|
|
@@ -8228,7 +8276,7 @@
|
|
|
8228
8276
|
</xsl:template>
|
|
8229
8277
|
|
|
8230
8278
|
<!-- SOURCE: ... -->
|
|
8231
|
-
<xsl:template match="*[local-name()='table']/mn:source" priority="2">
|
|
8279
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-source" priority="2">
|
|
8232
8280
|
<xsl:call-template name="termsource"/>
|
|
8233
8281
|
</xsl:template>
|
|
8234
8282
|
|
|
@@ -8393,11 +8441,11 @@
|
|
|
8393
8441
|
<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
|
|
8394
8442
|
</xsl:template>
|
|
8395
8443
|
|
|
8396
|
-
<xsl:template match="mn:termsource" mode="td_text">
|
|
8397
|
-
<xsl:value-of select="
|
|
8444
|
+
<xsl:template match="mn:fmt-termsource" mode="td_text">
|
|
8445
|
+
<xsl:value-of select="mn:fmt-origin/@citeas"/>
|
|
8398
8446
|
</xsl:template>
|
|
8399
8447
|
|
|
8400
|
-
<xsl:template match="mn:link" mode="td_text">
|
|
8448
|
+
<xsl:template match="mn:fmt-link" mode="td_text">
|
|
8401
8449
|
<xsl:value-of select="@target"/>
|
|
8402
8450
|
</xsl:template>
|
|
8403
8451
|
|
|
@@ -8599,12 +8647,12 @@
|
|
|
8599
8647
|
|
|
8600
8648
|
<xsl:call-template name="refine_table-header-title-style"/>
|
|
8601
8649
|
|
|
8602
|
-
<xsl:apply-templates select="ancestor::mn:table/mn:name">
|
|
8650
|
+
<xsl:apply-templates select="ancestor::mn:table/mn:fmt-name">
|
|
8603
8651
|
<xsl:with-param name="continued">true</xsl:with-param>
|
|
8604
8652
|
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
8605
8653
|
</xsl:apply-templates>
|
|
8606
8654
|
|
|
8607
|
-
<xsl:if test="not(ancestor::mn:table/mn:name)"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
8655
|
+
<xsl:if test="not(ancestor::mn:table/mn:fmt-name)"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
8608
8656
|
<fo:block role="SKIP"/>
|
|
8609
8657
|
</xsl:if>
|
|
8610
8658
|
|
|
@@ -8639,7 +8687,7 @@
|
|
|
8639
8687
|
<xsl:param name="colwidths"/>
|
|
8640
8688
|
<xsl:param name="colgroup"/>
|
|
8641
8689
|
|
|
8642
|
-
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[
|
|
8690
|
+
<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"/>
|
|
8643
8691
|
|
|
8644
8692
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
8645
8693
|
</xsl:variable>
|
|
@@ -8680,6 +8728,12 @@
|
|
|
8680
8728
|
</xsl:choose>
|
|
8681
8729
|
</xsl:for-each>
|
|
8682
8730
|
|
|
8731
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8732
|
+
<xsl:call-template name="setTableStyles">
|
|
8733
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8734
|
+
</xsl:call-template>
|
|
8735
|
+
</xsl:for-each>
|
|
8736
|
+
|
|
8683
8737
|
<xsl:choose>
|
|
8684
8738
|
<xsl:when test="xalan:nodeset($colgroup)//mn:col">
|
|
8685
8739
|
<xsl:for-each select="xalan:nodeset($colgroup)//mn:col">
|
|
@@ -8696,10 +8750,22 @@
|
|
|
8696
8750
|
|
|
8697
8751
|
<fo:table-body role="SKIP">
|
|
8698
8752
|
<fo:table-row role="SKIP">
|
|
8753
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8754
|
+
<xsl:call-template name="setTableStyles">
|
|
8755
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8756
|
+
</xsl:call-template>
|
|
8757
|
+
</xsl:for-each>
|
|
8758
|
+
|
|
8699
8759
|
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
|
|
8700
8760
|
|
|
8701
8761
|
<xsl:call-template name="refine_table-footer-cell-style"/>
|
|
8702
8762
|
|
|
8763
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8764
|
+
<xsl:call-template name="setTableStyles">
|
|
8765
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8766
|
+
</xsl:call-template>
|
|
8767
|
+
</xsl:for-each>
|
|
8768
|
+
|
|
8703
8769
|
<xsl:call-template name="setBordersTableArray"/>
|
|
8704
8770
|
|
|
8705
8771
|
<!-- fn will be processed inside 'note' processing -->
|
|
@@ -8716,7 +8782,7 @@
|
|
|
8716
8782
|
<xsl:apply-templates select="../mn:dl"/>
|
|
8717
8783
|
<xsl:apply-templates select="../mn:note[not(@type = 'units')]"/>
|
|
8718
8784
|
<xsl:apply-templates select="../mn:example"/>
|
|
8719
|
-
<xsl:apply-templates select="../mn:source"/>
|
|
8785
|
+
<xsl:apply-templates select="../mn:fmt-source"/>
|
|
8720
8786
|
|
|
8721
8787
|
<xsl:variable name="isDisplayRowSeparator">
|
|
8722
8788
|
</xsl:variable>
|
|
@@ -8911,7 +8977,12 @@
|
|
|
8911
8977
|
<xsl:attribute name="min-height">5mm</xsl:attribute>
|
|
8912
8978
|
</xsl:if>
|
|
8913
8979
|
|
|
8914
|
-
<xsl:
|
|
8980
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8981
|
+
<xsl:call-template name="setTableStyles">
|
|
8982
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8983
|
+
</xsl:call-template>
|
|
8984
|
+
</xsl:for-each>
|
|
8985
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8915
8986
|
|
|
8916
8987
|
</xsl:template> <!-- setTableRowAttributes -->
|
|
8917
8988
|
<!-- ===================== -->
|
|
@@ -8964,7 +9035,13 @@
|
|
|
8964
9035
|
</xsl:attribute>
|
|
8965
9036
|
</xsl:if>
|
|
8966
9037
|
<xsl:call-template name="display-align"/>
|
|
8967
|
-
|
|
9038
|
+
|
|
9039
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
9040
|
+
<xsl:call-template name="setTableStyles">
|
|
9041
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
9042
|
+
</xsl:call-template>
|
|
9043
|
+
</xsl:for-each>
|
|
9044
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8968
9045
|
</xsl:template>
|
|
8969
9046
|
|
|
8970
9047
|
<xsl:template name="display-align">
|
|
@@ -8980,7 +9057,8 @@
|
|
|
8980
9057
|
</xsl:if>
|
|
8981
9058
|
</xsl:template>
|
|
8982
9059
|
|
|
8983
|
-
<xsl:template name="
|
|
9060
|
+
<xsl:template name="setTableStyles">
|
|
9061
|
+
<xsl:param name="scope">cell</xsl:param>
|
|
8984
9062
|
<xsl:variable name="styles__">
|
|
8985
9063
|
<xsl:call-template name="split">
|
|
8986
9064
|
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
|
@@ -8992,16 +9070,22 @@
|
|
|
8992
9070
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
8993
9071
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
8994
9072
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
8995
|
-
<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'">
|
|
9073
|
+
<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'">
|
|
8996
9074
|
<style name="{$key}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), 'currentColor', 'inherit')"/></style>
|
|
8997
9075
|
</xsl:if>
|
|
9076
|
+
<xsl:if test="$key = 'border' and ($scope = 'table' or $scope = 'ancestor_table' or $scope = 'ancestor_table_borders_only')">
|
|
9077
|
+
<style name="{$key}-top"><xsl:value-of select="$value"/></style>
|
|
9078
|
+
<style name="{$key}-right"><xsl:value-of select="$value"/></style>
|
|
9079
|
+
<style name="{$key}-left"><xsl:value-of select="$value"/></style>
|
|
9080
|
+
<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
|
|
9081
|
+
</xsl:if>
|
|
8998
9082
|
</xsl:for-each>
|
|
8999
9083
|
</xsl:variable>
|
|
9000
9084
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
9001
9085
|
<xsl:for-each select="$styles/style">
|
|
9002
9086
|
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
|
9003
9087
|
</xsl:for-each>
|
|
9004
|
-
</xsl:template> <!--
|
|
9088
|
+
</xsl:template> <!-- setTableStyles -->
|
|
9005
9089
|
|
|
9006
9090
|
<!-- cell in table body, footer -->
|
|
9007
9091
|
<xsl:template match="*[local-name()='td']" name="td">
|
|
@@ -9073,14 +9157,14 @@
|
|
|
9073
9157
|
|
|
9074
9158
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
9075
9159
|
|
|
9076
|
-
<xsl:apply-templates select="mn:name"/>
|
|
9160
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
9077
9161
|
|
|
9078
9162
|
</fo:inline>
|
|
9079
9163
|
<xsl:if test="ancestor::mn:preface">
|
|
9080
9164
|
<fo:block> </fo:block>
|
|
9081
9165
|
</xsl:if>
|
|
9082
9166
|
|
|
9083
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
9167
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
9084
9168
|
</fo:block>
|
|
9085
9169
|
</xsl:template> <!-- table/note -->
|
|
9086
9170
|
|
|
@@ -9220,7 +9304,7 @@
|
|
|
9220
9304
|
|
|
9221
9305
|
<!-- footnotes for table's name rendering -->
|
|
9222
9306
|
<xsl:template name="table_name_fn_display">
|
|
9223
|
-
<xsl:for-each select="mn:name//mn:fn">
|
|
9307
|
+
<xsl:for-each select="mn:fmt-name//mn:fn">
|
|
9224
9308
|
<xsl:variable name="reference" select="@reference"/>
|
|
9225
9309
|
<fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
|
|
9226
9310
|
<fo:block margin-bottom="12pt">
|
|
@@ -9880,7 +9964,7 @@
|
|
|
9880
9964
|
</xsl:if> -->
|
|
9881
9965
|
|
|
9882
9966
|
<xsl:variable name="words">
|
|
9883
|
-
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
9967
|
+
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'fmt-stem']">
|
|
9884
9968
|
<word>
|
|
9885
9969
|
<xsl:copy-of select="."/>
|
|
9886
9970
|
</word>
|
|
@@ -9939,7 +10023,7 @@
|
|
|
9939
10023
|
</xsl:copy>
|
|
9940
10024
|
</xsl:template>
|
|
9941
10025
|
|
|
9942
|
-
<xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
10026
|
+
<xsl:template match="*[local-name() = 'fmt-stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9943
10027
|
|
|
9944
10028
|
<xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting">
|
|
9945
10029
|
<xsl:variable name="formatting_tags">
|
|
@@ -9974,7 +10058,7 @@
|
|
|
9974
10058
|
</xsl:call-template>
|
|
9975
10059
|
</xsl:template>
|
|
9976
10060
|
|
|
9977
|
-
<xsl:template match="mn:link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
10061
|
+
<xsl:template match="mn:fmt-link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9978
10062
|
<xsl:variable name="link">
|
|
9979
10063
|
<link_updated>
|
|
9980
10064
|
<xsl:variable name="target_text">
|
|
@@ -10191,7 +10275,7 @@
|
|
|
10191
10275
|
|
|
10192
10276
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
10193
10277
|
|
|
10194
|
-
<xsl:apply-templates select="mn:name">
|
|
10278
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
10195
10279
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
10196
10280
|
</xsl:apply-templates>
|
|
10197
10281
|
|
|
@@ -10374,7 +10458,7 @@
|
|
|
10374
10458
|
</xsl:template> <!-- refine_multicomponent_block_style -->
|
|
10375
10459
|
|
|
10376
10460
|
<!-- dl/name -->
|
|
10377
|
-
<xsl:template match="mn:dl/mn:name">
|
|
10461
|
+
<xsl:template match="mn:dl/mn:fmt-name">
|
|
10378
10462
|
<xsl:param name="process">false</xsl:param>
|
|
10379
10463
|
<xsl:if test="$process = 'true'">
|
|
10380
10464
|
<fo:block xsl:use-attribute-sets="dl-name-style">
|
|
@@ -10785,12 +10869,12 @@
|
|
|
10785
10869
|
<xsl:template match="mn:appendix">
|
|
10786
10870
|
<xsl:call-template name="setNamedDestination"/>
|
|
10787
10871
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
|
|
10788
|
-
<xsl:apply-templates select="mn:title"/>
|
|
10872
|
+
<xsl:apply-templates select="mn:fmt-title"/>
|
|
10789
10873
|
</fo:block>
|
|
10790
|
-
<xsl:apply-templates select="node()[not(
|
|
10874
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
|
|
10791
10875
|
</xsl:template>
|
|
10792
10876
|
|
|
10793
|
-
<xsl:template match="mn:appendix/mn:title" priority="2">
|
|
10877
|
+
<xsl:template match="mn:appendix/mn:fmt-title" priority="2">
|
|
10794
10878
|
<xsl:variable name="level">
|
|
10795
10879
|
<xsl:call-template name="getLevel"/>
|
|
10796
10880
|
</xsl:variable>
|
|
@@ -10803,15 +10887,15 @@
|
|
|
10803
10887
|
<xsl:template match="mn:appendix//mn:example" priority="2">
|
|
10804
10888
|
<xsl:call-template name="setNamedDestination"/>
|
|
10805
10889
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
|
10806
|
-
<xsl:apply-templates select="mn:name"/>
|
|
10890
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10807
10891
|
</fo:block>
|
|
10808
|
-
<xsl:apply-templates select="node()[not(
|
|
10892
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10809
10893
|
</xsl:template>
|
|
10810
10894
|
|
|
10811
10895
|
<xsl:attribute-set name="xref-style">
|
|
10812
10896
|
</xsl:attribute-set>
|
|
10813
10897
|
|
|
10814
|
-
<xsl:template match="mn:xref">
|
|
10898
|
+
<xsl:template match="mn:fmt-xref">
|
|
10815
10899
|
<xsl:call-template name="insert_basic_link">
|
|
10816
10900
|
<xsl:with-param name="element">
|
|
10817
10901
|
<xsl:variable name="alt_text">
|
|
@@ -10831,7 +10915,7 @@
|
|
|
10831
10915
|
</xsl:template> <!-- xref -->
|
|
10832
10916
|
|
|
10833
10917
|
<!-- command between two xref points to non-standard bibitem -->
|
|
10834
|
-
<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="."/>
|
|
10918
|
+
<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="."/>
|
|
10835
10919
|
</xsl:template>
|
|
10836
10920
|
|
|
10837
10921
|
<xsl:attribute-set name="eref-style">
|
|
@@ -10862,7 +10946,7 @@
|
|
|
10862
10946
|
<!-- ====== -->
|
|
10863
10947
|
<!-- eref -->
|
|
10864
10948
|
<!-- ====== -->
|
|
10865
|
-
<xsl:template match="mn:eref" name="eref">
|
|
10949
|
+
<xsl:template match="mn:fmt-eref" name="eref">
|
|
10866
10950
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
10867
10951
|
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/mn:uri[@type = 'citation'])"/> -->
|
|
10868
10952
|
<xsl:variable name="external-destination" select="normalize-space($bibitems/mn:bibitem[@id = $current_bibitemid]/mn:uri[@type = 'citation'])"/>
|
|
@@ -10924,10 +11008,10 @@
|
|
|
10924
11008
|
|
|
10925
11009
|
<xsl:template name="refine_basic_link_style">
|
|
10926
11010
|
<xsl:attribute name="color">blue</xsl:attribute>
|
|
10927
|
-
<xsl:if test="not(parent::mn:title)">
|
|
11011
|
+
<xsl:if test="not(parent::mn:fmt-title)">
|
|
10928
11012
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
10929
11013
|
</xsl:if>
|
|
10930
|
-
<xsl:if test="parent::mn:title">
|
|
11014
|
+
<xsl:if test="parent::mn:fmt-title">
|
|
10931
11015
|
<xsl:attribute name="color">inherit</xsl:attribute>
|
|
10932
11016
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
10933
11017
|
</xsl:if>
|
|
@@ -11014,28 +11098,28 @@
|
|
|
11014
11098
|
|
|
11015
11099
|
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
11016
11100
|
|
|
11017
|
-
<xsl:apply-templates select="mn:name/mn:tab" mode="tab"/>
|
|
11101
|
+
<xsl:apply-templates select="mn:fmt-name/mn:tab" mode="tab"/>
|
|
11018
11102
|
|
|
11019
11103
|
<xsl:call-template name="refine_note-name-style"/>
|
|
11020
11104
|
|
|
11021
11105
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
11022
11106
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
11023
|
-
<xsl:if test="*[not(
|
|
11107
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
11024
11108
|
<xsl:call-template name="append_add-style"/>
|
|
11025
11109
|
</xsl:if>
|
|
11026
11110
|
|
|
11027
11111
|
<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
|
|
11028
|
-
<xsl:if test="count(*[not(self::mn:name)]) = 1 and *[not(self::mn:name)]/node()[last()][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11029
|
-
<xsl:apply-templates select="*[not(self::mn:name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11112
|
+
<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)]">
|
|
11113
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11030
11114
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
11031
11115
|
</xsl:apply-templates>
|
|
11032
11116
|
</xsl:if>
|
|
11033
11117
|
|
|
11034
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11118
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11035
11119
|
|
|
11036
11120
|
</fo:inline>
|
|
11037
11121
|
|
|
11038
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11122
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11039
11123
|
</fo:block>
|
|
11040
11124
|
</fo:block-container>
|
|
11041
11125
|
</fo:block-container>
|
|
@@ -11080,19 +11164,19 @@
|
|
|
11080
11164
|
|
|
11081
11165
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
11082
11166
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
|
11083
|
-
<xsl:if test="*[not(
|
|
11167
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
11084
11168
|
<xsl:call-template name="append_add-style"/>
|
|
11085
11169
|
</xsl:if>
|
|
11086
11170
|
|
|
11087
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11171
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11088
11172
|
|
|
11089
11173
|
</fo:inline>
|
|
11090
11174
|
|
|
11091
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11175
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11092
11176
|
</fo:block>
|
|
11093
11177
|
</xsl:template>
|
|
11094
11178
|
|
|
11095
|
-
<xsl:template match="mn:note/mn:name">
|
|
11179
|
+
<xsl:template match="mn:note/mn:fmt-name">
|
|
11096
11180
|
<xsl:param name="sfx"/>
|
|
11097
11181
|
<xsl:variable name="suffix">
|
|
11098
11182
|
<xsl:choose>
|
|
@@ -11125,7 +11209,7 @@
|
|
|
11125
11209
|
</xsl:if>
|
|
11126
11210
|
</xsl:template>
|
|
11127
11211
|
|
|
11128
|
-
<xsl:template match="mn:termnote/mn:name">
|
|
11212
|
+
<xsl:template match="mn:termnote/mn:fmt-name">
|
|
11129
11213
|
<xsl:param name="sfx"/>
|
|
11130
11214
|
<xsl:variable name="suffix">
|
|
11131
11215
|
<xsl:choose>
|
|
@@ -11211,15 +11295,15 @@
|
|
|
11211
11295
|
|
|
11212
11296
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
11213
11297
|
<fo:block role="BlockQuote">
|
|
11214
|
-
<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 -->
|
|
11298
|
+
<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 -->
|
|
11215
11299
|
</fo:block>
|
|
11216
11300
|
</fo:block-container>
|
|
11217
11301
|
</fo:block-container>
|
|
11218
|
-
<xsl:if test="mn:author or mn:source or mn:attribution">
|
|
11302
|
+
<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
|
|
11219
11303
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
11220
11304
|
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
11221
11305
|
<xsl:apply-templates select="mn:author"/>
|
|
11222
|
-
<xsl:apply-templates select="mn:source"/>
|
|
11306
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
11223
11307
|
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
11224
11308
|
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
11225
11309
|
</fo:block>
|
|
@@ -11229,17 +11313,32 @@
|
|
|
11229
11313
|
</fo:block-container>
|
|
11230
11314
|
</xsl:template>
|
|
11231
11315
|
|
|
11232
|
-
<xsl:template match="mn:source">
|
|
11316
|
+
<xsl:template match="mn:fmt-source">
|
|
11233
11317
|
<xsl:if test="../mn:author">
|
|
11234
11318
|
<xsl:text>, </xsl:text>
|
|
11235
11319
|
</xsl:if>
|
|
11236
|
-
<xsl:
|
|
11237
|
-
<xsl:
|
|
11238
|
-
<fo:
|
|
11239
|
-
<xsl:
|
|
11240
|
-
|
|
11241
|
-
|
|
11242
|
-
|
|
11320
|
+
<xsl:choose>
|
|
11321
|
+
<xsl:when test="not(parent::quote)">
|
|
11322
|
+
<fo:block>
|
|
11323
|
+
<xsl:call-template name="insert_basic_link">
|
|
11324
|
+
<xsl:with-param name="element">
|
|
11325
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11326
|
+
<xsl:apply-templates/>
|
|
11327
|
+
</fo:basic-link>
|
|
11328
|
+
</xsl:with-param>
|
|
11329
|
+
</xsl:call-template>
|
|
11330
|
+
</fo:block>
|
|
11331
|
+
</xsl:when>
|
|
11332
|
+
<xsl:otherwise>
|
|
11333
|
+
<xsl:call-template name="insert_basic_link">
|
|
11334
|
+
<xsl:with-param name="element">
|
|
11335
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11336
|
+
<xsl:apply-templates/>
|
|
11337
|
+
</fo:basic-link>
|
|
11338
|
+
</xsl:with-param>
|
|
11339
|
+
</xsl:call-template>
|
|
11340
|
+
</xsl:otherwise>
|
|
11341
|
+
</xsl:choose>
|
|
11243
11342
|
</xsl:template>
|
|
11244
11343
|
|
|
11245
11344
|
<xsl:template match="mn:author">
|
|
@@ -11258,7 +11357,7 @@
|
|
|
11258
11357
|
</xsl:attribute-set>
|
|
11259
11358
|
|
|
11260
11359
|
<xsl:template name="refine_figure-block-style">
|
|
11261
|
-
<xsl:if test="mn:name">
|
|
11360
|
+
<xsl:if test="mn:fmt-name">
|
|
11262
11361
|
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
|
11263
11362
|
</xsl:if>
|
|
11264
11363
|
</xsl:template>
|
|
@@ -11317,7 +11416,7 @@
|
|
|
11317
11416
|
<ancestor><xsl:copy-of select="ancestor::mn:figure[.//mn:name[.//mn:fn]]"/></ancestor> -->
|
|
11318
11417
|
<xsl:choose>
|
|
11319
11418
|
<!-- skip figure/name/fn -->
|
|
11320
|
-
<xsl:when test="ancestor::mn:figure[.//mn:name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11419
|
+
<xsl:when test="ancestor::mn:figure[.//mn:fmt-name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11321
11420
|
<xsl:otherwise>
|
|
11322
11421
|
<xsl:element name="figure" namespace="{$namespace_full}">
|
|
11323
11422
|
<xsl:element name="fmt-footnote-container" namespace="{$namespace_full}">
|
|
@@ -11513,17 +11612,17 @@
|
|
|
11513
11612
|
|
|
11514
11613
|
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
11515
11614
|
|
|
11516
|
-
<xsl:for-each select="mn:name"> <!-- set context -->
|
|
11615
|
+
<xsl:for-each select="mn:fmt-name"> <!-- set context -->
|
|
11517
11616
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
11518
11617
|
</xsl:for-each>
|
|
11519
11618
|
|
|
11520
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note and @type = 'units')]"/>
|
|
11619
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note and @type = 'units')]"/>
|
|
11521
11620
|
</fo:block>
|
|
11522
11621
|
|
|
11523
11622
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11524
11623
|
<xsl:call-template name="showFigureKey"/>
|
|
11525
11624
|
</xsl:if>
|
|
11526
|
-
<xsl:apply-templates select="mn:name"/> <!-- show figure's name AFTER image -->
|
|
11625
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
11527
11626
|
|
|
11528
11627
|
</fo:block-container>
|
|
11529
11628
|
</xsl:template>
|
|
@@ -11549,9 +11648,9 @@
|
|
|
11549
11648
|
<xsl:template match="mn:figure[@class = 'pseudocode']">
|
|
11550
11649
|
<xsl:call-template name="setNamedDestination"/>
|
|
11551
11650
|
<fo:block id="{@id}">
|
|
11552
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11651
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11553
11652
|
</fo:block>
|
|
11554
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11653
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11555
11654
|
</xsl:template>
|
|
11556
11655
|
|
|
11557
11656
|
<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
|
|
@@ -11562,7 +11661,7 @@
|
|
|
11562
11661
|
|
|
11563
11662
|
<!-- SOURCE: ... -->
|
|
11564
11663
|
<!-- figure/source -->
|
|
11565
|
-
<xsl:template match="mn:figure/mn:source" priority="2">
|
|
11664
|
+
<xsl:template match="mn:figure/mn:fmt-source" priority="2">
|
|
11566
11665
|
<xsl:call-template name="termsource"/>
|
|
11567
11666
|
</xsl:template>
|
|
11568
11667
|
|
|
@@ -11572,7 +11671,7 @@
|
|
|
11572
11671
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
11573
11672
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
11574
11673
|
<xsl:choose>
|
|
11575
|
-
<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) -->
|
|
11674
|
+
<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) -->
|
|
11576
11675
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
11577
11676
|
<xsl:if test="not(parent::mn:figure) or parent::mn:p">
|
|
11578
11677
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
@@ -11593,13 +11692,26 @@
|
|
|
11593
11692
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
11594
11693
|
|
|
11595
11694
|
<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
|
|
11596
|
-
<xsl:attribute name="
|
|
11695
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
11696
|
+
<xsl:choose>
|
|
11697
|
+
<xsl:when test="@width and not(@height)">
|
|
11698
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
11699
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11700
|
+
</xsl:when>
|
|
11701
|
+
<xsl:when test="@height and not(@width)">
|
|
11702
|
+
<xsl:attribute name="height">100%</xsl:attribute>
|
|
11703
|
+
<xsl:attribute name="content-height"><xsl:value-of select="@height"/></xsl:attribute>
|
|
11704
|
+
</xsl:when>
|
|
11705
|
+
<xsl:when test="not(@width) and not(@height)">
|
|
11706
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11707
|
+
</xsl:when>
|
|
11708
|
+
</xsl:choose>
|
|
11709
|
+
|
|
11597
11710
|
<xsl:if test="normalize-space($logo_width) != ''">
|
|
11598
11711
|
<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
|
|
11599
11712
|
</xsl:if>
|
|
11600
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11601
11713
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
11602
|
-
<xsl:attribute name="
|
|
11714
|
+
<xsl:attribute name="vertical-align">top</xsl:attribute>
|
|
11603
11715
|
</xsl:if>
|
|
11604
11716
|
|
|
11605
11717
|
<xsl:variable name="width">
|
|
@@ -11888,7 +12000,7 @@
|
|
|
11888
12000
|
<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
|
|
11889
12001
|
<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
|
|
11890
12002
|
|
|
11891
|
-
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:name/mn:bookmark" priority="2"/>
|
|
12003
|
+
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:fmt-name/mn:bookmark" priority="2"/>
|
|
11892
12004
|
<xsl:template match="mn:figure[not(mn:image)]/*[local-name() = 'svg']" priority="2" name="image_svg">
|
|
11893
12005
|
<xsl:param name="name"/>
|
|
11894
12006
|
|
|
@@ -11898,8 +12010,8 @@
|
|
|
11898
12010
|
|
|
11899
12011
|
<xsl:variable name="alt-text">
|
|
11900
12012
|
<xsl:choose>
|
|
11901
|
-
<xsl:when test="normalize-space(../mn:name) != ''">
|
|
11902
|
-
<xsl:value-of select="../mn:name"/>
|
|
12013
|
+
<xsl:when test="normalize-space(../mn:fmt-name) != ''">
|
|
12014
|
+
<xsl:value-of select="../mn:fmt-name"/>
|
|
11903
12015
|
</xsl:when>
|
|
11904
12016
|
<xsl:when test="normalize-space($name) != ''">
|
|
11905
12017
|
<xsl:value-of select="$name"/>
|
|
@@ -11908,7 +12020,7 @@
|
|
|
11908
12020
|
</xsl:choose>
|
|
11909
12021
|
</xsl:variable>
|
|
11910
12022
|
|
|
11911
|
-
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:title] and 1 = 1)"/>
|
|
12023
|
+
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:fmt-title] and 1 = 1)"/>
|
|
11912
12024
|
|
|
11913
12025
|
<xsl:choose>
|
|
11914
12026
|
<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
|
|
@@ -11957,9 +12069,9 @@
|
|
|
11957
12069
|
<fo:table-cell column-number="2">
|
|
11958
12070
|
<fo:block>
|
|
11959
12071
|
<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
|
|
11960
|
-
<xsl:if test="../mn:name/mn:bookmark">
|
|
12072
|
+
<xsl:if test="../mn:fmt-name/mn:bookmark">
|
|
11961
12073
|
<fo:block line-height="0" font-size="0">
|
|
11962
|
-
<xsl:for-each select="../mn:name/mn:bookmark">
|
|
12074
|
+
<xsl:for-each select="../mn:fmt-name/mn:bookmark">
|
|
11963
12075
|
<xsl:call-template name="bookmark"/>
|
|
11964
12076
|
</xsl:for-each>
|
|
11965
12077
|
</fo:block>
|
|
@@ -12199,7 +12311,7 @@
|
|
|
12199
12311
|
|
|
12200
12312
|
<!-- image with svg and emf -->
|
|
12201
12313
|
<xsl:template match="mn:figure/mn:image[*[local-name() = 'svg']]" priority="3">
|
|
12202
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12314
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12203
12315
|
<xsl:for-each select="*[local-name() = 'svg']">
|
|
12204
12316
|
<xsl:call-template name="image_svg">
|
|
12205
12317
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12216,7 +12328,7 @@
|
|
|
12216
12328
|
|
|
12217
12329
|
<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
12218
12330
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
12219
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12331
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12220
12332
|
<xsl:for-each select="xalan:nodeset($svg_content)/node()">
|
|
12221
12333
|
<xsl:call-template name="image_svg">
|
|
12222
12334
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12339,7 +12451,7 @@
|
|
|
12339
12451
|
<xsl:template match="mn:emf"/>
|
|
12340
12452
|
|
|
12341
12453
|
<!-- figure/name -->
|
|
12342
|
-
<xsl:template match="mn:figure/mn:name | mn:image/mn:name">
|
|
12454
|
+
<xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
|
|
12343
12455
|
<xsl:if test="normalize-space() != ''">
|
|
12344
12456
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
12345
12457
|
|
|
@@ -12413,25 +12525,25 @@
|
|
|
12413
12525
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
12414
12526
|
<xsl:call-template name="setNamedDestination"/>
|
|
12415
12527
|
<fo:block id="{@id}">
|
|
12416
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12528
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12417
12529
|
</fo:block>
|
|
12418
12530
|
</fo:block-container>
|
|
12419
12531
|
</fo:block-container>
|
|
12420
12532
|
</xsl:template>
|
|
12421
12533
|
|
|
12422
|
-
<xsl:template match="mn:formula/mn:dt/mn:stem">
|
|
12534
|
+
<xsl:template match="mn:formula/mn:dt/mn:fmt-stem">
|
|
12423
12535
|
<fo:inline>
|
|
12424
12536
|
<xsl:apply-templates/>
|
|
12425
12537
|
</fo:inline>
|
|
12426
12538
|
</xsl:template>
|
|
12427
12539
|
|
|
12428
|
-
<xsl:template match="mn:admitted/mn:stem">
|
|
12540
|
+
<xsl:template match="mn:fmt-admitted/mn:fmt-stem">
|
|
12429
12541
|
<fo:inline>
|
|
12430
12542
|
<xsl:apply-templates/>
|
|
12431
12543
|
</fo:inline>
|
|
12432
12544
|
</xsl:template>
|
|
12433
12545
|
|
|
12434
|
-
<xsl:template match="mn:formula/mn:name"> <!-- show in 'stem' template -->
|
|
12546
|
+
<xsl:template match="mn:formula/mn:fmt-name"> <!-- show in 'stem' template -->
|
|
12435
12547
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
|
12436
12548
|
<xsl:if test="normalize-space() != ''">
|
|
12437
12549
|
<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
|
|
@@ -12440,7 +12552,7 @@
|
|
|
12440
12552
|
</xsl:template>
|
|
12441
12553
|
|
|
12442
12554
|
<!-- stem inside formula with name (with formula's number) -->
|
|
12443
|
-
<xsl:template match="mn:formula[mn:name]/mn:stem">
|
|
12555
|
+
<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
|
|
12444
12556
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12445
12557
|
|
|
12446
12558
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -12460,13 +12572,13 @@
|
|
|
12460
12572
|
|
|
12461
12573
|
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
|
12462
12574
|
|
|
12463
|
-
<xsl:for-each select="../mn:name">
|
|
12575
|
+
<xsl:for-each select="../mn:fmt-name">
|
|
12464
12576
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
12465
12577
|
</xsl:for-each>
|
|
12466
12578
|
|
|
12467
12579
|
<xsl:call-template name="refine_formula-stem-number-style"/>
|
|
12468
12580
|
|
|
12469
|
-
<xsl:apply-templates select="../mn:name"/>
|
|
12581
|
+
<xsl:apply-templates select="../mn:fmt-name"/>
|
|
12470
12582
|
</fo:block>
|
|
12471
12583
|
</fo:table-cell>
|
|
12472
12584
|
</fo:table-row>
|
|
@@ -12476,7 +12588,7 @@
|
|
|
12476
12588
|
</xsl:template>
|
|
12477
12589
|
|
|
12478
12590
|
<!-- stem inside formula without name (without formula's number) -->
|
|
12479
|
-
<xsl:template match="mn:formula[not(mn:name)]/mn:stem">
|
|
12591
|
+
<xsl:template match="mn:formula[not(mn:fmt-name)]/mn:fmt-stem">
|
|
12480
12592
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12481
12593
|
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
12482
12594
|
<xsl:apply-templates/>
|
|
@@ -12861,7 +12973,7 @@
|
|
|
12861
12973
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
12862
12974
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
12863
12975
|
-->
|
|
12864
|
-
<xsl:template match="mn:stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12976
|
+
<xsl:template match="mn:fmt-stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:fmt-stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12865
12977
|
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
12866
12978
|
|
|
12867
12979
|
<xsl:call-template name="refine_mathml-style"/>
|
|
@@ -13126,7 +13238,7 @@
|
|
|
13126
13238
|
|
|
13127
13239
|
<xsl:template match="mn:ul | mn:ol" mode="list" name="list">
|
|
13128
13240
|
|
|
13129
|
-
<xsl:apply-templates select="mn:name">
|
|
13241
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
13130
13242
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
13131
13243
|
</xsl:apply-templates>
|
|
13132
13244
|
|
|
@@ -13172,7 +13284,7 @@
|
|
|
13172
13284
|
|
|
13173
13285
|
<xsl:call-template name="refine_list-style"/>
|
|
13174
13286
|
|
|
13175
|
-
<xsl:if test="mn:name">
|
|
13287
|
+
<xsl:if test="mn:fmt-name">
|
|
13176
13288
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
13177
13289
|
</xsl:if>
|
|
13178
13290
|
|
|
@@ -13187,7 +13299,7 @@
|
|
|
13187
13299
|
<xsl:template name="refine_list-style_provisional-distance-between-starts">
|
|
13188
13300
|
</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
|
|
13189
13301
|
|
|
13190
|
-
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:name">
|
|
13302
|
+
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:fmt-name">
|
|
13191
13303
|
<xsl:param name="process">false</xsl:param>
|
|
13192
13304
|
<xsl:if test="$process = 'true'">
|
|
13193
13305
|
<fo:block xsl:use-attribute-sets="list-name-style">
|
|
@@ -13320,7 +13432,7 @@
|
|
|
13320
13432
|
-->
|
|
13321
13433
|
<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
|
|
13322
13434
|
<!-- fn in text -->
|
|
13323
|
-
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:name))]" priority="2" name="fn">
|
|
13435
|
+
<xsl:template match="mn:fn[not(ancestor::*[(self::mn:table or self::mn:figure)] and not(ancestor::mn:fmt-name))]" priority="2" name="fn">
|
|
13324
13436
|
<xsl:param name="footnote_body_from_table">false</xsl:param>
|
|
13325
13437
|
|
|
13326
13438
|
<!-- list of unique footnotes -->
|
|
@@ -13444,7 +13556,7 @@
|
|
|
13444
13556
|
<!-- commented:
|
|
13445
13557
|
.//mn:bibitem[ancestor::mn:references]/mn:note |
|
|
13446
13558
|
because 'fn' there is in biblio-tag -->
|
|
13447
|
-
<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])]">
|
|
13559
|
+
<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])]">
|
|
13448
13560
|
<!-- copy unique fn -->
|
|
13449
13561
|
<fn gen_id="{generate-id(.)}">
|
|
13450
13562
|
<xsl:copy-of select="@*"/>
|
|
@@ -13523,7 +13635,7 @@
|
|
|
13523
13635
|
<xsl:call-template name="displayAdmonitionName"/>
|
|
13524
13636
|
</fo:block>
|
|
13525
13637
|
<fo:block xsl:use-attribute-sets="admonition-p-style">
|
|
13526
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
13638
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
13527
13639
|
</fo:block>
|
|
13528
13640
|
|
|
13529
13641
|
</fo:block-container>
|
|
@@ -13549,7 +13661,7 @@
|
|
|
13549
13661
|
</xsl:otherwise>
|
|
13550
13662
|
</xsl:choose> -->
|
|
13551
13663
|
<xsl:variable name="name">
|
|
13552
|
-
<xsl:apply-templates select="mn:name"/>
|
|
13664
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
13553
13665
|
</xsl:variable>
|
|
13554
13666
|
<xsl:copy-of select="$name"/>
|
|
13555
13667
|
<xsl:if test="normalize-space($name) != ''">
|
|
@@ -13557,7 +13669,7 @@
|
|
|
13557
13669
|
</xsl:if>
|
|
13558
13670
|
</xsl:template>
|
|
13559
13671
|
|
|
13560
|
-
<xsl:template match="mn:admonition/mn:name">
|
|
13672
|
+
<xsl:template match="mn:admonition/mn:fmt-name">
|
|
13561
13673
|
<xsl:apply-templates/>
|
|
13562
13674
|
</xsl:template>
|
|
13563
13675
|
|
|
@@ -13684,10 +13796,10 @@
|
|
|
13684
13796
|
<xsl:call-template name="setNamedDestination"/>
|
|
13685
13797
|
<fo:block id="{@id}"/>
|
|
13686
13798
|
|
|
13687
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
13799
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
13688
13800
|
|
|
13689
13801
|
<fo:block xsl:use-attribute-sets="references-non-normative-style">
|
|
13690
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
13802
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
13691
13803
|
</fo:block>
|
|
13692
13804
|
</xsl:template> <!-- references -->
|
|
13693
13805
|
|
|
@@ -14010,7 +14122,8 @@
|
|
|
14010
14122
|
</xsl:copy>
|
|
14011
14123
|
</xsl:template>
|
|
14012
14124
|
|
|
14013
|
-
<xsl:template match="mn:xref" mode="index_add_id"
|
|
14125
|
+
<xsl:template match="mn:xref" mode="index_add_id"/>
|
|
14126
|
+
<xsl:template match="mn:fmt-xref" mode="index_add_id">
|
|
14014
14127
|
<xsl:param name="docid"/>
|
|
14015
14128
|
<xsl:variable name="id">
|
|
14016
14129
|
<xsl:call-template name="generateIndexXrefId">
|
|
@@ -14052,7 +14165,7 @@
|
|
|
14052
14165
|
<xsl:template match="mn:indexsect//mn:li" mode="index_update">
|
|
14053
14166
|
<xsl:copy>
|
|
14054
14167
|
<xsl:apply-templates select="@*" mode="index_update"/>
|
|
14055
|
-
<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
|
|
14168
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
|
|
14056
14169
|
</xsl:copy>
|
|
14057
14170
|
</xsl:template>
|
|
14058
14171
|
|
|
@@ -14073,11 +14186,11 @@
|
|
|
14073
14186
|
<xsl:value-of select="."/>
|
|
14074
14187
|
<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
|
|
14075
14188
|
</xsl:when>
|
|
14076
|
-
<xsl:when test="self::* and local-name(.) = 'xref'">
|
|
14189
|
+
<xsl:when test="self::* and local-name(.) = 'fmt-xref'">
|
|
14077
14190
|
<xsl:variable name="id" select="@id"/>
|
|
14078
14191
|
|
|
14079
|
-
<xsl:variable name="id_next" select="following-sibling::mn:xref[1]/@id"/>
|
|
14080
|
-
<xsl:variable name="id_prev" select="preceding-sibling::mn:xref[1]/@id"/>
|
|
14192
|
+
<xsl:variable name="id_next" select="following-sibling::mn:fmt-xref[1]/@id"/>
|
|
14193
|
+
<xsl:variable name="id_prev" select="preceding-sibling::mn:fmt-xref[1]/@id"/>
|
|
14081
14194
|
|
|
14082
14195
|
<xsl:variable name="pages_">
|
|
14083
14196
|
<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
|
|
@@ -14173,18 +14286,18 @@
|
|
|
14173
14286
|
<xsl:variable name="item_number">
|
|
14174
14287
|
<xsl:number count="mn:li[ancestor::mn:indexsect]" level="any"/>
|
|
14175
14288
|
</xsl:variable>
|
|
14176
|
-
<xsl:variable name="xref_number"><xsl:number count="mn:xref"/></xsl:variable>
|
|
14289
|
+
<xsl:variable name="xref_number"><xsl:number count="mn:fmt-xref"/></xsl:variable>
|
|
14177
14290
|
<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
|
|
14178
14291
|
</xsl:template>
|
|
14179
14292
|
|
|
14180
|
-
<xsl:template match="mn:indexsect/mn:title" priority="4">
|
|
14293
|
+
<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
|
|
14181
14294
|
<fo:block xsl:use-attribute-sets="indexsect-title-style">
|
|
14182
14295
|
<!-- Index -->
|
|
14183
14296
|
<xsl:apply-templates/>
|
|
14184
14297
|
</fo:block>
|
|
14185
14298
|
</xsl:template>
|
|
14186
14299
|
|
|
14187
|
-
<xsl:template match="mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14300
|
+
<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14188
14301
|
<!-- Letter A, B, C, ... -->
|
|
14189
14302
|
<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
|
|
14190
14303
|
<xsl:apply-templates/>
|
|
@@ -14225,12 +14338,12 @@
|
|
|
14225
14338
|
<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"/>
|
|
14226
14339
|
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
|
14227
14340
|
<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"/> -->
|
|
14228
|
-
<xsl:when test="1 = 2 and preceding-sibling::node()[self::mn:fmt-
|
|
14341
|
+
<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]">
|
|
14229
14342
|
<!-- skip here, see the template 'fmt-review-start' -->
|
|
14230
14343
|
</xsl:when>
|
|
14231
14344
|
<xsl:otherwise>
|
|
14232
14345
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
|
14233
|
-
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-
|
|
14346
|
+
<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>
|
|
14234
14347
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
|
14235
14348
|
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
|
14236
14349
|
</xsl:otherwise>
|
|
@@ -14394,7 +14507,7 @@
|
|
|
14394
14507
|
|
|
14395
14508
|
<xsl:template name="processTables_Contents">
|
|
14396
14509
|
<mnx:tables>
|
|
14397
|
-
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:name and normalize-space(@id) != '']">
|
|
14510
|
+
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:fmt-name and normalize-space(@id) != '']">
|
|
14398
14511
|
<xsl:choose>
|
|
14399
14512
|
<xsl:when test="mn:fmt-name">
|
|
14400
14513
|
<xsl:variable name="fmt_name">
|
|
@@ -14416,7 +14529,7 @@
|
|
|
14416
14529
|
|
|
14417
14530
|
<xsl:template name="processFigures_Contents">
|
|
14418
14531
|
<mnx:figures>
|
|
14419
|
-
<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) != '']">
|
|
14532
|
+
<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) != '']">
|
|
14420
14533
|
<xsl:choose>
|
|
14421
14534
|
<xsl:when test="mn:fmt-name">
|
|
14422
14535
|
<xsl:variable name="fmt_name">
|
|
@@ -14445,7 +14558,7 @@
|
|
|
14445
14558
|
|
|
14446
14559
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
|
|
14447
14560
|
|
|
14448
|
-
<xsl:template match="mn:figure/mn:fmt-name |
|
|
14561
|
+
<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">
|
|
14449
14562
|
<xsl:apply-templates mode="contents"/>
|
|
14450
14563
|
<xsl:text> </xsl:text>
|
|
14451
14564
|
</xsl:template>
|
|
@@ -14457,7 +14570,7 @@
|
|
|
14457
14570
|
</xsl:if>
|
|
14458
14571
|
</xsl:template>
|
|
14459
14572
|
|
|
14460
|
-
<xsl:template match="mn:figure/mn:fmt-name | mn:table/mn:fmt-name |
|
|
14573
|
+
<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">
|
|
14461
14574
|
<xsl:apply-templates mode="bookmarks"/>
|
|
14462
14575
|
<xsl:text> </xsl:text>
|
|
14463
14576
|
</xsl:template>
|
|
@@ -14468,7 +14581,7 @@
|
|
|
14468
14581
|
</xsl:if>
|
|
14469
14582
|
</xsl:template>
|
|
14470
14583
|
|
|
14471
|
-
<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">
|
|
14584
|
+
<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">
|
|
14472
14585
|
<xsl:value-of select="."/>
|
|
14473
14586
|
</xsl:template>
|
|
14474
14587
|
|
|
@@ -14478,7 +14591,7 @@
|
|
|
14478
14591
|
</xsl:if>
|
|
14479
14592
|
</xsl:template>
|
|
14480
14593
|
|
|
14481
|
-
<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">
|
|
14594
|
+
<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">
|
|
14482
14595
|
<xsl:value-of select="."/>
|
|
14483
14596
|
</xsl:template>
|
|
14484
14597
|
|
|
@@ -14951,7 +15064,7 @@
|
|
|
14951
15064
|
<xsl:value-of select="."/>
|
|
14952
15065
|
</xsl:template>
|
|
14953
15066
|
|
|
14954
|
-
<xsl:template match="mn:
|
|
15067
|
+
<xsl:template match="mn:annotation" mode="contents_item"/>
|
|
14955
15068
|
|
|
14956
15069
|
<xsl:template match="mn:tab" mode="contents_item">
|
|
14957
15070
|
<xsl:text> </xsl:text>
|
|
@@ -15106,7 +15219,7 @@
|
|
|
15106
15219
|
<xsl:apply-templates/>
|
|
15107
15220
|
</xsl:template>
|
|
15108
15221
|
|
|
15109
|
-
<xsl:template match="mn:toc//mn:xref" priority="3">
|
|
15222
|
+
<xsl:template match="mn:toc//mn:xref | mn:toc//mn:fmt-xref" priority="3">
|
|
15110
15223
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15111
15224
|
<!-- New format: one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15112
15225
|
<!-- <test><xsl:copy-of select="."/></test> -->
|
|
@@ -15174,8 +15287,8 @@
|
|
|
15174
15287
|
<xsl:apply-templates mode="toc_table_width"/>
|
|
15175
15288
|
</xsl:template>
|
|
15176
15289
|
|
|
15177
|
-
<xsl:template match="mn:clause[@type = 'toc']/mn:title" mode="toc_table_width"/>
|
|
15178
|
-
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:title" mode="toc_table_width"/>
|
|
15290
|
+
<xsl:template match="mn:clause[@type = 'toc']/mn:fmt-title" mode="toc_table_width"/>
|
|
15291
|
+
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:fmt-title" mode="toc_table_width"/>
|
|
15179
15292
|
|
|
15180
15293
|
<xsl:template match="mn:li" mode="toc_table_width">
|
|
15181
15294
|
<mn:tr>
|
|
@@ -15183,7 +15296,7 @@
|
|
|
15183
15296
|
</mn:tr>
|
|
15184
15297
|
</xsl:template>
|
|
15185
15298
|
|
|
15186
|
-
<xsl:template match="mn:xref" mode="toc_table_width">
|
|
15299
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width">
|
|
15187
15300
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15188
15301
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15189
15302
|
<xsl:for-each select="mn:tab">
|
|
@@ -15261,10 +15374,10 @@
|
|
|
15261
15374
|
|
|
15262
15375
|
</xsl:template> <!-- tab -->
|
|
15263
15376
|
|
|
15264
|
-
<xsl:template match="mn:note/mn:name/mn:tab" priority="2"/>
|
|
15265
|
-
<xsl:template match="mn:termnote/mn:name/mn:tab" priority="2"/>
|
|
15377
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" priority="2"/>
|
|
15378
|
+
<xsl:template match="mn:termnote/mn:fmt-name/mn:tab" priority="2"/>
|
|
15266
15379
|
|
|
15267
|
-
<xsl:template match="mn:note/mn:name/mn:tab" mode="tab">
|
|
15380
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" mode="tab">
|
|
15268
15381
|
</xsl:template>
|
|
15269
15382
|
|
|
15270
15383
|
<xsl:template name="insertNonBreakSpaces">
|
|
@@ -15278,13 +15391,13 @@
|
|
|
15278
15391
|
</xsl:template>
|
|
15279
15392
|
|
|
15280
15393
|
<xsl:variable name="reviews_">
|
|
15281
|
-
<xsl:for-each select="//mn:
|
|
15394
|
+
<xsl:for-each select="//mn:annotation[not(parent::mn:annotation-container)][@from]">
|
|
15282
15395
|
<xsl:copy>
|
|
15283
15396
|
<xsl:copy-of select="@from"/>
|
|
15284
15397
|
<xsl:copy-of select="@id"/>
|
|
15285
15398
|
</xsl:copy>
|
|
15286
15399
|
</xsl:for-each>
|
|
15287
|
-
<xsl:for-each select="//mn:fmt-
|
|
15400
|
+
<xsl:for-each select="//mn:fmt-annotation-start[@source]">
|
|
15288
15401
|
<xsl:copy>
|
|
15289
15402
|
<xsl:copy-of select="@source"/>
|
|
15290
15403
|
<xsl:copy-of select="@id"/>
|
|
@@ -15298,7 +15411,7 @@
|
|
|
15298
15411
|
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
|
15299
15412
|
<xsl:variable name="curr_id" select="@id"/>
|
|
15300
15413
|
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
|
15301
|
-
<xsl:for-each select="$reviews//mn:
|
|
15414
|
+
<xsl:for-each select="$reviews//mn:annotation[@from = $curr_id]"> <!-- $reviews//mn:fmt-review-start[@source = $curr_id] -->
|
|
15302
15415
|
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
|
15303
15416
|
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
|
15304
15417
|
<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>
|
|
@@ -15313,7 +15426,7 @@
|
|
|
15313
15426
|
|
|
15314
15427
|
<!-- document text (not figures, or tables) footnotes -->
|
|
15315
15428
|
<xsl:variable name="reviews_container_">
|
|
15316
|
-
<xsl:for-each select="//mn:
|
|
15429
|
+
<xsl:for-each select="//mn:annotation-container/mn:fmt-annotation-body">
|
|
15317
15430
|
<xsl:variable name="update_xml_step1">
|
|
15318
15431
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
15319
15432
|
</xsl:variable>
|
|
@@ -15322,10 +15435,10 @@
|
|
|
15322
15435
|
</xsl:variable>
|
|
15323
15436
|
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
|
15324
15437
|
|
|
15325
|
-
<xsl:template match="mn:
|
|
15438
|
+
<xsl:template match="mn:annotation-container"/>
|
|
15326
15439
|
|
|
15327
15440
|
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
|
15328
|
-
<xsl:template match="mn:
|
|
15441
|
+
<xsl:template match="mn:annotation[not(parent::mn:annotation-container)]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15329
15442
|
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
|
15330
15443
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
15331
15444
|
<xsl:choose>
|
|
@@ -15345,7 +15458,7 @@
|
|
|
15345
15458
|
</xsl:template>
|
|
15346
15459
|
|
|
15347
15460
|
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
|
15348
|
-
<xsl:template match="mn:fmt-
|
|
15461
|
+
<xsl:template match="mn:fmt-annotation-start" name="fmt-annotation-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15349
15462
|
<!-- comment 2019-11-29 -->
|
|
15350
15463
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
|
15351
15464
|
<xsl:apply-templates /> -->
|
|
@@ -15401,7 +15514,7 @@
|
|
|
15401
15514
|
</xsl:template>
|
|
15402
15515
|
|
|
15403
15516
|
<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
|
|
15404
|
-
<xsl:template match="mn:
|
|
15517
|
+
<xsl:template match="mn:annotation[@type = 'other']"/>
|
|
15405
15518
|
|
|
15406
15519
|
<!-- ============ -->
|
|
15407
15520
|
<!-- errata -->
|
|
@@ -15794,9 +15907,12 @@
|
|
|
15794
15907
|
<xsl:choose>
|
|
15795
15908
|
<xsl:when test="mn:fmt-title">
|
|
15796
15909
|
<xsl:variable name="fmt_title_section">
|
|
15797
|
-
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:
|
|
15910
|
+
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:annotation)]"/>
|
|
15798
15911
|
</xsl:variable>
|
|
15799
15912
|
<xsl:value-of select="normalize-space($fmt_title_section)"/>
|
|
15913
|
+
<xsl:if test="normalize-space($fmt_title_section) = ''">
|
|
15914
|
+
<xsl:value-of select="mn:fmt-title/mn:tab[1]/preceding-sibling::node()"/>
|
|
15915
|
+
</xsl:if>
|
|
15800
15916
|
</xsl:when>
|
|
15801
15917
|
<xsl:otherwise>
|
|
15802
15918
|
<xsl:value-of select="mn:title/mn:tab[1]/preceding-sibling::node()"/>
|
|
@@ -15809,6 +15925,9 @@
|
|
|
15809
15925
|
<xsl:when test="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab]">
|
|
15810
15926
|
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/following-sibling::node()"/>
|
|
15811
15927
|
</xsl:when>
|
|
15928
|
+
<xsl:when test="mn:fmt-title/mn:tab">
|
|
15929
|
+
<xsl:copy-of select="mn:fmt-title/mn:tab[1]/following-sibling::node()"/>
|
|
15930
|
+
</xsl:when>
|
|
15812
15931
|
<xsl:when test="mn:fmt-title">
|
|
15813
15932
|
<xsl:copy-of select="mn:fmt-title/node()"/>
|
|
15814
15933
|
</xsl:when>
|
|
@@ -15947,10 +16066,10 @@
|
|
|
15947
16066
|
|
|
15948
16067
|
</fo:block>
|
|
15949
16068
|
|
|
15950
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
16069
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
15951
16070
|
|
|
15952
16071
|
<fo:block>
|
|
15953
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
16072
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
15954
16073
|
</fo:block>
|
|
15955
16074
|
</xsl:otherwise>
|
|
15956
16075
|
</xsl:choose>
|
|
@@ -15959,7 +16078,7 @@
|
|
|
15959
16078
|
<xsl:template name="refine_annex_style">
|
|
15960
16079
|
</xsl:template>
|
|
15961
16080
|
|
|
15962
|
-
<xsl:template match="mn:name/text()">
|
|
16081
|
+
<xsl:template match="mn:name/text() | mn:fmt-name/text()">
|
|
15963
16082
|
<!-- 0xA0 to space replacement -->
|
|
15964
16083
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15965
16084
|
</xsl:template>
|
|
@@ -16015,28 +16134,28 @@
|
|
|
16015
16134
|
<xsl:template match="mn:amend"/>
|
|
16016
16135
|
|
|
16017
16136
|
<!-- fmt-title renamed to title in update_xml_step1 -->
|
|
16018
|
-
<xsl:template match="mn:fmt-title"/>
|
|
16137
|
+
<!-- <xsl:template match="mn:fmt-title" /> -->
|
|
16019
16138
|
|
|
16020
16139
|
<!-- fmt-name renamed to name in update_xml_step1 -->
|
|
16021
|
-
<xsl:template match="mn:fmt-name"/>
|
|
16140
|
+
<!-- <xsl:template match="mn:fmt-name" /> -->
|
|
16022
16141
|
|
|
16023
16142
|
<!-- fmt-preferred renamed to preferred in update_xml_step1 -->
|
|
16024
|
-
<xsl:template match="mn:fmt-preferred"/>
|
|
16143
|
+
<!-- <xsl:template match="mn:fmt-preferred" /> -->
|
|
16025
16144
|
|
|
16026
16145
|
<!-- fmt-admitted renamed to admitted in update_xml_step1 -->
|
|
16027
|
-
<xsl:template match="mn:fmt-admitted"/>
|
|
16146
|
+
<!-- <xsl:template match="mn:fmt-admitted" /> -->
|
|
16028
16147
|
|
|
16029
16148
|
<!-- fmt-deprecates renamed to deprecates in update_xml_step1 -->
|
|
16030
|
-
<xsl:template match="mn:fmt-deprecates"/>
|
|
16149
|
+
<!-- <xsl:template match="mn:fmt-deprecates" /> -->
|
|
16031
16150
|
|
|
16032
16151
|
<!-- fmt-definition renamed to definition in update_xml_step1 -->
|
|
16033
|
-
<xsl:template match="mn:fmt-definition"/>
|
|
16152
|
+
<!-- <xsl:template match="mn:fmt-definition" /> -->
|
|
16034
16153
|
|
|
16035
16154
|
<!-- fmt-termsource renamed to termsource in update_xml_step1 -->
|
|
16036
|
-
<xsl:template match="mn:fmt-termsource"/>
|
|
16155
|
+
<!-- <xsl:template match="mn:fmt-termsource" /> -->
|
|
16037
16156
|
|
|
16038
16157
|
<!-- fmt-source renamed to source in update_xml_step1 -->
|
|
16039
|
-
<xsl:template match="mn:fmt-source"/>
|
|
16158
|
+
<!-- <xsl:template match="mn:fmt-source" /> -->
|
|
16040
16159
|
|
|
16041
16160
|
<xsl:template match="mn:semx">
|
|
16042
16161
|
<xsl:apply-templates/>
|
|
@@ -16505,12 +16624,12 @@
|
|
|
16505
16624
|
<xsl:when test="ancestor::mn:preface">
|
|
16506
16625
|
<xsl:value-of select="$level_total - 2"/>
|
|
16507
16626
|
</xsl:when>
|
|
16508
|
-
<xsl:when test="ancestor::mn:sections and self::mn:title">
|
|
16627
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-title">
|
|
16509
16628
|
<!-- determine 'depth' depends on upper clause with title/@depth -->
|
|
16510
16629
|
<!-- <xsl:message>title=<xsl:value-of select="."/></xsl:message> -->
|
|
16511
|
-
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:title/@depth][1]/mn:title/@depth"/>
|
|
16630
|
+
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:fmt-title/@depth][1]/mn:fmt-title/@depth"/>
|
|
16512
16631
|
<!-- <xsl:message>clause_with_depth_depth=<xsl:value-of select="$clause_with_depth_depth"/></xsl:message> -->
|
|
16513
|
-
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:title/@depth][1]/ancestor::*)"/>
|
|
16632
|
+
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:fmt-title/@depth][1]/ancestor::*)"/>
|
|
16514
16633
|
<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
|
|
16515
16634
|
<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
|
|
16516
16635
|
<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
|
|
@@ -16526,8 +16645,8 @@
|
|
|
16526
16645
|
</xsl:otherwise>
|
|
16527
16646
|
</xsl:choose>
|
|
16528
16647
|
</xsl:when>
|
|
16529
|
-
<xsl:when test="ancestor::mn:sections and self::mn:name and parent::mn:term">
|
|
16530
|
-
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:title/@depth)"/>
|
|
16648
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-name and parent::mn:term">
|
|
16649
|
+
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:fmt-title/@depth)"/>
|
|
16531
16650
|
<xsl:choose>
|
|
16532
16651
|
<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
|
|
16533
16652
|
<xsl:value-of select="number($upper_terms_depth + 1)"/>
|
|
@@ -16538,7 +16657,7 @@
|
|
|
16538
16657
|
</xsl:choose>
|
|
16539
16658
|
</xsl:when>
|
|
16540
16659
|
<xsl:when test="ancestor::mn:sections">
|
|
16541
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:title/@depth)"/>
|
|
16660
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:fmt-title/@depth)"/>
|
|
16542
16661
|
<xsl:choose>
|
|
16543
16662
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16544
16663
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16554,8 +16673,8 @@
|
|
|
16554
16673
|
<xsl:when test="parent::mn:annex">
|
|
16555
16674
|
<xsl:value-of select="$level_total - 1"/>
|
|
16556
16675
|
</xsl:when>
|
|
16557
|
-
<xsl:when test="ancestor::mn:annex and self::mn:title">
|
|
16558
|
-
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:title/@depth)"/>
|
|
16676
|
+
<xsl:when test="ancestor::mn:annex and self::mn:fmt-title">
|
|
16677
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:fmt-title/@depth)"/>
|
|
16559
16678
|
<xsl:choose>
|
|
16560
16679
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16561
16680
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16588,7 +16707,7 @@
|
|
|
16588
16707
|
</xsl:when>
|
|
16589
16708
|
<xsl:otherwise>
|
|
16590
16709
|
<xsl:variable name="title_level_">
|
|
16591
|
-
<xsl:for-each select="../preceding-sibling::mn:title[1]">
|
|
16710
|
+
<xsl:for-each select="../preceding-sibling::mn:fmt-title[1]">
|
|
16592
16711
|
<xsl:call-template name="getLevel"/>
|
|
16593
16712
|
</xsl:for-each>
|
|
16594
16713
|
</xsl:variable>
|
|
@@ -16665,15 +16784,17 @@
|
|
|
16665
16784
|
</xsl:template>
|
|
16666
16785
|
|
|
16667
16786
|
<xsl:template name="setNamedDestination">
|
|
16668
|
-
|
|
16669
|
-
|
|
16670
|
-
<
|
|
16671
|
-
|
|
16672
|
-
<xsl:for-each select=". | mn:title | mn:name">
|
|
16673
|
-
<xsl:if test="@named_dest">
|
|
16674
|
-
<fox:destination internal-destination="{@named_dest}"/>
|
|
16787
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
16788
|
+
<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
|
|
16789
|
+
<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'">
|
|
16790
|
+
<fox:destination internal-destination="{@id}"/>
|
|
16675
16791
|
</xsl:if>
|
|
16676
|
-
|
|
16792
|
+
<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
|
|
16793
|
+
<xsl:if test="@named_dest">
|
|
16794
|
+
<fox:destination internal-destination="{@named_dest}"/>
|
|
16795
|
+
</xsl:if>
|
|
16796
|
+
</xsl:for-each>
|
|
16797
|
+
</xsl:if>
|
|
16677
16798
|
</xsl:template>
|
|
16678
16799
|
|
|
16679
16800
|
<xsl:template name="add-letter-spacing">
|
|
@@ -17021,7 +17142,7 @@
|
|
|
17021
17142
|
</xsl:when>
|
|
17022
17143
|
<xsl:otherwise>
|
|
17023
17144
|
<!-- namespace-uri(ancestor::mn:title) != '' to skip title from $contents -->
|
|
17024
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
17145
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
17025
17146
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
17026
17147
|
</xsl:if>
|
|
17027
17148
|
<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">
|
|
@@ -17055,7 +17176,7 @@
|
|
|
17055
17176
|
</fo:block>
|
|
17056
17177
|
</fo:block-container>
|
|
17057
17178
|
</fo:inline-container>
|
|
17058
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17179
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17059
17180
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
17060
17181
|
</xsl:if>
|
|
17061
17182
|
</xsl:otherwise>
|