metanorma-bipm 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -21,8 +21,6 @@
21
21
 
22
22
  <xsl:variable name="first_pass" select="count($index//item) = 0"/>
23
23
 
24
- <xsl:variable name="pageWidth" select="210"/>
25
- <xsl:variable name="pageHeight" select="297"/>
26
24
  <xsl:variable name="marginLeftRight1" select="31.7"/>
27
25
  <xsl:variable name="marginLeftRight2" select="40"/>
28
26
  <xsl:variable name="marginTop" select="25.4"/>
@@ -34,7 +32,7 @@
34
32
  <!-- IT USES for mn2pdf -->
35
33
  <xsl:variable name="coverpages_count">2</xsl:variable><!-- DON'T DELETE IT -->
36
34
 
37
-
35
+
38
36
  <xsl:variable name="debug">false</xsl:variable>
39
37
 
40
38
  <xsl:variable name="copyrightYear" select="//bipm:bipm-standard/bipm:bibdata/bipm:copyright/bipm:from"/>
@@ -57,10 +55,6 @@
57
55
  <xsl:variable name="num"><xsl:number level="any" count="bipm:bipm-standard"/></xsl:variable>
58
56
  <xsl:variable name="title-part"><xsl:value-of select="bipm:bibdata/bipm:title[@type = 'part']"/></xsl:variable>
59
57
  <xsl:variable name="current_document">
60
- <!-- <xsl:apply-templates select="." mode="change_id">
61
- <xsl:with-param name="lang" select="$lang"/>
62
- <xsl:with-param name="ignoreReferenceFrom" select="'true'"/>
63
- </xsl:apply-templates> -->
64
58
  <xsl:copy-of select="."/>
65
59
  </xsl:variable>
66
60
  <xsl:for-each select="xalan:nodeset($current_document)">
@@ -78,9 +72,6 @@
78
72
  <xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
79
73
  <xsl:variable name="num"><xsl:number level="any" count="bipm:bipm-standard"/></xsl:variable>
80
74
  <xsl:variable name="current_document">
81
- <!-- <xsl:apply-templates select="." mode="change_id">
82
- <xsl:with-param name="lang" select="$lang"/>
83
- </xsl:apply-templates> -->
84
75
  <xsl:copy-of select="."/>
85
76
  </xsl:variable>
86
77
  <xsl:for-each select="xalan:nodeset($current_document)">
@@ -124,7 +115,6 @@
124
115
 
125
116
  <!-- add id to xref and split xref with @to into two xref -->
126
117
  <xsl:variable name="current_document_index_id">
127
- <!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
128
118
  <xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
129
119
  </xsl:variable>
130
120
 
@@ -156,7 +146,6 @@
156
146
  </xsl:variable>
157
147
 
158
148
  <xsl:variable name="current_document_index_id">
159
- <!-- <xsl:apply-templates select=".//bipm:clause[@type = 'index']" mode="index_add_id"/> -->
160
149
  <xsl:apply-templates select=".//bipm:indexsect" mode="index_add_id"/>
161
150
  </xsl:variable>
162
151
 
@@ -190,7 +179,6 @@
190
179
 
191
180
 
192
181
  <xsl:variable name="independentAppendix" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:appendix)"/>
193
- <!-- <xsl:variable name="independentAppendix" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:title[@type = 'appendix'])"/> -->
194
182
 
195
183
  <xsl:variable name="doctype" select="//bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:doctype"/>
196
184
 
@@ -207,7 +195,6 @@
207
195
  </xsl:if>
208
196
 
209
197
  <!-- Index -->
210
- <!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
211
198
  <xsl:apply-templates select="//bipm:indexsect" mode="contents"/>
212
199
 
213
200
  </contents>
@@ -439,17 +426,6 @@
439
426
  <xsl:for-each select="//bipm:bipm-standard">
440
427
  <xsl:variable name="lang" select="*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
441
428
  <xsl:variable name="num"><xsl:number level="any" count="bipm:bipm-standard"/></xsl:variable>
442
- <!-- change id to prevent identical id in different documents in one container -->
443
- <!-- <xsl:variable name="current_document">
444
- <xsl:apply-templates select="." mode="change_id">
445
- <xsl:with-param name="lang" select="$lang"/>
446
- <xsl:with-param name="ignoreReferenceFrom" select="'true'"/>
447
- </xsl:apply-templates>
448
- </xsl:variable>
449
-
450
- <xsl:variable name="flatxml">
451
- <xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
452
- </xsl:variable> -->
453
429
 
454
430
  <xsl:variable name="title_eref">
455
431
  <xsl:apply-templates select="." mode="title_eref"/>
@@ -475,16 +451,6 @@
475
451
  <xsl:for-each select="(//bipm:bipm-standard)[*[local-name()='bibdata']/*[local-name()='language'][@current = 'true'] = $doc_split_by_language]">
476
452
  <xsl:variable name="lang" select="*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
477
453
  <xsl:variable name="num"><xsl:number level="any" count="bipm:bipm-standard"/></xsl:variable>
478
- <!-- change id to prevent identical id in different documents in one container -->
479
- <!-- <xsl:variable name="current_document">
480
- <xsl:apply-templates select="." mode="change_id">
481
- <xsl:with-param name="lang" select="$lang"/>
482
- </xsl:apply-templates>
483
- </xsl:variable>
484
-
485
- <xsl:variable name="flatxml">
486
- <xsl:apply-templates select="xalan:nodeset($current_document)" mode="flatxml"/>
487
- </xsl:variable> -->
488
454
 
489
455
  <xsl:variable name="title_eref">
490
456
  <xsl:apply-templates select="." mode="title_eref"/>
@@ -581,7 +547,6 @@
581
547
  <xsl:apply-templates select="@*" mode="flatxml"/>
582
548
 
583
549
  <xsl:variable name="pos_first_clause_" select="count(bipm:clause[1]/preceding-sibling::*)"/>
584
- <!-- pos_first_clause=<xsl:value-of select="$pos_first_clause"/> -->
585
550
 
586
551
  <xsl:variable name="pos_first_clause">
587
552
  <xsl:choose>
@@ -624,34 +589,10 @@
624
589
 
625
590
 
626
591
  <!-- flattening clauses from 2nd level -->
627
- <!-- <xsl:template match="bipm:clause[not(parent::bipm:sections) and not(parent::bipm:annex) and not(parent::bipm:abstract) and not(ancestor::bipm:boilerplate)]" mode="flatxml"> -->
628
592
  <xsl:template match="bipm:clause[not(parent::bipm:sections) and not(parent::bipm:annex) and not(parent::bipm:preface) and not(ancestor::bipm:boilerplate)]" mode="flatxml">
629
593
  <xsl:copy>
630
594
  <xsl:apply-templates select="@*" mode="flatxml"/>
631
595
 
632
- <!-- add note_side inside empty clause to show near the title -->
633
- <!-- <xsl:variable name="curr_id" select="@id"/>
634
- <xsl:for-each select=".//bipm:quote[ancestor::bipm:clause[1][@id = $curr_id]]//bipm:fn">
635
- <xsl:element name="note_side" namespace="https://www.metanorma.org/ns/bipm">
636
-
637
- <xsl:attribute name="id">
638
- <xsl:call-template name="fn_reference_to_xref_target"/>
639
- </xsl:attribute>
640
-
641
- <xsl:variable name="num" select="position()"/>
642
-
643
- <xsl:variable name="asterisks">
644
- <xsl:call-template name="repeat">
645
- <xsl:with-param name="char" select="'*'"/>
646
- <xsl:with-param name="count" select="$num + 1"/>
647
- </xsl:call-template>
648
- </xsl:variable>
649
- <xsl:value-of select="$asterisks"/>
650
-
651
- <xsl:text> </xsl:text>
652
- <xsl:apply-templates mode="flatxml"/>
653
- </xsl:element>
654
- </xsl:for-each> -->
655
596
  </xsl:copy>
656
597
  <xsl:apply-templates mode="flatxml"/>
657
598
  </xsl:template>
@@ -686,7 +627,7 @@
686
627
  <xsl:template match="bipm:clause2/*[local-name() != 'quote' and local-name() != 'note' and local-name() != 'clause'][last()]" mode="flatxml">
687
628
  <xsl:copy>
688
629
  <xsl:apply-templates select="@*|node()" mode="flatxml"/>
689
- <!-- <xsl:copy-of select="following-sibling::*[local-name() = 'note']"/> -->
630
+
690
631
  <xsl:for-each select="following-sibling::*[local-name() = 'note']">
691
632
  <xsl:call-template name="change_note_kind"/>
692
633
  </xsl:for-each>
@@ -698,17 +639,7 @@
698
639
  </xsl:if>
699
640
  </xsl:copy>
700
641
  </xsl:template>
701
-
702
- <!-- <xsl:template match="bipm:clause2/*[count(following-sibling::*) = 1 and following-sibling::*[local-name() = 'note']]" mode="flatxml">
703
- <xsl:copy>
704
- <xsl:apply-templates select="@*|node()" mode="flatxml"/>
705
- <xsl:copy-of select="following-sibling::*[local-name() = 'note']"/>
706
- </xsl:copy>
707
- </xsl:template> -->
708
-
709
- <!-- <xsl:template match="bipm:clause/bipm:note[count(following-sibling::*) = 0]" mode="flatxml"/> -->
710
- <!-- <xsl:template match="bipm:clause/bipm:note[count(following-sibling::*[local-name() != 'clause' and local-name() != 'note']) = 0]" mode="flatxml" priority="2"/> -->
711
-
642
+
712
643
 
713
644
  <xsl:template match="bipm:note" name="change_note_kind" mode="flatxml">
714
645
  <xsl:variable name="element">
@@ -742,9 +673,7 @@
742
673
  <xsl:otherwise>
743
674
  <xsl:apply-templates select="." mode="fn_to_xref"/> <!-- displays asterisks with link to side note -->
744
675
  <xsl:call-template name="fn_to_note_side"/> <!-- convert footnote to side note with asterisk at start -->
745
- <!-- <xsl:element name="note_side" namespace="https://www.metanorma.org/ns/bipm">
746
- <xsl:apply-templates mode="flatxml"/>
747
- </xsl:element> -->
676
+
748
677
  </xsl:otherwise>
749
678
  </xsl:choose>
750
679
  </xsl:template>
@@ -762,9 +691,7 @@
762
691
  <xsl:otherwise>
763
692
  <xsl:apply-templates select="." mode="fn_to_xref"/> <!-- displays asterisks with link to side note -->
764
693
  <xsl:call-template name="fn_to_note_side"/> <!-- convert footnote to side note with asterisk at start -->
765
- <!-- <xsl:element name="note_side" namespace="https://www.metanorma.org/ns/bipm">
766
- <xsl:apply-templates mode="flatxml"/>
767
- </xsl:element> -->
694
+
768
695
  </xsl:otherwise>
769
696
  </xsl:choose>
770
697
  </xsl:template>
@@ -790,17 +717,9 @@
790
717
  </xsl:choose>
791
718
  </xsl:variable>
792
719
 
793
- <!-- <xsl:variable name="asterisks">
794
- <xsl:call-template name="repeat">
795
- <xsl:with-param name="char" select="'*'"/>
796
- <xsl:with-param name="count" select="$number + 1"/>
797
- </xsl:call-template>
798
- </xsl:variable>
799
- <xsl:value-of select="$asterisks"/> -->
800
720
  <xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/bipm">
801
721
  <xsl:value-of select="concat('(',$number,')')"/>
802
722
  </xsl:element>
803
- <!-- <xsl:text> </xsl:text> -->
804
723
 
805
724
  </xsl:element>
806
725
  </xsl:template>
@@ -827,9 +746,6 @@
827
746
 
828
747
  <!-- flat lists -->
829
748
  <xsl:template match="bipm:ul | bipm:ol" mode="flatxml" priority="2">
830
- <!-- <xsl:copy>
831
- <xsl:copy-of select="@*"/>
832
- </xsl:copy> -->
833
749
  <xsl:apply-templates mode="flatxml_list"/>
834
750
  </xsl:template>
835
751
 
@@ -853,9 +769,9 @@
853
769
  <xsl:attribute name="list_type">
854
770
  <xsl:value-of select="local-name(..)"/>
