metanorma-m3aawg 2.0.2 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/m3aawg/html/m3d.css +1 -2
  3. data/lib/isodoc/m3aawg/html/m3d.scss +0 -1
  4. data/lib/isodoc/m3aawg/html/wordstyle.css +20 -0
  5. data/lib/isodoc/m3aawg/html/wordstyle.scss +19 -0
  6. data/lib/isodoc/m3aawg/m3aawg.policy.xsl +1204 -318
  7. data/lib/isodoc/m3aawg/m3aawg.report.xsl +1204 -318
  8. data/lib/metanorma/m3aawg/basicdoc.rng +5 -3
  9. data/lib/metanorma/m3aawg/biblio.rng +5 -3
  10. data/lib/metanorma/m3aawg/isodoc.rng +73 -3
  11. data/lib/metanorma/m3aawg/version.rb +1 -1
  12. metadata +2 -2
data/lib/isodoc/m3aawg/m3aawg.report.xsl CHANGED
@@ -1,12 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:m3d="https://www.metanorma.org/ns/m3d" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
2
2
 
3
3
  <xsl:output method="xml" encoding="UTF-8" indent="no"/>
4
-
5
- <xsl:param name="svg_images"/>
6
- <xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
7
- <xsl:variable name="images" select="document($svg_images)"/>
8
- <xsl:param name="basepath"/>
9
-
4
+
10
5
 
11
6
 
12
7
  <xsl:key name="kfn" match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" use="@reference"/>
@@ -14,27 +9,22 @@
14
9
 
15
10
 
16
11
  <xsl:variable name="debug">false</xsl:variable>
17
-
18
- <xsl:variable name="marginLeftRight1" select="17.3"/>
19
- <xsl:variable name="marginLeftRight2" select="17.3"/>
20
- <xsl:variable name="marginTop" select="35"/>
21
- <xsl:variable name="marginBottom" select="23"/>
22
-
12
+
13
+
23
14
  <xsl:variable name="title-en" select="/m3d:m3d-standard/m3d:bibdata/m3d:title[@language = 'en']"/>
24
15
  <!-- Example:
25
16
  <item level="1" id="Foreword" display="true">Foreword</item>
26
17
  <item id="term-script" display="false">3.2</item>
27
18
  -->
28
- <xsl:variable name="contents">
19
+ <xsl:variable name="contents_">
29
20
  <contents>
30
21
  <xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
31
22
  <xsl:call-template name="processMainSectionsDefault_Contents"/>
23
+
24
+ <xsl:call-template name="processTablesFigures_Contents"/>
32
25
  </contents>
33
26
  </xsl:variable>
34
-
35
- <xsl:variable name="lang">
36
- <xsl:call-template name="getLang"/>
37
- </xsl:variable>
27
+ <xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
38
28
 
39
29
  <xsl:template match="/">
40
30
  <xsl:call-template name="namespaceCheck"/>
@@ -213,7 +203,7 @@
213
203
  <xsl:if test="$debug = 'true'">
214
204
  <xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
215
205
  DEBUG
216
- contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
206
+ contents=<xsl:copy-of select="$contents"/>
217
207
  <xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
218
208
  </xsl:if>
219
209
 
@@ -226,7 +216,7 @@
226
216
  </xsl:variable>
227
217
  <fo:block font-size="12pt" font-weight="bold" text-decoration="underline" margin-bottom="4pt" role="H1"><xsl:value-of select="$title-toc"/></fo:block>
228
218
  <fo:block font-size="10pt" role="TOC">
229
- <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
219
+ <xsl:for-each select="$contents//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
230
220
  <xsl:choose>
231
221
  <xsl:when test="@section = ''">
232
222
  <fo:table table-layout="fixed" width="100%">
@@ -303,10 +293,30 @@
303
293
  </xsl:otherwise>
304
294
 
305
295
  </xsl:choose>
296
+
297
+ </xsl:for-each>
306
298
 
299
+ <!-- List of Tables -->
300
+ <xsl:if test="$contents//tables/table">
301
+ <xsl:call-template name="insertListOf_Title">
302
+ <xsl:with-param name="title" select="$title-list-tables"/>
303
+ </xsl:call-template>
304
+ <xsl:for-each select="$contents//tables/table">
305
+ <xsl:call-template name="insertListOf_Item"/>
306
+ </xsl:for-each>
307
+ </xsl:if>
307
308
 
309
+ <!-- List of Figures -->
310
+ <xsl:if test="$contents//figures/figure">
311
+ <xsl:call-template name="insertListOf_Title">
312
+ <xsl:with-param name="title" select="$title-list-figures"/>
313
+ </xsl:call-template>
314
+ <xsl:for-each select="$contents//figures/figure">
315
+ <xsl:call-template name="insertListOf_Item"/>
316
+ </xsl:for-each>
317
+ </xsl:if>
308
318
 
309
- </xsl:for-each>
319
+
310
320
  </fo:block>
311
321
  </fo:block-container>
312
322
 
@@ -331,6 +341,49 @@
331
341
  </fo:root>
332
342
  </xsl:template>
333
343
 
344
+ <xsl:template name="insertListOf_Title">
345
+ <xsl:param name="title"/>
346
+ <fo:table table-layout="fixed" width="100%">
347
+ <fo:table-column column-width="180mm"/>
348
+ <fo:table-body>
349
+ <fo:table-row height="6mm">
350
+ <fo:table-cell>
351
+ <fo:block role="TOCI" font-weight="bold">
352
+ <xsl:value-of select="$title"/>
353
+ </fo:block>
354
+ </fo:table-cell>
355
+ </fo:table-row>
356
+ </fo:table-body>
357
+ </fo:table>
358
+ </xsl:template>
359
+
360
+ <xsl:template name="insertListOf_Item">
361
+ <fo:table table-layout="fixed" width="100%">
362
+ <fo:table-column column-width="5mm"/>
363
+ <fo:table-column column-width="175mm"/>
364
+ <fo:table-body>
365
+ <fo:table-row height="6mm">
366
+ <fo:table-cell>
367
+ <fo:block> </fo:block>
368
+ </fo:table-cell>
369
+ <fo:table-cell>
370
+ <fo:block text-align-last="justify" role="TOCI" font-weight="bold">
371
+ <fo:basic-link internal-destination="{@id}">
372
+ <xsl:call-template name="setAltText">
373
+ <xsl:with-param name="value" select="@alt-text"/>
374
+ </xsl:call-template>
375
+ <xsl:apply-templates select="." mode="contents"/><xsl:text> </xsl:text>
376
+ <fo:inline keep-together.within-line="always">
377
+ <fo:leader font-weight="normal" leader-pattern="dots"/>
378
+ <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
379
+ </fo:inline>
380
+ </fo:basic-link>
381
+ </fo:block>
382
+ </fo:table-cell>
383
+ </fo:table-row>
384
+ </fo:table-body>
385
+ </fo:table>
386
+ </xsl:template>
334
387
 
335
388
  <xsl:template match="m3d:boilerplate//m3d:p" priority="2">
336
389
  <fo:block font-size="11pt" margin-bottom="12pt">
@@ -343,7 +396,7 @@
343
396
  </xsl:template>
344
397
 
345
398
  <!-- ============================= -->
346
- <!-- CONTENTS -->
399
+ <!-- CONTENTS -->
347
400
  <!-- ============================= -->
348
401
 
349
402
  <!-- element with title -->
@@ -393,52 +446,11 @@
393
446
  </item>
394
447
  </xsl:if>
395
448
  </xsl:template>
396
-
397
-
398
-
399
- <xsl:template name="getListItemFormat">
400
- <xsl:choose>
401
- <xsl:when test="local-name(..) = 'ul'">
402
- <xsl:call-template name="setULLabel"/>
403
- </xsl:when>
404
- <xsl:otherwise> <!-- for ordered lists -->
405
- <xsl:choose>
406
- <xsl:when test="../@type = 'arabic'">
407
- <xsl:number format="a)" lang="en"/>
408
- </xsl:when>
409
- <xsl:when test="../@type = 'alphabet'">
410
- <xsl:number format="1)"/>
411
- </xsl:when>
412
- <xsl:otherwise>
413
- <xsl:number format="1."/>
414
- </xsl:otherwise>
415
- </xsl:choose>
416
- </xsl:otherwise>
417
- </xsl:choose>
418
- </xsl:template>
419
-
420
449
  <!-- ============================= -->
421
450
  <!-- ============================= -->
422
451
 
423
452
 
424
453
 
425
- <!-- <xsl:template match="m3d:clause//m3d:clause[not(m3d:title)]">
426
- <xsl:param name="sectionNum"/>
427
- <xsl:variable name="section">
428
- <xsl:call-template name="getSection">
429
- <xsl:with-param name="sectionNum" select="$sectionNum"/>
430
- </xsl:call-template>
431
- </xsl:variable>
432
- <fo:block margin-top="6pt" margin-bottom="6pt" keep-with-next="always">
433
- <fo:inline>
434
- <xsl:value-of select="$section"/>
435
- </fo:inline>
436
- </fo:block>
437
- <xsl:apply-templates>
438
- <xsl:with-param name="sectionNum" select="$sectionNum"/>
439
- </xsl:apply-templates>
440
- </xsl:template> -->
441
-
442
454
  <!-- ====== -->
443
455
  <!-- title -->
444
456
  <!-- ====== -->
@@ -588,40 +600,16 @@
588
600
  </xsl:template>
589
601
 
590
602
 
591
- <xsl:template match="m3d:ul | m3d:ol" mode="ul_ol">
603
+ <xsl:template match="m3d:ul | m3d:ol" mode="list" priority="2">
592
604
  <fo:block-container margin-left="6mm">
593
605
  <fo:block-container margin-left="0mm">
594
- <fo:list-block margin-bottom="12pt" provisional-distance-between-starts="6mm"> <!-- margin-bottom="8pt" -->
595
- <xsl:if test="local-name() = 'ol'">
596
- <xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
597
- </xsl:if>
598
- <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
599
- </fo:list-block>
600
- <xsl:for-each select="./m3d:note">
601
- <xsl:call-template name="note"/>
602
- </xsl:for-each>
606
+ <xsl:call-template name="list"/>
603
607
  </fo:block-container>
604
608
  </fo:block-container>
605
609
  </xsl:template>
606
610
 
607
- <xsl:template match="m3d:li">
608
- <fo:list-item id="{@id}">
609
- <fo:list-item-label end-indent="label-end()">
610
- <fo:block>
611
- <xsl:call-template name="getListItemFormat"/>
612
- </fo:block>
613
- </fo:list-item-label>
614
- <fo:list-item-body start-indent="body-start()">
615
- <fo:block>
616
- <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
617
- <xsl:apply-templates select="./m3d:note"/>
618
- </fo:block>
619
- </fo:list-item-body>
620
- </fo:list-item>
621
- </xsl:template>
622
-
623
611
 
624
- <xsl:template match="m3d:preferred">
612
+ <xsl:template match="m3d:preferred" priority="2">
625
613
 
626
614
  <fo:inline>
627
615
  <xsl:call-template name="setStyle_preferred"/>
@@ -666,42 +654,27 @@
666
654
  </fo:instream-foreign-object>
667
655
  </fo:inline>
668
656
  </xsl:template>
