metanorma-m3aawg 1.6.0 → 1.6.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -5
  3. data/lib/asciidoctor/m3aawg/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/m3aawg/isodoc.rng +51 -3
  5. data/lib/isodoc/m3aawg/html/htmlstyle.css +3 -3
  6. data/lib/isodoc/m3aawg/html/htmlstyle.scss +2 -2
  7. data/lib/isodoc/m3aawg/html/m3d.css +41 -41
  8. data/lib/isodoc/m3aawg/html/m3d.scss +41 -41
  9. data/lib/isodoc/m3aawg/html/wordstyle.css +31 -31
  10. data/lib/isodoc/m3aawg/html/wordstyle.scss +31 -31
  11. data/lib/isodoc/m3aawg/m3d.report.xsl +335 -93
  12. data/lib/metanorma/m3aawg/processor.rb +12 -8
  13. data/lib/metanorma/m3aawg/version.rb +1 -1
  14. data/metanorma-m3d.gemspec +1 -2
  15. data/metanorma.yml +8 -2
  16. metadata +4 -18
data/lib/isodoc/m3aawg/html/wordstyle.scss CHANGED
@@ -70,7 +70,7 @@
70
70
  margin:0cm;
71
71
  margin-bottom:12.0pt;
72
72
  mso-pagination:widow-orphan;
73
- font-size:11.0pt;
73
+ font-size:$normalfontsize;
74
74
  font-family:$bodyfont;
75
75
  mso-fareast-font-family:"Times New Roman";
76
76
  mso-ansi-language:EN-US;
@@ -85,7 +85,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
85
85
  /* do not put in margin-left, it is specific to list level */
86
86
  mso-add-space:auto;
87
87
  mso-pagination:widow-orphan;
88
- font-size:11.0pt;
88
+ font-size:$normalfontsize;
89
89
  font-family:$bodyfont;
90
90
  mso-ansi-language:EN-AU;
91
91
  mso-fareast-language:EN-US;}
@@ -100,7 +100,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
100
100
  /* do not put in margin-left, it is specific to list level */
101
101
  mso-add-space:auto;
102
102
  mso-pagination:widow-orphan;
103
- font-size:11.0pt;
103
+ font-size:$normalfontsize;
104
104
  font-family:$bodyfont;
105
105
  mso-ansi-language:EN-AU;
106
106
  mso-fareast-language:EN-US;}
@@ -115,7 +115,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
115
115
  /* do not put in margin-left, it is specific to list level */
116
116
  mso-add-space:auto;
117
117
  mso-pagination:widow-orphan;
118
- font-size:11.0pt;
118
+ font-size:$normalfontsize;
119
119
  font-family:$bodyfont;
120
120
  mso-ansi-language:EN-AU;
121
121
  mso-fareast-language:EN-US;}
@@ -130,7 +130,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
130
130
  /* do not put in margin-left, it is specific to list level */
131
131
  mso-add-space:auto;
132
132
  mso-pagination:widow-orphan;
133
- font-size:11.0pt;
133
+ font-size:$normalfontsize;
134
134
  font-family:$bodyfont;
135
135
  mso-ansi-language:EN-AU;
136
136
  mso-fareast-language:EN-US;}
@@ -141,7 +141,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
141
141
  margin:0cm;
142
142
  margin-bottom:.0001pt;
143
143
  mso-pagination:widow-orphan;
144
- font-size:10.0pt;
144
+ font-size:$footnotefontsize;
145
145
  font-family:$bodyfont;
146
146
  mso-fareast-font-family:"Times New Roman";
147
147
  mso-ansi-language:EN-US;
@@ -152,7 +152,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
152
152
  margin-bottom:.0001pt;
153
153
  mso-pagination:widow-orphan;
154
154
  tab-stops:center 216.0pt right 432.0pt;
155
- font-size:11.0pt;
155
+ font-size:$normalfontsize;
156
156
  font-family:$bodyfont;
157
157
  mso-fareast-font-family:"Times New Roman";
158
158
  mso-ansi-language:EN-US;
@@ -163,7 +163,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
163
163
  margin-bottom:.0001pt;
164
164
  mso-pagination:widow-orphan;
165
165
  tab-stops:center 342.1pt right 684.3pt;
166
- font-size:11.0pt;
166
+ font-size:$normalfontsize;
167
167
  font-family:$bodyfont;
168
168
  mso-fareast-font-family:"Times New Roman";
169
169
  mso-ansi-language:EN-US;
@@ -174,7 +174,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
174
174
  margin-bottom:.0001pt;
175
175
  mso-pagination:widow-orphan;
176
176
  tab-stops:center 216.0pt right 432.0pt;
177
- font-size:11.0pt;
177
+ font-size:$normalfontsize;
178
178
  font-family:$bodyfont;
179
179
  mso-fareast-font-family:"Times New Roman";
180
180
  mso-ansi-language:EN-US;
@@ -185,7 +185,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
185
185
  margin-bottom:.0001pt;
186
186
  mso-pagination:widow-orphan;
187
187
  tab-stops:center 342.1pt right 684.3pt;
188
- font-size:11.0pt;
188
+ font-size:$normalfontsize;
189
189
  font-family:$bodyfont;
190
190
  mso-fareast-font-family:"Times New Roman";
191
191
  mso-ansi-language:EN-US;
@@ -230,7 +230,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
230
230
  margin:0cm;
231
231
  margin-bottom:.0001pt;