855
771
  </xsl:attribute>
856
- <!-- <xsl:attribute name="label"> -->
772
+
857
773
  <xsl:call-template name="setListItemLabel"/>
858
- <!-- </xsl:attribute> -->
774
+
859
775
  <xsl:if test="ancestor::bipm:quote">
860
776
  <xsl:attribute name="parent-type">quote</xsl:attribute>
861
777
  </xsl:if>
@@ -864,7 +780,6 @@
864
780
 
865
781
  <!-- if current li is first -->
866
782
  <xsl:if test="not(preceding-sibling::*[local-name() = 'li'])">
867
- <!-- <xsl:copy-of select="following-sibling::bipm:li[last()]/following-sibling::*"/> -->
868
783
 
869
784
  <!-- move note for list (list level note) into first 'li' -->
870
785
  <xsl:for-each select="following-sibling::bipm:li[last()]/following-sibling::*">
@@ -910,10 +825,6 @@
910
825
 
911
826
  </xsl:if>
912
827
 
913
- <!-- move note for list (list level note) into latest 'li' -->
914
- <!-- <xsl:if test="not(following-sibling::*[local-name() = 'li'])">
915
- <xsl:copy-of select="following-sibling::*"/>
916
- </xsl:if> -->
917
828
  </xsl:copy>
918
829
  </xsl:template>
919
830
 
@@ -939,13 +850,7 @@
939
850
  </xsl:choose>
940
851
  </xsl:variable>
941
852
 
942
- <!-- <xsl:variable name="asterisks">
943
- <xsl:call-template name="repeat">
944
- <xsl:with-param name="char" select="'*'"/>
945
- <xsl:with-param name="count" select="$number + 1"/>
946
- </xsl:call-template>
947
- </xsl:variable>
948
- <xsl:value-of select="$asterisks"/> -->
853
+
949
854
  <xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/bipm">
950
855
  <xsl:value-of select="concat('(',$number,')')"/>
951
856
  </xsl:element>
@@ -965,8 +870,7 @@
965
870
  <xsl:when test="local-name(..) = 'ul'">
966
871
  <xsl:call-template name="setULLabel"/>
967
872
  </xsl:when>
968
- <!-- <xsl:when test="local-name(..) = 'ul' and ../ancestor::bipm:ul">&#x2212;</xsl:when> --> <!-- &#x2212; - minus sign. &#x2014; - dash -->
969
- <!-- <xsl:when test="local-name(..) = 'ul'">•</xsl:when> --> <!-- &#x2014; dash -->
873
+
970
874
  <xsl:otherwise> <!-- for ordered lists -->
971
875
  <xsl:variable name="start_value">
972
876
  <xsl:choose>
@@ -985,11 +889,6 @@
985
889
  <xsl:choose>
986
890
  <xsl:when test="../@type = 'arabic'">1.</xsl:when>
987
891
  <xsl:when test="../@type = 'alphabet'">a)</xsl:when>
988
- <!-- <xsl:choose>
989
- <xsl:when test="$independentAppendix = ''">a)</xsl:when>
990
- <xsl:otherwise>(a)</xsl:otherwise>
991
- </xsl:choose>
992
- </xsl:when> -->
993
892
  <xsl:when test="../@type = 'alphabet_upper'">A.</xsl:when>
994
893
  <xsl:when test="../@type = 'roman'">(i)</xsl:when>
995
894
  <xsl:when test="../@type = 'roman_upper'">I.</xsl:when>
@@ -1010,30 +909,7 @@
1010
909
  </xsl:choose>
1011
910
  </xsl:template>
1012
911
 
1013
- <!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml"/> -->
1014
912
  <xsl:template match="bipm:indexsect" mode="flatxml"/>
1015
- <!-- <xsl:template match="bipm:clause[@type = 'index']" mode="flatxml">
1016
- <xsl:copy>
1017
- <xsl:apply-templates select="@*" mode="flatxml_index"/>
1018
- <xsl:apply-templates mode="flatxml_index"/>
1019
- </xsl:copy>
1020
- </xsl:template>
1021
-
1022
- <xsl:template match="@*|node()" mode="flatxml_index">
1023
- <xsl:copy>
1024
- <xsl:apply-templates select="@*|node()" mode="flatxml_index"/>
1025
- </xsl:copy>
1026
- </xsl:template>
1027
-
1028
- <xsl:template match="bipm:xref" mode="flatxml_index">
1029
- <xsl:copy>
1030
- <xsl:apply-templates select="@*" mode="flatxml_index"/>
1031
- <xsl:attribute name="id">
1032
- <xsl:value-of select="generate-id(.)"/>
1033
- </xsl:attribute>
1034
- <xsl:apply-templates mode="flatxml_index"/>
1035
- </xsl:copy>
1036
- </xsl:template> -->
1037
913
 
1038
914
  <!-- ================================= -->
1039
915
  <!-- END: Flattening xml for fit notes at page sides (margins) -->
@@ -1078,40 +954,6 @@
1078
954
 
1079
955
  </xsl:template>
1080
956
 
1081
- <xsl:template match="bipm:pagebreak2" mode="pagebreak">
1082
- <xsl:variable name="orientation" select="normalize-space(@orientation)"/>
1083
- <xsl:variable name="tree">
1084
- <xsl:for-each select="ancestor::*[ancestor::bipm:sections or ancestor::bipm:annex or ancestor::bipm:preface]">
1085
- <element pos="{position()}">
1086
- <xsl:value-of select="name()"/>
1087
- </element>
1088
- </xsl:for-each>
1089
- </xsl:variable>
1090
- <!-- close preceding elements -->
1091
- <xsl:for-each select="xalan:nodeset($tree)//element">
1092
- <xsl:sort data-type="number" order="descending" select="@pos"/>
1093
- <xsl:text disable-output-escaping="yes">&lt;/</xsl:text>
1094
- <xsl:value-of select="."/>
1095
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
1096
- </xsl:for-each>
1097
- <!-- open elements -->
1098
- <xsl:for-each select="xalan:nodeset($tree)//element">
1099
- <xsl:text disable-output-escaping="yes">&lt;</xsl:text>
1100
- <xsl:value-of select="."/>
1101
- <xsl:for-each select="@*[local-name() != 'pos']">
1102
- <xsl:text> </xsl:text>
1103
- <xsl:value-of select="local-name()"/>
1104
- <xsl:text>="</xsl:text>
1105
- <xsl:value-of select="."/>
1106
- <xsl:text>"</xsl:text>
1107
- </xsl:for-each>
1108
- <xsl:if test="position() = 1">
1109
- <xsl:text> orientation="</xsl:text><xsl:value-of select="$orientation"/><xsl:text>"</xsl:text>
1110
- </xsl:if>
1111
- <xsl:text disable-output-escaping="yes">&gt;</xsl:text>
1112
- </xsl:for-each>
1113
-
1114
- </xsl:template>
1115
957
  <!-- ================================= -->
1116
958
  <!-- END: Page breaks processing -->
1117
959
  <!-- ================================= -->
@@ -1241,7 +1083,6 @@
1241
1083
 
1242
1084
  <fo:flow flow-name="xsl-region-body">
1243
1085
  <fo:block line-height="135%">
1244
- <!-- <xsl:apply-templates select="bipm:preface/bipm:abstract" /> -->
1245
1086
  <xsl:apply-templates select="bipm:preface/*[1]"/>
1246
1087
  </fo:block>
1247
1088
  </fo:flow>
@@ -1271,8 +1112,7 @@
1271
1112
 
1272
1113
  <fo:block-container margin-left="-14mm" margin-right="0mm">
1273
1114
  <fo:block-container margin-left="0mm" margin-right="0mm">
1274
- <fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">
1275
- <!-- <fo:marker marker-class-name="header-title"><xsl:value-of select="$title-toc"/></fo:marker> -->
1115
+ <fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">
1276
1116
  <fo:inline><xsl:value-of select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']"/></fo:inline>
1277
1117
  <fo:inline keep-together.within-line="always">
1278
1118
  <fo:leader leader-pattern="space"/>
@@ -1321,7 +1161,6 @@
1321
1161
  </fo:page-sequence>
1322
1162
 
1323
1163
 
1324
- <!-- <xsl:apply-templates select="bipm:preface/*[not(local-name() = 'abstract')]" mode="sections" /> --> <!-- bipm:clause -->
1325
1164
  <xsl:apply-templates select="bipm:preface/*[position() &gt; 1]" mode="sections"/> <!-- bipm:clause -->
1326
1165
 
1327
1166
 
@@ -1345,7 +1184,6 @@
1345
1184
  <xsl:apply-templates select="bipm:doccontrol" mode="sections"/>
1346
1185
 
1347
1186
  <!-- Index -->
1348
- <!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
1349
1187
  <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
1350
1188
  <xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
1351
1189
  </xsl:apply-templates>
@@ -1394,7 +1232,6 @@
1394
1232
  <fo:block-container font-size="18pt" font-weight="bold" text-align="center">
1395
1233
  <fo:block role="H1">
1396
1234
 
1397
- <!-- <xsl:variable name="title"> -->
1398
1235
  <xsl:choose>
1399
1236
  <xsl:when test="$independentAppendix != ''">
1400
1237
  <xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='appendix']" mode="title"/>
@@ -1406,22 +1243,8 @@
1406
1243
  <xsl:apply-templates select="//bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type='main']" mode="title"/>
1407
1244
  </xsl:otherwise>
1408
1245
  </xsl:choose>
1409
- <!-- </xsl:variable> -->
1410
1246
 
1411
1247
 
1412
- <!-- <xsl:variable name="mep_text" select="'Mise en pratique'"/>
1413
-
1414
- <xsl:choose>
1415
- <xsl:when test="$curr_lang = 'en' and contains($title, $mep_text)">
1416
- <xsl:value-of select="substring-before($title, $mep_text)"/>
1417
- <xsl:text> </xsl:text><fo:inline font-style="italic"><xsl:value-of select="$mep_text"/></fo:inline><xsl:text> </xsl:text>
1418
- <xsl:value-of select="substring-after($title, $mep_text)"/>
1419
- </xsl:when>
1420
- <xsl:otherwise>
1421
- <xsl:value-of select="$title"/>
1422
- </xsl:otherwise>
1423
- </xsl:choose> -->
1424
-
1425
1248
  </fo:block>
1426
1249
 
1427
1250
 
@@ -1503,11 +1326,10 @@
1503
1326
  </fo:page-sequence>
1504
1327
 
1505
1328
 
1506
- <xsl:apply-templates select="bipm:preface/*" mode="sections"/> <!-- bipm:clause -->
1329
+ <xsl:apply-templates select="bipm:preface/*" mode="sections"/>
1507
1330
 
1508
1331
  <!-- Document Pages -->
1509
1332
  <xsl:apply-templates select="bipm:sections/*" mode="sections"/>
1510
- <!-- <xsl:call-template name="sections_appendix"/> --> <!-- without pagebreaks -->
1511
1333
 
1512
1334
  <!-- Normative references -->
1513
1335
  <xsl:apply-templates select="bipm:bibliography/bipm:references[@normative='true']" mode="sections"/>
@@ -1522,7 +1344,6 @@
1522
1344
  <xsl:apply-templates select="bipm:doccontrol" mode="sections"/>
1523
1345
 
1524
1346
  <!-- Index -->
1525
- <!-- <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:clause[@type = 'index']" mode="index" /> -->
1526
1347
  <xsl:apply-templates select="xalan:nodeset($indexes)/doc[@id = $docid]//bipm:indexsect" mode="index">
1527
1348
  <xsl:with-param name="isDraft" select="normalize-space(//bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:draft or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'draft') or contains(//bipm:bipm-standard/bipm:bibdata/bipm:status/bipm:stage, 'projet'))"/>
1528
1349
  </xsl:apply-templates>
@@ -1630,15 +1451,10 @@
1630
1451
  <fo:block font-size="22.2pt" font-weight="{$weight-bold}" margin-top="1mm" role="H1"><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:title[@language = 'en' and @type = 'main']"/></fo:block>
1631
1452
 
1632
1453
  <xsl:variable name="edition_str">édition</xsl:variable>