669
-
670
-
671
-
672
- <xsl:template match="m3d:formula/m3d:stem">
673
- <fo:block margin-top="14pt" margin-bottom="14pt">
674
- <fo:table table-layout="fixed" width="100%"> <!-- 170mm -->
675
- <fo:table-column column-width="95%"/> <!-- 165mm -->
676
- <fo:table-column column-width="5%"/> <!-- 5mm -->
677
- <fo:table-body>
678
- <fo:table-row>
679
- <fo:table-cell display-align="center">
680
- <fo:block text-align="center">
681
- <xsl:apply-templates/>
682
- </fo:block>
683
- </fo:table-cell>
684
- <fo:table-cell display-align="center">
685
- <fo:block text-align="left">
686
- <xsl:apply-templates select="../m3d:name" mode="formula_number"/>
687
- </fo:block>
688
- </fo:table-cell>
689
- </fo:table-row>
690
- </fo:table-body>
691
- </fo:table>
692
- </fo:block>
693
- </xsl:template>
694
657
 
695
658
 
696
659
  <xsl:variable name="Image-M3AAWG-Logo">
697
660
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text>
698
661
  </xsl:variable>
699
662
 
700
- <xsl:variable name="pageWidth_">
663
+ <xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
664
+ <xsl:call-template name="getLang"/>
665
+ </xsl:variable><xsl:variable name="pageWidth_">
701
666
  215.9
702
667
  </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
703
668
  279.4
704
- </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
669
+ </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
670
+ 17.3
671
+ </xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
672
+ 17.3
673
+ </xsl:variable><xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/><xsl:variable name="marginTop_">
674
+ 35
675
+ </xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
676
+ 23
677
+ </xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
705
678
 
706
679
  <title-edition lang="en">
707
680
 
@@ -713,6 +686,10 @@
713
686
  <xsl:text>Édition </xsl:text>
714
687
  </title-edition>
715
688
 
689
+ <title-edition lang="ru">
690
+ <xsl:text>Издание </xsl:text>
691
+ </title-edition>
692
+
716
693
  <!-- These titles of Table of contents renders different than determined in localized-strings -->
717
694
  <title-toc lang="en">
718
695
 
@@ -729,7 +706,7 @@
729
706
  <xsl:text>Contents</xsl:text>
730
707
 
731
708
  </title-toc>
732
-
709
+
733
710
  <title-descriptors lang="en">Descriptors</title-descriptors>
734
711
 
735
712
  <title-part lang="en">
@@ -741,7 +718,11 @@
741
718
 
742
719
 
743
720
 
744
- </title-part>
721
+ </title-part>
722
+ <title-part lang="ru">
723
+
724
+
725
+ </title-part>
745
726
  <title-part lang="zh">第 # 部分:</title-part>
746
727
 
747
728
  <title-subpart lang="en">Sub-part #</title-subpart>
@@ -757,13 +738,38 @@
757
738
 
758
739
  <title-summary lang="en">Summary</title-summary>
759
740
 
741
+ <title-continued lang="ru">(продолжение)</title-continued>
760
742
  <title-continued lang="en">(continued)</title-continued>
761
743
  <title-continued lang="fr">(continué)</title-continued>
762
744
 
763
- </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
745
+ </xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="title-list-tables">
746
+ <xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
747
+ <xsl:value-of select="$toc_table_title"/>
748
+ <xsl:if test="normalize-space($toc_table_title) = ''">
749
+ <xsl:call-template name="getTitle">
750
+ <xsl:with-param name="name" select="'title-list-tables'"/>
751
+ </xsl:call-template>
752
+ </xsl:if>
753
+ </xsl:variable><xsl:variable name="title-list-figures">
754
+ <xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
755
+ <xsl:value-of select="$toc_figure_title"/>
756
+ <xsl:if test="normalize-space($toc_figure_title) = ''">
757
+ <xsl:call-template name="getTitle">
758
+ <xsl:with-param name="name" select="'title-list-figures'"/>
759
+ </xsl:call-template>
760
+ </xsl:if>
761
+ </xsl:variable><xsl:variable name="title-list-recommendations">
762
+ <xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
763
+ <xsl:value-of select="$toc_requirement_title"/>
764
+ <xsl:if test="normalize-space($toc_requirement_title) = ''">
765
+ <xsl:call-template name="getTitle">
766
+ <xsl:with-param name="name" select="'title-list-recommendations'"/>
767
+ </xsl:call-template>
768
+ </xsl:if>
769
+ </xsl:variable><xsl:variable name="bibdata">
764
770
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
765
771
  <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
766
- </xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
772
+ </xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space">​</xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
767
773
  <xsl:param name="name"/>
768
774
  <xsl:param name="lang"/>
769
775
  <xsl:variable name="lang_">
@@ -786,7 +792,7 @@
786
792
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
787
793
  </xsl:otherwise>
788
794
  </xsl:choose>
789
- </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
795
+ </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
790
796
 
791
797
 
792
798
 
@@ -950,7 +956,7 @@
950
956
 
951
957
 
952
958
  </xsl:attribute-set><xsl:attribute-set name="example-name-style">
953
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
959
+
954
960
 
955
961
 
956
962
 
@@ -1321,12 +1327,11 @@
1321
1327
 
1322
1328
 
1323
1329
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1324
- <xsl:attribute name="role">BlockQuote</xsl:attribute>
1330
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
1331
+ <xsl:attribute name="margin-right">12mm</xsl:attribute>
1325
1332
 
1326
1333
 
1327
1334
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1328
- <xsl:attribute name="margin-left">12mm</xsl:attribute>
1329
- <xsl:attribute name="margin-right">12mm</xsl:attribute>
1330
1335
 
1331
1336
 
1332
1337
 
@@ -1334,10 +1339,8 @@
1334
1339
 
1335
1340
 
1336
1341
  </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1342
+ <xsl:attribute name="text-align">right</xsl:attribute>
1337
1343
 
1338
-
1339
- <xsl:attribute name="text-align">right</xsl:attribute>
1340
-
1341
1344
 
1342
1345
  </xsl:attribute-set><xsl:attribute-set name="termsource-style">
1343
1346
 
@@ -1357,6 +1360,9 @@
1357
1360
 
1358
1361
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1359
1362
 
1363
+ </xsl:attribute-set><xsl:attribute-set name="term-name-style">
1364
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1365
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1360
1366
  </xsl:attribute-set><xsl:attribute-set name="figure-style">
1361
1367
 
1362
1368
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -1386,6 +1392,38 @@
1386
1392
 
1387
1393
 
1388
1394
  </xsl:attribute-set><xsl:attribute-set name="formula-style">
1395
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
1396
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1397
+
1398
+
1399
+
1400
+
1401
+ <xsl:attribute name="margin-top">14pt</xsl:attribute>
1402
+ <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1403
+
1404
+
1405
+
1406
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-block-style">
1407
+ <xsl:attribute name="text-align">center</xsl:attribute>
1408
+
1409
+
1410
+
1411
+
1412
+
1413
+
1414
+
1415
+
1416
+
1417
+
1418
+
1419
+ </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
1420
+ <xsl:attribute name="text-align">right</xsl:attribute>
1421
+
1422
+
1423
+
1424
+
1425
+
1426
+ <xsl:attribute name="text-align">left</xsl:attribute>
1389
1427
 
1390
1428
  </xsl:attribute-set><xsl:attribute-set name="image-style">
1391
1429
  <xsl:attribute name="text-align">center</xsl:attribute>
@@ -1422,6 +1460,18 @@
1422
1460
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1423
1461
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1424
1462
 
1463
+ </xsl:attribute-set><xsl:attribute-set name="preferred-block-style">
1464
+
1465
+
1466
+
1467
+
1468
+
1469
+
1470
+ </xsl:attribute-set><xsl:attribute-set name="preferred-term-style">
1471
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1472
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1473
+
1474
+
1425
1475
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
1426
1476
 
1427
1477
  </xsl:attribute-set><xsl:attribute-set name="admitted-style">
@@ -1438,13 +1488,19 @@
1438
1488
  </xsl:attribute-set><xsl:variable name="color-added-text">
1439
1489
  <xsl:text>rgb(0, 255, 0)</xsl:text>
1440
1490
  </xsl:variable><xsl:attribute-set name="add-style">
1441
- <xsl:attribute name="color">red</xsl:attribute>
1442
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
1443
- <!-- <xsl:attribute name="color">black</xsl:attribute>
1444
- <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1445
- <xsl:attribute name="padding-top">1mm</xsl:attribute>
1446
- <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1447
- </xsl:attribute-set><xsl:variable name="color-deleted-text">
1491
+
1492
+ <xsl:attribute name="color">red</xsl:attribute>
1493
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
1494
+ <!-- <xsl:attribute name="color">black</xsl:attribute>
1495
+ <xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
1496
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
1497
+ <xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
1498
+
1499
+ </xsl:attribute-set><xsl:variable name="add-style">
1500
+ <add-style xsl:use-attribute-sets="add-style"/>
1501
+ </xsl:variable><xsl:template name="append_add-style">
1502
+ <xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/>
1503
+ </xsl:template><xsl:variable name="color-deleted-text">
1448
1504
  <xsl:text>red</xsl:text>
1449
1505
  </xsl:variable><xsl:attribute-set name="del-style">
1450
1506
  <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
@@ -1455,6 +1511,36 @@
1455
1511
 
1456
1512
  </xsl:attribute-set><xsl:attribute-set name="list-style">
1457
1513
 
1514
+
1515
+
1516
+
1517
+
1518
+
1519
+
1520
+
1521
+
1522
+ <xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
1523
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1524
+
1525
+
1526
+
1527
+
1528
+
1529
+
1530
+
1531
+
1532
+
1533
+ </xsl:attribute-set><xsl:attribute-set name="list-item-style">
1534
+
1535
+
1536
+ </xsl:attribute-set><xsl:attribute-set name="list-item-label-style">
1537
+
1538
+
1539
+
1540
+ </xsl:attribute-set><xsl:attribute-set name="list-item-body-style">
1541
+
1542
+
1543
+
1458
1544
  </xsl:attribute-set><xsl:attribute-set name="toc-style">
1459
1545
  <xsl:attribute name="line-height">135%</xsl:attribute>
1460
1546
  </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
@@ -1730,15 +1816,148 @@
1730
1816
 
1731
1817
 
1732
1818
 
