metanorma-bipm 2.0.0.1 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/bipm.brochure.xsl +1063 -670
  3. data/lib/isodoc/bipm/bipm.guide.xsl +1063 -670
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +1063 -670
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +1063 -670
  6. data/lib/isodoc/bipm/html/htmlstyle.css +25 -19
  7. data/lib/isodoc/bipm/html/htmlstyle.scss +7 -2
  8. data/lib/isodoc/bipm/jcgm.standard.xsl +978 -608
  9. data/lib/metanorma/bipm/version.rb +1 -1
  10. metadata +2 -2
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -2176,9 +2176,6 @@
2176
2176
  <!-- ============================= -->
2177
2177
  <!-- CONTENTS -->
2178
2178
  <!-- ============================= -->
2179
- <xsl:template match="node()" mode="contents">
2180
- <xsl:apply-templates mode="contents"/>
2181
- </xsl:template>
2182
2179
 
2183
2180
  <!-- element with title -->
2184
2181
  <xsl:template match="*[bipm:title]" mode="contents">
@@ -3299,8 +3296,8 @@
3299
3296
  <fo:list-item-label><fo:block/></fo:list-item-label>
3300
3297
  <fo:list-item-body>
3301
3298
  <fo:block>
3302
- <xsl:apply-templates select="bipm:name" mode="presentation"/>
3303
- <xsl:apply-templates/>
3299
+ <xsl:apply-templates select="bipm:name"/>
3300
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3304
3301
  </fo:block>
3305
3302
  </fo:list-item-body>
3306
3303
  </fo:list-item>
@@ -3322,7 +3319,7 @@
3322
3319
  </fo:table-cell>
3323
3320
  <fo:table-cell display-align="center">
3324
3321
  <fo:block text-align="right">
3325
- <xsl:apply-templates select="../bipm:name" mode="presentation"/>
3322
+ <xsl:apply-templates select="../bipm:name" mode="formula_number"/>
3326
3323
  </fo:block>
3327
3324
  </fo:table-cell>
3328
3325
  </fo:table-row>
@@ -3370,103 +3367,15 @@
3370
3367
  </xsl:variable>
3371
3368
  <fo:inline role="H{$level}" font-weight="bold">
3372
3369
  <xsl:attribute name="padding-right">2mm</xsl:attribute>
3373
- <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name" mode="presentation"/>
3370
+ <xsl:apply-templates select="ancestor::bipm:term[1]/bipm:name"/>
3374
3371
  </fo:inline>
3375
3372
  </xsl:if>
3376
3373
  <xsl:apply-templates/>
3377
3374
  </fo:block>
3378
3375
  </xsl:template>
3379
3376
 
3380
- <xsl:template match="bipm:bibitem">
3381
- <fo:block id="{@id}" margin-bottom="12pt" start-indent="25mm" text-indent="-25mm" line-height="115%">
3382
- <xsl:if test=".//bipm:fn">
3383
- <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
3384
- </xsl:if>
3385
- <xsl:call-template name="processBibitem"/>
3386
- <!-- <xsl:apply-templates /> -->
3387
- </fo:block>
3388
- </xsl:template>
3389
-
3390
- <xsl:template match="bipm:bibitem/bipm:note" priority="2">
3391
- <fo:footnote>
3392
- <xsl:variable name="number">
3393
- <xsl:choose>
3394
- <xsl:when test="ancestor::bipm:references[preceding-sibling::bipm:references]">
3395
- <xsl:number level="any" count="bipm:references[preceding-sibling::bipm:references]//bipm:bibitem/bipm:note"/>
3396
- </xsl:when>
3397
- <xsl:otherwise>
3398
- <xsl:number level="any" count="bipm:bibitem/bipm:note"/>
3399
- </xsl:otherwise>
3400
- </xsl:choose>
3401
- </xsl:variable>
3402
- <fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super"> <!-- 60% baseline-shift="35%" -->
3403
- <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
3404
- <xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
3405
- </fo:basic-link>
3406
- </fo:inline>
3407
- <fo:footnote-body>
3408
- <fo:block font-size="10pt" margin-bottom="12pt" start-indent="0pt">
3409
- <fo:inline id="{generate-id()}" keep-with-next.within-line="always" font-size="60%" vertical-align="super"><!-- baseline-shift="30%" padding-right="9mm" alignment-baseline="hanging" -->
3410
- <xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
3411
- </fo:inline>
3412
- <xsl:apply-templates/>
3413
- </fo:block>
3414
- </fo:footnote-body>
3415
- </fo:footnote>
3416
- </xsl:template>
3417
-
3418
- <xsl:template match="bipm:references[not(@normative='true')]">
3419
- <fo:block break-after="page"/>
3420
- <fo:block id="{@id}" line-height="120%">
3421
- <xsl:apply-templates/>
3422
- </fo:block>
3423
- </xsl:template>
3424
-
3425
- <xsl:template match="bipm:annex//bipm:references">
3426
- <fo:block id="{@id}">
3427
- <xsl:apply-templates/>
3428
- </fo:block>
3429
- </xsl:template>
3430
3377
 
3431
- <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
3432
- <xsl:template match="bipm:references[not(@normative='true')]/bipm:bibitem">
3433
- <fo:list-block id="{@id}" margin-bottom="12pt" provisional-distance-between-starts="13mm">
3434
- <fo:list-item>
3435
- <fo:list-item-label end-indent="label-end()">
3436
- <fo:block>
3437
- <fo:inline>
3438
- <!-- <xsl:number format="1."/> -->
3439
- <xsl:value-of select="bipm:docidentifier[@type='metanorma-ordinal']"/>
3440
- <xsl:if test="not(bipm:docidentifier[@type='metanorma-ordinal'])">
3441
- <xsl:choose>
3442
- <xsl:when test="bipm:docidentifier[@type='metanorma']">
3443
- <xsl:value-of select="bipm:docidentifier[@type='metanorma']"/>
3444
- </xsl:when>
3445
- <xsl:otherwise>
3446
- <xsl:number format="[1]"/>
3447
- </xsl:otherwise>
3448
- </xsl:choose>
3449
- </xsl:if>
3450
- </fo:inline>
3451
- </fo:block>
3452
- </fo:list-item-label>
3453
- <fo:list-item-body start-indent="body-start()">
3454
- <fo:block>
3455
- <xsl:call-template name="processBibitem"/>
3456
- <!-- <xsl:apply-templates /> -->
3457
- </fo:block>
3458
- </fo:list-item-body>
3459
- </fo:list-item>
3460
- </fo:list-block>
3461
- </xsl:template>
3462
-
3463
3378
 
3464
- <xsl:template match="bipm:bibitem/bipm:title">
3465
- <fo:inline font-style="italic">
3466
- <xsl:apply-templates/>
3467
- </fo:inline>
3468
- </xsl:template>
3469
-
3470
3379
  <xsl:template match="bipm:references/bipm:bibitem/bipm:docidentifier[(@type='metanorma' or @type='metanorma-ordinal') and ../bipm:formattedref]"/>
3471
3380
 
3472
3381
 
@@ -3476,20 +3385,7 @@
3476
3385
  <fo:block break-after="page"/> -->
3477
3386
  </xsl:template>
3478
3387
 
3479
- <xsl:template match="bipm:admonition">
3480
- <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">
3481
- <fo:block-container margin-left="0mm" margin-right="0mm" padding="2mm" padding-top="3mm">
3482
- <fo:block font-size="11pt" margin-bottom="6pt" font-weight="bold" font-style="italic" text-align="center">
3483
- <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/>
3484
- </fo:block>
3485
- <fo:block font-style="italic">
3486
- <xsl:apply-templates/>
3487
- </fo:block>
3488
- </fo:block-container>
3489
- </fo:block-container>
3490
- </xsl:template>
3491
-
3492
-
3388
+
3493
3389
  <xsl:template match="bipm:xref" priority="2">
3494
3390
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">
3495
3391
 
@@ -3550,7 +3446,7 @@
3550
3446
  </fo:basic-link>
3551
3447
  </xsl:template>
3552
3448
 
3553
- <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2" mode="presentation">
3449
+ <xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
3554
3450
  <xsl:choose>
3555
3451
  <xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
3556
3452
  <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
@@ -4754,6 +4650,20 @@
4754
4650
  <xsl:attribute name="font-size">10.5pt</xsl:attribute>
4755
4651
 
4756
4652
 
4653
+
4654
+
4655
+
4656
+
4657
+
4658
+
4659
+
4660
+
4661
+
4662
+
4663
+
4664
+
4665
+
4666
+
4757
4667
  </xsl:attribute-set><xsl:attribute-set name="link-style">
4758
4668
 
4759
4669
 
@@ -4763,6 +4673,9 @@
4763
4673
 
4764
4674
 
4765
4675
 
4676
+ </xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
4677
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
4678
+
4766
4679
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
4767
4680
  <xsl:attribute name="white-space">pre</xsl:attribute>
4768
4681
  <xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -4772,10 +4685,17 @@
4772
4685
 
4773
4686
 
4774
4687
 
4688
+
4689
+
4690
+
4691
+
4692
+
4775
4693
 
4776
4694
 
4777
4695
 
4778
4696
 
4697
+
4698
+
4779
4699
  </xsl:attribute-set><xsl:attribute-set name="permission-style">
4780
4700
 
4781
4701
  </xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -4878,7 +4798,61 @@
4878
4798
 
4879
4799
  </xsl:attribute-set><xsl:variable name="table-border_">
4880
4800
 
4881
- </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
4801
+ </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
4802
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
4803
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
4804
+
4805
+
4806
+ <xsl:attribute name="space-after">12pt</xsl:attribute>
4807
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4808
+
4809
+
4810
+
4811
+
4812
+
4813
+
4814
+
4815
+
4816
+
4817
+
4818
+
4819
+
4820
+
4821
+
4822
+
4823
+
4824
+
4825
+
4826
+
4827
+
4828
+ </xsl:attribute-set><xsl:attribute-set name="table-style">
4829
+ <xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
4830
+ <xsl:attribute name="table-layout">fixed</xsl:attribute>
4831
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
4832
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
4833
+
4834
+
4835
+
4836
+
4837
+
4838
+
4839
+
4840
+
4841
+
4842
+
4843
+
4844
+
4845
+
4846
+
4847
+
4848
+
4849
+
4850
+
4851
+
4852
+
4853
+
4854
+
4855
+ </xsl:attribute-set><xsl:attribute-set name="table-name-style">
4882
4856
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
4883
4857
 
4884
4858
 
@@ -4901,7 +4875,168 @@
4901
4875
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
4902
4876
 
4903
4877
 
4878
+ </xsl:attribute-set><xsl:attribute-set name="table-row-style">
4879
+ <xsl:attribute name="min-height">4mm</xsl:attribute>
4880
+
4881
+
4882
+
4883
+
4884
+ </xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
4885
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
4886
+
4887
+
4888
+
4889
+
4890
+
4891
+
4892
+
4893
+
4894
+
4895
+ </xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
4896
+
4897
+
4898
+
4899
+ </xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
4900
+
4901
+ </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style">
4902
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
4903
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
4904
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
4905
+ <xsl:attribute name="display-align">center</xsl:attribute>
4906
+
4907
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
4908
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
4909
+ <xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
4910
+ <xsl:attribute name="height">8mm</xsl:attribute>
4911
+ <xsl:attribute name="padding-top">2mm</xsl:attribute>
4912
+
4913
+
4914
+
4915
+
4916
+
4917
+
4918
+
4919
+
4920
+
4921
+
4922
+
4923
+
4924
+
4925
+ </xsl:attribute-set><xsl:attribute-set name="table-cell-style">
4926
+ <xsl:attribute name="display-align">center</xsl:attribute>
4927
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
4928
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
4929
+
4930
+
4931
+ <xsl:attribute name="border">solid 0pt white</xsl:attribute>
4932
+
4933
+
4934
+
4935
+
4936
+
4937
+
4938
+
4939
+
4940
+
4941
+
4942
+
4943
+
4904
4944
  </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