232
232
  mso-pagination:widow-orphan;
233
- font-size:10.0pt;
233
+ font-size:$footnotefontsize;
234
234
  font-family:$bodyfont;
235
235
  mso-fareast-font-family:"Times New Roman";
236
236
  mso-ansi-language:EN-US;
@@ -282,7 +282,7 @@ h1
282
282
  mso-hyphenate:none;
283
283
  tab-stops:20.0pt list 21.6pt left 28.0pt;
284
284
  font-size:13.0pt;
285
- mso-bidi-font-size:11.0pt;
285
+ mso-bidi-font-size:$normalfontsize;
286
286
  font-family:$headerfont;
287
287
  mso-fareast-font-family:$headerfont;
288
288
  mso-font-kerning:0pt;
@@ -310,7 +310,7 @@ h1.Annex
310
310
  mso-hyphenate:none;
311
311
  tab-stops:20.0pt list 21.6pt left 28.0pt;
312
312
  font-size:13.0pt;
313
- mso-bidi-font-size:11.0pt;
313
+ mso-bidi-font-size:$normalfontsize;
314
314
  font-family:$headerfont;
315
315
  mso-fareast-font-family:$headerfont;
316
316
  mso-font-kerning:0pt;
@@ -336,7 +336,7 @@ h1.Annex
336
336
  mso-hyphenate:none;
337
337
  tab-stops:27.0pt 35.0pt;
338
338
  font-size:12.0pt;
339
- mso-bidi-font-size:11.0pt;
339
+ mso-bidi-font-size:$normalfontsize;
340
340
  font-family:$headerfont;
341
341
  font-weight:bold;
342
342
  mso-fareast-font-family:$headerfont;
@@ -363,7 +363,7 @@ h2
363
363
  mso-hyphenate:none;
364
364
  tab-stops:27.0pt 35.0pt;
365
365
  font-size:12.0pt;
366
- mso-bidi-font-size:11.0pt;
366
+ mso-bidi-font-size:$normalfontsize;
367
367
  font-family:$headerfont;
368
368
  mso-fareast-font-family:$headerfont;
369
369
  mso-ansi-language:EN-GB;
@@ -388,7 +388,7 @@ h3
388
388
  mso-list:l1 level3 lfo6;
389
389
  mso-hyphenate:none;
390
390
  tab-stops:list 36.0pt left 44.0pt;
391
- font-size:11.0pt;
391
+ font-size:$normalfontsize;
392
392
  font-family:$headerfont;
393
393
  mso-fareast-font-family:$headerfont;
394
394
  mso-ansi-language:EN-GB;
@@ -413,7 +413,7 @@ h4
413
413
  mso-list:l1 level4 lfo6;
414
414
  mso-hyphenate:none;
415
415
  tab-stops:51.05pt 57.0pt 68.0pt;
416
- font-size:11.0pt;
416
+ font-size:$normalfontsize;
417
417
  font-family:$headerfont;
418
418
  mso-fareast-font-family:$headerfont;
419
419
  mso-ansi-language:EN-GB;
@@ -438,7 +438,7 @@ h5
438
438
  mso-list:l1 level5 lfo6;
439
439
  mso-hyphenate:none;
440
440
  tab-stops:51.05pt list 54.0pt;
441
- font-size:11.0pt;
441
+ font-size:$normalfontsize;
442
442
  font-family:$headerfont;
443
443
  mso-fareast-font-family:$headerfont;
444
444
  mso-ansi-language:EN-GB;
@@ -463,7 +463,7 @@ h6
463
463
  mso-list:l1 level6 lfo6;
464
464
  mso-hyphenate:none;
465
465
  tab-stops:51.05pt list 72.0pt;
466
- font-size:11.0pt;
466
+ font-size:$normalfontsize;
467
467
  font-family:$headerfont;
468
468
  mso-fareast-font-family:$headerfont;
469
469
  mso-ansi-language:EN-GB;
@@ -483,7 +483,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
483
483
  mso-pagination:widow-orphan;
484
484
  mso-hyphenate:none;
485
485
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
486
- font-size:11.0pt;
486
+ font-size:$normalfontsize;
487
487
  font-family:$bodyfont;
488
488
  mso-fareast-font-family:$bodyfont;
489
489
  mso-bidi-font-family:$bodyfont;
@@ -506,7 +506,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
506
506
  mso-pagination:widow-orphan;
507
507
  mso-hyphenate:none;
508
508
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
509
- font-size:11.0pt;
509
+ font-size:$normalfontsize;
510
510
  font-family:$bodyfont;
511
511
  mso-fareast-font-family:$bodyfont;
512
512
  mso-bidi-font-family:$bodyfont;
@@ -529,7 +529,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
529
529
  mso-pagination:widow-orphan;
530
530
  mso-hyphenate:none;
531
531
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
532
- font-size:11.0pt;
532
+ font-size:$normalfontsize;
533
533
  font-family:$bodyfont;
534
534
  mso-fareast-font-family:$bodyfont;
535
535
  mso-bidi-font-family:$bodyfont;
@@ -551,7 +551,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
551
551
  line-height:12.0pt;
552
552
  mso-pagination:widow-orphan;
553
553
  tab-stops:20.15pt;
554
- font-size:10.0pt;
554
+ font-size:$footnotefontsize;
555
555
  font-family:$bodyfont;
556
556
  mso-fareast-font-family:$bodyfont;