1819
+ </xsl:attribute-set><xsl:attribute-set name="hljs-doctag">
1820
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1821
+ </xsl:attribute-set><xsl:attribute-set name="hljs-keyword">
1822
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1823
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-keyword">
1824
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1825
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-tag">
1826
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1827
+ </xsl:attribute-set><xsl:attribute-set name="hljs-template-variable">
1828
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1829
+ </xsl:attribute-set><xsl:attribute-set name="hljs-type">
1830
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1831
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable_and_language_">
1832
+ <xsl:attribute name="color">#d73a49</xsl:attribute>
1833
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title">
1834
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1835
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class_">
1836
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1837
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class__and_inherited__">
1838
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1839
+ </xsl:attribute-set><xsl:attribute-set name="hljs-title_and_function_">
1840
+ <xsl:attribute name="color">#6f42c1</xsl:attribute>
1841
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attr">
1842
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1843
+ </xsl:attribute-set><xsl:attribute-set name="hljs-attribute">
1844
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1845
+ </xsl:attribute-set><xsl:attribute-set name="hljs-literal">
1846
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1847
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta">
1848
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1849
+ </xsl:attribute-set><xsl:attribute-set name="hljs-number">
1850
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1851
+ </xsl:attribute-set><xsl:attribute-set name="hljs-operator">
1852
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1853
+ </xsl:attribute-set><xsl:attribute-set name="hljs-variable">
1854
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1855
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-attr">
1856
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1857
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-class">
1858
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1859
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-id">
1860
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1861
+ </xsl:attribute-set><xsl:attribute-set name="hljs-regexp">
1862
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1863
+ </xsl:attribute-set><xsl:attribute-set name="hljs-string">
1864
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1865
+ </xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-string">
1866
+ <xsl:attribute name="color">#032f62</xsl:attribute>
1867
+ </xsl:attribute-set><xsl:attribute-set name="hljs-built_in">
1868
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1869
+ </xsl:attribute-set><xsl:attribute-set name="hljs-symbol">
1870
+ <xsl:attribute name="color">#e36209</xsl:attribute>
1871
+ </xsl:attribute-set><xsl:attribute-set name="hljs-comment">
1872
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1873
+ </xsl:attribute-set><xsl:attribute-set name="hljs-code">
1874
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1875
+ </xsl:attribute-set><xsl:attribute-set name="hljs-formula">
1876
+ <xsl:attribute name="color">#6a737d</xsl:attribute>
1877
+ </xsl:attribute-set><xsl:attribute-set name="hljs-name">
1878
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1879
+ </xsl:attribute-set><xsl:attribute-set name="hljs-quote">
1880
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1881
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-tag">
1882
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1883
+ </xsl:attribute-set><xsl:attribute-set name="hljs-selector-pseudo">
1884
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1885
+ </xsl:attribute-set><xsl:attribute-set name="hljs-subst">
1886
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1887
+ </xsl:attribute-set><xsl:attribute-set name="hljs-section">
1888
+ <xsl:attribute name="color">#005cc5</xsl:attribute>
1889
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1890
+ </xsl:attribute-set><xsl:attribute-set name="hljs-bullet">
1891
+ <xsl:attribute name="color">#735c0f</xsl:attribute>
1892
+ </xsl:attribute-set><xsl:attribute-set name="hljs-emphasis">
1893
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1894
+ <xsl:attribute name="font-style">italic</xsl:attribute>
1895
+ </xsl:attribute-set><xsl:attribute-set name="hljs-strong">
1896
+ <xsl:attribute name="color">#24292e</xsl:attribute>
1897
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
1898
+ </xsl:attribute-set><xsl:attribute-set name="hljs-addition">
1899
+ <xsl:attribute name="color">#22863a</xsl:attribute>
1900
+ <xsl:attribute name="background-color">#f0fff4</xsl:attribute>
1901
+ </xsl:attribute-set><xsl:attribute-set name="hljs-deletion">
1902
+ <xsl:attribute name="color">#b31d28</xsl:attribute>
1903
+ <xsl:attribute name="background-color">#ffeef0</xsl:attribute>
1904
+ </xsl:attribute-set><xsl:attribute-set name="hljs-char_and_escape_">
1905
+ </xsl:attribute-set><xsl:attribute-set name="hljs-link">
1906
+ </xsl:attribute-set><xsl:attribute-set name="hljs-params">
1907
+ </xsl:attribute-set><xsl:attribute-set name="hljs-property">
1908
+ </xsl:attribute-set><xsl:attribute-set name="hljs-punctuation">
1909
+ </xsl:attribute-set><xsl:attribute-set name="hljs-tag">
1910
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-title-style">
1911
+ <xsl:attribute name="role">H1</xsl:attribute>
1912
+
1913
+
1914
+
1915
+
1916
+
1917
+ </xsl:attribute-set><xsl:attribute-set name="indexsect-clause-title-style">
1918
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1919
+
1920
+
1921
+
1922
+
1923
+
1733
1924
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
1925
+ <xsl:variable name="nodes_preface_">
1926
+ <xsl:for-each select="/*/*[local-name()='preface']/*">
1927
+ <node id="{@id}"/>
1928
+ </xsl:for-each>
1929
+ </xsl:variable>
1930
+ <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
1931
+
1734
1932
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1735
1933
  <xsl:sort select="@displayorder" data-type="number"/>
1934
+
1935
+ <!-- process Section's title -->
1936
+ <xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
1937
+ <xsl:if test="$preceding-sibling_id != ''">
1938
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
1939
+ </xsl:if>
1940
+
1736
1941
  <xsl:apply-templates select="." mode="contents"/>
1737
1942
  </xsl:for-each>
1738
1943
  </xsl:template><xsl:template name="processMainSectionsDefault_Contents">
1739
1944
 
1945
+ <xsl:variable name="nodes_sections_">
1946
+ <xsl:for-each select="/*/*[local-name()='sections']/*">
1947
+ <node id="{@id}"/>
1948
+ </xsl:for-each>
1949
+ </xsl:variable>
1950
+ <xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
1951
+
1740
1952
  <xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
1741
1953
  <xsl:sort select="@displayorder" data-type="number"/>
1954
+
1955
+ <!-- process Section's title -->
1956
+ <xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
1957
+ <xsl:if test="$preceding-sibling_id != ''">
1958
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
1959
+ </xsl:if>
1960
+
1742
1961
  <xsl:apply-templates select="." mode="contents"/>
1743
1962
  </xsl:for-each>
1744
1963
 
@@ -1751,6 +1970,30 @@
1751
1970
  <xsl:sort select="@displayorder" data-type="number"/>
1752
1971
  <xsl:apply-templates select="." mode="contents"/>
1753
1972
  </xsl:for-each>
1973
+ </xsl:template><xsl:template name="processTablesFigures_Contents">
1974
+ <xsl:param name="always"/>
1975
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
1976
+ <xsl:call-template name="processTables_Contents"/>
1977
+ </xsl:if>
1978
+ <xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
1979
+ <xsl:call-template name="processFigures_Contents"/>
1980
+ </xsl:if>
1981
+ </xsl:template><xsl:template name="processTables_Contents">
1982
+ <tables>
1983
+ <xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
1984
+ <table id="{@id}" alt-text="{*[local-name() = 'name']}">
1985
+ <xsl:copy-of select="*[local-name() = 'name']"/>
1986
+ </table>
1987
+ </xsl:for-each>
1988
+ </tables>
1989
+ </xsl:template><xsl:template name="processFigures_Contents">
1990
+ <figures>
1991
+ <xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
1992
+ <figure id="{@id}" alt-text="{*[local-name() = 'name']}">
1993
+ <xsl:copy-of select="*[local-name() = 'name']"/>
1994
+ </figure>
1995
+ </xsl:for-each>
1996
+ </figures>
1754
1997
  </xsl:template><xsl:template name="processPrefaceSectionsDefault">
1755
1998
  <xsl:for-each select="/*/*[local-name()='preface']/*">
1756
1999
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -1822,9 +2065,12 @@
1822
2065
 
1823
2066
 
1824
2067
  </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
2068
+ <xsl:param name="margin"/>
1825
2069
 
1826
2070
  <!-- process in the template 'paragraph' -->
1827
- <xsl:call-template name="paragraph"/>
2071
+ <xsl:call-template name="paragraph">
2072
+ <xsl:with-param name="margin" select="$margin"/>
2073
+ </xsl:call-template>
1828
2074
 
1829
2075
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']">
1830
2076
  <fo:block xsl:use-attribute-sets="feedback-statement-style">
@@ -1836,9 +2082,12 @@
1836
2082
  <xsl:call-template name="title"/>
1837
2083
 
1838
2084
  </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
2085
+ <xsl:param name="margin"/>
1839
2086
 
1840
2087
  <!-- process in the template 'paragraph' -->
1841
- <xsl:call-template name="paragraph"/>
2088
+ <xsl:call-template name="paragraph">
2089
+ <xsl:with-param name="margin" select="$margin"/>
2090
+ </xsl:call-template>
1842
2091
 
1843
2092
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1844
2093
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
@@ -1877,7 +2126,7 @@
1877
2126
  </xsl:call-template>
1878
2127
  </xsl:if>
1879
2128
  </xsl:variable>
1880
- <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
2129
+ <!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> -->
1881
2130
 
1882
2131
 
1883
2132
  <xsl:variable name="margin-side">
@@ -2143,7 +2392,7 @@
2143
2392
  <!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', ' ')"/> -->
2144
2393
  <!-- 2009 thinspace -->
2145
2394
  <!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/> -->
2146
- <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​', ' '))"/>
2395
+ <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
2147
2396
  </xsl:call-template>
2148
2397
  </xsl:variable>
2149
2398
  <xsl:variable name="max_length">
@@ -2184,8 +2433,7 @@
2184
2433
  </xsl:call-template>
2185
2434
  </xsl:if>
2186
2435
  </xsl:template><xsl:template match="text()" mode="td_text">
2187
- <xsl:variable name="zero-space">​</xsl:variable>
2188
- <xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
2436
+ <xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
2189
2437
  </xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
2190
2438
  <xsl:value-of select="*[local-name()='origin']/@citeas"/>
2191
2439
  </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
@@ -2530,37 +2778,7 @@
2530
2778
 
2531
2779
  <!-- list of footnotes to calculate actual footnotes number -->
2532
2780
  <xsl:variable name="p_fn_">
2533
- <xsl:choose>
2534
- <xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
2535
- <fn gen_id="{generate-id(.)}">
2536
- <xsl:copy-of select="@*"/>
2537
- <xsl:copy-of select="node()"/>
2538
- </fn>
2539
- </xsl:when>
2540
- <xsl:otherwise>
2541
- <!-- itetation for:
2542
- footnotes in bibdata/title
2543
- footnotes in bibliography
2544
- footnotes in document's body (except table's head/body/foot and figure text)
2545
- -->
2546
- <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
2547
- <fn gen_id="{generate-id(.)}">
2548
- <xsl:copy-of select="@*"/>
2549
- <xsl:copy-of select="node()"/>
2550
- </fn>
2551
- </xsl:for-each>
2552
- <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
2553
- <xsl:sort select="@displayorder" data-type="number"/>
2554
- <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
2555
- <!-- copy unique fn -->
2556
- <fn gen_id="{generate-id(.)}">
2557
- <xsl:copy-of select="@*"/>
2558
- <xsl:copy-of select="node()"/>
2559
- </fn>
2560
- </xsl:for-each>
2561
- </xsl:for-each>
2562
- </xsl:otherwise>
2563
- </xsl:choose>
2781
+ <xsl:call-template name="get_fn_list"/>
2564
2782
  </xsl:variable>
2565
2783
  <xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
2566
2784
 
@@ -2621,6 +2839,38 @@
2621
2839
  <xsl:copy-of select="$footnote_inline"/>
2622
2840
  </xsl:otherwise>
2623
2841
  </xsl:choose>
2842
+ </xsl:template><xsl:template name="get_fn_list">
2843
+ <xsl:choose>
2844
+ <xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
2845
+ <fn gen_id="{generate-id(.)}">
2846
+ <xsl:copy-of select="@*"/>
2847
+ <xsl:copy-of select="node()"/>
2848
+ </fn>
2849
+ </xsl:when>
2850
+ <xsl:otherwise>
2851
+ <!-- itetation for:
2852
+ footnotes in bibdata/title
2853
+ footnotes in bibliography
2854
+ footnotes in document's body (except table's head/body/foot and figure text)
2855
+ -->
2856
+ <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
2857
+ <fn gen_id="{generate-id(.)}">
2858
+ <xsl:copy-of select="@*"/>
2859
+ <xsl:copy-of select="node()"/>
2860
+ </fn>
2861
+ </xsl:for-each>
2862
+ <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
2863
+ <xsl:sort select="@displayorder" data-type="number"/>
2864
+ <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
2865
+ <!-- copy unique fn -->
2866
+ <fn gen_id="{generate-id(.)}">
2867
+ <xsl:copy-of select="@*"/>
2868
+ <xsl:copy-of select="node()"/>
2869
+ </fn>
2870
+ </xsl:for-each>
2871
+ </xsl:for-each>
2872
+ </xsl:otherwise>
2873
+ </xsl:choose>
2624
2874
  </xsl:template><xsl:template name="table_fn_display">
2625
2875
  <xsl:variable name="references">
2626
2876
 
