metanorma-ribose 1.6.7 → 1.6.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +21 -1
  3. data/lib/asciidoctor/ribose/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/ribose/isodoc.rng +51 -3
  5. data/lib/isodoc/ribose/html/htmlstyle.css +3 -3
  6. data/lib/isodoc/ribose/html/htmlstyle.scss +2 -2
  7. data/lib/isodoc/ribose/html/rsd.css +70 -70
  8. data/lib/isodoc/ribose/html/rsd.scss +70 -70
  9. data/lib/isodoc/ribose/html/wordstyle.css +53 -53
  10. data/lib/isodoc/ribose/html/wordstyle.scss +53 -53
  11. data/lib/isodoc/ribose/rsd.standard.xsl +280 -72
  12. data/lib/isodoc/ribose/xref.rb +7 -2
  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 +4 -18
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:$normalfontsize;
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:$normalfontsize;
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:$normalfontsize;
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:$normalfontsize;
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">
@@ -1062,7 +1062,7 @@
1062
1062
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
1063
1063
 
1064
1064
 
1065
- <xsl:attribute name="font-family">SourceCodePro</xsl:attribute>
1065
+ <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1066
1066
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1067
1067
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1068
1068
  <xsl:attribute name="line-height">113%</xsl:attribute>
@@ -1102,8 +1102,8 @@
1102
1102
 
1103
1103
 
1104
1104
 
1105
-
1106
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1105
+
1106
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1107
1107
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1108
1108
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1109
1109
 
@@ -1142,11 +1142,10 @@
1142
1142
 
1143
1143
 
1144
1144
 
1145
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1146
1145
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1147
1146
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1148
1147
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1149
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1148
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1150
1149
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1151
1150
 
1152
1151
 
@@ -1196,7 +1195,7 @@
1196
1195
 
1197
1196
 
1198
1197
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1199
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1198
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1200
1199
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1201
1200
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1202
1201
 
@@ -1204,7 +1203,7 @@
1204
1203
 
1205
1204
 
1206
1205
 
1207
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1206
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1208
1207
  <xsl:attribute name="font-size">11pt</xsl:attribute>
1209
1208
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
1210
1209
 
@@ -1286,6 +1285,7 @@
1286
1285
 
1287
1286
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1288
1287
 
1288
+
1289
1289
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1290
1290
 
1291
1291
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
@@ -1297,6 +1297,7 @@
1297
1297
 
1298
1298
 
1299
1299
 
1300
+
1300
1301
  </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1301
1302
 
1302
1303
  <xsl:attribute name="text-align">right</xsl:attribute>
@@ -1323,6 +1324,7 @@
1323
1324
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1324
1325
 
1325
1326
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1327
+
1326
1328
 
1327
1329
 
1328
1330
 
@@ -1335,9 +1337,8 @@
1335
1337
 
1336
1338
 
1337
1339
 
1338
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1339
1340
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1340
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1341
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1341
1342
  <xsl:attribute name="text-align">center</xsl:attribute>
1342
1343
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1343
1344
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -1371,7 +1372,7 @@
1371
1372
 
1372
1373
  </xsl:attribute-set><xsl:attribute-set name="tt-style">
1373
1374
 
1374
- <xsl:attribute name="font-family">SourceCodePro</xsl:attribute>
1375
+ <xsl:attribute name="font-family">Source Code Pro</xsl:attribute>
1375
1376
 
1376
1377
 
1377
1378
 
@@ -1383,7 +1384,7 @@
1383
1384
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
1384
1385
 
1385
1386
  <xsl:attribute name="font-size">12pt</xsl:attribute>
1386
- <xsl:attribute name="font-family">SourceSansPro</xsl:attribute>
1387
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
1387
1388
 
1388
1389
  </xsl:attribute-set><xsl:attribute-set name="domain-style">
1389
1390
 
@@ -1440,7 +1441,7 @@
1440
1441
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1441
1442
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
1442
1443
  <xsl:call-template name="add-zero-spaces-java"/>
1443
- </xsl:template><xsl:template match="*[local-name()='table']">
1444
+ </xsl:template><xsl:template match="*[local-name()='table']" name="table">
1444
1445
 
1445
1446
  <xsl:variable name="simple-table">
