metanorma-un 0.6.12 → 0.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/un/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/un/isodoc.rng +420 -76
  4. data/lib/asciidoctor/un/reqt.rng +23 -2
  5. data/lib/asciidoctor/un/un.rng +6 -16
  6. data/lib/isodoc/un/html/wordstyle.css +12 -1
  7. data/lib/isodoc/un/html/wordstyle.scss +12 -1
  8. data/lib/isodoc/un/un.plenary-attachment.xsl +48 -13
  9. data/lib/isodoc/un/un.plenary.xsl +48 -13
  10. data/lib/isodoc/un/un.recommendation.xsl +48 -13
  11. data/lib/metanorma/un/version.rb +1 -1
  12. data/metanorma-unece.gemspec +1 -2
  13. metadata +5 -19
data/lib/asciidoctor/un/reqt.rng CHANGED
@@ -58,6 +58,14 @@
58
58
  <optional>
59
59
  <attribute name="type"/>
60
60
  </optional>
61
+ <optional>
62
+ <attribute name="tag"/>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="multilingual-rendering">
66
+ <ref name="MultilingualRenderingType"/>
67
+ </attribute>
68
+ </optional>
61
69
  <optional>
62
70
  <ref name="reqtitle"/>
63
71
  </optional>
@@ -101,7 +109,9 @@
101
109
  </define>
102
110
  <define name="label">
103
111
  <element name="label">
104
- <text/>
112
+ <oneOrMore>
113
+ <ref name="TextElement"/>
114
+ </oneOrMore>
105
115
  </element>
106
116
  </define>
107
117
  <define name="subject">
@@ -175,8 +185,19 @@
175
185
  <data type="boolean"/>
176
186
  </attribute>
177
187
  </optional>
188
+ <optional>
189
+ <attribute name="tag"/>
190
+ </optional>
191
+ <optional>
192
+ <attribute name="multilingual-rendering">
193
+ <ref name="MultilingualRenderingType"/>
194
+ </attribute>
195
+ </optional>
178
196
  <oneOrMore>
179
- <ref name="BasicBlock"/>
197
+ <choice>
198
+ <ref name="BasicBlock"/>
199
+ <ref name="component"/>
200
+ </choice>
180
201
  </oneOrMore>
181
202
  </define>
182
203
  <define name="ObligationType">
data/lib/asciidoctor/un/un.rng CHANGED
@@ -178,14 +178,9 @@
178
178
  <ref name="section-title"/>
179
179
  </optional>
180
180
  <group>
181
- <group>
182
- <zeroOrMore>
183
- <ref name="BasicBlock"/>
184
- </zeroOrMore>
185
- <zeroOrMore>
186
- <ref name="note"/>
187
- </zeroOrMore>
188
- </group>
181
+ <zeroOrMore>
182
+ <ref name="BasicBlock"/>
183
+ </zeroOrMore>
189
184
  <zeroOrMore>
190
185
  <choice>
191
186
  <ref name="clause-subsection"/>
@@ -229,14 +224,9 @@
229
224
  <ref name="section-title"/>
230
225
  </optional>
231
226
  <group>
232
- <group>
233
- <zeroOrMore>
234
- <ref name="BasicBlock"/>
235
- </zeroOrMore>
236
- <zeroOrMore>
237
- <ref name="note"/>
238
- </zeroOrMore>
239
- </group>
227
+ <zeroOrMore>
228
+ <ref name="BasicBlock"/>
229
+ </zeroOrMore>
240
230
  <zeroOrMore>
241
231
  <choice>
242
232
  <ref name="annex-subsection"/>
data/lib/isodoc/un/html/wordstyle.css CHANGED
@@ -149,6 +149,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
149
149
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
150
150
  mso-style-noshow: yes;
151
151
  mso-style-unhide: no;
152
+ mso-style-name: "Comment Text";
152
153
  margin: 0cm;
153
154
  margin-bottom: .0001pt;
154
155
  mso-pagination: widow-orphan;