@@ -2792,7 +3042,7 @@
2792
3042
  </fo:inline>
2793
3043
  </xsl:template><xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
2794
3044
  <fo:inline><xsl:value-of select="."/></fo:inline>
2795
- </xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
3045
+ </xsl:template><xsl:template match="*[local-name()='fn']//*[local-name()='p']">
2796
3046
  <fo:inline>
2797
3047
  <xsl:apply-templates/>
2798
3048
  </fo:inline>
@@ -3160,20 +3410,44 @@
3160
3410
  <fo:inline text-decoration="underline">
3161
3411
  <xsl:apply-templates/>
3162
3412
  </fo:inline>
3163
- </xsl:template><xsl:template match="*[local-name()='add']">
3413
+ </xsl:template><xsl:template match="*[local-name()='add']" name="tag_add">
3164
3414
  <xsl:param name="skip">true</xsl:param>
3415
+ <xsl:param name="block">false</xsl:param>
3416
+ <xsl:param name="type"/>
3417
+ <xsl:param name="text-align"/>
3165
3418
  <xsl:choose>
3166
3419
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
3167
3420
  <xsl:choose>
3168
- <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3421
+ <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or local-name(..) = 'formattedref' and not(preceding-sibling::node())) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
3169
3422
  <xsl:otherwise>
3170
- <fo:inline>
3423
+ <xsl:variable name="tag">
3171
3424
  <xsl:call-template name="insertTag">
3172
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
3425
+ <xsl:with-param name="type">
3426
+ <xsl:choose>
3427
+ <xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
3428
+ <xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
3429
+ </xsl:choose>
3430
+ </xsl:with-param>
3173
3431
  <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
3174
3432
  <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
3175
3433
  </xsl:call-template>
3176
- </fo:inline>
3434
+ </xsl:variable>
3435
+ <xsl:choose>
3436
+ <xsl:when test="$block = 'false'">
3437
+ <fo:inline>
3438
+ <xsl:copy-of select="$tag"/>
3439
+ </fo:inline>
3440
+ </xsl:when>
3441
+ <xsl:otherwise>
3442
+ <fo:block> <!-- for around figures -->
3443
+ <xsl:if test="$text-align != ''">
3444
+ <xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
3445
+ </xsl:if>
3446
+ <xsl:copy-of select="$tag"/>
3447
+ </fo:block>
3448
+ </xsl:otherwise>
3449
+ </xsl:choose>
3450
+
3177
3451
  </xsl:otherwise>
3178
3452
  </xsl:choose>
3179
3453
  </xsl:when>
@@ -3532,18 +3806,22 @@
3532
3806
  </xsl:apply-templates>
3533
3807
  </xsl:template><xsl:template name="getLang">
3534
3808
  <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3535
- <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3536
3809
  <xsl:variable name="language">
3537
3810
  <xsl:choose>
3538
3811
  <xsl:when test="$language_current != ''">
3539
3812
  <xsl:value-of select="$language_current"/>
3540
3813
  </xsl:when>
3541
- <xsl:when test="$language_current_2 != ''">
3542
- <xsl:value-of select="$language_current_2"/>
3543
- </xsl:when>
3544
3814
  <xsl:otherwise>
3545
- <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3546
- </xsl:otherwise>
3815
+ <xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3816
+ <xsl:choose>
3817
+ <xsl:when test="$language_current_2 != ''">
3818
+ <xsl:value-of select="$language_current_2"/>
3819
+ </xsl:when>
3820
+ <xsl:otherwise>
3821
+ <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3822
+ </xsl:otherwise>
3823
+ </xsl:choose>
3824
+ </xsl:otherwise>
3547
3825
  </xsl:choose>
3548
3826
  </xsl:variable>
3549
3827
 
@@ -3745,6 +4023,9 @@
3745
4023
  </fo:inline>
3746
4024
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
3747
4025
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
4026
+ <xsl:if test="parent::*[local-name() = 'add']">
4027
+ <xsl:call-template name="append_add-style"/>
4028
+ </xsl:if>
3748
4029
  <xsl:apply-templates/>
3749
4030
  </fo:basic-link>
3750
4031
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -3759,8 +4040,8 @@
3759
4040
 
3760
4041
  </xsl:if>
3761
4042
  <fo:block-container margin-left="0mm">
3762
- <fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
3763
- <xsl:apply-templates/>
4043
+ <fo:block id="{@id}">
4044
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
3764
4045
  </fo:block>
3765
4046
  </fo:block-container>
3766
4047
  </fo:block-container>
@@ -3772,10 +4053,43 @@
3772
4053
  <fo:inline>
3773
4054
  <xsl:apply-templates/>
3774
4055
  </fo:inline>
3775
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
4056
+ </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
3776
4057
  <xsl:if test="normalize-space() != ''">
3777
4058
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
3778
4059
  </xsl:if>
4060
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']">
4061
+ <fo:block xsl:use-attribute-sets="formula-style">
4062
+
4063
+
4064
+
4065
+ <fo:table table-layout="fixed" width="100%">
4066
+ <fo:table-column column-width="95%"/>
4067
+ <fo:table-column column-width="5%"/>
4068
+ <fo:table-body>
4069
+ <fo:table-row>
4070
+ <fo:table-cell display-align="center">
4071
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
4072
+
4073
+
4074
+
4075
+ <xsl:apply-templates/>
4076
+ </fo:block>
4077
+ </fo:table-cell>
4078
+ <fo:table-cell display-align="center">
4079
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style">
4080
+ <xsl:apply-templates select="../*[local-name() = 'name']"/>
4081
+ </fo:block>
4082
+ </fo:table-cell>
4083
+ </fo:table-row>
4084
+ </fo:table-body>
4085
+ </fo:table>
4086
+ </fo:block>
4087
+ </xsl:template><xsl:template match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']">
4088
+ <fo:block xsl:use-attribute-sets="formula-style">
4089
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
4090
+ <xsl:apply-templates/>
4091
+ </fo:block>
4092
+ </fo:block>
3779
4093
  </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
3780
4094
 
3781
4095
  <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
@@ -3809,6 +4123,13 @@
3809
4123
 
3810
4124
 
3811
4125
 
4126
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4127
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
4128
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
4129
+ <xsl:call-template name="append_add-style"/>
4130
+ </xsl:if>
4131
+
4132
+
3812
4133
  <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
3813
4134
  <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
3814
4135
  <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
@@ -3847,6 +4168,12 @@
3847
4168
 
3848
4169
 
3849
4170
 
4171
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4172
+ <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
4173
+ <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
4174
+ <xsl:call-template name="append_add-style"/>
4175
+ </xsl:if>
4176
+
3850
4177
  <xsl:apply-templates select="*[local-name() = 'name']"/>
3851
4178
 
3852
4179
  </fo:inline>
@@ -3898,6 +4225,7 @@
3898
4225
  </fo:block>
3899
4226
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3900
4227
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
4228
+
3901
4229
 
3902
4230
 
3903
4231
  <fo:block keep-with-next="always" margin-top="10pt" margin-bottom="8pt" line-height="1.1">
@@ -4338,7 +4666,11 @@
4338
4666
  <xsl:value-of select="."/>
4339
4667
  </xsl:template><xsl:template match="node()" mode="contents">
4340
4668
  <xsl:apply-templates mode="contents"/>
4341
- </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
4669
+ </xsl:template><xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" mode="contents_no_displayorder">
4670
+ <xsl:call-template name="contents_section-title"/>
4671
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'section-title']" mode="contents_in_clause">
4672
+ <xsl:call-template name="contents_section-title"/>
4673
+ </xsl:template><xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents">
4342
4674
  <xsl:variable name="level">
4343
4675
  <xsl:call-template name="getLevel">
4344
4676
  <xsl:with-param name="depth" select="@depth"/>
@@ -4407,13 +4739,14 @@
4407
4739
  <xsl:apply-templates mode="bookmarks"/>
4408
4740
  </xsl:template><xsl:template name="addBookmarks">
4409
4741
  <xsl:param name="contents"/>
4410
- <xsl:if test="xalan:nodeset($contents)//item">
4742
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4743
+ <xsl:if test="$contents_nodes//item">
4411
4744
  <fo:bookmark-tree>
4412
4745
  <xsl:choose>
4413
- <xsl:when test="xalan:nodeset($contents)/doc">
4746
+ <xsl:when test="$contents_nodes/doc">
4414
4747
  <xsl:choose>
4415
- <xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
4416
- <xsl:for-each select="xalan:nodeset($contents)/doc">
4748
+ <xsl:when test="count($contents_nodes/doc) &gt; 1">
4749
+ <xsl:for-each select="$contents_nodes/doc">
4417
4750
  <fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
4418
4751
  <xsl:if test="@bundle = 'true'">
4419
4752
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
@@ -4464,7 +4797,7 @@
4464
4797
  </xsl:for-each>
4465
4798
  </xsl:when>
4466
4799
  <xsl:otherwise>
4467
- <xsl:for-each select="xalan:nodeset($contents)/doc">
4800
+ <xsl:for-each select="$contents_nodes/doc">
4468
4801
 
4469
4802
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
4470
4803
 
@@ -4482,25 +4815,36 @@
4482
4815
  </xsl:choose>
4483
4816
  </xsl:when>
4484
4817
  <xsl:otherwise>
4485
- <xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>
4818
+ <xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
4819
+
4820
+ <xsl:call-template name="insertFigureBookmarks">
4821
+ <xsl:with-param name="contents" select="$contents_nodes/contents"/>
4822
+ </xsl:call-template>
4823
+
4824
+ <xsl:call-template name="insertTableBookmarks">
4825
+ <xsl:with-param name="contents" select="$contents_nodes/contents"/>
4826
+ <xsl:with-param name="lang" select="@lang"/>
4827
+ </xsl:call-template>
4828
+
4486
4829
  </xsl:otherwise>
4487
4830
  </xsl:choose>
4488
4831
 
4832
+
4489
4833
 
4490
4834
 
4491
4835
 
4492
4836
 
4493
-
4494
-
4837
+
4495
4838
 
4496
4839
  </fo:bookmark-tree>
4497
4840
  </xsl:if>
4498
4841
  </xsl:template><xsl:template name="insertFigureBookmarks">
4499
4842
  <xsl:param name="contents"/>
4500
- <xsl:if test="xalan:nodeset($contents)/figure">
4501
- <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
4843
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4844
+ <xsl:if test="$contents_nodes/figure">
4845
+ <fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
4502
4846
  <fo:bookmark-title>Figures</fo:bookmark-title>
4503
- <xsl:for-each select="xalan:nodeset($contents)/figure">
4847
+ <xsl:for-each select="$contents_nodes/figure">
4504
4848
  <fo:bookmark internal-destination="{@id}">
4505
4849
  <fo:bookmark-title>
4506
4850
  <xsl:value-of select="normalize-space(title)"/>
@@ -4509,18 +4853,40 @@
4509
4853
  </xsl:for-each>
4510
4854
  </fo:bookmark>
4511
4855
  </xsl:if>
4856
+
4857
+
4858
+ <xsl:if test="$contents_nodes//figures/figure">
4859
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
4860
+
4861
+
4862
+
4863
+ <xsl:variable name="bookmark-title">
4864
+
4865
+ <xsl:value-of select="$title-list-figures"/>
4866
+
4867
+ </xsl:variable>
4868
+ <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
4869
+ <xsl:for-each select="$contents_nodes//figures/figure">
4870
+ <fo:bookmark internal-destination="{@id}">
4871
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
4872
+ </fo:bookmark>
4873
+ </xsl:for-each>
4874
+ </fo:bookmark>
4875
+ </xsl:if>
4876
+
4512
4877
  </xsl:template><xsl:template name="insertTableBookmarks">