1446
1447
  <xsl:call-template name="getSimpleTable"/>
@@ -1484,10 +1485,12 @@
1484
1485
 
1485
1486
 
1486
1487
  <xsl:variable name="colwidths">
1487
- <xsl:call-template name="calculate-column-widths">
1488
- <xsl:with-param name="cols-count" select="$cols-count"/>
1489
- <xsl:with-param name="table" select="$simple-table"/>
1490
- </xsl:call-template>
1488
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1489
+ <xsl:call-template name="calculate-column-widths">
1490
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1491
+ <xsl:with-param name="table" select="$simple-table"/>
1492
+ </xsl:call-template>
1493
+ </xsl:if>
1491
1494
  </xsl:variable>
1492
1495
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1493
1496
 
@@ -1526,7 +1529,12 @@
1526
1529
 
1527
1530
  <xsl:variable name="table_attributes">
1528
1531
  <attribute name="table-layout">fixed</attribute>
1529
- <attribute name="width">100%</attribute>
1532
+ <attribute name="width">
1533
+ <xsl:choose>
1534
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
1535
+ <xsl:otherwise>100%</xsl:otherwise>
1536
+ </xsl:choose>
1537
+ </attribute>
1530
1538
  <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1531
1539
  <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1532
1540
 
@@ -1555,16 +1563,25 @@
1555
1563
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1556
1564
  </xsl:if>
1557
1565
 
1558
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1559
- <xsl:choose>
1560
- <xsl:when test=". = 1 or . = 0">
1561
- <fo:table-column column-width="proportional-column-width(2)"/>
1562
- </xsl:when>
1563
- <xsl:otherwise>
1564
- <fo:table-column column-width="proportional-column-width({.})"/>
1565
- </xsl:otherwise>
1566
- </xsl:choose>
1567
- </xsl:for-each>
1566
+ <xsl:choose>
1567
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1568
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1569
+ <fo:table-column column-width="{@width}"/>
1570
+ </xsl:for-each>
1571
+ </xsl:when>
1572
+ <xsl:otherwise>
1573
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1574
+ <xsl:choose>
1575
+ <xsl:when test=". = 1 or . = 0">
1576
+ <fo:table-column column-width="proportional-column-width(2)"/>
1577
+ </xsl:when>
1578
+ <xsl:otherwise>
1579
+ <fo:table-column column-width="proportional-column-width({.})"/>
1580
+ </xsl:otherwise>
1581
+ </xsl:choose>
1582
+ </xsl:for-each>
1583
+ </xsl:otherwise>
1584
+ </xsl:choose>
1568
1585
 
1569
1586
  <xsl:choose>
1570
1587
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1577,10 +1594,12 @@
1577
1594
 
1578
1595
  </fo:table>
1579
1596
 
1597
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1580
1598
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1581
1599
  <xsl:call-template name="insertTableFooterInSeparateTable">
1582
1600
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1583
1601
  <xsl:with-param name="colwidths" select="$colwidths"/>
1602
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1584
1603
  </xsl:call-template>
1585
1604
  </xsl:for-each>
1586
1605
 
@@ -1834,12 +1853,22 @@
1834
1853
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1835
1854
  <xsl:param name="table_attributes"/>
1836
1855
  <xsl:param name="colwidths"/>
1856
+ <xsl:param name="colgroup"/>
1837
1857
 
1838
1858
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1839
1859
 
1840
1860
  <xsl:if test="$isNoteOrFnExist = 'true'">
1841
1861
 
1842
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1862
+ <xsl:variable name="cols-count">
1863
+ <xsl:choose>
1864
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1865
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1866
+ </xsl:when>
1867
+ <xsl:otherwise>
1868
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1869
+ </xsl:otherwise>
1870
+ </xsl:choose>
1871
+ </xsl:variable>
1843
1872
 
1844
1873
  <fo:table keep-with-previous="always">
1845
1874
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1857,16 +1886,25 @@
1857
1886
  </xsl:choose>
1858
1887
  </xsl:for-each>
1859
1888
 
