metanorma-ribose 1.6.5 → 1.6.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +66 -0
  3. data/README.adoc +5 -6
  4. data/lib/asciidoctor/ribose/basicdoc.rng +50 -3
  5. data/lib/asciidoctor/ribose/isodoc.rng +36 -43
  6. data/lib/isodoc/ribose/html/htmlstyle.css +7 -3
  7. data/lib/isodoc/ribose/html/htmlstyle.scss +2 -2
  8. data/lib/isodoc/ribose/html/rsd.css +70 -70
  9. data/lib/isodoc/ribose/html/rsd.scss +70 -70
  10. data/lib/isodoc/ribose/html/wordstyle.css +53 -53
  11. data/lib/isodoc/ribose/html/wordstyle.scss +53 -53
  12. data/lib/isodoc/ribose/rsd.standard.xsl +324 -93
  13. data/lib/metanorma/ribose/processor.rb +9 -0
  14. data/lib/metanorma/ribose/version.rb +1 -1
  15. data/metanorma-ribose.gemspec +1 -2
  16. data/metanorma.yml +6 -0
  17. metadata +5 -21
  18. data/.github/workflows/macos.yml +0 -41
  19. data/.github/workflows/ubuntu.yml +0 -45
  20. data/.github/workflows/windows.yml +0 -43
data/lib/isodoc/ribose/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;}
@@ -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";
@@ -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
  color:#0E1A85;
@@ -375,7 +375,7 @@ h1.Annex
375
375
  mso-style-next:Normal;
376
376
  margin-top:3.0pt;
377
377
  margin-right:0cm;
378
- margin-bottom:12.0pt;
378
+ margin-bottom:$normalfontsize;
379
379
  margin-left:0cm;
380
380
  text-indent:0cm;
381
381
  line-height:12.5pt;
@@ -388,7 +388,7 @@ h1.Annex
388
388
  mso-hyphenate:none;
389
389
  tab-stops:20.0pt list 21.6pt left 28.0pt;
390
390
  font-size:13.0pt;
391
- mso-bidi-font-size:11.0pt;
391
+ mso-bidi-font-size:$smallerfontsize;
392
392
  font-family:$headerfont;
393
393
  font-weight:normal;
394
394
  mso-fareast-font-family:$headerfont;
@@ -406,7 +406,7 @@ h1.Annex
406
406
  mso-style-next:Normal;
407
407
  margin-top:3.0pt;
408
408
  margin-right:0cm;
409
- margin-bottom:12.0pt;
409
+ margin-bottom:$normalfontsize;
410
410
  margin-left:0cm;
411
411
  text-indent:0cm;
412
412
  line-height:12.5pt;
@@ -415,8 +415,8 @@ h1.Annex
415
415
  mso-outline-level:2;
416
416
  mso-hyphenate:none;
417
417
  tab-stops:27.0pt 35.0pt;
418
- font-size:12.0pt;
419
- mso-bidi-font-size:11.0pt;
418
+ font-size:$normalfontsize;
419
+ mso-bidi-font-size:$smallerfontsize;
420
420
  font-family:$headerfont;
421
421
  font-weight:normal;
422
422
  mso-fareast-font-family:$headerfont;
@@ -433,7 +433,7 @@ h2
433
433
  mso-style-next:Normal;
434
434
  margin-top:3.0pt;
435
435
  margin-right:0cm;
436
- margin-bottom:12.0pt;
436
+ margin-bottom:$normalfontsize;
437
437
  margin-left:0cm;
438
438
  text-indent:0cm;
439
439
  line-height:12.5pt;
@@ -443,8 +443,8 @@ h2
443
443
  mso-list:l1 level2 lfo6;
444
444
  mso-hyphenate:none;
445
445
  tab-stops:27.0pt 35.0pt;
446
- font-size:12.0pt;
447
- mso-bidi-font-size:11.0pt;
446
+ font-size:$normalfontsize;
447
+ mso-bidi-font-size:$smallerfontsize;
448
448
  font-family:$headerfont;
449
449
  font-weight:normal;
450
450
  mso-fareast-font-family:$headerfont;
@@ -461,17 +461,17 @@ h3
461
461
  mso-style-next:Normal;
462
462
  margin-top:3.0pt;
463
463
  margin-right:0cm;
464
- margin-bottom:12.0pt;
464
+ margin-bottom:$normalfontsize;
465
465
  margin-left:0cm;
466
466
  text-indent:0cm;
467
- line-height:12.0pt;
467
+ line-height:$normalfontsize;
468
468
  mso-pagination:widow-orphan;
469
469
  page-break-after:avoid;
470
470
  mso-outline-level:3;
471
471
  mso-list:l1 level3 lfo6;
472
472
  mso-hyphenate:none;
473
473
  tab-stops:list 36.0pt left 44.0pt;
474
- font-size:11.0pt;
474
+ font-size:$smallerfontsize;
475
475
  font-family:$headerfont;
476
476
  font-weight:normal;
477
477
  color:#0E1A85;
@@ -488,17 +488,17 @@ h4
488
488
  mso-style-next:Normal;
489
489
  margin-top:3.0pt;
490
490
  margin-right:0cm;
491
- margin-bottom:12.0pt;
491
+ margin-bottom:$normalfontsize;
492
492
  margin-left:0cm;
493
493
  text-indent:0cm;
494
- line-height:12.0pt;
494
+ line-height:$normalfontsize;
495
495
  mso-pagination:widow-orphan;
496
496
  page-break-after:avoid;
497
497
  mso-outline-level:4;
498
498
  mso-list:l1 level4 lfo6;
499
499
  mso-hyphenate:none;
500
500
  tab-stops:51.05pt 57.0pt 68.0pt;
501
- font-size:11.0pt;
501
+ font-size:$smallerfontsize;
502
502
  font-family:$headerfont;
503
503
  font-weight:normal;
504
504
  color:#0E1A85;
@@ -515,17 +515,17 @@ h5
515
515
  mso-style-next:Normal;
516
516
  margin-top:3.0pt;
517
517
  margin-right:0cm;
518
- margin-bottom:12.0pt;
518
+ margin-bottom:$normalfontsize;
519
519
  margin-left:0cm;
520
520
  text-indent:0cm;
521
- line-height:12.0pt;
521
+ line-height:$normalfontsize;
522
522
  mso-pagination:widow-orphan;