4513
4878
  <xsl:param name="contents"/>
4514
4879
  <xsl:param name="lang"/>
4515
- <xsl:if test="xalan:nodeset($contents)/table">
4516
- <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
4880
+ <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
4881
+ <xsl:if test="$contents_nodes/table">
4882
+ <fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
4517
4883
  <fo:bookmark-title>
4518
4884
  <xsl:choose>
4519
4885
  <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
4520
4886
  <xsl:otherwise>Tables</xsl:otherwise>
4521
4887
  </xsl:choose>
4522
4888
  </fo:bookmark-title>
4523
- <xsl:for-each select="xalan:nodeset($contents)/table">
4889
+ <xsl:for-each select="$contents_nodes/table">
4524
4890
  <fo:bookmark internal-destination="{@id}">
4525
4891
  <fo:bookmark-title>
4526
4892
  <xsl:value-of select="normalize-space(title)"/>
@@ -4529,6 +4895,29 @@
4529
4895
  </xsl:for-each>
4530
4896
  </fo:bookmark>
4531
4897
  </xsl:if>
4898
+
4899
+
4900
+ <xsl:if test="$contents_nodes//tables/table">
4901
+ <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
4902
+
4903
+
4904
+
4905
+ <xsl:variable name="bookmark-title">
4906
+
4907
+ <xsl:value-of select="$title-list-tables"/>
4908
+
4909
+ </xsl:variable>
4910
+
4911
+ <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
4912
+
4913
+ <xsl:for-each select="$contents_nodes//tables/table">
4914
+ <fo:bookmark internal-destination="{@id}">
4915
+ <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
4916
+ </fo:bookmark>
4917
+ </xsl:for-each>
4918
+ </fo:bookmark>
4919
+ </xsl:if>
4920
+
4532
4921
  </xsl:template><xsl:template name="getLangVersion">
4533
4922
  <xsl:param name="lang"/>
4534
4923
  <xsl:param name="doctype" select="''"/>
@@ -4727,12 +5116,140 @@
4727
5116
  </fo:block-container>
4728
5117
  </fo:block-container>
4729
5118
  </xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
4730
- <xsl:variable name="text">
5119
+ <xsl:choose>
5120
+ <xsl:when test="normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting -->
5121
+ <xsl:variable name="syntax" select="java:org.metanorma.fop.Util.syntaxHighlight(., ../@lang)"/>
5122
+ <xsl:choose>
5123
+ <xsl:when test="normalize-space($syntax) != ''"><!-- if there is highlighted result -->
5124
+ <xsl:apply-templates select="xalan:nodeset($syntax)" mode="syntax_highlight"/> <!-- process span tags -->
5125
+ </xsl:when>
5126
+ <xsl:otherwise> <!-- if case of non-succesfull syntax highlight (for instance, unknown lang), process without highlighting -->
5127
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
5128
+ </xsl:otherwise>
5129
+ </xsl:choose>
5130
+ </xsl:when>
5131
+ <xsl:otherwise>
5132
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
5133
+ </xsl:otherwise>
5134
+ </xsl:choose>
5135
+
5136
+ </xsl:template><xsl:template name="add_spaces_to_sourcecode">
5137
+ <xsl:variable name="text_step1">
4731
5138
  <xsl:call-template name="add-zero-spaces-equal"/>
4732
5139
  </xsl:variable>
4733
- <xsl:call-template name="add-zero-spaces-java">
4734
- <xsl:with-param name="text" select="$text"/>
4735
- </xsl:call-template>
5140
+ <xsl:variable name="text_step2">
5141
+ <xsl:call-template name="add-zero-spaces-java">
5142
+ <xsl:with-param name="text" select="$text_step1"/>
5143
+ </xsl:call-template>
5144
+ </xsl:variable>
5145
+ <xsl:value-of select="$text_step2"/>
5146
+ </xsl:template><xsl:template match="*" mode="syntax_highlight">
5147
+ <xsl:apply-templates mode="syntax_highlight"/>
5148
+ </xsl:template><xsl:variable name="syntax_highlight_styles_">
5149
+ <style class="hljs-addition" xsl:use-attribute-sets="hljs-addition"/>
5150
+ <style class="hljs-attr" xsl:use-attribute-sets="hljs-attr"/>
5151
+ <style class="hljs-attribute" xsl:use-attribute-sets="hljs-attribute"/>
5152
+ <style class="hljs-built_in" xsl:use-attribute-sets="hljs-built_in"/>
5153
+ <style class="hljs-bullet" xsl:use-attribute-sets="hljs-bullet"/>
5154
+ <style class="hljs-char_and_escape_" xsl:use-attribute-sets="hljs-char_and_escape_"/>
5155
+ <style class="hljs-code" xsl:use-attribute-sets="hljs-code"/>
5156
+ <style class="hljs-comment" xsl:use-attribute-sets="hljs-comment"/>
5157
+ <style class="hljs-deletion" xsl:use-attribute-sets="hljs-deletion"/>
5158
+ <style class="hljs-doctag" xsl:use-attribute-sets="hljs-doctag"/>
5159
+ <style class="hljs-emphasis" xsl:use-attribute-sets="hljs-emphasis"/>
5160
+ <style class="hljs-formula" xsl:use-attribute-sets="hljs-formula"/>
5161
+ <style class="hljs-keyword" xsl:use-attribute-sets="hljs-keyword"/>
5162
+ <style class="hljs-link" xsl:use-attribute-sets="hljs-link"/>
5163
+ <style class="hljs-literal" xsl:use-attribute-sets="hljs-literal"/>
5164
+ <style class="hljs-meta" xsl:use-attribute-sets="hljs-meta"/>
5165
+ <style class="hljs-meta_hljs-string" xsl:use-attribute-sets="hljs-meta_hljs-string"/>
5166
+ <style class="hljs-meta_hljs-keyword" xsl:use-attribute-sets="hljs-meta_hljs-keyword"/>
5167
+ <style class="hljs-name" xsl:use-attribute-sets="hljs-name"/>
5168
+ <style class="hljs-number" xsl:use-attribute-sets="hljs-number"/>
5169
+ <style class="hljs-operator" xsl:use-attribute-sets="hljs-operator"/>
5170
+ <style class="hljs-params" xsl:use-attribute-sets="hljs-params"/>
5171
+ <style class="hljs-property" xsl:use-attribute-sets="hljs-property"/>
5172
+ <style class="hljs-punctuation" xsl:use-attribute-sets="hljs-punctuation"/>
5173
+ <style class="hljs-quote" xsl:use-attribute-sets="hljs-quote"/>
5174
+ <style class="hljs-regexp" xsl:use-attribute-sets="hljs-regexp"/>
5175
+ <style class="hljs-section" xsl:use-attribute-sets="hljs-section"/>
5176
+ <style class="hljs-selector-attr" xsl:use-attribute-sets="hljs-selector-attr"/>
5177
+ <style class="hljs-selector-class" xsl:use-attribute-sets="hljs-selector-class"/>
5178
+ <style class="hljs-selector-id" xsl:use-attribute-sets="hljs-selector-id"/>
5179
+ <style class="hljs-selector-pseudo" xsl:use-attribute-sets="hljs-selector-pseudo"/>
5180
+ <style class="hljs-selector-tag" xsl:use-attribute-sets="hljs-selector-tag"/>
5181
+ <style class="hljs-string" xsl:use-attribute-sets="hljs-string"/>
5182
+ <style class="hljs-strong" xsl:use-attribute-sets="hljs-strong"/>
5183
+ <style class="hljs-subst" xsl:use-attribute-sets="hljs-subst"/>
5184
+ <style class="hljs-symbol" xsl:use-attribute-sets="hljs-symbol"/>
5185
+ <style class="hljs-tag" xsl:use-attribute-sets="hljs-tag"/>
5186
+ <!-- <style class="hljs-tag_hljs-attr" xsl:use-attribute-sets="hljs-tag_hljs-attr"></style> -->
5187
+ <!-- <style class="hljs-tag_hljs-name" xsl:use-attribute-sets="hljs-tag_hljs-name"></style> -->
5188
+ <style class="hljs-template-tag" xsl:use-attribute-sets="hljs-template-tag"/>
5189
+ <style class="hljs-template-variable" xsl:use-attribute-sets="hljs-template-variable"/>
5190
+ <style class="hljs-title" xsl:use-attribute-sets="hljs-title"/>
5191
+ <style class="hljs-title_and_class_" xsl:use-attribute-sets="hljs-title_and_class_"/>
5192
+ <style class="hljs-title_and_class__and_inherited__" xsl:use-attribute-sets="hljs-title_and_class__and_inherited__"/>
5193
+ <style class="hljs-title_and_function_" xsl:use-attribute-sets="hljs-title_and_function_"/>
5194
+ <style class="hljs-type" xsl:use-attribute-sets="hljs-type"/>
5195
+ <style class="hljs-variable" xsl:use-attribute-sets="hljs-variable"/>
5196
+ <style class="hljs-variable_and_language_" xsl:use-attribute-sets="hljs-variable_and_language_"/>
5197
+ </xsl:variable><xsl:variable name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/><xsl:template match="span" mode="syntax_highlight" priority="2">
5198
+ <!-- <fo:inline color="green" font-style="italic"><xsl:apply-templates mode="syntax_highlight"/></fo:inline> -->
5199
+ <fo:inline>
5200
+ <xsl:variable name="classes_">
5201
+ <xsl:call-template name="split">
5202
+ <xsl:with-param name="pText" select="@class"/>
5203
+ <xsl:with-param name="sep" select="' '"/>
5204
+ </xsl:call-template>
5205
+ <!-- a few classes together (_and_ suffix) -->
5206
+ <xsl:if test="contains(@class, 'hljs-char') and contains(@class, 'escape_')">
5207
+ <item>hljs-char_and_escape_</item>
5208
+ </xsl:if>
5209
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_')">
5210
+ <item>hljs-title_and_class_</item>
5211
+ </xsl:if>
5212
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_') and contains(@class, 'inherited__')">
5213
+ <item>hljs-title_and_class__and_inherited__</item>
5214
+ </xsl:if>
5215
+ <xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'function_')">
5216
+ <item>hljs-title_and_function_</item>
5217
+ </xsl:if>
5218
+ <xsl:if test="contains(@class, 'hljs-variable') and contains(@class, 'language_')">
5219
+ <item>hljs-variable_and_language_</item>
5220
+ </xsl:if>
5221
+ <!-- with parent classes (_ suffix) -->
5222
+ <xsl:if test="contains(@class, 'hljs-keyword') and contains(ancestor::*/@class, 'hljs-meta')">
5223
+ <item>hljs-meta_hljs-keyword</item>
5224
+ </xsl:if>
5225
+ <xsl:if test="contains(@class, 'hljs-string') and contains(ancestor::*/@class, 'hljs-meta')">
5226
+ <item>hljs-meta_hljs-string</item>
5227
+ </xsl:if>
5228
+ </xsl:variable>
5229
+ <xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
5230
+
5231
+ <xsl:for-each select="$classes/item">
5232
+ <xsl:variable name="class_name" select="."/>
5233
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
5234
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
5235
+ </xsl:for-each>
5236
+ </xsl:for-each>
5237
+
5238
+ <!-- <xsl:variable name="class_name">
5239
+ <xsl:choose>
5240
+ <xsl:when test="@class = 'hljs-attr' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-attr</xsl:when>
5241
+ <xsl:when test="@class = 'hljs-name' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-name</xsl:when>
5242
+ <xsl:when test="@class = 'hljs-string' and ancestor::*/@class = 'hljs-meta'">hljs-meta_hljs-string</xsl:when>
5243
+ <xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
5244
+ </xsl:choose>
5245
+ </xsl:variable>
5246
+ <xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
5247
+ <xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
5248
+ </xsl:for-each> -->
5249
+
5250
+ <xsl:apply-templates mode="syntax_highlight"/></fo:inline>
5251
+ </xsl:template><xsl:template match="text()" mode="syntax_highlight" priority="2">
5252
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4736
5253
  </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