1860
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1861
- <xsl:choose>
1862
- <xsl:when test=". = 1 or . = 0">
1863
- <fo:table-column column-width="proportional-column-width(2)"/>
1864
- </xsl:when>
1865
- <xsl:otherwise>
1866
- <fo:table-column column-width="proportional-column-width({.})"/>
1867
- </xsl:otherwise>
1868
- </xsl:choose>
1869
- </xsl:for-each>
1889
+ <xsl:choose>
1890
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1891
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1892
+ <fo:table-column column-width="{@width}"/>
1893
+ </xsl:for-each>
1894
+ </xsl:when>
1895
+ <xsl:otherwise>
1896
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1897
+ <xsl:choose>
1898
+ <xsl:when test=". = 1 or . = 0">
1899
+ <fo:table-column column-width="proportional-column-width(2)"/>
1900
+ </xsl:when>
1901
+ <xsl:otherwise>
1902
+ <fo:table-column column-width="proportional-column-width({.})"/>
1903
+ </xsl:otherwise>
1904
+ </xsl:choose>
1905
+ </xsl:for-each>
1906
+ </xsl:otherwise>
1907
+ </xsl:choose>
1870
1908
 
1871
1909
  <fo:table-body>
1872
1910
  <fo:table-row>
@@ -2266,7 +2304,9 @@
2266
2304
  </xsl:template><xsl:template match="*[local-name()='dl']">
2267
2305
  <fo:block-container>
2268
2306
 
2269
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2307
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2308
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2309
+ </xsl:if>
2270
2310
 
2271
2311
 
2272
2312
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -2281,6 +2321,7 @@
2281
2321
  <fo:block-container>
2282
2322
 
2283
2323
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2324
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2284
2325
 
2285
2326
 
2286
2327
  <xsl:variable name="parent" select="local-name(..)"/>
@@ -2464,12 +2505,32 @@
2464
2505
  </xsl:otherwise>
2465
2506
  </xsl:choose>
2466
2507
  </xsl:template><xsl:template name="getMaxLength_dt">
2467
- <xsl:for-each select="*[local-name()='dt']">
2468
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2469
- <xsl:if test="position() = 1">
2470
- <xsl:value-of select="string-length(normalize-space(.))"/>
2471
- </xsl:if>
2472
- </xsl:for-each>
2508
+ <xsl:variable name="lengths">
2509
+ <xsl:for-each select="*[local-name()='dt']">
2510
+ <xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
2511
+ <xsl:variable name="attributes">
2512
+ <xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
2513
+ <xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
2514
+ </xsl:variable>
2515
+ <length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
2516
+ </xsl:for-each>
2517
+ </xsl:variable>
2518
+ <xsl:variable name="maxLength">
2519
+ <!-- <xsl:for-each select="*[local-name()='dt']">
2520
+ <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2521
+ <xsl:if test="position() = 1">
2522
+ <xsl:value-of select="string-length(normalize-space(.))"/>
2523
+ </xsl:if>
2524
+ </xsl:for-each> -->
2525
+ <xsl:for-each select="xalan:nodeset($lengths)/length">
2526
+ <xsl:sort select="." data-type="number" order="descending"/>
2527
+ <xsl:if test="position() = 1">
2528
+ <xsl:value-of select="."/>
2529
+ </xsl:if>
2530
+ </xsl:for-each>
2531
+ </xsl:variable>
2532
+ <!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
2533
+ <xsl:value-of select="$maxLength"/>
2473
2534
  </xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
2474
2535
  <xsl:param name="key_iso"/>
2475
2536
 
@@ -2581,6 +2642,9 @@
2581
2642
  </fo:inline>
2582
2643
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2583
2644
  <fo:inline font-weight="bold">
2645
+
2646
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
2647
+
2584
2648
  <xsl:apply-templates/>
2585
2649
  </fo:inline>
2586
2650
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2606,6 +2670,7 @@
2606
2670
 
2607
2671
 
2608
2672
 
2673
+
2609
2674
  10
2610
2675
 
2611
2676
  </xsl:variable>
@@ -2620,6 +2685,10 @@
2620
2685
  </xsl:if>
2621
2686
  <xsl:apply-templates/>
2622
2687
  </fo:inline>
2688
+ </xsl:template><xsl:template match="*[local-name()='underline']">
2689
+ <fo:inline text-decoration="underline">
2690
+ <xsl:apply-templates/>
2691
+ </fo:inline>
2623
2692
  </xsl:template><xsl:template match="*[local-name()='del']">
