metanorma-un 0.7.4 → 0.7.5

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/un/isodoc.rng +6 -2
  3. data/lib/isodoc/un/html/htmlstyle.css +24 -13
  4. data/lib/isodoc/un/html/htmlstyle.scss +15 -13
  5. data/lib/isodoc/un/html/wordstyle.css +30 -18
  6. data/lib/isodoc/un/html/wordstyle.scss +30 -18
  7. data/lib/isodoc/un/un.plenary-attachment.xsl +54 -3
  8. data/lib/isodoc/un/un.plenary.xsl +54 -3
  9. data/lib/isodoc/un/un.recommendation.xsl +54 -3
  10. data/lib/metanorma/un/version.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ccaa87ab379c84d4d55870a2d11b39c373988215c8968bcddea4d6e3a419a2dd
4
- data.tar.gz: 36d71cf8e66d7a05ee9972aecd2fc870fdb263e91eee5e7972344a1db786f000
3
+ metadata.gz: e571be88b769ac9333a8bcacd96bfa1e02b8b24e421b0d93ba912e3f9868b57d
4
+ data.tar.gz: b83c712fe918c7660831321f909555e4265c015a4536b344ce1c80bc035e1dfb
5
5
  SHA512:
6
- metadata.gz: e5ce088a501262889e1357d6fb6475f060ecd79400f7f7de3e6fa0636b5fd8f8de019a13c6f6038ea0903ba6986688712d423f1c221f1d00553a0c621520ee25
7
- data.tar.gz: 1135d540fdfc8bb6df1ff040874ff024c5d29b033a677660f3bf97bd6219ae4b1749072fb8bd433b13bb3d85c3352a2bbbfef3d27f37cedf3d996ad023c48fdf
6
+ metadata.gz: cadb83bac6c3e9ed659b1447cc1c8fd11a2c3e88cee4b6765ce3e60be3122f06aa8f5ca9129f281e78410ac2b3fe648027c534b8972fe839fb37885f99e38f86
7
+ data.tar.gz: 1a4874986efb7c85a0bcce107a25472f9f2733ebe2678d7a02fbdb911866911b4a7918dd27ee209085817059638d6f4cb681197eca894d3a7872c92512819cb6
data/lib/asciidoctor/un/isodoc.rng CHANGED
@@ -1973,7 +1973,11 @@
1973
1973
  </optional>
1974
1974
  <element name="name">
1975
1975
  <zeroOrMore>
1976
- <ref name="PureTextElement"/>
1976
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1977
1981
  </zeroOrMore>
1978
1982
  </element>
1979
1983
  <optional>
@@ -1987,7 +1991,7 @@
1987
1991
  </element>
1988
1992
  </optional>
1989
1993
  <optional>
1990
- <element name="grammar-info">
1994
+ <element name="grammar">
1991
1995
  <ref name="Grammar"/>
1992
1996
  </element>
1993
1997
  </optional>
data/lib/isodoc/un/html/htmlstyle.css CHANGED
@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
75
75
  font-family: {{monospacefont}} !important;
76
76
  font-variant-ligatures: none; }
77
77
 
78
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
79
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
80
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
81
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
82
+ font-size: {{monospacefontsize}}; }
83
+
78
84
  article, aside, details, figcaption, figure,
79
85
  footer, header, hgroup, menu, nav, section {
80
86
  display: block; }