4737
5254
  <xsl:if test="normalize-space() != ''">
4738
5255
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
@@ -5057,6 +5574,8 @@
5057
5574
  </xsl:otherwise>
5058
5575
  </xsl:choose> -->
5059
5576
  </fo:block>
5577
+ </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
5578
+ <xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
5060
5579
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
5061
5580
  <xsl:if test="normalize-space() != ''">
5062
5581
  <xsl:value-of select="."/>
@@ -5103,11 +5622,14 @@
5103
5622
 
5104
5623
 
5105
5624
  <fo:block-container margin-left="0mm">
5106
-
5107
- <fo:block xsl:use-attribute-sets="quote-style">
5625
+ <fo:block-container xsl:use-attribute-sets="quote-style">
5108
5626
 
5109
- <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5110
- </fo:block>
5627
+ <fo:block-container margin-left="0mm" margin-right="0mm">
5628
+ <fo:block role="BlockQuote">
5629
+ <xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
5630
+ </fo:block>
5631
+ </fo:block-container>
5632
+ </fo:block-container>
5111
5633
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
5112
5634
  <fo:block xsl:use-attribute-sets="quote-source-style">
5113
5635
  <!-- — ISO, ISO 7301:2011, Clause 1 -->
@@ -5128,26 +5650,11 @@
5128
5650
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5129
5651
  <xsl:text>— </xsl:text>
5130
5652
  <xsl:apply-templates/>
5131
- </xsl:template><xsl:variable name="bibitem_hidden_">
5132
- <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5133
- <xsl:copy-of select="."/>
5134
- </xsl:for-each>
5135
- <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5136
- <xsl:copy-of select="."/>
5137
- </xsl:for-each>
5138
- </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5139
-
5140
- <xsl:variable name="bibitemid">
5141
- <xsl:choose>
5142
- <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5143
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5144
- <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5145
- <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5146
- </xsl:choose>
5147
- </xsl:variable>
5148
-
5653
+ </xsl:template><xsl:template match="*[local-name() = 'eref']">
5654
+ <xsl:variable name="current_bibitemid" select="@bibitemid"/>
5655
+ <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
5149
5656
  <xsl:choose>
5150
- <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
5657
+ <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
5151
5658
  <fo:inline xsl:use-attribute-sets="eref-style">
5152
5659
  <xsl:if test="@type = 'footnote'">
5153
5660
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -5163,8 +5670,8 @@
5163
5670
  <xsl:variable name="text" select="normalize-space()"/>
5164
5671
 
5165
5672
 
5166
-
5167
- <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
5673
+
5674
+ <fo:basic-link fox:alt-text="{@citeas}">
5168
5675
  <xsl:if test="normalize-space(@citeas) = ''">
5169
5676
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
5170
5677
  </xsl:if>
@@ -5174,14 +5681,21 @@
5174
5681
 
5175
5682
  </xsl:if>
5176
5683
 
5177
-
5684
+ <xsl:choose>
5685
+ <xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
5686
+ <xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
5687
+ </xsl:when>
5688
+ <xsl:otherwise>
5689
+ <xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
5690
+ </xsl:otherwise>
5691
+ </xsl:choose>
5178
5692
 
5179
5693
  <xsl:apply-templates/>
5180
5694
  </fo:basic-link>
5181
-
5695
+
5182
5696
  </fo:inline>
5183
5697
  </xsl:when>
5184
- <xsl:otherwise>
5698
+ <xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) -->
5185
5699
  <fo:inline><xsl:apply-templates/></fo:inline>
5186
5700
  </xsl:otherwise>
5187
5701
  </xsl:choose>
@@ -5257,6 +5771,31 @@
5257
5771
  <xsl:with-param name="count" select="$count - 1"/>
5258
5772
  </xsl:call-template>
5259
5773
  </xsl:if>
5774
+ </xsl:template><xsl:template match="*[local-name() = 'preferred']">
5775
+ <xsl:variable name="level">
5776
+ <xsl:call-template name="getLevel"/>
5777
+ </xsl:variable>
5778
+ <xsl:variable name="font-size">
5779
+ inherit
5780
+ </xsl:variable>
5781
+ <xsl:variable name="levelTerm">
5782
+ <xsl:call-template name="getLevelTermName"/>
5783
+ </xsl:variable>
5784
+ <fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
5785
+
5786
+
5787
+
5788
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
5789
+ <fo:block xsl:use-attribute-sets="term-name-style">
5790
+ <xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
5791
+ </fo:block>
5792
+ </xsl:if>
5793
+
5794
+ <fo:block xsl:use-attribute-sets="preferred-term-style">
5795
+ <xsl:call-template name="setStyle_preferred"/>
5796
+ <xsl:apply-templates/>
5797
+ </fo:block>
5798
+ </fo:block>
5260
5799
  </xsl:template><xsl:template match="*[local-name() = 'domain']">
5261
5800
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
5262
5801
  <xsl:text> </xsl:text>
@@ -5347,24 +5886,8 @@
5347
5886
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5348
5887
  </xsl:template><xsl:variable name="ul_labels_">
5349
5888
 
5350
-
5351
-
5352
-
5353
-
5354
-
5355
-
5356
-
5357
-
5358
- <label font-size="18pt" margin-top="-0.5mm">•</label> <!-- margin-top to vertical align big dot -->
5359
-
5360
-
5361
-
5362
-
5363
-
5364
-
5365
-
5366
-
5367
-
5889
+ <label font-size="18pt" margin-top="-0.5mm">•</label> <!-- margin-top to vertical align big dot -->
5890
+
5368
5891
  </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5369
5892
  <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5370
5893
  <xsl:variable name="list_level">
@@ -5390,6 +5913,91 @@
5390
5913
  </xsl:template><xsl:template match="label" mode="ul_labels">
5391
5914
  <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5392
5915
  <xsl:value-of select="."/>
5916
+ </xsl:template><xsl:template name="getListItemFormat">
5917
+ <!-- Example: for BSI <?list-type loweralpha?> -->
5918
+ <xsl:variable name="processing_instruction_type" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-type'))"/>
5919
+ <xsl:choose>
5920
+ <xsl:when test="local-name(..) = 'ul'">
5921
+ <xsl:choose>
5922
+ <xsl:when test="normalize-space($processing_instruction_type) = 'simple'"/>
5923
+ <xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
5924
+ </xsl:choose>
5925
+ </xsl:when>
5926
+ <xsl:otherwise> <!-- for ordered lists 'ol' -->
5927
+
5928
+ <!-- Example: for BSI <?list-start 2?> -->
5929
+ <xsl:variable name="processing_instruction_start" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-start'))"/>
5930
+
5931
+ <xsl:variable name="start_value">
5932
+ <xsl:choose>
5933
+ <xsl:when test="normalize-space($processing_instruction_start) != ''">
5934
+ <xsl:value-of select="number($processing_instruction_start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5935
+ </xsl:when>
5936
+ <xsl:when test="normalize-space(../@start) != ''">
5937
+ <xsl:value-of select="number(../@start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
5938
+ </xsl:when>
5939
+ <xsl:otherwise>0</xsl:otherwise>
5940
+ </xsl:choose>
5941
+ </xsl:variable>
5942
+
5943
+ <xsl:variable name="curr_value"><xsl:number/></xsl:variable>
5944
+
5945
+ <xsl:variable name="type">
5946
+ <xsl:choose>
5947
+ <xsl:when test="normalize-space($processing_instruction_type) != ''"><xsl:value-of select="$processing_instruction_type"/></xsl:when>
5948
+ <xsl:when test="normalize-space(../@type) != ''"><xsl:value-of select="../@type"/></xsl:when>
5949
+
5950
+ <xsl:otherwise> <!-- if no @type or @class = 'steps' -->
5951
+
5952
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5953
+ <xsl:variable name="list_level">
5954
+ <xsl:choose>
5955
+ <xsl:when test="$list_level_ &lt;= 5"><xsl:value-of select="$list_level_"/></xsl:when>
5956
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 5"/></xsl:otherwise>
5957
+ </xsl:choose>
5958
+ </xsl:variable>
5959
+
5960
+ <xsl:choose>
5961
+ <xsl:when test="$list_level mod 5 = 0">roman_upper</xsl:when> <!-- level 5 -->
5962
+ <xsl:when test="$list_level mod 4 = 0">alphabet_upper</xsl:when> <!-- level 4 -->
5963
+ <xsl:when test="$list_level mod 3 = 0">roman</xsl:when> <!-- level 3 -->
5964
+ <xsl:when test="$list_level mod 2 = 0 and ancestor::*/@class = 'steps'">alphabet</xsl:when> <!-- level 2 and @class = 'steps'-->
5965
+ <xsl:when test="$list_level mod 2 = 0">arabic</xsl:when> <!-- level 2 -->
5966
+ <xsl:otherwise> <!-- level 1 -->
5967
+ <xsl:choose>
5968
+ <xsl:when test="ancestor::*/@class = 'steps'">arabic</xsl:when>
5969
+ <xsl:otherwise>alphabet</xsl:otherwise>
5970
+ </xsl:choose>
5971
+ </xsl:otherwise>
5972
+ </xsl:choose>
5973
+
5974
+ </xsl:otherwise>
5975
+ </xsl:choose>
5976
+ </xsl:variable>
5977
+
5978
+ <xsl:variable name="format">
5979
+ <xsl:choose>
5980
+ <xsl:when test="$type = 'arabic'">
5981
+ 1.
5982
+ </xsl:when>
5983
+ <xsl:when test="$type = 'alphabet'">
5984
+ a)
5985
+ </xsl:when>
5986
+ <xsl:when test="$type = 'alphabet_upper'">
5987
+ A.
5988
+ </xsl:when>
5989
+ <xsl:when test="$type = 'roman'">
5990
+ i)
5991
+ </xsl:when>
5992
+ <xsl:when test="$type = 'roman_upper'">I.</xsl:when>
5993
+ <xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
5994
+ </xsl:choose>
5995
+ </xsl:variable>
5996
+
5997
+ <xsl:number value="$start_value + $curr_value" format="{normalize-space($format)}" lang="en"/>
5998
+
5999
+ </xsl:otherwise>
6000
+ </xsl:choose>
5393
6001
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5394
6002
  <xsl:choose>
5395
6003
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5405,18 +6013,75 @@
5405
6013
 
5406
6014
  <fo:block-container margin-left="0mm">
5407
6015
  <fo:block>
5408
- <xsl:apply-templates select="." mode="ul_ol"/>
6016
+ <xsl:apply-templates select="." mode="list"/>
5409
6017
  </fo:block>
5410
6018
  </fo:block-container>
5411
6019
  </fo:block-container>
5412
6020
  </xsl:when>
5413
6021
  <xsl:otherwise>
5414
6022
  <fo:block>
5415
- <xsl:apply-templates select="." mode="ul_ol"/>
6023
+ <xsl:apply-templates select="." mode="list"/>
5416
6024
  </fo:block>
5417
6025
  </xsl:otherwise>
5418
6026
  </xsl:choose>
