metanorma-iho 0.4.4 → 0.4.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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iho/isodoc.rng +6 -2
  3. data/lib/isodoc/iho/html/htmlstyle.css +22 -11
  4. data/lib/isodoc/iho/html/htmlstyle.scss +13 -11
  5. data/lib/isodoc/iho/html/wordstyle.css +30 -18
  6. data/lib/isodoc/iho/html/wordstyle.scss +30 -18
  7. data/lib/isodoc/iho/iho.specification.xsl +54 -2
  8. data/lib/isodoc/iho/iho.standard.xsl +54 -2
  9. data/lib/metanorma/iho/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 587ec460bc251b89adf66c9dbec0b095719d2efbc0e73ad99fdf476aa7f53d0a
4
- data.tar.gz: 2362fd44a6030540f43abf8c85f2ceaacbb5dbdb1c2bb5244bae225d46c650d9
3
+ metadata.gz: fe0847c09cfdfde2e17055709884e36114585df1c82e72ca972959da5537b915
4
+ data.tar.gz: 61017f76453d1a730328e274a5f6b150c0761c69340cbd92244b2ce1fc01efba
5
5
  SHA512:
6
- metadata.gz: 3bcf07f81a1c70c40a04400e944cbf8642720273f04c0dc8bcc14a3e8c7bc8da78ce028bf410598768dff2316d5624643e3d618e815bc072ba21a94f7bb56ebb
7
- data.tar.gz: 28467c427d0465e9351d4949ee68d1182ea7672770a154435a3bd82daacc82891f2e1d5ff2e09ecd58841a3c9f9f42982c1c9a201466713cd2b7a0d358adfc60
6
+ metadata.gz: e4be9b3b344e0ea3c98bf779a1880770a97a5099c56857ecce0d2f55b05ad34d67288b092b71d10a25d520da7b6777bb41d648bb1fba6e2451ca34d15a66d34d
7
+ data.tar.gz: d67e94e5dc7b1460503b60da913339dd59e46b709917e97af3daa064b67ef21c586333f8860b36fcb15e2301a960bf44f86340c87c0effbe0c0a8685085fa37d
data/lib/asciidoctor/iho/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/iho/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 {
@@ -537,27 +546,28 @@ h2,
537
546
  h3,
538
547
  h4,
539
548
  h5,
540
- h6 {
549
+ h6,
550
+ .h1, .h2, .h3, .h4, .h5, .h6 {
541
551
  font-family: {{headerfont}};
542
552
  color: #05164D;
543
553
  font-weight: 300;
544
554
  margin-top: 1.6em;
545
555
  margin-bottom: 0.3em; }
546
556
 
547
- h1 {
557
+ h1, .h1 {
548
558
  font-size: 1.6em;
549
559
  text-transform: uppercase;
550
560
  margin-top: 2em; }
551
561
 
552
- h1#content {
562
+ h1#content, #content.h1 {
553
563
  margin-top: 2em; }
554
564
 
555
- h2 {
565
+ h2, .h2 {
556
566
  margin-top: 1.3em;
557
567
  font-size: 1.3em;
558
568
  font-weight: 400; }
559
569
 
560
- h3 {
570
+ h3, .h3 {
561
571
  margin-top: 1.1em;
562
572
  font-size: 1.1em;
563
573
  font-weight: 100; }
@@ -842,7 +852,7 @@ p {
842
852
  margin-top: 1em;
843
853
  margin-bottom: 1em; }
844
854
 
845
- h2 p {
855
+ h2 p, .h2 p {
846
856
  display: inline; }
847
857
 
848
858
  /*
@@ -975,7 +985,8 @@ To top button
975
985
  h1,
976
986
  h2,
977
987
  h3,
978
- h4 {
988
+ h4,
989
+ .h1, .h2, .h3, .h4 {
979
990
  page-break-after: avoid;
980
991
  margin-top: 1.2em; }
981
992
  .note,
@@ -998,15 +1009,15 @@ To top button
998
1009
  background-color: white; }
999
1010
  .container {
1000
1011
  padding-left: 0; }
1001
- h1.content {
1012
+ h1.content, .h1.content {
1002
1013
  margin-top: 2em;
1003
1014
  line-height: 2.5em; }
1004
- h1 {
1015
+ h1, .h1 {
1005
1016
  font-size: 1.5em;
1006
1017
  line-height: 1.5; }
1007
- h2 {
1018
+ h2, .h2 {
1008
1019
  font-size: 1.2em; }
1009
- h3 {
1020
+ h3, .h3 {
1010
1021
  font-size: 1em; }
1011
1022
  .Note {
1012
1023
  background-color: #fedc5b;
data/lib/isodoc/iho/html/htmlstyle.scss CHANGED
@@ -203,7 +203,8 @@ h2,
203
203
  h3,
204
204
  h4,
205
205
  h5,
206
- h6 {
206
+ h6,
207
+ .h1, .h2, .h3, .h4, .h5, .h6 {
207
208
  font-family: $headerfont;
208
209
  color: #05164D;
209
210
  font-weight: 300;
@@ -211,23 +212,23 @@ h6 {
211
212
  margin-bottom: 0.3em;
212
213
  }
213
214
 
214
- h1 {
215
+ h1, .h1 {
215
216
  font-size: 1.6em;
216
217
  text-transform: uppercase;
217
218
  margin-top: 2em;
218
219
  }
219
220
 
220
- h1#content {
221
+ h1#content, .h1#content {
221
222
  margin-top: 2em;
222
223
  }
223
224
 
224
- h2 {
225
+ h2, .h2 {
225
226
  margin-top: 1.3em;
226
227
  font-size: 1.3em;
227
228
  font-weight: 400;
228
229
  }
229
230
 
230
- h3 {
231
+ h3, .h3 {
231
232
  margin-top: 1.1em;
232
233
  font-size: 1.1em;
233
234
  font-weight: 100;
@@ -503,7 +504,7 @@ p {
503
504
  margin-bottom: 1em;
504
505
  }
505
506
 
506
- h2 p {
507
+ h2 p, .h2 p {
507
508
  display: inline;
508
509
  }
509
510
 
@@ -681,7 +682,8 @@ To top button
681
682
  h1,
682
683
  h2,
683
684
  h3,
684
- h4 {
685
+ h4,
686
+ .h1, .h2, .h3, .h4 {
685
687
  page-break-after: avoid;
686
688
  margin-top: 1.2em;
687
689
  }
@@ -720,21 +722,21 @@ To top button
720
722
  padding-left: 0;
721
723
  }
722
724
 
723
- h1.content {
725
+ h1.content, .h1.content {
724
726
  margin-top: 2em;
725
727
  line-height: 2.5em;
726
728
  }
727
729
 
728
- h1 {
730
+ h1, .h1 {
729
731
  font-size: 1.5em;
730
732
  line-height: 1.5;
731
733
  }
732
734
 
733
- h2 {
735
+ h2, .h2 {
734
736
  font-size: 1.2em
735
737
  }
736
738
 
737
- h3 {
739
+ h3, .h3 {
738
740
  font-size: 1em;
739
741
  }
740
742
 
data/lib/isodoc/iho/html/wordstyle.css CHANGED
@@ -370,7 +370,7 @@ span.blackgraphtx {
370
370
  div.figure, p.figure {
371
371
  text-align: center; }
372
372
 
373
- h1 {
373
+ h1, .h1 {
374
374
  mso-style-priority: 1;
375
375
  mso-style-unhide: no;
376
376
  mso-style-qformat: yes;
@@ -385,8 +385,6 @@ h1 {
385
385
  line-height: 13.5pt;
386
386
  mso-pagination: widow-orphan;
387
387
  page-break-after: avoid;
388
- mso-outline-level: 1;
389
- mso-list: l1 level1 lfo6;
390
388
  mso-hyphenate: none;
391
389
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
392
390
  font-size: 13.0pt;
@@ -399,6 +397,10 @@ h1 {
399
397
  mso-fareast-language: JA;
400
398
  mso-bidi-font-weight: normal; }
401
399
 
400
+ h1 {
401
+ mso-outline-level: 1;
402
+ mso-list: l1 level1 lfo6; }
403
+
402
404
  h1.Annex {
403
405
  mso-style-priority: 1;
404
406
  mso-style-unhide: no;
@@ -456,7 +458,7 @@ h1.Annex {
456
458
  mso-fareast-language: JA;
457
459
  mso-bidi-font-weight: normal; }
458
460
 
459
- h2 {
461
+ h2, .h2 {
460
462
  mso-style-priority: 2;
461
463
  mso-style-unhide: no;
462
464
  mso-style-qformat: yes;
@@ -472,8 +474,6 @@ h2 {
472
474
  line-height: 12.5pt;
473
475
  mso-pagination: widow-orphan;
474
476
  page-break-after: avoid;
475
- mso-outline-level: 2;
476
- mso-list: l1 level2 lfo6;
477
477
  mso-hyphenate: none;
478
478
  tab-stops: 27.0pt 35.0pt;
479
479
  font-size: {{normalfontsize}};
@@ -485,7 +485,11 @@ h2 {
485
485
  mso-fareast-language: JA;
486
486
  mso-bidi-font-weight: normal; }
487
487
 
488
- h3 {
488
+ h2 {
489
+ mso-outline-level: 2;
490
+ mso-list: l1 level2 lfo6; }
491
+
492
+ h3, .h3 {
489
493
  mso-style-priority: 3;
490
494
  mso-style-unhide: no;
491
495
  mso-style-qformat: yes;
@@ -501,8 +505,6 @@ h3 {
501
505
  line-height: {{normalfontsize}};
502
506
  mso-pagination: widow-orphan;
503
507
  page-break-after: avoid;
504
- mso-outline-level: 3;
505
- mso-list: l1 level3 lfo6;
506
508
  mso-hyphenate: none;
507
509
  tab-stops: list 36.0pt left 44.0pt;
508
510
  font-size: {{smallerfontsize}};
@@ -513,7 +515,11 @@ h3 {
513
515
  mso-fareast-language: JA;
514
516
  mso-bidi-font-weight: normal; }
515
517
 
516
- h4 {
518
+ h3 {
519
+ mso-outline-level: 3;
520
+ mso-list: l1 level3 lfo6; }
521
+
522
+ h4, .h4 {
517
523
  mso-style-priority: 4;
518
524
  mso-style-unhide: no;
519
525
  mso-style-qformat: yes;
@@ -529,8 +535,6 @@ h4 {
529
535
  line-height: {{normalfontsize}};
530
536
  mso-pagination: widow-orphan;
531
537
  page-break-after: avoid;
532
- mso-outline-level: 4;
533
- mso-list: l1 level4 lfo6;
534
538
  mso-hyphenate: none;
535
539
  tab-stops: 51.05pt 57.0pt 68.0pt;
536
540
  font-size: {{smallerfontsize}};
@@ -541,7 +545,11 @@ h4 {
541
545
  mso-fareast-language: JA;
542
546
  mso-bidi-font-weight: normal; }
543
547
 
544
- h5 {
548
+ h4 {
549
+ mso-outline-level: 4;
550
+ mso-list: l1 level4 lfo6; }
551
+
552
+ h5, .h5 {
545
553
  mso-style-priority: 5;
546
554
  mso-style-unhide: no;
547
555
  mso-style-qformat: yes;
@@ -557,8 +565,6 @@ h5 {
557
565
  line-height: {{normalfontsize}};
558
566
  mso-pagination: widow-orphan;
559
567
  page-break-after: avoid;
560
- mso-outline-level: 5;
561
- mso-list: l1 level5 lfo6;
562
568
  mso-hyphenate: none;
563
569
  tab-stops: 51.05pt list 54.0pt;
564
570
  font-size: {{smallerfontsize}};
@@ -569,7 +575,11 @@ h5 {
569
575
  mso-fareast-language: JA;
570
576
  mso-bidi-font-weight: normal; }
571
577
 
572
- h6 {
578
+ h5 {
579
+ mso-outline-level: 5;
580
+ mso-list: l1 level5 lfo6; }
581
+
582
+ h6, .h6 {
573
583
  mso-style-priority: 6;
574
584
  mso-style-unhide: no;
575
585
  mso-style-qformat: yes;
@@ -585,8 +595,6 @@ h6 {
585
595
  line-height: {{normalfontsize}};
586
596
  mso-pagination: widow-orphan;
587
597
  page-break-after: avoid;
588
- mso-outline-level: 6;
589
- mso-list: l1 level6 lfo6;
590
598
  mso-hyphenate: none;
591
599
  tab-stops: 51.05pt list 72.0pt;
592
600
  font-size: {{smallerfontsize}};
@@ -597,6 +605,10 @@ h6 {
597
605
  mso-fareast-language: JA;
598
606
  mso-bidi-font-weight: normal; }
599
607
 
608
+ h6 {
609
+ mso-outline-level: 6;
610
+ mso-list: l1 level6 lfo6; }
611
+
600
612
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
601
613
  mso-style-priority: 39;
602
614
  mso-style-unhide: no;
data/lib/isodoc/iho/html/wordstyle.scss CHANGED
@@ -340,7 +340,7 @@ div.figure, p.figure
340
340
 
341
341
 
342
342
 
343
- h1
343
+ h1, .h1
344
344
  {mso-style-priority:1;
345
345
  mso-style-unhide:no;
346
346
  mso-style-qformat:yes;
@@ -355,8 +355,6 @@ h1
355
355
  line-height:13.5pt;
356
356
  mso-pagination:widow-orphan;
357
357
  page-break-after:avoid;
358
- mso-outline-level:1;
359
- mso-list:l1 level1 lfo6;
360
358
  mso-hyphenate:none;
361
359
  tab-stops:20.0pt list 21.6pt left 28.0pt;
362
360
  font-size:13.0pt;
@@ -368,6 +366,10 @@ h1
368
366
  mso-ansi-language:EN-GB;
369
367
  mso-fareast-language:JA;
370
368
  mso-bidi-font-weight:normal;}
369
+ h1 {
370
+ mso-outline-level:1;
371
+ mso-list:l1 level1 lfo6;
372
+ }
371
373
  h1.Annex
372
374
  {mso-style-priority:1;
373
375
  mso-style-unhide:no;
@@ -423,7 +425,7 @@ h1.Annex
423
425
  mso-ansi-language:EN-GB;
424
426
  mso-fareast-language:JA;
425
427
  mso-bidi-font-weight:normal;}
426
- h2
428
+ h2, .h2
427
429
  {mso-style-priority:2;
428
430
  mso-style-unhide:no;
429
431
  mso-style-qformat:yes;
@@ -439,8 +441,6 @@ h2
439
441
  line-height:12.5pt;
440
442
  mso-pagination:widow-orphan;
441
443
  page-break-after:avoid;
442
- mso-outline-level:2;
443
- mso-list:l1 level2 lfo6;
444
444
  mso-hyphenate:none;
445
445
  tab-stops:27.0pt 35.0pt;
446
446
  font-size:$normalfontsize;
@@ -451,7 +451,11 @@ h2
451
451
  mso-ansi-language:EN-GB;
452
452
  mso-fareast-language:JA;
453
453
  mso-bidi-font-weight:normal;}
454
- h3
454
+ h2 {
455
+ mso-outline-level:2;
456
+ mso-list:l1 level2 lfo6;
457
+ }
458
+ h3, .h3
455
459
  {mso-style-priority:3;
456
460
  mso-style-unhide:no;
457
461
  mso-style-qformat:yes;
@@ -467,8 +471,6 @@ h3
467
471
  line-height:$normalfontsize;
468
472
  mso-pagination:widow-orphan;
469
473
  page-break-after:avoid;
470
- mso-outline-level:3;
471
- mso-list:l1 level3 lfo6;
472
474
  mso-hyphenate:none;
473
475
  tab-stops:list 36.0pt left 44.0pt;
474
476
  font-size:$smallerfontsize;
@@ -478,7 +480,11 @@ h3
478
480
  mso-ansi-language:EN-GB;
479
481
  mso-fareast-language:JA;
480
482
  mso-bidi-font-weight:normal;}
481
- h4
483
+ h3 {
484
+ mso-outline-level:3;
485
+ mso-list:l1 level3 lfo6;
486
+ }
487
+ h4, .h4
482
488
  {mso-style-priority:4;
483
489
  mso-style-unhide:no;
484
490
  mso-style-qformat:yes;
@@ -494,8 +500,6 @@ h4
494
500
  line-height:$normalfontsize;
495
501
  mso-pagination:widow-orphan;
496
502
  page-break-after:avoid;
497
- mso-outline-level:4;
498
- mso-list:l1 level4 lfo6;
499
503
  mso-hyphenate:none;
500
504
  tab-stops:51.05pt 57.0pt 68.0pt;
501
505
  font-size:$smallerfontsize;
@@ -505,7 +509,11 @@ h4
505
509
  mso-ansi-language:EN-GB;
506
510
  mso-fareast-language:JA;
507
511
  mso-bidi-font-weight:normal;}
508
- h5
512
+ h4 {
513
+ mso-outline-level:4;
514
+ mso-list:l1 level4 lfo6;
515
+ }
516
+ h5, .h5
509
517
  {mso-style-priority:5;
510
518
  mso-style-unhide:no;
511
519
  mso-style-qformat:yes;
@@ -521,8 +529,6 @@ h5
521
529
  line-height:$normalfontsize;
522
530
  mso-pagination:widow-orphan;
523
531
  page-break-after:avoid;
524
- mso-outline-level:5;
525
- mso-list:l1 level5 lfo6;
526
532
  mso-hyphenate:none;
527
533
  tab-stops:51.05pt list 54.0pt;
528
534
  font-size:$smallerfontsize;
@@ -532,7 +538,11 @@ h5
532
538
  mso-ansi-language:EN-GB;
533
539
  mso-fareast-language:JA;
534
540
  mso-bidi-font-weight:normal;}
535
- h6
541
+ h5 {
542
+ mso-outline-level:5;
543
+ mso-list:l1 level5 lfo6;
544
+ }
545
+ h6, .h6
536
546
  {mso-style-priority:6;
537
547
  mso-style-unhide:no;
538
548
  mso-style-qformat:yes;
@@ -548,8 +558,6 @@ h6
548
558
  line-height:$normalfontsize;
549
559
  mso-pagination:widow-orphan;
550
560
  page-break-after:avoid;
551
- mso-outline-level:6;
552
- mso-list:l1 level6 lfo6;
553
561
  mso-hyphenate:none;
554
562
  tab-stops:51.05pt list 72.0pt;
555
563
  font-size:$smallerfontsize;
@@ -559,6 +567,10 @@ h6
559
567
  mso-ansi-language:EN-GB;
560
568
  mso-fareast-language:JA;
561
569
  mso-bidi-font-weight:normal;}
570
+ h6 {
571
+ mso-outline-level:6;
572
+ mso-list:l1 level6 lfo6;
573
+ }
562
574
  p.MsoToc1, li.MsoToc1, div.MsoToc1
563
575
  {mso-style-priority:39;
564
576
  mso-style-unhide:no;
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -466,7 +466,7 @@
466
466
  </fo:block>
467
467
  </xsl:template>
468
468
 
469
- <xsl:template match="iho:title">
469
+ <xsl:template match="iho:title" name="title">
470
470
 
471
471
  <xsl:variable name="level">
472
472
  <xsl:call-template name="getLevel"/>
@@ -820,7 +820,9 @@
820
820
 
821
821
  <xsl:template name="getListItemFormat">
822
822
  <xsl:choose>
823
- <xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
823
+ <xsl:when test="local-name(..) = 'ul'">
824
+ <xsl:call-template name="setULLabel"/>
825
+ </xsl:when>
824
826
  <xsl:otherwise> <!-- for ordered lists -->
825
827
  <xsl:choose>
826
828
  <xsl:when test="../@type = 'arabic'">
@@ -3148,6 +3150,7 @@
3148
3150
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3149
3151
  <xsl:apply-templates/>
3150
3152
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3153
+ <xsl:apply-templates select="@language"/>
3151
3154
  <xsl:apply-templates/>
3152
3155
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3153
3156
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -5342,6 +5345,51 @@
5342
5345
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5343
5346
  <!-- 0xA0 to space replacement -->
5344
5347
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5348
+ </xsl:template><xsl:variable name="ul_labels_">
5349
+
5350
+
5351
+
5352
+
5353
+
5354
+
5355
+ <label>—</label> <!-- em dash -->
5356
+
5357
+
5358
+
5359
+
5360
+
5361
+
5362
+
5363
+
5364
+
5365
+
5366
+
5367
+
5368
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5369
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5370
+ <xsl:variable name="list_level">
5371
+ <xsl:choose>
5372
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5373
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5374
+ </xsl:choose>
5375
+ </xsl:variable>
5376
+ <xsl:choose>
5377
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5378
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5379
+ </xsl:when>
5380
+ <xsl:when test="$list_level mod 3 = 0">
5381
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5382
+ </xsl:when>
5383
+ <xsl:when test="$list_level mod 2 = 0">
5384
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5385
+ </xsl:when>
5386
+ <xsl:otherwise>
5387
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5388
+ </xsl:otherwise>
5389
+ </xsl:choose>
5390
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5391
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5392
+ <xsl:value-of select="."/>
5345
5393
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5346
5394
  <xsl:choose>
5347
5395
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5894,6 +5942,10 @@
5894
5942
  </svg>
5895
5943
  </fo:instream-foreign-object>
5896
5944
  </fo:inline>
5945
+ </xsl:template><xsl:template match="@language">
5946
+ <xsl:copy-of select="."/>
5947
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
5948
+ <xsl:call-template name="title"/>
5897
5949
  </xsl:template><xsl:template name="convertDate">
5898
5950
  <xsl:param name="date"/>
5899
5951
  <xsl:param name="format" select="'short'"/>
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -466,7 +466,7 @@
466
466
  </fo:block>
467
467
  </xsl:template>
468
468
 
469
- <xsl:template match="iho:title">
469
+ <xsl:template match="iho:title" name="title">
470
470
 
471
471
  <xsl:variable name="level">
472
472
  <xsl:call-template name="getLevel"/>
@@ -820,7 +820,9 @@
820
820
 
821
821
  <xsl:template name="getListItemFormat">
822
822
  <xsl:choose>
823
- <xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
823
+ <xsl:when test="local-name(..) = 'ul'">
824
+ <xsl:call-template name="setULLabel"/>
825
+ </xsl:when>
824
826
  <xsl:otherwise> <!-- for ordered lists -->
825
827
  <xsl:choose>
826
828
  <xsl:when test="../@type = 'arabic'">
@@ -3148,6 +3150,7 @@
3148
3150
  </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
3149
3151
  <xsl:apply-templates/>
3150
3152
  </xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
3153
+ <xsl:apply-templates select="@language"/>
3151
3154
  <xsl:apply-templates/>
3152
3155
  </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
3153
3156
  <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -5342,6 +5345,51 @@
5342
5345
  </xsl:template><xsl:template match="*[local-name() = 'name']/text()">
5343
5346
  <!-- 0xA0 to space replacement -->
5344
5347
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
5348
+ </xsl:template><xsl:variable name="ul_labels_">
5349
+
5350
+
5351
+
5352
+
5353
+
5354
+
5355
+ <label>—</label> <!-- em dash -->
5356
+
5357
+
5358
+
5359
+
5360
+
5361
+
5362
+
5363
+
5364
+
5365
+
5366
+
5367
+
5368
+ </xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
5369
+ <xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
5370
+ <xsl:variable name="list_level">
5371
+ <xsl:choose>
5372
+ <xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
5373
+ <xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
5374
+ </xsl:choose>
5375
+ </xsl:variable>
5376
+ <xsl:choose>
5377
+ <xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
5378
+ <xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
5379
+ </xsl:when>
5380
+ <xsl:when test="$list_level mod 3 = 0">
5381
+ <xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
5382
+ </xsl:when>
5383
+ <xsl:when test="$list_level mod 2 = 0">
5384
+ <xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
5385
+ </xsl:when>
5386
+ <xsl:otherwise>
5387
+ <xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
5388
+ </xsl:otherwise>
5389
+ </xsl:choose>
5390
+ </xsl:template><xsl:template match="label" mode="ul_labels">
5391
+ <xsl:copy-of select="@*[not(local-name() = 'level')]"/>
5392
+ <xsl:value-of select="."/>
5345
5393
  </xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
5346
5394
  <xsl:choose>
5347
5395
  <xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -5894,6 +5942,10 @@
5894
5942
  </svg>
5895
5943
  </fo:instream-foreign-object>
5896
5944
  </fo:inline>
5945
+ </xsl:template><xsl:template match="@language">
5946
+ <xsl:copy-of select="."/>
5947
+ </xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
5948
+ <xsl:call-template name="title"/>
5897
5949
  </xsl:template><xsl:template name="convertDate">
5898
5950
  <xsl:param name="date"/>
5899
5951
  <xsl:param name="format" select="'short'"/>
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.4.4".freeze
3
+ VERSION = "0.4.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.4
4
+ version: 0.4.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: htmlentities