metanorma-iho 0.2.5 → 0.2.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +66 -0
  3. data/README.adoc +3 -1
  4. data/lib/asciidoctor/iho/basicdoc.rng +50 -3
  5. data/lib/asciidoctor/iho/isodoc.rng +36 -43
  6. data/lib/isodoc/iho/html/htmlstyle.css +7 -3
  7. data/lib/isodoc/iho/html/htmlstyle.scss +2 -2
  8. data/lib/isodoc/iho/html/iho.css +71 -71
  9. data/lib/isodoc/iho/html/iho.scss +71 -71
  10. data/lib/isodoc/iho/html/wordstyle.css +55 -55
  11. data/lib/isodoc/iho/html/wordstyle.scss +55 -55
  12. data/lib/isodoc/iho/iho.specification.xsl +299 -68
  13. data/lib/isodoc/iho/iho.standard.xsl +299 -68
  14. data/lib/isodoc/iho/xref.rb +2 -2
  15. data/lib/metanorma/iho/processor.rb +14 -8
  16. data/lib/metanorma/iho/version.rb +1 -1
  17. data/metanorma-iho.gemspec +1 -2
  18. data/metanorma.yml +14 -6
  19. metadata +5 -21
  20. data/.github/workflows/macos.yml +0 -41
  21. data/.github/workflows/ubuntu.yml +0 -45
  22. data/.github/workflows/windows.yml +0 -43
data/lib/isodoc/iho/html/wordstyle.scss CHANGED
@@ -69,9 +69,9 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
69
69
  mso-style-qformat:yes;
70
70
  mso-style-parent:"";
71
71
  margin:0cm;
72
- margin-bottom:12.0pt;
72
+ margin-bottom:$normalfontsize;
73
73
  mso-pagination:widow-orphan;
74
- font-size:12.0pt;
74
+ font-size:$normalfontsize;
75
75
  font-family:$bodyfont;
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
@@ -82,11 +82,11 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
82
82
  mso-style-qformat:yes;
83
83
  margin-top:0cm;
84
84
  margin-right:0cm;
85
- margin-bottom:12.0pt;
85
+ margin-bottom:$normalfontsize;
86
86
  /* do not put in margin-left, it is specific to list level */
87
87
  /*mso-add-space:auto;*/
88
88
  mso-pagination:widow-orphan;
89
- font-size:12.0pt;
89
+ font-size:$normalfontsize;
90
90
  font-family:$bodyfont;
91
91
  mso-ansi-language:EN-AU;
92
92
  mso-fareast-language:EN-US;}
@@ -97,11 +97,11 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
97
97
  mso-style-type:export-only;
98
98
  margin-top:0cm;
99
99
  margin-right:0cm;
100
- margin-bottom:12.0pt;
100
+ margin-bottom:$normalfontsize;
101
101
  /* do not put in margin-left, it is specific to list level */
102
102
  /*mso-add-space:auto;*/
103
103
  mso-pagination:widow-orphan;
104
- font-size:12.0pt;
104
+ font-size:$normalfontsize;
105
105
  font-family:$bodyfont;
106
106
  mso-ansi-language:EN-AU;
107
107
  mso-fareast-language:EN-US;}
@@ -112,11 +112,11 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
112
112
  mso-style-type:export-only;
113
113
  margin-top:0cm;
114
114
  margin-right:0cm;
115
- margin-bottom:12.0pt;
115
+ margin-bottom:$normalfontsize;
116
116
  /* do not put in margin-left, it is specific to list level */
117
117
  /*mso-add-space:auto;*/
118
118
  mso-pagination:widow-orphan;
119
- font-size:12.0pt;
119
+ font-size:$normalfontsize;
120
120
  font-family:$bodyfont;
121
121
  mso-ansi-language:EN-AU;
122
122
  mso-fareast-language:EN-US;}
@@ -127,11 +127,11 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
127
127
  mso-style-type:export-only;
128
128
  margin-top:0cm;
129
129
  margin-right:0cm;
130
- margin-bottom:12.0pt;
130
+ margin-bottom:$normalfontsize;
131
131
  /* do not put in margin-left, it is specific to list level */
132
132
  /*mso-add-space:auto;*/
133
133
  mso-pagination:widow-orphan;
134
- font-size:12.0pt;
134
+ font-size:$normalfontsize;
135
135
  font-family:$bodyfont;
136
136
  mso-ansi-language:EN-AU;
137
137
  mso-fareast-language:EN-US;}
@@ -142,7 +142,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
142
142
  margin:0cm;
143
143
  margin-bottom:.0001pt;
144
144
  mso-pagination:widow-orphan;
145
- font-size:10.0pt;
145
+ font-size:$footnotefontsize;
146
146
  font-family:$bodyfont;
147
147
  mso-fareast-font-family:"Times New Roman";
148
148
  mso-ansi-language:EN-US;
@@ -153,7 +153,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
153
153
  margin-bottom:.0001pt;
154
154
  mso-pagination:widow-orphan;
155
155
  tab-stops:center 216.0pt right 482.0pt;
156
- font-size:12.0pt;
156
+ font-size:$normalfontsize;
157
157
  font-family:$bodyfont;
158
158
  mso-fareast-font-family:"Times New Roman";
159
159
  mso-ansi-language:EN-US;
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
164
164
  margin-bottom:.0001pt;
165
165
  mso-pagination:widow-orphan;
166
166
  tab-stops:center 367.0pt right 734.0pt;
167
- font-size:12.0pt;
167
+ font-size:$normalfontsize;
168
168
  font-family:$bodyfont;
169
169
  mso-fareast-font-family:"Times New Roman";
170
170
  mso-ansi-language:EN-US;
@@ -205,7 +205,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
205
205
  margin-left:0cm;
206
206
  margin-bottom:.0001pt;
207
207
  mso-pagination:widow-orphan;
208
- font-size:12.0pt;
208
+ font-size:$normalfontsize;
209
209
  font-family:$bodyfont;