523
523
  page-break-after:avoid;
524
524
  mso-outline-level:5;
525
525
  mso-list:l1 level5 lfo6;
526
526
  mso-hyphenate:none;
527
527
  tab-stops:51.05pt list 54.0pt;
528
- font-size:11.0pt;
528
+ font-size:$smallerfontsize;
529
529
  font-family:$headerfont;
530
530
  font-weight:normal;
531
531
  mso-fareast-font-family:$headerfont;
@@ -542,17 +542,17 @@ h6
542
542
  mso-style-next:Normal;
543
543
  margin-top:3.0pt;
544
544
  margin-right:0cm;
545
- margin-bottom:12.0pt;
545
+ margin-bottom:$normalfontsize;
546
546
  margin-left:0cm;
547
547
  text-indent:0cm;
548
- line-height:12.0pt;
548
+ line-height:$normalfontsize;
549
549
  mso-pagination:widow-orphan;
550
550
  page-break-after:avoid;
551
551
  mso-outline-level:6;
552
552
  mso-list:l1 level6 lfo6;
553
553
  mso-hyphenate:none;
554
554
  tab-stops:51.05pt list 72.0pt;
555
- font-size:11.0pt;
555
+ font-size:$smallerfontsize;
556
556
  font-family:$headerfont;
557
557
  font-weight:normal;
558
558
  color:#0E1A85;
@@ -570,11 +570,11 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
570
570
  margin-left:36.0pt;
571
571
  margin-bottom:.0001pt;
572
572
  text-indent:-36.0pt;
573
- line-height:12.0pt;
573
+ line-height:$normalfontsize;
574
574
  mso-pagination:widow-orphan;
575
575
  mso-hyphenate:none;
576
576
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
577
- font-size:12.0pt;
577
+ font-size:$normalfontsize;
578
578
  font-family:$bodyfont;
579
579
  mso-fareast-font-family:$bodyfont;
580
580
  mso-bidi-font-family:$bodyfont;
@@ -593,11 +593,11 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
593
593
  margin-left:36.0pt;
594
594
  margin-bottom:.0001pt;
595
595
  text-indent:-36.0pt;
596
- line-height:12.0pt;
596
+ line-height:$normalfontsize;
597
597
  mso-pagination:widow-orphan;
598
598
  mso-hyphenate:none;
599
599
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
600
- font-size:12.0pt;
600
+ font-size:$normalfontsize;
601
601
  font-family:$bodyfont;
602
602
  mso-fareast-font-family:$bodyfont;
603
603
  mso-bidi-font-family:$bodyfont;
@@ -616,11 +616,11 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
616
616
  margin-left:36.0pt;
617
617
  margin-bottom:.0001pt;
618
618
  text-indent:-36.0pt;
619
- line-height:12.0pt;
619
+ line-height:$normalfontsize;
620
620
  mso-pagination:widow-orphan;
621
621
  mso-hyphenate:none;
622
622
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
623
- font-size:12.0pt;
623
+ font-size:$normalfontsize;
624
624
  font-family:$bodyfont;
625
625
  mso-fareast-font-family:$bodyfont;
626
626
  mso-bidi-font-family:$bodyfont;
@@ -636,13 +636,13 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
636
636
  mso-style-link:"Footnote Text Char";
637
637
  margin-top:0cm;
638
638
  margin-right:0cm;
639
- margin-bottom:12.0pt;
639
+ margin-bottom:$normalfontsize;
640
640
  margin-left:0cm;
641
641
  text-align:justify;
642
- line-height:12.0pt;
642
+ line-height:$normalfontsize;
643
643
  mso-pagination:widow-orphan;
644
644
  tab-stops:20.15pt;
645
- font-size:10.0pt;
645
+ font-size:$footnotefontsize;
646
646
  font-family:$bodyfont;
647
647
  mso-fareast-font-family:$bodyfont;
648
648
  mso-bidi-font-family:$bodyfont;
@@ -658,9 +658,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
658
658
  margin-bottom:6.0pt;
659
659
  margin-left:0cm;
660
660
  text-align:justify;
661
- line-height:12.0pt;
661
+ line-height:$normalfontsize;
662
662
  mso-pagination:widow-orphan;
663
- font-size:12.0pt;
663
+ font-size:$normalfontsize;
664
664
  font-family:$bodyfont;
665
665
  mso-fareast-font-family:$bodyfont;
666
666
  mso-bidi-font-family:$bodyfont;
@@ -689,7 +689,7 @@ span.Heading2Char
689
689
  mso-style-locked:yes;
690
690
  mso-style-parent:"";
691
691
  mso-style-link:"Heading 2";
692
- mso-ansi-font-size:12.0pt;
692
+ mso-ansi-font-size:$normalfontsize;
693
693
  font-family:$headerfont;
694
694
  color:#0E1A85;
695
695
  font-weight:normal;
@@ -706,7 +706,7 @@ span.Heading3Char
706
706
  mso-style-locked:yes;
707
707
  mso-style-parent:"";
708
708
  mso-style-link:"Heading 3";
709
- mso-ansi-font-size:11.0pt;
709
+ mso-ansi-font-size:$smallerfontsize;
710
710
  font-family:$headerfont;
711
711
  color:#0E1A85;
712
712
  font-weight:normal;
@@ -723,7 +723,7 @@ span.Heading4Char
723
723
  mso-style-locked:yes;
724
724
  mso-style-parent:"";
725
725
  mso-style-link:"Heading 4";
726
- mso-ansi-font-size:11.0pt;
726
+ mso-ansi-font-size:$smallerfontsize;
727
727
  font-family:$headerfont;
728
728
  color:#0E1A85;
729
729
  font-weight:normal;
@@ -740,7 +740,7 @@ span.Heading5Char
740
740
  mso-style-locked:yes;
741
741
  mso-style-parent:"";
742
742
  mso-style-link:"Heading 5";
743
- mso-ansi-font-size:11.0pt;
743
+ mso-ansi-font-size:$smallerfontsize;
744
744
  font-family:$headerfont;
745
745
  color:#0E1A85;
746
746
  font-weight:normal;
@@ -757,7 +757,7 @@ span.Heading6Char
757
757
  mso-style-locked:yes;
758
758
  mso-style-parent:"";
