metanorma-bipm 2.6.10 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/bipm/base_convert.rb +26 -0
- data/lib/isodoc/bipm/bipm.brochure.xsl +725 -506
- data/lib/isodoc/bipm/bipm.guide.xsl +725 -506
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +725 -506
- data/lib/isodoc/bipm/bipm.rapport.xsl +725 -506
- 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 +683 -507
- 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/basicdoc.rng +5 -5
- data/lib/metanorma/bipm/cleanup.rb +8 -21
- data/lib/metanorma/bipm/converter.rb +0 -4
- data/lib/metanorma/bipm/isodoc.rng +75 -7
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +2 -2
- metadata +6 -6
|
@@ -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>
|
|
@@ -1156,9 +1145,9 @@
|
|
|
1156
1145
|
|
|
1157
1146
|
<fo:flow flow-name="xsl-region-body">
|
|
1158
1147
|
|
|
1159
|
-
<fo:block-container margin-left="-14mm"
|
|
1160
|
-
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
1161
|
-
<fo:block
|
|
1148
|
+
<!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
|
|
1149
|
+
<fo:block-container margin-left="0mm" margin-right="0mm"> -->
|
|
1150
|
+
<fo:block xsl:use-attribute-sets="toc-title-style">
|
|
1162
1151
|
<fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
|
|
1163
1152
|
<fo:inline keep-together.within-line="always">
|
|
1164
1153
|
<fo:leader leader-pattern="space"/>
|
|
@@ -1167,10 +1156,10 @@
|
|
|
1167
1156
|
</fo:inline>
|
|
1168
1157
|
</fo:inline>
|
|
1169
1158
|
</fo:block>
|
|
1170
|
-
</fo:block-container>
|
|
1171
|
-
</fo:block-container>
|
|
1159
|
+
<!-- </fo:block-container>
|
|
1160
|
+
</fo:block-container> -->
|
|
1172
1161
|
|
|
1173
|
-
<fo:block-container
|
|
1162
|
+
<fo:block-container xsl:use-attribute-sets="toc-style">
|
|
1174
1163
|
<fo:block role="TOC">
|
|
1175
1164
|
<!-- <xsl:copy-of select="$contents"/> -->
|
|
1176
1165
|
|
|
@@ -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 -->
|
|
@@ -1854,7 +1896,7 @@
|
|
|
1854
1896
|
|
|
1855
1897
|
<xsl:template name="insertContentItem">
|
|
1856
1898
|
<xsl:param name="keep-with-next"/>
|
|
1857
|
-
<fo:table-row
|
|
1899
|
+
<fo:table-row xsl:use-attribute-sets="toc-item-style">
|
|
1858
1900
|
<xsl:if test="$keep-with-next = 'true'">
|
|
1859
1901
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
1860
1902
|
</xsl:if>
|
|
@@ -1880,32 +1922,8 @@
|
|
|
1880
1922
|
<xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
|
|
1881
1923
|
</xsl:if>
|
|
1882
1924
|
<fo:block role="SKIP">
|
|
1883
|
-
|
|
1884
|
-
|
|
1885
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
1886
|
-
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1887
|
-
</xsl:if>
|
|
1888
|
-
<xsl:if test="@level >= 2 and not(@parent = 'annex')">
|
|
1889
|
-
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
1890
|
-
</xsl:if>
|
|
1891
|
-
<xsl:if test="@level = 2">
|
|
1892
|
-
<xsl:attribute name="margin-left">8mm</xsl:attribute>
|
|
1893
|
-
</xsl:if>
|
|
1894
|
-
<xsl:if test="@level > 2">
|
|
1895
|
-
<xsl:attribute name="margin-left">9mm</xsl:attribute>
|
|
1896
|
-
</xsl:if>
|
|
1897
|
-
<xsl:if test="@level >= 2 and @parent = 'annex'">
|
|
1898
|
-
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
1899
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
1900
|
-
<xsl:attribute name="margin-left">25mm</xsl:attribute>
|
|
1901
|
-
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1902
|
-
</xsl:if>
|
|
1903
|
-
<xsl:if test="@type = 'index'">
|
|
1904
|
-
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
1905
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
1906
|
-
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
1907
|
-
<xsl:attribute name="space-before">14pt</xsl:attribute>
|
|
1908
|
-
</xsl:if>
|
|
1925
|
+
|
|
1926
|
+
<xsl:call-template name="refine_toc-item-style"/>
|
|
1909
1927
|
|
|
1910
1928
|
<fo:list-block role="SKIP">
|
|
1911
1929
|
<xsl:attribute name="provisional-distance-between-starts">
|
|
@@ -1919,15 +1937,16 @@
|
|
|
1919
1937
|
</xsl:attribute>
|
|
1920
1938
|
|
|
1921
1939
|
<fo:list-item role="SKIP">
|
|
1940
|
+
|
|
1922
1941
|
<fo:list-item-label end-indent="label-end()" role="SKIP">
|
|
1923
1942
|
<fo:block role="SKIP">
|
|
1924
1943
|
<xsl:if test="@level = 1 or (@level = 2 and not(@parent = 'annex'))">
|
|
1925
1944
|
<xsl:value-of select="@section"/>
|
|
1926
1945
|
<xsl:if test="normalize-space(@section) != '' and @type = 'annex'">.</xsl:if>
|
|
1927
1946
|
</xsl:if>
|
|
1928
|
-
|
|
1929
1947
|
</fo:block>
|
|
1930
1948
|
</fo:list-item-label>
|
|
1949
|
+
|
|
1931
1950
|
<fo:list-item-body start-indent="body-start()" role="SKIP">
|
|
1932
1951
|
<fo:block role="SKIP">
|
|
1933
1952
|
<xsl:if test="@level >= 3">
|
|
@@ -1959,7 +1978,7 @@
|
|
|
1959
1978
|
</xsl:if>
|
|
1960
1979
|
<fo:block role="SKIP">
|
|
1961
1980
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}" role="SKIP">
|
|
1962
|
-
<fo:inline
|
|
1981
|
+
<fo:inline xsl:use-attribute-sets="toc-pagenumber-style" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
|
|
1963
1982
|
</fo:basic-link>
|
|
1964
1983
|
</fo:block>
|
|
1965
1984
|
</fo:table-cell>
|
|
@@ -1969,7 +1988,7 @@
|
|
|
1969
1988
|
<xsl:template name="insertListOf_Title">
|
|
1970
1989
|
<xsl:param name="title"/>
|
|
1971
1990
|
<fo:table-row keep-with-next="always">
|
|
1972
|
-
<fo:table-cell
|
|
1991
|
+
<fo:table-cell xsl:use-attribute-sets="toc-listof-title-style">
|
|
1973
1992
|
<fo:block role="TOCI">
|
|
1974
1993
|
<xsl:value-of select="$title"/>
|
|
1975
1994
|
</fo:block>
|
|
@@ -1983,7 +2002,7 @@
|
|
|
1983
2002
|
<xsl:template name="insertListOf_Item">
|
|
1984
2003
|
<fo:table-row>
|
|
1985
2004
|
<fo:table-cell>
|
|
1986
|
-
<fo:block
|
|
2005
|
+
<fo:block xsl:use-attribute-sets="toc-listof-item-style">
|
|
1987
2006
|
<fo:list-block provisional-distance-between-starts="8mm">
|
|
1988
2007
|
<fo:list-item>
|
|
1989
2008
|
<fo:list-item-label end-indent="label-end()">
|
|
@@ -2005,7 +2024,7 @@
|
|
|
2005
2024
|
</fo:list-block>
|
|
2006
2025
|
</fo:block>
|
|
2007
2026
|
</fo:table-cell>
|
|
2008
|
-
<fo:table-cell
|
|
2027
|
+
<fo:table-cell xsl:use-attribute-sets="toc-pagenumber-style" text-align="right">
|
|
2009
2028
|
<fo:block>
|
|
2010
2029
|
<fo:basic-link internal-destination="{@id}">
|
|
2011
2030
|
<xsl:call-template name="setAltText">
|
|
@@ -2101,20 +2120,20 @@
|
|
|
2101
2120
|
<xsl:choose>
|
|
2102
2121
|
<xsl:when test="parent::mn:sections">
|
|
2103
2122
|
<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"/>
|
|
2123
|
+
<xsl:when test="./mn:fmt-title[1]/mn:tab">
|
|
2124
|
+
<xsl:apply-templates select="./mn:fmt-title[1]/mn:tab[1]/following-sibling::node()" mode="header"/>
|
|
2106
2125
|
</xsl:when>
|
|
2107
2126
|
<xsl:otherwise>
|
|
2108
|
-
<xsl:apply-templates select="./mn:title[1]" mode="header"/>
|
|
2127
|
+
<xsl:apply-templates select="./mn:fmt-title[1]" mode="header"/>
|
|
2109
2128
|
</xsl:otherwise>
|
|
2110
2129
|
</xsl:choose>
|
|
2111
2130
|
</xsl:when>
|
|
2112
2131
|
|
|
2113
2132
|
<xsl:when test="self::mn:annex">
|
|
2114
2133
|
<xsl:choose>
|
|
2115
|
-
<xsl:when test="./*[1]/mn:title[1]/mn:tab">
|
|
2134
|
+
<xsl:when test="./*[1]/mn:fmt-title[1]/mn:tab">
|
|
2116
2135
|
<xsl:variable name="title_annex">
|
|
2117
|
-
<xsl:value-of select="normalize-space(./*[1]/mn:title[1]/mn:tab[1]/preceding-sibling::node())"/>
|
|
2136
|
+
<xsl:value-of select="normalize-space(./*[1]/mn:fmt-title[1]/mn:tab[1]/preceding-sibling::node())"/>
|
|
2118
2137
|
</xsl:variable>
|
|
2119
2138
|
<xsl:choose>
|
|
2120
2139
|
<xsl:when test="substring($title_annex, string-length($title_annex)) = '.'">
|
|
@@ -2126,13 +2145,13 @@
|
|
|
2126
2145
|
</xsl:choose>
|
|
2127
2146
|
</xsl:when>
|
|
2128
2147
|
<xsl:otherwise>
|
|
2129
|
-
<xsl:apply-templates select="./*[1]/mn:title[1]" mode="header"/>
|
|
2148
|
+
<xsl:apply-templates select="./*[1]/mn:fmt-title[1]" mode="header"/>
|
|
2130
2149
|
</xsl:otherwise>
|
|
2131
2150
|
</xsl:choose>
|
|
2132
2151
|
</xsl:when>
|
|
2133
2152
|
|
|
2134
2153
|
<xsl:otherwise>
|
|
2135
|
-
<xsl:apply-templates select="./mn:title[1]" mode="header"/>
|
|
2154
|
+
<xsl:apply-templates select="./mn:fmt-title[1]" mode="header"/>
|
|
2136
2155
|
</xsl:otherwise>
|
|
2137
2156
|
|
|
2138
2157
|
</xsl:choose>
|
|
@@ -2210,7 +2229,7 @@
|
|
|
2210
2229
|
<!-- title -->
|
|
2211
2230
|
<!-- ====== -->
|
|
2212
2231
|
|
|
2213
|
-
<xsl:template match="mn:title" name="title">
|
|
2232
|
+
<xsl:template match="mn:fmt-title" name="title">
|
|
2214
2233
|
|
|
2215
2234
|
<xsl:variable name="level">
|
|
2216
2235
|
<xsl:call-template name="getLevel"/>
|
|
@@ -2344,7 +2363,7 @@
|
|
|
2344
2363
|
<xsl:apply-templates mode="header"/>
|
|
2345
2364
|
</xsl:template>
|
|
2346
2365
|
|
|
2347
|
-
<xsl:template match="mn:stem" mode="header">
|
|
2366
|
+
<xsl:template match="mn:fmt-stem" mode="header">
|
|
2348
2367
|
<xsl:apply-templates/>
|
|
2349
2368
|
</xsl:template>
|
|
2350
2369
|
|
|
@@ -2503,7 +2522,7 @@
|
|
|
2503
2522
|
<xsl:template match="mn:sections/mn:clause | mn:annex/mn:clause" priority="3">
|
|
2504
2523
|
|
|
2505
2524
|
<xsl:variable name="space-before"> <!-- margin-top for title, see mn:title -->
|
|
2506
|
-
<xsl:if test="local-name(*[1]) = 'title'">
|
|
2525
|
+
<xsl:if test="local-name(*[1]) = 'fmt-title'">
|
|
2507
2526
|
<xsl:if test="*[1]/@depth = 1 and not(*[1]/ancestor::mn:annex) and $independentAppendix != ''">30pt</xsl:if>
|
|
2508
2527
|
<xsl:if test="*[1]/@depth = 2 and not(*[1]/ancestor::mn:annex)">30pt</xsl:if>
|
|
2509
2528
|
<xsl:if test="*[1]/@depth = 2 and *[1]/ancestor::mn:annex">18pt</xsl:if> <!-- 24pt -->
|
|
@@ -2615,7 +2634,7 @@
|
|
|
2615
2634
|
<xsl:variable name="start_row" select="xalan:nodeset($rows)/num[$curr_row_num]/@span_start"/>
|
|
2616
2635
|
<xsl:variable name="end_row" select="$start_row + xalan:nodeset($rows)/num[$curr_row_num]/@span_num - 1"/>
|
|
2617
2636
|
<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 -->
|
|
2637
|
+
<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
2638
|
<xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
|
|
2620
2639
|
</xsl:if>
|
|
2621
2640
|
|
|
@@ -2623,7 +2642,7 @@
|
|
|
2623
2642
|
<xsl:variable name="start_row_next_num" select="number($start_row_next)"/>
|
|
2624
2643
|
|
|
2625
2644
|
<xsl:variable name="table-row-padding-bottom">
|
|
2626
|
-
<xsl:if test="$start_row_next != '' and local-name(*[$start_row_next_num]) = 'title'">
|
|
2645
|
+
<xsl:if test="$start_row_next != '' and local-name(*[$start_row_next_num]) = 'fmt-title'">
|
|
2627
2646
|
<xsl:if test="*[$start_row_next_num]/@depth = 2 and not(*[$start_row_next_num]/ancestor::mn:annex)">30pt</xsl:if>
|
|
2628
2647
|
<xsl:if test="*[$start_row_next_num]/@depth = 2 and *[$start_row_next_num]/ancestor::mn:annex">18pt</xsl:if> <!-- 24pt -->
|
|
2629
2648
|
<xsl:if test="*[$start_row_next_num]/@depth = 3 and not(*[$start_row_next_num]/ancestor::mn:annex)">20pt</xsl:if>
|
|
@@ -2724,7 +2743,7 @@
|
|
|
2724
2743
|
<xsl:choose>
|
|
2725
2744
|
<xsl:when test="count(./node()) = 0"> <!-- if empty clause, then move id into next title -->
|
|
2726
2745
|
<xsl:choose>
|
|
2727
|
-
<xsl:when test="local-name(following-sibling::*[1]) = 'title'"/> <!-- id will set in title -->
|
|
2746
|
+
<xsl:when test="local-name(following-sibling::*[1]) = 'fmt-title'"/> <!-- id will set in title -->
|
|
2728
2747
|
<xsl:otherwise>
|
|
2729
2748
|
<fo:block>
|
|
2730
2749
|
<xsl:call-template name="setId"/>
|
|
@@ -2761,7 +2780,7 @@
|
|
|
2761
2780
|
<xsl:variable name="num">
|
|
2762
2781
|
<xsl:number count="//mn:table[@id = $table_id]//mn:note_side" level="any"/>
|
|
2763
2782
|
</xsl:variable>
|
|
2764
|
-
<xsl:if test="$num = 1 and ancestor::mn:table[1]/mn:name/mn:tab">
|
|
2783
|
+
<xsl:if test="$num = 1 and ancestor::mn:table[1]/mn:fmt-name/mn:tab">
|
|
2765
2784
|
<xsl:attribute name="margin-top">48pt</xsl:attribute>
|
|
2766
2785
|
</xsl:if>
|
|
2767
2786
|
|
|
@@ -2770,13 +2789,13 @@
|
|
|
2770
2789
|
<xsl:call-template name="addReviewHelper"/>
|
|
2771
2790
|
|
|
2772
2791
|
<!-- 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>
|
|
2792
|
+
<xsl:if test="ancestor::mn:fmt-title and not(mn:sup_fn)"><fo:inline>* </fo:inline></xsl:if>
|
|
2774
2793
|
|
|
2775
2794
|
<xsl:apply-templates mode="note_side"/>
|
|
2776
2795
|
</fo:block>
|
|
2777
2796
|
</xsl:template>
|
|
2778
2797
|
|
|
2779
|
-
<xsl:template match="mn:note_side/mn:name" mode="note_side" priority="2"/>
|
|
2798
|
+
<xsl:template match="mn:note_side/mn:fmt-name" mode="note_side" priority="2"/>
|
|
2780
2799
|
<xsl:template match="mn:note_side/*" mode="note_side">
|
|
2781
2800
|
<xsl:apply-templates select="."/>
|
|
2782
2801
|
</xsl:template>
|
|
@@ -2816,7 +2835,7 @@
|
|
|
2816
2835
|
<xsl:variable name="element-name">
|
|
2817
2836
|
<xsl:choose>
|
|
2818
2837
|
<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 -->
|
|
2838
|
+
<xsl:when test="../@inline-header = 'true' and $previous-element = 'fmt-title'">fo:inline</xsl:when> <!-- first paragraph after inline title -->
|
|
2820
2839
|
<xsl:when test="parent::mn:admonition">fo:inline</xsl:when>
|
|
2821
2840
|
<xsl:otherwise>fo:block</xsl:otherwise>
|
|
2822
2841
|
</xsl:choose>
|
|
@@ -2977,12 +2996,12 @@
|
|
|
2977
2996
|
<fo:table-row>
|
|
2978
2997
|
<fo:table-cell>
|
|
2979
2998
|
<fo:block>
|
|
2980
|
-
<xsl:apply-templates select="mn:name"/>
|
|
2999
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
2981
3000
|
</fo:block>
|
|
2982
3001
|
</fo:table-cell>
|
|
2983
3002
|
<fo:table-cell>
|
|
2984
3003
|
<fo:block>
|
|
2985
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
3004
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
2986
3005
|
</fo:block>
|
|
2987
3006
|
</fo:table-cell>
|
|
2988
3007
|
</fo:table-row>
|
|
@@ -2991,15 +3010,15 @@
|
|
|
2991
3010
|
</fo:block>
|
|
2992
3011
|
</xsl:template>
|
|
2993
3012
|
|
|
2994
|
-
<xsl:template match="mn:preferred" priority="2">
|
|
3013
|
+
<xsl:template match="mn:fmt-preferred" priority="2">
|
|
2995
3014
|
<fo:block font-weight="bold" keep-with-next="always" space-before="8pt" margin-bottom="6pt">
|
|
2996
3015
|
<xsl:call-template name="setStyle_preferred"/>
|
|
2997
|
-
<xsl:if test="ancestor::mn:term[1]/mn:name">
|
|
3016
|
+
<xsl:if test="ancestor::mn:term[1]/mn:fmt-name">
|
|
2998
3017
|
<xsl:variable name="level">
|
|
2999
3018
|
<xsl:call-template name="getLevelTermName"/>
|
|
3000
3019
|
</xsl:variable>
|
|
3001
3020
|
<fo:inline role="H{$level}" font-weight="bold" padding-right="2mm">
|
|
3002
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
3021
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
3003
3022
|
</fo:inline>
|
|
3004
3023
|
</xsl:if>
|
|
3005
3024
|
<xsl:apply-templates/>
|
|
@@ -3012,12 +3031,12 @@
|
|
|
3012
3031
|
<fo:block break-after="page"/>
|
|
3013
3032
|
</xsl:template>
|
|
3014
3033
|
|
|
3015
|
-
<xsl:template match="mn:xref" priority="2">
|
|
3034
|
+
<xsl:template match="mn:xref | mn:fmt-xref" priority="2">
|
|
3016
3035
|
<xsl:call-template name="insert_basic_link">
|
|
3017
3036
|
<xsl:with-param name="element">
|
|
3018
3037
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
|
|
3019
3038
|
|
|
3020
|
-
<xsl:if test="parent::mn:title">
|
|
3039
|
+
<xsl:if test="parent::mn:fmt-title">
|
|
3021
3040
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
3022
3041
|
</xsl:if>
|
|
3023
3042
|
|
|
@@ -3065,7 +3084,7 @@
|
|
|
3065
3084
|
</xsl:call-template>
|
|
3066
3085
|
</xsl:template>
|
|
3067
3086
|
|
|
3068
|
-
<xsl:template match="mn:eref[.//mn:locality[@type = 'anchor']]" priority="2">
|
|
3087
|
+
<xsl:template match="mn:fmt-eref[.//mn:locality[@type = 'anchor']]" priority="2">
|
|
3069
3088
|
<xsl:variable name="target" select=".//mn:locality[@type = 'anchor']/mn:referenceFrom"/>
|
|
3070
3089
|
<xsl:call-template name="insert_basic_link">
|
|
3071
3090
|
<xsl:with-param name="element">
|
|
@@ -3078,7 +3097,7 @@
|
|
|
3078
3097
|
</xsl:call-template>
|
|
3079
3098
|
</xsl:template>
|
|
3080
3099
|
|
|
3081
|
-
<xsl:template match="mn:note[not(ancestor::mn:preface)]/mn:name" priority="2">
|
|
3100
|
+
<xsl:template match="mn:note[not(ancestor::mn:preface)]/mn:fmt-name" priority="2">
|
|
3082
3101
|
<xsl:choose>
|
|
3083
3102
|
<xsl:when test="not(../preceding-sibling::mn:note) and not((../following-sibling::mn:note))">
|
|
3084
3103
|
<!-- <xsl:variable name="curr_lang" select="ancestor::mn:metanorma/mn:bibdata/mn:language[@current = 'true']"/>
|
|
@@ -3124,7 +3143,7 @@
|
|
|
3124
3143
|
</xsl:choose>
|
|
3125
3144
|
</xsl:template>
|
|
3126
3145
|
|
|
3127
|
-
<xsl:template match="mn:name/text()" priority="2">
|
|
3146
|
+
<xsl:template match="mn:fmt-name/text()" priority="2">
|
|
3128
3147
|
<xsl:value-of select="."/>
|
|
3129
3148
|
</xsl:template>
|
|
3130
3149
|
|
|
@@ -3341,7 +3360,7 @@
|
|
|
3341
3360
|
<xsl:template match="mn:clause[@type = 'toc']" priority="3">
|
|
3342
3361
|
<fo:block>
|
|
3343
3362
|
<xsl:copy-of select="@id"/>
|
|
3344
|
-
<xsl:apply-templates select="mn:title[1]"/>
|
|
3363
|
+
<xsl:apply-templates select="mn:fmt-title[1]"/>
|
|
3345
3364
|
|
|
3346
3365
|
<!-- create virtual table to determine column's width -->
|
|
3347
3366
|
<xsl:variable name="toc_table_simple">
|
|
@@ -3363,7 +3382,7 @@
|
|
|
3363
3382
|
<fo:table-column column-width="100%"/>
|
|
3364
3383
|
<fo:table-header role="SKIP">
|
|
3365
3384
|
<fo:table-row font-weight="bold" role="SKIP">
|
|
3366
|
-
<fo:table-cell
|
|
3385
|
+
<fo:table-cell xsl:use-attribute-sets="toc-title-page-style">
|
|
3367
3386
|
<fo:block role="Caption">
|
|
3368
3387
|
<xsl:variable name="page">
|
|
3369
3388
|
<xsl:call-template name="getLocalizedString">
|
|
@@ -3379,7 +3398,7 @@
|
|
|
3379
3398
|
<fo:table-row role="SKIP">
|
|
3380
3399
|
<fo:table-cell role="SKIP">
|
|
3381
3400
|
<fo:block role="SKIP">
|
|
3382
|
-
<xsl:variable name="title_id" select="generate-id(mn:title[1])"/>
|
|
3401
|
+
<xsl:variable name="title_id" select="generate-id(mn:fmt-title[1])"/>
|
|
3383
3402
|
<xsl:apply-templates select="*[not(generate-id() = $title_id)]">
|
|
3384
3403
|
<xsl:with-param name="colwidths" select="$colwidths"/>
|
|
3385
3404
|
</xsl:apply-templates>
|
|
@@ -3392,10 +3411,10 @@
|
|
|
3392
3411
|
</xsl:template>
|
|
3393
3412
|
|
|
3394
3413
|
<!-- 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"/>
|
|
3414
|
+
<xsl:template match="mn:clause[@type = 'toc']//mn:fmt-title/text()[1][not(preceding-sibling::mn:tab) and following-sibling::*[1][self::mn:tab]]"/>
|
|
3415
|
+
<xsl:template match="mn:clause[@type = 'toc']//mn:fmt-title/mn:tab" priority="2"/>
|
|
3397
3416
|
|
|
3398
|
-
<xsl:template match="mn:xref" mode="toc_table_width" priority="2">
|
|
3417
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width" priority="2">
|
|
3399
3418
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
3400
3419
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
3401
3420
|
<xsl:for-each select="mn:tab">
|
|
@@ -3663,7 +3682,7 @@
|
|
|
3663
3682
|
</fo:page-sequence>
|
|
3664
3683
|
</xsl:template>
|
|
3665
3684
|
|
|
3666
|
-
<xsl:template match="mn:stem/text()">
|
|
3685
|
+
<xsl:template match="mn:fmt-stem/text()">
|
|
3667
3686
|
<xsl:value-of select="normalize-space()"/>
|
|
3668
3687
|
</xsl:template>
|
|
3669
3688
|
|
|
@@ -4137,18 +4156,12 @@
|
|
|
4137
4156
|
<title-toc lang="zh">目次</title-toc>
|
|
4138
4157
|
|
|
4139
4158
|
<title-part lang="en">
|
|
4140
|
-
<xsl:text>Part #</xsl:text>
|
|
4141
4159
|
</title-part>
|
|
4142
4160
|
<title-part lang="fr">
|
|
4143
|
-
<xsl:text>Partie #</xsl:text>
|
|
4144
4161
|
</title-part>
|
|
4145
4162
|
<title-part lang="ru">
|
|
4146
4163
|
</title-part>
|
|
4147
4164
|
<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
4165
|
</xsl:variable>
|
|
4153
4166
|
<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
|
|
4154
4167
|
|
|
@@ -4601,7 +4614,8 @@
|
|
|
4601
4614
|
<xsl:template match="mn:stem" mode="update_xml_step1"/>
|
|
4602
4615
|
|
|
4603
4616
|
<xsl:template match="mn:fmt-stem" mode="update_xml_step1">
|
|
4604
|
-
<xsl:element name="stem" namespace="{$namespace_full}">
|
|
4617
|
+
<!-- <xsl:element name="stem" namespace="{$namespace_full}"> -->
|
|
4618
|
+
<xsl:copy>
|
|
4605
4619
|
<xsl:copy-of select="@*"/>
|
|
4606
4620
|
<xsl:choose>
|
|
4607
4621
|
<xsl:when test="mn:semx and count(node()) = 1">
|
|
@@ -4625,7 +4639,8 @@
|
|
|
4625
4639
|
</xsl:choose>
|
|
4626
4640
|
</xsl:otherwise>
|
|
4627
4641
|
</xsl:choose>
|
|
4628
|
-
</xsl:
|
|
4642
|
+
</xsl:copy>
|
|
4643
|
+
<!-- </xsl:element> -->
|
|
4629
4644
|
</xsl:template>
|
|
4630
4645
|
|
|
4631
4646
|
<xsl:template match="mn:image[not(.//mn:passthrough)] | mn:bibdata[not(.//mn:passthrough)] | mn:localized-strings" mode="update_xml_step1">
|
|
@@ -4787,12 +4802,14 @@
|
|
|
4787
4802
|
</xsl:template>
|
|
4788
4803
|
|
|
4789
4804
|
<xsl:template match="mn:fmt-title" mode="update_xml_step1">
|
|
4790
|
-
<xsl:element name="title" namespace="{$namespace_full}">
|
|
4805
|
+
<!-- <xsl:element name="title" namespace="{$namespace_full}"> -->
|
|
4806
|
+
<xsl:copy>
|
|
4791
4807
|
<xsl:copy-of select="@*"/>
|
|
4792
4808
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4793
4809
|
|
|
4794
4810
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4795
|
-
</xsl:
|
|
4811
|
+
</xsl:copy>
|
|
4812
|
+
<!-- </xsl:element> -->
|
|
4796
4813
|
</xsl:template>
|
|
4797
4814
|
|
|
4798
4815
|
<xsl:template name="addNamedDestinationAttribute">
|
|
@@ -4804,12 +4821,14 @@
|
|
|
4804
4821
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4805
4822
|
</xsl:when>
|
|
4806
4823
|
<xsl:otherwise>
|
|
4807
|
-
<xsl:element name="name" namespace="{$namespace_full}">
|
|
4824
|
+
<!-- <xsl:element name="name" namespace="{$namespace_full}"> -->
|
|
4825
|
+
<xsl:copy>
|
|
4808
4826
|
<xsl:copy-of select="@*"/>
|
|
4809
4827
|
<xsl:call-template name="addNamedDestinationAttribute"/>
|
|
4810
4828
|
|
|
4811
4829
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4812
|
-
</xsl:
|
|
4830
|
+
</xsl:copy>
|
|
4831
|
+
<!-- </xsl:element> -->
|
|
4813
4832
|
</xsl:otherwise>
|
|
4814
4833
|
</xsl:choose>
|
|
4815
4834
|
</xsl:template>
|
|
@@ -4824,7 +4843,7 @@
|
|
|
4824
4843
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4825
4844
|
</xsl:template>
|
|
4826
4845
|
<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}">
|
|
4846
|
+
<xsl:element name="fmt-preferred" namespace="{$namespace_full}">
|
|
4828
4847
|
<xsl:copy-of select="@*"/>
|
|
4829
4848
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4830
4849
|
</xsl:element>
|
|
@@ -4834,7 +4853,7 @@
|
|
|
4834
4853
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4835
4854
|
</xsl:template>
|
|
4836
4855
|
<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}">
|
|
4856
|
+
<xsl:element name="fmt-admitted" namespace="{$namespace_full}">
|
|
4838
4857
|
<xsl:copy-of select="@*"/>
|
|
4839
4858
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4840
4859
|
</xsl:element>
|
|
@@ -4844,32 +4863,32 @@
|
|
|
4844
4863
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4845
4864
|
</xsl:template>
|
|
4846
4865
|
<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}">
|
|
4866
|
+
<xsl:element name="fmt-deprecates" namespace="{$namespace_full}">
|
|
4848
4867
|
<xsl:copy-of select="@*"/>
|
|
4849
4868
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4850
4869
|
</xsl:element>
|
|
4851
4870
|
</xsl:template>
|
|
4852
4871
|
|
|
4853
|
-
<xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4872
|
+
<!-- <xsl:template match="mn:fmt-definition" mode="update_xml_step1">
|
|
4854
4873
|
<xsl:element name="definition" namespace="{$namespace_full}">
|
|
4855
4874
|
<xsl:copy-of select="@*"/>
|
|
4856
4875
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4857
4876
|
</xsl:element>
|
|
4858
4877
|
</xsl:template>
|
|
4859
|
-
|
|
4878
|
+
|
|
4860
4879
|
<xsl:template match="mn:fmt-termsource" mode="update_xml_step1">
|
|
4861
4880
|
<xsl:element name="termsource" namespace="{$namespace_full}">
|
|
4862
4881
|
<xsl:copy-of select="@*"/>
|
|
4863
4882
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4864
4883
|
</xsl:element>
|
|
4865
4884
|
</xsl:template>
|
|
4866
|
-
|
|
4885
|
+
|
|
4867
4886
|
<xsl:template match="mn:fmt-source" mode="update_xml_step1">
|
|
4868
4887
|
<xsl:element name="source" namespace="{$namespace_full}">
|
|
4869
4888
|
<xsl:copy-of select="@*"/>
|
|
4870
4889
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4871
4890
|
</xsl:element>
|
|
4872
|
-
</xsl:template>
|
|
4891
|
+
</xsl:template> -->
|
|
4873
4892
|
|
|
4874
4893
|
<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
4894
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -4892,12 +4911,12 @@
|
|
|
4892
4911
|
</xsl:template>
|
|
4893
4912
|
|
|
4894
4913
|
<xsl:template match="mn:identifier" mode="update_xml_step1"/>
|
|
4895
|
-
<xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4914
|
+
<!-- <xsl:template match="mn:fmt-identifier" mode="update_xml_step1">
|
|
4896
4915
|
<xsl:element name="identifier" namespace="{$namespace_full}">
|
|
4897
4916
|
<xsl:copy-of select="@*"/>
|
|
4898
4917
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4899
4918
|
</xsl:element>
|
|
4900
|
-
</xsl:template>
|
|
4919
|
+
</xsl:template> -->
|
|
4901
4920
|
|
|
4902
4921
|
<xsl:template match="mn:concept" mode="update_xml_step1"/>
|
|
4903
4922
|
|
|
@@ -4907,51 +4926,53 @@
|
|
|
4907
4926
|
|
|
4908
4927
|
<xsl:template match="mn:eref" mode="update_xml_step1"/>
|
|
4909
4928
|
|
|
4910
|
-
<xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4929
|
+
<!-- <xsl:template match="mn:fmt-eref" mode="update_xml_step1">
|
|
4911
4930
|
<xsl:element name="eref" namespace="{$namespace_full}">
|
|
4912
4931
|
<xsl:copy-of select="@*"/>
|
|
4913
4932
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4914
4933
|
</xsl:element>
|
|
4915
|
-
</xsl:template>
|
|
4934
|
+
</xsl:template> -->
|
|
4916
4935
|
|
|
4917
4936
|
<xsl:template match="mn:xref" mode="update_xml_step1"/>
|
|
4918
4937
|
|
|
4919
|
-
<xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4938
|
+
<!-- <xsl:template match="mn:fmt-xref" mode="update_xml_step1">
|
|
4920
4939
|
<xsl:element name="xref" namespace="{$namespace_full}">
|
|
4921
4940
|
<xsl:copy-of select="@*"/>
|
|
4922
4941
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4923
4942
|
</xsl:element>
|
|
4924
|
-
</xsl:template>
|
|
4943
|
+
</xsl:template> -->
|
|
4925
4944
|
|
|
4926
4945
|
<xsl:template match="mn:link" mode="update_xml_step1"/>
|
|
4927
4946
|
|
|
4928
|
-
<xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4947
|
+
<!-- <xsl:template match="mn:fmt-link" mode="update_xml_step1">
|
|
4929
4948
|
<xsl:element name="link" namespace="{$namespace_full}">
|
|
4930
4949
|
<xsl:copy-of select="@*"/>
|
|
4931
4950
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4932
4951
|
</xsl:element>
|
|
4933
|
-
</xsl:template>
|
|
4952
|
+
</xsl:template> -->
|
|
4934
4953
|
|
|
4935
4954
|
<xsl:template match="mn:origin" mode="update_xml_step1"/>
|
|
4936
4955
|
|
|
4937
|
-
<xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4956
|
+
<!-- <xsl:template match="mn:fmt-origin" mode="update_xml_step1">
|
|
4938
4957
|
<xsl:element name="origin" namespace="{$namespace_full}">
|
|
4939
4958
|
<xsl:copy-of select="@*"/>
|
|
4940
4959
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
4941
4960
|
</xsl:element>
|
|
4942
|
-
</xsl:template>
|
|
4961
|
+
</xsl:template> -->
|
|
4943
4962
|
|
|
4944
4963
|
<xsl:template match="mn:erefstack" mode="update_xml_step1"/>
|
|
4945
4964
|
|
|
4946
4965
|
<xsl:template match="mn:svgmap" mode="update_xml_step1"/>
|
|
4947
4966
|
|
|
4948
|
-
<xsl:template match="mn:
|
|
4967
|
+
<xsl:template match="mn:annotation-container" mode="update_xml_step1"/>
|
|
4949
4968
|
|
|
4950
|
-
|
|
4951
|
-
|
|
4952
|
-
|
|
4953
|
-
|
|
4954
|
-
|
|
4969
|
+
<xsl:template match="mn:fmt-identifier[not(ancestor::*[local-name() = 'bibdata'])]//text()" mode="update_xml_step1">
|
|
4970
|
+
<xsl:element name="{$element_name_keep-together_within-line}" namespace="{$namespace_full}">
|
|
4971
|
+
<xsl:value-of select="."/>
|
|
4972
|
+
</xsl:element>
|
|
4973
|
+
</xsl:template>
|
|
4974
|
+
|
|
4975
|
+
<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
|
|
4955
4976
|
|
|
4956
4977
|
<!-- END: update new Presentation XML -->
|
|
4957
4978
|
|
|
@@ -5147,7 +5168,7 @@
|
|
|
5147
5168
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
5148
5169
|
<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
5170
|
|
|
5150
|
-
<xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:link[not(contains(
|
|
5171
|
+
<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
5172
|
|
|
5152
5173
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
5153
5174
|
|
|
@@ -5266,7 +5287,7 @@
|
|
|
5266
5287
|
</xsl:if>
|
|
5267
5288
|
</xsl:template>
|
|
5268
5289
|
|
|
5269
|
-
<xsl:template match="mn:stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5290
|
+
<xsl:template match="mn:fmt-stem | mn:image" mode="update_xml_enclose_keep-together_within-line">
|
|
5270
5291
|
<xsl:copy-of select="."/>
|
|
5271
5292
|
</xsl:template>
|
|
5272
5293
|
|
|
@@ -5601,7 +5622,7 @@
|
|
|
5601
5622
|
</fo:block>
|
|
5602
5623
|
</xsl:template> <!-- copyright-statement -->
|
|
5603
5624
|
|
|
5604
|
-
<xsl:template match="mn:copyright-statement//mn:title">
|
|
5625
|
+
<xsl:template match="mn:copyright-statement//mn:fmt-title">
|
|
5605
5626
|
<!-- process in the template 'title' -->
|
|
5606
5627
|
<xsl:call-template name="title"/>
|
|
5607
5628
|
</xsl:template> <!-- copyright-statement//title -->
|
|
@@ -5617,7 +5638,7 @@
|
|
|
5617
5638
|
</fo:block>
|
|
5618
5639
|
</xsl:template> <!-- license-statement -->
|
|
5619
5640
|
|
|
5620
|
-
<xsl:template match="mn:license-statement//mn:title">
|
|
5641
|
+
<xsl:template match="mn:license-statement//mn:fmt-title">
|
|
5621
5642
|
<xsl:variable name="level">
|
|
5622
5643
|
<xsl:call-template name="getLevel"/>
|
|
5623
5644
|
</xsl:variable>
|
|
@@ -5642,7 +5663,7 @@
|
|
|
5642
5663
|
</fo:block>
|
|
5643
5664
|
</xsl:template> <!-- legal-statement -->
|
|
5644
5665
|
|
|
5645
|
-
<xsl:template match="mn:legal-statement//mn:title">
|
|
5666
|
+
<xsl:template match="mn:legal-statement//mn:fmt-title">
|
|
5646
5667
|
<!-- process in the template 'title' -->
|
|
5647
5668
|
<xsl:call-template name="title"/>
|
|
5648
5669
|
|
|
@@ -5662,7 +5683,7 @@
|
|
|
5662
5683
|
</fo:block>
|
|
5663
5684
|
</xsl:template> <!-- feedback-statement -->
|
|
5664
5685
|
|
|
5665
|
-
<xsl:template match="mn:feedback-statement//mn:title">
|
|
5686
|
+
<xsl:template match="mn:feedback-statement//mn:fmt-title">
|
|
5666
5687
|
<!-- process in the template 'title' -->
|
|
5667
5688
|
<xsl:call-template name="title"/>
|
|
5668
5689
|
</xsl:template>
|
|
@@ -5687,7 +5708,7 @@
|
|
|
5687
5708
|
<xsl:template name="refine_link-style">
|
|
5688
5709
|
</xsl:template> <!-- refine_link-style -->
|
|
5689
5710
|
|
|
5690
|
-
<xsl:template match="mn:link" name="link">
|
|
5711
|
+
<xsl:template match="mn:fmt-link" name="link">
|
|
5691
5712
|
<xsl:variable name="target_normalized" select="translate(@target, '\', '/')"/>
|
|
5692
5713
|
<xsl:variable name="target_attachment_name" select="substring-after($target_normalized, '_attachments/')"/>
|
|
5693
5714
|
<xsl:variable name="isLinkToEmbeddedFile" select="normalize-space(@attachment = 'true' and $pdfAttachmentsList//attachment[@filename = current()/@target])"/>
|
|
@@ -5905,7 +5926,7 @@
|
|
|
5905
5926
|
<xsl:value-of select="."/>
|
|
5906
5927
|
</xsl:attribute>
|
|
5907
5928
|
</xsl:for-each>
|
|
5908
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
5929
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
5909
5930
|
</xsl:when>
|
|
5910
5931
|
|
|
5911
5932
|
<xsl:otherwise>
|
|
@@ -5947,11 +5968,11 @@
|
|
|
5947
5968
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5948
5969
|
</xsl:if>
|
|
5949
5970
|
|
|
5950
|
-
<xsl:apply-templates select="node()[not(self::mn:name or self::mn:dl)]"/>
|
|
5971
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name or self::mn:dl)]"/>
|
|
5951
5972
|
</fo:block>
|
|
5952
5973
|
|
|
5953
5974
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
5954
|
-
<xsl:apply-templates select="mn:name"/> <!-- show sourcecode's name AFTER content -->
|
|
5975
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
5955
5976
|
|
|
5956
5977
|
</fo:block-container>
|
|
5957
5978
|
</fo:block-container>
|
|
@@ -6252,7 +6273,7 @@
|
|
|
6252
6273
|
|
|
6253
6274
|
<!-- end mode="syntax_highlight" -->
|
|
6254
6275
|
|
|
6255
|
-
<xsl:template match="mn:sourcecode/mn:name">
|
|
6276
|
+
<xsl:template match="mn:sourcecode/mn:fmt-name">
|
|
6256
6277
|
<xsl:if test="normalize-space() != ''">
|
|
6257
6278
|
<fo:block xsl:use-attribute-sets="sourcecode-name-style">
|
|
6258
6279
|
<xsl:apply-templates/>
|
|
@@ -6270,7 +6291,7 @@
|
|
|
6270
6291
|
</xsl:choose>
|
|
6271
6292
|
</xsl:template>
|
|
6272
6293
|
|
|
6273
|
-
<xsl:template match="mn:annotation">
|
|
6294
|
+
<xsl:template match="mn:callout-annotation">
|
|
6274
6295
|
<xsl:variable name="annotation-id" select="@id"/>
|
|
6275
6296
|
<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
|
|
6276
6297
|
<fo:block id="{$annotation-id}" white-space="nowrap">
|
|
@@ -6282,7 +6303,7 @@
|
|
|
6282
6303
|
</fo:block>
|
|
6283
6304
|
</xsl:template>
|
|
6284
6305
|
|
|
6285
|
-
<xsl:template match="mn:annotation/mn:p">
|
|
6306
|
+
<xsl:template match="mn:callout-annotation/mn:p">
|
|
6286
6307
|
<xsl:param name="callout"/>
|
|
6287
6308
|
<fo:inline id="{@id}">
|
|
6288
6309
|
<xsl:call-template name="setNamedDestination"/>
|
|
@@ -6432,7 +6453,7 @@
|
|
|
6432
6453
|
<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
6454
|
<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
|
|
6434
6455
|
<xsl:choose>
|
|
6435
|
-
<xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (
|
|
6456
|
+
<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
6457
|
<xsl:otherwise>
|
|
6437
6458
|
<xsl:variable name="tag">
|
|
6438
6459
|
<xsl:call-template name="insertTag">
|
|
@@ -6833,12 +6854,12 @@
|
|
|
6833
6854
|
<xsl:template match="mn:permission">
|
|
6834
6855
|
<xsl:call-template name="setNamedDestination"/>
|
|
6835
6856
|
<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)]"/>
|
|
6857
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6858
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6838
6859
|
</fo:block>
|
|
6839
6860
|
</xsl:template>
|
|
6840
6861
|
|
|
6841
|
-
<xsl:template match="mn:permission/mn:name">
|
|
6862
|
+
<xsl:template match="mn:permission/mn:fmt-name">
|
|
6842
6863
|
<xsl:if test="normalize-space() != ''">
|
|
6843
6864
|
<fo:block xsl:use-attribute-sets="permission-name-style">
|
|
6844
6865
|
<xsl:apply-templates/>
|
|
@@ -6860,15 +6881,15 @@
|
|
|
6860
6881
|
<xsl:template match="mn:requirement">
|
|
6861
6882
|
<xsl:call-template name="setNamedDestination"/>
|
|
6862
6883
|
<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
|
|
6863
|
-
<xsl:apply-templates select="mn:name"/>
|
|
6884
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6864
6885
|
<xsl:apply-templates select="mn:label"/>
|
|
6865
6886
|
<xsl:apply-templates select="@obligation"/>
|
|
6866
6887
|
<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)]"/>
|
|
6888
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:label) and not(self::mn:subject)]"/>
|
|
6868
6889
|
</fo:block>
|
|
6869
6890
|
</xsl:template>
|
|
6870
6891
|
|
|
6871
|
-
<xsl:template match="mn:requirement/mn:name">
|
|
6892
|
+
<xsl:template match="mn:requirement/mn:fmt-name">
|
|
6872
6893
|
<xsl:if test="normalize-space() != ''">
|
|
6873
6894
|
|
|
6874
6895
|
<fo:block xsl:use-attribute-sets="requirement-name-style">
|
|
@@ -6904,12 +6925,12 @@
|
|
|
6904
6925
|
<xsl:template match="mn:recommendation">
|
|
6905
6926
|
<xsl:call-template name="setNamedDestination"/>
|
|
6906
6927
|
<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)]"/>
|
|
6928
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
6929
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
6909
6930
|
</fo:block>
|
|
6910
6931
|
</xsl:template>
|
|
6911
6932
|
|
|
6912
|
-
<xsl:template match="mn:recommendation/mn:name">
|
|
6933
|
+
<xsl:template match="mn:recommendation/mn:fmt-name">
|
|
6913
6934
|
<xsl:if test="normalize-space() != ''">
|
|
6914
6935
|
|
|
6915
6936
|
<fo:block xsl:use-attribute-sets="recommendation-name-style">
|
|
@@ -7158,11 +7179,11 @@
|
|
|
7158
7179
|
|
|
7159
7180
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
|
|
7160
7181
|
</xsl:if>
|
|
7161
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7182
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7162
7183
|
</fo:block>
|
|
7163
7184
|
</xsl:template>
|
|
7164
7185
|
|
|
7165
|
-
<xsl:template match="mn:term/mn:name">
|
|
7186
|
+
<xsl:template match="mn:term/mn:fmt-name">
|
|
7166
7187
|
<xsl:if test="normalize-space() != ''">
|
|
7167
7188
|
<!-- <xsl:variable name="level">
|
|
7168
7189
|
<xsl:call-template name="getLevelTermName"/>
|
|
@@ -7181,7 +7202,7 @@
|
|
|
7181
7202
|
<!-- origin -->
|
|
7182
7203
|
<!-- modification -->
|
|
7183
7204
|
<!-- ====== -->
|
|
7184
|
-
<xsl:template match="mn:termsource" name="termsource">
|
|
7205
|
+
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
7185
7206
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
7186
7207
|
|
|
7187
7208
|
<xsl:call-template name="refine_termsource-style"/>
|
|
@@ -7220,24 +7241,24 @@
|
|
|
7220
7241
|
</fo:block>
|
|
7221
7242
|
</xsl:template>
|
|
7222
7243
|
|
|
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">
|
|
7244
|
+
<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
7245
|
<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
|
|
7225
7246
|
</xsl:template>
|
|
7226
7247
|
|
|
7227
|
-
<xsl:template match="mn:termsource/text()">
|
|
7248
|
+
<xsl:template match="mn:fmt-termsource/text()">
|
|
7228
7249
|
<xsl:if test="normalize-space() != ''">
|
|
7229
7250
|
<xsl:value-of select="."/>
|
|
7230
7251
|
</xsl:if>
|
|
7231
7252
|
</xsl:template>
|
|
7232
7253
|
|
|
7233
7254
|
<!-- text SOURCE: -->
|
|
7234
|
-
<xsl:template match="mn:termsource/mn:strong[1][following-sibling::*[1][self::mn:origin]]/text()">
|
|
7255
|
+
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
7235
7256
|
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
7236
7257
|
<xsl:value-of select="."/>
|
|
7237
7258
|
</fo:inline>
|
|
7238
7259
|
</xsl:template>
|
|
7239
7260
|
|
|
7240
|
-
<xsl:template match="mn:origin">
|
|
7261
|
+
<xsl:template match="mn:fmt-origin">
|
|
7241
7262
|
<xsl:call-template name="insert_basic_link">
|
|
7242
7263
|
<xsl:with-param name="element">
|
|
7243
7264
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -7283,7 +7304,7 @@
|
|
|
7283
7304
|
<!-- ====== -->
|
|
7284
7305
|
|
|
7285
7306
|
<!-- Preferred, admitted, deprecated -->
|
|
7286
|
-
<xsl:template match="mn:preferred">
|
|
7307
|
+
<xsl:template match="mn:fmt-preferred">
|
|
7287
7308
|
<xsl:variable name="level">
|
|
7288
7309
|
<xsl:call-template name="getLevel"/>
|
|
7289
7310
|
</xsl:variable>
|
|
@@ -7294,15 +7315,15 @@
|
|
|
7294
7315
|
</xsl:variable>
|
|
7295
7316
|
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
7296
7317
|
|
|
7297
|
-
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7318
|
+
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
7298
7319
|
|
|
7299
7320
|
<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
|
|
7300
7321
|
|
|
7301
|
-
<xsl:for-each select="ancestor::mn:term[1]/mn:name"><!-- change context -->
|
|
7322
|
+
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
7302
7323
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7303
7324
|
</xsl:for-each>
|
|
7304
7325
|
|
|
7305
|
-
<xsl:apply-templates select="ancestor::mn:term[1]/mn:name"/>
|
|
7326
|
+
<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
|
|
7306
7327
|
</fo:block>
|
|
7307
7328
|
</xsl:if>
|
|
7308
7329
|
|
|
@@ -7326,13 +7347,13 @@
|
|
|
7326
7347
|
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
|
7327
7348
|
<xsl:template match="mn:domain"/>
|
|
7328
7349
|
|
|
7329
|
-
<xsl:template match="mn:admitted">
|
|
7350
|
+
<xsl:template match="mn:fmt-admitted">
|
|
7330
7351
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
7331
7352
|
<xsl:apply-templates/>
|
|
7332
7353
|
</fo:block>
|
|
7333
7354
|
</xsl:template>
|
|
7334
7355
|
|
|
7335
|
-
<xsl:template match="mn:deprecates">
|
|
7356
|
+
<xsl:template match="mn:fmt-deprecates">
|
|
7336
7357
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
7337
7358
|
<xsl:apply-templates/>
|
|
7338
7359
|
</fo:block>
|
|
@@ -7346,7 +7367,7 @@
|
|
|
7346
7367
|
|
|
7347
7368
|
<!-- 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
7369
|
<!-- in metanorma xml preferred terms delimited by semicolons -->
|
|
7349
|
-
<xsl:template match="mn:preferred/text()[contains(., ';')] | mn:preferred/mn:strong/text()[contains(., ';')]">
|
|
7370
|
+
<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
|
|
7350
7371
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
|
7351
7372
|
</xsl:template>
|
|
7352
7373
|
<!-- End Preferred, admitted, deprecated -->
|
|
@@ -7365,16 +7386,16 @@
|
|
|
7365
7386
|
<!-- ========== -->
|
|
7366
7387
|
<!-- definition -->
|
|
7367
7388
|
<!-- ========== -->
|
|
7368
|
-
<xsl:template match="mn:definition">
|
|
7389
|
+
<xsl:template match="mn:fmt-definition">
|
|
7369
7390
|
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
7370
7391
|
<xsl:apply-templates/>
|
|
7371
7392
|
</fo:block>
|
|
7372
7393
|
</xsl:template>
|
|
7373
7394
|
|
|
7374
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]">
|
|
7395
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]">
|
|
7375
7396
|
<xsl:apply-templates/>
|
|
7376
7397
|
</xsl:template>
|
|
7377
|
-
<xsl:template match="mn:definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7398
|
+
<xsl:template match="mn:fmt-definition[preceding-sibling::mn:domain]/mn:p[1]">
|
|
7378
7399
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
|
7379
7400
|
<fo:block/>
|
|
7380
7401
|
</xsl:template>
|
|
@@ -7436,12 +7457,12 @@
|
|
|
7436
7457
|
<xsl:call-template name="refine_termexample-style"/>
|
|
7437
7458
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
7438
7459
|
|
|
7439
|
-
<xsl:apply-templates select="mn:name"/>
|
|
7440
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
7460
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
7461
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
7441
7462
|
</fo:block>
|
|
7442
7463
|
</xsl:template>
|
|
7443
7464
|
|
|
7444
|
-
<xsl:template match="mn:termexample/mn:name">
|
|
7465
|
+
<xsl:template match="mn:termexample/mn:fmt-name">
|
|
7445
7466
|
<xsl:if test="normalize-space() != ''">
|
|
7446
7467
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
|
7447
7468
|
<xsl:call-template name="refine_termexample-name-style"/>
|
|
@@ -7492,7 +7513,7 @@
|
|
|
7492
7513
|
<xsl:call-template name="refine_example-style"/>
|
|
7493
7514
|
|
|
7494
7515
|
<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
|
|
7516
|
+
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>block
|
|
7496
7517
|
</xsl:variable>
|
|
7497
7518
|
|
|
7498
7519
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
@@ -7503,7 +7524,7 @@
|
|
|
7503
7524
|
|
|
7504
7525
|
<!-- display name 'EXAMPLE' in a separate block -->
|
|
7505
7526
|
<fo:block>
|
|
7506
|
-
<xsl:apply-templates select="mn:name">
|
|
7527
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7507
7528
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7508
7529
|
</xsl:apply-templates>
|
|
7509
7530
|
</fo:block>
|
|
@@ -7511,7 +7532,7 @@
|
|
|
7511
7532
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7512
7533
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7513
7534
|
<xsl:variable name="example_body">
|
|
7514
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7535
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7515
7536
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7516
7537
|
</xsl:apply-templates>
|
|
7517
7538
|
</xsl:variable>
|
|
@@ -7538,14 +7559,14 @@
|
|
|
7538
7559
|
<fo:list-item>
|
|
7539
7560
|
<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
|
|
7540
7561
|
<fo:block>
|
|
7541
|
-
<xsl:apply-templates select="mn:name">
|
|
7562
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7542
7563
|
<xsl:with-param name="fo_element">block</xsl:with-param>
|
|
7543
7564
|
</xsl:apply-templates>
|
|
7544
7565
|
</fo:block>
|
|
7545
7566
|
</fo:list-item-label>
|
|
7546
7567
|
<fo:list-item-body start-indent="body-start()">
|
|
7547
7568
|
<fo:block>
|
|
7548
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]">
|
|
7569
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
|
|
7549
7570
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7550
7571
|
</xsl:apply-templates>
|
|
7551
7572
|
</fo:block>
|
|
@@ -7558,21 +7579,21 @@
|
|
|
7558
7579
|
|
|
7559
7580
|
<!-- display 'EXAMPLE' and first element in the same line -->
|
|
7560
7581
|
<fo:block>
|
|
7561
|
-
<xsl:apply-templates select="mn:name">
|
|
7582
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
7562
7583
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7563
7584
|
</xsl:apply-templates>
|
|
7564
7585
|
<fo:inline>
|
|
7565
|
-
<xsl:apply-templates select="*[not(self::mn:name)][1]">
|
|
7586
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][1]">
|
|
7566
7587
|
<xsl:with-param name="fo_element" select="$fo_element"/>
|
|
7567
7588
|
</xsl:apply-templates>
|
|
7568
7589
|
</fo:inline>
|
|
7569
7590
|
</fo:block>
|
|
7570
7591
|
|
|
7571
|
-
<xsl:if test="*[not(self::mn:name)][position() > 1]">
|
|
7592
|
+
<xsl:if test="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7572
7593
|
<!-- display further elements in blocks -->
|
|
7573
7594
|
<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
|
|
7574
7595
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
7575
|
-
<xsl:apply-templates select="*[not(self::mn:name)][position() > 1]">
|
|
7596
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() > 1]">
|
|
7576
7597
|
<xsl:with-param name="fo_element" select="'block'"/>
|
|
7577
7598
|
</xsl:apply-templates>
|
|
7578
7599
|
</fo:block-container>
|
|
@@ -7586,7 +7607,7 @@
|
|
|
7586
7607
|
</xsl:template>
|
|
7587
7608
|
|
|
7588
7609
|
<!-- example/name -->
|
|
7589
|
-
<xsl:template match="mn:example/mn:name">
|
|
7610
|
+
<xsl:template match="mn:example/mn:fmt-name">
|
|
7590
7611
|
<xsl:param name="fo_element">block</xsl:param>
|
|
7591
7612
|
|
|
7592
7613
|
<xsl:choose>
|
|
@@ -7611,7 +7632,7 @@
|
|
|
7611
7632
|
</xsl:template>
|
|
7612
7633
|
|
|
7613
7634
|
<!-- 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">
|
|
7635
|
+
<xsl:template match="mn:table/mn:example/mn:fmt-name | mn:table/mn:tfoot//mn:example/mn:fmt-name">
|
|
7615
7636
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
7616
7637
|
<xsl:apply-templates/>
|
|
7617
7638
|
</fo:inline>
|
|
@@ -7692,7 +7713,7 @@
|
|
|
7692
7713
|
|
|
7693
7714
|
<xsl:template name="refine_table-style">
|
|
7694
7715
|
<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)">
|
|
7716
|
+
<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
7717
|
<xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
|
|
7697
7718
|
<xsl:attribute name="border-bottom">0.5pt solid black</xsl:attribute>
|
|
7698
7719
|
</xsl:if>
|
|
@@ -7759,7 +7780,7 @@
|
|
|
7759
7780
|
</xsl:attribute-set> <!-- table-header-cell-style -->
|
|
7760
7781
|
|
|
7761
7782
|
<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 -->
|
|
7783
|
+
<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
7784
|
<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
|
|
7764
7785
|
<xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
|
|
7765
7786
|
</xsl:if>
|
|
@@ -7928,7 +7949,7 @@
|
|
|
7928
7949
|
|
|
7929
7950
|
<!-- Display table's name before table as standalone block -->
|
|
7930
7951
|
<!-- $namespace = 'iso' or -->
|
|
7931
|
-
<xsl:apply-templates select="mn:name"/> <!-- table's title rendered before table -->
|
|
7952
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
|
|
7932
7953
|
<xsl:call-template name="table_name_fn_display"/>
|
|
7933
7954
|
|
|
7934
7955
|
<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
|
|
@@ -7970,7 +7991,7 @@
|
|
|
7970
7991
|
|
|
7971
7992
|
<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
|
|
7972
7993
|
|
|
7973
|
-
<xsl:for-each select="mn:name">
|
|
7994
|
+
<xsl:for-each select="mn:fmt-name">
|
|
7974
7995
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
7975
7996
|
</xsl:for-each>
|
|
7976
7997
|
|
|
@@ -8006,6 +8027,10 @@
|
|
|
8006
8027
|
<xsl:with-param name="margin-side" select="$margin-side"/>
|
|
8007
8028
|
</xsl:call-template>
|
|
8008
8029
|
|
|
8030
|
+
<xsl:call-template name="setTableStyles">
|
|
8031
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8032
|
+
</xsl:call-template>
|
|
8033
|
+
|
|
8009
8034
|
</xsl:element>
|
|
8010
8035
|
</xsl:variable>
|
|
8011
8036
|
|
|
@@ -8026,7 +8051,7 @@
|
|
|
8026
8051
|
</xsl:attribute>
|
|
8027
8052
|
</xsl:for-each>
|
|
8028
8053
|
|
|
8029
|
-
<xsl:variable name="isNoteOrFnExist" select="./mn:note[not(@type = 'units')] or ./mn:example or .//mn:fn[
|
|
8054
|
+
<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
8055
|
<xsl:if test="$isNoteOrFnExist = 'true'">
|
|
8031
8056
|
<!-- <xsl:choose>
|
|
8032
8057
|
<xsl:when test="$namespace = 'plateau'"></xsl:when>
|
|
@@ -8082,7 +8107,7 @@
|
|
|
8082
8107
|
<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
|
|
8083
8108
|
</xsl:when>
|
|
8084
8109
|
<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 -->
|
|
8110
|
+
<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
8111
|
</xsl:otherwise>
|
|
8087
8112
|
</xsl:choose>
|
|
8088
8113
|
|
|
@@ -8176,7 +8201,7 @@
|
|
|
8176
8201
|
</xsl:template>
|
|
8177
8202
|
|
|
8178
8203
|
<!-- table/name-->
|
|
8179
|
-
<xsl:template match="*[local-name()='table']/mn:name">
|
|
8204
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-name">
|
|
8180
8205
|
<xsl:param name="continued"/>
|
|
8181
8206
|
<xsl:param name="cols-count"/>
|
|
8182
8207
|
<xsl:if test="normalize-space() != ''">
|
|
@@ -8228,7 +8253,7 @@
|
|
|
8228
8253
|
</xsl:template>
|
|
8229
8254
|
|
|
8230
8255
|
<!-- SOURCE: ... -->
|
|
8231
|
-
<xsl:template match="*[local-name()='table']/mn:source" priority="2">
|
|
8256
|
+
<xsl:template match="*[local-name()='table']/mn:fmt-source" priority="2">
|
|
8232
8257
|
<xsl:call-template name="termsource"/>
|
|
8233
8258
|
</xsl:template>
|
|
8234
8259
|
|
|
@@ -8393,11 +8418,11 @@
|
|
|
8393
8418
|
<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
|
|
8394
8419
|
</xsl:template>
|
|
8395
8420
|
|
|
8396
|
-
<xsl:template match="mn:termsource" mode="td_text">
|
|
8397
|
-
<xsl:value-of select="
|
|
8421
|
+
<xsl:template match="mn:fmt-termsource" mode="td_text">
|
|
8422
|
+
<xsl:value-of select="mn:fmt-origin/@citeas"/>
|
|
8398
8423
|
</xsl:template>
|
|
8399
8424
|
|
|
8400
|
-
<xsl:template match="mn:link" mode="td_text">
|
|
8425
|
+
<xsl:template match="mn:fmt-link" mode="td_text">
|
|
8401
8426
|
<xsl:value-of select="@target"/>
|
|
8402
8427
|
</xsl:template>
|
|
8403
8428
|
|
|
@@ -8599,12 +8624,12 @@
|
|
|
8599
8624
|
|
|
8600
8625
|
<xsl:call-template name="refine_table-header-title-style"/>
|
|
8601
8626
|
|
|
8602
|
-
<xsl:apply-templates select="ancestor::mn:table/mn:name">
|
|
8627
|
+
<xsl:apply-templates select="ancestor::mn:table/mn:fmt-name">
|
|
8603
8628
|
<xsl:with-param name="continued">true</xsl:with-param>
|
|
8604
8629
|
<xsl:with-param name="cols-count" select="$cols-count"/>
|
|
8605
8630
|
</xsl:apply-templates>
|
|
8606
8631
|
|
|
8607
|
-
<xsl:if test="not(ancestor::mn:table/mn:name)"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
8632
|
+
<xsl:if test="not(ancestor::mn:table/mn:fmt-name)"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
|
|
8608
8633
|
<fo:block role="SKIP"/>
|
|
8609
8634
|
</xsl:if>
|
|
8610
8635
|
|
|
@@ -8639,7 +8664,7 @@
|
|
|
8639
8664
|
<xsl:param name="colwidths"/>
|
|
8640
8665
|
<xsl:param name="colgroup"/>
|
|
8641
8666
|
|
|
8642
|
-
<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ..//mn:fn[
|
|
8667
|
+
<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
8668
|
|
|
8644
8669
|
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
|
8645
8670
|
</xsl:variable>
|
|
@@ -8680,6 +8705,12 @@
|
|
|
8680
8705
|
</xsl:choose>
|
|
8681
8706
|
</xsl:for-each>
|
|
8682
8707
|
|
|
8708
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8709
|
+
<xsl:call-template name="setTableStyles">
|
|
8710
|
+
<xsl:with-param name="scope">table</xsl:with-param>
|
|
8711
|
+
</xsl:call-template>
|
|
8712
|
+
</xsl:for-each>
|
|
8713
|
+
|
|
8683
8714
|
<xsl:choose>
|
|
8684
8715
|
<xsl:when test="xalan:nodeset($colgroup)//mn:col">
|
|
8685
8716
|
<xsl:for-each select="xalan:nodeset($colgroup)//mn:col">
|
|
@@ -8696,10 +8727,22 @@
|
|
|
8696
8727
|
|
|
8697
8728
|
<fo:table-body role="SKIP">
|
|
8698
8729
|
<fo:table-row role="SKIP">
|
|
8730
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8731
|
+
<xsl:call-template name="setTableStyles">
|
|
8732
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8733
|
+
</xsl:call-template>
|
|
8734
|
+
</xsl:for-each>
|
|
8735
|
+
|
|
8699
8736
|
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
|
|
8700
8737
|
|
|
8701
8738
|
<xsl:call-template name="refine_table-footer-cell-style"/>
|
|
8702
8739
|
|
|
8740
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8741
|
+
<xsl:call-template name="setTableStyles">
|
|
8742
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
8743
|
+
</xsl:call-template>
|
|
8744
|
+
</xsl:for-each>
|
|
8745
|
+
|
|
8703
8746
|
<xsl:call-template name="setBordersTableArray"/>
|
|
8704
8747
|
|
|
8705
8748
|
<!-- fn will be processed inside 'note' processing -->
|
|
@@ -8716,7 +8759,7 @@
|
|
|
8716
8759
|
<xsl:apply-templates select="../mn:dl"/>
|
|
8717
8760
|
<xsl:apply-templates select="../mn:note[not(@type = 'units')]"/>
|
|
8718
8761
|
<xsl:apply-templates select="../mn:example"/>
|
|
8719
|
-
<xsl:apply-templates select="../mn:source"/>
|
|
8762
|
+
<xsl:apply-templates select="../mn:fmt-source"/>
|
|
8720
8763
|
|
|
8721
8764
|
<xsl:variable name="isDisplayRowSeparator">
|
|
8722
8765
|
</xsl:variable>
|
|
@@ -8911,7 +8954,12 @@
|
|
|
8911
8954
|
<xsl:attribute name="min-height">5mm</xsl:attribute>
|
|
8912
8955
|
</xsl:if>
|
|
8913
8956
|
|
|
8914
|
-
<xsl:
|
|
8957
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
8958
|
+
<xsl:call-template name="setTableStyles">
|
|
8959
|
+
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
8960
|
+
</xsl:call-template>
|
|
8961
|
+
</xsl:for-each>
|
|
8962
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8915
8963
|
|
|
8916
8964
|
</xsl:template> <!-- setTableRowAttributes -->
|
|
8917
8965
|
<!-- ===================== -->
|
|
@@ -8964,7 +9012,13 @@
|
|
|
8964
9012
|
</xsl:attribute>
|
|
8965
9013
|
</xsl:if>
|
|
8966
9014
|
<xsl:call-template name="display-align"/>
|
|
8967
|
-
|
|
9015
|
+
|
|
9016
|
+
<xsl:for-each select="ancestor::mn:table[1]">
|
|
9017
|
+
<xsl:call-template name="setTableStyles">
|
|
9018
|
+
<xsl:with-param name="scope">ancestor_table_borders_only</xsl:with-param>
|
|
9019
|
+
</xsl:call-template>
|
|
9020
|
+
</xsl:for-each>
|
|
9021
|
+
<xsl:call-template name="setTableStyles"/>
|
|
8968
9022
|
</xsl:template>
|
|
8969
9023
|
|
|
8970
9024
|
<xsl:template name="display-align">
|
|
@@ -8980,7 +9034,8 @@
|
|
|
8980
9034
|
</xsl:if>
|
|
8981
9035
|
</xsl:template>
|
|
8982
9036
|
|
|
8983
|
-
<xsl:template name="
|
|
9037
|
+
<xsl:template name="setTableStyles">
|
|
9038
|
+
<xsl:param name="scope">cell</xsl:param>
|
|
8984
9039
|
<xsl:variable name="styles__">
|
|
8985
9040
|
<xsl:call-template name="split">
|
|
8986
9041
|
<xsl:with-param name="pText" select="concat(@style,';')"/>
|
|
@@ -8989,19 +9044,35 @@
|
|
|
8989
9044
|
</xsl:variable>
|
|
8990
9045
|
<xsl:variable name="quot">"</xsl:variable>
|
|
8991
9046
|
<xsl:variable name="styles_">
|
|
9047
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
|
9048
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
|
9049
|
+
<style name="border-top">none</style>
|
|
9050
|
+
<style name="border-right">none</style>
|
|
9051
|
+
<style name="border-left">none</style>
|
|
9052
|
+
<style name="border-bottom">none</style>
|
|
9053
|
+
<style name="color">inherit</style>
|
|
9054
|
+
<style name="background-color">transparent</style>
|
|
9055
|
+
</xsl:if>
|
|
9056
|
+
|
|
8992
9057
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
8993
9058
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
8994
9059
|
<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'">
|
|
9060
|
+
<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
9061
|
<style name="{$key}"><xsl:value-of select="java:replaceAll(java:java.lang.String.new($value), 'currentColor', 'inherit')"/></style>
|
|
8997
9062
|
</xsl:if>
|
|
9063
|
+
<xsl:if test="$key = 'border' and ($scope = 'table' or $scope = 'ancestor_table' or $scope = 'ancestor_table_borders_only')">
|
|
9064
|
+
<style name="{$key}-top"><xsl:value-of select="$value"/></style>
|
|
9065
|
+
<style name="{$key}-right"><xsl:value-of select="$value"/></style>
|
|
9066
|
+
<style name="{$key}-left"><xsl:value-of select="$value"/></style>
|
|
9067
|
+
<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
|
|
9068
|
+
</xsl:if>
|
|
8998
9069
|
</xsl:for-each>
|
|
8999
9070
|
</xsl:variable>
|
|
9000
9071
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
9001
9072
|
<xsl:for-each select="$styles/style">
|
|
9002
9073
|
<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
|
|
9003
9074
|
</xsl:for-each>
|
|
9004
|
-
</xsl:template> <!--
|
|
9075
|
+
</xsl:template> <!-- setTableStyles -->
|
|
9005
9076
|
|
|
9006
9077
|
<!-- cell in table body, footer -->
|
|
9007
9078
|
<xsl:template match="*[local-name()='td']" name="td">
|
|
@@ -9073,14 +9144,14 @@
|
|
|
9073
9144
|
|
|
9074
9145
|
<xsl:call-template name="refine_table-note-name-style"/>
|
|
9075
9146
|
|
|
9076
|
-
<xsl:apply-templates select="mn:name"/>
|
|
9147
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
9077
9148
|
|
|
9078
9149
|
</fo:inline>
|
|
9079
9150
|
<xsl:if test="ancestor::mn:preface">
|
|
9080
9151
|
<fo:block> </fo:block>
|
|
9081
9152
|
</xsl:if>
|
|
9082
9153
|
|
|
9083
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
9154
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
9084
9155
|
</fo:block>
|
|
9085
9156
|
</xsl:template> <!-- table/note -->
|
|
9086
9157
|
|
|
@@ -9220,7 +9291,7 @@
|
|
|
9220
9291
|
|
|
9221
9292
|
<!-- footnotes for table's name rendering -->
|
|
9222
9293
|
<xsl:template name="table_name_fn_display">
|
|
9223
|
-
<xsl:for-each select="mn:name//mn:fn">
|
|
9294
|
+
<xsl:for-each select="mn:fmt-name//mn:fn">
|
|
9224
9295
|
<xsl:variable name="reference" select="@reference"/>
|
|
9225
9296
|
<fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
|
|
9226
9297
|
<fo:block margin-bottom="12pt">
|
|
@@ -9880,7 +9951,7 @@
|
|
|
9880
9951
|
</xsl:if> -->
|
|
9881
9952
|
|
|
9882
9953
|
<xsl:variable name="words">
|
|
9883
|
-
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
|
|
9954
|
+
<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'fmt-stem']">
|
|
9884
9955
|
<word>
|
|
9885
9956
|
<xsl:copy-of select="."/>
|
|
9886
9957
|
</word>
|
|
@@ -9939,7 +10010,7 @@
|
|
|
9939
10010
|
</xsl:copy>
|
|
9940
10011
|
</xsl:template>
|
|
9941
10012
|
|
|
9942
|
-
<xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
10013
|
+
<xsl:template match="*[local-name() = 'fmt-stem' or local-name() = 'image']" mode="td_text_with_formatting"/>
|
|
9943
10014
|
|
|
9944
10015
|
<xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting">
|
|
9945
10016
|
<xsl:variable name="formatting_tags">
|
|
@@ -9974,7 +10045,7 @@
|
|
|
9974
10045
|
</xsl:call-template>
|
|
9975
10046
|
</xsl:template>
|
|
9976
10047
|
|
|
9977
|
-
<xsl:template match="mn:link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
10048
|
+
<xsl:template match="mn:fmt-link[normalize-space() = '']" mode="td_text_with_formatting">
|
|
9978
10049
|
<xsl:variable name="link">
|
|
9979
10050
|
<link_updated>
|
|
9980
10051
|
<xsl:variable name="target_text">
|
|
@@ -10191,7 +10262,7 @@
|
|
|
10191
10262
|
|
|
10192
10263
|
<xsl:call-template name="refine_multicomponent_block_style"/>
|
|
10193
10264
|
|
|
10194
|
-
<xsl:apply-templates select="mn:name">
|
|
10265
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
10195
10266
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
10196
10267
|
</xsl:apply-templates>
|
|
10197
10268
|
|
|
@@ -10374,7 +10445,7 @@
|
|
|
10374
10445
|
</xsl:template> <!-- refine_multicomponent_block_style -->
|
|
10375
10446
|
|
|
10376
10447
|
<!-- dl/name -->
|
|
10377
|
-
<xsl:template match="mn:dl/mn:name">
|
|
10448
|
+
<xsl:template match="mn:dl/mn:fmt-name">
|
|
10378
10449
|
<xsl:param name="process">false</xsl:param>
|
|
10379
10450
|
<xsl:if test="$process = 'true'">
|
|
10380
10451
|
<fo:block xsl:use-attribute-sets="dl-name-style">
|
|
@@ -10785,12 +10856,12 @@
|
|
|
10785
10856
|
<xsl:template match="mn:appendix">
|
|
10786
10857
|
<xsl:call-template name="setNamedDestination"/>
|
|
10787
10858
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
|
|
10788
|
-
<xsl:apply-templates select="mn:title"/>
|
|
10859
|
+
<xsl:apply-templates select="mn:fmt-title"/>
|
|
10789
10860
|
</fo:block>
|
|
10790
|
-
<xsl:apply-templates select="node()[not(
|
|
10861
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
|
|
10791
10862
|
</xsl:template>
|
|
10792
10863
|
|
|
10793
|
-
<xsl:template match="mn:appendix/mn:title" priority="2">
|
|
10864
|
+
<xsl:template match="mn:appendix/mn:fmt-title" priority="2">
|
|
10794
10865
|
<xsl:variable name="level">
|
|
10795
10866
|
<xsl:call-template name="getLevel"/>
|
|
10796
10867
|
</xsl:variable>
|
|
@@ -10803,15 +10874,15 @@
|
|
|
10803
10874
|
<xsl:template match="mn:appendix//mn:example" priority="2">
|
|
10804
10875
|
<xsl:call-template name="setNamedDestination"/>
|
|
10805
10876
|
<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
|
|
10806
|
-
<xsl:apply-templates select="mn:name"/>
|
|
10877
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
10807
10878
|
</fo:block>
|
|
10808
|
-
<xsl:apply-templates select="node()[not(
|
|
10879
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
10809
10880
|
</xsl:template>
|
|
10810
10881
|
|
|
10811
10882
|
<xsl:attribute-set name="xref-style">
|
|
10812
10883
|
</xsl:attribute-set>
|
|
10813
10884
|
|
|
10814
|
-
<xsl:template match="mn:xref">
|
|
10885
|
+
<xsl:template match="mn:fmt-xref">
|
|
10815
10886
|
<xsl:call-template name="insert_basic_link">
|
|
10816
10887
|
<xsl:with-param name="element">
|
|
10817
10888
|
<xsl:variable name="alt_text">
|
|
@@ -10831,7 +10902,7 @@
|
|
|
10831
10902
|
</xsl:template> <!-- xref -->
|
|
10832
10903
|
|
|
10833
10904
|
<!-- 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="."/>
|
|
10905
|
+
<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
10906
|
</xsl:template>
|
|
10836
10907
|
|
|
10837
10908
|
<xsl:attribute-set name="eref-style">
|
|
@@ -10862,7 +10933,7 @@
|
|
|
10862
10933
|
<!-- ====== -->
|
|
10863
10934
|
<!-- eref -->
|
|
10864
10935
|
<!-- ====== -->
|
|
10865
|
-
<xsl:template match="mn:eref" name="eref">
|
|
10936
|
+
<xsl:template match="mn:fmt-eref" name="eref">
|
|
10866
10937
|
<xsl:variable name="current_bibitemid" select="@bibitemid"/>
|
|
10867
10938
|
<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/mn:uri[@type = 'citation'])"/> -->
|
|
10868
10939
|
<xsl:variable name="external-destination" select="normalize-space($bibitems/mn:bibitem[@id = $current_bibitemid]/mn:uri[@type = 'citation'])"/>
|
|
@@ -10924,10 +10995,10 @@
|
|
|
10924
10995
|
|
|
10925
10996
|
<xsl:template name="refine_basic_link_style">
|
|
10926
10997
|
<xsl:attribute name="color">blue</xsl:attribute>
|
|
10927
|
-
<xsl:if test="not(parent::mn:title)">
|
|
10998
|
+
<xsl:if test="not(parent::mn:fmt-title)">
|
|
10928
10999
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
10929
11000
|
</xsl:if>
|
|
10930
|
-
<xsl:if test="parent::mn:title">
|
|
11001
|
+
<xsl:if test="parent::mn:fmt-title">
|
|
10931
11002
|
<xsl:attribute name="color">inherit</xsl:attribute>
|
|
10932
11003
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
10933
11004
|
</xsl:if>
|
|
@@ -11001,7 +11072,10 @@
|
|
|
11001
11072
|
|
|
11002
11073
|
<xsl:call-template name="setNamedDestination"/>
|
|
11003
11074
|
|
|
11004
|
-
<fo:block-container
|
|
11075
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
|
11076
|
+
<xsl:if test="not(parent::mn:references)">
|
|
11077
|
+
<xsl:copy-of select="@id"/>
|
|
11078
|
+
</xsl:if>
|
|
11005
11079
|
|
|
11006
11080
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
11007
11081
|
|
|
@@ -11014,28 +11088,28 @@
|
|
|
11014
11088
|
|
|
11015
11089
|
<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
|
|
11016
11090
|
|
|
11017
|
-
<xsl:apply-templates select="mn:name/mn:tab" mode="tab"/>
|
|
11091
|
+
<xsl:apply-templates select="mn:fmt-name/mn:tab" mode="tab"/>
|
|
11018
11092
|
|
|
11019
11093
|
<xsl:call-template name="refine_note-name-style"/>
|
|
11020
11094
|
|
|
11021
11095
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
11022
11096
|
<!-- <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(
|
|
11097
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
11024
11098
|
<xsl:call-template name="append_add-style"/>
|
|
11025
11099
|
</xsl:if>
|
|
11026
11100
|
|
|
11027
11101
|
<!-- 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)]">
|
|
11102
|
+
<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)]">
|
|
11103
|
+
<xsl:apply-templates select="*[not(self::mn:fmt-name)]/node()[1][self::mn:add][starts-with(text(), $ace_tag)]">
|
|
11030
11104
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
11031
11105
|
</xsl:apply-templates>
|
|
11032
11106
|
</xsl:if>
|
|
11033
11107
|
|
|
11034
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11108
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11035
11109
|
|
|
11036
11110
|
</fo:inline>
|
|
11037
11111
|
|
|
11038
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11112
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11039
11113
|
</fo:block>
|
|
11040
11114
|
</fo:block-container>
|
|
11041
11115
|
</fo:block-container>
|
|
@@ -11080,19 +11154,19 @@
|
|
|
11080
11154
|
|
|
11081
11155
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
|
11082
11156
|
<!-- <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(
|
|
11157
|
+
<xsl:if test="*[not(self::mn:fmt-name)][1][count(node()[normalize-space() != '']) = 1 and mn:add]">
|
|
11084
11158
|
<xsl:call-template name="append_add-style"/>
|
|
11085
11159
|
</xsl:if>
|
|
11086
11160
|
|
|
11087
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11161
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11088
11162
|
|
|
11089
11163
|
</fo:inline>
|
|
11090
11164
|
|
|
11091
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11165
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11092
11166
|
</fo:block>
|
|
11093
11167
|
</xsl:template>
|
|
11094
11168
|
|
|
11095
|
-
<xsl:template match="mn:note/mn:name">
|
|
11169
|
+
<xsl:template match="mn:note/mn:fmt-name">
|
|
11096
11170
|
<xsl:param name="sfx"/>
|
|
11097
11171
|
<xsl:variable name="suffix">
|
|
11098
11172
|
<xsl:choose>
|
|
@@ -11125,7 +11199,7 @@
|
|
|
11125
11199
|
</xsl:if>
|
|
11126
11200
|
</xsl:template>
|
|
11127
11201
|
|
|
11128
|
-
<xsl:template match="mn:termnote/mn:name">
|
|
11202
|
+
<xsl:template match="mn:termnote/mn:fmt-name">
|
|
11129
11203
|
<xsl:param name="sfx"/>
|
|
11130
11204
|
<xsl:variable name="suffix">
|
|
11131
11205
|
<xsl:choose>
|
|
@@ -11211,15 +11285,15 @@
|
|
|
11211
11285
|
|
|
11212
11286
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
11213
11287
|
<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 -->
|
|
11288
|
+
<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
11289
|
</fo:block>
|
|
11216
11290
|
</fo:block-container>
|
|
11217
11291
|
</fo:block-container>
|
|
11218
|
-
<xsl:if test="mn:author or mn:source or mn:attribution">
|
|
11292
|
+
<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
|
|
11219
11293
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
11220
11294
|
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
11221
11295
|
<xsl:apply-templates select="mn:author"/>
|
|
11222
|
-
<xsl:apply-templates select="mn:source"/>
|
|
11296
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
11223
11297
|
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
11224
11298
|
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
11225
11299
|
</fo:block>
|
|
@@ -11229,17 +11303,32 @@
|
|
|
11229
11303
|
</fo:block-container>
|
|
11230
11304
|
</xsl:template>
|
|
11231
11305
|
|
|
11232
|
-
<xsl:template match="mn:source">
|
|
11306
|
+
<xsl:template match="mn:fmt-source">
|
|
11233
11307
|
<xsl:if test="../mn:author">
|
|
11234
11308
|
<xsl:text>, </xsl:text>
|
|
11235
11309
|
</xsl:if>
|
|
11236
|
-
<xsl:
|
|
11237
|
-
<xsl:
|
|
11238
|
-
<fo:
|
|
11239
|
-
<xsl:
|
|
11240
|
-
|
|
11241
|
-
|
|
11242
|
-
|
|
11310
|
+
<xsl:choose>
|
|
11311
|
+
<xsl:when test="not(parent::quote)">
|
|
11312
|
+
<fo:block>
|
|
11313
|
+
<xsl:call-template name="insert_basic_link">
|
|
11314
|
+
<xsl:with-param name="element">
|
|
11315
|
+
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
11316
|
+
<xsl:apply-templates/>
|
|
11317
|
+
</fo:basic-link>
|
|
11318
|
+
</xsl:with-param>
|
|
11319
|
+
</xsl:call-template>
|
|
11320
|
+
</fo:block>
|
|
11321
|
+
</xsl:when>
|
|
11322
|
+
<xsl:otherwise>
|
|
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
|
+
</xsl:otherwise>
|
|
11331
|
+
</xsl:choose>
|
|
11243
11332
|
</xsl:template>
|
|
11244
11333
|
|
|
11245
11334
|
<xsl:template match="mn:author">
|
|
@@ -11258,7 +11347,7 @@
|
|
|
11258
11347
|
</xsl:attribute-set>
|
|
11259
11348
|
|
|
11260
11349
|
<xsl:template name="refine_figure-block-style">
|
|
11261
|
-
<xsl:if test="mn:name">
|
|
11350
|
+
<xsl:if test="mn:fmt-name">
|
|
11262
11351
|
<xsl:attribute name="space-after">12pt</xsl:attribute>
|
|
11263
11352
|
</xsl:if>
|
|
11264
11353
|
</xsl:template>
|
|
@@ -11317,7 +11406,7 @@
|
|
|
11317
11406
|
<ancestor><xsl:copy-of select="ancestor::mn:figure[.//mn:name[.//mn:fn]]"/></ancestor> -->
|
|
11318
11407
|
<xsl:choose>
|
|
11319
11408
|
<!-- skip figure/name/fn -->
|
|
11320
|
-
<xsl:when test="ancestor::mn:figure[.//mn:name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11409
|
+
<xsl:when test="ancestor::mn:figure[.//mn:fmt-name[.//mn:fn[@target = $curr_id]]]"><!-- skip --></xsl:when>
|
|
11321
11410
|
<xsl:otherwise>
|
|
11322
11411
|
<xsl:element name="figure" namespace="{$namespace_full}">
|
|
11323
11412
|
<xsl:element name="fmt-footnote-container" namespace="{$namespace_full}">
|
|
@@ -11513,17 +11602,17 @@
|
|
|
11513
11602
|
|
|
11514
11603
|
<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
|
|
11515
11604
|
|
|
11516
|
-
<xsl:for-each select="mn:name"> <!-- set context -->
|
|
11605
|
+
<xsl:for-each select="mn:fmt-name"> <!-- set context -->
|
|
11517
11606
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
11518
11607
|
</xsl:for-each>
|
|
11519
11608
|
|
|
11520
|
-
<xsl:apply-templates select="node()[not(self::mn:name) and not(self::mn:note and @type = 'units')]"/>
|
|
11609
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name) and not(self::mn:note and @type = 'units')]"/>
|
|
11521
11610
|
</fo:block>
|
|
11522
11611
|
|
|
11523
11612
|
<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
|
|
11524
11613
|
<xsl:call-template name="showFigureKey"/>
|
|
11525
11614
|
</xsl:if>
|
|
11526
|
-
<xsl:apply-templates select="mn:name"/> <!-- show figure's name AFTER image -->
|
|
11615
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
11527
11616
|
|
|
11528
11617
|
</fo:block-container>
|
|
11529
11618
|
</xsl:template>
|
|
@@ -11549,9 +11638,9 @@
|
|
|
11549
11638
|
<xsl:template match="mn:figure[@class = 'pseudocode']">
|
|
11550
11639
|
<xsl:call-template name="setNamedDestination"/>
|
|
11551
11640
|
<fo:block id="{@id}">
|
|
11552
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
11641
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
11553
11642
|
</fo:block>
|
|
11554
|
-
<xsl:apply-templates select="mn:name"/>
|
|
11643
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
11555
11644
|
</xsl:template>
|
|
11556
11645
|
|
|
11557
11646
|
<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
|
|
@@ -11562,7 +11651,7 @@
|
|
|
11562
11651
|
|
|
11563
11652
|
<!-- SOURCE: ... -->
|
|
11564
11653
|
<!-- figure/source -->
|
|
11565
|
-
<xsl:template match="mn:figure/mn:source" priority="2">
|
|
11654
|
+
<xsl:template match="mn:figure/mn:fmt-source" priority="2">
|
|
11566
11655
|
<xsl:call-template name="termsource"/>
|
|
11567
11656
|
</xsl:template>
|
|
11568
11657
|
|
|
@@ -11572,7 +11661,7 @@
|
|
|
11572
11661
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
11573
11662
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
11574
11663
|
<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) -->
|
|
11664
|
+
<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
11665
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
11577
11666
|
<xsl:if test="not(parent::mn:figure) or parent::mn:p">
|
|
11578
11667
|
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
@@ -11593,13 +11682,26 @@
|
|
|
11593
11682
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
|
|
11594
11683
|
|
|
11595
11684
|
<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
|
|
11596
|
-
<xsl:attribute name="
|
|
11685
|
+
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
11686
|
+
<xsl:choose>
|
|
11687
|
+
<xsl:when test="@width and not(@height)">
|
|
11688
|
+
<xsl:attribute name="width">100%</xsl:attribute>
|
|
11689
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11690
|
+
</xsl:when>
|
|
11691
|
+
<xsl:when test="@height and not(@width)">
|
|
11692
|
+
<xsl:attribute name="height">100%</xsl:attribute>
|
|
11693
|
+
<xsl:attribute name="content-height"><xsl:value-of select="@height"/></xsl:attribute>
|
|
11694
|
+
</xsl:when>
|
|
11695
|
+
<xsl:when test="not(@width) and not(@height)">
|
|
11696
|
+
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11697
|
+
</xsl:when>
|
|
11698
|
+
</xsl:choose>
|
|
11699
|
+
|
|
11597
11700
|
<xsl:if test="normalize-space($logo_width) != ''">
|
|
11598
11701
|
<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
|
|
11599
11702
|
</xsl:if>
|
|
11600
|
-
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
11601
11703
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
11602
|
-
<xsl:attribute name="
|
|
11704
|
+
<xsl:attribute name="vertical-align">top</xsl:attribute>
|
|
11603
11705
|
</xsl:if>
|
|
11604
11706
|
|
|
11605
11707
|
<xsl:variable name="width">
|
|
@@ -11888,7 +11990,7 @@
|
|
|
11888
11990
|
<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
|
|
11889
11991
|
<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
|
|
11890
11992
|
|
|
11891
|
-
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:name/mn:bookmark" priority="2"/>
|
|
11993
|
+
<xsl:template match="mn:figure[not(mn:image) and *[local-name() = 'svg']]/mn:fmt-name/mn:bookmark" priority="2"/>
|
|
11892
11994
|
<xsl:template match="mn:figure[not(mn:image)]/*[local-name() = 'svg']" priority="2" name="image_svg">
|
|
11893
11995
|
<xsl:param name="name"/>
|
|
11894
11996
|
|
|
@@ -11898,8 +12000,8 @@
|
|
|
11898
12000
|
|
|
11899
12001
|
<xsl:variable name="alt-text">
|
|
11900
12002
|
<xsl:choose>
|
|
11901
|
-
<xsl:when test="normalize-space(../mn:name) != ''">
|
|
11902
|
-
<xsl:value-of select="../mn:name"/>
|
|
12003
|
+
<xsl:when test="normalize-space(../mn:fmt-name) != ''">
|
|
12004
|
+
<xsl:value-of select="../mn:fmt-name"/>
|
|
11903
12005
|
</xsl:when>
|
|
11904
12006
|
<xsl:when test="normalize-space($name) != ''">
|
|
11905
12007
|
<xsl:value-of select="$name"/>
|
|
@@ -11908,7 +12010,7 @@
|
|
|
11908
12010
|
</xsl:choose>
|
|
11909
12011
|
</xsl:variable>
|
|
11910
12012
|
|
|
11911
|
-
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:title] and 1 = 1)"/>
|
|
12013
|
+
<xsl:variable name="isPrecedingTitle" select="normalize-space(ancestor::mn:figure/preceding-sibling::*[1][self::mn:fmt-title] and 1 = 1)"/>
|
|
11912
12014
|
|
|
11913
12015
|
<xsl:choose>
|
|
11914
12016
|
<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
|
|
@@ -11957,9 +12059,9 @@
|
|
|
11957
12059
|
<fo:table-cell column-number="2">
|
|
11958
12060
|
<fo:block>
|
|
11959
12061
|
<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
|
|
11960
|
-
<xsl:if test="../mn:name/mn:bookmark">
|
|
12062
|
+
<xsl:if test="../mn:fmt-name/mn:bookmark">
|
|
11961
12063
|
<fo:block line-height="0" font-size="0">
|
|
11962
|
-
<xsl:for-each select="../mn:name/mn:bookmark">
|
|
12064
|
+
<xsl:for-each select="../mn:fmt-name/mn:bookmark">
|
|
11963
12065
|
<xsl:call-template name="bookmark"/>
|
|
11964
12066
|
</xsl:for-each>
|
|
11965
12067
|
</fo:block>
|
|
@@ -12199,7 +12301,7 @@
|
|
|
12199
12301
|
|
|
12200
12302
|
<!-- image with svg and emf -->
|
|
12201
12303
|
<xsl:template match="mn:figure/mn:image[*[local-name() = 'svg']]" priority="3">
|
|
12202
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12304
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12203
12305
|
<xsl:for-each select="*[local-name() = 'svg']">
|
|
12204
12306
|
<xsl:call-template name="image_svg">
|
|
12205
12307
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12216,7 +12318,7 @@
|
|
|
12216
12318
|
|
|
12217
12319
|
<xsl:template match="mn:figure/mn:image[@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
|
|
12218
12320
|
<xsl:variable name="svg_content" select="document(@src)"/>
|
|
12219
|
-
<xsl:variable name="name" select="ancestor::mn:figure/mn:name"/>
|
|
12321
|
+
<xsl:variable name="name" select="ancestor::mn:figure/mn:fmt-name"/>
|
|
12220
12322
|
<xsl:for-each select="xalan:nodeset($svg_content)/node()">
|
|
12221
12323
|
<xsl:call-template name="image_svg">
|
|
12222
12324
|
<xsl:with-param name="name" select="$name"/>
|
|
@@ -12339,7 +12441,7 @@
|
|
|
12339
12441
|
<xsl:template match="mn:emf"/>
|
|
12340
12442
|
|
|
12341
12443
|
<!-- figure/name -->
|
|
12342
|
-
<xsl:template match="mn:figure/mn:name | mn:image/mn:name">
|
|
12444
|
+
<xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
|
|
12343
12445
|
<xsl:if test="normalize-space() != ''">
|
|
12344
12446
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
12345
12447
|
|
|
@@ -12413,25 +12515,25 @@
|
|
|
12413
12515
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
12414
12516
|
<xsl:call-template name="setNamedDestination"/>
|
|
12415
12517
|
<fo:block id="{@id}">
|
|
12416
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12518
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
12417
12519
|
</fo:block>
|
|
12418
12520
|
</fo:block-container>
|
|
12419
12521
|
</fo:block-container>
|
|
12420
12522
|
</xsl:template>
|
|
12421
12523
|
|
|
12422
|
-
<xsl:template match="mn:formula/mn:dt/mn:stem">
|
|
12524
|
+
<xsl:template match="mn:formula/mn:dt/mn:fmt-stem">
|
|
12423
12525
|
<fo:inline>
|
|
12424
12526
|
<xsl:apply-templates/>
|
|
12425
12527
|
</fo:inline>
|
|
12426
12528
|
</xsl:template>
|
|
12427
12529
|
|
|
12428
|
-
<xsl:template match="mn:admitted/mn:stem">
|
|
12530
|
+
<xsl:template match="mn:fmt-admitted/mn:fmt-stem">
|
|
12429
12531
|
<fo:inline>
|
|
12430
12532
|
<xsl:apply-templates/>
|
|
12431
12533
|
</fo:inline>
|
|
12432
12534
|
</xsl:template>
|
|
12433
12535
|
|
|
12434
|
-
<xsl:template match="mn:formula/mn:name"> <!-- show in 'stem' template -->
|
|
12536
|
+
<xsl:template match="mn:formula/mn:fmt-name"> <!-- show in 'stem' template -->
|
|
12435
12537
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
|
12436
12538
|
<xsl:if test="normalize-space() != ''">
|
|
12437
12539
|
<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
|
|
@@ -12440,7 +12542,7 @@
|
|
|
12440
12542
|
</xsl:template>
|
|
12441
12543
|
|
|
12442
12544
|
<!-- stem inside formula with name (with formula's number) -->
|
|
12443
|
-
<xsl:template match="mn:formula[mn:name]/mn:stem">
|
|
12545
|
+
<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
|
|
12444
12546
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12445
12547
|
|
|
12446
12548
|
<fo:table table-layout="fixed" width="100%">
|
|
@@ -12460,13 +12562,13 @@
|
|
|
12460
12562
|
|
|
12461
12563
|
<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
|
|
12462
12564
|
|
|
12463
|
-
<xsl:for-each select="../mn:name">
|
|
12565
|
+
<xsl:for-each select="../mn:fmt-name">
|
|
12464
12566
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
12465
12567
|
</xsl:for-each>
|
|
12466
12568
|
|
|
12467
12569
|
<xsl:call-template name="refine_formula-stem-number-style"/>
|
|
12468
12570
|
|
|
12469
|
-
<xsl:apply-templates select="../mn:name"/>
|
|
12571
|
+
<xsl:apply-templates select="../mn:fmt-name"/>
|
|
12470
12572
|
</fo:block>
|
|
12471
12573
|
</fo:table-cell>
|
|
12472
12574
|
</fo:table-row>
|
|
@@ -12476,7 +12578,7 @@
|
|
|
12476
12578
|
</xsl:template>
|
|
12477
12579
|
|
|
12478
12580
|
<!-- stem inside formula without name (without formula's number) -->
|
|
12479
|
-
<xsl:template match="mn:formula[not(mn:name)]/mn:stem">
|
|
12581
|
+
<xsl:template match="mn:formula[not(mn:fmt-name)]/mn:fmt-stem">
|
|
12480
12582
|
<fo:block xsl:use-attribute-sets="formula-style">
|
|
12481
12583
|
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
12482
12584
|
<xsl:apply-templates/>
|
|
@@ -12861,7 +12963,7 @@
|
|
|
12861
12963
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
12862
12964
|
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
12863
12965
|
-->
|
|
12864
|
-
<xsl:template match="mn:stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12966
|
+
<xsl:template match="mn:fmt-stem[@type = 'AsciiMath'][count(*) = 0]/text() | mn:fmt-stem[@type = 'AsciiMath'][mn:asciimath]" priority="3">
|
|
12865
12967
|
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
12866
12968
|
|
|
12867
12969
|
<xsl:call-template name="refine_mathml-style"/>
|
|
@@ -13126,7 +13228,7 @@
|
|
|
13126
13228
|
|
|
13127
13229
|
<xsl:template match="mn:ul | mn:ol" mode="list" name="list">
|
|
13128
13230
|
|
|
13129
|
-
<xsl:apply-templates select="mn:name">
|
|
13231
|
+
<xsl:apply-templates select="mn:fmt-name">
|
|
13130
13232
|
<xsl:with-param name="process">true</xsl:with-param>
|
|
13131
13233
|
</xsl:apply-templates>
|
|
13132
13234
|
|
|
@@ -13172,7 +13274,7 @@
|
|
|
13172
13274
|
|
|
13173
13275
|
<xsl:call-template name="refine_list-style"/>
|
|
13174
13276
|
|
|
13175
|
-
<xsl:if test="mn:name">
|
|
13277
|
+
<xsl:if test="mn:fmt-name">
|
|
13176
13278
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
13177
13279
|
</xsl:if>
|
|
13178
13280
|
|
|
@@ -13187,7 +13289,7 @@
|
|
|
13187
13289
|
<xsl:template name="refine_list-style_provisional-distance-between-starts">
|
|
13188
13290
|
</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
|
|
13189
13291
|
|
|
13190
|
-
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:name">
|
|
13292
|
+
<xsl:template match="*[self::mn:ol or self::mn:ul]/mn:fmt-name">
|
|
13191
13293
|
<xsl:param name="process">false</xsl:param>
|
|
13192
13294
|
<xsl:if test="$process = 'true'">
|
|
13193
13295
|
<fo:block xsl:use-attribute-sets="list-name-style">
|
|
@@ -13320,7 +13422,7 @@
|
|
|
13320
13422
|
-->
|
|
13321
13423
|
<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
|
|
13322
13424
|
<!-- 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">
|
|
13425
|
+
<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
13426
|
<xsl:param name="footnote_body_from_table">false</xsl:param>
|
|
13325
13427
|
|
|
13326
13428
|
<!-- list of unique footnotes -->
|
|
@@ -13444,7 +13546,7 @@
|
|
|
13444
13546
|
<!-- commented:
|
|
13445
13547
|
.//mn:bibitem[ancestor::mn:references]/mn:note |
|
|
13446
13548
|
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])]">
|
|
13549
|
+
<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
13550
|
<!-- copy unique fn -->
|
|
13449
13551
|
<fn gen_id="{generate-id(.)}">
|
|
13450
13552
|
<xsl:copy-of select="@*"/>
|
|
@@ -13523,7 +13625,7 @@
|
|
|
13523
13625
|
<xsl:call-template name="displayAdmonitionName"/>
|
|
13524
13626
|
</fo:block>
|
|
13525
13627
|
<fo:block xsl:use-attribute-sets="admonition-p-style">
|
|
13526
|
-
<xsl:apply-templates select="node()[not(self::mn:name)]"/>
|
|
13628
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
|
|
13527
13629
|
</fo:block>
|
|
13528
13630
|
|
|
13529
13631
|
</fo:block-container>
|
|
@@ -13549,7 +13651,7 @@
|
|
|
13549
13651
|
</xsl:otherwise>
|
|
13550
13652
|
</xsl:choose> -->
|
|
13551
13653
|
<xsl:variable name="name">
|
|
13552
|
-
<xsl:apply-templates select="mn:name"/>
|
|
13654
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
13553
13655
|
</xsl:variable>
|
|
13554
13656
|
<xsl:copy-of select="$name"/>
|
|
13555
13657
|
<xsl:if test="normalize-space($name) != ''">
|
|
@@ -13557,7 +13659,7 @@
|
|
|
13557
13659
|
</xsl:if>
|
|
13558
13660
|
</xsl:template>
|
|
13559
13661
|
|
|
13560
|
-
<xsl:template match="mn:admonition/mn:name">
|
|
13662
|
+
<xsl:template match="mn:admonition/mn:fmt-name">
|
|
13561
13663
|
<xsl:apply-templates/>
|
|
13562
13664
|
</xsl:template>
|
|
13563
13665
|
|
|
@@ -13684,10 +13786,10 @@
|
|
|
13684
13786
|
<xsl:call-template name="setNamedDestination"/>
|
|
13685
13787
|
<fo:block id="{@id}"/>
|
|
13686
13788
|
|
|
13687
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
13789
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
13688
13790
|
|
|
13689
13791
|
<fo:block xsl:use-attribute-sets="references-non-normative-style">
|
|
13690
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
13792
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
13691
13793
|
</fo:block>
|
|
13692
13794
|
</xsl:template> <!-- references -->
|
|
13693
13795
|
|
|
@@ -13706,8 +13808,8 @@
|
|
|
13706
13808
|
</xsl:template> <!-- bibitem -->
|
|
13707
13809
|
|
|
13708
13810
|
<!-- Bibliography (non-normative references) -->
|
|
13709
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
|
13710
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
13811
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
|
13812
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
13711
13813
|
<!-- start BIPM bibitem processing -->
|
|
13712
13814
|
<xsl:call-template name="setNamedDestination"/>
|
|
13713
13815
|
<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
|
|
@@ -13759,7 +13861,7 @@
|
|
|
13759
13861
|
</fo:list-item>
|
|
13760
13862
|
</xsl:otherwise>
|
|
13761
13863
|
</xsl:choose>
|
|
13762
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
|
13864
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
|
13763
13865
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
13764
13866
|
</xsl:apply-templates>
|
|
13765
13867
|
</xsl:template>
|
|
@@ -13776,8 +13878,26 @@
|
|
|
13776
13878
|
</xsl:apply-templates>
|
|
13777
13879
|
<xsl:apply-templates select="mn:formattedref"/>
|
|
13778
13880
|
<!-- end bibitem processing -->
|
|
13881
|
+
|
|
13882
|
+
<xsl:call-template name="processBibliographyNote"/>
|
|
13779
13883
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
|
13780
13884
|
|
|
13885
|
+
<xsl:template name="processBibliographyNote">
|
|
13886
|
+
<xsl:if test="self::mn:note">
|
|
13887
|
+
<xsl:variable name="note_node">
|
|
13888
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
|
13889
|
+
<xsl:copy> <!-- skip @id -->
|
|
13890
|
+
<xsl:copy-of select="node()"/>
|
|
13891
|
+
</xsl:copy>
|
|
13892
|
+
</xsl:element>
|
|
13893
|
+
</xsl:variable>
|
|
13894
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
|
13895
|
+
<xsl:call-template name="note"/>
|
|
13896
|
+
</xsl:for-each> -->
|
|
13897
|
+
<xsl:call-template name="note"/>
|
|
13898
|
+
</xsl:if>
|
|
13899
|
+
</xsl:template>
|
|
13900
|
+
|
|
13781
13901
|
<xsl:template match="mn:title" mode="title">
|
|
13782
13902
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
13783
13903
|
</xsl:template>
|
|
@@ -14010,7 +14130,8 @@
|
|
|
14010
14130
|
</xsl:copy>
|
|
14011
14131
|
</xsl:template>
|
|
14012
14132
|
|
|
14013
|
-
<xsl:template match="mn:xref" mode="index_add_id"
|
|
14133
|
+
<xsl:template match="mn:xref" mode="index_add_id"/>
|
|
14134
|
+
<xsl:template match="mn:fmt-xref" mode="index_add_id">
|
|
14014
14135
|
<xsl:param name="docid"/>
|
|
14015
14136
|
<xsl:variable name="id">
|
|
14016
14137
|
<xsl:call-template name="generateIndexXrefId">
|
|
@@ -14052,7 +14173,7 @@
|
|
|
14052
14173
|
<xsl:template match="mn:indexsect//mn:li" mode="index_update">
|
|
14053
14174
|
<xsl:copy>
|
|
14054
14175
|
<xsl:apply-templates select="@*" mode="index_update"/>
|
|
14055
|
-
<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
|
|
14176
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
|
|
14056
14177
|
</xsl:copy>
|
|
14057
14178
|
</xsl:template>
|
|
14058
14179
|
|
|
@@ -14073,11 +14194,11 @@
|
|
|
14073
14194
|
<xsl:value-of select="."/>
|
|
14074
14195
|
<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
|
|
14075
14196
|
</xsl:when>
|
|
14076
|
-
<xsl:when test="self::* and local-name(.) = 'xref'">
|
|
14197
|
+
<xsl:when test="self::* and local-name(.) = 'fmt-xref'">
|
|
14077
14198
|
<xsl:variable name="id" select="@id"/>
|
|
14078
14199
|
|
|
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"/>
|
|
14200
|
+
<xsl:variable name="id_next" select="following-sibling::mn:fmt-xref[1]/@id"/>
|
|
14201
|
+
<xsl:variable name="id_prev" select="preceding-sibling::mn:fmt-xref[1]/@id"/>
|
|
14081
14202
|
|
|
14082
14203
|
<xsl:variable name="pages_">
|
|
14083
14204
|
<xsl:for-each select="$index/index/item[@id = $id or @id = $id_next or @id = $id_prev]">
|
|
@@ -14173,18 +14294,18 @@
|
|
|
14173
14294
|
<xsl:variable name="item_number">
|
|
14174
14295
|
<xsl:number count="mn:li[ancestor::mn:indexsect]" level="any"/>
|
|
14175
14296
|
</xsl:variable>
|
|
14176
|
-
<xsl:variable name="xref_number"><xsl:number count="mn:xref"/></xsl:variable>
|
|
14297
|
+
<xsl:variable name="xref_number"><xsl:number count="mn:fmt-xref"/></xsl:variable>
|
|
14177
14298
|
<xsl:value-of select="concat($docid_curr, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
|
|
14178
14299
|
</xsl:template>
|
|
14179
14300
|
|
|
14180
|
-
<xsl:template match="mn:indexsect/mn:title" priority="4">
|
|
14301
|
+
<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
|
|
14181
14302
|
<fo:block xsl:use-attribute-sets="indexsect-title-style">
|
|
14182
14303
|
<!-- Index -->
|
|
14183
14304
|
<xsl:apply-templates/>
|
|
14184
14305
|
</fo:block>
|
|
14185
14306
|
</xsl:template>
|
|
14186
14307
|
|
|
14187
|
-
<xsl:template match="mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14308
|
+
<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
|
|
14188
14309
|
<!-- Letter A, B, C, ... -->
|
|
14189
14310
|
<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
|
|
14190
14311
|
<xsl:apply-templates/>
|
|
@@ -14225,12 +14346,12 @@
|
|
|
14225
14346
|
<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
14347
|
<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
|
|
14227
14348
|
<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-
|
|
14349
|
+
<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
14350
|
<!-- skip here, see the template 'fmt-review-start' -->
|
|
14230
14351
|
</xsl:when>
|
|
14231
14352
|
<xsl:otherwise>
|
|
14232
14353
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
|
14233
|
-
<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-
|
|
14354
|
+
<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
14355
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
|
14235
14356
|
<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
|
|
14236
14357
|
</xsl:otherwise>
|
|
@@ -14329,6 +14450,96 @@
|
|
|
14329
14450
|
<!-- End Form's elements processing -->
|
|
14330
14451
|
<!-- =================== -->
|
|
14331
14452
|
|
|
14453
|
+
<xsl:attribute-set name="toc-style">
|
|
14454
|
+
<xsl:attribute name="line-height">135%</xsl:attribute>
|
|
14455
|
+
</xsl:attribute-set>
|
|
14456
|
+
|
|
14457
|
+
<xsl:template name="refine_toc-style">
|
|
14458
|
+
</xsl:template>
|
|
14459
|
+
|
|
14460
|
+
<xsl:attribute-set name="toc-title-style">
|
|
14461
|
+
<xsl:attribute name="margin-left">-14mm</xsl:attribute>
|
|
14462
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14463
|
+
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
14464
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14465
|
+
<xsl:attribute name="text-align-last">justify</xsl:attribute>
|
|
14466
|
+
<xsl:attribute name="margin-bottom">82pt</xsl:attribute>
|
|
14467
|
+
<xsl:attribute name="role">H1</xsl:attribute>
|
|
14468
|
+
</xsl:attribute-set>
|
|
14469
|
+
|
|
14470
|
+
<xsl:attribute-set name="toc-title-page-style">
|
|
14471
|
+
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
14472
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
14473
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14474
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
14475
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
|
14476
|
+
|
|
14477
|
+
<xsl:attribute-set name="toc-item-block-style">
|
|
14478
|
+
</xsl:attribute-set>
|
|
14479
|
+
|
|
14480
|
+
<xsl:template name="refine_toc-item-block-style">
|
|
14481
|
+
</xsl:template>
|
|
14482
|
+
|
|
14483
|
+
<xsl:attribute-set name="toc-item-style">
|
|
14484
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
|
14485
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
|
14486
|
+
|
|
14487
|
+
<xsl:template name="refine_toc-item-style">
|
|
14488
|
+
<xsl:if test="@level = 1">
|
|
14489
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14490
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
14491
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14492
|
+
</xsl:if>
|
|
14493
|
+
<xsl:if test="@level >= 2 and not(@parent = 'annex')">
|
|
14494
|
+
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
14495
|
+
</xsl:if>
|
|
14496
|
+
<xsl:if test="@level = 2">
|
|
14497
|
+
<xsl:attribute name="margin-left">8mm</xsl:attribute>
|
|
14498
|
+
</xsl:if>
|
|
14499
|
+
<xsl:if test="@level > 2">
|
|
14500
|
+
<xsl:attribute name="margin-left">9mm</xsl:attribute>
|
|
14501
|
+
</xsl:if>
|
|
14502
|
+
<xsl:if test="@level >= 2 and @parent = 'annex'">
|
|
14503
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14504
|
+
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
14505
|
+
<xsl:attribute name="margin-left">25mm</xsl:attribute>
|
|
14506
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14507
|
+
</xsl:if>
|
|
14508
|
+
<xsl:if test="@type = 'index'">
|
|
14509
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14510
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
14511
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14512
|
+
<xsl:attribute name="space-before">14pt</xsl:attribute>
|
|
14513
|
+
</xsl:if>
|
|
14514
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
|
14515
|
+
|
|
14516
|
+
<xsl:attribute-set name="toc-leader-style">
|
|
14517
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
|
14518
|
+
|
|
14519
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
|
14520
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14521
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14522
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
14523
|
+
</xsl:attribute-set>
|
|
14524
|
+
|
|
14525
|
+
<!-- List of Figures, Tables -->
|
|
14526
|
+
<xsl:attribute-set name="toc-listof-title-style">
|
|
14527
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
14528
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
14529
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
14530
|
+
<xsl:attribute name="padding-top">14pt</xsl:attribute>
|
|
14531
|
+
<xsl:attribute name="padding-bottom">6pt</xsl:attribute>
|
|
14532
|
+
</xsl:attribute-set>
|
|
14533
|
+
|
|
14534
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
|
14535
|
+
</xsl:attribute-set>
|
|
14536
|
+
|
|
14537
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
|
14538
|
+
<xsl:attribute name="role">TOCI</xsl:attribute>
|
|
14539
|
+
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
14540
|
+
<xsl:attribute name="margin-left">8mm</xsl:attribute>
|
|
14541
|
+
</xsl:attribute-set>
|
|
14542
|
+
|
|
14332
14543
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
14333
14544
|
<xsl:variable name="nodes_preface_">
|
|
14334
14545
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
|
@@ -14394,7 +14605,7 @@
|
|
|
14394
14605
|
|
|
14395
14606
|
<xsl:template name="processTables_Contents">
|
|
14396
14607
|
<mnx:tables>
|
|
14397
|
-
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:name and normalize-space(@id) != '']">
|
|
14608
|
+
<xsl:for-each select="//mn:table[not(ancestor::mn:metanorma-extension)][@id and mn:fmt-name and normalize-space(@id) != '']">
|
|
14398
14609
|
<xsl:choose>
|
|
14399
14610
|
<xsl:when test="mn:fmt-name">
|
|
14400
14611
|
<xsl:variable name="fmt_name">
|
|
@@ -14416,7 +14627,7 @@
|
|
|
14416
14627
|
|
|
14417
14628
|
<xsl:template name="processFigures_Contents">
|
|
14418
14629
|
<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) != '']">
|
|
14630
|
+
<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
14631
|
<xsl:choose>
|
|
14421
14632
|
<xsl:when test="mn:fmt-name">
|
|
14422
14633
|
<xsl:variable name="fmt_name">
|
|
@@ -14445,7 +14656,7 @@
|
|
|
14445
14656
|
|
|
14446
14657
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
|
|
14447
14658
|
|
|
14448
|
-
<xsl:template match="mn:figure/mn:fmt-name |
|
|
14659
|
+
<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
14660
|
<xsl:apply-templates mode="contents"/>
|
|
14450
14661
|
<xsl:text> </xsl:text>
|
|
14451
14662
|
</xsl:template>
|
|
@@ -14457,7 +14668,7 @@
|
|
|
14457
14668
|
</xsl:if>
|
|
14458
14669
|
</xsl:template>
|
|
14459
14670
|
|
|
14460
|
-
<xsl:template match="mn:figure/mn:fmt-name | mn:table/mn:fmt-name |
|
|
14671
|
+
<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
14672
|
<xsl:apply-templates mode="bookmarks"/>
|
|
14462
14673
|
<xsl:text> </xsl:text>
|
|
14463
14674
|
</xsl:template>
|
|
@@ -14468,7 +14679,7 @@
|
|
|
14468
14679
|
</xsl:if>
|
|
14469
14680
|
</xsl:template>
|
|
14470
14681
|
|
|
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">
|
|
14682
|
+
<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
14683
|
<xsl:value-of select="."/>
|
|
14473
14684
|
</xsl:template>
|
|
14474
14685
|
|
|
@@ -14478,7 +14689,7 @@
|
|
|
14478
14689
|
</xsl:if>
|
|
14479
14690
|
</xsl:template>
|
|
14480
14691
|
|
|
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">
|
|
14692
|
+
<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
14693
|
<xsl:value-of select="."/>
|
|
14483
14694
|
</xsl:template>
|
|
14484
14695
|
|
|
@@ -14951,7 +15162,7 @@
|
|
|
14951
15162
|
<xsl:value-of select="."/>
|
|
14952
15163
|
</xsl:template>
|
|
14953
15164
|
|
|
14954
|
-
<xsl:template match="mn:
|
|
15165
|
+
<xsl:template match="mn:annotation" mode="contents_item"/>
|
|
14955
15166
|
|
|
14956
15167
|
<xsl:template match="mn:tab" mode="contents_item">
|
|
14957
15168
|
<xsl:text> </xsl:text>
|
|
@@ -15106,7 +15317,7 @@
|
|
|
15106
15317
|
<xsl:apply-templates/>
|
|
15107
15318
|
</xsl:template>
|
|
15108
15319
|
|
|
15109
|
-
<xsl:template match="mn:toc//mn:xref" priority="3">
|
|
15320
|
+
<xsl:template match="mn:toc//mn:xref | mn:toc//mn:fmt-xref" priority="3">
|
|
15110
15321
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15111
15322
|
<!-- New format: one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15112
15323
|
<!-- <test><xsl:copy-of select="."/></test> -->
|
|
@@ -15174,8 +15385,8 @@
|
|
|
15174
15385
|
<xsl:apply-templates mode="toc_table_width"/>
|
|
15175
15386
|
</xsl:template>
|
|
15176
15387
|
|
|
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"/>
|
|
15388
|
+
<xsl:template match="mn:clause[@type = 'toc']/mn:fmt-title" mode="toc_table_width"/>
|
|
15389
|
+
<xsl:template match="mn:clause[not(@type = 'toc')]/mn:fmt-title" mode="toc_table_width"/>
|
|
15179
15390
|
|
|
15180
15391
|
<xsl:template match="mn:li" mode="toc_table_width">
|
|
15181
15392
|
<mn:tr>
|
|
@@ -15183,7 +15394,7 @@
|
|
|
15183
15394
|
</mn:tr>
|
|
15184
15395
|
</xsl:template>
|
|
15185
15396
|
|
|
15186
|
-
<xsl:template match="mn:xref" mode="toc_table_width">
|
|
15397
|
+
<xsl:template match="mn:fmt-xref" mode="toc_table_width">
|
|
15187
15398
|
<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15188
15399
|
<!-- New format - one tab <xref target="cgpm9th1948r6">“9th CGPM, 1948:<tab/>decision to establish the SI”</xref> -->
|
|
15189
15400
|
<xsl:for-each select="mn:tab">
|
|
@@ -15261,10 +15472,10 @@
|
|
|
15261
15472
|
|
|
15262
15473
|
</xsl:template> <!-- tab -->
|
|
15263
15474
|
|
|
15264
|
-
<xsl:template match="mn:note/mn:name/mn:tab" priority="2"/>
|
|
15265
|
-
<xsl:template match="mn:termnote/mn:name/mn:tab" priority="2"/>
|
|
15475
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" priority="2"/>
|
|
15476
|
+
<xsl:template match="mn:termnote/mn:fmt-name/mn:tab" priority="2"/>
|
|
15266
15477
|
|
|
15267
|
-
<xsl:template match="mn:note/mn:name/mn:tab" mode="tab">
|
|
15478
|
+
<xsl:template match="mn:note/mn:fmt-name/mn:tab" mode="tab">
|
|
15268
15479
|
</xsl:template>
|
|
15269
15480
|
|
|
15270
15481
|
<xsl:template name="insertNonBreakSpaces">
|
|
@@ -15278,13 +15489,13 @@
|
|
|
15278
15489
|
</xsl:template>
|
|
15279
15490
|
|
|
15280
15491
|
<xsl:variable name="reviews_">
|
|
15281
|
-
<xsl:for-each select="//mn:
|
|
15492
|
+
<xsl:for-each select="//mn:annotation[not(parent::mn:annotation-container)][@from]">
|
|
15282
15493
|
<xsl:copy>
|
|
15283
15494
|
<xsl:copy-of select="@from"/>
|
|
15284
15495
|
<xsl:copy-of select="@id"/>
|
|
15285
15496
|
</xsl:copy>
|
|
15286
15497
|
</xsl:for-each>
|
|
15287
|
-
<xsl:for-each select="//mn:fmt-
|
|
15498
|
+
<xsl:for-each select="//mn:fmt-annotation-start[@source]">
|
|
15288
15499
|
<xsl:copy>
|
|
15289
15500
|
<xsl:copy-of select="@source"/>
|
|
15290
15501
|
<xsl:copy-of select="@id"/>
|
|
@@ -15298,7 +15509,7 @@
|
|
|
15298
15509
|
<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
|
|
15299
15510
|
<xsl:variable name="curr_id" select="@id"/>
|
|
15300
15511
|
<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
|
|
15301
|
-
<xsl:for-each select="$reviews//mn:
|
|
15512
|
+
<xsl:for-each select="$reviews//mn:annotation[@from = $curr_id]"> <!-- $reviews//mn:fmt-review-start[@source = $curr_id] -->
|
|
15302
15513
|
<xsl:variable name="review_id" select="normalize-space(@id)"/>
|
|
15303
15514
|
<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
|
|
15304
15515
|
<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 +15524,7 @@
|
|
|
15313
15524
|
|
|
15314
15525
|
<!-- document text (not figures, or tables) footnotes -->
|
|
15315
15526
|
<xsl:variable name="reviews_container_">
|
|
15316
|
-
<xsl:for-each select="//mn:
|
|
15527
|
+
<xsl:for-each select="//mn:annotation-container/mn:fmt-annotation-body">
|
|
15317
15528
|
<xsl:variable name="update_xml_step1">
|
|
15318
15529
|
<xsl:apply-templates select="." mode="update_xml_step1"/>
|
|
15319
15530
|
</xsl:variable>
|
|
@@ -15322,10 +15533,10 @@
|
|
|
15322
15533
|
</xsl:variable>
|
|
15323
15534
|
<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
|
|
15324
15535
|
|
|
15325
|
-
<xsl:template match="mn:
|
|
15536
|
+
<xsl:template match="mn:annotation-container"/>
|
|
15326
15537
|
|
|
15327
15538
|
<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
|
|
15328
|
-
<xsl:template match="mn:
|
|
15539
|
+
<xsl:template match="mn:annotation[not(parent::mn:annotation-container)]"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15329
15540
|
<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
|
|
15330
15541
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
15331
15542
|
<xsl:choose>
|
|
@@ -15345,7 +15556,7 @@
|
|
|
15345
15556
|
</xsl:template>
|
|
15346
15557
|
|
|
15347
15558
|
<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
|
|
15348
|
-
<xsl:template match="mn:fmt-
|
|
15559
|
+
<xsl:template match="mn:fmt-annotation-start" name="fmt-annotation-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
|
|
15349
15560
|
<!-- comment 2019-11-29 -->
|
|
15350
15561
|
<!-- <fo:block font-weight="bold">Review:</fo:block>
|
|
15351
15562
|
<xsl:apply-templates /> -->
|
|
@@ -15401,7 +15612,7 @@
|
|
|
15401
15612
|
</xsl:template>
|
|
15402
15613
|
|
|
15403
15614
|
<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
|
|
15404
|
-
<xsl:template match="mn:
|
|
15615
|
+
<xsl:template match="mn:annotation[@type = 'other']"/>
|
|
15405
15616
|
|
|
15406
15617
|
<!-- ============ -->
|
|
15407
15618
|
<!-- errata -->
|
|
@@ -15794,9 +16005,12 @@
|
|
|
15794
16005
|
<xsl:choose>
|
|
15795
16006
|
<xsl:when test="mn:fmt-title">
|
|
15796
16007
|
<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:
|
|
16008
|
+
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/preceding-sibling::node()[not(self::mn:annotation)]"/>
|
|
15798
16009
|
</xsl:variable>
|
|
15799
16010
|
<xsl:value-of select="normalize-space($fmt_title_section)"/>
|
|
16011
|
+
<xsl:if test="normalize-space($fmt_title_section) = ''">
|
|
16012
|
+
<xsl:value-of select="mn:fmt-title/mn:tab[1]/preceding-sibling::node()"/>
|
|
16013
|
+
</xsl:if>
|
|
15800
16014
|
</xsl:when>
|
|
15801
16015
|
<xsl:otherwise>
|
|
15802
16016
|
<xsl:value-of select="mn:title/mn:tab[1]/preceding-sibling::node()"/>
|
|
@@ -15809,6 +16023,9 @@
|
|
|
15809
16023
|
<xsl:when test="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab]">
|
|
15810
16024
|
<xsl:copy-of select="mn:fmt-title//mn:span[@class = 'fmt-caption-delim'][mn:tab][1]/following-sibling::node()"/>
|
|
15811
16025
|
</xsl:when>
|
|
16026
|
+
<xsl:when test="mn:fmt-title/mn:tab">
|
|
16027
|
+
<xsl:copy-of select="mn:fmt-title/mn:tab[1]/following-sibling::node()"/>
|
|
16028
|
+
</xsl:when>
|
|
15812
16029
|
<xsl:when test="mn:fmt-title">
|
|
15813
16030
|
<xsl:copy-of select="mn:fmt-title/node()"/>
|
|
15814
16031
|
</xsl:when>
|
|
@@ -15947,10 +16164,10 @@
|
|
|
15947
16164
|
|
|
15948
16165
|
</fo:block>
|
|
15949
16166
|
|
|
15950
|
-
<xsl:apply-templates select="mn:title[@columns = 1]"/>
|
|
16167
|
+
<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
|
|
15951
16168
|
|
|
15952
16169
|
<fo:block>
|
|
15953
|
-
<xsl:apply-templates select="node()[not(self::mn:title and @columns = 1)]"/>
|
|
16170
|
+
<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
|
|
15954
16171
|
</fo:block>
|
|
15955
16172
|
</xsl:otherwise>
|
|
15956
16173
|
</xsl:choose>
|
|
@@ -15959,7 +16176,7 @@
|
|
|
15959
16176
|
<xsl:template name="refine_annex_style">
|
|
15960
16177
|
</xsl:template>
|
|
15961
16178
|
|
|
15962
|
-
<xsl:template match="mn:name/text()">
|
|
16179
|
+
<xsl:template match="mn:name/text() | mn:fmt-name/text()">
|
|
15963
16180
|
<!-- 0xA0 to space replacement -->
|
|
15964
16181
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
|
15965
16182
|
</xsl:template>
|
|
@@ -16015,28 +16232,28 @@
|
|
|
16015
16232
|
<xsl:template match="mn:amend"/>
|
|
16016
16233
|
|
|
16017
16234
|
<!-- fmt-title renamed to title in update_xml_step1 -->
|
|
16018
|
-
<xsl:template match="mn:fmt-title"/>
|
|
16235
|
+
<!-- <xsl:template match="mn:fmt-title" /> -->
|
|
16019
16236
|
|
|
16020
16237
|
<!-- fmt-name renamed to name in update_xml_step1 -->
|
|
16021
|
-
<xsl:template match="mn:fmt-name"/>
|
|
16238
|
+
<!-- <xsl:template match="mn:fmt-name" /> -->
|
|
16022
16239
|
|
|
16023
16240
|
<!-- fmt-preferred renamed to preferred in update_xml_step1 -->
|
|
16024
|
-
<xsl:template match="mn:fmt-preferred"/>
|
|
16241
|
+
<!-- <xsl:template match="mn:fmt-preferred" /> -->
|
|
16025
16242
|
|
|
16026
16243
|
<!-- fmt-admitted renamed to admitted in update_xml_step1 -->
|
|
16027
|
-
<xsl:template match="mn:fmt-admitted"/>
|
|
16244
|
+
<!-- <xsl:template match="mn:fmt-admitted" /> -->
|
|
16028
16245
|
|
|
16029
16246
|
<!-- fmt-deprecates renamed to deprecates in update_xml_step1 -->
|
|
16030
|
-
<xsl:template match="mn:fmt-deprecates"/>
|
|
16247
|
+
<!-- <xsl:template match="mn:fmt-deprecates" /> -->
|
|
16031
16248
|
|
|
16032
16249
|
<!-- fmt-definition renamed to definition in update_xml_step1 -->
|
|
16033
|
-
<xsl:template match="mn:fmt-definition"/>
|
|
16250
|
+
<!-- <xsl:template match="mn:fmt-definition" /> -->
|
|
16034
16251
|
|
|
16035
16252
|
<!-- fmt-termsource renamed to termsource in update_xml_step1 -->
|
|
16036
|
-
<xsl:template match="mn:fmt-termsource"/>
|
|
16253
|
+
<!-- <xsl:template match="mn:fmt-termsource" /> -->
|
|
16037
16254
|
|
|
16038
16255
|
<!-- fmt-source renamed to source in update_xml_step1 -->
|
|
16039
|
-
<xsl:template match="mn:fmt-source"/>
|
|
16256
|
+
<!-- <xsl:template match="mn:fmt-source" /> -->
|
|
16040
16257
|
|
|
16041
16258
|
<xsl:template match="mn:semx">
|
|
16042
16259
|
<xsl:apply-templates/>
|
|
@@ -16505,12 +16722,12 @@
|
|
|
16505
16722
|
<xsl:when test="ancestor::mn:preface">
|
|
16506
16723
|
<xsl:value-of select="$level_total - 2"/>
|
|
16507
16724
|
</xsl:when>
|
|
16508
|
-
<xsl:when test="ancestor::mn:sections and self::mn:title">
|
|
16725
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-title">
|
|
16509
16726
|
<!-- determine 'depth' depends on upper clause with title/@depth -->
|
|
16510
16727
|
<!-- <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"/>
|
|
16728
|
+
<xsl:variable name="clause_with_depth_depth" select="ancestor::mn:clause[mn:fmt-title/@depth][1]/mn:fmt-title/@depth"/>
|
|
16512
16729
|
<!-- <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::*)"/>
|
|
16730
|
+
<xsl:variable name="clause_with_depth_level" select="count(ancestor::mn:clause[mn:fmt-title/@depth][1]/ancestor::*)"/>
|
|
16514
16731
|
<!-- <xsl:message>clause_with_depth_level=<xsl:value-of select="$clause_with_depth_level"/></xsl:message> -->
|
|
16515
16732
|
<xsl:variable name="curr_level" select="count(ancestor::*) - 1"/>
|
|
16516
16733
|
<!-- <xsl:message>curr_level=<xsl:value-of select="$curr_level"/></xsl:message> -->
|
|
@@ -16526,8 +16743,8 @@
|
|
|
16526
16743
|
</xsl:otherwise>
|
|
16527
16744
|
</xsl:choose>
|
|
16528
16745
|
</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)"/>
|
|
16746
|
+
<xsl:when test="ancestor::mn:sections and self::mn:fmt-name and parent::mn:term">
|
|
16747
|
+
<xsl:variable name="upper_terms_depth" select="normalize-space(ancestor::mn:terms[1]/mn:fmt-title/@depth)"/>
|
|
16531
16748
|
<xsl:choose>
|
|
16532
16749
|
<xsl:when test="string(number($upper_terms_depth)) != 'NaN'">
|
|
16533
16750
|
<xsl:value-of select="number($upper_terms_depth + 1)"/>
|
|
@@ -16538,7 +16755,7 @@
|
|
|
16538
16755
|
</xsl:choose>
|
|
16539
16756
|
</xsl:when>
|
|
16540
16757
|
<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)"/>
|
|
16758
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::*[self::mn:clause or self::mn:terms][1]/mn:fmt-title/@depth)"/>
|
|
16542
16759
|
<xsl:choose>
|
|
16543
16760
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16544
16761
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16554,8 +16771,8 @@
|
|
|
16554
16771
|
<xsl:when test="parent::mn:annex">
|
|
16555
16772
|
<xsl:value-of select="$level_total - 1"/>
|
|
16556
16773
|
</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)"/>
|
|
16774
|
+
<xsl:when test="ancestor::mn:annex and self::mn:fmt-title">
|
|
16775
|
+
<xsl:variable name="upper_clause_depth" select="normalize-space(ancestor::mn:clause[2]/mn:fmt-title/@depth)"/>
|
|
16559
16776
|
<xsl:choose>
|
|
16560
16777
|
<xsl:when test="string(number($upper_clause_depth)) != 'NaN'">
|
|
16561
16778
|
<xsl:value-of select="number($upper_clause_depth + 1)"/>
|
|
@@ -16588,7 +16805,7 @@
|
|
|
16588
16805
|
</xsl:when>
|
|
16589
16806
|
<xsl:otherwise>
|
|
16590
16807
|
<xsl:variable name="title_level_">
|
|
16591
|
-
<xsl:for-each select="../preceding-sibling::mn:title[1]">
|
|
16808
|
+
<xsl:for-each select="../preceding-sibling::mn:fmt-title[1]">
|
|
16592
16809
|
<xsl:call-template name="getLevel"/>
|
|
16593
16810
|
</xsl:for-each>
|
|
16594
16811
|
</xsl:variable>
|
|
@@ -16665,15 +16882,17 @@
|
|
|
16665
16882
|
</xsl:template>
|
|
16666
16883
|
|
|
16667
16884
|
<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}"/>
|
|
16885
|
+
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
16886
|
+
<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
|
|
16887
|
+
<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'">
|
|
16888
|
+
<fox:destination internal-destination="{@id}"/>
|
|
16675
16889
|
</xsl:if>
|
|
16676
|
-
|
|
16890
|
+
<xsl:for-each select=". | mn:fmt-title | mn:fmt-name">
|
|
16891
|
+
<xsl:if test="@named_dest">
|
|
16892
|
+
<fox:destination internal-destination="{@named_dest}"/>
|
|
16893
|
+
</xsl:if>
|
|
16894
|
+
</xsl:for-each>
|
|
16895
|
+
</xsl:if>
|
|
16677
16896
|
</xsl:template>
|
|
16678
16897
|
|
|
16679
16898
|
<xsl:template name="add-letter-spacing">
|
|
@@ -17021,7 +17240,7 @@
|
|
|
17021
17240
|
</xsl:when>
|
|
17022
17241
|
<xsl:otherwise>
|
|
17023
17242
|
<!-- 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())">
|
|
17243
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_prev = '' and ../preceding-sibling::node())">
|
|
17025
17244
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
17026
17245
|
</xsl:if>
|
|
17027
17246
|
<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 +17274,7 @@
|
|
|
17055
17274
|
</fo:block>
|
|
17056
17275
|
</fo:block-container>
|
|
17057
17276
|
</fo:inline-container>
|
|
17058
|
-
<xsl:if test="namespace-uri(ancestor::mn:title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17277
|
+
<xsl:if test="namespace-uri(ancestor::mn:fmt-title) != '' and ($char_next != '' or ../following-sibling::node())">
|
|
17059
17278
|
<fo:inline padding-left="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
|
|
17060
17279
|
</xsl:if>
|
|
17061
17280
|
</xsl:otherwise>
|