210
210
  mso-fareast-font-family:"Times New Roman";
211
211
  mso-bidi-font-family:"Times New Roman";
@@ -306,7 +306,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
306
306
  margin:0cm;
307
307
  margin-bottom:.0001pt;
308
308
  mso-pagination:widow-orphan;
309
- font-size:10.0pt;
309
+ font-size:$footnotefontsize;
310
310
  font-family:$bodyfont;
311
311
  mso-fareast-font-family:"Times New Roman";
312
312
  mso-ansi-language:EN-US;
@@ -347,7 +347,7 @@ h1
347
347
  mso-style-next:Normal;
348
348
  margin-top:13.5pt;
349
349
  margin-right:0cm;
350
- margin-bottom:12.0pt;
350
+ margin-bottom:$normalfontsize;
351
351
  margin-left:0cm;
352
352
  text-indent:0cm;
353
353
  line-height:13.5pt;
@@ -358,7 +358,7 @@ h1
358
358
  mso-hyphenate:none;
359
359
  tab-stops:20.0pt list 21.6pt left 28.0pt;
360
360
  font-size:13.0pt;
361
- mso-bidi-font-size:11.0pt;
361
+ mso-bidi-font-size:$smallerfontsize;
362
362
  font-family:$headerfont;
363
363
  mso-fareast-font-family:$headerfont;
364
364
  font-weight:normal;
@@ -374,7 +374,7 @@ h1.Annex
374
374
  mso-style-next:Normal;
375
375
  margin-top:3.0pt;
376
376
  margin-right:0cm;
377
- margin-bottom:12.0pt;
377
+ margin-bottom:$normalfontsize;
378
378
  margin-left:0cm;
379
379
  text-indent:0cm;
380
380
  line-height:12.5pt;
@@ -387,7 +387,7 @@ h1.Annex
387
387
  mso-hyphenate:none;
388
388
  tab-stops:20.0pt list 21.6pt left 28.0pt;
389
389
  font-size:13.0pt;
390
- mso-bidi-font-size:11.0pt;
390
+ mso-bidi-font-size:$smallerfontsize;
391
391
  font-family:$headerfont;
392
392
  font-weight:normal;
393
393
  mso-fareast-font-family:$headerfont;
@@ -404,7 +404,7 @@ h1.Annex
404
404
  mso-style-next:Normal;
405
405
  margin-top:3.0pt;
406
406
  margin-right:0cm;
407
- margin-bottom:12.0pt;
407
+ margin-bottom:$normalfontsize;
408
408
  margin-left:0cm;
409
409
  text-indent:0cm;
410
410
  line-height:12.5pt;
@@ -413,8 +413,8 @@ h1.Annex
413
413
  mso-outline-level:2;
414
414
  mso-hyphenate:none;
415
415
  tab-stops:27.0pt 35.0pt;
416
- font-size:12.0pt;
417
- mso-bidi-font-size:11.0pt;
416
+ font-size:$normalfontsize;
417
+ mso-bidi-font-size:$smallerfontsize;
418
418
  font-family:$headerfont;
419
419
  font-weight:normal;
420
420
  mso-fareast-font-family:$headerfont;
@@ -430,7 +430,7 @@ h2
430
430
  mso-style-next:Normal;
431
431
  margin-top:3.0pt;
432
432
  margin-right:0cm;
433
- margin-bottom:12.0pt;
433
+ margin-bottom:$normalfontsize;
434
434
  margin-left:0cm;
435
435
  text-indent:0cm;
436
436
  line-height:12.5pt;
@@ -440,8 +440,8 @@ h2
440
440
  mso-list:l1 level2 lfo6;
441
441
  mso-hyphenate:none;
442
442
  tab-stops:27.0pt 35.0pt;
443
- font-size:12.0pt;
444
- mso-bidi-font-size:11.0pt;
443
+ font-size:$normalfontsize;
444
+ mso-bidi-font-size:$smallerfontsize;
445
445
  font-family:$headerfont;
446
446
  font-weight:normal;
447
447
  mso-fareast-font-family:$headerfont;
@@ -457,17 +457,17 @@ h3
457
457
  mso-style-next:Normal;
458
458
  margin-top:3.0pt;
459
459
  margin-right:0cm;
460
- margin-bottom:12.0pt;
460
+ margin-bottom:$normalfontsize;
461
461
  margin-left:0cm;
462
462
  text-indent:0cm;
463
- line-height:12.0pt;
463
+ line-height:$normalfontsize;
464
464
  mso-pagination:widow-orphan;
465
465
  page-break-after:avoid;
466
466
  mso-outline-level:3;
467
467
  mso-list:l1 level3 lfo6;
468
468
  mso-hyphenate:none;
469
469
  tab-stops:list 36.0pt left 44.0pt;
470
- font-size:11.0pt;
470
+ font-size:$smallerfontsize;
471
471
  font-family:$headerfont;
472
472
  font-weight:normal;
473
473
  mso-fareast-font-family:$headerfont;
@@ -483,17 +483,17 @@ h4
483
483
  mso-style-next:Normal;
484
484
  margin-top:3.0pt;
485
485
  margin-right:0cm;
486
- margin-bottom:12.0pt;
486
+ margin-bottom:$normalfontsize;
487
487
  margin-left:0cm;
488
488
  text-indent:0cm;
489
- line-height:12.0pt;
489
+ line-height:$normalfontsize;
490
490
  mso-pagination:widow-orphan;
491
491
  page-break-after:avoid;
492
492
  mso-outline-level:4;
493
493
  mso-list:l1 level4 lfo6;
494
494
  mso-hyphenate:none;
495
495
  tab-stops:51.05pt 57.0pt 68.0pt;
496
- font-size:11.0pt;
496
+ font-size:$smallerfontsize;
497
497
  font-family:$headerfont;
498
498
  font-weight:normal;
499
499
  mso-fareast-font-family:$headerfont;
@@ -509,17 +509,17 @@ h5
509
509
  mso-style-next:Normal;