1633
- <!-- <xsl:choose>
1634
- <xsl:when test="$lang = 'fr'">édition</xsl:when>
1635
- <xsl:otherwise>edition</xsl:otherwise>
1636
- </xsl:choose>
1637
- </xsl:variable> -->
1454
+
1638
1455
  <fo:block font-size="14pt" font-weight="{$weight-bold}" margin-top="4mm"><xsl:value-of select="concat((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:edition, ' ', $edition_str, ' ', $copyrightYear)"/></fo:block>
1639
1456
  </fo:block-container>
1640
1457
 
1641
- <!-- <fo:block-container height="98%" display-align="center"> -->
1642
1458
  <fo:block-container absolute-position="fixed" left="12.5mm" top="92mm" height="170mm" width="144mm" display-align="center">
1643
1459
  <fo:block role="H1">
1644
1460
 
@@ -1669,14 +1485,6 @@
1669
1485
 
1670
1486
  <xsl:variable name="titles_length" select="string-length($title_appendix_fr) + string-length($title_appendix_en) + string-length($title_annex_fr) + string-length($title_annex_en) + string-length($title_part_fr) + string-length($title_part_en) + string-length($title_subpart_fr) + string-length($title_subpart_fr)"/>
1671
1487
 
1672
- <!-- <xsl:variable name="font-size-number-factor">
1673
- <xsl:choose>
1674
- <xsl:when test="$titles_length &gt; 350">0.7</xsl:when>
1675
- <xsl:when test="$titles_length &gt; 250">0.85</xsl:when>
1676
- <xsl:when test="$titles_length &gt; 130">0.9</xsl:when>
1677
- <xsl:otherwise>1</xsl:otherwise>
1678
- </xsl:choose>
1679
- </xsl:variable> -->
1680
1488
 
1681
1489
  <xsl:variable name="space-factor">
1682
1490
  <xsl:choose>
@@ -1704,7 +1512,6 @@
1704
1512
  </xsl:choose>
1705
1513
  </xsl:variable>
1706
1514
 
1707
- <!-- <fo:block font-size="6pt">DEBUG font-size-factor=<xsl:value-of select="$font-size-factor"/>, titles_length=<xsl:value-of select="$titles_length"/></fo:block> -->
1708
1515
  <!-- Appendix titles processing -->
1709
1516
  <xsl:variable name="appendix_num" select="normalize-space((//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:appendix)"/>
1710
1517
  <xsl:if test="$appendix_num != ''">
@@ -1817,38 +1624,13 @@
1817
1624
  </fo:block>
1818
1625
  </fo:block-container>
1819
1626
 
1820
- <!-- <fo:block-container>
1821
- <fo:block font-family="Work Sans" font-size="16pt" line-height="120%" font-weight="400" margin-top="20mm">
1822
- <fo:block>
1823
- <xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $lang]"/>
1824
- <xsl:text> (</xsl:text>
1825
- <xsl:variable name="editionFO">
1826
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:edition">
1827
- <xsl:with-param name="curr_lang" select="$lang"/>
1828
- </xsl:apply-templates>
1829
- </xsl:variable>
1830
- <xsl:value-of select="normalize-space($editionFO)"/>
1831
- <xsl:text>)</xsl:text>
1832
- </fo:block>
1833
- <fo:block>
1834
- <xsl:choose>
1835
- <xsl:when test="$lang = 'fr'">Annexe </xsl:when>
1836
- <xsl:otherwise>Appendix </xsl:otherwise>
1837
- </xsl:choose>
1838
- <xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:appendix"/>
1839
- </fo:block>
1840
- </fo:block>
1841
- <fo:block font-family="Work Sans" font-size="36pt" font-weight="600" margin-top="15mm">
1842
- <xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@type = 'appendix' and @language = $lang]"/>
1843
- </fo:block>
1844
- </fo:block-container> -->
1845
1627
 
1846
1628
  <fo:block-container absolute-position="fixed" left="12mm" top="242mm" height="42mm" width="140mm" display-align="after">
1847
1629
  <fo:block font-size="12pt">
1848
1630
  <fo:block><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:editorialgroup/bipm:committee/bipm:variant[@language = 'fr']"/></fo:block>
1849
1631
  <fo:block><xsl:value-of select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:ext/bipm:editorialgroup/bipm:committee/bipm:variant[@language = 'en']"/></fo:block>
1850
1632
  <fo:block> </fo:block>
1851
- <!-- <fo:block>BIPM SI MEP S1</fo:block> -->
1633
+
1852
1634
  <fo:block>
1853
1635
  <xsl:call-template name="printRevisionDate">
1854
1636
  <xsl:with-param name="date" select="(//bipm:bipm-standard)[1]/bipm:bibdata/bipm:version/bipm:revision-date"/>
@@ -1966,8 +1748,6 @@
1966
1748
  </xsl:for-each>
1967
1749
 
1968
1750
 
1969
-
1970
-
1971
1751
  </fo:flow>
1972
1752
  </fo:page-sequence>
1973
1753
  </xsl:if>
@@ -2000,11 +1780,6 @@
2000
1780
  <fo:block break-after="page"/>
2001
1781
 
2002
1782
  <xsl:call-template name="insert_Logo-BIPM-Metro"/>
2003
- <!-- <fo:block-container absolute-position="fixed" left="47mm" top="67mm">
2004
- <fo:block>
2005
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo-BIPM-Metro))}" width="118.6mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
2006
- </fo:block>
2007
- </fo:block-container> -->
2008
1783
 
2009
1784
  <fo:block break-after="page"/>
2010
1785
  <fo:block> </fo:block>
@@ -2018,22 +1793,8 @@
2018
1793
  <xsl:for-each select="//bipm:bipm-standard/bipm:bibdata">
2019
1794
  <lang><xsl:value-of select="bipm:language[@current = 'true']"/></lang>
2020
1795
  </xsl:for-each>
2021
- <!-- <xsl:choose>
2022
- <xsl:when test="count(//bipm:bipm-standard) = 1">
2023
- <lang>fr</lang>
2024
- <lang>en</lang>
2025
- </xsl:when>
2026
- <xsl:otherwise>
2027
- <xsl:for-each select="//bipm:bipm-standard/bipm:bibdata">
2028
- <lang><xsl:value-of select="bipm:language"/></lang>
2029
- </xsl:for-each>
2030
- </xsl:otherwise>
2031
- </xsl:choose> -->
2032
1796
  </xsl:when>
2033
1797
  <xsl:otherwise>
2034
- <!-- <xsl:for-each select="(//bipm:bipm-standard)[$docnum]/bipm:bibdata">
2035
- <lang><xsl:value-of select="bipm:language"/></lang>
2036
- </xsl:for-each> -->
2037
1798
  <lang><xsl:value-of select="$doc_split_by_language"/></lang>
2038
1799
  </xsl:otherwise>
2039
1800
  </xsl:choose>
@@ -2064,14 +1825,9 @@
2064
1825
  </xsl:if>
2065
1826
  <fo:block role="TOCI">
2066
1827
  <xsl:if test="@level = 1">
2067
- <!-- <xsl:attribute name="space-after">6pt</xsl:attribute> -->
2068
1828
  <xsl:attribute name="font-family">Arial</xsl:attribute>
2069
1829
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2070
1830
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2071
- <!-- <xsl:if test="@type = 'annex'">
2072
- <xsl:attribute name="space-before">14pt</xsl:attribute>
2073
- <xsl:attribute name="space-after">0pt</xsl:attribute>
2074
- </xsl:if> -->
2075
1831
  </xsl:if>
2076
1832
  <xsl:if test="@level &gt;= 2 and not(@parent = 'annex')">
2077
1833
  <xsl:attribute name="font-size">10.5pt</xsl:attribute>
@@ -2094,12 +1850,7 @@
2094
1850
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2095
1851
  <xsl:attribute name="space-before">14pt</xsl:attribute>
2096
1852
  </xsl:if>
2097
- <!-- <xsl:if test="@level = 2 and not(following-sibling::item[@display='true']) and not(item[@display='true'])">
2098
- <xsl:attribute name="space-after">12pt</xsl:attribute>
2099
- </xsl:if>
2100
- <xsl:if test="@level = 3 and not(following-sibling::item[@display='true']) and not(../following-sibling::item[@display='true'])">
2101
- <xsl:attribute name="space-after">12pt</xsl:attribute>
2102
- </xsl:if> -->
1853
+
2103
1854
 
2104
1855
  <fo:list-block>
2105
1856
  <xsl:attribute name="provisional-distance-between-starts">
@@ -2119,11 +1870,11 @@
2119
1870
  <xsl:value-of select="@section"/>
2120
1871
  <xsl:if test="normalize-space(@section) != '' and @type = 'annex'">.</xsl:if>
2121
1872
  </xsl:if>
2122
- <!-- <fo:inline font-size="10pt" color="white">Z</fo:inline> --> <!-- for baseline alignment in string -->
1873
+
2123
1874
  </fo:block>
2124
1875
  </fo:list-item-label>
2125
1876
  <fo:list-item-body start-indent="body-start()">
2126
- <fo:block> <!-- text-align-last="justify" -->
1877
+ <fo:block>
2127
1878
  <xsl:if test="@level &gt;= 3">
2128
1879
  <xsl:attribute name="margin-left">11mm</xsl:attribute>
2129
1880
  <xsl:attribute name="text-indent">-11mm</xsl:attribute>
@@ -2132,19 +1883,11 @@
2132
1883
  <xsl:if test="@level &gt;= 3">
2133
1884
  <fo:inline padding-right="2mm"><xsl:value-of select="@section"/></fo:inline>
2134
1885
  </xsl:if>
2135
- <!-- <xsl:variable name="sectionTitle">
2136
- <xsl:apply-templates select="title"/>
2137
- </xsl:variable> -->
1886
+
2138
1887
  <fo:inline>
2139
- <!-- <xsl:value-of select="$sectionTitle"/> -->
2140
1888
  <xsl:apply-templates select="title"/>
2141
1889
  </fo:inline>
2142
- <!-- <xsl:text> </xsl:text> -->
2143
- <!-- keep-together.within-line="always" -->
2144
- <!-- <fo:inline >
2145
- <fo:leader leader-pattern="space"/>
2146
- <fo:inline font-family="Arial" font-weight="bold" font-size="10pt"><fo:page-number-citation ref-id="{@id}"/>35</fo:inline>
2147
- </fo:inline> -->
1890
+
2148
1891
  </fo:basic-link>
2149
1892
  </fo:block>
2150
1893
  </fo:list-item-body>
@@ -2343,23 +2086,10 @@
2343
2086
  </xsl:variable>
2344
2087
  <xsl:value-of select="."/>
2345
2088
  <fo:inline font-size="{$font-size}" baseline-shift="{$baseline-shift}">
2346
- <xsl:choose>
2347
- <xsl:when test="$curr_lang = 'fr'">
2348
- <xsl:choose>
2349
- <xsl:when test=". = '1'">re</xsl:when>
2350
- <xsl:otherwise>e</xsl:otherwise>
2351
- </xsl:choose>
2352
- </xsl:when>
2353
- <xsl:otherwise>
2354
- <xsl:choose>
2355
- <xsl:when test=". = '1'">st</xsl:when>
2356
- <xsl:when test=". = '2'">nd</xsl:when>
2357
- <xsl:when test=". = '3'">rd</xsl:when>
2358
- <xsl:otherwise>th</xsl:otherwise>
2359
- </xsl:choose>
2360
- </xsl:otherwise>
2361
- </xsl:choose>
2362
-
2089
+ <xsl:call-template name="number-to-ordinal">
2090
+ <xsl:with-param name="number" select="."/>
2091
+ <xsl:with-param name="curr_lang" select="$curr_lang"/>
2092
+ </xsl:call-template>
2363
2093
  </fo:inline>
2364
2094
  <xsl:text> </xsl:text>
2365
2095
  <xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
@@ -2367,51 +2097,8 @@
2367
2097
  </fo:inline>
2368
2098
  </xsl:template>
2369
2099
 