4945
+ <xsl:attribute name="border">solid black 1pt</xsl:attribute>
4946
+ <xsl:attribute name="padding-left">1mm</xsl:attribute>
4947
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
4948
+ <xsl:attribute name="padding-top">1mm</xsl:attribute>
4949
+
4950
+
4951
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
4952
+
4953
+
4954
+
4955
+
4956
+
4957
+
4958
+
4959
+
4960
+
4961
+
4962
+ </xsl:attribute-set><xsl:attribute-set name="table-note-style">
4963
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
4964
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4965
+
4966
+ <xsl:attribute name="text-align">justify</xsl:attribute>
4967
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
4968
+
4969
+
4970
+
4971
+
4972
+
4973
+
4974
+
4975
+
4976
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
4977
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
4978
+
4979
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
4980
+ <xsl:attribute name="text-indent">-6.5mm</xsl:attribute>
4981
+ <xsl:attribute name="margin-left">6.5mm</xsl:attribute>
4982
+ <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
4983
+
4984
+
4985
+
4986
+
4987
+
4988
+
4989
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
4990
+ <xsl:attribute name="font-size">80%</xsl:attribute>
4991
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
4992
+
4993
+
4994
+
4995
+ <xsl:attribute name="font-style">italic</xsl:attribute>
4996
+ <xsl:attribute name="padding-right">2.5mm</xsl:attribute>
4997
+
4998
+
4999
+
5000
+
5001
+
5002
+
5003
+
5004
+
5005
+
5006
+
5007
+ </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
5008
+ <xsl:attribute name="text-indent">0</xsl:attribute>
5009
+ <xsl:attribute name="start-indent">0</xsl:attribute>
5010
+
5011
+
5012
+ </xsl:attribute-set><xsl:attribute-set name="table-fn-body-style">
5013
+
5014
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-number-style">
5015
+ <xsl:attribute name="font-size">80%</xsl:attribute>
5016
+ <xsl:attribute name="padding-right">5mm</xsl:attribute>
5017
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5018
+
5019
+ </xsl:attribute-set><xsl:attribute-set name="figure-fn-body-style">
5020
+ <xsl:attribute name="text-align">justify</xsl:attribute>
5021
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5022
+
5023
+ </xsl:attribute-set><xsl:attribute-set name="dt-row-style">
5024
+
5025
+
5026
+ </xsl:attribute-set><xsl:attribute-set name="dt-style">
5027
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
5028
+
5029
+
5030
+ <xsl:attribute name="margin-top">0pt</xsl:attribute>
5031
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5032
+
5033
+
5034
+
5035
+
5036
+
5037
+
5038
+
5039
+
4905
5040
 
4906
5041
  </xsl:attribute-set><xsl:attribute-set name="appendix-style">
4907
5042
 
@@ -4958,6 +5093,7 @@
4958
5093
 
4959
5094
 
4960
5095
  </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
5096
+ <xsl:attribute name="padding-right">2mm</xsl:attribute>
4961
5097
 
4962
5098
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4963
5099
 
@@ -5016,6 +5152,9 @@
5016
5152
 
5017
5153
 
5018
5154
 
5155
+ </xsl:attribute-set><xsl:attribute-set name="termsource-text-style">
5156
+
5157
+
5019
5158
  </xsl:attribute-set><xsl:attribute-set name="origin-style">
5020
5159
 
5021
5160
 
@@ -5023,8 +5162,9 @@
5023
5162
 
5024
5163
  </xsl:attribute-set><xsl:attribute-set name="term-style">
5025
5164
 
5026
- </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
5165
+ </xsl:attribute-set><xsl:attribute-set name="figure-style">
5027
5166
 
5167
+ </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
5028
5168
 
5029
5169
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
5030
5170
  <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5032,6 +5172,7 @@
5032
5172
  <xsl:attribute name="margin-left">19mm</xsl:attribute>
5033
5173
  <xsl:attribute name="text-indent">-19mm</xsl:attribute>
5034
5174
 
5175
+
5035
5176
 
5036
5177
 
5037
5178
 
@@ -5119,6 +5260,21 @@
5119
5260
 
5120
5261
  </xsl:attribute-set><xsl:attribute-set name="toc-style">
5121
5262
  <xsl:attribute name="line-height">135%</xsl:attribute>
5263
+ </xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
5264
+ <xsl:attribute name="font-size">80%</xsl:attribute>
5265
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5266
+
5267
+ <xsl:attribute name="font-size">70%</xsl:attribute>
5268
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5269
+ <xsl:attribute name="font-style">italic</xsl:attribute>
5270
+
5271
+
5272
+
5273
+
5274
+
5275
+
5276
+
5277
+
5122
5278
  </xsl:attribute-set><xsl:attribute-set name="fn-style">
5123
5279
  <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5124
5280
  </xsl:attribute-set><xsl:attribute-set name="fn-num-style">
@@ -5148,7 +5304,6 @@
5148
5304
  <xsl:attribute name="text-indent">0</xsl:attribute>
5149
5305
  <xsl:attribute name="start-indent">0</xsl:attribute>
5150
5306
 
5151
-
5152
5307
  <xsl:attribute name="font-size">9pt</xsl:attribute>
5153
5308
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5154
5309
  <xsl:attribute name="line-height">124%</xsl:attribute>
@@ -5170,6 +5325,7 @@
5170
5325
 
5171
5326
 
5172
5327
 
5328
+
5173
5329
  </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
5174
5330
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
5175
5331
 
@@ -5193,6 +5349,207 @@
5193
5349
 
5194
5350
 
5195
5351
 
5352
+ </xsl:attribute-set><xsl:attribute-set name="admonition-style">
5353
+
5354
+
5355
+
5356
+ <xsl:attribute name="border">0.25pt solid black</xsl:attribute>
5357
+ <xsl:attribute name="margin-left">16mm</xsl:attribute>
5358
+ <xsl:attribute name="margin-right">16mm</xsl:attribute>
5359
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5360
+
5361
+
5362
+
5363
+
5364
+
5365
+
5366
+
5367
+
5368
+
5369
+
5370
+
5371
+
5372
+ </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
5373
+
5374
+
5375
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
5376
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
5377
+ <xsl:attribute name="padding">2mm</xsl:attribute>
5378
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
5379
+
5380
+
5381
+
5382
+
5383
+
5384
+
5385
+
5386
+
5387
+
5388
+ </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
5389
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
5390
+
5391
+
5392
+ <xsl:attribute name="font-size">11pt</xsl:attribute>
5393
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
5394
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
5395
+ <xsl:attribute name="font-style">italic</xsl:attribute>
5396
+ <xsl:attribute name="text-align">center</xsl:attribute>
5397
+
5398
+
5399
+
5400
+
5401
+
5402
+
5403
+
5404
+
5405
+
5406
+
5407
+
5408
+
5409
+ </xsl:attribute-set><xsl:attribute-set name="admonition-p-style">
5410
+
5411
+
5412
+ <xsl:attribute name="font-style">italic</xsl:attribute>
5413
+
5414
+
5415
+
5416
+
5417
+
5418
+
5419
+
5420
+
5421
+
5422
+
5423
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
5424
+
5425
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5426
+ <xsl:attribute name="start-indent">25mm</xsl:attribute>
5427
+ <xsl:attribute name="text-indent">-25mm</xsl:attribute>
5428
+ <xsl:attribute name="line-height">115%</xsl:attribute>
5429
+
5430
+
5431
+
5432
+
5433
+
5434
+
5435
+
5436
+
5437
+
5438
+
5439
+
5440
+
5441
+
5442
+
5443
+
5444
+
5445
+
5446
+
5447
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-style">
5448
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
5449
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5450
+
5451
+ <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
5452
+
5453
+
5454
+
5455
+
5456
+
5457
+
5458
+
5459
+
5460
+
5461
+
5462
+
5463
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
5464
+
5465
+
5466
+
5467
+
5468
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-style">
5469
+ <xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
5470
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5471
+
5472
+ <xsl:attribute name="provisional-distance-between-starts">13mm</xsl:attribute>
5473
+
5474
+
5475
+
5476
+
5477
+
5478
+
5479
+
5480
+
5481
+
5482
+
5483
+
5484
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
5485
+
5486
+
5487
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
5488
+
5489
+
5490
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
5491
+ <xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
5492
+ <xsl:attribute name="font-size">65%</xsl:attribute>
5493
+
5494
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5495
+
5496
+
5497
+
5498
+
5499
+
5500
+
5501
+
5502
+
5503
+
5504
+
5505
+
5506
+
5507
+
5508
+
5509
+
5510
+
5511
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
5512
+ <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
5513
+
5514
+ <xsl:attribute name="font-size">60%</xsl:attribute>
5515
+ <xsl:attribute name="vertical-align">super</xsl:attribute>
5516
+
5517
+
5518
+
5519
+
5520
+
5521
+
5522
+
5523
+
5524
+
5525
+
5526
+
5527
+
5528
+
5529
+
5530
+
5531
+
5532
+ </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
5533
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
5534
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5535
+ <xsl:attribute name="start-indent">0pt</xsl:attribute>
5536
+
5537
+
5538
+
5539
+
5540
+
5541
+
5542
+
5543
+
5544
+
5545
+
5546
+
5547
+ </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
5548
+
5549
+ <xsl:attribute name="line-height">120%</xsl:attribute>
5550
+
5551
+
5552
+
5196
5553
  </xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
5197
5554
  <xsl:for-each select="/*/*[local-name()='preface']/*">
5198
5555
  <xsl:sort select="@displayorder" data-type="number"/>
@@ -5255,19 +5612,15 @@
5255
5612
  <xsl:call-template name="getSimpleTable"/>
5256
5613
  </xsl:variable>
5257
5614
 
5258
- <!-- <xsl:if test="$namespace = 'bipm'">
5259
- <fo:block>&#xA0;</fo:block>
5260
- </xsl:if> -->
5261
-
5262
5615
 
5263
5616
  <!-- Display table's name before table as standalone block -->
5264
5617
  <!-- $namespace = 'iso' or -->
5265
5618
 
5266
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
5619
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
5267
5620
 
5268
5621
 
5269
5622
 
5270
- <xsl:call-template name="fn_name_display"/>
5623
+ <xsl:call-template name="table_name_fn_display"/>
5271
5624
 
5272
5625
 
5273
5626
  <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
@@ -5283,7 +5636,7 @@
5283
5636
  <!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
5284
5637
 
5285
5638
 
5286
- <xsl:variable name="margin-left">
5639
+ <xsl:variable name="margin-side">
5287
5640
  <xsl:choose>
5288
5641
  <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
5289
5642
  <xsl:otherwise>0</xsl:otherwise>
@@ -5291,88 +5644,79 @@
5291
5644
  </xsl:variable>
5292
5645
 
5293
5646
 
5294
- <fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
5295
-
5296
-
5297
-
5298
-
5299
-
5300
-
5301
-
5302
-
5303
-
5304
-
5305
-
5306
-
5307
-
5308
-
5647
+ <fo:block-container xsl:use-attribute-sets="table-container-style">
5648
+
5309
5649
 
5650
+
5310
5651
 