510
510
  margin-top:3.0pt;
511
511
  margin-right:0cm;
512
- margin-bottom:12.0pt;
512
+ margin-bottom:$normalfontsize;
513
513
  margin-left:0cm;
514
514
  text-indent:0cm;
515
- line-height:12.0pt;
515
+ line-height:$normalfontsize;
516
516
  mso-pagination:widow-orphan;
517
517
  page-break-after:avoid;
518
518
  mso-outline-level:5;
519
519
  mso-list:l1 level5 lfo6;
520
520
  mso-hyphenate:none;
521
521
  tab-stops:51.05pt list 54.0pt;
522
- font-size:11.0pt;
522
+ font-size:$smallerfontsize;
523
523
  font-family:$headerfont;
524
524
  font-weight:normal;
525
525
  mso-fareast-font-family:$headerfont;
@@ -535,17 +535,17 @@ h6
535
535
  mso-style-next:Normal;
536
536
  margin-top:3.0pt;
537
537
  margin-right:0cm;
538
- margin-bottom:12.0pt;
538
+ margin-bottom:$normalfontsize;
539
539
  margin-left:0cm;
540
540
  text-indent:0cm;
541
- line-height:12.0pt;
541
+ line-height:$normalfontsize;
542
542
  mso-pagination:widow-orphan;
543
543
  page-break-after:avoid;
544
544
  mso-outline-level:6;
545
545
  mso-list:l1 level6 lfo6;
546
546
  mso-hyphenate:none;
547
547
  tab-stops:51.05pt list 72.0pt;
548
- font-size:11.0pt;
548
+ font-size:$smallerfontsize;
549
549
  font-family:$headerfont;
550
550
  font-weight:normal;
551
551
  mso-fareast-font-family:$headerfont;
@@ -562,11 +562,11 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
562
562
  margin-left:36.0pt;
563
563
  margin-bottom:.0001pt;
564
564
  text-indent:-36.0pt;
565
- line-height:12.0pt;
565
+ line-height:$normalfontsize;
566
566
  mso-pagination:widow-orphan;
567
567
  mso-hyphenate:none;
568
568
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
569
- font-size:12.0pt;
569
+ font-size:$normalfontsize;
570
570
  font-family:$bodyfont;
571
571
  mso-fareast-font-family:$bodyfont;
572
572
  mso-bidi-font-family:$bodyfont;
@@ -585,11 +585,11 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
585
585
  margin-left:36.0pt;
586
586
  margin-bottom:.0001pt;
587
587
  text-indent:-36.0pt;
588
- line-height:12.0pt;
588
+ line-height:$normalfontsize;
589
589
  mso-pagination:widow-orphan;
590
590
  mso-hyphenate:none;
591
591
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
592
- font-size:12.0pt;
592
+ font-size:$normalfontsize;
593
593
  font-family:$bodyfont;
594
594
  mso-fareast-font-family:$bodyfont;
595
595
  mso-bidi-font-family:$bodyfont;
@@ -608,11 +608,11 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
608
608
  margin-left:36.0pt;
609
609
  margin-bottom:.0001pt;
610
610
  text-indent:-36.0pt;
611
- line-height:12.0pt;
611
+ line-height:$normalfontsize;
612
612
  mso-pagination:widow-orphan;
613
613
  mso-hyphenate:none;
614
614
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
615
- font-size:12.0pt;
615
+ font-size:$normalfontsize;
616
616
  font-family:$bodyfont;
617
617
  mso-fareast-font-family:$bodyfont;
618
618
  mso-bidi-font-family:$bodyfont;
@@ -628,13 +628,13 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
628
628
  mso-style-link:"Footnote Text Char";
629
629
  margin-top:0cm;
630
630
  margin-right:0cm;
631
- margin-bottom:12.0pt;
631
+ margin-bottom:$normalfontsize;
632
632
  margin-left:0cm;
633
633
  text-align:justify;
634
- line-height:12.0pt;
634
+ line-height:$normalfontsize;
635
635
  mso-pagination:widow-orphan;
636
636
  tab-stops:20.15pt;
637
- font-size:10.0pt;
637
+ font-size:$footnotefontsize;
638
638
  font-family:$bodyfont;
639
639
  mso-fareast-font-family:$bodyfont;
640
640
  mso-bidi-font-family:$bodyfont;
@@ -650,9 +650,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
650
650
  margin-bottom:6.0pt;
651
651
  margin-left:0cm;
652
652
  text-align:justify;
653
- line-height:12.0pt;
653
+ line-height:$normalfontsize;
654
654
  mso-pagination:widow-orphan;
655
- font-size:12.0pt;
655
+ font-size:$normalfontsize;
656
656
  font-family:$bodyfont;
657
657
  mso-fareast-font-family:$bodyfont;
658
658
  mso-bidi-font-family:$bodyfont;
@@ -680,7 +680,7 @@ span.Heading2Char
680
680
  mso-style-locked:yes;
681
681
  mso-style-parent:"";
682
682
  mso-style-link:"Heading 2";
683
- mso-ansi-font-size:12.0pt;
683
+ mso-ansi-font-size:$normalfontsize;
684
684
  font-family:$headerfont;
685
685
  font-weight:normal;
686
686
  mso-ascii-font-family:Cambria;
@@ -696,7 +696,7 @@ span.Heading3Char
696
696
  mso-style-locked:yes;
697
697
  mso-style-parent:"";
698
698
  mso-style-link:"Heading 3";
699
- mso-ansi-font-size:11.0pt;
699
+ mso-ansi-font-size:$smallerfontsize;
700
700
  font-family:$headerfont;
701
701
  font-weight:normal;
702
702
  mso-ascii-font-family:$headerfont;
@@ -712,7 +712,7 @@ span.Heading4Char
712
712
  mso-style-locked:yes;
713
713
  mso-style-parent:"";
714
714
  mso-style-link:"Heading 4";