2370
- <xsl:template match="bipm:license-statement">
2371
- <fo:block font-size="10.5pt" font-family="Times New Roman">
2372
- <xsl:apply-templates/>
2373
- </fo:block>
2374
- </xsl:template>
2375
-
2376
- <xsl:template match="bipm:license-statement//bipm:title">
2377
- <xsl:variable name="level">
2378
- <xsl:call-template name="getLevel"/>
2379
- </xsl:variable>
2380
- <fo:block text-decoration="underline" margin-bottom="6pt" role="H{$level}">
2381
- <xsl:apply-templates/>
2382
- </fo:block>
2383
- </xsl:template>
2384
-
2385
- <xsl:template match="bipm:license-statement//bipm:p">
2386
- <fo:block text-align="justify" line-height="135%">
2387
- <xsl:apply-templates/>
2388
- </fo:block>
2389
- </xsl:template>
2390
2100
 
2391
- <!-- <xsl:template match="bipm:license-statement//bipm:link">
2392
- <fo:inline color="blue" text-decoration="underline">
2393
- <fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
2394
- <xsl:choose>
2395
- <xsl:when test="normalize-space(.) != ''">
2396
- <xsl:apply-templates/>
2397
- </xsl:when>
2398
- <xsl:otherwise>
2399
- <xsl:value-of select="@target"/>
2400
- </xsl:otherwise>
2401
- </xsl:choose>
2402
- </fo:basic-link>
2403
- </fo:inline>
2404
- </xsl:template> -->
2405
-
2406
-
2407
- <xsl:template match="bipm:feedback-statement">
2408
- <fo:block font-size="10pt" line-height="125%">
2409
- <xsl:apply-templates/>
2410
- </fo:block>
2411
- </xsl:template>
2412
-
2413
-
2414
- <xsl:template match="bipm:feedback-statement//bipm:p">
2101
+ <xsl:template match="bipm:feedback-statement//bipm:p" priority="2">
2415
2102
  <fo:block margin-top="6pt">
2416
2103
  <xsl:variable name="p_num"><xsl:number/></xsl:variable>
2417
2104
  <xsl:if test="$p_num = 1">Édité par le </xsl:if>
@@ -2432,8 +2119,6 @@
2432
2119
 
2433
2120
  <xsl:variable name="font-size">
2434
2121
  <xsl:choose>
2435
- <!-- <xsl:when test="$level = 1 and $independentAppendix != ''">11.5pt</xsl:when>
2436
- <xsl:when test="$level &gt;= 2 and $independentAppendix != ''">10.5pt</xsl:when> -->
2437
2122
  <xsl:when test="$level = 1">16pt</xsl:when>
2438
2123
  <xsl:when test="$level = 2 and ancestor::bipm:annex and ../@type = 'toc'">16pt</xsl:when>
2439
2124
  <xsl:when test="$level = 2 and ancestor::bipm:annex">10.5pt</xsl:when>
@@ -2463,20 +2148,13 @@
2463
2148
  <xsl:when test="$level = 1 and (parent::bipm:annex or ancestor::bipm:annex or parent::bipm:abstract or ancestor::bipm:preface)">84pt</xsl:when>
2464
2149
  <xsl:when test="$level = 1">6pt</xsl:when>
2465
2150
  <xsl:when test="$level = 2 and ancestor::bipm:annex and ../@type = 'toc'">29mm</xsl:when>
2466
- <xsl:when test="$level = 2 and ancestor::bipm:annex">6pt</xsl:when> <!-- 6pt 12pt -->
2467
- <!-- <xsl:when test="$level = 2 and $independentAppendix != ''">6pt</xsl:when> -->
2151
+ <xsl:when test="$level = 2 and ancestor::bipm:annex">6pt</xsl:when>
2468
2152
  <xsl:when test="$level = 2">10pt</xsl:when>
2469
2153
  <xsl:otherwise>6pt</xsl:otherwise>
2470
2154
  </xsl:choose>
2471
2155
  </xsl:attribute>
2472
- <!-- <xsl:if test="$level = 1 and $independentAppendix != ''">
2473
- <xsl:attribute name="space-before">24pt</xsl:attribute>
2474
- </xsl:if> -->
2475
- <!-- <xsl:if test="$level = 2 and $independentAppendix != ''">
2476
- <xsl:attribute name="margin-top">36pt</xsl:attribute>
2477
- </xsl:if> -->
2156
+
2478
2157
  <xsl:if test="$level = 2 and ancestor::bipm:annex">
2479
- <!-- <xsl:attribute name="margin-top">24pt</xsl:attribute> -->
2480
2158
  <xsl:attribute name="space-before">18pt</xsl:attribute> <!-- 24 pt -->
2481
2159
  </xsl:if>
2482
2160
  <xsl:if test="$level = 2 and not(ancestor::bipm:annex)">
@@ -2489,7 +2167,6 @@
2489
2167
  <xsl:attribute name="space-before">12pt</xsl:attribute>
2490
2168
  </xsl:if>
2491
2169
  <xsl:if test="$level = 3 and not(ancestor::bipm:annex)">
2492
- <!-- <xsl:attribute name="margin-top">20pt</xsl:attribute> -->
2493
2170
  <xsl:attribute name="space-before">20pt</xsl:attribute>
2494
2171
  </xsl:if>
2495
2172
 
@@ -2503,22 +2180,8 @@
2503
2180
 
2504
2181
  <fo:block-container margin-left="0mm">
2505
2182
 
2506
- <!-- marker not working for math -->
2507
- <!-- <xsl:if test="$level = 1">
2508
- <fo:marker marker-class-name="header-title">
2509
- <xsl:choose>
2510
- <xsl:when test="*[local-name() = 'tab']">
2511
- <xsl:apply-templates select="*[local-name() = 'tab'][1]/following-sibling::node()" mode="header"/>
2512
- </xsl:when>
2513
- <xsl:otherwise>
2514
- <xsl:apply-templates mode="header"/>
2515
- </xsl:otherwise>
2516
- </xsl:choose>
2517
- </fo:marker>
2518
- </xsl:if> -->
2519
-
2520
2183
  <xsl:choose>
2521
- <xsl:when test="*[local-name() = 'tab'] and not(ancestor::bipm:annex) "><!-- split number and title --> <!-- and $independentAppendix = '' -->
2184
+ <xsl:when test="*[local-name() = 'tab'] and not(ancestor::bipm:annex) "><!-- split number and title -->
2522
2185
  <fo:table table-layout="fixed" width="100%" role="H{$level}">
2523
2186
  <fo:table-column column-width="14mm"/>
2524
2187
  <fo:table-column column-width="136mm"/>
@@ -2541,41 +2204,27 @@
2541
2204
  </xsl:when>
2542
2205
  <xsl:otherwise>
2543
2206
  <fo:block role="H{$level}">
2544
- <!-- <xsl:if test="$independentAppendix != ''">
2545
- <xsl:attribute name="margin-left">14mm</xsl:attribute>
2546
- </xsl:if> -->
2207
+
2547
2208
  <xsl:choose>
2548
2209
  <xsl:when test="ancestor::bipm:annex and $level &gt;= 2">
2549
2210
  <xsl:if test="$level &gt;= 3">
2550
2211
  <xsl:attribute name="margin-left">14mm</xsl:attribute>
2551
2212
  </xsl:if>
2552
- <xsl:if test="$level = 3 and not(../@type = 'toc')">
2553
- <!-- <xsl:call-template name="blacksquare"/> -->
2554
- </xsl:if>
2555
2213
  <xsl:if test="$level = 4">
2556
2214
  <xsl:attribute name="text-align">center</xsl:attribute>
2557
2215
  </xsl:if>
2558
2216
  <xsl:if test="../@type = 'toc'">
2559
2217
  <xsl:attribute name="text-align">left</xsl:attribute>
2560
2218
  </xsl:if>
2561
- <!-- <xsl:call-template name="extractTitle"/> -->
2219
+
2562
2220
  <xsl:apply-templates/>
2563
2221
  <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2564
2222
  </xsl:when>
2565
2223
  <xsl:otherwise>
2566
- <!-- <xsl:choose>
2567
- <xsl:when test="$independentAppendix = ''"> -->
2568
- <xsl:apply-templates/>
2569
- <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2570
- <!-- </xsl:when>
2571
- <xsl:otherwise>
2572
- <xsl:variable name="section" select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
2573
- <xsl:if test="$section != '' and $level = 1">
2574
- <fo:inline padding-right="1mm"><xsl:value-of select="$section"/></fo:inline>
2575
- </xsl:if>
2576
- <xsl:call-template name="extractTitle"/>
2577
- </xsl:otherwise>
2578
- </xsl:choose> -->
2224
+
2225
+ <xsl:apply-templates/>
2226
+ <xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
2227
+
2579
2228
  </xsl:otherwise>
2580
2229
  </xsl:choose>
2581
2230
  <xsl:if test=".//bipm:note_side">
@@ -2606,7 +2255,6 @@
2606
2255
  <!-- ====== -->
2607
2256
 
2608
2257
 
2609
- <!-- <xsl:template match="bipm:preface/bipm:abstract" priority="3"> -->
2610
2258
  <xsl:template match="bipm:preface/*[1]" priority="3">
2611
2259
  <fo:table table-layout="fixed" width="173.5mm">
2612
2260
  <xsl:call-template name="setId"/>
@@ -2650,13 +2298,11 @@
2650
2298
 
2651
2299
  <xsl:variable name="rows_with_notes">
2652
2300
  <xsl:for-each select="*">
2653
- <!-- <xsl:if test=".//bipm:note[not(ancestor::bipm:table)]"> -->
2654
2301
  <xsl:if test=".//bipm:note_side"> <!-- virtual element note_side -->
2655
2302
  <row_num><xsl:value-of select="position()"/></row_num>
2656
2303
  </xsl:if>
2657
2304
  </xsl:for-each>
2658
2305
  </xsl:variable>
2659
- <!-- rows_with_notes<xsl:copy-of select="$rows_with_notes"/> -->
2660
2306
 
2661
2307
  <xsl:variable name="rows">
2662
2308
  <xsl:for-each select="xalan:nodeset($rows_with_notes)/row_num">
@@ -2690,9 +2336,7 @@
2690
2336
  </xsl:choose>
2691
2337
  </xsl:for-each>
2692
2338
  </xsl:variable>
2693
-
2694
-
2695
- <!-- rows=<xsl:copy-of select="$rows"/> -->
2339
+
2696
2340
 
2697
2341
  <xsl:apply-templates mode="clause_table">
2698
2342
  <xsl:with-param name="rows" select="$rows"/>
@@ -2702,8 +2346,6 @@
2702
2346
  </xsl:template>
2703
2347
 
2704
2348
 
2705
-
2706
- <!-- <xsl:template match="bipm:preface/bipm:abstract/*" mode="clause_table"> -->
2707
2349
  <xsl:template match="bipm:preface/*[1]/*" mode="clause_table">
2708
2350
  <xsl:param name="rows"/>
2709
2351
 
@@ -2735,24 +2377,12 @@
2735
2377
  <xsl:variable name="start_row" select="$current_row"/>
2736
2378
  <xsl:variable name="end_row" select="$current_row + $number-rows-spanned"/>
2737
2379
  <fo:block>
2738
- <!-- <xsl:for-each select="ancestor::bipm:abstract/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note[not(ancestor::bipm:table)]"> -->
2739
- <!-- <xsl:for-each select="ancestor::bipm:abstract/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note_side"> -->
2380
+
2740
2381
  <xsl:for-each select="ancestor::bipm:preface/*[1]/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note_side">
2741
2382
  <xsl:apply-templates select="." mode="note_side"/>
2742
2383
  </xsl:for-each>
2743
2384
  </fo:block>
2744
2385
 
2745
- <!-- DEBUG -->
2746
- <!-- <xsl:if test=".//bipm:note">
2747
- <fo:block>Note</fo:block>
2748
- </xsl:if>
2749
- <fo:block font-size="6pt" color="red">
2750
- <fo:block>current_row=<xsl:value-of select="$current_row"/></fo:block>
2751
- <xsl:for-each select="xalan:nodeset($rows)/num">
2752
- <fo:block>span_start=<xsl:value-of select="@span_start"/></fo:block>
2753
- <fo:block>span_num=<xsl:value-of select="@span_num"/></fo:block>
2754
- </xsl:for-each>
2755
- </fo:block> -->
2756
2386
 
2757
2387
  </fo:table-cell>
2758
2388
 