5311
- <xsl:attribute name="space-after">12pt</xsl:attribute>
5312
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
5313
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
5314
5652
  <xsl:if test="not(ancestor::*[local-name()='note_side'])">
5315
5653
  <xsl:attribute name="font-size">10pt</xsl:attribute>
5316
5654
  </xsl:if>
5317
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
5318
5655
  <xsl:if test="@parent-type = 'quote'">
5319
5656
  <xsl:attribute name="font-family">Arial</xsl:attribute>
5320
5657
  <xsl:attribute name="font-size">9pt</xsl:attribute>
5321
5658
  </xsl:if>
5322
5659
 
5660
+
5323
5661
 
5662
+
5663
+
5664
+
5665
+
5666
+
5324
5667
 
5325
5668
 
5326
5669
 
5670
+
5671
+
5672
+ <!-- end table block-container attributes -->
5673
+
5327
5674
  <!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
5328
5675
 
5329
5676
 
5677
+ <xsl:variable name="table_width_default">100%</xsl:variable>
5330
5678
  <xsl:variable name="table_width">
5331
5679
  <!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
5332
5680
 
5333
-
5334
-
5335
- <xsl:choose>
5336
- <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
5337
- <xsl:otherwise>100%</xsl:otherwise>
5338
- </xsl:choose>
5339
-
5681
+ <xsl:choose>
5682
+ <xsl:when test="@width"><xsl:value-of select="@width"/></xsl:when>
5683
+ <xsl:otherwise><xsl:value-of select="$table_width_default"/></xsl:otherwise>
5684
+ </xsl:choose>
5685
+
5340
5686
  </xsl:variable>
5341
5687
 
5688
+
5342
5689
  <xsl:variable name="table_attributes">
5343
- <attribute name="table-layout">fixed</attribute>
5344
- <attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
5345
- <attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
5346
- <attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
5347
-
5348
-
5349
-
5350
-
5351
-
5352
-
5353
-
5354
-
5355
-
5356
-
5357
-
5358
-
5359
-
5360
- <xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol'])">
5361
- <attribute name="border-top">0.5pt solid black</attribute>
5362
- <attribute name="border-bottom">0.5pt solid black</attribute>
5363
- </xsl:if>
5364
- <attribute name="margin-left">0mm</attribute>
5365
- <attribute name="margin-right">0mm</attribute>
5366
- <!-- <attribute name="keep-together.within-column">1</attribute> --> <!-- integer value instead 'always'! -->
5367
-
5368
-
5690
+
5691
+ <xsl:element name="table_attributes" use-attribute-sets="table-style">
5692
+ <xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
5693
+
5694
+
5695
+
5696
+
5697
+ <xsl:if test="not(ancestor::*[local-name()='preface']) and not(ancestor::*[local-name()='note_side']) and not(ancestor::*[local-name() = 'annex'] and .//*[local-name() = 'xref'][@pagenumber]) and not(ancestor::*[local-name() = 'doccontrol'])">
5698
+ <xsl:attribute name="border-top">0.5pt solid black</xsl:attribute>
5699
+ <xsl:attribute name="border-bottom">0.5pt solid black</xsl:attribute>
5700
+ </xsl:if>
5701
+
5702
+
5703
+
5704
+
5705
+
5706
+
5707
+
5708
+
5709
+
5710
+
5711
+
5712
+ </xsl:element>
5369
5713
  </xsl:variable>
5370
5714
 
5371
5715
 
5372
- <fo:table id="{@id}" table-omit-footer-at-break="true">
5716
+ <fo:table id="{@id}">
5373
5717
 
5374
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
5375
- <xsl:attribute name="{@name}">
5718
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
5719
+ <xsl:attribute name="{local-name()}">
5376
5720
  <xsl:value-of select="."/>
5377
5721
  </xsl:attribute>
5378
5722
  </xsl:for-each>
@@ -5383,7 +5727,6 @@
5383
5727
  </xsl:if>
5384
5728
 
5385
5729
 
5386
-
5387
5730
  <xsl:choose>
5388
5731
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
5389
5732
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -5409,7 +5752,7 @@
5409
5752
  <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
5410
5753
  </xsl:when>
5411
5754
  <xsl:otherwise>
5412
- <xsl:apply-templates/>
5755
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
5413
5756
  </xsl:otherwise>
5414
5757
  </xsl:choose>
5415
5758
 
@@ -5481,11 +5824,11 @@
5481
5824
  </xsl:otherwise>
5482
5825
  </xsl:choose>
5483
5826
 
5484
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
5827
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
5485
5828
  <xsl:param name="continued"/>
5486
5829
  <xsl:if test="normalize-space() != ''">
5487
5830
  <fo:block xsl:use-attribute-sets="table-name-style">
5488
-
5831
+
5489
5832
 
5490
5833
  <xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
5491
5834
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
@@ -5597,7 +5940,6 @@
5597
5940
  </xsl:otherwise>
5598
5941
  </xsl:choose>
5599
5942
  </xsl:variable>
5600
-
5601
5943
 
5602
5944
  <column>
5603
5945
  <xsl:for-each select="xalan:nodeset($widths)//width">
@@ -5633,7 +5975,6 @@
5633
5975
  <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
5634
5976
  </xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
5635
5977
  <xsl:param name="cols-count"/>
5636
- <!-- font-weight="bold" -->
5637
5978
  <fo:table-header>
5638
5979
 
5639
5980
 
@@ -5645,7 +5986,7 @@
5645
5986
  <fo:table-row>
5646
5987
  <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
5647
5988
 
5648
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
5989
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
5649
5990
  <xsl:with-param name="continued">true</xsl:with-param>
5650
5991
  </xsl:apply-templates>
5651
5992
 
@@ -5691,17 +6032,18 @@
5691
6032
  </xsl:variable>
5692
6033
 
5693
6034
  <fo:table keep-with-previous="always">
5694
- <xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
6035
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
6036
+ <xsl:variable name="name" select="local-name()"/>
5695
6037
  <xsl:choose>
5696
- <xsl:when test="@name = 'border-top'">
5697
- <xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
6038
+ <xsl:when test="$name = 'border-top'">
6039
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
5698
6040
  </xsl:when>
5699
- <xsl:when test="@name = 'border'">
5700
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
6041
+ <xsl:when test="$name = 'border'">
6042
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
5701
6043
  <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
5702
6044
  </xsl:when>
5703
6045
  <xsl:otherwise>
5704
- <xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
6046
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
5705
6047
  </xsl:otherwise>
5706
6048
  </xsl:choose>
5707
6049
  </xsl:for-each>
@@ -5730,19 +6072,16 @@
5730
6072
 
5731
6073
  <fo:table-body>
5732
6074
  <fo:table-row>
5733
- <fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
6075
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
5734
6076
 
5735
6077
 
6078
+
5736
6079
 
5737
6080
 
5738
6081
  <!-- fn will be processed inside 'note' processing -->
5739
6082
 
5740
6083
 
5741
6084
 
5742
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
5743
-
5744
-
5745
-
5746
6085
  <xsl:if test="count(ancestor::bipm:table//*[local-name()='note']) &gt; 1">
5747
6086
  <fo:block font-weight="bold">
5748
6087
  <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
@@ -5756,7 +6095,6 @@
5756
6095
 
5757
6096
 
5758
6097
 
5759
-
5760
6098
  <!-- for BSI (not PAS) display Notes before footnotes -->
5761
6099
 
5762
6100
 
@@ -5770,7 +6108,7 @@
5770
6108
 
5771
6109
 
5772
6110
  <!-- fn processing -->
5773
- <xsl:call-template name="fn_display"/>
6111
+ <xsl:call-template name="table_fn_display"/>
5774
6112
 
5775
6113
  <!-- for PAS display Notes after footnotes -->
5776
6114
 
@@ -5807,129 +6145,107 @@
5807
6145
  <xsl:call-template name="insertTableFooter">
5808
6146
  <xsl:with-param name="cols-count" select="$cols-count"/>
5809
6147
  </xsl:call-template>
5810
-
5811
- <fo:table-body>
5812
-
5813
-
5814
- <xsl:apply-templates/>
5815
-
5816
- </fo:table-body>
5817
-
5818
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
5819
- <xsl:choose>
5820
- <xsl:when test="substring-after(., '—') != ''">
5821
- <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
5822
- </xsl:when>
5823
- <xsl:otherwise>
5824
- <xsl:value-of select="."/>
5825
- </xsl:otherwise>
5826
- </xsl:choose>
5827
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
5828
- <xsl:apply-templates mode="presentation_name"/>
5829
- </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
5830
- <xsl:apply-templates select="."/>
5831
- </xsl:template><xsl:template match="*[local-name()='tr']">
5832
- <xsl:variable name="parent-name" select="local-name(..)"/>
5833
-
5834
- <fo:table-row min-height="4mm">
5835
- <xsl:if test="$parent-name = 'thead'">
5836
- <xsl:attribute name="font-weight">bold</xsl:attribute>
5837
-
5838
-
5839
-
5840
-
5841
-
5842
-
5843
-
5844
-
5845
- </xsl:if>
5846
- <xsl:if test="$parent-name = 'tfoot'">
5847
-
5848
-
5849
-
5850
- </xsl:if>
5851
-
5852
-
5853
-
5854
-
5855
- <xsl:if test="count(*) = 1 and local-name(*[1]) = 'th'">
5856
- <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
5857
- </xsl:if>
5858
- <xsl:if test="not(ancestor::*[local-name()='note_side'])">
5859
- <xsl:attribute name="min-height">5mm</xsl:attribute>
5860
- </xsl:if>
5861
-
5862
-
5863
-
5864
-
5865
-
5866
-
5867
-
6148
+
6149
+ <fo:table-body>
6150
+
6151
+
5868
6152
  <xsl:apply-templates/>
5869
- </fo:table-row>
5870
- </xsl:template><xsl:template match="*[local-name()='th']">
5871
- <fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
5872
- <xsl:attribute name="text-align">
5873
- <xsl:choose>
5874
- <xsl:when test="@align">
5875
- <xsl:call-template name="setAlignment"/>
5876
- </xsl:when>
5877
- <xsl:otherwise>center</xsl:otherwise>
5878
- </xsl:choose>
5879
- </xsl:attribute>
5880
6153
 
6154
+ </fo:table-body>
6155
+
6156
+ </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
6157
+ <fo:table-row xsl:use-attribute-sets="table-header-row-style">
6158
+
5881
6159
 
5882
6160
 
5883
6161
 
6162
+
5884
6163
 
5885
6164
 
6165
+ <xsl:call-template name="setTableRowAttributes"/>
5886
6166
 
6167
+ <xsl:apply-templates/>
6168
+ </fo:table-row>
6169
+ </xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
6170
+ <fo:table-row xsl:use-attribute-sets="table-footer-row-style">
5887
6171
 
6172
+ <xsl:call-template name="setTableRowAttributes"/>
6173
+ <xsl:apply-templates/>
6174
+ </fo:table-row>
6175
+ </xsl:template><xsl:template match="*[local-name()='tr']">
6176
+ <fo:table-row xsl:use-attribute-sets="table-body-row-style">
6177
+
5888
6178
 
6179
+
5889
6180
 