@@ -86,6 +92,9 @@ table {
86
92
  h1, h2, h3, h4, h5, h6 {
87
93
  font-family: {{headerfont}}; }
88
94
 
95
+ .h1, .h2, .h3, .h4, .h5, .h6 {
96
+ font-family: {{headerfont}}; }
97
+
89
98
  blockquote, q {
90
99
  quotes: none; }
91
100
  blockquote:before, blockquote:after, q:before, q:after {
@@ -558,7 +567,8 @@ h3,
558
567
  h4,
559
568
  h5,
560
569
  h6,
561
- .h2Annex {
570
+ .h2Annex,
571
+ .h1, .h2, .h3, .h4, .h5, .h6 {
562
572
  font-family: {{headerfont}};
563
573
  color: #00ADEF;
564
574
  font-weight: 700;
@@ -568,38 +578,38 @@ h6,
568
578
 
569
579
  h1,
570
580
  h2,
571
- h3 {
581
+ h3, .h1, .h2, .h3 {
572
582
  margin-top: 18px;
573
583
  margin-bottom: 9px; }
574
584
 
575
- h1 {
585
+ h1, .h1 {
576
586
  font-size: 33px;
577
587
  font-weight: 500;
578
588
  margin: 0.67em 0;
579
589
  letter-spacing: -0.02em;
580
590
  color: #4D4D4D; }
581
591
 
582
- h2 {
592
+ h2, .h2 {
583
593
  font-size: 27px;
584
594
  color: #4D4D4D; }
585
595
 
586
- h3 {
596
+ h3, .h3 {
587
597
  font-size: 24px;
588
598
  margin-top: 26px;
589
599
  color: #000; }
590
600
 
591
- h4 {
601
+ h4, .h4 {
592
602
  font-size: 18.2px;
593
603
  margin-bottom: 2px;
594
604
  color: #4D4D4D;
595
605
  letter-spacing: 0.03em; }
596
606
 
597
- h5 {
607
+ h5, .h5 {
598
608
  font-size: 16.25px;
599
609
  color: #000;
600
610
  margin-bottom: 2px; }
601
611
 
602
- h6 {
612
+ h6, .h6 {
603
613
  font-size: 13px;
604
614
  color: #4D4D4D;
605
615
  letter-spacing: 0.05em; }
@@ -893,7 +903,7 @@ p {
893
903
  margin-bottom: 1em;
894
904
  margin-top: 1em; }
895
905
 
896
- h2 p {
906
+ h2 p, .h2 p {
897
907
  display: inline; }
898
908
 
899
909
  /*
@@ -1057,7 +1067,8 @@ To top button
1057
1067
  h1,
1058
1068
  h2,
1059
1069
  h3,
1060
- h4 {
1070
+ h4,
1071
+ .h1, .h2, .h3, .h4 {
1061
1072
  page-break-after: avoid;
1062
1073
  margin-top: 1.2em; }
1063
1074
  .note,
@@ -1089,12 +1100,12 @@ To top button
1089
1100
  h1.content {
1090
1101
  line-height: 2.5em;
1091
1102
  margin-top: 2em; }
1092
- h1 {
1103
+ h1, .h1 {
1093
1104
  font-size: 1.5em;
1094
1105
  line-height: 1.5; }
1095
- h2 {
1106
+ h2, .h2 {
1096
1107
  font-size: 1.2em; }
1097
- h3 {
1108
+ h3, .h3 {
1098
1109
  font-size: 1em; }
1099
1110
  .Note {
1100
1111
  background-color: #fff495;
data/lib/isodoc/un/html/htmlstyle.scss CHANGED
@@ -268,7 +268,8 @@ h3,
268
268
  h4,
269
269
  h5,
270
270
  h6,
271
- .h2Annex {
271
+ .h2Annex,
272
+ .h1, .h2, .h3, .h4, .h5, .h6 {
272
273
  font-family: $headerfont;
273
274
  color: $un-blue;
274
275
  font-weight: 700;
@@ -279,12 +280,12 @@ h6,
279
280
 
280
281
  h1,
281
282
  h2,
282
- h3 {
283
+ h3, .h1, .h2, .h3 {
283
284
  margin-top: 18px;
284
285
  margin-bottom: 9px;
285
286
  }
286
287
 
287
- h1 {
288
+ h1, .h1 {
288
289
  font-size: 33px;
289
290
  font-weight: 500;
290
291
  margin: 0.67em 0;
@@ -293,31 +294,31 @@ h1 {
293
294
  }
294
295
 
295
296
 
296
- h2 {
297
+ h2, .h2 {
297
298
  font-size: 27px;
298
299
  color: $un-label;
299
300
  }
300
301
 
301
- h3 {
302
+ h3, .h3 {
302
303
  font-size: 24px;
303
304
  margin-top: 26px;
304
305
  color: $un-black;
305
306
  }
306
307
 
307
- h4 {
308
+ h4, .h4 {
308
309
  font-size: 18.2px;
309
310
  margin-bottom: 2px;
310
311
  color: $un-label;
311
312
  letter-spacing: 0.03em;
312
313
  }
313
314
 
314
- h5 {
315
+ h5, .h5 {
315
316
  font-size: 16.25px;
316
317
  color: $un-black;
317
318
  margin-bottom: 2px;
318
319
  }
319
320
 
320
- h6 {
321
+ h6, .h6 {
321
322
  font-size: 13px;
322
323
  color: $un-label;
323
324
  letter-spacing: 0.05em;
@@ -607,7 +608,7 @@ p {
607
608
  margin-top: 1em;
608
609
  }
609
610
 
610
- h2 p {
611
+ h2 p, .h2 p {
611
612
  display: inline;
612
613
  }
613
614
 
@@ -791,7 +792,8 @@ To top button
791
792
  h1,
792
793
  h2,
793
794
  h3,
794
- h4 {
795
+ h4,
796
+ .h1, .h2, .h3, .h4 {
795
797
  page-break-after: avoid;
796
798
  margin-top: 1.2em;
797
799
  }
@@ -847,16 +849,16 @@ To top button
847
849
  margin-top: 2em;
848
850
  }
849
851
 
850
- h1 {
852
+ h1, .h1 {
851
853
  font-size: 1.5em;
852
854
  line-height: 1.5;
853
855
  }
854
856
 
855
- h2 {
857
+ h2, .h2 {
856
858
  font-size: 1.2em;
857
859
  }
858
860
 
859
- h3 {
861
+ h3, .h3 {
860
862
  font-size: 1em;
861
863
  }
862
864
 
data/lib/isodoc/un/html/wordstyle.css CHANGED
@@ -366,7 +366,7 @@ span.blackgraphtx {
366
366
  div.figure, p.figure {
367
367
  text-align: center; }
368
368
 
369
- h1 {
369
+ h1, .h1 {
370
370
  mso-style-priority: 1;
371
371
  mso-style-unhide: no;
372
372
  mso-style-qformat: yes;
@@ -381,8 +381,6 @@ h1 {
381
381
  line-height: 13.5pt;
382
382
  mso-pagination: widow-orphan;
383
383
  page-break-after: avoid;
384
- mso-outline-level: 1;
385
- mso-list: l1 level1 lfo6;
386
384
  mso-hyphenate: none;
387
385
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
388
386
  font-size: 13.0pt;
@@ -394,6 +392,10 @@ h1 {
394
392
  mso-fareast-language: JA;
395
393
  mso-bidi-font-weight: normal; }
396
394
 
395
+ h1 {
396
+ mso-outline-level: 1;
397
+ mso-list: l1 level1 lfo6; }
398
+
397
399
  h1.Annex {
398
400
  mso-style-priority: 1;
399
401
  mso-style-unhide: no;
@@ -450,7 +452,7 @@ h1.Annex {
450
452
  mso-fareast-language: JA;
451
453
  mso-bidi-font-weight: normal; }
452
454
 
453
- h2 {
455
+ h2, .h2 {
454
456
  mso-style-priority: 2;
455
457
  mso-style-unhide: no;
456
458
  mso-style-qformat: yes;
@@ -465,8 +467,6 @@ h2 {
465
467
  line-height: 12.5pt;
466
468
  mso-pagination: widow-orphan;
467
469
  page-break-after: avoid;
468
- mso-outline-level: 2;
469
- mso-list: l1 level2 lfo6;
470
470
  mso-hyphenate: none;
471
471
  tab-stops: 27.0pt 35.0pt;
472
472
  font-size: 12.0pt;
@@ -477,7 +477,11 @@ h2 {
477
477
  mso-fareast-language: JA;
478
478
  mso-bidi-font-weight: normal; }
479
479
 
480
- h3 {
480
+ h2 {
481
+ mso-outline-level: 2;
482
+ mso-list: l1 level2 lfo6; }
483
+
484
+ h3, .h3 {
481
485
  mso-style-priority: 3;
482
486
  mso-style-unhide: no;
483
487
  mso-style-qformat: yes;
@@ -493,8 +497,6 @@ h3 {
493
497
  line-height: 12.0pt;
494
498
  mso-pagination: widow-orphan;
495
499
  page-break-after: avoid;
496
- mso-outline-level: 3;
497
- mso-list: l1 level3 lfo6;
498
500
  mso-hyphenate: none;
499
501
  tab-stops: list 27.0pt left 44.0pt;
500
502
  font-size: 11.0pt;
@@ -504,7 +506,11 @@ h3 {
504
506
  mso-fareast-language: JA;
505
507
  mso-bidi-font-weight: normal; }
506
508
 
507
- h4 {
509
+ h3 {
510
+ mso-outline-level: 3;
511
+ mso-list: l1 level3 lfo6; }
512
+
513
+ h4, .h4 {
508
514
  mso-style-priority: 4;
509
515
  mso-style-unhide: no;
510
516
  mso-style-qformat: yes;
@@ -520,8 +526,6 @@ h4 {
520
526
  line-height: 12.0pt;
521
527
  mso-pagination: widow-orphan;
522
528
  page-break-after: avoid;
523
- mso-outline-level: 4;
524
- mso-list: l1 level4 lfo6;
525
529
  mso-hyphenate: none;
526
530
  tab-stops: 51.05pt 57.0pt 68.0pt;
527
531
  font-size: 11.0pt;
@@ -531,7 +535,11 @@ h4 {
531
535
  mso-fareast-language: JA;
532
536
  mso-bidi-font-weight: normal; }
533
537
 
534
- h5 {
538
+ h4 {
539
+ mso-outline-level: 4;
540
+ mso-list: l1 level4 lfo6; }
541
+
542
+ h5, .h5 {
535
543
  mso-style-priority: 5;
536
544
  mso-style-unhide: no;
537
545
  mso-style-qformat: yes;
@@ -547,8 +555,6 @@ h5 {
547
555
  line-height: 12.0pt;
548
556
  mso-pagination: widow-orphan;
549
557
  page-break-after: avoid;
550
- mso-outline-level: 5;
551
- mso-list: l1 level5 lfo6;
552
558
  mso-hyphenate: none;
553
559
  tab-stops: 51.05pt list 54.0pt;
554
560
  font-size: 11.0pt;
@@ -558,7 +564,11 @@ h5 {
558
564
  mso-fareast-language: JA;
559
565
  mso-bidi-font-weight: normal; }
560
566
 
561
- h6 {
567
+ h5 {
568
+ mso-outline-level: 5;
569
+ mso-list: l1 level5 lfo6; }
570
+
571
+ h6, .h6 {
562
572
  mso-style-priority: 6;
563
573
  mso-style-unhide: no;
564
574
  mso-style-qformat: yes;
@@ -574,8 +584,6 @@ h6 {
574
584
  line-height: 12.0pt;
575
585
  mso-pagination: widow-orphan;
576
586
  page-break-after: avoid;
577
- mso-outline-level: 6;
578
- mso-list: l1 level6 lfo6;
579
587
  mso-hyphenate: none;
580
588
  tab-stops: 51.05pt list 72.0pt;
581
589
  font-size: 11.0pt;
@@ -585,6 +593,10 @@ h6 {
585
593
  mso-fareast-language: JA;
586
594
  mso-bidi-font-weight: normal; }
587
595
 
596
+ h6 {
597
+ mso-outline-level: 6;
598
+ mso-list: l1 level6 lfo6; }
599
+
588
600
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
589
601
  mso-style-priority: 39;
590
602
  mso-style-unhide: no;
data/lib/isodoc/un/html/wordstyle.scss CHANGED
@@ -335,7 +335,7 @@ div.figure, p.figure
335
335
  {text-align: center;}
336
336
 
337
337
 
338
- h1
338
+ h1, .h1
339
339
  {mso-style-priority:1;
340
340
  mso-style-unhide:no;
341
341
  mso-style-qformat:yes;
@@ -350,8 +350,6 @@ h1
350
350
  line-height:13.5pt;
351
351
  mso-pagination:widow-orphan;
352
352
  page-break-after:avoid;
353
- mso-outline-level:1;
354
- mso-list:l1 level1 lfo6;
355
353
  mso-hyphenate:none;
356
354
  tab-stops:20.0pt list 21.6pt left 28.0pt;
357
355
  font-size:13.0pt;
@@ -362,6 +360,10 @@ h1
362
360
  mso-ansi-language:EN-GB;
363
361
  mso-fareast-language:JA;
364
362
  mso-bidi-font-weight:normal;}
363
+ h1 {
364
+ mso-outline-level:1;
365
+ mso-list:l1 level1 lfo6;
366
+ }
365
367
  h1.Annex
366
368
  {mso-style-priority:1;
367
369
  mso-style-unhide:no;
@@ -416,7 +418,7 @@ h1.Annex
416
418
  mso-ansi-language:EN-GB;
417
419
  mso-fareast-language:JA;
418
420
  mso-bidi-font-weight:normal;}
419
- h2
421
+ h2, .h2
420
422
  {mso-style-priority:2;
421
423
  mso-style-unhide:no;
422
424
  mso-style-qformat:yes;
@@ -431,8 +433,6 @@ h2
431
433
  line-height:12.5pt;
432
434
  mso-pagination:widow-orphan;
433
435
  page-break-after:avoid;
434
- mso-outline-level:2;
435
- mso-list:l1 level2 lfo6;
436
436
  mso-hyphenate:none;
437
437
  tab-stops:27.0pt 35.0pt;
438
438
  font-size:12.0pt;
@@ -442,7 +442,11 @@ h2
442
442
  mso-ansi-language:EN-GB;
443
443
  mso-fareast-language:JA;
444
444
  mso-bidi-font-weight:normal;}
445
- h3
445
+ h2 {
446
+ mso-outline-level:2;
447
+ mso-list:l1 level2 lfo6;
448
+ }
449
+ h3, .h3
446
450
  {mso-style-priority:3;
447
451
  mso-style-unhide:no;
448
452
  mso-style-qformat:yes;
@@ -458,8 +462,6 @@ h3
458
462
  line-height:12.0pt;
459
463
  mso-pagination:widow-orphan;
460
464
  page-break-after:avoid;
461
- mso-outline-level:3;
462
- mso-list:l1 level3 lfo6;
463
465
  mso-hyphenate:none;
464
466
  tab-stops:list 27.0pt left 44.0pt;
465
467
  font-size:11.0pt;
@@ -468,7 +470,11 @@ h3
468
470
  mso-ansi-language:EN-GB;
469
471
  mso-fareast-language:JA;
470
472
  mso-bidi-font-weight:normal;}
471
- h4
473
+ h3 {
474
+ mso-outline-level:3;
475
+ mso-list:l1 level3 lfo6;
476
+ }
477
+ h4, .h4
472
478
  {mso-style-priority:4;
473
479
  mso-style-unhide:no;
474
480
  mso-style-qformat:yes;
@@ -484,8 +490,6 @@ h4
484
490
  line-height:12.0pt;
485
491
  mso-pagination:widow-orphan;
486
492
  page-break-after:avoid;
487
- mso-outline-level:4;
488
- mso-list:l1 level4 lfo6;
489
493
  mso-hyphenate:none;
490
494
  tab-stops:51.05pt 57.0pt 68.0pt;
491
495
  font-size:11.0pt;
@@ -494,7 +498,11 @@ h4
494
498
  mso-ansi-language:EN-GB;
495
499
  mso-fareast-language:JA;
496
500
  mso-bidi-font-weight:normal;}
497
- h5
501
+ h4 {
502
+ mso-outline-level:4;
503
+ mso-list:l1 level4 lfo6;
504
+ }
505
+ h5, .h5
498
506
  {mso-style-priority:5;
499
507
  mso-style-unhide:no;
500
508
  mso-style-qformat:yes;
@@ -510,8 +518,6 @@ h5
510
518
  line-height:12.0pt;
511
519
  mso-pagination:widow-orphan;
512
520
  page-break-after:avoid;
513
- mso-outline-level:5;
514
- mso-list:l1 level5 lfo6;
515
521
  mso-hyphenate:none;
516
522
  tab-stops:51.05pt list 54.0pt;
517
523
  font-size:11.0pt;
@@ -520,7 +526,11 @@ h5
520
526
  mso-ansi-language:EN-GB;
521
527
  mso-fareast-language:JA;
522
528
  mso-bidi-font-weight:normal;}
523
- h6
529
+ h5 {
530
+ mso-outline-level:5;
531
+ mso-list:l1 level5 lfo6;
532
+ }
533
+ h6, .h6
524
534
  {mso-style-priority:6;
525
535
  mso-style-unhide:no;
526
536
  mso-style-qformat:yes;
@@ -536,8 +546,6 @@ h6
536
546
  line-height:12.0pt;
537
547
  mso-pagination:widow-orphan;
538
548
  page-break-after:avoid;
539
- mso-outline-level:6;
540
- mso-list:l1 level6 lfo6;
541
549
  mso-hyphenate:none;
542
550
  tab-stops:51.05pt list 72.0pt;
543
551
  font-size:11.0pt;
@@ -546,6 +554,10 @@ h6
546
554
  mso-ansi-language:EN-GB;
547
555
  mso-fareast-language:JA;
548
556
  mso-bidi-font-weight:normal;}
557
+ h6 {
558
+ mso-outline-level:6;
559
+ mso-list:l1 level6 lfo6;
560
+ }
549
561
  p.MsoToc1, li.MsoToc1, div.MsoToc1
550
562
  {mso-style-priority:39;
551
563
  mso-style-unhide:no;
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -591,8 +591,9 @@
591
591
  <fo:list-item-label end-indent="label-end()">
592
592
  <fo:block>
593
593
  <xsl:choose>
594
- <!-- <xsl:when test="local-name(..) = 'ul'">&#x2014;</xsl:when> --> <!-- dash -->
595
- <xsl:when test="local-name(..) = 'ul'">•</xsl:when>
594
+ <xsl:when test="local-name(..) = 'ul'">
595
+ <xsl:call-template name="setULLabel"/>
596
+ </xsl:when>
596
597
  <xsl:otherwise> <!-- for ordered lists -->
597
598
  <xsl:choose>
598
599
  <xsl:when test="../@type = 'arabic'">
@@ -733,7 +734,7 @@
733
734
 
734
735
  <xsl:template match="un:title[parent::un:clause[@inline-header = 'true']]" priority="3"/>
735
736
 
736
- <xsl:template match="un:title">
737
+ <xsl:template match="un:title" name="title">
737
738
 
738
739
  <xsl:variable name="level">
739
740
  <xsl:call-template name="getLevel"/>
@@ -3314,6 +3315,7 @@
3314
3315
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3315
3316
  <xsl:apply-templates/>
3316
3317
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3318
+ <xsl:apply-templates select="@language"/>
3317
3319
  <xsl:apply-templates/>
3318
3320
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3319
3321
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -5530,6 +5532,51 @@
5530
5532
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5531
5533
  <!-- 0xA0 to space replacement -->
5532
5534
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5535
+ </xsl:template><xsl:variable name="ul_labels_">
5536
+
5537
+
5538
+
5539
+
5540
+
5541
+
5542
+
5543
+
5544
+
5545
+
5546
+
5547
+
5548
+
5549
+
5550
+
5551
+
5552
+ <label>•</label>
5553
+
5554
+
5555
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5556
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5557
+ <xsl:variable name="list_level">
5558
+ <xsl:choose>
5559
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5560
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5561
+ </xsl:choose>
5562
+ </xsl:variable>
5563
+ <xsl:choose>
5564
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5565
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5566
+ </xsl:when>
5567
+ <xsl:when test="$list_level mod 3 = 0">
5568
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5569
+ </xsl:when>
5570
+ <xsl:when test="$list_level mod 2 = 0">
5571
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5572
+ </xsl:when>
5573
+ <xsl:otherwise>
5574
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5575
+ </xsl:otherwise>
5576
+ </xsl:choose>
5577
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5578
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5579
+ <xsl:value-of select="."/>
5533
5580
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5534
5581
  <xsl:choose>
5535
5582
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5983,6 +6030,10 @@
5983
6030
  </svg>
5984
6031
  </fo:instream-foreign-object>
5985
6032
  </fo:inline>
6033
+ </xsl:template><xsl:template match="@language">
6034
+ <xsl:copy-of select="."/>
6035
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
6036
+ <xsl:call-template name="title"/>
5986
6037
  </xsl:template><xsl:template name="convertDate">
5987
6038
  <xsl:param name="date"/>
5988
6039
  <xsl:param name="format" select="'short'"/>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -591,8 +591,9 @@
591
591
  <fo:list-item-label end-indent="label-end()">
592
592
  <fo:block>
593
593
  <xsl:choose>
594
- <!-- <xsl:when test="local-name(..) = 'ul'">&#x2014;</xsl:when> --> <!-- dash -->
595
- <xsl:when test="local-name(..) = 'ul'">•</xsl:when>
594
+ <xsl:when test="local-name(..) = 'ul'">
595
+ <xsl:call-template name="setULLabel"/>
596
+ </xsl:when>
596
597
  <xsl:otherwise> <!-- for ordered lists -->
597
598
  <xsl:choose>
598
599
  <xsl:when test="../@type = 'arabic'">
@@ -733,7 +734,7 @@
733
734
 
734
735
  <xsl:template match="un:title[parent::un:clause[@inline-header = 'true']]" priority="3"/>
735
736
 
736
- <xsl:template match="un:title">
737
+ <xsl:template match="un:title" name="title">
737
738
 
738
739
  <xsl:variable name="level">
739
740
  <xsl:call-template name="getLevel"/>
@@ -3314,6 +3315,7 @@
3314
3315
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3315
3316
  <xsl:apply-templates/>
3316
3317
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3318
+ <xsl:apply-templates select="@language"/>
3317
3319
  <xsl:apply-templates/>
3318
3320
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3319
3321
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -5530,6 +5532,51 @@
5530
5532
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5531
5533
  <!-- 0xA0 to space replacement -->
5532
5534
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5535
+ </xsl:template><xsl:variable name="ul_labels_">
5536
+
5537
+
5538
+
5539
+
5540
+
5541
+
5542
+
5543
+
5544
+
5545
+
5546
+
5547
+
5548
+
5549
+
5550
+
5551
+
5552
+ <label>•</label>
5553
+
5554
+
5555
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5556
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5557
+ <xsl:variable name="list_level">
5558
+ <xsl:choose>
5559
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5560
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5561
+ </xsl:choose>
5562
+ </xsl:variable>
5563
+ <xsl:choose>
5564
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5565
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5566
+ </xsl:when>
5567
+ <xsl:when test="$list_level mod 3 = 0">
5568
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5569
+ </xsl:when>
5570
+ <xsl:when test="$list_level mod 2 = 0">
5571
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5572
+ </xsl:when>
5573
+ <xsl:otherwise>
5574
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5575
+ </xsl:otherwise>
5576
+ </xsl:choose>
5577
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5578
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5579
+ <xsl:value-of select="."/>
5533
5580
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5534
5581
  <xsl:choose>
5535
5582
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5983,6 +6030,10 @@
5983
6030
  </svg>
5984
6031
  </fo:instream-foreign-object>
5985
6032
  </fo:inline>
6033
+ </xsl:template><xsl:template match="@language">
6034
+ <xsl:copy-of select="."/>
6035
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
6036
+ <xsl:call-template name="title"/>
5986
6037
  </xsl:template><xsl:template name="convertDate">
5987
6038
  <xsl:param name="date"/>
5988
6039
  <xsl:param name="format" select="'short'"/>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -630,8 +630,9 @@
630
630
  <fo:list-item-label end-indent="label-end()">
631
631
  <fo:block>
632
632
  <xsl:choose>
633
- <!-- <xsl:when test="local-name(..) = 'ul'">&#x2014;</xsl:when> --> <!-- dash -->
634
- <xsl:when test="local-name(..) = 'ul'">•</xsl:when>
633
+ <xsl:when test="local-name(..) = 'ul'">
634
+ <xsl:call-template name="setULLabel"/>
635
+ </xsl:when>
635
636
  <xsl:otherwise> <!-- for ordered lists -->
636
637
  <xsl:choose>
637
638
  <xsl:when test="../@type = 'arabic'">
@@ -763,7 +764,7 @@
763
764
 
764
765
  <xsl:template match="un:title[parent::un:clause[@inline-header = 'true']]" priority="3"/>
765
766
 
766
- <xsl:template match="un:title">
767
+ <xsl:template match="un:title" name="title">
767
768
 
768
769
  <xsl:variable name="level">
769
770
  <xsl:call-template name="getLevel"/>
@@ -3273,6 +3274,7 @@
3273
3274
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3274
3275
  <xsl:apply-templates/>
3275
3276
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3277
+ <xsl:apply-templates select="@language"/>
3276
3278
  <xsl:apply-templates/>
3277
3279
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3278
3280
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -5498,6 +5500,51 @@
5498
5500
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5499
5501
  <!-- 0xA0 to space replacement -->
5500
5502
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5503
+ </xsl:template><xsl:variable name="ul_labels_">
5504
+
5505
+
5506
+
5507
+
5508
+
5509
+
5510
+
5511
+
5512
+
5513
+
5514
+
5515
+
5516
+
5517
+
5518
+
5519
+
5520
+
5521
+ <label>•</label>
5522
+
5523
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5524
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5525
+ <xsl:variable name="list_level">
5526
+ <xsl:choose>
5527
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5528
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5529
+ </xsl:choose>
5530
+ </xsl:variable>
5531
+ <xsl:choose>
5532
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5533
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5534
+ </xsl:when>
5535
+ <xsl:when test="$list_level mod 3 = 0">
5536
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5537
+ </xsl:when>
5538
+ <xsl:when test="$list_level mod 2 = 0">
5539
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5540
+ </xsl:when>
5541
+ <xsl:otherwise>
5542
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5543
+ </xsl:otherwise>
5544
+ </xsl:choose>
5545
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5546
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5547
+ <xsl:value-of select="."/>
5501
5548
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5502
5549
  <xsl:choose>
5503
5550
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5951,6 +5998,10 @@
5951
5998
  </svg>
5952
5999
  </fo:instream-foreign-object>
5953
6000
  </fo:inline>
6001
+ </xsl:template><xsl:template match="@language">
6002
+ <xsl:copy-of select="."/>
6003
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
6004
+ <xsl:call-template name="title"/>
5954
6005
  </xsl:template><xsl:template name="convertDate">
5955
6006
  <xsl:param name="date"/>
5956
6007
  <xsl:param name="format" select="'short'"/>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.7.4".freeze
3
+ VERSION = "0.7.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.4
4
+ version: 0.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-12-13 00:00:00.000000000 Z
11
+ date: 2021-12-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639