2624
2693
  <fo:inline font-size="10pt" color="red" text-decoration="line-through">
2625
2694
  <xsl:apply-templates/>
@@ -2985,6 +3054,7 @@
2985
3054
  </xsl:choose>
2986
3055
  </xsl:variable>
2987
3056
  <fo:inline xsl:use-attribute-sets="link-style">
3057
+
2988
3058
  <xsl:choose>
2989
3059
  <xsl:when test="$target = ''">
2990
3060
  <xsl:apply-templates/>
@@ -3203,8 +3273,9 @@
3203
3273
  </xsl:if> -->
3204
3274
  </fo:inline>
3205
3275
  </xsl:if>
3206
- </xsl:template><xsl:template match="*[local-name() = 'figure']">
3207
- <fo:block-container id="{@id}">
3276
+ </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
3277
+ <fo:block-container id="{@id}">
3278
+
3208
3279
  <fo:block>
3209
3280
  <xsl:apply-templates/>
3210
3281
  </fo:block>
@@ -3255,7 +3326,7 @@
3255
3326
  <xsl:apply-templates mode="bookmarks"/>
3256
3327
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3257
3328
  <xsl:apply-templates select="."/>
3258
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3329
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3259
3330
  <xsl:apply-templates mode="bookmarks"/>
3260
3331
  </xsl:template><xsl:template name="addBookmarks">
3261
3332
  <xsl:param name="contents"/>
@@ -3271,6 +3342,8 @@
3271
3342
  <xsl:variable name="bookmark-title_">
3272
3343
  <xsl:call-template name="getLangVersion">
3273
3344
  <xsl:with-param name="lang" select="@lang"/>
3345
+ <xsl:with-param name="doctype" select="@doctype"/>
3346
+ <xsl:with-param name="title" select="@title-part"/>
3274
3347
  </xsl:call-template>
3275
3348
  </xsl:variable>
3276
3349
  <xsl:choose>
@@ -3288,13 +3361,34 @@
3288
3361
  </xsl:choose>
3289
3362
  </fo:bookmark-title>
3290
3363
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3364
+
3365
+ <xsl:call-template name="insertFigureBookmarks">
3366
+ <xsl:with-param name="contents" select="contents"/>
3367
+ </xsl:call-template>
3368
+
3369
+ <xsl:call-template name="insertTableBookmarks">
3370
+ <xsl:with-param name="contents" select="contents"/>
3371
+ <xsl:with-param name="lang" select="@lang"/>
3372
+ </xsl:call-template>
3373
+
3291
3374
  </fo:bookmark>
3292
3375
 
3293
3376
  </xsl:for-each>
3294
3377
  </xsl:when>
3295
3378
  <xsl:otherwise>
3296
3379
  <xsl:for-each select="xalan:nodeset($contents)/doc">
3380
+
3297
3381
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3382
+
3383
+ <xsl:call-template name="insertFigureBookmarks">
3384
+ <xsl:with-param name="contents" select="contents"/>
3385
+ </xsl:call-template>
3386
+
3387
+ <xsl:call-template name="insertTableBookmarks">
3388
+ <xsl:with-param name="contents" select="contents"/>
3389
+ <xsl:with-param name="lang" select="@lang"/>
3390
+ </xsl:call-template>
3391
+
3298
3392
  </xsl:for-each>
3299
3393
  </xsl:otherwise>
3300
3394
  </xsl:choose>
@@ -3313,8 +3407,44 @@
3313
3407
 
3314
3408
  </fo:bookmark-tree>
3315
3409
  </xsl:if>