557
557
  mso-bidi-font-family:$bodyfont;
@@ -569,7 +569,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
569
569
  text-align:justify;
570
570
  line-height:12.0pt;
571
571
  mso-pagination:widow-orphan;
572
- font-size:11.0pt;
572
+ font-size:$normalfontsize;
573
573
  font-family:$bodyfont;
574
574
  mso-fareast-font-family:$bodyfont;
575
575
  mso-bidi-font-family:$bodyfont;
@@ -613,7 +613,7 @@ span.Heading3Char
613
613
  mso-style-locked:yes;
614
614
  mso-style-parent:"";
615
615
  mso-style-link:"Heading 3";
616
- mso-ansi-font-size:11.0pt;
616
+ mso-ansi-font-size:$normalfontsize;
617
617
  font-family:$headerfont;
618
618
  mso-ascii-font-family:$headerfont;
619
619
  mso-fareast-font-family:$headerfont;
@@ -629,7 +629,7 @@ span.Heading4Char
629
629
  mso-style-locked:yes;
630
630
  mso-style-parent:"";
631
631
  mso-style-link:"Heading 4";
632
- mso-ansi-font-size:11.0pt;
632
+ mso-ansi-font-size:$normalfontsize;
633
633
  font-family:$headerfont;
634
634
  mso-ascii-font-family:$headerfont;
635
635
  mso-fareast-font-family:$headerfont;
@@ -645,7 +645,7 @@ span.Heading5Char
645
645
  mso-style-locked:yes;
646
646
  mso-style-parent:"";
647
647
  mso-style-link:"Heading 5";
648
- mso-ansi-font-size:11.0pt;
648
+ mso-ansi-font-size:$normalfontsize;
649
649
  font-family:$headerfont;
650
650
  mso-ascii-font-family:$headerfont;
651
651
  mso-fareast-font-family:$headerfont;
@@ -661,7 +661,7 @@ span.Heading6Char
661
661
  mso-style-locked:yes;
662
662
  mso-style-parent:"";
663
663
  mso-style-link:"Heading 6";
664
- mso-ansi-font-size:11.0pt;
664
+ mso-ansi-font-size:$normalfontsize;
665
665
  font-family:$headerfont;
666
666
  mso-ascii-font-family:$headerfont;
667
667
  mso-fareast-font-family:$headerfont;
@@ -680,8 +680,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
680
680
  margin-left:0cm;
681
681
  line-height:10.5pt;
682
682
  mso-pagination:widow-orphan;
683
- font-size:10.0pt;
684
- mso-bidi-font-size:11.0pt;
683
+ font-size:$smallerfontsize;
684
+ mso-bidi-font-size:$normalfontsize;
685
685
  font-family:$bodyfont;
686
686
  mso-fareast-font-family:$bodyfont;
687
687
  mso-bidi-font-family:$bodyfont;
@@ -1164,7 +1164,7 @@ table.MsoNormalTable
1164
1164
  mso-para-margin:0cm;
1165
1165
  mso-para-margin-bottom:.0001pt;
1166
1166
  mso-pagination:widow-orphan;
1167
- font-size:10.0pt;
1167
+ font-size:$smallerfontsize;
1168
1168
  font-family:$bodyfont;}
1169
1169
  ol