@@ -2764,8 +2394,6 @@
2764
2394
 
2765
2395
 
2766
2396
  <xsl:template match="bipm:sections/bipm:clause | bipm:annex/bipm:clause" priority="3">
2767
- <!-- <xsl:choose>
2768
- <xsl:when test="$independentAppendix = ''"> -->
2769
2397
 
2770
2398
  <xsl:variable name="space-before"> <!-- margin-top for title, see bipm:title -->
2771
2399
  <xsl:if test="local-name(*[1]) = 'title'">
@@ -2805,13 +2433,11 @@
2805
2433
 
2806
2434
  <xsl:variable name="rows_with_notes">
2807
2435
  <xsl:for-each select="*">
2808
- <!-- <xsl:if test=".//bipm:note[not(ancestor::bipm:table)]"> -->
2809
- <xsl:if test=".//bipm:note_side"> <!-- virtual element note_side --> <!-- [not(ancestor::bipm:table)] -->
2436
+ <xsl:if test=".//bipm:note_side"> <!-- virtual element note_side -->
2810
2437
  <row_num><xsl:value-of select="position()"/></row_num>
2811
2438
  </xsl:if>
2812
2439
  </xsl:for-each>
2813
2440
  </xsl:variable>
2814
- <!-- rows_with_notes<xsl:copy-of select="$rows_with_notes"/> -->
2815
2441
 
2816
2442
  <xsl:variable name="rows3">
2817
2443
  <xsl:for-each select="xalan:nodeset($rows_with_notes)/row_num">
@@ -2857,31 +2483,15 @@
2857
2483
  </xsl:for-each>
2858
2484
  </xsl:variable>
2859
2485
 
2860
- <!-- rows=<xsl:copy-of select="$rows"/> -->
2861
-
2862
2486
  <!-- updated strategy: consolidated show all block with note, instead of spanned rows -->
2863
2487
 
2864
2488
  <xsl:call-template name="insertClauses">
2865
2489
  <xsl:with-param name="rows" select="$rows"/>
2866
2490
  </xsl:call-template>
2867
-
2868
-
2869
- <!-- <xsl:apply-templates mode="clause_table">
2870
- <xsl:with-param name="rows" select="$rows"/>
2871
- </xsl:apply-templates> -->
2872
2491
 
2873
2492
  </fo:table-body>
2874
2493
  </fo:table>
2875
-
2876
- <!-- </xsl:when>
2877
- <xsl:otherwise>
2878
- <fo:block>
2879
- <xsl:call-template name="setId"/>
2880
- <xsl:apply-templates/>
2881
- </fo:block>
2882
- </xsl:otherwise>
2883
- </xsl:choose> -->
2884
-
2494
+
2885
2495
  </xsl:template>
2886
2496
 
2887
2497
 
@@ -2905,7 +2515,6 @@
2905
2515
  <xsl:if test="$start_row_next != '' and local-name(*[$start_row_next_num]) = 'title'">
2906
2516
  <xsl:if test="*[$start_row_next_num]/@depth = 2 and not(*[$start_row_next_num]/ancestor::bipm:annex)">30pt</xsl:if>
2907
2517
  <xsl:if test="*[$start_row_next_num]/@depth = 2 and *[$start_row_next_num]/ancestor::bipm:annex">18pt</xsl:if> <!-- 24pt -->
2908
- <!-- <xsl:attribute name="padding-bottom">20pt</xsl:attribute> -->
2909
2518
  <xsl:if test="*[$start_row_next_num]/@depth = 3 and not(*[$start_row_next_num]/ancestor::bipm:annex)">20pt</xsl:if>
2910
2519
  <xsl:if test="*[$start_row_next_num]/@depth = 3 and *[$start_row_next_num]/ancestor::bipm:annex">6pt</xsl:if> <!-- 6pt -->
2911
2520
  <xsl:if test="*[$start_row_next_num]/@depth = 4 and *[$start_row_next_num]/ancestor::bipm:annex">12pt</xsl:if> <!-- 6pt -->
@@ -2920,7 +2529,6 @@
2920
2529
  <xsl:attribute name="padding-bottom"><xsl:value-of select="$table-row-padding-bottom-value"/></xsl:attribute>
2921
2530
  </xsl:if>
2922
2531
 
2923
- <!-- <fo:block>$end_row=<xsl:value-of select="$end_row"/>,local-name(*[$end_row])=<xsl:value-of select="local-name(*[$end_row]) "/></fo:block> -->
2924
2532
 
2925
2533
  <fo:block>
2926
2534
  <!-- insert elements from sections/clause annex/clause -->
@@ -2964,8 +2572,8 @@
2964
2572
  <xsl:variable name="current_row"><xsl:number count="*"/></xsl:variable>
2965
2573
 
2966
2574
 
2967
- <fo:table-row> <!-- border="1pt solid black" -->
2968
- <fo:table-cell> <!-- border="1pt solid black" -->
2575
+ <fo:table-row>
2576
+ <fo:table-cell>
2969
2577
  <fo:block>
2970
2578
  <xsl:apply-templates select="."/>
2971
2579
  </fo:block>
@@ -2991,8 +2599,7 @@
2991
2599
  <xsl:variable name="end_row" select="$current_row + $number-rows-spanned"/>
2992
2600
 
2993
2601
  <fo:block>
2994
- <!-- <fo:block>display-align=<xsl:value-of select="xalan:nodeset($rows)/num[@span_start = $current_row]/@display-align"/></fo:block> -->
2995
- <!-- <xsl:for-each select="ancestor::*[1]/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note"> -->
2602
+
2996
2603
  <xsl:for-each select="ancestor::*[1]/*[position() &gt;= $start_row and position() &lt; $end_row]//bipm:note_side">
2997
2604
 
2998
2605
  <xsl:apply-templates select="." mode="note_side"/>
@@ -3027,29 +2634,18 @@
3027
2634
  </xsl:otherwise>
3028
2635
  </xsl:choose>
3029
2636
 
3030
- <!-- <xsl:if test="$namespace = 'bipm'">
3031
- <xsl:attribute name="keep-with-next">always</xsl:attribute>
3032
- </xsl:if> -->
3033
2637
  </xsl:template>
3034
2638
 
3035
2639
 
3036
2640
  <!-- skip, because it process in note_side template -->
3037
- <!-- <xsl:template match="bipm:preface/bipm:abstract//bipm:note[not(ancestor::bipm:table)]" priority="3"/> -->
3038
- <!-- <xsl:template match="bipm:preface/bipm:abstract//bipm:note_side" priority="3"/> -->
3039
2641
  <xsl:template match="bipm:preface/*[1]//bipm:note_side" priority="3"/>
3040
2642
 
3041
2643
 
3042
- <!-- <xsl:template match="bipm:sections//bipm:note | bipm:annex//bipm:note" priority="3"> -->
3043
2644
  <xsl:template match="bipm:sections//bipm:note_side | bipm:annex//bipm:note_side" priority="3">
3044
- <!-- <xsl:if test="$independentAppendix != ''">
3045
- <fo:block>
3046
- <xsl:apply-templates />
3047
- </fo:block>
3048
- </xsl:if> -->
3049
- </xsl:template> <!-- [not(ancestor::bipm:table)] -->
2645
+
2646
+ </xsl:template>
3050
2647
 
3051
2648
 
3052
- <!-- <xsl:template match="bipm:note" mode="note_side"> -->
3053
2649
  <xsl:template match="bipm:note_side" mode="note_side">
3054
2650
  <fo:block line-height-shift-adjustment="disregard-shifts" space-after="4pt">
3055
2651
  <xsl:call-template name="setId"/>
@@ -3062,7 +2658,7 @@
3062
2658
  <xsl:if test="$num = 1 and ancestor::bipm:table[1]/bipm:name/bipm:tab">
3063
2659
  <xsl:attribute name="margin-top">48pt</xsl:attribute>
3064
2660
  </xsl:if>
3065
- <!-- <fo:inline>num=<xsl:value-of select="$num"/></fo:inline> -->
2661
+
3066
2662
  </xsl:if>
3067
2663
 
3068
2664
  <!-- if note relates to title, but not fn -->
@@ -3071,9 +2667,8 @@
3071
2667
  <xsl:apply-templates mode="note_side"/>
3072
2668
  </fo:block>
3073
2669
  </xsl:template>
3074
- <!-- <xsl:template match="bipm:note/bipm:name" mode="note_side" priority="2"/> -->
2670
+
3075
2671
  <xsl:template match="bipm:note_side/bipm:name" mode="note_side" priority="2"/>
3076
- <!-- <xsl:template match="bipm:note/*" mode="note_side"> -->
3077
2672
  <xsl:template match="bipm:note_side/*" mode="note_side">
3078
2673
  <xsl:apply-templates select="."/>
3079
2674
  </xsl:template>
@@ -3105,7 +2700,7 @@
3105
2700
  </xsl:template>
3106
2701
 
3107
2702
 
3108
- <xsl:template match="bipm:p" name="p">
2703
+ <xsl:template match="bipm:p" name="paragraph">
3109
2704
  <xsl:param name="inline" select="'false'"/>
3110
2705
 
3111
2706
  <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
@@ -3137,9 +2732,6 @@
3137
2732
  <xsl:if test="ancestor::bipm:table and ancestor::bipm:preface">
3138
2733
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
3139
2734
  </xsl:if>
3140
- <xsl:if test="ancestor::bipm:dd and not(ancestor::bipm:table)">
3141
- <!-- <xsl:attribute name="margin-bottom">4pt</xsl:attribute> -->
3142
- </xsl:if>
3143
2735
  <xsl:if test="parent::bipm:li">
3144
2736
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3145
2737
  </xsl:if>
@@ -3171,10 +2763,10 @@
3171
2763
  </xsl:if>
3172
2764
  </xsl:template>
3173
2765
 
3174
- <xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process" priority="2">
2766
+ <xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="4">
3175
2767
  <xsl:choose>
3176
2768
  <xsl:when test="ancestor::bipm:preface">
3177
- <xsl:call-template name="p"/>
2769
+ <xsl:call-template name="paragraph"/>
3178
2770
  </xsl:when>
3179
2771
  <xsl:otherwise>
3180
2772
  <xsl:apply-templates/>
@@ -3184,7 +2776,6 @@
3184
2776
 
3185
2777
 
3186
2778
  <xsl:template match="bipm:ul | bipm:ol" mode="ul_ol">
3187
- <!-- <fo:block id="{@id}"/> -->
3188
2779
  <xsl:apply-templates/><!-- for second level -->
3189
2780
  </xsl:template>
3190
2781
 
@@ -3214,17 +2805,7 @@
3214
2805
 
3215
2806
  <fo:block-container margin-left="0mm">
3216
2807
  <fo:list-block provisional-distance-between-starts="6.5mm"> <!-- debug: border="0.5pt solid blue" -->
3217
- <!-- last item -->
3218
- <!-- <xsl:if test="not(following-sibling::*[1][local-name() = 'li'])">
3219
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3220
- <xsl:if test="../ancestor::bipm:ul | ../ancestor::bipm:ol">
3221
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3222
- </xsl:if>
3223
- <xsl:if test="../following-sibling::*[1][local-name() = 'ul' or local-name() = 'ol']">
3224
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
3225
- </xsl:if>
3226
- </xsl:if> -->
3227
- <!-- <xsl:if test="../ancestor::bipm:note"> -->
2808
+
3228
2809
  <xsl:if test="ancestor::bipm:note_side">
3229
2810
  <xsl:attribute name="provisional-distance-between-starts">0mm</xsl:attribute>
3230
2811
  </xsl:if>
@@ -3242,28 +2823,6 @@
3242
2823
  </xsl:if>
3243
2824
  <xsl:value-of select="@label"/>
3244
2825
  </fo:inline>