715
- mso-ansi-font-size:11.0pt;
715
+ mso-ansi-font-size:$smallerfontsize;
716
716
  font-family:$headerfont;
717
717
  font-weight:normal;
718
718
  mso-ascii-font-family:$headerfont;
@@ -728,7 +728,7 @@ span.Heading5Char
728
728
  mso-style-locked:yes;
729
729
  mso-style-parent:"";
730
730
  mso-style-link:"Heading 5";
731
- mso-ansi-font-size:11.0pt;
731
+ mso-ansi-font-size:$smallerfontsize;
732
732
  font-family:$headerfont;
733
733
  font-weight:normal;
734
734
  mso-ascii-font-family:$headerfont;
@@ -744,7 +744,7 @@ span.Heading6Char
744
744
  mso-style-locked:yes;
745
745
  mso-style-parent:"";
746
746
  mso-style-link:"Heading 6";
747
- mso-ansi-font-size:11.0pt;
747
+ mso-ansi-font-size:$smallerfontsize;
748
748
  font-family:$headerfont;
749
749
  font-weight:normal;
750
750
  mso-ascii-font-family:$headerfont;
@@ -764,7 +764,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
764
764
  line-height:10.5pt;
765
765
  mso-pagination:widow-orphan;
766
766
  font-size:10.0pt;
767
- mso-bidi-font-size:11.0pt;
767
+ mso-bidi-font-size:$smallerfontsize;
768
768
  font-family:$bodyfont;
769
769
  mso-fareast-font-family:$bodyfont;
770
770
  mso-bidi-font-family:$bodyfont;
@@ -1145,7 +1145,7 @@ table.MsoNormalTable
1145
1145
  mso-para-margin:0cm;
1146
1146
  mso-para-margin-bottom:.0001pt;
1147
1147
  mso-pagination:widow-orphan;
1148
- font-size:12.0pt;
1148
+ font-size:$normalfontsize;
1149
1149
  font-family:$bodyfont;}
1150
1150
  ol