759
759
  mso-style-link:"Heading 6";
760
- mso-ansi-font-size:11.0pt;
760
+ mso-ansi-font-size:$smallerfontsize;
761
761
  font-family:$headerfont;
762
762
  color:#0E1A85;
763
763
  font-weight:normal;
@@ -778,7 +778,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
778
778
  line-height:10.5pt;
779
779
  mso-pagination:widow-orphan;
780
780
  font-size:10.0pt;
781
- mso-bidi-font-size:11.0pt;
781
+ mso-bidi-font-size:$smallerfontsize;
782
782
  font-family:$bodyfont;
783
783
  mso-fareast-font-family:$bodyfont;
784
784
  mso-bidi-font-family:$bodyfont;
@@ -1159,7 +1159,7 @@ table.MsoNormalTable
1159
1159
  mso-para-margin:0cm;
1160
1160
  mso-para-margin-bottom:.0001pt;
1161
1161
  mso-pagination:widow-orphan;
1162
- font-size:12.0pt;
1162
+ font-size:$normalfontsize;
1163
1163
  font-family:$bodyfont;}
1164
1164
  ol
1165
1165
  {margin-bottom:0cm;
data/lib/isodoc/ribose/rsd.standard.xsl CHANGED
@@ -55,7 +55,7 @@
55
55
 
56
56
  <xsl:template match="/">
57
57
  <xsl:call-template name="namespaceCheck"/>
58
- <fo:root font-family="SourceSansPro-Light, STIX Two Math" font-size="10.5pt" xml:lang="{$lang}">
58
+ <fo:root font-family="Source Sans Pro, STIX Two Math" font-weight="300" font-size="10.5pt" xml:lang="{$lang}">
59
59
  <fo:layout-master-set>
60
60
 
61
61
  <fo:simple-page-master master-name="odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
@@ -107,12 +107,12 @@
107
107
  <fo:flow flow-name="xsl-region-body">
108
108
  <fo:block font-size="16pt" margin-bottom="16pt"> </fo:block>
109
109
  <fo:block font-size="16pt" margin-bottom="16pt"> </fo:block>
110
- <fo:block font-size="22pt" font-weight="bold" margin-bottom="12pt"><xsl:value-of select="$doctitle"/></fo:block>
110
+ <fo:block font-size="22pt" font-weight="normal" margin-bottom="12pt"><xsl:value-of select="$doctitle"/></fo:block>
111
111
  <fo:block font-size="22pt" margin-bottom="14pt"> </fo:block>
112
112
  <fo:block font-size="22pt" margin-bottom="14pt"> </fo:block>
113
113
  <fo:block font-size="22pt" margin-bottom="6pt"> </fo:block>
114
114
 
115
- <fo:block font-family="SourceSerifPro" font-size="12pt" line-height="230%">
115
+ <fo:block font-family="Source Serif Pro" font-size="12pt" line-height="230%">
116
116
  <fo:block>Ronald Tse</fo:block>
117
117
  <fo:block>Wai Kit Wong</fo:block>
118
118
  <fo:block>Daniel Wyatt</fo:block>
@@ -144,7 +144,7 @@
144
144
  </xsl:call-template>
145
145
  </fo:block>
146
146
 
147
- <fo:block font-size="12pt" font-weight="bold" font-style="italic" margin-bottom="12pt">
147
+ <fo:block font-size="12pt" font-weight="normal" font-style="italic" margin-bottom="12pt">
148
148
  <xsl:text>Unrestricted</xsl:text>
149
149
  </fo:block>
150
150
 
@@ -165,8 +165,8 @@
165
165
  <xsl:with-param name="name" select="'title-toc'"/>
166
166
  </xsl:call-template>
167
167
  </xsl:variable>
168
- <fo:block font-size="14pt" font-weight="bold" margin-bottom="15.5pt"><xsl:value-of select="$title-toc"/></fo:block>
169
- <fo:block font-weight="bold" line-height="125%">
168
+ <fo:block font-size="14pt" font-weight="normal" margin-bottom="15.5pt"><xsl:value-of select="$title-toc"/></fo:block>
169
+ <fo:block font-weight="normal" line-height="125%">
170
170
  <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
171
171
  <fo:block>
172
172
  <xsl:if test="@level = 1">
@@ -225,7 +225,7 @@
225
225
 
226
226
  <fo:block line-height="130%">
227
227
 
228
- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt"><xsl:value-of select="$doctitle"/></fo:block>
228
+ <fo:block font-size="16pt" font-weight="normal" margin-bottom="18pt"><xsl:value-of select="$doctitle"/></fo:block>
229
229
 
230
230
  <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:abstract"/>
231
231
  <xsl:apply-templates select="/rsd:rsd-standard/rsd:preface/rsd:foreword"/>
@@ -328,7 +328,7 @@
328
328
  </xsl:template>
329
329
 
330
330
  <xsl:template match="rsd:license-statement//rsd:title">
331
- <fo:block text-align="center" font-weight="bold" margin-top="4pt">
331
+ <fo:block text-align="center" font-weight="normal" margin-top="4pt">
332
332
  <xsl:apply-templates/>
333
333
  </fo:block>
334
334
  </xsl:template>
@@ -349,7 +349,7 @@
349
349
  </xsl:template>
350
350
 
351
351
  <xsl:template match="rsd:copyright-statement//rsd:title">
352
- <fo:block font-weight="bold" text-align="center">
352
+ <fo:block font-weight="normal" text-align="center">
353
353
  <xsl:apply-templates/>
354
354
  </fo:block>
355
355
  </xsl:template>
@@ -373,7 +373,7 @@
373
373
  </xsl:template>
374
374
 
375
375
  <xsl:template match="rsd:legal-statement//rsd:title">
376
- <fo:block font-weight="bold" padding-top="2mm" margin-bottom="6pt">
376
+ <fo:block font-weight="normal" padding-top="2mm" margin-bottom="6pt">
377
377
  <xsl:apply-templates/>
378
378
  </fo:block>
379
379
  </xsl:template>
@@ -434,7 +434,7 @@
434
434
 
435
435
  <xsl:element name="{$element-name}">
436
436
  <xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
437
- <xsl:attribute name="font-weight">bold</xsl:attribute>
437
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
438
438
  <xsl:attribute name="space-before">13.5pt</xsl:attribute>
439
439
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
440
440
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -529,7 +529,7 @@
529
529
 
530
530
 
531
531
  <xsl:template match="rsd:bibitem">
532
- <fo:block font-family="SourceSansPro" font-size="11pt" id="{@id}" margin-bottom="12pt" start-indent="12mm" text-indent="-12mm">
532
+ <fo:block font-family="Source Sans Pro" font-size="11pt" id="{@id}" margin-bottom="12pt" start-indent="12mm" text-indent="-12mm">
533
533
  <xsl:if test=".//rsd:fn">
534
534
  <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
535
535
  </xsl:if>
@@ -674,13 +674,13 @@
674
674
  <xsl:otherwise> <!-- for ordered lists -->
675
675
  <xsl:choose>
676
676
  <xsl:when test="../@type = 'arabic'">
677
- <xsl:number format="a)"/>
677
+ <xsl:number format="a)" lang="en"/>
678
678
  </xsl:when>
679
679
  <xsl:when test="../@type = 'alphabet'">
680
680
  <xsl:number format="1)"/>
681
681
  </xsl:when>
682
682
  <xsl:when test="../@type = 'alphabet_upper'">
683
- <xsl:number format="A)"/>
683
+ <xsl:number format="A)" lang="en"/>
684
684
  </xsl:when>
685
685
 
686
686
  <xsl:when test="../@type = 'roman'">
@@ -727,10 +727,10 @@
727
727
  </xsl:choose>
728
728
  </xsl:variable>
729
729
  <fo:block font-size="{$font-size}">
730
- <fo:block font-weight="bold" keep-with-next="always">
730
+ <fo:block font-weight="normal" keep-with-next="always">
731
731
  <xsl:apply-templates select="ancestor::rsd:term/rsd:name" mode="presentation"/>
732
732
  </fo:block>
733
- <fo:block font-weight="bold" keep-with-next="always" line-height="1">
733
+ <fo:block font-weight="normal" keep-with-next="always" line-height="1">
734
734
  <xsl:apply-templates/>
735
735
  </fo:block>
736
736
  </fo:block>
@@ -774,7 +774,7 @@
774
774
  <xsl:template match="rsd:admonition">
775
775
  <fo:block-container border="0.5pt solid rgb(79, 129, 189)" color="rgb(79, 129, 189)" margin-left="16mm" margin-right="16mm" margin-bottom="12pt">
776
776
  <fo:block-container margin-left="0mm" margin-right="0mm" padding="2mm" padding-top="3mm">
777
- <fo:block font-size="11pt" margin-bottom="6pt" font-weight="bold" font-style="italic" text-align="center">
777
+ <fo:block font-size="11pt" margin-bottom="6pt" font-weight="normal" font-style="italic" text-align="center">
778
778
  <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/>
779
779
  </fo:block>
780
780
  <fo:block font-style="italic">
@@ -820,7 +820,7 @@
820
820
  </xsl:template>
821
821
 
822
822
  <xsl:template name="insertHeaderFooter">
823
- <xsl:param name="font-weight" select="'bold'"/>
823
+ <xsl:param name="font-weight" select="'normal'"/>
824
824
  <fo:static-content flow-name="header-odd">
825
825
  <fo:block-container height="100%" display-align="after">
826
826
  <fo:block text-align="right">
@@ -950,13 +950,22 @@
950
950
  <title-part lang="en">
951
951
 
952
952
 
953
+
953
954
  </title-part>
954
955
  <title-part lang="fr">
955
956
 
956
957
 
958
+
957
959
  </title-part>
958
960
  <title-part lang="zh">第 # 部分:</title-part>
959
961
 
962
+ <title-subpart lang="en">
963
+
964
+ </title-subpart>
965
+ <title-subpart lang="fr">
966
+
967
+ </title-subpart>
968
+
960
969
  <title-modified lang="en">modified</title-modified>
961
970
  <title-modified lang="fr">modifiée</title-modified>
962
971
 
@@ -1053,7 +1062,7 @@
1053
1062
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
1054
1063
 
1055
1064
 
1056
- <xsl:attribute name="font-family">SourceCodePro</xsl:attribute>
1065
+ <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1057
1066
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1058
1067
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1059
1068
  <xsl:attribute name="line-height">113%</xsl:attribute>
@@ -1093,8 +1102,8 @@
1093
1102
 
1094
1103
 
1095
1104
 
1096
-
1097
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1105
+
1106
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1098
1107
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1099
1108
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1100
1109
 
@@ -1133,11 +1142,10 @@
1133
1142
 
1134
1143
 
1135
1144
 
1136
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1137
1145
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1138
1146
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1139
1147
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1140
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1148
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1141
1149
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1142
1150
 
1143
1151
 
@@ -1187,7 +1195,7 @@
1187
1195
 
1188
1196
 
1189
1197
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1190
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1198
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1191
1199
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1192
1200
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1193
1201
 
@@ -1195,7 +1203,7 @@
1195
1203
 
1196
1204
 
1197
1205
 
1198
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1206
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1199
1207
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1200
1208
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1201
1209
 
@@ -1233,6 +1241,7 @@
1233
1241
 
1234
1242
 
1235
1243
 
1244
+
1236
1245
  </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">
1237
1246
 
1238
1247
 
@@ -1276,6 +1285,7 @@
1276
1285
 
1277
1286
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1278
1287
 
1288
+
1279
1289
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1280
1290
 
1281
1291
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1313,6 +1323,7 @@
1313
1323
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1314
1324
 
1315
1325
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1326
+
1316
1327
 
1317
1328
 
1318
1329
 
@@ -1325,9 +1336,8 @@
1325
1336
 
1326
1337
 
1327
1338
 
1328
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1329
1339
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1330
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1340
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1331
1341
  <xsl:attribute name="text-align">center</xsl:attribute>
1332
1342
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1333
1343
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -1361,7 +1371,7 @@
1361
1371
 
1362
1372
  </xsl:attribute-set><xsl:attribute-set name="tt-style">
1363
1373
 
1364
- <xsl:attribute name="font-family">SourceCodePro</xsl:attribute>
1374
+ <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1365
1375
 
1366
1376
 
1367
1377
 
@@ -1373,7 +1383,7 @@
1373
1383
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1374
1384
 
1375
1385
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1376
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1386
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1377
1387
 
1378
1388
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
1379
1389
 
@@ -1440,7 +1450,9 @@
1440
1450
 
1441
1451
 
1442
1452
 
1443
-
1453
+ <!-- <xsl:if test="$namespace = 'bipm'">
1454
+ <fo:block>&#xA0;</fo:block>
1455
+ </xsl:if> -->
1444
1456
 
1445
1457
  <!-- $namespace = 'iso' or -->
1446
1458
 
@@ -1472,10 +1484,12 @@
1472
1484
 
1473
1485
 
1474
1486
  <xsl:variable name="colwidths">
1475
- <xsl:call-template name="calculate-column-widths">
1476
- <xsl:with-param name="cols-count" select="$cols-count"/>
1477
- <xsl:with-param name="table" select="$simple-table"/>
1478
- </xsl:call-template>
1487
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1488
+ <xsl:call-template name="calculate-column-widths">
1489
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1490
+ <xsl:with-param name="table" select="$simple-table"/>
1491
+ </xsl:call-template>
1492
+ </xsl:if>
1479
1493
  </xsl:variable>
1480
1494
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1481
1495
 
@@ -1543,16 +1557,25 @@
1543
1557
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1544
1558
  </xsl:if>
1545
1559
 
1546
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1547
- <xsl:choose>
1548
- <xsl:when test=". = 1 or . = 0">
1549
- <fo:table-column column-width="proportional-column-width(2)"/>
1550
- </xsl:when>
1551
- <xsl:otherwise>
1552
- <fo:table-column column-width="proportional-column-width({.})"/>
1553
- </xsl:otherwise>
1554
- </xsl:choose>
1555
- </xsl:for-each>
1560
+ <xsl:choose>
1561
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1562
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1563
+ <fo:table-column column-width="{@width}"/>
1564
+ </xsl:for-each>
1565
+ </xsl:when>
1566
+ <xsl:otherwise>
1567
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1568
+ <xsl:choose>
1569
+ <xsl:when test=". = 1 or . = 0">
1570
+ <fo:table-column column-width="proportional-column-width(2)"/>
1571
+ </xsl:when>
1572
+ <xsl:otherwise>
1573
+ <fo:table-column column-width="proportional-column-width({.})"/>
1574
+ </xsl:otherwise>
1575
+ </xsl:choose>
1576
+ </xsl:for-each>
1577
+ </xsl:otherwise>
1578
+ </xsl:choose>
1556
1579
 
1557
1580
  <xsl:choose>
1558
1581
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1565,10 +1588,12 @@
1565
1588
 
1566
1589
  </fo:table>
1567
1590
 
1591
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1568
1592
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1569
1593
  <xsl:call-template name="insertTableFooterInSeparateTable">
1570
1594
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1571
1595
  <xsl:with-param name="colwidths" select="$colwidths"/>
1596
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1572
1597
  </xsl:call-template>
1573
1598
  </xsl:for-each>
1574
1599
 
@@ -1601,6 +1626,7 @@
1601
1626
  <xsl:if test="normalize-space() != ''">
1602
1627
  <fo:block xsl:use-attribute-sets="table-name-style">
1603
1628
 
1629
+
1604
1630
  <xsl:apply-templates/>
1605
1631
  </fo:block>
1606
1632
  </xsl:if>
@@ -1783,12 +1809,26 @@
1783
1809
 
1784
1810
 
1785
1811
 
1786
- <!-- except gb and bipm -->
1787
1812
 
1788
- <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1789
1813
 
1790
1814
 
1815
+ <!-- except gb -->
1791
1816
 
1817
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1818
+
1819
+
1820
+ <!-- show Note under table in preface (ex. abstract) sections -->
1821
+ <!-- empty, because notes show at page side in main sections -->
1822
+ <!-- <xsl:if test="$namespace = 'bipm'">
1823
+ <xsl:choose>
1824
+ <xsl:when test="ancestor::*[local-name()='preface']">
1825
+ <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1826
+ </xsl:when>
1827
+ <xsl:otherwise>
1828
+ <fo:block/>
1829
+ </xsl:otherwise>
1830
+ </xsl:choose>
1831
+ </xsl:if> -->
1792
1832
 
1793
1833
 
1794
1834
  <!-- horizontal row separator -->
@@ -1807,12 +1847,22 @@
1807
1847
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1808
1848
  <xsl:param name="table_attributes"/>
1809
1849
  <xsl:param name="colwidths"/>
1850
+ <xsl:param name="colgroup"/>
1810
1851
 
1811
1852
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1812
1853
 
1813
1854
  <xsl:if test="$isNoteOrFnExist = 'true'">
1814
1855
 
1815
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1856
+ <xsl:variable name="cols-count">
1857
+ <xsl:choose>
1858
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1859
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1860
+ </xsl:when>
1861
+ <xsl:otherwise>
1862
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1863
+ </xsl:otherwise>
1864
+ </xsl:choose>
1865
+ </xsl:variable>
1816
1866
 
1817
1867
  <fo:table keep-with-previous="always">
1818
1868
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1830,16 +1880,25 @@
1830
1880
  </xsl:choose>
1831
1881
  </xsl:for-each>
1832
1882
 
1833
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1834
- <xsl:choose>
1835
- <xsl:when test=". = 1 or . = 0">
1836
- <fo:table-column column-width="proportional-column-width(2)"/>
1837
- </xsl:when>
1838
- <xsl:otherwise>
1839
- <fo:table-column column-width="proportional-column-width({.})"/>
1840
- </xsl:otherwise>
1841
- </xsl:choose>
1842
- </xsl:for-each>
1883
+ <xsl:choose>
1884
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1885
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1886
+ <fo:table-column column-width="{@width}"/>
1887
+ </xsl:for-each>
1888
+ </xsl:when>
1889
+ <xsl:otherwise>
1890
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1891
+ <xsl:choose>
1892
+ <xsl:when test=". = 1 or . = 0">
1893
+ <fo:table-column column-width="proportional-column-width(2)"/>
1894
+ </xsl:when>
1895
+ <xsl:otherwise>
1896
+ <fo:table-column column-width="proportional-column-width({.})"/>
1897
+ </xsl:otherwise>
1898
+ </xsl:choose>
1899
+ </xsl:for-each>
1900
+ </xsl:otherwise>
1901
+ </xsl:choose>
1843
1902
 
1844
1903
  <fo:table-body>
1845
1904
  <fo:table-row>
@@ -1851,7 +1910,11 @@
1851
1910
 
1852
1911
 
1853
1912
 
1854
- <!-- except gb and bipm -->
1913
+
1914
+
1915
+
1916
+
1917
+ <!-- except gb -->
1855
1918
 
1856
1919
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
1857
1920
 
@@ -1937,6 +2000,10 @@
1937
2000
 
1938
2001
 
1939
2002
 
2003
+ <!-- <xsl:if test="$namespace = 'bipm'">
2004
+ <xsl:attribute name="height">8mm</xsl:attribute>
2005
+ </xsl:if> -->
2006
+
1940
2007
  <xsl:apply-templates/>
1941
2008
  </fo:table-row>
1942
2009
  </xsl:template><xsl:template match="*[local-name()='th']">
@@ -2018,7 +2085,8 @@
2018
2085
  </xsl:attribute>
2019
2086
  </xsl:if>
2020
2087
  <xsl:call-template name="display-align"/>
2021
- <fo:block>
2088
+ <fo:block>
2089
+
2022
2090
  <xsl:apply-templates/>
2023
2091
  </fo:block>
2024
2092
  </fo:table-cell>
@@ -2228,7 +2296,13 @@
2228
2296
  <xsl:apply-templates/>
2229
2297
  </fo:inline>
2230
2298
  </xsl:template><xsl:template match="*[local-name()='dl']">
2231
- <fo:block-container margin-left="0mm">
2299
+ <fo:block-container>
2300
+
2301
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2302
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2303
+ </xsl:if>
2304
+
2305
+
2232
2306
  <xsl:if test="parent::*[local-name() = 'note']">
2233
2307
  <xsl:attribute name="margin-left">
2234
2308
  <xsl:choose>
@@ -2238,8 +2312,12 @@
2238
2312
  </xsl:attribute>
2239
2313
 
2240
2314
  </xsl:if>
2241
- <fo:block-container margin-left="0mm">
2242
-
2315
+ <fo:block-container>
2316
+
2317
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2318
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2319
+
2320
+
2243
2321
  <xsl:variable name="parent" select="local-name(..)"/>
2244
2322
 
2245
2323
  <xsl:variable name="key_iso">
@@ -2253,9 +2331,12 @@
2253
2331
  <fo:block margin-bottom="12pt" text-align="left">
2254
2332
 
2255
2333
  <xsl:variable name="title-where">
2256
- <xsl:call-template name="getTitle">
2257
- <xsl:with-param name="name" select="'title-where'"/>
2258
- </xsl:call-template>
2334
+
2335
+
2336
+ <xsl:call-template name="getTitle">
2337
+ <xsl:with-param name="name" select="'title-where'"/>
2338
+ </xsl:call-template>
2339
+
2259
2340
  </xsl:variable>
2260
2341
  <xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
2261
2342
  <xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2271,9 +2352,12 @@
2271
2352
 
2272
2353
 
2273
2354
  <xsl:variable name="title-where">
2274
- <xsl:call-template name="getTitle">
2275
- <xsl:with-param name="name" select="'title-where'"/>
2276
- </xsl:call-template>
2355
+
2356
+
2357
+ <xsl:call-template name="getTitle">
2358
+ <xsl:with-param name="name" select="'title-where'"/>
2359
+ </xsl:call-template>
2360
+
2277
2361
  </xsl:variable>
2278
2362
  <xsl:value-of select="$title-where"/>
2279
2363
  </fo:block>
@@ -2284,9 +2368,12 @@
2284
2368
 
2285
2369
 
2286
2370
  <xsl:variable name="title-key">
2287
- <xsl:call-template name="getTitle">
2288
- <xsl:with-param name="name" select="'title-key'"/>
2289
- </xsl:call-template>
2371
+
2372
+
2373
+ <xsl:call-template name="getTitle">
2374
+ <xsl:with-param name="name" select="'title-key'"/>
2375
+ </xsl:call-template>
2376
+
2290
2377
  </xsl:variable>
2291
2378
  <xsl:value-of select="$title-key"/>
2292
2379
  </fo:block>
@@ -2412,12 +2499,32 @@
2412
2499
  </xsl:otherwise>
2413
2500
  </xsl:choose>
2414
2501
  </xsl:template><xsl:template name="getMaxLength_dt">
2415
- <xsl:for-each select="*[local-name()='dt']">
2416
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2417
- <xsl:if test="position() = 1">
2418
- <xsl:value-of select="string-length(normalize-space(.))"/>
2419
- </xsl:if>
2420
- </xsl:for-each>
2502
+ <xsl:variable name="lengths">
2503
+ <xsl:for-each select="*[local-name()='dt']">
2504
+ <xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
2505
+ <xsl:variable name="attributes">
2506
+ <xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
2507
+ <xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
2508
+ </xsl:variable>
2509
+ <length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
2510
+ </xsl:for-each>
2511
+ </xsl:variable>
2512
+ <xsl:variable name="maxLength">
2513
+ <!-- <xsl:for-each select="*[local-name()='dt']">
2514
+ <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2515
+ <xsl:if test="position() = 1">
2516
+ <xsl:value-of select="string-length(normalize-space(.))"/>
2517
+ </xsl:if>
2518
+ </xsl:for-each> -->
2519
+ <xsl:for-each select="xalan:nodeset($lengths)/length">
2520
+ <xsl:sort select="." data-type="number" order="descending"/>
2521
+ <xsl:if test="position() = 1">
2522
+ <xsl:value-of select="."/>
2523
+ </xsl:if>
2524
+ </xsl:for-each>
2525
+ </xsl:variable>
2526
+ <!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
2527
+ <xsl:value-of select="$maxLength"/>
2421
2528
  </xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
2422
2529
  <xsl:param name="key_iso"/>
2423
2530
 
@@ -2529,6 +2636,9 @@
2529
2636
  </fo:inline>
2530
2637
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2531
2638
  <fo:inline font-weight="bold">
2639
+
2640
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
2641
+
2532
2642
  <xsl:apply-templates/>
2533
2643
  </fo:inline>
2534
2644
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2857,7 +2967,18 @@
2857
2967
  <xsl:with-param name="previousRow" select="$newRow"/>
2858
2968
  </xsl:apply-templates>
2859
2969
  </xsl:template><xsl:template name="getLang">
2860
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
2970
+ <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
2971
+ <xsl:variable name="language">
2972
+ <xsl:choose>
2973
+ <xsl:when test="$language_current != ''">
2974
+ <xsl:value-of select="$language_current"/>
2975
+ </xsl:when>
2976
+ <xsl:otherwise>
2977
+ <xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
2978
+ </xsl:otherwise>
2979
+ </xsl:choose>
2980
+ </xsl:variable>
2981
+
2861
2982
  <xsl:choose>
2862
2983
  <xsl:when test="$language = 'English'">en</xsl:when>
2863
2984
  <xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -2892,6 +3013,7 @@
2892
3013
  <xsl:value-of select="substring($str, 2)"/>
2893
3014
  </xsl:template><xsl:template match="mathml:math">
2894
3015
  <fo:inline font-family="STIX Two Math"> <!-- -->
3016
+
2895
3017
  <xsl:variable name="mathml">
2896
3018
  <xsl:apply-templates select="." mode="mathml"/>
2897
3019
  </xsl:variable>
@@ -2921,6 +3043,7 @@
2921
3043
  </xsl:choose>
2922
3044
  </xsl:variable>
2923
3045
  <fo:inline xsl:use-attribute-sets="link-style">
3046
+
2924
3047
  <xsl:choose>
2925
3048
  <xsl:when test="$target = ''">
2926
3049
  <xsl:apply-templates/>
@@ -2974,10 +3097,14 @@
2974
3097
  </fo:inline>
2975
3098
  </xsl:template><xsl:template match="*[local-name() = 'modification']">
2976
3099
  <xsl:variable name="title-modified">
2977
- <xsl:call-template name="getTitle">
2978
- <xsl:with-param name="name" select="'title-modified'"/>
2979
- </xsl:call-template>
3100
+
3101
+
3102
+ <xsl:call-template name="getTitle">
3103
+ <xsl:with-param name="name" select="'title-modified'"/>
3104
+ </xsl:call-template>
3105
+
2980
3106
  </xsl:variable>
3107
+
2981
3108
  <xsl:choose>
2982
3109
  <xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
2983
3110
  <xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -3042,6 +3169,8 @@
3042
3169
 
3043
3170
 
3044
3171
 
3172
+
3173
+
3045
3174
  <fo:inline xsl:use-attribute-sets="note-name-style">
3046
3175
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
3047
3176
  </fo:inline>
@@ -3134,7 +3263,8 @@
3134
3263
  </fo:inline>
3135
3264
  </xsl:if>
3136
3265
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3137
- <fo:block-container id="{@id}">
3266
+ <fo:block-container id="{@id}">
3267
+
3138
3268
  <fo:block>
3139
3269
  <xsl:apply-templates/>
3140
3270
  </fo:block>
@@ -3185,7 +3315,7 @@
3185
3315
  <xsl:apply-templates mode="bookmarks"/>
3186
3316
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3187
3317
  <xsl:apply-templates select="."/>
3188
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3318
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3189
3319
  <xsl:apply-templates mode="bookmarks"/>
3190
3320
  </xsl:template><xsl:template name="addBookmarks">
3191
3321
  <xsl:param name="contents"/>
@@ -3201,6 +3331,8 @@
3201
3331
  <xsl:variable name="bookmark-title_">
3202
3332
  <xsl:call-template name="getLangVersion">
3203
3333
  <xsl:with-param name="lang" select="@lang"/>
3334
+ <xsl:with-param name="doctype" select="@doctype"/>
3335
+ <xsl:with-param name="title" select="@title-part"/>
3204
3336
  </xsl:call-template>
3205
3337
  </xsl:variable>
3206
3338
  <xsl:choose>
@@ -3218,13 +3350,34 @@
3218
3350
  </xsl:choose>
3219
3351
  </fo:bookmark-title>
3220
3352
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3353
+
3354
+ <xsl:call-template name="insertFigureBookmarks">
3355
+ <xsl:with-param name="contents" select="contents"/>
3356
+ </xsl:call-template>
3357
+
3358
+ <xsl:call-template name="insertTableBookmarks">
3359
+ <xsl:with-param name="contents" select="contents"/>
3360
+ <xsl:with-param name="lang" select="@lang"/>
3361
+ </xsl:call-template>
3362
+
3221
3363
  </fo:bookmark>
3222
3364
 
3223
3365
  </xsl:for-each>
3224
3366
  </xsl:when>
3225
3367
  <xsl:otherwise>
3226
3368
  <xsl:for-each select="xalan:nodeset($contents)/doc">
3369
+
3227
3370
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3371
+
3372
+ <xsl:call-template name="insertFigureBookmarks">
3373
+ <xsl:with-param name="contents" select="contents"/>
3374
+ </xsl:call-template>
3375
+
3376
+ <xsl:call-template name="insertTableBookmarks">
3377
+ <xsl:with-param name="contents" select="contents"/>
3378
+ <xsl:with-param name="lang" select="@lang"/>
3379
+ </xsl:call-template>
3380
+
3228
3381
  </xsl:for-each>
3229
3382
  </xsl:otherwise>
3230
3383
  </xsl:choose>
@@ -3243,8 +3396,44 @@
3243
3396
 
3244
3397
  </fo:bookmark-tree>
3245
3398
  </xsl:if>
3399
+ </xsl:template><xsl:template name="insertFigureBookmarks">
3400
+ <xsl:param name="contents"/>
3401
+ <xsl:if test="xalan:nodeset($contents)/figure">
3402
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
3403
+ <fo:bookmark-title>Figures</fo:bookmark-title>
3404
+ <xsl:for-each select="xalan:nodeset($contents)/figure">
3405
+ <fo:bookmark internal-destination="{@id}">
3406
+ <fo:bookmark-title>
3407
+ <xsl:value-of select="normalize-space(title)"/>
3408
+ </fo:bookmark-title>
3409
+ </fo:bookmark>
3410
+ </xsl:for-each>
3411
+ </fo:bookmark>
3412
+ </xsl:if>
3413
+ </xsl:template><xsl:template name="insertTableBookmarks">
3414
+ <xsl:param name="contents"/>
3415
+ <xsl:param name="lang"/>
3416
+ <xsl:if test="xalan:nodeset($contents)/table">
3417
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
3418
+ <fo:bookmark-title>
3419
+ <xsl:choose>
3420
+ <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
3421
+ <xsl:otherwise>Tables</xsl:otherwise>
3422
+ </xsl:choose>
3423
+ </fo:bookmark-title>
3424
+ <xsl:for-each select="xalan:nodeset($contents)/table">
3425
+ <fo:bookmark internal-destination="{@id}">
3426
+ <fo:bookmark-title>
3427
+ <xsl:value-of select="normalize-space(title)"/>
3428
+ </fo:bookmark-title>
3429
+ </fo:bookmark>
3430
+ </xsl:for-each>
3431
+ </fo:bookmark>
3432
+ </xsl:if>
3246
3433
  </xsl:template><xsl:template name="getLangVersion">
3247
3434
  <xsl:param name="lang"/>
3435
+ <xsl:param name="doctype" select="''"/>
3436
+ <xsl:param name="title" select="''"/>
3248
3437
  <xsl:choose>
3249
3438
  <xsl:when test="$lang = 'en'">
3250
3439
 
@@ -3708,9 +3897,14 @@
3708
3897
 
3709
3898
  <fo:inline>
3710
3899
 
3711
- <xsl:call-template name="getTitle">
3712
- <xsl:with-param name="name" select="'title-source'"/>
3713
- </xsl:call-template>
3900
+
3901
+
3902
+
3903
+ <xsl:call-template name="getTitle">
3904
+ <xsl:with-param name="name" select="'title-source'"/>
3905
+ </xsl:call-template>
3906
+
3907
+
3714
3908
  <xsl:text>: </xsl:text>
3715
3909
  </fo:inline>
3716
3910
 
@@ -3735,7 +3929,8 @@
3735
3929
  <fo:block-container margin-left="0mm">
3736
3930
 
3737
3931
  <fo:block xsl:use-attribute-sets="quote-style">
3738
- <xsl:apply-templates select=".//*[local-name() = 'p']"/>
3932
+ <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
3933
+ <xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
3739
3934
  </fo:block>
3740
3935
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
3741
3936
  <fo:block xsl:use-attribute-sets="quote-source-style">
@@ -3854,9 +4049,12 @@
3854
4049
  </fo:block>
3855
4050
  </xsl:template><xsl:template match="*[local-name() = 'deprecates']">
3856
4051
  <xsl:variable name="title-deprecated">
3857
- <xsl:call-template name="getTitle">
3858
- <xsl:with-param name="name" select="'title-deprecated'"/>
3859
- </xsl:call-template>
4052
+
4053
+
4054
+ <xsl:call-template name="getTitle">
4055
+ <xsl:with-param name="name" select="'title-deprecated'"/>
4056
+ </xsl:call-template>
4057
+
3860
4058
  </xsl:variable>
3861
4059
  <fo:block xsl:use-attribute-sets="deprecates-style">
3862
4060
  <xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -3910,7 +4108,7 @@
3910
4108
  <fo:block id="{@id}">
3911
4109
  <xsl:apply-templates/>
3912
4110
  </fo:block>
3913
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4111
+ </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']">
3914
4112
 
3915
4113
  <fo:block id="{@id}">
3916
4114
  <xsl:apply-templates/>
@@ -3967,7 +4165,8 @@
3967
4165
  <fo:table-column column-width="107mm"/>
3968
4166
  <fo:table-column column-width="15mm"/>
3969
4167
  <fo:table-body>
3970
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4168
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4169
+
3971
4170
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
3972
4171
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
3973
4172
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -3985,6 +4184,10 @@
3985
4184
  <fo:block><xsl:apply-templates/></fo:block>
3986
4185
  </fo:table-cell>
3987
4186
  </xsl:template><xsl:template name="processBibitem">
4187
+
4188
+
4189
+ <!-- end BIPM bibitem processing-->
4190
+
3988
4191
 
3989
4192
 
3990
4193
 
@@ -4222,13 +4425,22 @@
4222
4425
  </xsl:template><xsl:template name="split">
4223
4426
  <xsl:param name="pText" select="."/>
4224
4427
  <xsl:param name="sep" select="','"/>
4428
+ <xsl:param name="normalize-space" select="'true'"/>
4225
4429
  <xsl:if test="string-length($pText) &gt;0">
4226
4430
  <item>
4227
- <xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
4431
+ <xsl:choose>
4432
+ <xsl:when test="$normalize-space = 'true'">
4433
+ <xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
4434
+ </xsl:when>
4435
+ <xsl:otherwise>
4436
+ <xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
4437
+ </xsl:otherwise>
4438
+ </xsl:choose>
4228
4439
  </item>
4229
4440
  <xsl:call-template name="split">
4230
4441
  <xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
4231
4442
  <xsl:with-param name="sep" select="$sep"/>
4443
+ <xsl:with-param name="normalize-space" select="$normalize-space"/>
4232
4444
  </xsl:call-template>
4233
4445
  </xsl:if>
4234
4446
  </xsl:template><xsl:template name="getDocumentId">
@@ -4294,4 +4506,23 @@
4294
4506
  <xsl:with-param name="letter-spacing" select="$letter-spacing"/>
4295
4507
  </xsl:call-template>
4296
4508
  </xsl:if>
4509
+ </xsl:template><xsl:template name="repeat">
4510
+ <xsl:param name="char" select="'*'"/>
4511
+ <xsl:param name="count"/>
4512
+ <xsl:if test="$count &gt; 0">
4513
+ <xsl:value-of select="$char"/>
4514
+ <xsl:call-template name="repeat">
4515
+ <xsl:with-param name="char" select="$char"/>
4516
+ <xsl:with-param name="count" select="$count - 1"/>
4517
+ </xsl:call-template>
4518
+ </xsl:if>
4519
+ </xsl:template><xsl:template name="getLocalizedString">
4520
+ <xsl:param name="key"/>
4521
+
4522
+ <xsl:variable name="curr_lang">
4523
+ <xsl:call-template name="getLang"/>
4524
+ </xsl:variable>
4525
+
4526
+ <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4527
+
4297
4528
  </xsl:template></xsl:stylesheet>