3245
- <!-- <xsl:choose>
3246
- <xsl:when test="@list_type = 'ul'"><fo:inline font-size="14pt" baseline-shift="-15%">•</fo:inline></xsl:when>
3247
- <xsl:otherwise>
3248
- <xsl:choose>
3249
- <xsl:when test="../@type = 'arabic'">
3250
- <xsl:number format="1."/>
3251
- </xsl:when>
3252
- <xsl:when test="../@type = 'alphabet'">
3253
- <xsl:number format="a)"/>
3254
- </xsl:when>
3255
- <xsl:when test="../@type = 'alphabet_upper'">
3256
- <xsl:number format="A)"/>
3257
- </xsl:when>
3258
- <xsl:when test="../@type = 'roman'">
3259
- <xsl:number format="i)"/>
3260
- </xsl:when>
3261
- <xsl:otherwise>
3262
- <xsl:number format="1)"/>
3263
- </xsl:otherwise>
3264
- </xsl:choose>
3265
- </xsl:otherwise>
3266
- </xsl:choose> -->
3267
2826
  </fo:block>
3268
2827
  </fo:list-item-label>
3269
2828
  <fo:list-item-body start-indent="body-start()" line-height-shift-adjustment="disregard-shifts">
@@ -3271,7 +2830,6 @@
3271
2830
  <xsl:if test="@list_type = 'ol'">
3272
2831
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3273
2832
  </xsl:if>
3274
- <!-- <xsl:if test="ancestor::bipm:note"> -->
3275
2833
  <xsl:if test="ancestor::bipm:note_side">
3276
2834
  <xsl:attribute name="text-indent">3mm</xsl:attribute>
3277
2835
  </xsl:if>
@@ -3379,10 +2937,8 @@
3379
2937
  <xsl:template match="bipm:references/bipm:bibitem/bipm:docidentifier[(@type='metanorma' or @type='metanorma-ordinal') and ../bipm:formattedref]"/>
3380
2938
 
3381
2939
 
3382
- <xsl:template match="bipm:pagebreak">
2940
+ <xsl:template match="bipm:pagebreak" priority="2">
3383
2941
  <fo:block break-after="page"/>
3384
- <!-- <fo:block>&#xA0;</fo:block>
3385
- <fo:block break-after="page"/> -->
3386
2942
  </xsl:template>
3387
2943
 
3388
2944
 
@@ -3395,10 +2951,9 @@
3395
2951
 
3396
2952
  <xsl:choose>
3397
2953
  <xsl:when test="@pagenumber='true'"><!-- ToC in Appendix, and page in references like this: « Le BIPM et la Convention du Mètre » (page 5). -->
3398
- <fo:inline> <!-- font-weight="bold" -->
2954
+ <fo:inline>
3399
2955
  <!-- DEBUG -->
3400
2956
  <xsl:if test="@id">
3401
- <!-- <xsl:value-of select="concat('[', @id,']')"/> -->
3402
2957
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
3403
2958
  </xsl:if>
3404
2959
  <fo:page-number-citation ref-id="{@target}"/>
@@ -3439,7 +2994,6 @@
3439
2994
  <xsl:template match="bipm:eref[.//bipm:locality[@type = 'anchor']]" priority="2">
3440
2995
  <xsl:variable name="target" select=".//bipm:locality[@type = 'anchor']/bipm:referenceFrom"/>
3441
2996
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
3442
- <!-- <xsl:apply-templates select="node()[not(local-name() = 'localityStack')]"/> -->
3443
2997
  <xsl:if test="xalan:nodeset($ids)//id = $target">
3444
2998
  <fo:page-number-citation ref-id="{$target}"/>
3445
2999
  </xsl:if>
@@ -3460,9 +3014,6 @@
3460
3014
  <xsl:otherwise>Note: </xsl:otherwise>
3461
3015
  </xsl:choose>
3462
3016
  </xsl:when>
3463
- <!-- <xsl:when test="../preceding-sibling::*[1][local-name = 'note'] or following-sibling::*[1][local-name = 'note']">
3464
- <xsl:number/><xsl:text>. </xsl:text>
3465
- </xsl:when> -->
3466
3017
  <xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
3467
3018
  <xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
3468
3019
  <xsl:number count="//bipm:table[@id = $table_id]//bipm:note"/><xsl:text>. </xsl:text>
@@ -3851,9 +3402,6 @@
3851
3402
  <fo:block-container font-family="Arial" font-size="8pt" padding-top="12.5mm">
3852
3403
  <fo:block text-align="right">
3853
3404
  <xsl:copy-of select="$header-title"/>
3854
- <!-- <fo:retrieve-marker retrieve-class-name="header-title"
3855
- retrieve-boundary="page-sequence"
3856
- retrieve-position="first-starting-within-page"/> -->
3857
3405
  <xsl:text>  </xsl:text>
3858
3406
  <fo:inline font-size="13pt" baseline-shift="-15%">•</fo:inline>
3859
3407
  <xsl:text>  </xsl:text>
@@ -3877,10 +3425,7 @@
3877
3425
  <xsl:text>  </xsl:text>
3878
3426
  <fo:inline font-size="13pt" baseline-shift="-15%">•</fo:inline>
3879
3427
  <xsl:text>  </xsl:text>
3880
- <xsl:copy-of select="$header-title"/>
3881
- <!-- <fo:retrieve-marker retrieve-class-name="header-title"
3882
- retrieve-boundary="page-sequence"
3883
- retrieve-position="first-starting-within-page"/> -->
3428
+ <xsl:copy-of select="$header-title"/>
3884
3429
  </fo:block>
3885
3430
  <fo:block-container font-size="1pt" border-top="0.5pt solid black" width="86.6mm">
3886
3431
  <fo:block> </fo:block>
@@ -3956,44 +3501,6 @@
3956
3501
  </xsl:if>
3957
3502
  </xsl:template>
3958
3503
 
3959
- <!-- <xsl:template name="insertHeaderFooterAppendix">
3960
- <fo:static-content flow-name="header-appendix">
3961
- <fo:block-container font-size="11pt" padding-top="12.7mm">
3962
-
3963
- <fo:block text-align-last="justify">
3964
- <xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $lang]"/>
3965
- <xsl:text> – </xsl:text>
3966
- <xsl:variable name="editionFO">
3967
- <xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:edition">
3968
- <xsl:with-param name="curr_lang" select="$lang"/>
3969
- </xsl:apply-templates>
3970
- </xsl:variable>
3971
- <xsl:copy-of select="$editionFO"/>
3972
- <xsl:text> (</xsl:text>
3973
- <xsl:value-of select="substring(/bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:revision-date, 1, 4)"/>
3974
- <xsl:text>) – </xsl:text>
3975
- <xsl:choose>
3976
- <xsl:when test="$lang = 'fr'">Annexe </xsl:when>
3977
- <xsl:otherwise>Appendix </xsl:otherwise>
3978
- </xsl:choose>
3979
- <xsl:value-of select="/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:appendix"/>
3980
- <fo:inline keep-together.within-line="always">
3981
- <fo:leader leader-pattern="space"/>
3982
- <fo:inline>
3983
- <xsl:call-template name="printRevisionDate">
3984
- <xsl:with-param name="date" select="/bipm:bipm-standard/bipm:bibdata/bipm:version/bipm:revision-date"/>
3985
- </xsl:call-template>
3986
- </fo:inline>
3987
- </fo:inline>
3988
- </fo:block>
3989
- </fo:block-container>
3990
- </fo:static-content>
3991
- <fo:static-content flow-name="footer-appendix">
3992
- <fo:block-container font-size="11pt" height="100%" display-align="after">
3993
- <fo:block text-align="center" padding-bottom="12.7mm"><fo:page-number/>/<fo:page-number-citation ref-id="theLastPage"/></fo:block>
3994
- </fo:block-container>
3995
- </fo:static-content>
3996
- </xsl:template> -->
3997
3504
 
3998
3505
  <xsl:template name="printRevisionDate">
3999
3506
  <xsl:param name="date"/>
@@ -4004,47 +3511,17 @@
4004
3511
  <xsl:variable name="month" select="substring($date, 6, 2)"/>
4005
3512
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
4006
3513
  <xsl:variable name="monthStr">
4007
- <xsl:choose>
4008
- <xsl:when test="$lang = 'fr'">
4009
- <xsl:choose>
4010
- <xsl:when test="$month = '01'">janvier</xsl:when>
4011
- <xsl:when test="$month = '02'">février</xsl:when>
4012
- <xsl:when test="$month = '03'">mars</xsl:when>
4013
- <xsl:when test="$month = '04'">avril</xsl:when>
4014
- <xsl:when test="$month = '05'">mai</xsl:when>
4015
- <xsl:when test="$month = '06'">juin</xsl:when>
4016
- <xsl:when test="$month = '07'">juillet</xsl:when>
4017
- <xsl:when test="$month = '08'">août</xsl:when>
4018
- <xsl:when test="$month = '09'">septembre</xsl:when>
4019
- <xsl:when test="$month = '10'">octobre</xsl:when>
4020
- <xsl:when test="$month = '11'">novembre</xsl:when>
4021
- <xsl:when test="$month = '12'">décembre</xsl:when>
4022
- </xsl:choose>
4023
- </xsl:when>
4024
- <xsl:otherwise>
4025
- <xsl:choose>
4026
- <xsl:when test="$month = '01'">January</xsl:when>
4027
- <xsl:when test="$month = '02'">February</xsl:when>
4028
- <xsl:when test="$month = '03'">March</xsl:when>
4029
- <xsl:when test="$month = '04'">April</xsl:when>
4030
- <xsl:when test="$month = '05'">May</xsl:when>
4031
- <xsl:when test="$month = '06'">June</xsl:when>
4032
- <xsl:when test="$month = '07'">July</xsl:when>
4033
- <xsl:when test="$month = '08'">August</xsl:when>
4034
- <xsl:when test="$month = '09'">September</xsl:when>
4035
- <xsl:when test="$month = '10'">October</xsl:when>
4036
- <xsl:when test="$month = '11'">November</xsl:when>
4037
- <xsl:when test="$month = '12'">December</xsl:when>
4038
- </xsl:choose>
4039
- </xsl:otherwise>
4040
- </xsl:choose>
3514
+ <xsl:call-template name="getMonthByNum">
3515
+ <xsl:with-param name="num" select="$month"/>
3516
+ <xsl:with-param name="lang" select="$lang"/>
3517
+ <xsl:with-param name="lowercase" select="$lang = 'fr'"/>
3518
+ </xsl:call-template>
4041
3519
  </xsl:variable>
4042
3520
  <xsl:choose>
4043
3521
  <xsl:when test="$lang = 'fr' or $variant = 'true'">
4044
3522
  <xsl:value-of select="concat($day, ' ', $monthStr, ' ', $year)"/>
4045
3523
  </xsl:when>
4046
3524
  <xsl:otherwise>
4047
- <!-- <xsl:value-of select="concat($monthStr, ' ', $day, ', ', $year)"/> -->
4048
3525
  <xsl:value-of select="$monthStr"/>
4049
3526
  <xsl:text> </xsl:text>
4050
3527
  <xsl:value-of select="$day"/>
@@ -4052,7 +3529,6 @@
4052
3529
  <xsl:value-of select="$year"/>
4053
3530
  </xsl:otherwise>
4054
3531
  </xsl:choose>
4055
-
4056
3532
  </xsl:template>
4057
3533
 
4058
3534
 
@@ -4063,39 +3539,12 @@
4063
3539
  </fo:block>
4064
3540
  </fo:static-content>
4065
3541
  </xsl:template>
4066
-
4067
- <!-- <xsl:template name="insertIndexPages">
4068
- <fo:page-sequence master-reference="index" force-page-count="no-force">
4069
- <xsl:call-template name="insertHeaderFooter"/>
4070
- <fo:flow flow-name="xsl-region-body">
4071
- <fo:marker marker-class-name="header-title">Index</fo:marker>
4072
- <fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm" span="all">Index</fo:block>
4073
- <xsl:variable name="alphabet" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
4074
- <xsl:for-each select="(document('')//node())[position() &lt; 26]">
4075
- <xsl:variable name="letter" select="substring($alphabet, position(), 1)"/>
4076
- <fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always"><xsl:value-of select="$letter"/></fo:block>
4077
- <fo:block>accélération due à la pesanteur (gn), 33</fo:block>
4078
- <fo:block>activité d’un radionucléide, 26, 27</fo:block>
4079
- <fo:block>ampère (A), 13, 16, 18, 20, 28, 44, 49, 51, 52, 54, 55, 71, 81, 83-86, 89, 91-94, 97, 99, 100, 101, 103-104</fo:block>
4080
- <fo:block>angle, 25, 26, 33, 37 38, 40, 48, 55, 65</fo:block>
4081
- <fo:block>atmosphère normale, 52</fo:block>
4082
- <fo:block>atome gramme, 104</fo:block>
4083
- <fo:block>atome de césium, niveaux hyperfins, 15, 17, 18, 56, 58, 83, 85, 92, 94, 97, 98, 102</fo:block>
4084
- <xsl:if test="position() != last()"><fo:block>&#xA0;</fo:block></xsl:if>
4085
- </xsl:for-each>
4086
-
4087
- </fo:flow>
4088
- </fo:page-sequence>
4089
- </xsl:template>
4090
- -->
4091
-
3542
+
4092
3543
 