6181
+
6182
+ <xsl:call-template name="setTableRowAttributes"/>
6183
+ <xsl:apply-templates/>
6184
+ </fo:table-row>
6185
+ </xsl:template><xsl:template name="setTableRowAttributes">
6186
+
6187
+
6188
+ <xsl:if test="count(*) = 1 and local-name(*[1]) = 'th'">
6189
+ <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
6190
+ </xsl:if>
6191
+ <xsl:if test="not(ancestor::*[local-name()='note_side'])">
6192
+ <xsl:attribute name="min-height">5mm</xsl:attribute>
6193
+ </xsl:if>
6194
+
6195
+
6196
+
6197
+
6198
+
6199
+
6200
+
6201
+ </xsl:template><xsl:template match="*[local-name()='th']">
6202
+ <fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" -->
6203
+ <xsl:call-template name="setTextAlignment">
6204
+ <xsl:with-param name="default">center</xsl:with-param>
6205
+ </xsl:call-template>
5890
6206
 
5891
6207
 
5892
- <xsl:attribute name="font-weight">normal</xsl:attribute>
5893
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
5894
- <!-- <xsl:attribute name="border-top">solid black 0.5pt</xsl:attribute> -->
5895
- <xsl:attribute name="border-bottom">solid black 0.5pt</xsl:attribute>
5896
- <xsl:attribute name="height">8mm</xsl:attribute>
5897
- <xsl:attribute name="padding-top">2mm</xsl:attribute>
5898
6208
  <xsl:if test="(ancestor::*[local-name() = 'annex'] and ancestor::*[local-name() = 'table']//*[local-name() = 'xref'][@pagenumber]) or ancestor::*[local-name() = 'doccontrol']"><!-- for Annex ToC -->
5899
6209
  <xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
5900
6210
  <xsl:attribute name="border-bottom">solid black 0pt</xsl:attribute>
5901
6211
  </xsl:if>
5902
6212
  <xsl:if test="ancestor::*[local-name() = 'doccontrol']">
5903
- <xsl:attribute name="text-align">
5904
- <xsl:choose>
5905
- <xsl:when test="@align">
5906
- <xsl:value-of select="@align"/>
5907
- </xsl:when>
5908
- <xsl:otherwise>left</xsl:otherwise>
5909
- </xsl:choose>
5910
- </xsl:attribute>
6213
+ <xsl:call-template name="setTextAlignment">
6214
+ <xsl:with-param name="default">left</xsl:with-param>
6215
+ </xsl:call-template>
5911
6216
  <xsl:attribute name="display-align">before</xsl:attribute>
5912
6217
  </xsl:if>
5913
6218
 
5914
6219
 
6220
+
6221
+
6222
+
6223
+
6224
+
6225
+
6226
+
5915
6227
  <xsl:if test="$lang = 'ar'">
5916
6228
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
5917
6229
  </xsl:if>
5918
- <xsl:if test="@colspan">
5919
- <xsl:attribute name="number-columns-spanned">
5920
- <xsl:value-of select="@colspan"/>
5921
- </xsl:attribute>
5922
- </xsl:if>
5923
- <xsl:if test="@rowspan">
5924
- <xsl:attribute name="number-rows-spanned">
5925
- <xsl:value-of select="@rowspan"/>
5926
- </xsl:attribute>
5927
- </xsl:if>
5928
- <xsl:call-template name="display-align"/>
6230
+
6231
+ <xsl:call-template name="setTableCellAttributes"/>
6232
+
5929
6233
  <fo:block>
5930
6234
  <xsl:apply-templates/>
5931
6235
  </fo:block>
5932
6236
  </fo:table-cell>
6237
+ </xsl:template><xsl:template name="setTableCellAttributes">
6238
+ <xsl:if test="@colspan">
6239
+ <xsl:attribute name="number-columns-spanned">
6240
+ <xsl:value-of select="@colspan"/>
6241
+ </xsl:attribute>
6242
+ </xsl:if>
6243
+ <xsl:if test="@rowspan">
6244
+ <xsl:attribute name="number-rows-spanned">
6245
+ <xsl:value-of select="@rowspan"/>
6246
+ </xsl:attribute>
6247
+ </xsl:if>
6248
+ <xsl:call-template name="display-align"/>
5933
6249
  </xsl:template><xsl:template name="display-align">
5934
6250
  <xsl:if test="@valign">
5935
6251
  <xsl:attribute name="display-align">
@@ -5942,22 +6258,29 @@
5942
6258
  </xsl:attribute>
5943
6259
  </xsl:if>
5944
6260
  </xsl:template><xsl:template match="*[local-name()='td']">
5945
- <fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
5946
- <xsl:attribute name="text-align">
5947
- <xsl:choose>
5948
- <xsl:when test="@align">
5949
- <xsl:call-template name="setAlignment"/>
5950
- </xsl:when>
5951
- <xsl:otherwise>left</xsl:otherwise>
5952
- </xsl:choose>
5953
- </xsl:attribute>
6261
+ <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
6262
+ <xsl:call-template name="setTextAlignment">
6263
+ <xsl:with-param name="default">left</xsl:with-param>
6264
+ </xsl:call-template>
6265
+
5954
6266
  <xsl:if test="$lang = 'ar'">
5955
6267
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
5956
6268
  </xsl:if>
5957
6269
 
5958
6270
 
6271
+ <xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
6272
+ <xsl:if test="$rownum = 1">
6273
+ <xsl:attribute name="padding-top">3mm</xsl:attribute>
6274
+ </xsl:if>
6275
+ <xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
6276
+ <xsl:attribute name="padding-bottom">2mm</xsl:attribute>
6277
+ </xsl:if>
6278
+ <xsl:if test="ancestor::*[local-name() = 'doccontrol']">
6279
+ <xsl:attribute name="display-align">before</xsl:attribute>
6280
+ </xsl:if>
5959
6281
 
5960
6282
 
6283
+ <!-- bsi -->
5961
6284
 
5962
6285
 
5963
6286
 
@@ -5966,37 +6289,21 @@
5966
6289
 
5967
6290
 
5968
6291
 
6292
+
5969
6293
 
5970
- <xsl:attribute name="border">solid 0pt white</xsl:attribute>
5971
- <xsl:variable name="rownum"><xsl:number count="*[local-name()='tr']"/></xsl:variable>
5972
- <xsl:if test="$rownum = 1">
5973
- <xsl:attribute name="padding-top">3mm</xsl:attribute>
5974
- </xsl:if>
5975
- <xsl:if test="not(ancestor::*[local-name()='tr']/following-sibling::*[local-name()='tr'])"> <!-- last row -->
5976
- <xsl:attribute name="padding-bottom">2mm</xsl:attribute>
5977
- </xsl:if>
5978
- <xsl:if test="ancestor::*[local-name() = 'doccontrol']">
5979
- <xsl:attribute name="display-align">before</xsl:attribute>
5980
- </xsl:if>
5981
6294
 
5982
6295
 
5983
6296
 
5984
6297
 
5985
- <xsl:if test=".//*[local-name() = 'table']">
6298
+
6299
+ <xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
5986
6300
  <xsl:attribute name="padding-right">1mm</xsl:attribute>
5987
6301
  </xsl:if>
5988
- <xsl:if test="@colspan">
5989
- <xsl:attribute name="number-columns-spanned">
5990
- <xsl:value-of select="@colspan"/>
5991
- </xsl:attribute>
5992
- </xsl:if>
5993
- <xsl:if test="@rowspan">
5994
- <xsl:attribute name="number-rows-spanned">
5995
- <xsl:value-of select="@rowspan"/>
5996
- </xsl:attribute>
5997
- </xsl:if>
5998
- <xsl:call-template name="display-align"/>
6302
+
6303
+ <xsl:call-template name="setTableCellAttributes"/>
6304
+
5999
6305
  <fo:block>
6306
+
6000
6307
 
6001
6308
  <xsl:if test="not(.//bipm:image)">
6002
6309
  <xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
@@ -6006,53 +6313,49 @@
6006
6313
  <xsl:attribute name="text-indent">-3mm</xsl:attribute>
6007
6314
  <xsl:attribute name="start-indent">3mm</xsl:attribute>
6008
6315
  </xsl:if>
6009
-
6316
+
6317
+
6010
6318
  <xsl:apply-templates/>
6011
6319
  </fo:block>
6012
6320
  </fo:table-cell>
6013
6321
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
6322
+
6323
+ <fo:block xsl:use-attribute-sets="table-note-style">
6324
+
6325
+
6326
+ <xsl:if test="ancestor::bipm:preface">
6327
+ <xsl:attribute name="margin-top">18pt</xsl:attribute>
6328
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
6329
+ </xsl:if>
6330
+
6331
+
6332
+
6014
6333
 
6015
-
6016
- <fo:block font-size="10pt" margin-bottom="12pt">
6334
+ <!-- Table's note name (NOTE, for example) -->
6335
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
6017
6336
 
6018
6337
 
6019
-
6020
-
6021
-
6022
-
6023
- <xsl:attribute name="text-align">justify</xsl:attribute>
6024
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
6025
6338
  <xsl:if test="ancestor::bipm:preface">
6026
- <xsl:attribute name="margin-top">18pt</xsl:attribute>
6027
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
6339
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
6028
6340
  </xsl:if>
6029
6341
 
6030
6342
 
6031
6343
 
6032
- <!-- Table's note name (NOTE, for example) -->
6033
-
6034
- <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
6035
-
6036
-
6037
-
6038
-
6039
- <xsl:if test="ancestor::bipm:preface">
6040
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
6041
- </xsl:if>
6042
-
6043
-
6044
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6045
-
6046
- </fo:inline>
6047
6344
 
6048
6345
 
6049
- <xsl:if test="ancestor::bipm:preface">
6050
- <fo:block> </fo:block>
6051
- </xsl:if>
6052
-
6053
6346
 
6054
- <xsl:apply-templates mode="process"/>
6055
- </fo:block>
6347
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
6348
+
6349
+ </fo:inline>
6350
+
6351
+
6352
+ <xsl:if test="ancestor::bipm:preface">
6353
+ <fo:block> </fo:block>
6354
+ </xsl:if>
6355
+
6356
+
6357
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]" mode="process"/>
6358
+ </fo:block>
6056
6359
 
6057
6360
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
6058
6361
  <xsl:apply-templates/>
@@ -6132,8 +6435,7 @@
6132
6435
  <xsl:copy-of select="$footnote_inline"/>
6133
6436
  <fo:footnote-body>
6134
6437
 
6135
- <fo:block-container text-indent="0" start-indent="0">
6136
-
6438
+ <fo:block-container xsl:use-attribute-sets="fn-container-body-style">
6137
6439
 
6138
6440
  <fo:block xsl:use-attribute-sets="fn-body-style">
6139
6441
 
@@ -6152,7 +6454,7 @@
6152
6454
  <xsl:copy-of select="$footnote_inline"/>
6153
6455
  </xsl:otherwise>
6154
6456
  </xsl:choose>
6155
- </xsl:template><xsl:template name="fn_display">
6457
+ </xsl:template><xsl:template name="table_fn_display">
6156
6458
  <xsl:variable name="references">
6157
6459
 
6158
6460
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
@@ -6163,42 +6465,30 @@
6163
6465
  <xsl:for-each select="xalan:nodeset($references)//fn">
6164
6466
  <xsl:variable name="reference" select="@reference"/>
6165
6467
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
6166
- <fo:block margin-bottom="12pt">
6468
+ <fo:block xsl:use-attribute-sets="table-fn-style">
6167
6469
 
6168
6470
 
6169
6471
 
6170
-
6171
-
6172
-
6173
-
6174
- <xsl:attribute name="font-size">9pt</xsl:attribute>
6175
- <xsl:attribute name="text-indent">-6.5mm</xsl:attribute>
6176
- <xsl:attribute name="margin-left">6.5mm</xsl:attribute>
6177
- <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
6178
-
6179
- <fo:inline font-size="80%" padding-right="5mm" id="{@id}">
6472
+ <fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
6473
+
6180
6474
 