3410
+ </xsl:template><xsl:template name="insertFigureBookmarks">
3411
+ <xsl:param name="contents"/>
3412
+ <xsl:if test="xalan:nodeset($contents)/figure">
3413
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
3414
+ <fo:bookmark-title>Figures</fo:bookmark-title>
3415
+ <xsl:for-each select="xalan:nodeset($contents)/figure">
3416
+ <fo:bookmark internal-destination="{@id}">
3417
+ <fo:bookmark-title>
3418
+ <xsl:value-of select="normalize-space(title)"/>
3419
+ </fo:bookmark-title>
3420
+ </fo:bookmark>
3421
+ </xsl:for-each>
3422
+ </fo:bookmark>
3423
+ </xsl:if>
3424
+ </xsl:template><xsl:template name="insertTableBookmarks">
3425
+ <xsl:param name="contents"/>
3426
+ <xsl:param name="lang"/>
3427
+ <xsl:if test="xalan:nodeset($contents)/table">
3428
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
3429
+ <fo:bookmark-title>
3430
+ <xsl:choose>
3431
+ <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
3432
+ <xsl:otherwise>Tables</xsl:otherwise>
3433
+ </xsl:choose>
3434
+ </fo:bookmark-title>
3435
+ <xsl:for-each select="xalan:nodeset($contents)/table">
3436
+ <fo:bookmark internal-destination="{@id}">
3437
+ <fo:bookmark-title>
3438
+ <xsl:value-of select="normalize-space(title)"/>
3439
+ </fo:bookmark-title>
3440
+ </fo:bookmark>
3441
+ </xsl:for-each>
3442
+ </fo:bookmark>
3443
+ </xsl:if>
3316
3444
  </xsl:template><xsl:template name="getLangVersion">
3317
3445
  <xsl:param name="lang"/>
3446
+ <xsl:param name="doctype" select="''"/>
3447
+ <xsl:param name="title" select="''"/>
3318
3448
  <xsl:choose>
3319
3449
  <xsl:when test="$lang = 'en'">
3320
3450
 
@@ -3350,6 +3480,12 @@
3350
3480
  <!-- <xsl:text> </xsl:text> -->
3351
3481
  </xsl:template><xsl:template name="getSection">
3352
3482
  <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
3483
+ <!--
3484
+ <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
3485
+ <xsl:value-of select="."/>
3486
+ </xsl:for-each>
3487
+ -->
3488
+
3353
3489
  </xsl:template><xsl:template name="getName">
3354
3490
  <xsl:choose>
3355
3491
  <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -3402,6 +3538,10 @@
3402
3538
  <xsl:copy>
3403
3539
  <xsl:apply-templates mode="contents_item"/>
3404
3540
  </xsl:copy>
3541
+ </xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
3542
+ <xsl:copy>
3543
+ <xsl:apply-templates mode="contents_item"/>
3544
+ </xsl:copy>
3405
3545
  </xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
3406
3546
  <xsl:text> </xsl:text>
3407
3547
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -3427,6 +3567,7 @@
3427
3567
 
3428
3568
 
3429
3569
 
3570
+
3430
3571
 
3431
3572
 
3432
3573
 
@@ -3810,7 +3951,8 @@
3810
3951
  <fo:block-container margin-left="0mm">
3811
3952
 
3812
3953
  <fo:block xsl:use-attribute-sets="quote-style">
3813
- <xsl:apply-templates select=".//*[local-name() = 'p']"/>
3954
+ <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
3955
+ <xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
3814
3956
  </fo:block>
3815
3957
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
3816
3958
  <fo:block xsl:use-attribute-sets="quote-source-style">
@@ -3956,6 +4098,7 @@
3956
4098
 
3957
4099
 
3958
4100
 
4101
+
3959
4102
 
3960
4103
 
3961
4104
  <xsl:variable name="pos"><xsl:number count="rsd:sections/rsd:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!-- | rsd:sections/rsd:terms -->
@@ -3972,7 +4115,7 @@
3972
4115
 
3973
4116
 
3974
4117
 
3975
- </xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
4118
+ </xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
3976
4119
  <fo:block break-after="page"/>
3977
4120
  <fo:block>
3978
4121
  <xsl:call-template name="setId"/>
@@ -3980,7 +4123,8 @@
3980
4123
  </fo:block>
3981
4124
  </xsl:template><xsl:template match="*[local-name() = 'clause']">
3982
4125
  <fo:block>
3983
- <xsl:call-template name="setId"/>
4126
+ <xsl:call-template name="setId"/>
4127
+
3984
4128
 
3985
4129
  <xsl:apply-templates/>
3986
4130
  </fo:block>
@@ -3988,7 +4132,7 @@
3988
4132
  <fo:block id="{@id}">
3989
4133
  <xsl:apply-templates/>