4093
3544
  <!-- =================== -->
4094
3545
  <!-- Index processing -->
4095
3546
  <!-- =================== -->
4096
3547
 
4097
- <!-- <xsl:template match="bipm:clause[@type = 'index']" /> -->
4098
- <!-- <xsl:template match="bipm:clause[@type = 'index']" mode="index"> -->
4099
3548
  <xsl:template match="bipm:indexsect"/>
4100
3549
  <xsl:template match="bipm:indexsect" mode="index">
4101
3550
  <xsl:param name="isDraft"/>
@@ -4144,7 +3593,6 @@
4144
3593
  </fo:page-sequence>
4145
3594
  </xsl:template>
4146
3595
 
4147
- <!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:title" priority="4"> -->
4148
3596
  <xsl:template match="bipm:indexsect/bipm:title" priority="4">
4149
3597
  <fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt" margin-left="-18mm" role="H1">
4150
3598
  <!-- Index -->
@@ -4152,7 +3600,6 @@
4152
3600
  </fo:block>
4153
3601
  </xsl:template>
4154
3602
 
4155
- <!-- <xsl:template match="bipm:clause[@type = 'index']/bipm:clause/bipm:title" priority="4"> -->
4156
3603
  <xsl:template match="bipm:indexsect/bipm:clause/bipm:title" priority="4">
4157
3604
  <!-- Letter A, B, C, ... -->
4158
3605
  <fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
@@ -4501,63 +3948,12 @@
4501
3948
  </xsl:if>
4502
3949
  </xsl:template>
4503
3950
 
4504
- <!-- <xsl:template match="node()" mode="change_id">
4505
- <xsl:param name="lang"/>
4506
- <xsl:param name="ignoreReferenceFrom"/>
4507
- <xsl:copy>
4508
- <xsl:apply-templates select="@*|node()" mode="change_id">
4509
- <xsl:with-param name="lang" select="$lang"/>
4510
- <xsl:with-param name="ignoreReferenceFrom" select="$ignoreReferenceFrom"/>
4511
- </xsl:apply-templates>
4512
- </xsl:copy>
4513
- </xsl:template>
4514
3951
 
4515
- <xsl:template match="bipm:locality[@type='anchor']/bipm:referenceFrom " mode="change_id">
4516
- <xsl:param name="lang"/>
4517
- <xsl:param name="ignoreReferenceFrom"/>
4518
- <xsl:copy>
4519
- <xsl:apply-templates select="@*" mode="change_id">
4520
- <xsl:with-param name="lang" select="$lang"/>
4521
- <xsl:with-param name="ignoreReferenceFrom" select="$ignoreReferenceFrom"/>
4522
- </xsl:apply-templates>
4523
- <xsl:choose>
4524
- <xsl:when test="$ignoreReferenceFrom = 'true'"><xsl:value-of select="."/></xsl:when>
4525
- <xsl:otherwise><xsl:value-of select="."/>_<xsl:value-of select="$lang"/><xsl:if test="$doctype = 'guide'">_<xsl:number count="bipm:bipm-standard" level="any"/></xsl:if></xsl:otherwise>
4526
- </xsl:choose>
4527
- </xsl:copy>
4528
- </xsl:template>
4529
-
4530
- <xsl:template match="@*" mode="change_id">
4531
- <xsl:param name="lang"/>
4532
- <xsl:param name="ignoreReferenceFrom"/>
4533
- <xsl:choose>
4534
- <xsl:when test="$ignoreReferenceFrom = 'true' and local-name() = 'id' and xalan:nodeset($ids)//referenceFrom = .">
4535
- <xsl:attribute name="{local-name()}">
4536
- <xsl:value-of select="."/>
4537
- </xsl:attribute>
4538
- </xsl:when>
4539
- <xsl:when test="local-name() = 'id' or
4540
- local-name() = 'bibitemid' or
4541
- (local-name() = 'target' and local-name(..) = 'xref')">
4542
- <xsl:attribute name="{local-name()}">
4543
- <xsl:value-of select="."/>_<xsl:value-of select="$lang"/><xsl:if test="$doctype = 'guide'">_<xsl:number count="bipm:bipm-standard" level="any"/></xsl:if>
4544
- </xsl:attribute>
4545
- </xsl:when>
4546
- <xsl:otherwise>
4547
- no change
4548
- <xsl:copy>
4549
- <xsl:apply-templates select="@*" mode="change_id">
4550
- <xsl:with-param name="lang" select="$lang"/>
4551
- <xsl:with-param name="ignoreReferenceFrom" select="$ignoreReferenceFrom"/>
4552
- </xsl:apply-templates>
4553
- </xsl:copy>
4554
- </xsl:otherwise>
4555
- </xsl:choose>
4556
- </xsl:template> -->
4557
-
4558
-
4559
-
4560
- <xsl:variable name="titles_">
3952
+ <xsl:variable name="pageWidth_">
3953
+ 210
3954
+ </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
3955
+ 297
3956
+ </xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
4561
3957
 
4562
3958
  <title-edition lang="en">
4563
3959
 
@@ -4664,6 +4060,65 @@
4664
4060
 
4665
4061
 
4666
4062
 
4063
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
4064
+
4065
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
4066
+
4067
+
4068
+ </xsl:attribute-set><xsl:attribute-set name="copyright-statement-p-style">
4069
+
4070
+
4071
+
4072
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-style">
4073
+
4074
+ <xsl:attribute name="font-family">Times New Roman</xsl:attribute>
4075
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
4076
+
4077
+
4078
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-title-style">
4079
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
4080
+
4081
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4082
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4083
+
4084
+
4085
+
4086
+
4087
+
4088
+
4089
+ </xsl:attribute-set><xsl:attribute-set name="license-statement-p-style">
4090
+
4091
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4092
+ <xsl:attribute name="line-height">135%</xsl:attribute>
4093
+
4094
+
4095
+
4096
+
4097
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-style">
4098
+
4099
+
4100
+
4101
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-title-style">
4102
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
4103
+
4104
+
4105
+
4106
+
4107
+
4108
+ </xsl:attribute-set><xsl:attribute-set name="legal-statement-p-style">
4109
+
4110
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-style">
4111
+
4112
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4113
+ <xsl:attribute name="line-height">125%</xsl:attribute>
4114
+
4115
+
4116
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-title-style">
4117
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
4118
+
4119
+ </xsl:attribute-set><xsl:attribute-set name="feedback-statement-p-style">
4120
+
4121
+
4667
4122
  </xsl:attribute-set><xsl:attribute-set name="link-style">
4668
4123
 
4669
4124
 
@@ -5487,6 +4942,7 @@
5487
4942
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
5488
4943
 
5489
4944
 
4945
+
5490
4946
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
5491
4947
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5492
4948
  <xsl:attribute name="font-size">65%</xsl:attribute>
@@ -5596,6 +5052,74 @@
5596
5052
  <xsl:value-of select="."/>
5597
5053
  </xsl:template><xsl:template match="*[local-name()='br']">
5598
5054
  <xsl:value-of select="$linebreak"/>
5055
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']">
5056
+ <fo:block xsl:use-attribute-sets="copyright-statement-style">
5057
+ <xsl:apply-templates/>
5058
+ </fo:block>
5059
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
5060
+
5061
+ <!-- process in the template 'title' -->
5062
+ <xsl:call-template name="title"/>
5063
+
5064
+ </xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
5065
+
5066
+
5067
+ <!-- process in the template 'paragraph' -->
5068
+ <xsl:call-template name="paragraph"/>
5069
+
5070
+ </xsl:template><xsl:template match="*[local-name()='license-statement']">
5071
+ <fo:block xsl:use-attribute-sets="license-statement-style">
5072
+ <xsl:apply-templates/>
5073
+ </fo:block>
5074
+ </xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
5075
+
5076
+ <xsl:variable name="level">
5077
+ <xsl:call-template name="getLevel"/>
5078
+ </xsl:variable>
5079
+ <fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
5080
+ <xsl:apply-templates/>
5081
+ </fo:block>
5082
+
5083
+ </xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
5084
+
5085
+ <fo:block xsl:use-attribute-sets="license-statement-p-style">
5086
+
5087
+
5088
+
5089
+
5090
+
5091
+ <xsl:apply-templates/>
5092
+ </fo:block>
5093
+
5094
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']">
5095
+ <fo:block xsl:use-attribute-sets="legal-statement-style">
5096
+ <xsl:apply-templates/>
5097
+ </fo:block>
5098
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
5099
+
5100
+ <!-- process in the template 'title' -->
5101
+ <xsl:call-template name="title"/>
5102
+
5103
+
5104
+ </xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
5105
+
5106
+ <!-- process in the template 'paragraph' -->
5107
+ <xsl:call-template name="paragraph"/>
5108
+
5109
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']">
5110
+ <fo:block xsl:use-attribute-sets="feedback-statement-style">
5111
+ <xsl:apply-templates/>
5112
+ </fo:block>
5113
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
5114
+
5115
+ <!-- process in the template 'title' -->
5116
+ <xsl:call-template name="title"/>
5117
+
5118
+ </xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
5119
+
5120
+ <!-- process in the template 'paragraph' -->
5121
+ <xsl:call-template name="paragraph"/>
5122
+
5599
5123
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
5600
5124
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
5601
5125
  <xsl:call-template name="add-zero-spaces-java"/>
@@ -5752,7 +5276,7 @@
5752
5276
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
5753
5277
  </xsl:when>
5754
5278
  <xsl:otherwise>
5755
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5279
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
5756
5280
  </xsl:otherwise>
5757
5281
  </xsl:choose>
5758
5282
 
@@ -5973,7 +5497,7 @@
5973
5497
 
5974
5498
  <xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
5975
5499
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
5976
- </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
5500
+ </xsl:template><xsl:template match="*[local-name()='thead']">
5977
5501
  <xsl:param name="cols-count"/>
5978
5502
  <fo:table-header>
5979
5503
 
@@ -5998,13 +5522,13 @@
5998
5522
  <fo:table-body>
5999
5523
  <xsl:apply-templates/>
6000
5524
  </fo:table-body>
6001
- </xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
5525
+ </xsl:template><xsl:template match="*[local-name()='tfoot']">
6002
5526
  <xsl:apply-templates/>
6003
5527
  </xsl:template><xsl:template name="insertTableFooter">
6004
5528
  <xsl:param name="cols-count"/>
6005
5529
  <xsl:if test="../*[local-name()='tfoot']">
6006
5530
  <fo:table-footer>
6007
- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
5531
+ <xsl:apply-templates select="../*[local-name()='tfoot']"/>
6008
5532
  </fo:table-footer>
6009
5533
  </xsl:if>
6010
5534
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
@@ -6100,7 +5624,7 @@
6100
5624
 
6101
5625
  <!-- except gb and bsi -->
6102
5626
 
6103
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
5627
+ <xsl:apply-templates select="../*[local-name()='note']"/>
6104
5628
 
6105
5629
 
6106
5630
 
@@ -6138,7 +5662,7 @@
6138
5662
 
6139
5663
 
6140
5664
 
6141
- <xsl:apply-templates select="../*[local-name()='thead']" mode="process">
5665
+ <xsl:apply-templates select="../*[local-name()='thead']">
6142
5666
  <xsl:with-param name="cols-count" select="$cols-count"/>
6143
5667
  </xsl:apply-templates>
6144
5668
 
@@ -6318,7 +5842,7 @@
6318
5842
  <xsl:apply-templates/>
6319
5843
  </fo:block>
6320
5844
  </fo:table-cell>