5419
- </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
6027
+ </xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
6028
+ <fo:list-block xsl:use-attribute-sets="list-style">
6029
+
6030
+
6031
+
6032
+
6033
+
6034
+
6035
+ <xsl:if test="local-name() = 'ol'">
6036
+ <xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
6037
+ </xsl:if>
6038
+
6039
+
6040
+
6041
+
6042
+ <xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
6043
+ </fo:list-block>
6044
+ <!-- <xsl:for-each select="./iho:note">
6045
+ <xsl:call-template name="note"/>
6046
+ </xsl:for-each> -->
6047
+ <xsl:apply-templates select="./*[local-name() = 'note']"/>
6048
+ </xsl:template><xsl:template match="*[local-name()='li']">
6049
+ <fo:list-item xsl:use-attribute-sets="list-item-style">
6050
+ <xsl:copy-of select="@id"/>
6051
+
6052
+
6053
+
6054
+ <fo:list-item-label end-indent="label-end()">
6055
+ <fo:block xsl:use-attribute-sets="list-item-label-style">
6056
+
6057
+
6058
+
6059
+ <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6060
+ <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
6061
+ <xsl:call-template name="append_add-style"/>
6062
+ </xsl:if>
6063
+
6064
+ <xsl:call-template name="getListItemFormat"/>
6065
+ </fo:block>
6066
+ </fo:list-item-label>
6067
+ <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
6068
+ <fo:block>
6069
+
6070
+
6071
+
6072
+
6073
+
6074
+ <xsl:apply-templates/>
6075
+
6076
+ <!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
6077
+
6078
+ <xsl:for-each select="./bsi:note">
6079
+ <xsl:call-template name="note"/>
6080
+ </xsl:for-each> -->
6081
+ </fo:block>
6082
+ </fo:list-item-body>
6083
+ </fo:list-item>
6084
+ </xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="bookmark_in_fn">
5420
6085
  <xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
5421
6086
  <bookmark><xsl:value-of select="@id"/></bookmark>
5422
6087
  </xsl:for-each>
@@ -5438,7 +6103,7 @@
5438
6103
  <!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
5439
6104
  <xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
5440
6105
  <xsl:if test="@to">
5441
- <xsl:value-of select="$dash"/>
6106
+ <xsl:value-of select="$en_dash"/>
5442
6107
  <xsl:copy>
5443
6108
  <xsl:copy-of select="@*"/>
5444
6109
  <xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
@@ -5463,7 +6128,7 @@
5463
6128
  <xsl:param name="target"/>
5464
6129
  <!-- <node></node> -->
5465
6130
  <xsl:choose>
5466
- <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
6131
+ <xsl:when test="self::text() and (normalize-space(.) = ',' or normalize-space(.) = $en_dash) and $remove = 'true'">
5467
6132
  <!-- skip text (i.e. remove it) and process next element -->
5468
6133
  <!-- [removed_<xsl:value-of select="."/>] -->
5469
6134
  <xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
@@ -5547,12 +6212,22 @@
5547
6212
  </xsl:variable>
5548
6213
  <xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
5549
6214
  <xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_', -->
6215
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
6216
+ <fo:block xsl:use-attribute-sets="indexsect-title-style">
6217
+ <!-- Index -->
6218
+ <xsl:apply-templates/>
6219
+ </fo:block>
6220
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4">
6221
+ <!-- Letter A, B, C, ... -->
6222
+ <fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
6223
+ <xsl:apply-templates/>
6224
+ </fo:block>
5550
6225
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
5551
6226
  <xsl:apply-templates/>
5552
6227
  <fo:block>
5553
- <xsl:if test="following-sibling::*[local-name() = 'clause']">
5554
- <fo:block> </fo:block>
5555
- </xsl:if>
6228
+ <xsl:if test="following-sibling::*[local-name() = 'clause']">
6229
+ <fo:block> </fo:block>
6230
+ </xsl:if>
5556
6231
  </fo:block>
5557
6232
  </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
5558
6233
  <xsl:apply-templates/>
@@ -5562,6 +6237,9 @@
5562
6237
 
5563
6238
  <xsl:apply-templates/>
5564
6239
  </fo:block>
6240
+ </xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
6241
+ <!-- to split by '_' and other chars -->
6242
+ <xsl:call-template name="add-zero-spaces-java"/>
5565
6243
  </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
5566
6244
  <fo:inline id="{@id}" font-size="1pt"/>
5567
6245
  </xsl:template><xsl:template match="*[local-name() = 'errata']">
@@ -5759,23 +6437,45 @@
5759
6437
  <xsl:apply-templates/>
5760
6438
  </fo:inline>
5761
6439
  </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
6440
+
6441
+ <!-- list of footnotes to calculate actual footnotes number -->
6442
+ <xsl:variable name="p_fn_">
6443
+ <xsl:call-template name="get_fn_list"/>
6444
+ </xsl:variable>
6445
+ <xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
6446
+ <xsl:variable name="gen_id" select="generate-id(.)"/>
6447
+ <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
6448
+ <!-- fn sequence number in document -->
6449
+ <xsl:variable name="current_fn_number">
6450
+ <xsl:choose>
6451
+ <xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI -->
6452
+ <xsl:otherwise>
6453
+ <!-- <xsl:value-of select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1" /> -->
6454
+ <xsl:value-of select="count($p_fn//fn[@gen_id = $gen_id]/preceding-sibling::fn) + 1"/>
6455
+ </xsl:otherwise>
6456
+ </xsl:choose>
6457
+ </xsl:variable>
5762
6458
  <fo:footnote>
5763
6459
  <xsl:variable name="number">
5764
6460
 
5765
- <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
6461
+ <xsl:value-of select="$current_fn_number"/>
5766
6462
 
5767
6463
  </xsl:variable>
6464
+
6465
+ <xsl:variable name="current_fn_number_text">
6466
+ <xsl:value-of select="$number"/>
6467
+
6468
+ </xsl:variable>
6469
+
5768
6470
  <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
5769
- <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
5770
- <xsl:value-of select="$number"/>
5771
-
6471
+ <fo:basic-link internal-destination="{$gen_id}" fox:alt-text="footnote {$number}">
6472
+ <xsl:value-of select="$current_fn_number_text"/>
5772
6473
  </fo:basic-link>
5773
6474
  </fo:inline>
5774
6475
  <fo:footnote-body>
5775
6476
  <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
5776
- <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
5777
- <xsl:value-of select="$number"/>
5778
-
6477
+ <fo:inline id="{$gen_id}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
6478
+ <xsl:value-of select="$current_fn_number_text"/>
5779
6479
  </fo:inline>
5780
6480
  <xsl:apply-templates/>
5781
6481
  </fo:block>
@@ -5901,7 +6601,7 @@
5901
6601
  </fo:table-body>
5902
6602
  </fo:table>
5903
6603
  </fo:block>
5904
- </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
6604
+ </xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2">
5905
6605
  <fo:table-row min-height="5mm">
5906
6606
  <xsl:apply-templates/>
5907
6607
  </fo:table-row>
@@ -6016,6 +6716,78 @@
6016
6716
  <!-- processing for admonition/p found in the template for 'p' -->
6017
6717
  <xsl:call-template name="paragraph"/>
6018
6718
 
6719
+ </xsl:template><xsl:template match="@*|node()" mode="update_xml_step1">
6720
+ <xsl:copy>
6721
+ <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
6722
+ </xsl:copy>
6723
+ </xsl:template><xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
6724
+ <xsl:copy>
6725
+ <xsl:copy-of select="@*"/>
6726
+
6727
+ <xsl:variable name="nodes_preface_">
6728
+ <xsl:for-each select="*">
6729
+ <node id="{@id}"/>
6730
+ </xsl:for-each>
6731
+ </xsl:variable>
6732
+ <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
6733
+
6734
+ <xsl:for-each select="*">
6735
+ <xsl:sort select="@displayorder" data-type="number"/>
6736
+
6737
+ <!-- process Section's title -->
6738
+ <xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
6739
+ <xsl:if test="$preceding-sibling_id != ''">
6740
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
6741
+ </xsl:if>
6742
+
6743
+ <xsl:choose>
6744
+ <xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
6745
+ <xsl:otherwise>
6746
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6747
+ </xsl:otherwise>
6748
+ </xsl:choose>
6749
+
6750
+ </xsl:for-each>
6751
+ </xsl:copy>
6752
+ </xsl:template><xsl:template match="*[local-name() = 'sections']" mode="update_xml_step1">
6753
+ <xsl:copy>
6754
+ <xsl:copy-of select="@*"/>
6755
+
6756
+ <xsl:variable name="nodes_sections_">
6757
+ <xsl:for-each select="*">
6758
+ <node id="{@id}"/>
6759
+ </xsl:for-each>
6760
+ </xsl:variable>
6761
+ <xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
6762
+
6763
+ <!-- move section 'Normative references' inside 'sections' -->
6764
+ <xsl:for-each select="* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
6765
+ <xsl:sort select="@displayorder" data-type="number"/>
6766
+
6767
+ <!-- process Section's title -->
6768
+ <xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
6769
+ <xsl:if test="$preceding-sibling_id != ''">
6770
+ <xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
6771
+ </xsl:if>
6772
+
6773
+ <xsl:choose>
6774
+ <xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
6775
+ <xsl:otherwise>
6776
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6777
+ </xsl:otherwise>
6778
+ </xsl:choose>
6779
+
6780
+ </xsl:for-each>
6781
+ </xsl:copy>
6782
+ </xsl:template><xsl:template match="*[local-name() = 'bibliography']" mode="update_xml_step1">
6783
+ <xsl:copy>
6784
+ <xsl:copy-of select="@*"/>
6785
+ <!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
6786
+ <xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
6787
+ <xsl:sort select="@displayorder" data-type="number"/>
6788
+ <xsl:apply-templates select="." mode="update_xml_step1"/>
6789
+ </xsl:for-each>
6790
+ </xsl:copy>
6019
6791
  </xsl:template><xsl:template name="convertDate">
6020
6792
  <xsl:param name="date"/>
6021
6793
  <xsl:param name="format" select="'short'"/>
@@ -6129,9 +6901,6 @@
6129
6901
  <xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
6130
6902
  </xsl:choose>
6131
6903
  </xsl:template><xsl:template name="addPDFUAmeta">
6132
- <xsl:variable name="lang">
6133
- <xsl:call-template name="getLang"/>
6134
- </xsl:variable>
6135
6904
  <pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
6136
6905
  <pdf:dictionary type="normal" key="ViewerPreferences">
6137
6906
  <pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
@@ -6359,10 +7128,12 @@
6359
7128
  <xsl:param name="key"/>
6360
7129
  <xsl:param name="formatted">false</xsl:param>
6361
7130
  <xsl:param name="lang"/>
7131
+ <xsl:param name="returnEmptyIfNotFound">false</xsl:param>
6362
7132
 
6363
7133
  <xsl:variable name="curr_lang">
6364
7134
  <xsl:choose>
6365
7135
  <xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
7136
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6366
7137
  <xsl:otherwise>
6367
7138
  <xsl:call-template name="getLang"/>
6368
7139
  </xsl:otherwise>
@@ -6397,6 +7168,7 @@
6397
7168
  </xsl:otherwise>
6398
7169
  </xsl:choose>
6399
7170
  </xsl:when>
7171
+ <xsl:when test="$returnEmptyIfNotFound = 'true'"/>
6400
7172
  <xsl:otherwise>
6401
7173
  <xsl:variable name="key_">
6402
7174
  <xsl:call-template name="capitalize">
@@ -6466,53 +7238,153 @@
6466
7238
  <xsl:param name="first"/>
6467
7239
  <xsl:if test="$number != ''">
6468
7240
  <xsl:variable name="words">