3990
4134
  </fo:block>
3991
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4135
+ </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']">
3992
4136
 
3993
4137
  <fo:block id="{@id}">
3994
4138
  <xsl:apply-templates/>
@@ -4045,7 +4189,8 @@
4045
4189
  <fo:table-column column-width="107mm"/>
4046
4190
  <fo:table-column column-width="15mm"/>
4047
4191
  <fo:table-body>
4048
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4192
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4193
+
4049
4194
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
4050
4195
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
4051
4196
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4063,6 +4208,10 @@
4063
4208
  <fo:block><xsl:apply-templates/></fo:block>
4064
4209
  </fo:table-cell>
4065
4210
  </xsl:template><xsl:template name="processBibitem">
4211
+
4212
+
4213
+ <!-- end BIPM bibitem processing-->
4214
+
4066
4215
 
4067
4216
 
4068
4217
 
@@ -4121,6 +4270,8 @@
4121
4270
  <xsl:value-of select="translate(.,'. ','')"/>
4122
4271
  </xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
4123
4272
  <xsl:value-of select="substring(.,1,1)"/>
4273
+ </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
4274
+ <fo:inline><xsl:apply-templates/></fo:inline>
4124
4275
  </xsl:template><xsl:template name="convertDate">
4125
4276
  <xsl:param name="date"/>
4126
4277
  <xsl:param name="format" select="'short'"/>
@@ -4145,6 +4296,57 @@
4145
4296
  </xsl:variable>
4146
4297
  <xsl:variable name="result">
4147
4298
  <xsl:choose>
4299
+ <xsl:when test="$format = 'ddMMyyyy'">
4300
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4301
+ <xsl:text> </xsl:text>
4302
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
4303
+ </xsl:when>
4304
+ <xsl:when test="$format = 'ddMM'">
4305
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4306
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
4307
+ </xsl:when>
4308
+ <xsl:when test="$format = 'short' or $day = ''">
4309
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
4310
+ </xsl:when>
4311
+ <xsl:otherwise>
4312
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
4313
+ </xsl:otherwise>
4314
+ </xsl:choose>
4315
+ </xsl:variable>
4316
+ <xsl:value-of select="$result"/>
4317
+ </xsl:template><xsl:template name="convertDateLocalized">
4318
+ <xsl:param name="date"/>
4319
+ <xsl:param name="format" select="'short'"/>
4320
+ <xsl:variable name="year" select="substring($date, 1, 4)"/>
4321
+ <xsl:variable name="month" select="substring($date, 6, 2)"/>
4322
+ <xsl:variable name="day" select="substring($date, 9, 2)"/>
4323
+ <xsl:variable name="monthStr">
4324
+ <xsl:choose>
4325
+ <xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
4326
+ <xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
4327
+ <xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
4328
+ <xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
4329
+ <xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
4330
+ <xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
4331
+ <xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
4332
+ <xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
4333
+ <xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
4334
+ <xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
4335
+ <xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
4336
+ <xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
4337
+ </xsl:choose>
4338
+ </xsl:variable>
4339
+ <xsl:variable name="result">
4340
+ <xsl:choose>
4341
+ <xsl:when test="$format = 'ddMMyyyy'">
4342
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4343
+ <xsl:text> </xsl:text>
4344
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
4345
+ </xsl:when>
4346
+ <xsl:when test="$format = 'ddMM'">
4347
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4348
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
4349
+ </xsl:when>
4148
4350
  <xsl:when test="$format = 'short' or $day = ''">
4149
4351
  <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
4150
4352
  </xsl:when>
@@ -4339,6 +4541,7 @@
4339
4541
 
4340
4542
 
4341
4543
 
4544
+
4342
4545
  </xsl:variable>
4343
4546
  <xsl:if test="$documentNS != $XSLNS">
4344
4547
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -4398,6 +4601,11 @@
4398
4601
  <xsl:call-template name="getLang"/>
4399
4602
  </xsl:variable>
4400
4603
 
4401
- <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4604
+ <xsl:choose>
4605
+ <xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
4606
+ <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4607
+ </xsl:when>
4608
+ <xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
4609
+ </xsl:choose>
4402
4610
 
4403
4611
  </xsl:template></xsl:stylesheet>