6181
6475
 
6182
6476
 
6477
+ <fo:inline font-style="normal">(</fo:inline>
6183
6478
 
6184
6479
 
6480
+ <xsl:value-of select="@reference"/>
6185
6481
 
6186
6482
 
6483
+ <fo:inline font-style="normal">)</fo:inline>
6187
6484
 
6188
- <xsl:attribute name="font-style">italic</xsl:attribute>
6189
-
6190
- <xsl:attribute name="padding-right">2.5mm</xsl:attribute>
6191
- <fo:inline font-style="normal">(</fo:inline>
6192
6485
 
6193
- <xsl:value-of select="@reference"/>
6194
6486
 
6195
- <fo:inline font-style="normal">)</fo:inline>
6196
6487
 
6197
6488
 
6198
6489
 
6199
6490
  </fo:inline>
6200
- <fo:inline>
6201
-
6491
+ <fo:inline xsl:use-attribute-sets="table-fn-body-style">
6202
6492
  <xsl:copy-of select="./node()"/>
6203
6493
  </fo:inline>
6204
6494
  </fo:block>
@@ -6210,7 +6500,7 @@
6210
6500
 
6211
6501
  <xsl:apply-templates/>
6212
6502
  </fn>
6213
- </xsl:template><xsl:template name="fn_name_display">
6503
+ </xsl:template><xsl:template name="table_name_fn_display">
6214
6504
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
6215
6505
  <xsl:variable name="reference" select="@reference"/>
6216
6506
  <fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
@@ -6219,9 +6509,7 @@
6219
6509
  </fo:block>
6220
6510
  </xsl:for-each>
6221
6511
  </xsl:template><xsl:template name="fn_display_figure">
6222
- <xsl:variable name="key_iso">
6223
- <!-- and (not(@class) or @class !='pseudocode') -->
6224
- </xsl:variable>
6512
+
6225
6513
  <xsl:variable name="references">
6226
6514
  <xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
6227
6515
  <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -6229,48 +6517,52 @@
6229
6517
  </fn>
6230
6518
  </xsl:for-each>
6231
6519
  </xsl:variable>
6520
+
6521
+ <xsl:if test="xalan:nodeset($references)//fn">
6232
6522
 
6233
- <!-- current hierarchy is 'figure' element -->
6234
- <xsl:variable name="following_dl_colwidths">
6235
- <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
6236
- <xsl:variable name="html-table">
6237
- <xsl:variable name="doc_ns">
6238
- bipm
6239
- </xsl:variable>
6240
- <xsl:variable name="ns">
6241
- <xsl:choose>
6242
- <xsl:when test="normalize-space($doc_ns) != ''">
6243
- <xsl:value-of select="normalize-space($doc_ns)"/>
6244
- </xsl:when>
6245
- <xsl:otherwise>
6246
- <xsl:value-of select="substring-before(name(/*), '-')"/>
6247
- </xsl:otherwise>
6248
- </xsl:choose>
6523
+ <xsl:variable name="key_iso">
6524
+
6525
+ </xsl:variable>
6526
+
6527
+ <!-- current hierarchy is 'figure' element -->
6528
+ <xsl:variable name="following_dl_colwidths">
6529
+ <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
6530
+ <xsl:variable name="html-table">
6531
+ <xsl:variable name="doc_ns">
6532
+ bipm
6533
+ </xsl:variable>
6534
+ <xsl:variable name="ns">
6535
+ <xsl:choose>
6536
+ <xsl:when test="normalize-space($doc_ns) != ''">
6537
+ <xsl:value-of select="normalize-space($doc_ns)"/>
6538
+ </xsl:when>
6539
+ <xsl:otherwise>
6540
+ <xsl:value-of select="substring-before(name(/*), '-')"/>
6541
+ </xsl:otherwise>
6542
+ </xsl:choose>
6543
+ </xsl:variable>
6544
+
6545
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
6546
+ <tbody>
6547
+ <xsl:apply-templates mode="dl"/>
6548
+ </tbody>
6549
+ </xsl:for-each>
6249
6550
  </xsl:variable>
6250
6551
 
6251
- <xsl:for-each select="*[local-name() = 'dl'][1]">
6252
- <tbody>
6253
- <xsl:apply-templates mode="dl"/>
6254
- </tbody>
6255
- </xsl:for-each>
6256
- </xsl:variable>
6257
-
6258
- <xsl:call-template name="calculate-column-widths">
6259
- <xsl:with-param name="cols-count" select="2"/>
6260
- <xsl:with-param name="table" select="$html-table"/>
6261
- </xsl:call-template>
6262
-
6263
- </xsl:if>
6264
- </xsl:variable>
6265
-
6266
-
6267
- <xsl:variable name="maxlength_dt">
6268
- <xsl:for-each select="*[local-name() = 'dl'][1]">
6269
- <xsl:call-template name="getMaxLength_dt"/>
6270
- </xsl:for-each>
6271
- </xsl:variable>
6272
-
6273
- <xsl:if test="xalan:nodeset($references)//fn">
6552
+ <xsl:call-template name="calculate-column-widths">
6553
+ <xsl:with-param name="cols-count" select="2"/>
6554
+ <xsl:with-param name="table" select="$html-table"/>
6555
+ </xsl:call-template>
6556
+
6557
+ </xsl:if>
6558
+ </xsl:variable>
6559
+
6560
+ <xsl:variable name="maxlength_dt">
6561
+ <xsl:for-each select="*[local-name() = 'dl'][1]">
6562
+ <xsl:call-template name="getMaxLength_dt"/>
6563
+ </xsl:for-each>
6564
+ </xsl:variable>
6565
+
6274
6566
  <fo:block>
6275
6567
  <fo:table width="95%" table-layout="fixed">
6276
6568
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -6297,20 +6589,18 @@
6297
6589
  <fo:table-row>
6298
6590
  <fo:table-cell>
6299
6591
  <fo:block>
6300
- <fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}">
6301
-
6592
+ <fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
6302
6593
  <xsl:value-of select="@reference"/>
6303
6594
  </fo:inline>
6304
6595
  </fo:block>
6305
6596
  </fo:table-cell>
6306
6597
  <fo:table-cell>
6307
- <fo:block text-align="justify" margin-bottom="12pt">
6308
-
6598
+ <fo:block xsl:use-attribute-sets="figure-fn-body-style">
6309
6599
  <xsl:if test="normalize-space($key_iso) = 'true'">
6310
- <xsl:attribute name="margin-bottom">0</xsl:attribute>
6600
+
6601
+ <xsl:attribute name="margin-bottom">0</xsl:attribute>
6602
+
6311
6603
  </xsl:if>
6312
-
6313
- <!-- <xsl:apply-templates /> -->
6314
6604
  <xsl:copy-of select="./node()"/>
6315
6605
  </fo:block>
6316
6606
  </fo:table-cell>
@@ -6323,19 +6613,10 @@
6323
6613
  </xsl:if>
6324
6614
 
6325
6615
  </xsl:template><xsl:template match="*[local-name()='fn']">
6326
- <fo:inline font-size="80%" keep-with-previous.within-line="always">
6327
-
6328
-
6329
-
6330
-
6331
-
6332
-
6333
-
6616
+ <fo:inline xsl:use-attribute-sets="fn-reference-style">
6617
+
6334
6618
 
6335
6619
 
6336
- <xsl:attribute name="font-size">70%</xsl:attribute>
6337
- <xsl:attribute name="vertical-align">super</xsl:attribute>
6338
- <xsl:attribute name="font-style">italic</xsl:attribute>
6339
6620
 
6340
6621
 
6341
6622
  <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference | ancestor::*[local-name()='clause'][1]/@id-->
@@ -6384,10 +6665,9 @@
6384
6665
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
6385
6666
  </xsl:call-template>
6386
6667
 
6387
- <fo:block-container>
6668
+ <fo:block-container margin-left="0mm">
6669
+
6388
6670
 
6389
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6390
-
6391
6671
 
6392
6672
  <xsl:variable name="parent" select="local-name(..)"/>
6393
6673
 
@@ -6599,12 +6879,12 @@
6599
6879
  <xsl:if test="normalize-space($key_iso) = 'true'">
6600
6880
  <xsl:attribute name="margin-top">0</xsl:attribute>
6601
6881
  </xsl:if>
6602
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
6882
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
6603
6883
  </fo:block>
6604
6884
  </fo:table-cell>
6605
6885
  <fo:table-cell>
6606
6886
  <fo:block>
6607
- <xsl:apply-templates/>
6887
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6608
6888
  </fo:block>
6609
6889
  </fo:table-cell>
6610
6890
  </fo:table-row>
@@ -6623,29 +6903,18 @@
6623
6903
  </xsl:template><xsl:template match="*[local-name()='dt']">
6624
6904
  <xsl:param name="key_iso"/>
6625
6905
 
6626
- <fo:table-row>
6627
-
6628
-
6906
+ <fo:table-row xsl:use-attribute-sets="dt-row-style">
6629
6907
  <fo:table-cell>
6630
6908
 
6631
- <fo:block margin-top="6pt">
6909
+ <fo:block xsl:use-attribute-sets="dt-style">
6632
6910
  <xsl:copy-of select="@id"/>
6633
6911
 
6634
-
6635
6912
  <xsl:if test="normalize-space($key_iso) = 'true'">
6636
6913
  <xsl:attribute name="margin-top">0</xsl:attribute>
6637
-
6638
6914
  </xsl:if>
6639
6915
 
6640
6916
 
6641
6917
 
6642
-
6643
-
6644
-
6645
- <xsl:attribute name="margin-top">0pt</xsl:attribute>
6646
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
6647
-
6648
-
6649
6918
  <xsl:apply-templates/>
6650
6919
  </fo:block>
6651
6920
  </fo:table-cell>
@@ -6685,6 +6954,7 @@
6685
6954
  </fo:inline>
6686
6955
  </xsl:template><xsl:template match="*[local-name()='tt']">
6687
6956
  <fo:inline xsl:use-attribute-sets="tt-style">
6957
+
6688
6958
  <xsl:variable name="_font-size">
6689
6959
 
6690
6960
 
@@ -6721,15 +6991,21 @@
6721
6991
  <xsl:apply-templates/>
6722
6992
  </fo:inline>
6723
6993
  </xsl:template><xsl:template match="*[local-name()='add']">
6994
+ <xsl:param name="skip">true</xsl:param>
6724
6995
  <xsl:choose>
6725
6996
  <xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
6726
- <fo:inline>
6727
- <xsl:call-template name="insertTag">
6728
- <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
6729
- <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
6730
- <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
6731
- </xsl:call-template>
6732
- </fo:inline>
6997
+ <xsl:choose>
6998
+ <xsl:when test="$skip = 'true' and ((local-name(../..) = 'note' and not(preceding-sibling::node())) or (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab'])) and ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
6999
+ <xsl:otherwise>
7000
+ <fo:inline>
7001
+ <xsl:call-template name="insertTag">
7002
+ <xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
7003
+ <xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
7004
+ <xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
7005
+ </xsl:call-template>
7006
+ </fo:inline>
7007
+ </xsl:otherwise>
7008
+ </xsl:choose>
6733
7009
  </xsl:when>
6734
7010
  <xsl:when test="@amendment">
6735
7011
  <fo:inline>
@@ -7151,6 +7427,7 @@
7151
7427
  <xsl:apply-templates select="." mode="mathml"/>
7152
7428
  </xsl:variable>
7153
7429
  <fo:instream-foreign-object fox:alt-text="Math">
7430
+
7154
7431
 