6469
- <words>
6470
- <word cardinal="1">One-</word>
6471
- <word ordinal="1">First </word>
6472
- <word cardinal="2">Two-</word>
6473
- <word ordinal="2">Second </word>
6474
- <word cardinal="3">Three-</word>
6475
- <word ordinal="3">Third </word>
6476
- <word cardinal="4">Four-</word>
6477
- <word ordinal="4">Fourth </word>
6478
- <word cardinal="5">Five-</word>
6479
- <word ordinal="5">Fifth </word>
6480
- <word cardinal="6">Six-</word>
6481
- <word ordinal="6">Sixth </word>
6482
- <word cardinal="7">Seven-</word>
6483
- <word ordinal="7">Seventh </word>
6484
- <word cardinal="8">Eight-</word>
6485
- <word ordinal="8">Eighth </word>
6486
- <word cardinal="9">Nine-</word>
6487
- <word ordinal="9">Ninth </word>
6488
- <word ordinal="10">Tenth </word>
6489
- <word ordinal="11">Eleventh </word>
6490
- <word ordinal="12">Twelfth </word>
6491
- <word ordinal="13">Thirteenth </word>
6492
- <word ordinal="14">Fourteenth </word>
6493
- <word ordinal="15">Fifteenth </word>
6494
- <word ordinal="16">Sixteenth </word>
6495
- <word ordinal="17">Seventeenth </word>
6496
- <word ordinal="18">Eighteenth </word>
6497
- <word ordinal="19">Nineteenth </word>
6498
- <word cardinal="20">Twenty-</word>
6499
- <word ordinal="20">Twentieth </word>
6500
- <word cardinal="30">Thirty-</word>
6501
- <word ordinal="30">Thirtieth </word>
6502
- <word cardinal="40">Forty-</word>
6503
- <word ordinal="40">Fortieth </word>
6504
- <word cardinal="50">Fifty-</word>
6505
- <word ordinal="50">Fiftieth </word>
6506
- <word cardinal="60">Sixty-</word>
6507
- <word ordinal="60">Sixtieth </word>
6508
- <word cardinal="70">Seventy-</word>
6509
- <word ordinal="70">Seventieth </word>
6510
- <word cardinal="80">Eighty-</word>
6511
- <word ordinal="80">Eightieth </word>
6512
- <word cardinal="90">Ninety-</word>
6513
- <word ordinal="90">Ninetieth </word>
6514
- <word cardinal="100">Hundred-</word>
6515
- <word ordinal="100">Hundredth </word>
7241
+ <words>
7242
+ <xsl:choose>
7243
+ <xsl:when test="$lang = 'fr'"> <!-- https://en.wiktionary.org/wiki/Appendix:French_numbers -->
7244
+ <word cardinal="1">Une-</word>
7245
+ <word ordinal="1">Première </word>
7246
+ <word cardinal="2">Deux-</word>
7247
+ <word ordinal="2">Seconde </word>
7248
+ <word cardinal="3">Trois-</word>
7249
+ <word ordinal="3">Tierce </word>
7250
+ <word cardinal="4">Quatre-</word>
7251
+ <word ordinal="4">Quatrième </word>
7252
+ <word cardinal="5">Cinq-</word>
7253
+ <word ordinal="5">Cinquième </word>
7254
+ <word cardinal="6">Six-</word>
7255
+ <word ordinal="6">Sixième </word>
7256
+ <word cardinal="7">Sept-</word>
7257
+ <word ordinal="7">Septième </word>
7258
+ <word cardinal="8">Huit-</word>
7259
+ <word ordinal="8">Huitième </word>
7260
+ <word cardinal="9">Neuf-</word>
7261
+ <word ordinal="9">Neuvième </word>
7262
+ <word ordinal="10">Dixième </word>
7263
+ <word ordinal="11">Onzième </word>
7264
+ <word ordinal="12">Douzième </word>
7265
+ <word ordinal="13">Treizième </word>
7266
+ <word ordinal="14">Quatorzième </word>
7267
+ <word ordinal="15">Quinzième </word>
7268
+ <word ordinal="16">Seizième </word>
7269
+ <word ordinal="17">Dix-septième </word>
7270
+ <word ordinal="18">Dix-huitième </word>
7271
+ <word ordinal="19">Dix-neuvième </word>
7272
+ <word cardinal="20">Vingt-</word>
7273
+ <word ordinal="20">Vingtième </word>
7274
+ <word cardinal="30">Trente-</word>
7275
+ <word ordinal="30">Trentième </word>
7276
+ <word cardinal="40">Quarante-</word>
7277
+ <word ordinal="40">Quarantième </word>
7278
+ <word cardinal="50">Cinquante-</word>
7279
+ <word ordinal="50">Cinquantième </word>
7280
+ <word cardinal="60">Soixante-</word>
7281
+ <word ordinal="60">Soixantième </word>
7282
+ <word cardinal="70">Septante-</word>
7283
+ <word ordinal="70">Septantième </word>
7284
+ <word cardinal="80">Huitante-</word>
7285
+ <word ordinal="80">Huitantième </word>
7286
+ <word cardinal="90">Nonante-</word>
7287
+ <word ordinal="90">Nonantième </word>
7288
+ <word cardinal="100">Cent-</word>
7289
+ <word ordinal="100">Centième </word>
7290
+ </xsl:when>
7291
+ <xsl:when test="$lang = 'ru'">
7292
+ <word cardinal="1">Одна-</word>
7293
+ <word ordinal="1">Первое </word>
7294
+ <word cardinal="2">Две-</word>
7295
+ <word ordinal="2">Второе </word>
7296
+ <word cardinal="3">Три-</word>
7297
+ <word ordinal="3">Третье </word>
7298
+ <word cardinal="4">Четыре-</word>
7299
+ <word ordinal="4">Четвертое </word>
7300
+ <word cardinal="5">Пять-</word>
7301
+ <word ordinal="5">Пятое </word>
7302
+ <word cardinal="6">Шесть-</word>
7303
+ <word ordinal="6">Шестое </word>
7304
+ <word cardinal="7">Семь-</word>
7305
+ <word ordinal="7">Седьмое </word>
7306
+ <word cardinal="8">Восемь-</word>
7307
+ <word ordinal="8">Восьмое </word>
7308
+ <word cardinal="9">Девять-</word>
7309
+ <word ordinal="9">Девятое </word>
7310
+ <word ordinal="10">Десятое </word>
7311
+ <word ordinal="11">Одиннадцатое </word>
7312
+ <word ordinal="12">Двенадцатое </word>
7313
+ <word ordinal="13">Тринадцатое </word>
7314
+ <word ordinal="14">Четырнадцатое </word>
7315
+ <word ordinal="15">Пятнадцатое </word>
7316
+ <word ordinal="16">Шестнадцатое </word>
7317
+ <word ordinal="17">Семнадцатое </word>
7318
+ <word ordinal="18">Восемнадцатое </word>
7319
+ <word ordinal="19">Девятнадцатое </word>
7320
+ <word cardinal="20">Двадцать-</word>
7321
+ <word ordinal="20">Двадцатое </word>
7322
+ <word cardinal="30">Тридцать-</word>
7323
+ <word ordinal="30">Тридцатое </word>
7324
+ <word cardinal="40">Сорок-</word>
7325
+ <word ordinal="40">Сороковое </word>
7326
+ <word cardinal="50">Пятьдесят-</word>
7327
+ <word ordinal="50">Пятидесятое </word>
7328
+ <word cardinal="60">Шестьдесят-</word>
7329
+ <word ordinal="60">Шестидесятое </word>
7330
+ <word cardinal="70">Семьдесят-</word>
7331
+ <word ordinal="70">Семидесятое </word>
7332
+ <word cardinal="80">Восемьдесят-</word>
7333
+ <word ordinal="80">Восьмидесятое </word>
7334
+ <word cardinal="90">Девяносто-</word>
7335
+ <word ordinal="90">Девяностое </word>
7336
+ <word cardinal="100">Сто-</word>
7337
+ <word ordinal="100">Сотое </word>
7338
+ </xsl:when>
7339
+ <xsl:otherwise> <!-- default english -->
7340
+ <word cardinal="1">One-</word>
7341
+ <word ordinal="1">First </word>
7342
+ <word cardinal="2">Two-</word>
7343
+ <word ordinal="2">Second </word>
7344
+ <word cardinal="3">Three-</word>
7345
+ <word ordinal="3">Third </word>
7346
+ <word cardinal="4">Four-</word>
7347
+ <word ordinal="4">Fourth </word>
7348
+ <word cardinal="5">Five-</word>
7349
+ <word ordinal="5">Fifth </word>
7350
+ <word cardinal="6">Six-</word>
7351
+ <word ordinal="6">Sixth </word>
7352
+ <word cardinal="7">Seven-</word>
7353
+ <word ordinal="7">Seventh </word>
7354
+ <word cardinal="8">Eight-</word>
7355
+ <word ordinal="8">Eighth </word>
7356
+ <word cardinal="9">Nine-</word>
7357
+ <word ordinal="9">Ninth </word>
7358
+ <word ordinal="10">Tenth </word>
7359
+ <word ordinal="11">Eleventh </word>
7360
+ <word ordinal="12">Twelfth </word>
7361
+ <word ordinal="13">Thirteenth </word>
7362
+ <word ordinal="14">Fourteenth </word>
7363
+ <word ordinal="15">Fifteenth </word>
7364
+ <word ordinal="16">Sixteenth </word>
7365
+ <word ordinal="17">Seventeenth </word>
7366
+ <word ordinal="18">Eighteenth </word>
7367
+ <word ordinal="19">Nineteenth </word>
7368
+ <word cardinal="20">Twenty-</word>
7369
+ <word ordinal="20">Twentieth </word>
7370
+ <word cardinal="30">Thirty-</word>
7371
+ <word ordinal="30">Thirtieth </word>
7372
+ <word cardinal="40">Forty-</word>
7373
+ <word ordinal="40">Fortieth </word>
7374
+ <word cardinal="50">Fifty-</word>
7375
+ <word ordinal="50">Fiftieth </word>
7376
+ <word cardinal="60">Sixty-</word>
7377
+ <word ordinal="60">Sixtieth </word>
7378
+ <word cardinal="70">Seventy-</word>
7379
+ <word ordinal="70">Seventieth </word>
7380
+ <word cardinal="80">Eighty-</word>
7381
+ <word ordinal="80">Eightieth </word>
7382
+ <word cardinal="90">Ninety-</word>
7383
+ <word ordinal="90">Ninetieth </word>
7384
+ <word cardinal="100">Hundred-</word>
7385
+ <word ordinal="100">Hundredth </word>
7386
+ </xsl:otherwise>
7387
+ </xsl:choose>
6516
7388
  </words>
6517
7389
  </xsl:variable>
6518
7390
 
@@ -6586,4 +7458,18 @@
6586
7458
  <xsl:otherwise>_</xsl:otherwise>
6587
7459
  </xsl:choose>
6588
7460
  </xsl:attribute>
7461
+ </xsl:template><xsl:template name="substring-after-last">
7462
+ <xsl:param name="value"/>
7463
+ <xsl:param name="delimiter"/>
7464
+ <xsl:choose>
7465
+ <xsl:when test="contains($value, $delimiter)">
7466
+ <xsl:call-template name="substring-after-last">
7467
+ <xsl:with-param name="value" select="substring-after($value, $delimiter)"/>
7468
+ <xsl:with-param name="delimiter" select="$delimiter"/>
7469
+ </xsl:call-template>
7470
+ </xsl:when>
7471
+ <xsl:otherwise>
7472
+ <xsl:value-of select="$value"/>
7473
+ </xsl:otherwise>
7474
+ </xsl:choose>
6589
7475
  </xsl:template></xsl:stylesheet>