1170
1170
  {margin-bottom:0cm;
data/lib/isodoc/m3aawg/m3d.report.xsl CHANGED
@@ -218,55 +218,89 @@
218
218
  </xsl:call-template>
219
219
  </xsl:variable>
220
220
  <fo:block font-size="12pt" font-weight="bold" text-decoration="underline" margin-bottom="4pt"><xsl:value-of select="$title-toc"/></fo:block>
221
- <fo:table table-layout="fixed" width="100%" font-size="10pt">
222
- <fo:table-column column-width="25mm"/>
223
- <fo:table-column column-width="155mm"/>
224
- <fo:table-body>
225
- <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
226
- <fo:table-row height="6mm">
227
- <fo:table-cell>
228
- <fo:block font-weight="bold">
229
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
230
- <xsl:choose>
231
- <xsl:when test="@section = ''">
232
- <xsl:apply-templates select="title"/>
233
- </xsl:when>
234
- <xsl:when test="@type = 'references' and @section = ''">
235
- <xsl:apply-templates select="title"/>
236
- </xsl:when>
237
- <xsl:when test="@level = 1">
238
- <xsl:value-of select="@section"/>
239
- </xsl:when>
240
- <xsl:otherwise/>
241
- </xsl:choose>
242
- </fo:basic-link>
243
- </fo:block>
244
- </fo:table-cell>
245
- <fo:table-cell>
246
- <fo:block text-align-last="justify">
247
- <xsl:if test="@level = 1">
248
- <xsl:attribute name="font-weight">bold</xsl:attribute>
249
- </xsl:if>
250
- <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
251
- <xsl:choose>
252
- <xsl:when test="@section = ''"/>
253
- <xsl:when test="@type = 'references' and @section = ''"/>
254
- <xsl:otherwise>
255
- <xsl:apply-templates select="title"/>
256
- </xsl:otherwise>
257
- </xsl:choose>
258
-
259
- <fo:inline keep-together.within-line="always">
260
- <fo:leader font-weight="normal" leader-pattern="dots"/>
261
- <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
262
- </fo:inline>
263
- </fo:basic-link>
264
- </fo:block>
265
- </fo:table-cell>
266
- </fo:table-row>
267
- </xsl:for-each>
268
- </fo:table-body>
269
- </fo:table>
221
+ <fo:block font-size="10pt">
222
+ <xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
223
+ <xsl:choose>
224
+ <xsl:when test="@section = ''">
225
+ <fo:table table-layout="fixed" width="100%">
226
+ <fo:table-column column-width="180mm"/>
227
+ <fo:table-body>
228
+ <fo:table-row height="6mm">
229
+ <fo:table-cell>
230
+ <fo:block text-align-last="justify">
231
+ <xsl:if test="@level = 1">
232
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
233
+ </xsl:if>
234
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
235
+ <fo:inline font-weight="bold">
236
+ <xsl:apply-templates select="title"/><xsl:text> </xsl:text>
237
+ </fo:inline>
238
+ <fo:inline keep-together.within-line="always">
239
+ <fo:leader font-weight="normal" leader-pattern="dots"/>
240
+ <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
241
+ </fo:inline>
242
+ </fo:basic-link>
243
+ </fo:block>
244
+ </fo:table-cell>
245
+ </fo:table-row>
246
+ </fo:table-body>
247
+ </fo:table>
248
+ </xsl:when>
249
+ <xsl:otherwise>
250
+ <fo:table table-layout="fixed" width="100%">
251
+ <fo:table-column column-width="5mm"/> <!-- 25mm -->
252
+ <fo:table-column column-width="175mm"/> <!-- 155mm -->
253
+ <fo:table-body>
254
+ <fo:table-row height="6mm">
255
+ <fo:table-cell>
256
+ <fo:block font-weight="bold">
257
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
258
+ <xsl:choose>
259
+ <!-- <xsl:when test="@section = ''">
260
+ <xsl:apply-templates select="title"/>
261
+ </xsl:when> -->
262
+ <!-- <xsl:when test="@type = 'references' and @section = ''">
263
+ <xsl:apply-templates select="title"/>
264
+ </xsl:when> -->
265
+ <xsl:when test="@level = 1">
266
+ <xsl:value-of select="@section"/>
267
+ </xsl:when>
268
+ <xsl:otherwise/>
269
+ </xsl:choose>
270
+ </fo:basic-link>
271
+ </fo:block>
272
+ </fo:table-cell>
273
+ <fo:table-cell>
274
+ <fo:block text-align-last="justify">
275
+ <xsl:if test="@level = 1">
276
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
277
+ </xsl:if>
278
+ <fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
279
+ <!-- <xsl:choose>
280
+ <xsl:when test="@section = ''"></xsl:when>
281
+ <xsl:otherwise>
282
+ <xsl:apply-templates select="title"/>
283
+ </xsl:otherwise>
284
+ </xsl:choose> -->
285
+ <xsl:apply-templates select="title"/><xsl:text> </xsl:text>
286
+ <fo:inline keep-together.within-line="always">
287
+ <fo:leader font-weight="normal" leader-pattern="dots"/>
288
+ <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
289
+ </fo:inline>
290
+ </fo:basic-link>
291
+ </fo:block>
292
+ </fo:table-cell>
293
+ </fo:table-row>
294
+ </fo:table-body>
295
+ </fo:table>
296
+ </xsl:otherwise>
297
+
298
+ </xsl:choose>
299
+
300
+
301
+
302
+ </xsl:for-each>
303
+ </fo:block>
270
304
  </fo:block-container>
271
305
 
272
306
  <fo:block break-after="page"/>
@@ -365,7 +399,7 @@
365
399
  <xsl:otherwise> <!-- for ordered lists -->
366
400
  <xsl:choose>
367
401
  <xsl:when test="../@type = 'arabic'">
368
- <xsl:number format="a)"/>
402
+ <xsl:number format="a)" lang="en"/>
369
403
  </xsl:when>
370
404
  <xsl:when test="../@type = 'alphabet'">
371
405
  <xsl:number format="1)"/>
@@ -1235,6 +1269,7 @@
1235
1269
 
1236
1270
  </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1237
1271
 
1272
+
1238
1273
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
1239
1274
 
1240
1275
 
@@ -1246,6 +1281,7 @@
1246
1281
 
1247
1282
 
1248
1283
 
1284
+
1249
1285
  </xsl:attribute-set><xsl:attribute-set name="quote-source-style">
1250
1286
 
1251
1287
 
@@ -1265,6 +1301,7 @@
1265
1301
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1266
1302
 
1267
1303
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1304
+
1268
1305
 
1269
1306
 
1270
1307
 
@@ -1379,7 +1416,7 @@
1379
1416
  </xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
1380
1417
  <!-- <xsl:call-template name="add-zero-spaces"/> -->
1381
1418
  <xsl:call-template name="add-zero-spaces-java"/>
1382
- </xsl:template><xsl:template match="*[local-name()='table']">
1419
+ </xsl:template><xsl:template match="*[local-name()='table']" name="table">
1383
1420
 
1384
1421
  <xsl:variable name="simple-table">
1385
1422
  <xsl:call-template name="getSimpleTable"/>
@@ -1425,10 +1462,12 @@
1425
1462
 
1426
1463
 
1427
1464
  <xsl:variable name="colwidths">
1428
- <xsl:call-template name="calculate-column-widths">
1429
- <xsl:with-param name="cols-count" select="$cols-count"/>
1430
- <xsl:with-param name="table" select="$simple-table"/>
1431
- </xsl:call-template>
1465
+ <xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
1466
+ <xsl:call-template name="calculate-column-widths">
1467
+ <xsl:with-param name="cols-count" select="$cols-count"/>
1468
+ <xsl:with-param name="table" select="$simple-table"/>
1469
+ </xsl:call-template>
1470
+ </xsl:if>
1432
1471
  </xsl:variable>
1433
1472
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
1434
1473
 
@@ -1467,7 +1506,12 @@
1467
1506
 
1468
1507
  <xsl:variable name="table_attributes">
1469
1508
  <attribute name="table-layout">fixed</attribute>
1470
- <attribute name="width">100%</attribute>
1509
+ <attribute name="width">
1510
+ <xsl:choose>
1511
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
1512
+ <xsl:otherwise>100%</xsl:otherwise>
1513
+ </xsl:choose>
1514
+ </attribute>
1471
1515
  <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
1472
1516
  <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
1473
1517
 
@@ -1496,16 +1540,25 @@
1496
1540
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
1497
1541
  </xsl:if>
1498
1542
 
1499
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1500
- <xsl:choose>
1501
- <xsl:when test=". = 1 or . = 0">
1502
- <fo:table-column column-width="proportional-column-width(2)"/>
1503
- </xsl:when>
1504
- <xsl:otherwise>
1505
- <fo:table-column column-width="proportional-column-width({.})"/>
1506
- </xsl:otherwise>
1507
- </xsl:choose>
1508
- </xsl:for-each>
1543
+ <xsl:choose>
1544
+ <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
1545
+ <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
1546
+ <fo:table-column column-width="{@width}"/>
1547
+ </xsl:for-each>
1548
+ </xsl:when>
1549
+ <xsl:otherwise>
1550
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1551
+ <xsl:choose>
1552
+ <xsl:when test=". = 1 or . = 0">
1553
+ <fo:table-column column-width="proportional-column-width(2)"/>
1554
+ </xsl:when>
1555
+ <xsl:otherwise>
1556
+ <fo:table-column column-width="proportional-column-width({.})"/>
1557
+ </xsl:otherwise>
1558
+ </xsl:choose>
1559
+ </xsl:for-each>
1560
+ </xsl:otherwise>
1561
+ </xsl:choose>
1509
1562
 
1510
1563
  <xsl:choose>
1511
1564
  <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1518,10 +1571,12 @@
1518
1571
 
1519
1572
  </fo:table>
1520
1573
 
1574
+ <xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
1521
1575
  <xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
1522
1576
  <xsl:call-template name="insertTableFooterInSeparateTable">
1523
1577
  <xsl:with-param name="table_attributes" select="$table_attributes"/>
1524
1578
  <xsl:with-param name="colwidths" select="$colwidths"/>
1579
+ <xsl:with-param name="colgroup" select="$colgroup"/>
1525
1580
  </xsl:call-template>
1526
1581
  </xsl:for-each>
1527
1582
 
@@ -1775,12 +1830,22 @@
1775
1830
  </xsl:template><xsl:template name="insertTableFooterInSeparateTable">
1776
1831
  <xsl:param name="table_attributes"/>
1777
1832
  <xsl:param name="colwidths"/>
1833
+ <xsl:param name="colgroup"/>
1778
1834
 
1779
1835
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
1780
1836
 
1781
1837
  <xsl:if test="$isNoteOrFnExist = 'true'">
1782
1838
 
1783
- <xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
1839
+ <xsl:variable name="cols-count">
1840
+ <xsl:choose>
1841
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1842
+ <xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
1843
+ </xsl:when>
1844
+ <xsl:otherwise>
1845
+ <xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
1846
+ </xsl:otherwise>
1847
+ </xsl:choose>
1848
+ </xsl:variable>
1784
1849
 
1785
1850
  <fo:table keep-with-previous="always">
1786
1851
  <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1798,16 +1863,25 @@
1798
1863
  </xsl:choose>
1799
1864
  </xsl:for-each>
1800
1865
 
1801
- <xsl:for-each select="xalan:nodeset($colwidths)//column">
1802
- <xsl:choose>
1803
- <xsl:when test=". = 1 or . = 0">
1804
- <fo:table-column column-width="proportional-column-width(2)"/>
1805
- </xsl:when>
1806
- <xsl:otherwise>
1807
- <fo:table-column column-width="proportional-column-width({.})"/>
1808
- </xsl:otherwise>
1809
- </xsl:choose>
1810
- </xsl:for-each>
1866
+ <xsl:choose>
1867
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
1868
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
1869
+ <fo:table-column column-width="{@width}"/>
1870
+ </xsl:for-each>
1871
+ </xsl:when>
1872
+ <xsl:otherwise>
1873
+ <xsl:for-each select="xalan:nodeset($colwidths)//column">
1874
+ <xsl:choose>
1875
+ <xsl:when test=". = 1 or . = 0">
1876
+ <fo:table-column column-width="proportional-column-width(2)"/>
1877
+ </xsl:when>
1878
+ <xsl:otherwise>
1879
+ <fo:table-column column-width="proportional-column-width({.})"/>
1880
+ </xsl:otherwise>
1881
+ </xsl:choose>
1882
+ </xsl:for-each>
1883
+ </xsl:otherwise>
1884
+ </xsl:choose>
1811
1885
 
1812
1886
  <fo:table-body>
1813
1887
  <fo:table-row>
@@ -2209,7 +2283,9 @@
2209
2283
  </xsl:template><xsl:template match="*[local-name()='dl']">
2210
2284
  <fo:block-container>
2211
2285
 
2212
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
2286
+ <xsl:if test="not(ancestor::*[local-name() = 'quote'])">
2287
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
2288
+ </xsl:if>
2213
2289
 
2214
2290
 
2215
2291
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -2224,6 +2300,7 @@
2224
2300
  <fo:block-container>
2225
2301
 
2226
2302
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2303
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
2227
2304
 
2228
2305
 
2229
2306
  <xsl:variable name="parent" select="local-name(..)"/>
@@ -2407,12 +2484,32 @@
2407
2484
  </xsl:otherwise>
2408
2485
  </xsl:choose>
2409
2486
  </xsl:template><xsl:template name="getMaxLength_dt">
2410
- <xsl:for-each select="*[local-name()='dt']">
2411
- <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2412
- <xsl:if test="position() = 1">
2413
- <xsl:value-of select="string-length(normalize-space(.))"/>
2414
- </xsl:if>
2415
- </xsl:for-each>
2487
+ <xsl:variable name="lengths">
2488
+ <xsl:for-each select="*[local-name()='dt']">
2489
+ <xsl:variable name="maintext_length" select="string-length(normalize-space(.))"/>
2490
+ <xsl:variable name="attributes">
2491
+ <xsl:for-each select=".//@open"><xsl:value-of select="."/></xsl:for-each>
2492
+ <xsl:for-each select=".//@close"><xsl:value-of select="."/></xsl:for-each>
2493
+ </xsl:variable>
2494
+ <length><xsl:value-of select="string-length(normalize-space(.)) + string-length($attributes)"/></length>
2495
+ </xsl:for-each>
2496
+ </xsl:variable>
2497
+ <xsl:variable name="maxLength">
2498
+ <!-- <xsl:for-each select="*[local-name()='dt']">
2499
+ <xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
2500
+ <xsl:if test="position() = 1">
2501
+ <xsl:value-of select="string-length(normalize-space(.))"/>
2502
+ </xsl:if>
2503
+ </xsl:for-each> -->
2504
+ <xsl:for-each select="xalan:nodeset($lengths)/length">
2505
+ <xsl:sort select="." data-type="number" order="descending"/>
2506
+ <xsl:if test="position() = 1">
2507
+ <xsl:value-of select="."/>
2508
+ </xsl:if>
2509
+ </xsl:for-each>
2510
+ </xsl:variable>
2511
+ <!-- <xsl:message>DEBUG:<xsl:value-of select="$maxLength"/></xsl:message> -->
2512
+ <xsl:value-of select="$maxLength"/>
2416
2513
  </xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
2417
2514
  <xsl:param name="key_iso"/>
2418
2515
 
@@ -2524,6 +2621,7 @@
2524
2621
  </fo:inline>
2525
2622
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2526
2623
  <fo:inline font-weight="bold">
2624
+
2527
2625
  <xsl:apply-templates/>
2528
2626
  </fo:inline>
2529
2627
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2545,6 +2643,7 @@
2545
2643
 
2546
2644
 
2547
2645
 
2646
+
2548
2647
  <xsl:choose>
2549
2648
  <xsl:when test="not(ancestor::*[local-name()='note'])">10</xsl:when>
2550
2649
  <xsl:otherwise>11</xsl:otherwise>
@@ -2568,6 +2667,10 @@
2568
2667
  </xsl:if>
2569
2668
  <xsl:apply-templates/>
2570
2669
  </fo:inline>
2670
+ </xsl:template><xsl:template match="*[local-name()='underline']">
2671
+ <fo:inline text-decoration="underline">
2672
+ <xsl:apply-templates/>
2673
+ </fo:inline>
2571
2674
  </xsl:template><xsl:template match="*[local-name()='del']">
2572
2675
  <fo:inline font-size="10pt" color="red" text-decoration="line-through">
2573
2676
  <xsl:apply-templates/>
@@ -2933,6 +3036,7 @@
2933
3036
  </xsl:choose>
2934
3037
  </xsl:variable>
2935
3038
  <fo:inline xsl:use-attribute-sets="link-style">
3039
+
2936
3040
  <xsl:choose>
2937
3041
  <xsl:when test="$target = ''">
2938
3042
  <xsl:apply-templates/>
@@ -3149,8 +3253,9 @@
3149
3253
  </xsl:if> -->
3150
3254
  </fo:inline>
3151
3255
  </xsl:if>
3152
- </xsl:template><xsl:template match="*[local-name() = 'figure']">
3153
- <fo:block-container id="{@id}">
3256
+ </xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
3257
+ <fo:block-container id="{@id}">
3258
+
3154
3259
  <fo:block>
3155
3260
  <xsl:apply-templates/>
3156
3261
  </fo:block>
@@ -3201,7 +3306,7 @@
3201
3306
  <xsl:apply-templates mode="bookmarks"/>
3202
3307
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3203
3308
  <xsl:apply-templates select="."/>
3204
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3309
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3205
3310
  <xsl:apply-templates mode="bookmarks"/>
3206
3311
  </xsl:template><xsl:template name="addBookmarks">
3207
3312
  <xsl:param name="contents"/>
@@ -3217,6 +3322,8 @@
3217
3322
  <xsl:variable name="bookmark-title_">
3218
3323
  <xsl:call-template name="getLangVersion">
3219
3324
  <xsl:with-param name="lang" select="@lang"/>
3325
+ <xsl:with-param name="doctype" select="@doctype"/>
3326
+ <xsl:with-param name="title" select="@title-part"/>
3220
3327
  </xsl:call-template>
3221
3328
  </xsl:variable>
3222
3329
  <xsl:choose>
@@ -3234,13 +3341,34 @@
3234
3341
  </xsl:choose>
3235
3342
  </fo:bookmark-title>
3236
3343
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3344
+
3345
+ <xsl:call-template name="insertFigureBookmarks">
3346
+ <xsl:with-param name="contents" select="contents"/>
3347
+ </xsl:call-template>
3348
+
3349
+ <xsl:call-template name="insertTableBookmarks">
3350
+ <xsl:with-param name="contents" select="contents"/>
3351
+ <xsl:with-param name="lang" select="@lang"/>
3352
+ </xsl:call-template>
3353
+
3237
3354
  </fo:bookmark>
3238
3355
 
3239
3356
  </xsl:for-each>
3240
3357
  </xsl:when>
3241
3358
  <xsl:otherwise>
3242
3359
  <xsl:for-each select="xalan:nodeset($contents)/doc">
3360
+
3243
3361
  <xsl:apply-templates select="contents/item" mode="bookmark"/>
3362
+
3363
+ <xsl:call-template name="insertFigureBookmarks">
3364
+ <xsl:with-param name="contents" select="contents"/>
3365
+ </xsl:call-template>
3366
+
3367
+ <xsl:call-template name="insertTableBookmarks">
3368
+ <xsl:with-param name="contents" select="contents"/>
3369
+ <xsl:with-param name="lang" select="@lang"/>
3370
+ </xsl:call-template>
3371
+
3244
3372
  </xsl:for-each>
3245
3373
  </xsl:otherwise>
3246
3374
  </xsl:choose>
@@ -3259,8 +3387,44 @@
3259
3387
 
3260
3388
  </fo:bookmark-tree>
3261
3389
  </xsl:if>
3390
+ </xsl:template><xsl:template name="insertFigureBookmarks">
3391
+ <xsl:param name="contents"/>
3392
+ <xsl:if test="xalan:nodeset($contents)/figure">
3393
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
3394
+ <fo:bookmark-title>Figures</fo:bookmark-title>
3395
+ <xsl:for-each select="xalan:nodeset($contents)/figure">
3396
+ <fo:bookmark internal-destination="{@id}">
3397
+ <fo:bookmark-title>
3398
+ <xsl:value-of select="normalize-space(title)"/>
3399
+ </fo:bookmark-title>
3400
+ </fo:bookmark>
3401
+ </xsl:for-each>
3402
+ </fo:bookmark>
3403
+ </xsl:if>
3404
+ </xsl:template><xsl:template name="insertTableBookmarks">
3405
+ <xsl:param name="contents"/>
3406
+ <xsl:param name="lang"/>
3407
+ <xsl:if test="xalan:nodeset($contents)/table">
3408
+ <fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
3409
+ <fo:bookmark-title>
3410
+ <xsl:choose>
3411
+ <xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
3412
+ <xsl:otherwise>Tables</xsl:otherwise>
3413
+ </xsl:choose>
3414
+ </fo:bookmark-title>
3415
+ <xsl:for-each select="xalan:nodeset($contents)/table">
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>
3262
3424
  </xsl:template><xsl:template name="getLangVersion">
3263
3425
  <xsl:param name="lang"/>
3426
+ <xsl:param name="doctype" select="''"/>
3427
+ <xsl:param name="title" select="''"/>
3264
3428
  <xsl:choose>
3265
3429
  <xsl:when test="$lang = 'en'">
3266
3430
 
@@ -3296,6 +3460,12 @@
3296
3460
  <!-- <xsl:text> </xsl:text> -->
3297
3461
  </xsl:template><xsl:template name="getSection">
3298
3462
  <xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
3463
+ <!--
3464
+ <xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
3465
+ <xsl:value-of select="."/>
3466
+ </xsl:for-each>
3467
+ -->
3468
+
3299
3469
  </xsl:template><xsl:template name="getName">
3300
3470
  <xsl:choose>
3301
3471
  <xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -3348,6 +3518,10 @@
3348
3518
  <xsl:copy>
3349
3519
  <xsl:apply-templates mode="contents_item"/>
3350
3520
  </xsl:copy>
3521
+ </xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
3522
+ <xsl:copy>
3523
+ <xsl:apply-templates mode="contents_item"/>
3524
+ </xsl:copy>
3351
3525
  </xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
3352
3526
  <xsl:text> </xsl:text>
3353
3527
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -3373,6 +3547,7 @@
3373
3547
 
3374
3548
 
3375
3549
 
3550
+
3376
3551
 
3377
3552
 
3378
3553
 
@@ -3743,7 +3918,8 @@
3743
3918
  <fo:block-container margin-left="0mm">
3744
3919
 
3745
3920
  <fo:block xsl:use-attribute-sets="quote-style">
3746
- <xsl:apply-templates select=".//*[local-name() = 'p']"/>
3921
+ <!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
3922
+ <xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
3747
3923
  </fo:block>
3748
3924
  <xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
3749
3925
  <fo:block xsl:use-attribute-sets="quote-source-style">
@@ -3900,6 +4076,7 @@
3900
4076
 
3901
4077
 
3902
4078
 
4079
+
3903
4080
  <xsl:variable name="pos"><xsl:number count="m3d:sections/m3d:clause | m3d:sections/m3d:terms"/></xsl:variable>
3904
4081
  <xsl:if test="$pos &gt;= 2">
3905
4082
  <xsl:attribute name="space-before">18pt</xsl:attribute>
@@ -3915,7 +4092,7 @@
3915
4092
 
3916
4093
 
3917
4094
 
3918
- </xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
4095
+ </xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
3919
4096
  <fo:block break-after="page"/>
3920
4097
  <fo:block>
3921
4098
  <xsl:call-template name="setId"/>
@@ -3923,7 +4100,8 @@
3923
4100
  </fo:block>
3924
4101
  </xsl:template><xsl:template match="*[local-name() = 'clause']">
3925
4102
  <fo:block>
3926
- <xsl:call-template name="setId"/>
4103
+ <xsl:call-template name="setId"/>
4104
+
3927
4105
 
3928
4106
  <xsl:apply-templates/>
3929
4107
  </fo:block>
@@ -3931,7 +4109,7 @@
3931
4109
  <fo:block id="{@id}">
3932
4110
  <xsl:apply-templates/>
3933
4111
  </fo:block>
3934
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
4112
+ </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']">
3935
4113
 
3936
4114
  <fo:block id="{@id}">
3937
4115
  <xsl:apply-templates/>
@@ -3988,7 +4166,8 @@
3988
4166
  <fo:table-column column-width="107mm"/>
3989
4167
  <fo:table-column column-width="15mm"/>
3990
4168
  <fo:table-body>
3991
- <fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
4169
+ <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
4170
+
3992
4171
  <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
3993
4172
  <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
3994
4173
  <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4006,6 +4185,10 @@
4006
4185
  <fo:block><xsl:apply-templates/></fo:block>
4007
4186
  </fo:table-cell>
4008
4187
  </xsl:template><xsl:template name="processBibitem">
4188
+
4189
+
4190
+ <!-- end BIPM bibitem processing-->
4191
+
4009
4192
 
4010
4193
 
4011
4194
 
@@ -4064,6 +4247,8 @@
4064
4247
  <xsl:value-of select="translate(.,'. ','')"/>
4065
4248
  </xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
4066
4249
  <xsl:value-of select="substring(.,1,1)"/>
4250
+ </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
4251
+ <fo:inline><xsl:apply-templates/></fo:inline>
4067
4252
  </xsl:template><xsl:template name="convertDate">
4068
4253
  <xsl:param name="date"/>
4069
4254
  <xsl:param name="format" select="'short'"/>
@@ -4088,6 +4273,57 @@
4088
4273
  </xsl:variable>
4089
4274
  <xsl:variable name="result">
4090
4275
  <xsl:choose>
4276
+ <xsl:when test="$format = 'ddMMyyyy'">
4277
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4278
+ <xsl:text> </xsl:text>
4279
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
4280
+ </xsl:when>
4281
+ <xsl:when test="$format = 'ddMM'">
4282
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4283
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
4284
+ </xsl:when>
4285
+ <xsl:when test="$format = 'short' or $day = ''">
4286
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
4287
+ </xsl:when>
4288
+ <xsl:otherwise>
4289
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
4290
+ </xsl:otherwise>
4291
+ </xsl:choose>
4292
+ </xsl:variable>
4293
+ <xsl:value-of select="$result"/>
4294
+ </xsl:template><xsl:template name="convertDateLocalized">
4295
+ <xsl:param name="date"/>
4296
+ <xsl:param name="format" select="'short'"/>
4297
+ <xsl:variable name="year" select="substring($date, 1, 4)"/>
4298
+ <xsl:variable name="month" select="substring($date, 6, 2)"/>
4299
+ <xsl:variable name="day" select="substring($date, 9, 2)"/>
4300
+ <xsl:variable name="monthStr">
4301
+ <xsl:choose>
4302
+ <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>
4303
+ <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>
4304
+ <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>
4305
+ <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>
4306
+ <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>
4307
+ <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>
4308
+ <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>
4309
+ <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>
4310
+ <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>
4311
+ <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>
4312
+ <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>
4313
+ <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>
4314
+ </xsl:choose>
4315
+ </xsl:variable>
4316
+ <xsl:variable name="result">
4317
+ <xsl:choose>
4318
+ <xsl:when test="$format = 'ddMMyyyy'">
4319
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4320
+ <xsl:text> </xsl:text>
4321
+ <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
4322
+ </xsl:when>
4323
+ <xsl:when test="$format = 'ddMM'">
4324
+ <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
4325
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
4326
+ </xsl:when>
4091
4327
  <xsl:when test="$format = 'short' or $day = ''">
4092
4328
  <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
4093
4329
  </xsl:when>
@@ -4282,6 +4518,7 @@
4282
4518
 
4283
4519
 
4284
4520
 
4521
+
4285
4522
  </xsl:variable>
4286
4523
  <xsl:if test="$documentNS != $XSLNS">
4287
4524
  <xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -4341,6 +4578,11 @@
4341
4578
  <xsl:call-template name="getLang"/>
4342
4579
  </xsl:variable>
4343
4580
 
4344
- <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4581
+ <xsl:choose>
4582
+ <xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
4583
+ <xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
4584
+ </xsl:when>
4585
+ <xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
4586
+ </xsl:choose>
4345
4587
 
4346
4588
  </xsl:template></xsl:stylesheet>