7155
7432
  <xsl:if test="local-name(../..) = 'formula'">
7156
7433
  <xsl:attribute name="width">95%</xsl:attribute>
@@ -7200,6 +7477,7 @@
7200
7477
  </xsl:attribute>
7201
7478
 
7202
7479
 
7480
+
7203
7481
  <xsl:copy-of select="xalan:nodeset($mathml)"/>
7204
7482
  </fo:instream-foreign-object>
7205
7483
  </fo:inline>
@@ -7258,6 +7536,10 @@
7258
7536
 
7259
7537
 
7260
7538
 
7539
+
7540
+
7541
+
7542
+
7261
7543
  <xsl:choose>
7262
7544
  <xsl:when test="$target_text = ''">
7263
7545
  <xsl:apply-templates/>
@@ -7315,7 +7597,6 @@
7315
7597
  </fo:inline>
7316
7598
  </xsl:template><xsl:template match="*[local-name() = 'xref']">
7317
7599
  <fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
7318
-
7319
7600
  <xsl:apply-templates/>
7320
7601
  </fo:basic-link>
7321
7602
  </xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -7343,23 +7624,29 @@
7343
7624
  <fo:inline>
7344
7625
  <xsl:apply-templates/>
7345
7626
  </fo:inline>
7346
- </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation">
7627
+ </xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
7347
7628
  <xsl:if test="normalize-space() != ''">
7348
7629
  <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
7349
7630
  </xsl:if>
7350
- </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
7351
-
7352
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
7353
-
7354
-
7355
-
7356
-
7631
+ </xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
7632
+
7633
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
7634
+
7357
7635
 
7358
7636
  <xsl:if test="parent::*[local-name() = 'li']">
7359
7637
  <xsl:attribute name="margin-top">4pt</xsl:attribute>
7360
7638
  <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
7361
7639
  </xsl:if>
7362
7640
 
7641
+
7642
+
7643
+
7644
+
7645
+
7646
+
7647
+
7648
+
7649
+
7363
7650
  <fo:block-container margin-left="0mm">
7364
7651
 
7365
7652
 
@@ -7370,8 +7657,6 @@
7370
7657
  <fo:block>
7371
7658
 
7372
7659
 
7373
-
7374
-
7375
7660
  <xsl:if test="@parent-type = 'quote'">
7376
7661
  <xsl:attribute name="font-family">Arial</xsl:attribute>
7377
7662
  <xsl:attribute name="font-size">9pt</xsl:attribute>
@@ -7379,13 +7664,27 @@
7379
7664
  <xsl:attribute name="text-align">justify</xsl:attribute>
7380
7665
  </xsl:if>
7381
7666
 
7667
+
7668
+
7669
+
7382
7670
 
7383
7671
 
7384
7672
  <fo:inline xsl:use-attribute-sets="note-name-style">
7673
+
7674
+
7675
+
7676
+ <!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
7677
+ <xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7678
+ <xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
7679
+ <xsl:with-param name="skip">false</xsl:with-param>
7680
+ </xsl:apply-templates>
7681
+ </xsl:if>
7682
+
7683
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7385
7684
 
7386
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
7387
7685
  </fo:inline>
7388
- <xsl:apply-templates/>
7686
+
7687
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7389
7688
  </fo:block>
7390
7689
 
7391
7690
  </fo:block-container>
@@ -7394,7 +7693,7 @@
7394
7693
  </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
7395
7694
  <xsl:variable name="num"><xsl:number/></xsl:variable>
7396
7695
  <xsl:choose>
7397
- <xsl:when test="$num = 1">
7696
+ <xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
7398
7697
  <fo:inline xsl:use-attribute-sets="note-p-style">
7399
7698
  <xsl:apply-templates/>
7400
7699
  </fo:inline>
@@ -7409,12 +7708,16 @@
7409
7708
  <fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
7410
7709
 
7411
7710
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
7711
+
7712
+
7713
+
7714
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7412
7715
 
7413
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
7414
7716
  </fo:inline>
7415
- <xsl:apply-templates/>
7717
+
7718
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7416
7719
  </fo:block>
7417
- </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] | *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation">
7720
+ </xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']">
7418
7721
  <xsl:param name="sfx"/>
7419
7722
  <xsl:variable name="suffix">
7420
7723
  <xsl:choose>
@@ -7433,7 +7736,7 @@
7433
7736
  <xsl:apply-templates/>
7434
7737
  <xsl:value-of select="$suffix"/>
7435
7738
  </xsl:if>
7436
- </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
7739
+ </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']">
7437
7740
  <xsl:param name="sfx"/>
7438
7741
  <xsl:variable name="suffix">
7439
7742
  <xsl:choose>
@@ -7463,12 +7766,14 @@
7463
7766
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
7464
7767
 
7465
7768
 
7769
+
7770
+
7466
7771
  <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
7467
7772
 
7468
7773
  </xsl:if>
7469
- <xsl:apply-templates/>
7774
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7470
7775
  </fo:block>
7471
- </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
7776
+ </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
7472
7777
  <xsl:if test="normalize-space() != ''">
7473
7778
  <xsl:variable name="level">
7474
7779
  <xsl:call-template name="getLevelTermName"/>
@@ -7491,9 +7796,10 @@
7491
7796
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
7492
7797
  </xsl:call-template>
7493
7798
 
7494
- <fo:block>
7495
-
7496
- <xsl:apply-templates/>
7799
+
7800
+
7801
+ <fo:block xsl:use-attribute-sets="figure-style">
7802
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7497
7803
  </fo:block>
7498
7804
  <xsl:call-template name="fn_display_figure"/>
7499
7805
  <xsl:for-each select="*[local-name() = 'note']">
@@ -7501,15 +7807,15 @@
7501
7807
  </xsl:for-each>
7502
7808
 
7503
7809
 
7504
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
7810
+ <xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
7505
7811
 
7506
7812
 
7507
7813
  </fo:block-container>
7508
7814
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
7509
7815
  <fo:block id="{@id}">
7510
- <xsl:apply-templates/>
7816
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
7511
7817
  </fo:block>
7512
- <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
7818
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
7513
7819
  </xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
7514
7820
  <fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
7515
7821
  <xsl:apply-templates/>
@@ -7886,7 +8192,7 @@
7886
8192
  </fo:basic-link>
7887
8193
  </fo:block>
7888
8194
  </fo:block-container>
7889
- </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
8195
+ </xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
7890
8196
  <xsl:apply-templates mode="contents"/>
7891
8197
  <xsl:text> </xsl:text>
7892
8198
  </xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
@@ -8123,7 +8429,7 @@
8123
8429
  <xsl:apply-templates mode="bookmark"/>
8124
8430
  </xsl:otherwise>
8125
8431
  </xsl:choose>