6321
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
5845
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
6322
5846
 
6323
5847
  <fo:block xsl:use-attribute-sets="table-note-style">
6324
5848
 
@@ -6354,10 +5878,10 @@
6354
5878
  </xsl:if>
6355
5879
 
6356
5880
 
6357
- <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/>
5881
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6358
5882
  </fo:block>
6359
5883
 
6360
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
5884
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
6361
5885
  <xsl:apply-templates/>
6362
5886
  </xsl:template><xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
6363
5887
 
@@ -6895,7 +6419,9 @@
6895
6419
  </td>
6896
6420
  <td>
6897
6421
 
6898
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
6422
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6423
+ <xsl:with-param name="process">true</xsl:with-param>
6424
+ </xsl:apply-templates>
6899
6425
 
6900
6426
  </td>
6901
6427
  </tr>
@@ -6922,15 +6448,20 @@
6922
6448
  <fo:block>
6923
6449
 
6924
6450
 
6925
- <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
6451
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
6452
+ <xsl:with-param name="process">true</xsl:with-param>
6453
+ </xsl:apply-templates>
6926
6454
  </fo:block>
6927
6455
  </fo:table-cell>
6928
6456
  </fo:table-row>
6929
6457
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
6930
6458
  <xsl:apply-templates/>
6931
- </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
6932
- <xsl:apply-templates select="@language"/>
6933
- <xsl:apply-templates/>
6459
+ </xsl:template><xsl:template match="*[local-name()='dd']">
6460
+ <xsl:param name="process">false</xsl:param>
6461
+ <xsl:if test="$process = 'true'">
6462
+ <xsl:apply-templates select="@language"/>
6463
+ <xsl:apply-templates/>
6464
+ </xsl:if>
6934
6465
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
6935
6466
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
6936
6467
  </xsl:template><xsl:template match="*[local-name()='em']">
@@ -7105,7 +6636,11 @@
7105
6636
  <xsl:with-param name="text" select="substring($text,2)"/>
7106
6637
  </xsl:call-template>
7107
6638
  </xsl:if>
7108
- </xsl:template><xsl:template name="tokenize">
6639
+ </xsl:template><xsl:template match="*[local-name() = 'pagebreak']">
6640
+ <fo:block break-after="page"/>
6641
+ <fo:block> </fo:block>
6642
+ <fo:block break-after="page"/>
6643
+ </xsl:template><xsl:template name="tokenize">
7109
6644
  <xsl:param name="text"/>
7110
6645
  <xsl:param name="separator" select="' '"/>
7111
6646
  <xsl:choose>
@@ -7563,10 +7098,10 @@
7563
7098
  </fo:inline>
7564
7099
  </xsl:template><xsl:template match="*[local-name()='appendix']">
7565
7100
  <fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
7566
- <xsl:apply-templates select="*[local-name()='title']" mode="process"/>
7101
+ <xsl:apply-templates select="*[local-name()='title']"/>
7567
7102
  </fo:block>
7568
- <xsl:apply-templates/>
7569
- </xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
7103
+ <xsl:apply-templates select="node()[not(local-name()='title')]"/>
7104
+ </xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" priority="2">
7570
7105
  <xsl:variable name="level">
7571
7106
  <xsl:call-template name="getLevel"/>
7572
7107
  </xsl:variable>
@@ -8204,7 +7739,7 @@
8204
7739
  <xsl:value-of select="."/>
8205
7740
  </xsl:template><xsl:template match="node()" mode="contents">
8206
7741
  <xsl:apply-templates mode="contents"/>
8207
- </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="2" mode="contents">
7742
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
8208
7743
  <xsl:variable name="level">
8209
7744
  <xsl:call-template name="getLevel">
8210
7745
  <xsl:with-param name="depth" select="@depth"/>
@@ -8212,10 +7747,15 @@
8212
7747
  </xsl:variable>
8213
7748
 
8214
7749
  <xsl:variable name="section">
8215
- <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
7750
+ <xsl:choose>
7751
+ <xsl:when test="@type = 'section-title'"/>
7752
+ <xsl:otherwise>
7753
+ <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
7754
+ </xsl:otherwise>
7755
+ </xsl:choose>
8216
7756
  </xsl:variable>
8217
7757
 
8218
- <xsl:variable name="type">floating-title</xsl:variable>
7758
+ <xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
8219
7759
 
8220
7760
  <xsl:variable name="display">
8221
7761
  <xsl:choose>
@@ -8232,7 +7772,16 @@
8232
7772
  <xsl:variable name="title">
8233
7773
  <xsl:choose>
8234
7774
  <xsl:when test="*[local-name() = 'tab']">
8235
- <xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
7775
+ <xsl:choose>
7776
+ <xsl:when test="@type = 'section-title'">
7777
+ <xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
7778
+ <xsl:text>: </xsl:text>
7779
+ <xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
7780
+ </xsl:when>
7781
+ <xsl:otherwise>
7782
+ <xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
7783
+ </xsl:otherwise>
7784
+ </xsl:choose>
8236
7785
  </xsl:when>
8237
7786
  <xsl:otherwise>
8238
7787
  <xsl:copy-of select="node()"/>
@@ -9840,7 +9389,7 @@
9840
9389
  </fo:inline>
9841
9390
  </xsl:template><xsl:template match="@language">
9842
9391
  <xsl:copy-of select="."/>
9843
- </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
9392
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="4">
9844
9393
  <xsl:call-template name="title"/>
9845
9394
  </xsl:template><xsl:template match="*[local-name() = 'admonition']">
9846
9395
 
@@ -9905,27 +9454,17 @@
9905
9454
  <xsl:variable name="month" select="substring($date, 6, 2)"/>
9906
9455
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
9907
9456
  <xsl:variable name="monthStr">
9908
- <xsl:choose>
9909
- <xsl:when test="$month = '01'">january</xsl:when>
9910
- <xsl:when test="$month = '02'">february</xsl:when>
9911
- <xsl:when test="$month = '03'">march</xsl:when>
9912
- <xsl:when test="$month = '04'">april</xsl:when>
9913
- <xsl:when test="$month = '05'">may</xsl:when>
9914
- <xsl:when test="$month = '06'">june</xsl:when>
9915
- <xsl:when test="$month = '07'">july</xsl:when>
9916
- <xsl:when test="$month = '08'">august</xsl:when>
9917
- <xsl:when test="$month = '09'">september</xsl:when>
9918
- <xsl:when test="$month = '10'">october</xsl:when>
9919
- <xsl:when test="$month = '11'">november</xsl:when>
9920
- <xsl:when test="$month = '12'">december</xsl:when>
9921
- </xsl:choose>
9457
+ <xsl:call-template name="getMonthByNum">
9458
+ <xsl:with-param name="num" select="$month"/>
9459
+ <xsl:with-param name="lowercase" select="'true'"/>
9460
+ </xsl:call-template>
9922
9461
  </xsl:variable>
9923
9462
  <xsl:variable name="monthStr_localized">
9924
9463
  <xsl:if test="normalize-space($monthStr) != ''"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param></xsl:call-template></xsl:if>
9925
9464
  </xsl:variable>
9926
9465
  <xsl:variable name="result">
9927
9466
  <xsl:choose>
9928
- <xsl:when test="$format = 'ddMMyyyy'">
9467
+ <xsl:when test="$format = 'ddMMyyyy'"> <!-- convert date from format 2007-04-01 to 1 April 2007 -->
9929
9468
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
9930
9469
  <xsl:text> </xsl:text>
9931
9470
  <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
@@ -9938,11 +9477,57 @@
9938
9477
  <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
9939
9478
  </xsl:when>
9940
9479
  <xsl:otherwise>
9941
- <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/>
9480
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/> <!-- January 01, 2022 -->
9942
9481
  </xsl:otherwise>
9943
9482
  </xsl:choose>
9944
9483
  </xsl:variable>
9945
9484
  <xsl:value-of select="$result"/>
9485
+ </xsl:template><xsl:template name="getMonthByNum">
9486
+ <xsl:param name="num"/>
9487
+ <xsl:param name="lang">en</xsl:param>
9488
+ <xsl:param name="lowercase">false</xsl:param> <!-- return 'january' instead of 'January' -->
9489
+ <xsl:variable name="monthStr_">
9490
+ <xsl:choose>
9491
+ <xsl:when test="$lang = 'fr'">
9492
+ <xsl:choose>
9493
+ <xsl:when test="$num = '01'">Janvier</xsl:when>
9494
+ <xsl:when test="$num = '02'">Février</xsl:when>
9495
+ <xsl:when test="$num = '03'">Mars</xsl:when>
9496
+ <xsl:when test="$num = '04'">Avril</xsl:when>
9497
+ <xsl:when test="$num = '05'">Mai</xsl:when>
9498
+ <xsl:when test="$num = '06'">Juin</xsl:when>
9499
+ <xsl:when test="$num = '07'">Juillet</xsl:when>
9500
+ <xsl:when test="$num = '08'">Août</xsl:when>
9501
+ <xsl:when test="$num = '09'">Septembre</xsl:when>
9502
+ <xsl:when test="$num = '10'">Octobre</xsl:when>
9503
+ <xsl:when test="$num = '11'">Novembre</xsl:when>
9504
+ <xsl:when test="$num = '12'">Décembre</xsl:when>
9505
+ </xsl:choose>
9506
+ </xsl:when>
9507
+ <xsl:otherwise>
9508
+ <xsl:choose>
9509
+ <xsl:when test="$num = '01'">January</xsl:when>
9510
+ <xsl:when test="$num = '02'">February</xsl:when>
9511
+ <xsl:when test="$num = '03'">March</xsl:when>
9512
+ <xsl:when test="$num = '04'">April</xsl:when>
9513
+ <xsl:when test="$num = '05'">May</xsl:when>
9514
+ <xsl:when test="$num = '06'">June</xsl:when>
9515
+ <xsl:when test="$num = '07'">July</xsl:when>
9516
+ <xsl:when test="$num = '08'">August</xsl:when>
9517
+ <xsl:when test="$num = '09'">September</xsl:when>
9518
+ <xsl:when test="$num = '10'">October</xsl:when>
9519
+ <xsl:when test="$num = '11'">November</xsl:when>
9520
+ <xsl:when test="$num = '12'">December</xsl:when>
9521
+ </xsl:choose>
9522
+ </xsl:otherwise>
9523
+ </xsl:choose>
9524
+ </xsl:variable>
9525
+ <xsl:choose>
9526
+ <xsl:when test="normalize-space($lowercase) = 'true'">
9527
+ <xsl:value-of select="java:toLowerCase(java:java.lang.String.new($monthStr_))"/>
9528
+ </xsl:when>
9529
+ <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
9530
+ </xsl:choose>
9946
9531
  </xsl:template><xsl:template name="insertKeywords">
9947
9532
  <xsl:param name="sorting" select="'true'"/>
9948
9533
  <xsl:param name="charAtEnd" select="'.'"/>
@@ -10403,6 +9988,25 @@
10403
9988
  </xsl:otherwise>
10404
9989
  </xsl:choose>
10405
9990
  </xsl:if>
9991
+ </xsl:template><xsl:template name="number-to-ordinal">
9992
+ <xsl:param name="number"/>
9993
+ <xsl:param name="curr_lang"/>
9994
+ <xsl:choose>
9995
+ <xsl:when test="$curr_lang = 'fr'">
9996
+ <xsl:choose>
9997
+ <xsl:when test="$number = '1'">re</xsl:when>
9998
+ <xsl:otherwise>e</xsl:otherwise>
9999
+ </xsl:choose>
10000
+ </xsl:when>
10001
+ <xsl:otherwise>
10002
+ <xsl:choose>
10003
+ <xsl:when test="$number = 1">st</xsl:when>
10004
+ <xsl:when test="$number = 2">nd</xsl:when>
10005
+ <xsl:when test="$number = 3">rd</xsl:when>
10006
+ <xsl:otherwise>th</xsl:otherwise>
10007
+ </xsl:choose>
10008
+ </xsl:otherwise>
10009
+ </xsl:choose>
10406
10010
  </xsl:template><xsl:template name="setAltText">
10407
10011
  <xsl:param name="value"/>
10408
10012
  <xsl:attribute name="fox:alt-text">