@@ -369,6 +370,7 @@ h1 {
369
370
  mso-style-priority: 1;
370
371
  mso-style-unhide: no;
371
372
  mso-style-qformat: yes;
373
+ mso-style-name: "Heading 1";
372
374
  mso-style-link: "Heading 1 Char";
373
375
  mso-style-next: Normal;
374
376
  margin-top: 13.5pt;
@@ -452,6 +454,7 @@ h2 {
452
454
  mso-style-priority: 2;
453
455
  mso-style-unhide: no;
454
456
  mso-style-qformat: yes;
457
+ mso-style-name: "Heading 2";
455
458
  mso-style-parent: "Heading 1";
456
459
  mso-style-link: "Heading 2 Char";
457
460
  mso-style-next: Normal;
@@ -478,7 +481,8 @@ h3 {
478
481
  mso-style-priority: 3;
479
482
  mso-style-unhide: no;
480
483
  mso-style-qformat: yes;
481
- mso-style-parent: "Heading 1";
484
+ mso-style-name: "Heading 3";
485
+ mso-style-parent: "Heading 2";
482
486
  mso-style-link: "Heading 3 Char";
483
487
  mso-style-next: Normal;
484
488
  margin-top: 3.0pt;
@@ -504,6 +508,7 @@ h4 {
504
508
  mso-style-priority: 4;
505
509
  mso-style-unhide: no;
506
510
  mso-style-qformat: yes;
511
+ mso-style-name: "Heading 4";
507
512
  mso-style-parent: "Heading 3";
508
513
  mso-style-link: "Heading 4 Char";
509
514
  mso-style-next: Normal;
@@ -530,6 +535,7 @@ h5 {
530
535
  mso-style-priority: 5;
531
536
  mso-style-unhide: no;
532
537
  mso-style-qformat: yes;
538
+ mso-style-name: "Heading 5";
533
539
  mso-style-parent: "Heading 4";
534
540
  mso-style-link: "Heading 5 Char";
535
541
  mso-style-next: Normal;
@@ -556,6 +562,7 @@ h6 {
556
562
  mso-style-priority: 6;
557
563
  mso-style-unhide: no;
558
564
  mso-style-qformat: yes;
565
+ mso-style-name: "Heading 6";
559
566
  mso-style-parent: "Heading 5";
560
567
  mso-style-link: "Heading 6 Char";
561
568
  mso-style-next: Normal;
@@ -581,6 +588,7 @@ h6 {
581
588
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
582
589
  mso-style-priority: 39;
583
590
  mso-style-unhide: no;
591
+ mso-style-name: "TOC 1";
584
592
  mso-style-next: Normal;
585
593
  margin-top: 6.0pt;
586
594
  margin-right: 25.0pt;
@@ -603,6 +611,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
603
611
  mso-style-noshow: yes;
604
612
  mso-style-priority: 39;
605
613
  mso-style-unhide: no;
614
+ mso-style-name: "TOC 2";
606
615
  mso-style-parent: "TOC 1";
607
616
  mso-style-next: Normal;
608
617
  margin-top: 0cm;
@@ -626,6 +635,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
626
635
  mso-style-noshow: yes;
627
636
  mso-style-priority: 39;
628
637
  mso-style-unhide: no;
638
+ mso-style-name: "TOC 3";
629
639
  mso-style-parent: "TOC 2";
630
640
  mso-style-next: Normal;
631
641
  margin-top: 0cm;
@@ -647,6 +657,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
647
657
 
648
658
  span.MsoFootnoteReference {
649
659
  mso-style-priority: 99;
660
+ mso-style-name: "Footnote Reference";
650
661
  vertical-align: super; }
651
662
 
652
663
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
data/lib/isodoc/un/html/wordstyle.scss CHANGED
@@ -135,6 +135,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
135
135
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
136
136
  {mso-style-noshow:yes;
137
137
  mso-style-unhide:no;
138
+ mso-style-name:"Comment Text";
138
139
  margin:0cm;
139
140
  margin-bottom:.0001pt;
140
141
  mso-pagination:widow-orphan;
@@ -338,6 +339,7 @@ h1
338
339
  {mso-style-priority:1;
339
340
  mso-style-unhide:no;
340
341
  mso-style-qformat:yes;
342
+ mso-style-name:"Heading 1";
341
343
  mso-style-link:"Heading 1 Char";
342
344
  mso-style-next:Normal;
343
345
  margin-top:13.5pt;
@@ -418,6 +420,7 @@ h2
418
420
  {mso-style-priority:2;
419
421
  mso-style-unhide:no;
420
422
  mso-style-qformat:yes;
423
+ mso-style-name:"Heading 2";
421
424
  mso-style-parent:"Heading 1";
422
425
  mso-style-link:"Heading 2 Char";
423
426
  mso-style-next:Normal;
@@ -443,7 +446,8 @@ h3
443
446
  {mso-style-priority:3;
444
447
  mso-style-unhide:no;
445
448
  mso-style-qformat:yes;
446
- mso-style-parent:"Heading 1";
449
+ mso-style-name:"Heading 3";
450
+ mso-style-parent:"Heading 2";
447
451
  mso-style-link:"Heading 3 Char";
448
452
  mso-style-next:Normal;
449
453
  margin-top:3.0pt;
@@ -468,6 +472,7 @@ h4
468
472
  {mso-style-priority:4;
469
473
  mso-style-unhide:no;
470
474
  mso-style-qformat:yes;
475
+ mso-style-name:"Heading 4";
471
476
  mso-style-parent:"Heading 3";
472
477
  mso-style-link:"Heading 4 Char";
473
478
  mso-style-next:Normal;
@@ -493,6 +498,7 @@ h5
493
498
  {mso-style-priority:5;
494
499
  mso-style-unhide:no;
495
500
  mso-style-qformat:yes;
501
+ mso-style-name:"Heading 5";
496
502
  mso-style-parent:"Heading 4";
497
503
  mso-style-link:"Heading 5 Char";
498
504
  mso-style-next:Normal;
@@ -518,6 +524,7 @@ h6
518
524
  {mso-style-priority:6;
519
525
  mso-style-unhide:no;
520
526
  mso-style-qformat:yes;
527
+ mso-style-name:"Heading 6";
521
528
  mso-style-parent:"Heading 5";
522
529
  mso-style-link:"Heading 6 Char";
523
530
  mso-style-next:Normal;
@@ -542,6 +549,7 @@ h6
542
549
  p.MsoToc1, li.MsoToc1, div.MsoToc1
543
550
  {mso-style-priority:39;
544
551
  mso-style-unhide:no;
552
+ mso-style-name:"TOC 1";
545
553
  mso-style-next:Normal;
546
554
  margin-top:6.0pt;
547
555
  margin-right:25.0pt;
@@ -563,6 +571,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
563
571
  {mso-style-noshow:yes;
564
572
  mso-style-priority:39;
565
573
  mso-style-unhide:no;
574
+ mso-style-name:"TOC 2";
566
575
  mso-style-parent:"TOC 1";
567
576
  mso-style-next:Normal;
568
577
  margin-top:0cm;
@@ -585,6 +594,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
585
594
  {mso-style-noshow:yes;
586
595
  mso-style-priority:39;
587
596
  mso-style-unhide:no;
597
+ mso-style-name:"TOC 3";
588
598
  mso-style-parent:"TOC 2";
589
599
  mso-style-next:Normal;
590
600
  margin-top:0cm;
@@ -605,6 +615,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
605
615
  mso-bidi-font-weight:normal;}
606
616
  span.MsoFootnoteReference
607
617
  {mso-style-priority:99;
618
+ mso-style-name:"Footnote Reference";
608
619
  vertical-align:super;}
609
620
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
610
621
  {mso-style-noshow:yes;
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1205,6 +1205,8 @@
1205
1205
 
1206
1206
  <title-list-figures lang="en">List of Figures</title-list-figures>
1207
1207
 
1208
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1209
+
1208
1210
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1209
1211
 
1210
1212
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1479,6 +1481,11 @@
1479
1481
  <xsl:attribute name="padding-right">4mm</xsl:attribute>
1480
1482
 
1481
1483
 
1484
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1485
+
1486
+
1487
+
1488
+
1482
1489
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1483
1490
 
1484
1491
 
@@ -2579,9 +2586,7 @@
2579
2586
 
2580
2587
  <!-- Table's note name (NOTE, for example) -->
2581
2588
 
2582
- <fo:inline padding-right="2mm">
2583
-
2584
-
2589
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
2585
2590
 
2586
2591
 
2587
2592
 
@@ -2596,6 +2601,7 @@
2596
2601
  </xsl:if>
2597
2602
 
2598
2603
 
2604
+
2599
2605
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2600
2606
 
2601
2607
  </fo:inline>
@@ -3098,6 +3104,7 @@
3098
3104
  <fo:table-cell>
3099
3105
 
3100
3106
  <fo:block margin-top="6pt">
3107
+ <xsl:copy-of select="@id"/>
3101
3108
 
3102
3109
 
3103
3110
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3201,6 +3208,8 @@
3201
3208
  <xsl:if test="$font-size != ''">
3202
3209
  <xsl:attribute name="font-size">
3203
3210
  <xsl:choose>
3211
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
3212
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
3204
3213
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
3205
3214
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
3206
3215
  </xsl:choose>
@@ -3944,14 +3953,18 @@
3944
3953
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3945
3954
  <fo:inline><xsl:apply-templates/></fo:inline>
3946
3955
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3956
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3947
3957
  <fo:block id="{@id}">
3948
3958
  <xsl:apply-templates/>
3949
3959
  </fo:block>
3950
3960
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3961
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3951
3962
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3952
3963
 
3953
3964
 
3954
-
3965
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3966
+
3967
+ </xsl:if>
3955
3968
  <xsl:apply-templates/>
3956
3969
  </fo:block>
3957
3970
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4013,6 +4026,7 @@
4013
4026
  <xsl:otherwise>
4014
4027
  <fo:block xsl:use-attribute-sets="image-style">
4015
4028
 
4029
+
4016
4030
  <xsl:variable name="src">
4017
4031
  <xsl:call-template name="image_src"/>
4018
4032
  </xsl:variable>
@@ -4379,7 +4393,7 @@
4379
4393
  <xsl:text> </xsl:text>
4380
4394
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4381
4395
  <xsl:value-of select="."/>
4382
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
4396
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4383
4397
  <xsl:value-of select="."/>
4384
4398
  </xsl:template><xsl:template match="node()" mode="contents">
4385
4399
  <xsl:apply-templates mode="contents"/>
@@ -4477,6 +4491,8 @@
4477
4491
 
4478
4492
 
4479
4493
 
4494
+
4495
+
4480
4496
  </fo:bookmark-tree>
4481
4497
  </xsl:if>
4482
4498
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4670,12 +4686,16 @@
4670
4686
  <xsl:if test="$font-size != ''">
4671
4687
  <xsl:attribute name="font-size">
4672
4688
  <xsl:choose>
4689
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
4690
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
4673
4691
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
4674
4692
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
4675
4693
  </xsl:choose>
4676
4694
  </xsl:attribute>
4677
4695
  </xsl:if>
4678
4696
 
4697
+
4698
+
4679
4699
  <xsl:apply-templates/>
4680
4700
  </fo:block>
4681
4701
 
@@ -4918,7 +4938,8 @@
4918
4938
  </fo:block>
4919
4939
  </fo:table-cell>
4920
4940
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4921
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4941
+ <fo:block font-size="11pt">
4942
+
4922
4943
  <xsl:apply-templates/>
4923
4944
  </fo:block>
4924
4945
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -5028,6 +5049,7 @@
5028
5049
  </xsl:choose>
5029
5050
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5030
5051
  <fo:block xsl:use-attribute-sets="termsource-style">
5052
+
5031
5053
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5032
5054
  <xsl:variable name="termsource_text">
5033
5055
  <xsl:apply-templates/>
@@ -5038,13 +5060,15 @@
5038
5060
  <!-- <xsl:apply-templates /> -->
5039
5061
  <xsl:copy-of select="$termsource_text"/>
5040
5062
  </xsl:when>
5041
- <xsl:otherwise>
5063
+ <xsl:otherwise>
5064
+
5042
5065
 
5043
5066
  <xsl:text>[</xsl:text>
5044
5067
 
5045
5068
  <!-- <xsl:apply-templates /> -->
5046
5069
  <xsl:copy-of select="$termsource_text"/>
5047
5070
 
5071
+
5048
5072
  <xsl:text>]</xsl:text>
5049
5073
 
5050
5074
  </xsl:otherwise>
@@ -5111,12 +5135,20 @@
5111
5135
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5112
5136
  <xsl:text>— </xsl:text>
5113
5137
  <xsl:apply-templates/>
5114
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5138
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5139
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5140
+ <xsl:copy-of select="."/>
5141
+ </xsl:for-each>
5142
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5143
+ <xsl:copy-of select="."/>
5144
+ </xsl:for-each>
5145
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5115
5146
 
5116
5147
  <xsl:variable name="bibitemid">
5117
5148
  <xsl:choose>
5118
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5119
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5149
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5150
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5151
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5120
5152
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5121
5153
  </xsl:choose>
5122
5154
  </xsl:variable>
@@ -5207,10 +5239,10 @@
5207
5239
  </xsl:choose>
5208
5240
  </xsl:variable>
5209
5241
 
5210
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5242
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5211
5243
 
5212
5244
  <xsl:choose>
5213
- <xsl:when test="$language = 'zh'">
5245
+ <xsl:when test="$lang = 'zh'">
5214
5246
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5215
5247
  </xsl:when>
5216
5248
  <xsl:when test="../../@inline-header = 'true'">
@@ -6200,12 +6232,15 @@
6200
6232
  <xsl:param name="default">left</xsl:param>
6201
6233
  <xsl:attribute name="text-align">
6202
6234
  <xsl:choose>
6203
- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
6235
+ <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
6204
6236
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6205
6237
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6206
6238
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6207
6239
  </xsl:choose>
6208
6240
  </xsl:attribute>
6241
+ <xsl:if test="@align = 'indent'">
6242
+ <xsl:attribute name="margin-left">7mm</xsl:attribute>
6243
+ </xsl:if>
6209
6244
  </xsl:template><xsl:template name="number-to-words">
6210
6245
  <xsl:param name="number"/>
6211
6246
  <xsl:param name="first"/>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1205,6 +1205,8 @@
1205
1205
 
1206
1206
  <title-list-figures lang="en">List of Figures</title-list-figures>
1207
1207
 
1208
+ <title-table-figures lang="en">Table of Figures</title-table-figures>
1209
+
1208
1210
  <title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
1209
1211
 
1210
1212
  <title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1479,6 +1481,11 @@
1479
1481
  <xsl:attribute name="padding-right">4mm</xsl:attribute>
1480
1482
 
1481
1483
 
1484
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
1485
+
1486
+
1487
+
1488
+
1482
1489
  </xsl:attribute-set><xsl:attribute-set name="note-p-style">
1483
1490
 
1484
1491
 
@@ -2579,9 +2586,7 @@
2579
2586
 
2580
2587
  <!-- Table's note name (NOTE, for example) -->
2581
2588
 
2582
- <fo:inline padding-right="2mm">
2583
-
2584
-
2589
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
2585
2590
 
2586
2591
 
2587
2592
 
@@ -2596,6 +2601,7 @@
2596
2601
  </xsl:if>
2597
2602
 
2598
2603
 
2604
+
2599
2605
  <xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
2600
2606
 
2601
2607
  </fo:inline>
@@ -3098,6 +3104,7 @@
3098
3104
  <fo:table-cell>
3099
3105
 
3100
3106
  <fo:block margin-top="6pt">
3107
+ <xsl:copy-of select="@id"/>
3101
3108
 
3102
3109
 
3103
3110
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3201,6 +3208,8 @@
3201
3208
  <xsl:if test="$font-size != ''">
3202
3209
  <xsl:attribute name="font-size">
3203
3210
  <xsl:choose>
3211
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
3212
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
3204
3213
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
3205
3214
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
3206
3215
  </xsl:choose>
@@ -3944,14 +3953,18 @@
3944
3953
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3945
3954
  <fo:inline><xsl:apply-templates/></fo:inline>
3946
3955
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3956
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3947
3957
  <fo:block id="{@id}">
3948
3958
  <xsl:apply-templates/>
3949
3959
  </fo:block>
3950
3960
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3961
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3951
3962
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3952
3963
 
3953
3964
 
3954
-
3965
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3966
+
3967
+ </xsl:if>
3955
3968
  <xsl:apply-templates/>
3956
3969
  </fo:block>
3957
3970
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4013,6 +4026,7 @@
4013
4026
  <xsl:otherwise>
4014
4027
  <fo:block xsl:use-attribute-sets="image-style">
4015
4028
 
4029
+
4016
4030
  <xsl:variable name="src">
4017
4031
  <xsl:call-template name="image_src"/>
4018
4032
  </xsl:variable>
@@ -4379,7 +4393,7 @@
4379
4393
  <xsl:text> </xsl:text>
4380
4394
  </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
4381
4395
  <xsl:value-of select="."/>
4382
- </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
4396
+ </xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
4383
4397
  <xsl:value-of select="."/>
4384
4398
  </xsl:template><xsl:template match="node()" mode="contents">
4385
4399
  <xsl:apply-templates mode="contents"/>
@@ -4477,6 +4491,8 @@
4477
4491
 
4478
4492
 
4479
4493
 
4494
+
4495
+
4480
4496
  </fo:bookmark-tree>
4481
4497
  </xsl:if>
4482
4498
  </xsl:template><xsl:template name="insertFigureBookmarks">
@@ -4670,12 +4686,16 @@
4670
4686
  <xsl:if test="$font-size != ''">
4671
4687
  <xsl:attribute name="font-size">
4672
4688
  <xsl:choose>
4689
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
4690
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
4673
4691
  <xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
4674
4692
  <xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
4675
4693
  </xsl:choose>
4676
4694
  </xsl:attribute>
4677
4695
  </xsl:if>
4678
4696
 
4697
+
4698
+
4679
4699
  <xsl:apply-templates/>
4680
4700
  </fo:block>
4681
4701
 
@@ -4918,7 +4938,8 @@
4918
4938
  </fo:block>
4919
4939
  </fo:table-cell>
4920
4940
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4921
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4941
+ <fo:block font-size="11pt">
4942
+
4922
4943
  <xsl:apply-templates/>
4923
4944
  </fo:block>
4924
4945
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -5028,6 +5049,7 @@
5028
5049
  </xsl:choose>
5029
5050
  </xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
5030
5051
  <fo:block xsl:use-attribute-sets="termsource-style">
5052
+
5031
5053
  <!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
5032
5054
  <xsl:variable name="termsource_text">
5033
5055
  <xsl:apply-templates/>
@@ -5038,13 +5060,15 @@
5038
5060
  <!-- <xsl:apply-templates /> -->
5039
5061
  <xsl:copy-of select="$termsource_text"/>
5040
5062
  </xsl:when>
5041
- <xsl:otherwise>
5063
+ <xsl:otherwise>
5064
+
5042
5065
 
5043
5066
  <xsl:text>[</xsl:text>
5044
5067
 
5045
5068
  <!-- <xsl:apply-templates /> -->
5046
5069
  <xsl:copy-of select="$termsource_text"/>
5047
5070
 
5071
+
5048
5072
  <xsl:text>]</xsl:text>
5049
5073
 
5050
5074
  </xsl:otherwise>
@@ -5111,12 +5135,20 @@
5111
5135
  </xsl:template><xsl:template match="*[local-name() = 'author']">
5112
5136
  <xsl:text>— </xsl:text>
5113
5137
  <xsl:apply-templates/>
5114
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
5138
+ </xsl:template><xsl:variable name="bibitem_hidden_">
5139
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
5140
+ <xsl:copy-of select="."/>
5141
+ </xsl:for-each>
5142
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
5143
+ <xsl:copy-of select="."/>
5144
+ </xsl:for-each>
5145
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
5115
5146
 
5116
5147
  <xsl:variable name="bibitemid">
5117
5148
  <xsl:choose>
5118
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
5119
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5149
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
5150
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
5151
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
5120
5152
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
5121
5153
  </xsl:choose>
5122
5154
  </xsl:variable>
@@ -5207,10 +5239,10 @@
5207
5239
  </xsl:choose>
5208
5240
  </xsl:variable>
5209
5241
 
5210
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
5242
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
5211
5243
 
5212
5244
  <xsl:choose>
5213
- <xsl:when test="$language = 'zh'">
5245
+ <xsl:when test="$lang = 'zh'">
5214
5246
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
5215
5247
  </xsl:when>
5216
5248
  <xsl:when test="../../@inline-header = 'true'">
@@ -6200,12 +6232,15 @@
6200
6232
  <xsl:param name="default">left</xsl:param>
6201
6233
  <xsl:attribute name="text-align">
6202
6234
  <xsl:choose>
6203
- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
6235
+ <xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
6204
6236
  <xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
6205
6237
  <xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
6206
6238
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6207
6239
  </xsl:choose>
6208
6240
  </xsl:attribute>
6241
+ <xsl:if test="@align = 'indent'">
6242
+ <xsl:attribute name="margin-left">7mm</xsl:attribute>
6243
+ </xsl:if>
6209
6244
  </xsl:template><xsl:template name="number-to-words">
6210
6245
  <xsl:param name="number"/>
6211
6246
  <xsl:param name="first"/>