8126
- </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
8432
+ </xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'image']/*[local-name() = 'name']">
8127
8433
  <xsl:if test="normalize-space() != ''">
8128
8434
  <fo:block xsl:use-attribute-sets="figure-name-style">
8129
8435
 
@@ -8207,16 +8513,21 @@
8207
8513
  <xsl:apply-templates mode="contents_item">
8208
8514
  <xsl:with-param name="mode" select="$mode"/>
8209
8515
  </xsl:apply-templates>
8210
- </xsl:template><xsl:template match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item">
8516
+ </xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
8211
8517
  <xsl:param name="mode">bookmarks</xsl:param>
8212
- <xsl:if test="$mode = 'contents'">
8213
- <xsl:copy>
8214
- <xsl:apply-templates mode="contents_item"/>
8215
- </xsl:copy>
8216
- </xsl:if>
8518
+ <xsl:choose>
8519
+ <xsl:when test="starts-with(text(), $ace_tag)">
8520
+ <xsl:if test="$mode = 'contents'">
8521
+ <xsl:copy>
8522
+ <xsl:apply-templates mode="contents_item"/>
8523
+ </xsl:copy>
8524
+ </xsl:if>
8525
+ </xsl:when>
8526
+ <xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
8527
+ </xsl:choose>
8217
8528
  </xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
8218
8529
 
8219
- <fo:block-container margin-left="0mm">
8530
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
8220
8531
  <xsl:copy-of select="@id"/>
8221
8532
 
8222
8533
  <xsl:if test="parent::*[local-name() = 'note']">
@@ -8253,6 +8564,7 @@
8253
8564
 
8254
8565
 
8255
8566
  </xsl:variable>
8567
+
8256
8568
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
8257
8569
  <xsl:if test="$font-size != ''">
8258
8570
  <xsl:attribute name="font-size">
@@ -8269,11 +8581,11 @@
8269
8581
 
8270
8582
 
8271
8583
 
8272
- <xsl:apply-templates/>
8584
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8273
8585
  </fo:block>
8274
8586
 
8275
8587
 
8276
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
8588
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
8277
8589
 
8278
8590
 
8279
8591
 
@@ -8287,7 +8599,7 @@
8287
8599
  <xsl:call-template name="add-zero-spaces-java">
8288
8600
  <xsl:with-param name="text" select="$text"/>
8289
8601
  </xsl:call-template>
8290
- </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
8602
+ </xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
8291
8603
  <xsl:if test="normalize-space() != ''">
8292
8604
  <fo:block xsl:use-attribute-sets="sourcecode-name-style">
8293
8605
  <xsl:apply-templates/>
@@ -8295,10 +8607,10 @@
8295
8607
  </xsl:if>
8296
8608
  </xsl:template><xsl:template match="*[local-name() = 'permission']">
8297
8609
  <fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
8298
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
8299
- <xsl:apply-templates/>
8610
+ <xsl:apply-templates select="*[local-name()='name']"/>
8611
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8300
8612
  </fo:block>
8301
- </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
8613
+ </xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
8302
8614
  <xsl:if test="normalize-space() != ''">
8303
8615
  <fo:block xsl:use-attribute-sets="permission-name-style">
8304
8616
  <xsl:apply-templates/>
@@ -8311,13 +8623,13 @@
8311
8623
  </fo:block>
8312
8624
  </xsl:template><xsl:template match="*[local-name() = 'requirement']">
8313
8625
  <fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
8314
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
8315
- <xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
8316
- <xsl:apply-templates select="@obligation" mode="presentation"/>
8317
- <xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
8318
- <xsl:apply-templates/>
8626
+ <xsl:apply-templates select="*[local-name()='name']"/>
8627
+ <xsl:apply-templates select="*[local-name()='label']"/>
8628
+ <xsl:apply-templates select="@obligation"/>
8629
+ <xsl:apply-templates select="*[local-name()='subject']"/>
8630
+ <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
8319
8631
  </fo:block>
8320
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
8632
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
8321
8633
  <xsl:if test="normalize-space() != ''">
8322
8634
  <fo:block xsl:use-attribute-sets="requirement-name-style">
8323
8635
 
@@ -8325,20 +8637,24 @@
8325
8637
 
8326
8638
  </fo:block>
8327
8639
  </xsl:if>
8328
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
8640
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
8329
8641
  <fo:block xsl:use-attribute-sets="requirement-label-style">
8330
8642
  <xsl:apply-templates/>
8331
8643
  </fo:block>
8332
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
8644
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation">
8333
8645
  <fo:block>
8334
8646
  <fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
8335
8647
  </fo:block>
8648
+ </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2">
8649
+ <fo:block xsl:use-attribute-sets="subject-style">
8650
+ <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
8651
+ </fo:block>
8336
8652
  </xsl:template><xsl:template match="*[local-name() = 'recommendation']">
8337
8653
  <fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
8338
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
8339
- <xsl:apply-templates/>
8654
+ <xsl:apply-templates select="*[local-name()='name']"/>
8655
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8340
8656
  </fo:block>
8341
- </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
8657
+ </xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
8342
8658
  <xsl:if test="normalize-space() != ''">
8343
8659
  <fo:block xsl:use-attribute-sets="recommendation-name-style">
8344
8660
  <xsl:apply-templates/>
@@ -8349,10 +8665,6 @@
8349
8665
  <fo:block xsl:use-attribute-sets="recommendation-label-style">
8350
8666
  <xsl:apply-templates/>
8351
8667
  </fo:block>
8352
- </xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
8353
- <fo:block xsl:use-attribute-sets="subject-style">
8354
- <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
8355
- </fo:block>
8356
8668
  </xsl:template><xsl:template match="*[local-name() = 'subject']">
8357
8669
  <fo:block xsl:use-attribute-sets="subject-style">
8358
8670
  <xsl:text>Target Type </xsl:text><xsl:apply-templates/>
@@ -8405,7 +8717,7 @@
8405
8717
  <xsl:if test=".//*[local-name() = 'fn']">
8406
8718
  <xsl:for-each select="*[local-name() = 'tbody']">
8407
8719
  <fo:block font-size="90%" border-bottom="1pt solid black">
8408
- <xsl:call-template name="fn_display"/>
8720
+ <xsl:call-template name="table_fn_display"/>
8409
8721
  </fo:block>
8410
8722
  </xsl:for-each>
8411
8723
  </xsl:if>
@@ -8434,25 +8746,11 @@
8434
8746
  </fo:table-row>
8435
8747
  </xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
8436
8748
  <fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
8437
- <xsl:attribute name="text-align">
8438
- <xsl:choose>
8439
- <xsl:when test="@align">
8440
- <xsl:value-of select="@align"/>
8441
- </xsl:when>
8442
- <xsl:otherwise>left</xsl:otherwise>
8443
- </xsl:choose>
8444
- </xsl:attribute>
8445
- <xsl:if test="@colspan">
8446
- <xsl:attribute name="number-columns-spanned">
8447
- <xsl:value-of select="@colspan"/>
8448
- </xsl:attribute>
8449
- </xsl:if>
8450
- <xsl:if test="@rowspan">
8451
- <xsl:attribute name="number-rows-spanned">
8452
- <xsl:value-of select="@rowspan"/>
8453
- </xsl:attribute>
8454
- </xsl:if>
8455
- <xsl:call-template name="display-align"/>
8749
+ <xsl:call-template name="setTextAlignment">
8750
+ <xsl:with-param name="default">left</xsl:with-param>
8751
+ </xsl:call-template>
8752
+
8753
+ <xsl:call-template name="setTableCellAttributes"/>
8456
8754
 
8457
8755
  <fo:block>
8458
8756
  <xsl:apply-templates/>
@@ -8464,28 +8762,15 @@
8464
8762
  <xsl:attribute name="padding">0mm</xsl:attribute>
8465
8763
  <xsl:attribute name="padding-left">0mm</xsl:attribute>
8466
8764
  </xsl:if>
8467
- <xsl:attribute name="text-align">
8468
- <xsl:choose>
8469
- <xsl:when test="@align">
8470
- <xsl:value-of select="@align"/>
8471
- </xsl:when>
8472
- <xsl:otherwise>left</xsl:otherwise>
8473
- </xsl:choose>
8474
- </xsl:attribute>
8765
+ <xsl:call-template name="setTextAlignment">
8766
+ <xsl:with-param name="default">left</xsl:with-param>
8767
+ </xsl:call-template>
8768
+
8475
8769
  <xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
8476
8770
  <xsl:attribute name="font-weight">bold</xsl:attribute>
8477
8771
  </xsl:if>
8478
- <xsl:if test="@colspan">
8479
- <xsl:attribute name="number-columns-spanned">
8480
- <xsl:value-of select="@colspan"/>
8481
- </xsl:attribute>
8482
- </xsl:if>
8483
- <xsl:if test="@rowspan">
8484
- <xsl:attribute name="number-rows-spanned">
8485
- <xsl:value-of select="@rowspan"/>
8486
- </xsl:attribute>
8487
- </xsl:if>
8488
- <xsl:call-template name="display-align"/>
8772
+
8773
+ <xsl:call-template name="setTableCellAttributes"/>
8489
8774
 
8490
8775
  <fo:block>
8491
8776
  <xsl:apply-templates/>
@@ -8502,10 +8787,10 @@
8502
8787
  </fo:block>
8503
8788
  </xsl:template><xsl:template match="*[local-name() = 'termexample']">
8504
8789
  <fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
8505
- <xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
8506
- <xsl:apply-templates/>
8790
+ <xsl:apply-templates select="*[local-name()='name']"/>
8791
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
8507
8792
  </fo:block>
8508
- </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
8793
+ </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
8509
8794
  <xsl:if test="normalize-space() != ''">
8510
8795
  <fo:inline xsl:use-attribute-sets="termexample-name-style">
8511
8796
  <xsl:apply-templates/>
@@ -8531,9 +8816,7 @@
8531
8816
 
8532
8817
  <xsl:variable name="fo_element">
8533
8818
  <xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if>
8534
- block
8535
-
8536
-
8819
+ block
8537
8820
  </xsl:variable>
8538
8821
 
8539
8822
  <!-- display 'EXAMPLE' -->
@@ -8606,6 +8889,8 @@
8606
8889
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
8607
8890
  <fo:block xsl:use-attribute-sets="termsource-style">
8608
8891
 
8892
+
8893
+
8609
8894
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
8610
8895
  <xsl:variable name="termsource_text">
8611
8896
  <xsl:apply-templates/>
@@ -8643,9 +8928,7 @@
8643
8928
  <xsl:value-of select="."/>
8644
8929
  </xsl:if>
8645
8930
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
8646
- <fo:inline>
8647
-
8648
-
8931
+ <fo:inline xsl:use-attribute-sets="termsource-text-style">
8649
8932
  <xsl:value-of select="."/>
8650
8933
  </fo:inline>
8651
8934
  </xsl:template><xsl:template match="*[local-name() = 'origin']">
@@ -8730,7 +9013,7 @@
8730
9013
  </xsl:variable>
8731
9014
 
8732
9015
  <xsl:choose>
8733
- <xsl:when test="normalize-space($bibitemid) != ''">
9016
+ <xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
8734
9017
  <fo:inline xsl:use-attribute-sets="eref-style">
8735
9018
  <xsl:if test="@type = 'footnote'">
8736
9019
  <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -8762,7 +9045,6 @@
8762
9045
  </xsl:if>
8763
9046
 
8764
9047
 
8765
-
8766
9048
  </xsl:if>
8767
9049
 
8768
9050
 
@@ -8820,7 +9102,6 @@
8820
9102
  </xsl:choose>
8821
9103
  </xsl:variable>
8822
9104
 
8823
-
8824
9105
  <xsl:choose>
8825
9106
  <xsl:when test="$lang = 'zh'">
8826
9107
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -8913,11 +9194,6 @@
8913
9194
  <xsl:apply-templates/>
8914
9195
  </fo:block>
8915
9196
  </xsl:template><xsl:template match="*[local-name() = 'definitions']">
8916
- <fo:block id="{@id}">
8917
- <xsl:apply-templates/>
8918
- </fo:block>
8919
- </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']">
8920
-
8921
9197
  <fo:block id="{@id}">
8922
9198
  <xsl:apply-templates/>
8923
9199
  </fo:block>
@@ -9189,59 +9465,108 @@
9189
9465
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
9190
9466
  <fo:block><xsl:apply-templates/></fo:block>
9191
9467
  </fo:table-cell>
9192
- </xsl:template><xsl:template name="processBibitem">
9193
-
9194
-
9195
- <!-- start BIPM bibtem processing -->
9196
- <xsl:choose>
9197
- <xsl:when test="*[local-name() = 'formattedref']">
9198
- <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
9199
- </xsl:when>
9200
- <xsl:otherwise>
9201
- <xsl:variable name="docidentifier" select="*[local-name() = 'docidentifier'][not(@type = 'URN' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'BIPM' or @type = 'ISBN' or @type = 'ISSN')]"/>
9202
-
9203
- <xsl:value-of select="$docidentifier"/>
9204
- <xsl:if test="$docidentifier != '' and *[local-name() = 'title']">, </xsl:if>
9205
-
9206
- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
9207
-
9208
- <xsl:choose>
9209
- <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]">
9210
- <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]"/>
9211
- </xsl:when>
9212
- <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
9213
- <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
9214
- </xsl:when>
9215
- <xsl:otherwise>
9216
- <xsl:apply-templates select="*[local-name() = 'title']"/>
9217
- </xsl:otherwise>
9218
- </xsl:choose>
9219
-
9220
- </xsl:otherwise>
9221
- </xsl:choose>
9222
- <!-- end BIPM bibitem processing-->
9223
-
9224
-
9225
-
9468
+ </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() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/><xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2">
9226
9469
 
9227
9470
 
9228
9471
 
9472
+ <fo:block id="{@id}">
9473
+ <xsl:apply-templates/>
9474
+ </fo:block>
9475
+ </xsl:template><xsl:template match="*[local-name() = 'references']">
9476
+ <xsl:if test="not(ancestor::*[local-name() = 'annex'])">
9477
+
9478
+ <fo:block break-after="page"/>
9479
+
9480
+ </xsl:if>
9229
9481
 
9482
+ <!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
9483
+ <xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'">
9484
+ <fo:block break-after="page"/>
9485
+ </xsl:if>
9486
+ </xsl:if> -->
9230
9487
 
9488
+ <fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
9489
+ <xsl:apply-templates/>
9490
+ </fo:block>
9231
9491
 
9232
9492
 
9233
-
9234
9493
 
9235
9494
 
9236
-
9495
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']">
9496
+ <xsl:call-template name="bibitem"/>
9497
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
9237
9498
 
9499
+ <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
9500
+ <xsl:call-template name="processBibitem"/>
9501
+ </fo:block>
9502
+
9238
9503
 
9504
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
9239
9505
 
9240
9506
 
9507
+ <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
9508
+ <fo:list-item>
9509
+ <fo:list-item-label end-indent="label-end()">
9510
+ <fo:block>
9511
+ <fo:inline>
9512
+ <xsl:value-of select="bipm:docidentifier[@type='metanorma-ordinal']"/>
9513
+ <xsl:if test="not(bipm:docidentifier[@type='metanorma-ordinal'])">
9514
+ <xsl:choose>
9515
+ <xsl:when test="bipm:docidentifier[@type='metanorma']">
9516
+ <xsl:value-of select="bipm:docidentifier[@type='metanorma']"/>
9517
+ </xsl:when>
9518
+ <xsl:otherwise>
9519
+ <xsl:number format="[1]"/>
9520
+ </xsl:otherwise>
9521
+ </xsl:choose>
9522
+ </xsl:if>
9523
+ </fo:inline>
9524
+ </fo:block>
9525
+ </fo:list-item-label>
9526
+ <fo:list-item-body start-indent="body-start()">
9527
+ <fo:block>
9528
+ <xsl:call-template name="processBibitem"/>
9529
+ </fo:block>
9530
+ </fo:list-item-body>
9531
+ </fo:list-item>
9532
+ </fo:list-block>
9533
+
9241
9534
 
9535
+ </xsl:template><xsl:template name="processBibitem">
9242
9536
 
9243
-
9244
9537
 
9538
+ <!-- start BIPM bibitem processing -->
9539
+ <xsl:if test=".//bipm:fn">
9540
+ <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
9541
+ </xsl:if>
9542
+ <xsl:choose>
9543
+ <xsl:when test="*[local-name() = 'formattedref']">
9544
+ <xsl:apply-templates select="*[local-name() = 'formattedref']"/>
9545
+ </xsl:when>
9546
+ <xsl:otherwise>
9547
+ <xsl:variable name="docidentifier" select="*[local-name() = 'docidentifier'][not(@type = 'URN' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'BIPM' or @type = 'ISBN' or @type = 'ISSN')]"/>
9548
+
9549
+ <xsl:value-of select="$docidentifier"/>
9550
+ <xsl:if test="$docidentifier != '' and *[local-name() = 'title']">, </xsl:if>
9551
+
9552
+ <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
9553
+
9554
+ <xsl:choose>
9555
+ <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]">
9556
+ <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = $curr_lang]"/>
9557
+ </xsl:when>
9558
+ <xsl:when test="*[local-name() = 'title'][@type = 'main' and @language = 'en']">
9559
+ <xsl:apply-templates select="*[local-name() = 'title'][@type = 'main' and @language = 'en']"/>
9560
+ </xsl:when>
9561
+ <xsl:otherwise>
9562
+ <xsl:apply-templates select="*[local-name() = 'title']"/>
9563
+ </xsl:otherwise>
9564
+ </xsl:choose>
9565
+
9566
+ </xsl:otherwise>
9567
+ </xsl:choose>
9568
+ <!-- end BIPM bibitem processing-->
9569
+
9245
9570
  </xsl:template><xsl:template name="processBibitemDocId">
9246
9571
  <xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
9247
9572
  <xsl:choose>
@@ -9298,6 +9623,55 @@
9298
9623
  <xsl:value-of select="substring(.,1,1)"/>
9299
9624
  </xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
9300
9625
  <fo:inline><xsl:apply-templates/></fo:inline>
9626
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2">
9627
+ <!-- <fo:inline><xsl:apply-templates /></fo:inline> -->
9628
+ <fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM -->
9629
+ <xsl:apply-templates/>
9630
+ </fo:inline>
9631
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
9632
+ <fo:footnote>
9633
+ <xsl:variable name="number">
9634
+
9635
+ <xsl:choose>
9636
+ <xsl:when test="ancestor::*[local-name() = 'references'][preceding-sibling::*[local-name() = 'references']]">
9637
+ <xsl:number level="any" count="*[local-name() = 'references'][preceding-sibling::*[local-name() = 'references']]//*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
9638
+ </xsl:when>
9639
+ <xsl:otherwise>
9640
+ <xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
9641
+ </xsl:otherwise>
9642
+ </xsl:choose>
9643
+
9644
+ </xsl:variable>
9645
+ <fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
9646
+ <fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
9647
+ <xsl:value-of select="$number"/>
9648
+
9649
+ </fo:basic-link>
9650
+ </fo:inline>
9651
+ <fo:footnote-body>
9652
+ <fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
9653
+ <fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
9654
+ <xsl:value-of select="$number"/>
9655
+
9656
+ </fo:inline>
9657
+ <xsl:apply-templates/>
9658
+ </fo:block>
9659
+ </fo:footnote-body>
9660
+ </fo:footnote>
9661
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho -->
9662
+ <xsl:text> edition </xsl:text>
9663
+ <xsl:value-of select="."/>
9664
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho -->
9665
+ <xsl:text> (</xsl:text>
9666
+ <fo:inline xsl:use-attribute-sets="link-style">
9667
+ <fo:basic-link external-destination="." fox:alt-text=".">
9668
+ <xsl:value-of select="."/>
9669
+ </fo:basic-link>
9670
+ </fo:inline>
9671
+ <xsl:text>)</xsl:text>
9672
+ </xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']">
9673
+
9674
+ <xsl:apply-templates/>
9301
9675
  </xsl:template><xsl:template match="*[local-name() = 'form']">
9302
9676
  <fo:block>
9303
9677
  <xsl:apply-templates/>
@@ -9468,6 +9842,62 @@
9468
9842
  <xsl:copy-of select="."/>
9469
9843
  </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
9470
9844
  <xsl:call-template name="title"/>
9845
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']">
9846
+
9847
+
9848
+
9849
+
9850
+
9851
+ <!-- text in the box -->
9852
+ <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
9853
+
9854
+
9855
+
9856
+
9857
+
9858
+ <fo:block-container xsl:use-attribute-sets="admonition-container-style">
9859
+
9860
+
9861
+ <fo:block xsl:use-attribute-sets="admonition-name-style">
9862
+ <xsl:call-template name="displayAdmonitionName"/>
9863
+ </fo:block>
9864
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
9865
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
9866
+ </fo:block>
9867
+
9868
+ </fo:block-container>
9869
+
9870
+ </fo:block-container>
9871
+
9872
+ </xsl:template><xsl:template name="displayAdmonitionName">
9873
+
9874
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
9875
+ <xsl:if test="not(*[local-name() = 'name'])">
9876
+ <xsl:apply-templates select="@type"/>
9877
+ </xsl:if>
9878
+
9879
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
9880
+ <xsl:apply-templates/>
9881
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
9882
+ <xsl:variable name="admonition_type_">
9883
+ <xsl:call-template name="getLocalizedString">
9884
+ <xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
9885
+ </xsl:call-template>
9886
+ </xsl:variable>
9887
+ <xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
9888
+ <xsl:value-of select="$admonition_type"/>
9889
+ <xsl:if test="$admonition_type = ''">
9890
+ <xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
9891
+ </xsl:if>
9892
+ </xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
9893
+
9894
+ <fo:block xsl:use-attribute-sets="admonition-p-style">
9895
+
9896
+
9897
+
9898
+ <xsl:apply-templates/>
9899
+ </fo:block>
9900
+
9471
9901
  </xsl:template><xsl:template name="convertDate">
9472
9902
  <xsl:param name="date"/>
9473
9903
  <xsl:param name="format" select="'short'"/>
@@ -9476,78 +9906,39 @@
9476
9906
  <xsl:variable name="day" select="substring($date, 9, 2)"/>
9477
9907
  <xsl:variable name="monthStr">
9478
9908
  <xsl:choose>
9479
- <xsl:when test="$month = '01'">January</xsl:when>
9480
- <xsl:when test="$month = '02'">February</xsl:when>
9481
- <xsl:when test="$month = '03'">March</xsl:when>
9482
- <xsl:when test="$month = '04'">April</xsl:when>
9483
- <xsl:when test="$month = '05'">May</xsl:when>
9484
- <xsl:when test="$month = '06'">June</xsl:when>
9485
- <xsl:when test="$month = '07'">July</xsl:when>
9486
- <xsl:when test="$month = '08'">August</xsl:when>
9487
- <xsl:when test="$month = '09'">September</xsl:when>
9488
- <xsl:when test="$month = '10'">October</xsl:when>
9489
- <xsl:when test="$month = '11'">November</xsl:when>
9490
- <xsl:when test="$month = '12'">December</xsl:when>
9491
- </xsl:choose>
9492
- </xsl:variable>
9493
- <xsl:variable name="result">
9494
- <xsl:choose>
9495
- <xsl:when test="$format = 'ddMMyyyy'">
9496
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
9497
- <xsl:text> </xsl:text>
9498
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
9499
- </xsl:when>
9500
- <xsl:when test="$format = 'ddMM'">
9501
- <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
9502
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
9503
- </xsl:when>
9504
- <xsl:when test="$format = 'short' or $day = ''">
9505
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
9506
- </xsl:when>
9507
- <xsl:otherwise>
9508
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
9509
- </xsl:otherwise>
9909
+ <xsl:when test="$month = '01'">january</xsl:when>
9910
+ <xsl:when test="$month = '02'">february</xsl:when>
9911
+ <xsl:when test="$month = '03'">march</xsl:when>
9912
+ <xsl:when test="$month = '04'">april</xsl:when>
9913
+ <xsl:when test="$month = '05'">may</xsl:when>
9914
+ <xsl:when test="$month = '06'">june</xsl:when>
9915
+ <xsl:when test="$month = '07'">july</xsl:when>
9916
+ <xsl:when test="$month = '08'">august</xsl:when>
9917
+ <xsl:when test="$month = '09'">september</xsl:when>
9918
+ <xsl:when test="$month = '10'">october</xsl:when>
9919
+ <xsl:when test="$month = '11'">november</xsl:when>
9920
+ <xsl:when test="$month = '12'">december</xsl:when>
9510
9921
  </xsl:choose>
9511
9922
  </xsl:variable>
9512
- <xsl:value-of select="$result"/>
9513
- </xsl:template><xsl:template name="convertDateLocalized">
9514
- <xsl:param name="date"/>
9515
- <xsl:param name="format" select="'short'"/>
9516
- <xsl:variable name="year" select="substring($date, 1, 4)"/>
9517
- <xsl:variable name="month" select="substring($date, 6, 2)"/>
9518
- <xsl:variable name="day" select="substring($date, 9, 2)"/>
9519
- <xsl:variable name="monthStr">
9520
- <xsl:choose>
9521
- <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>
9522
- <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>
9523
- <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>
9524
- <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>
9525
- <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>
9526
- <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>
9527
- <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>
9528
- <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>
9529
- <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>
9530
- <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>
9531
- <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>
9532
- <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>
9533
- </xsl:choose>
9923
+ <xsl:variable name="monthStr_localized">
9924
+ <xsl:if test="normalize-space($monthStr) != ''"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param></xsl:call-template></xsl:if>
9534
9925
  </xsl:variable>
9535
9926
  <xsl:variable name="result">
9536
9927
  <xsl:choose>
9537
9928
  <xsl:when test="$format = 'ddMMyyyy'">
9538
9929
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
9539
9930
  <xsl:text> </xsl:text>
9540
- <xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
9931
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
9541
9932
  </xsl:when>
9542
9933
  <xsl:when test="$format = 'ddMM'">
9543
9934
  <xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
9544
- <xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
9935
+ <xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/>
9545
9936
  </xsl:when>
9546
9937
  <xsl:when test="$format = 'short' or $day = ''">
9547
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
9938
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
9548
9939
  </xsl:when>
9549
9940
  <xsl:otherwise>
9550
- <xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
9941
+ <xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/>
9551
9942
  </xsl:otherwise>
9552
9943
  </xsl:choose>
9553
9944
  </xsl:variable>
@@ -9861,7 +10252,6 @@
9861
10252
  <xsl:value-of select="$key_"/>
9862
10253
  </xsl:otherwise>
9863
10254
  </xsl:choose>
9864
-
9865
10255
  </xsl:template><xsl:template name="setTrackChangesStyles">
9866
10256
  <xsl:param name="isAdded"/>
9867
10257
  <xsl:param name="isDeleted"/>
@@ -9903,15 +10293,18 @@
9903
10293
  </xsl:choose>
9904
10294
  </xsl:template><xsl:template name="setTextAlignment">
9905
10295
  <xsl:param name="default">left</xsl:param>
10296
+ <xsl:variable name="align" select="normalize-space(@align)"/>
9906
10297
  <xsl:attribute name="text-align">
9907
10298
  <xsl:choose>
9908
- <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
10299
+ <xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
10300
+ <xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
10301
+ <xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
9909
10302
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
9910
10303
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
9911
10304
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
9912
10305
  </xsl:choose>
9913
10306
  </xsl:attribute>
9914
- <xsl:if test="@align = 'indent'">
10307
+ <xsl:if test="$align = 'indent'">
9915
10308
  <xsl:attribute name="margin-left">7mm</xsl:attribute>
9916
10309
  </xsl:if>
9917
10310
  </xsl:template><xsl:template name="number-to-words">