1151
1151
  {margin-bottom:0cm;
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -38,7 +38,7 @@
38
38
  <xsl:template match="/">
39
39
 
40
40
  <xsl:variable name="xslfo">
41
- <fo:root font-family="Helvetica Neue, Cambria Math" font-size="12pt" xml:lang="{$lang}">
41
+ <fo:root font-family="Arial, Cambria Math" font-size="12pt" xml:lang="{$lang}">
42
42
  <fo:layout-master-set>
43
43
  <!-- cover page -->
44
44
  <fo:simple-page-master master-name="cover" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -862,10 +862,10 @@
862
862
  <xsl:otherwise> <!-- for ordered lists -->
863
863
  <xsl:choose>
864
864
  <xsl:when test="../@type = 'arabic'">
865
- <xsl:number format="a)"/>
865
+ <xsl:number format="a)" lang="en"/>
866
866
  </xsl:when>
867
867
  <xsl:when test="../@type = 'alphabet'">
868
- <xsl:number format="a)"/>
868
+ <xsl:number format="a)" lang="en"/>
869
869
  </xsl:when>
870
870
  <xsl:otherwise>
871
871
  <xsl:number format="1."/>
@@ -1006,13 +1006,22 @@
1006
1006
  <title-part lang="en">
1007
1007
 
1008
1008
 
1009
+
1009
1010
  </title-part>
1010
1011
  <title-part lang="fr">
1011
1012
 
1012
1013
 
1014
+
1013
1015
  </title-part>
1014
1016
  <title-part lang="zh">第 # 部分:</title-part>
1015
1017
 
1018
+ <title-subpart lang="en">
1019
+
1020
+ </title-subpart>
1021
+ <title-subpart lang="fr">
1022
+
1023
+ </title-subpart>
1024
+
1016
1025
  <title-modified lang="en">modified</title-modified>
1017
1026
  <title-modified lang="fr">modifiée</title-modified>
1018
1027
 
@@ -1116,7 +1125,7 @@
1116
1125
 
1117
1126
 
1118
1127
 
1119
- <xsl:attribute name="font-family">SFMono-Regular</xsl:attribute>
1128
+ <xsl:attribute name="font-family">Fira Code</xsl:attribute>
1120
1129
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1121
1130
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1122
1131
  <xsl:attribute name="line-height">113%</xsl:attribute>
@@ -1280,6 +1289,7 @@
1280
1289
 
1281
1290
 
1282
1291
 
1292
+
1283
1293
  </xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
1284
1294
 
1285
1295
 
@@ -1326,6 +1336,7 @@
1326
1336
 
1327
1337
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1328
1338
 
1339
+
1329
1340
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1330
1341
 
1331
1342
 
@@ -1362,6 +1373,7 @@
1362
1373
  <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
1363
1374
 
1364
1375
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1376
+
1365
1377
 
1366
1378
 
1367
1379
 
@@ -1485,7 +1497,9 @@
1485
1497
 
1486
1498
 
1487
1499
 
1488
-
1500
+ <!-- <xsl:if test="$namespace = 'bipm'">
1501
+ <fo:block>&#xA0;</fo:block>
1502
+ </xsl:if> -->
1489
1503
 
1490
1504
  <!-- $namespace = 'iso' or -->
1491
1505
 
@@ -1519,10 +1533,12 @@
1519
1533
 
1520
1534
 
1521
1535
  <xsl:variable name="colwidths">
1522
- <xsl:call-template name="calculate-column-widths">
1523
- <xsl:with-param name="cols-count" select="$cols-count"/>
1524
- <xsl:with-param name="table" select="$simple-table"/>
1525
- </xsl:call-template>
1536
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1537
+ <xsl:call-template name="calculate-column-widths">
1538
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1539
+ <xsl:with-param name="table" select="$simple-table"/>
1540
+ </xsl:call-template>
1541
+ </xsl:if>
1526
1542
  </xsl:variable>
1527
1543
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1528
1544
 
@@ -1597,16 +1613,25 @@
1597
1613
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1598
1614
  </xsl:if>
1599
1615
 
1600
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1601
- <xsl:choose>
1602
- <xsl:when test=". = 1 or . = 0">
1603
- <fo:table-column column-width="proportional-column-width(2)"/>
1604
- </xsl:when>
1605
- <xsl:otherwise>
1606
- <fo:table-column column-width="proportional-column-width({.})"/>
1607
- </xsl:otherwise>
1608
- </xsl:choose>
1609
- </xsl:for-each>
1616
+ <xsl:choose>
1617
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1618
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1619
+ <fo:table-column column-width="{@width}"/>
1620
+ </xsl:for-each>
1621
+ </xsl:when>
1622
+ <xsl:otherwise>
1623
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1624
+ <xsl:choose>
1625
+ <xsl:when test=". = 1 or . = 0">
1626
+ <fo:table-column column-width="proportional-column-width(2)"/>
1627
+ </xsl:when>
1628
+ <xsl:otherwise>
1629
+ <fo:table-column column-width="proportional-column-width({.})"/>
1630
+ </xsl:otherwise>
1631
+ </xsl:choose>
1632
+ </xsl:for-each>
1633
+ </xsl:otherwise>
1634
+ </xsl:choose>
1610
1635
 
1611
1636
  <xsl:choose>
1612
1637
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1619,10 +1644,12 @@
1619
1644
 
1620
1645
  </fo:table>
1621
1646
 
1647
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1622
1648
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1623
1649
  <xsl:call-template name="insertTableFooterInSeparateTable">
1624
1650
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1625
1651
  <xsl:with-param name="colwidths" select="$colwidths"/>
1652
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1626
1653
  </xsl:call-template>
1627
1654
  </xsl:for-each>
1628
1655
 
@@ -1655,6 +1682,7 @@
1655
1682
  <xsl:if test="normalize-space() != ''">
1656
1683
  <fo:block xsl:use-attribute-sets="table-name-style">
1657
1684
 
1685
+
1658
1686
  <xsl:apply-templates/>
1659
1687
  </fo:block>
1660
1688
  </xsl:if>
@@ -1837,12 +1865,26 @@
1837
1865
 
1838
1866
 
1839
1867
 
1840
- <!-- except gb and bipm -->
1841
1868
 
1842
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1843
1869
 
1844
1870
 
1871
+ <!-- except gb -->
1872
+
1873
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1874
+
1845
1875
 
1876
+ <!-- show Note under table in preface (ex. abstract) sections -->
1877
+ <!-- empty, because notes show at page side in main sections -->
1878
+ <!-- <xsl:if test="$namespace = 'bipm'">
1879
+ <xsl:choose>
1880
+ <xsl:when test="ancestor::*[local-name()='preface']">
1881
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1882
+ </xsl:when>
1883
+ <xsl:otherwise>
1884
+ <fo:block/>
1885
+ </xsl:otherwise>
1886
+ </xsl:choose>
1887
+ </xsl:if> -->
1846
1888
 
1847
1889
 
1848
1890
  <!-- horizontal row separator -->
@@ -1861,12 +1903,22 @@
1861
1903
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1862
1904
  <xsl:param name="table_attributes"/>
1863
1905
  <xsl:param name="colwidths"/>
1906
+ <xsl:param name="colgroup"/>
1864
1907
 
1865
1908
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1866
1909
 
1867
1910
  <xsl:if test="$isNoteOrFnExist = 'true'">
1868
1911
 
1869
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1912
+ <xsl:variable name="cols-count">
1913
+ <xsl:choose>
1914
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1915
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1916
+ </xsl:when>
1917
+ <xsl:otherwise>
1918
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1919
+ </xsl:otherwise>
1920
+ </xsl:choose>
1921
+ </xsl:variable>
1870
1922
 
1871
1923
  <fo:table keep-with-previous="always">
1872
1924
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1884,16 +1936,25 @@
1884
1936
  </xsl:choose>
1885
1937
  </xsl:for-each>
1886
1938
 
1887
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1888
- <xsl:choose>
1889
- <xsl:when test=". = 1 or . = 0">
1890
- <fo:table-column column-width="proportional-column-width(2)"/>
1891
- </xsl:when>
1892
- <xsl:otherwise>
1893
- <fo:table-column column-width="proportional-column-width({.})"/>
1894
- </xsl:otherwise>
1895
- </xsl:choose>
1896
- </xsl:for-each>
1939
+ <xsl:choose>
1940
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1941
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1942
+ <fo:table-column column-width="{@width}"/>
1943
+ </xsl:for-each>
1944
+ </xsl:when>
1945
+ <xsl:otherwise>
1946
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1947
+ <xsl:choose>
1948
+ <xsl:when test=". = 1 or . = 0">
1949
+ <fo:table-column column-width="proportional-column-width(2)"/>
1950
+ </xsl:when>
1951
+ <xsl:otherwise>
1952
+ <fo:table-column column-width="proportional-column-width({.})"/>
1953
+ </xsl:otherwise>
1954
+ </xsl:choose>
1955
+ </xsl:for-each>
1956
+ </xsl:otherwise>
1957
+ </xsl:choose>
1897
1958
 
1898
1959
  <fo:table-body>
1899
1960
  <fo:table-row>
@@ -1905,7 +1966,11 @@
1905
1966
 
1906
1967
 
1907
1968
 
1908
- <!-- except gb and bipm -->
1969
+
1970
+
1971
+
1972
+
1973
+ <!-- except gb -->
1909
1974
 
1910
1975
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1911
1976
 
@@ -1991,6 +2056,10 @@
1991
2056
 
1992
2057
 
1993
2058
 
2059
+ <!-- <xsl:if test="$namespace = 'bipm'">
2060
+ <xsl:attribute name="height">8mm</xsl:attribute>
2061
+ </xsl:if> -->
2062
+
1994
2063
  <xsl:apply-templates/>
1995
2064
  </fo:table-row>
1996
2065
  </xsl:template><xsl:template match="*[local-name()='th']">
@@ -2074,7 +2143,8 @@
2074
2143
  </xsl:attribute>
2075
2144
  </xsl:if>
2076
2145
  <xsl:call-template name="display-align"/>
2077
- <fo:block>
2146
+ <fo:block>
2147
+
2078
2148
  <xsl:apply-templates/>
2079
2149
  </fo:block>
2080
2150
  </fo:table-cell>
@@ -2291,7 +2361,13 @@
2291
2361
  <xsl:apply-templates/>
2292
2362
  </fo:inline>
2293
2363
  </xsl:template><xsl:template match="*[local-name()='dl']">
2294
- <fo:block-container margin-left="0mm">
2364
+ <fo:block-container>
2365
+
2366
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2367
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2368
+ </xsl:if>
2369
+
2370
+
2295
2371
  <xsl:if test="parent::*[local-name() = 'note']">
2296
2372
  <xsl:attribute name="margin-left">
2297
2373
  <xsl:choose>
@@ -2301,8 +2377,12 @@
2301
2377
  </xsl:attribute>
2302
2378
 
2303
2379
  </xsl:if>
2304
- <fo:block-container margin-left="0mm">
2305
-
2380
+ <fo:block-container>
2381
+
2382
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2383
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2384
+
2385
+
2306
2386
  <xsl:variable name="parent" select="local-name(..)"/>
2307
2387
 
2308
2388
  <xsl:variable name="key_iso">
@@ -2316,9 +2396,12 @@
2316
2396
  <fo:block margin-bottom="12pt" text-align="left">
2317
2397
 
2318
2398
  <xsl:variable name="title-where">
2319
- <xsl:call-template name="getTitle">
2320
- <xsl:with-param name="name" select="'title-where'"/>
2321
- </xsl:call-template>
2399
+
2400
+
2401
+ <xsl:call-template name="getTitle">
2402
+ <xsl:with-param name="name" select="'title-where'"/>
2403
+ </xsl:call-template>
2404
+
2322
2405
  </xsl:variable>
2323
2406
  <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2324
2407
  <xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2334,9 +2417,12 @@
2334
2417
 
2335
2418
 
2336
2419
  <xsl:variable name="title-where">
2337
- <xsl:call-template name="getTitle">
2338
- <xsl:with-param name="name" select="'title-where'"/>
2339
- </xsl:call-template>
2420
+
2421
+
2422
+ <xsl:call-template name="getTitle">
2423
+ <xsl:with-param name="name" select="'title-where'"/>
2424
+ </xsl:call-template>
2425
+
2340
2426
  </xsl:variable>
2341
2427
  <xsl:value-of select="$title-where"/>
2342
2428
  </fo:block>
@@ -2347,9 +2433,12 @@
2347
2433
 
2348
2434
 
2349
2435
  <xsl:variable name="title-key">
2350
- <xsl:call-template name="getTitle">
2351
- <xsl:with-param name="name" select="'title-key'"/>
2352
- </xsl:call-template>
2436
+
2437
+
2438
+ <xsl:call-template name="getTitle">
2439
+ <xsl:with-param name="name" select="'title-key'"/>
2440
+ </xsl:call-template>
2441
+
2353
2442
  </xsl:variable>
2354
2443
  <xsl:value-of select="$title-key"/>
2355
2444
  </fo:block>
@@ -2479,12 +2568,32 @@
2479
2568
  </xsl:otherwise>
2480
2569
  </xsl:choose>
2481
2570
  </xsl:template><xsl:template name="getMaxLength_dt">
2482
- <xsl:for-each select="*[local-name()='dt']">
2483
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2484
- <xsl:if test="position() = 1">
2485
- <xsl:value-of select="string-length(normalize-space(.))"/>
2486
- </xsl:if>
2487
- </xsl:for-each>
2571
+ <xsl:variable name="lengths">
2572
+ <xsl:for-each select="*[local-name()='dt']">
2573
+ <xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
2574
+ <xsl:variable name="attributes">
2575
+ <xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
2576
+ <xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
2577
+ </xsl:variable>
2578
+ <length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
2579
+ </xsl:for-each>
2580
+ </xsl:variable>
2581
+ <xsl:variable name="maxLength">
2582
+ <!-- <xsl:for-each select="*[local-name()='dt']">
2583
+ <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2584
+ <xsl:if test="position() = 1">
2585
+ <xsl:value-of select="string-length(normalize-space(.))"/>
2586
+ </xsl:if>
2587
+ </xsl:for-each> -->
2588
+ <xsl:for-each select="xalan:nodeset($lengths)/length">
2589
+ <xsl:sort select="." data-type="number" order="descending"/>
2590
+ <xsl:if test="position() = 1">
2591
+ <xsl:value-of select="."/>
2592
+ </xsl:if>
2593
+ </xsl:for-each>
2594
+ </xsl:variable>
2595
+ <!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
2596
+ <xsl:value-of select="$maxLength"/>
2488
2597
  </xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
2489
2598
  <xsl:param name="key_iso"/>
2490
2599
 
@@ -2599,6 +2708,7 @@
2599
2708
  </fo:inline>
2600
2709
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2601
2710
  <fo:inline font-weight="bold">
2711
+
2602
2712
  <xsl:apply-templates/>
2603
2713
  </fo:inline>
2604
2714
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2927,7 +3037,18 @@
2927
3037
  <xsl:with-param name="previousRow" select="$newRow"/>
2928
3038
  </xsl:apply-templates>
2929
3039
  </xsl:template><xsl:template name="getLang">
2930
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3040
+ <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
3041
+ <xsl:variable name="language">
3042
+ <xsl:choose>
3043
+ <xsl:when test="$language_current != ''">
3044
+ <xsl:value-of select="$language_current"/>
3045
+ </xsl:when>
3046
+ <xsl:otherwise>
3047
+ <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
3048
+ </xsl:otherwise>
3049
+ </xsl:choose>
3050
+ </xsl:variable>
3051
+
2931
3052
  <xsl:choose>
2932
3053
  <xsl:when test="$language = 'English'">en</xsl:when>
2933
3054
  <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -2962,6 +3083,7 @@
2962
3083
  <xsl:value-of select="substring($str, 2)"/>
2963
3084
  </xsl:template><xsl:template match="mathml:math">
2964
3085
  <fo:inline font-family="STIX Two Math"> <!-- -->
3086
+
2965
3087
  <xsl:variable name="mathml">
2966
3088
  <xsl:apply-templates select="." mode="mathml"/>
2967
3089
  </xsl:variable>
@@ -2991,6 +3113,7 @@
2991
3113
  </xsl:choose>
2992
3114
  </xsl:variable>
2993
3115
  <fo:inline xsl:use-attribute-sets="link-style">
3116
+
2994
3117
  <xsl:choose>
2995
3118
  <xsl:when test="$target = ''">
2996
3119
  <xsl:apply-templates/>
@@ -3044,10 +3167,14 @@
3044
3167
  </fo:inline>
3045
3168
  </xsl:template><xsl:template match="*[local-name() = 'modification']">
3046
3169
  <xsl:variable name="title-modified">
3047
- <xsl:call-template name="getTitle">
3048
- <xsl:with-param name="name" select="'title-modified'"/>
3049
- </xsl:call-template>
3170
+
3171
+
3172
+ <xsl:call-template name="getTitle">
3173
+ <xsl:with-param name="name" select="'title-modified'"/>
3174
+ </xsl:call-template>
3175
+
3050
3176
  </xsl:variable>
3177
+
3051
3178
  <xsl:choose>
3052
3179
  <xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
3053
3180
  <xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -3112,6 +3239,8 @@
3112
3239
 
3113
3240
 
3114
3241
 
3242
+
3243
+
3115
3244
  <fo:inline xsl:use-attribute-sets="note-name-style">
3116
3245
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3117
3246
  </fo:inline>
@@ -3200,7 +3329,8 @@
3200
3329
  </fo:inline>
3201
3330
  </xsl:if>
3202
3331
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3203
- <fo:block-container id="{@id}">
3332
+ <fo:block-container id="{@id}">
3333
+
3204
3334
  <fo:block>
3205
3335
  <xsl:apply-templates/>
3206
3336
  </fo:block>
@@ -3251,7 +3381,7 @@
3251
3381
  <xsl:apply-templates mode="bookmarks"/>
3252
3382
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3253
3383
  <xsl:apply-templates select="."/>
3254
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3384
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3255
3385
  <xsl:apply-templates mode="bookmarks"/>
3256
3386
  </xsl:template><xsl:template name="addBookmarks">
3257
3387
  <xsl:param name="contents"/>
@@ -3267,6 +3397,8 @@
3267
3397
  <xsl:variable name="bookmark-title_">
3268
3398
  <xsl:call-template name="getLangVersion">
3269
3399
  <xsl:with-param name="lang" select="@lang"/>
3400
+ <xsl:with-param name="doctype" select="@doctype"/>
3401
+ <xsl:with-param name="title" select="@title-part"/>
3270
3402
  </xsl:call-template>
3271
3403
  </xsl:variable>
3272
3404
  <xsl:choose>
@@ -3284,13 +3416,34 @@
3284
3416
  </xsl:choose>
3285
3417
  </fo:bookmark-title>
3286
3418
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3419
+
3420
+ <xsl:call-template name="insertFigureBookmarks">
3421
+ <xsl:with-param name="contents" select="contents"/>
3422
+ </xsl:call-template>
3423
+
3424
+ <xsl:call-template name="insertTableBookmarks">
3425
+ <xsl:with-param name="contents" select="contents"/>
3426
+ <xsl:with-param name="lang" select="@lang"/>
3427
+ </xsl:call-template>
3428
+
3287
3429
  </fo:bookmark>
3288
3430
 
3289
3431
  </xsl:for-each>
3290
3432
  </xsl:when>
3291
3433
  <xsl:otherwise>
3292
3434
  <xsl:for-each select="xalan:nodeset($contents)/doc">
3435
+
3293
3436
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3437
+
3438
+ <xsl:call-template name="insertFigureBookmarks">
3439
+ <xsl:with-param name="contents" select="contents"/>
3440
+ </xsl:call-template>
3441
+
3442
+ <xsl:call-template name="insertTableBookmarks">
3443
+ <xsl:with-param name="contents" select="contents"/>
3444
+ <xsl:with-param name="lang" select="@lang"/>
3445
+ </xsl:call-template>
3446
+
3294
3447
  </xsl:for-each>
3295
3448
  </xsl:otherwise>
3296
3449
  </xsl:choose>
@@ -3309,8 +3462,44 @@
3309
3462
 
3310
3463
  </fo:bookmark-tree>
3311
3464
  </xsl:if>
3465
+ </xsl:template><xsl:template name="insertFigureBookmarks">
3466
+ <xsl:param name="contents"/>
3467
+ <xsl:if test="xalan:nodeset($contents)/figure">
3468
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
3469
+ <fo:bookmark-title>Figures</fo:bookmark-title>
3470
+ <xsl:for-each select="xalan:nodeset($contents)/figure">
3471
+ <fo:bookmark internal-destination="{@id}">
3472
+ <fo:bookmark-title>
3473
+ <xsl:value-of select="normalize-space(title)"/>
3474
+ </fo:bookmark-title>
3475
+ </fo:bookmark>
3476
+ </xsl:for-each>
3477
+ </fo:bookmark>
3478
+ </xsl:if>
3479
+ </xsl:template><xsl:template name="insertTableBookmarks">
3480
+ <xsl:param name="contents"/>
3481
+ <xsl:param name="lang"/>
3482
+ <xsl:if test="xalan:nodeset($contents)/table">
3483
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
3484
+ <fo:bookmark-title>
3485
+ <xsl:choose>
3486
+ <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
3487
+ <xsl:otherwise>Tables</xsl:otherwise>
3488
+ </xsl:choose>
3489
+ </fo:bookmark-title>
3490
+ <xsl:for-each select="xalan:nodeset($contents)/table">
3491
+ <fo:bookmark internal-destination="{@id}">
3492
+ <fo:bookmark-title>
3493
+ <xsl:value-of select="normalize-space(title)"/>
3494
+ </fo:bookmark-title>
3495
+ </fo:bookmark>
3496
+ </xsl:for-each>
3497
+ </fo:bookmark>
3498
+ </xsl:if>
3312
3499
  </xsl:template><xsl:template name="getLangVersion">
3313
3500
  <xsl:param name="lang"/>
3501
+ <xsl:param name="doctype" select="''"/>
3502
+ <xsl:param name="title" select="''"/>
3314
3503
  <xsl:choose>
3315
3504
  <xsl:when test="$lang = 'en'">
3316
3505
 
@@ -3774,9 +3963,14 @@
3774
3963
 
3775
3964
  <fo:inline>
3776
3965
 
3777
- <xsl:call-template name="getTitle">
3778
- <xsl:with-param name="name" select="'title-source'"/>
3779
- </xsl:call-template>
3966
+
3967
+
3968
+
3969
+ <xsl:call-template name="getTitle">
3970
+ <xsl:with-param name="name" select="'title-source'"/>
3971
+ </xsl:call-template>
3972
+
3973
+
3780
3974
  <xsl:text>: </xsl:text>
3781
3975
  </fo:inline>
3782
3976
 
@@ -3801,7 +3995,8 @@
3801
3995
  <fo:block-container margin-left="0mm">
3802
3996
 
3803
3997
  <fo:block xsl:use-attribute-sets="quote-style">
3804
- <xsl:apply-templates select=".//*[local-name() = 'p']"/>
3998
+ <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
3999
+ <xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
3805
4000
  </fo:block>
3806
4001
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
3807
4002
  <fo:block xsl:use-attribute-sets="quote-source-style">
@@ -3929,9 +4124,12 @@
3929
4124
  </fo:block>
3930
4125
  </xsl:template><xsl:template match="*[local-name() = 'deprecates']">
3931
4126
  <xsl:variable name="title-deprecated">
3932
- <xsl:call-template name="getTitle">
3933
- <xsl:with-param name="name" select="'title-deprecated'"/>
3934
- </xsl:call-template>
4127
+
4128
+
4129
+ <xsl:call-template name="getTitle">
4130
+ <xsl:with-param name="name" select="'title-deprecated'"/>
4131
+ </xsl:call-template>
4132
+
3935
4133
  </xsl:variable>
3936
4134
  <fo:block xsl:use-attribute-sets="deprecates-style">
3937
4135
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -3980,7 +4178,7 @@
3980
4178
  <fo:block id="{@id}">
3981
4179
  <xsl:apply-templates/>
3982
4180
  </fo:block>
3983
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4181
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3984
4182
 
3985
4183
  <fo:block id="{@id}">
3986
4184
  <xsl:apply-templates/>
@@ -4037,7 +4235,8 @@
4037
4235
  <fo:table-column column-width="107mm"/>
4038
4236
  <fo:table-column column-width="15mm"/>
4039
4237
  <fo:table-body>
4040
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4238
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4239
+
4041
4240
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4042
4241
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4043
4242
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4055,6 +4254,10 @@
4055
4254
  <fo:block><xsl:apply-templates/></fo:block>
4056
4255
  </fo:table-cell>
4057
4256
  </xsl:template><xsl:template name="processBibitem">
4257
+
4258
+
4259
+ <!-- end BIPM bibitem processing-->
4260
+
4058
4261
 
4059
4262
 
4060
4263
 
@@ -4393,13 +4596,22 @@
4393
4596
  </xsl:template><xsl:template name="split">
4394
4597
  <xsl:param name="pText" select="."/>
4395
4598
  <xsl:param name="sep" select="','"/>
4599
+ <xsl:param name="normalize-space" select="'true'"/>
4396
4600
  <xsl:if test="string-length($pText) &gt;0">
4397
4601
  <item>
4398
- <xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
4602
+ <xsl:choose>
4603
+ <xsl:when test="$normalize-space = 'true'">
4604
+ <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
4605
+ </xsl:when>
4606
+ <xsl:otherwise>
4607
+ <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
4608
+ </xsl:otherwise>
4609
+ </xsl:choose>
4399
4610
  </item>
4400
4611
  <xsl:call-template name="split">
4401
4612
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
4402
4613
  <xsl:with-param name="sep" select="$sep"/>
4614
+ <xsl:with-param name="normalize-space" select="$normalize-space"/>
4403
4615
  </xsl:call-template>
4404
4616
  </xsl:if>
4405
4617
  </xsl:template><xsl:template name="getDocumentId">
@@ -4465,4 +4677,23 @@
4465
4677
  <xsl:with-param name="letter-spacing" select="$letter-spacing"/>
4466
4678
  </xsl:call-template>
4467
4679
  </xsl:if>
4680
+ </xsl:template><xsl:template name="repeat">
4681
+ <xsl:param name="char" select="'*'"/>
4682
+ <xsl:param name="count"/>
4683
+ <xsl:if test="$count &gt; 0">
4684
+ <xsl:value-of select="$char"/>
4685
+ <xsl:call-template name="repeat">
4686
+ <xsl:with-param name="char" select="$char"/>
4687
+ <xsl:with-param name="count" select="$count - 1"/>
4688
+ </xsl:call-template>
4689
+ </xsl:if>
4690
+ </xsl:template><xsl:template name="getLocalizedString">
4691
+ <xsl:param name="key"/>
4692
+
4693
+ <xsl:variable name="curr_lang">
4694
+ <xsl:call-template name="getLang"/>
4695
+ </xsl:variable>
4696
+
4697
+ <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4698
+
4468
4699
  </xsl:template></xsl:stylesheet>