metanorma-ribose 1.8.4 → 1.8.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ribose/isodoc.rng +6 -2
- data/lib/isodoc/ribose/html/htmlstyle.css +21 -10
- data/lib/isodoc/ribose/html/htmlstyle.scss +12 -10
- data/lib/isodoc/ribose/html/wordstyle.css +30 -18
- data/lib/isodoc/ribose/html/wordstyle.scss +30 -18
- data/lib/isodoc/ribose/ribose.standard.xsl +63 -7
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma.yml +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 15ecdae44d9c0f03941e38f784f1b766b2fc80283f0cc76a15b65c9d5f6f8c57
|
4
|
+
data.tar.gz: a0b8dde351cee3f3f3cecc58b874f006d5dc294777de296df53f5eefdbf7593e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e354fdb71a7273590f7b3995967826e48ee29212351e10a5907784b21d1a4fcab29580a4b13f7012fcc42a8444105473e1d486742c82f98958d10bc3caaa422f
|
7
|
+
data.tar.gz: e1a9612a2af44a9401ff659f7d013d22a133ca4d73ef188a8217968abb2340b8841d74c2fba8ad051247faa08c9357653afe67b563d459f71e806f7280c605a6
|
@@ -1973,7 +1973,11 @@
|
|
1973
1973
|
</optional>
|
1974
1974
|
<element name="name">
|
1975
1975
|
<zeroOrMore>
|
1976
|
-
<
|
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
|
1994
|
+
<element name="grammar">
|
1991
1995
|
<ref name="Grammar"/>
|
1992
1996
|
</element>
|
1993
1997
|
</optional>
|
@@ -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: #1661AD;
|
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; }
|
@@ -840,7 +850,7 @@ p {
|
|
840
850
|
margin-top: 1em;
|
841
851
|
margin-bottom: 1em; }
|
842
852
|
|
843
|
-
h2 p {
|
853
|
+
h2 p, .h2 p {
|
844
854
|
display: inline; }
|
845
855
|
|
846
856
|
/*
|
@@ -970,7 +980,8 @@ To top button
|
|
970
980
|
h1,
|
971
981
|
h2,
|
972
982
|
h3,
|
973
|
-
h4
|
983
|
+
h4,
|
984
|
+
.h1, .h2, .h3, .h4 {
|
974
985
|
page-break-after: avoid;
|
975
986
|
margin-top: 1.2em; }
|
976
987
|
.note,
|
@@ -996,12 +1007,12 @@ To top button
|
|
996
1007
|
h1.content {
|
997
1008
|
margin-top: 2em;
|
998
1009
|
line-height: 2.5em; }
|
999
|
-
h1 {
|
1010
|
+
h1, .h1 {
|
1000
1011
|
font-size: 1.5em;
|
1001
1012
|
line-height: 1.5; }
|
1002
|
-
h2 {
|
1013
|
+
h2, .h2 {
|
1003
1014
|
font-size: 1.2em; }
|
1004
|
-
h3 {
|
1015
|
+
h3, .h3 {
|
1005
1016
|
font-size: 1em; }
|
1006
1017
|
.Note {
|
1007
1018
|
background-color: #fff495;
|
@@ -202,7 +202,8 @@ h2,
|
|
202
202
|
h3,
|
203
203
|
h4,
|
204
204
|
h5,
|
205
|
-
h6
|
205
|
+
h6,
|
206
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
206
207
|
font-family: $headerfont;
|
207
208
|
color: #1661AD;
|
208
209
|
font-weight: 300;
|
@@ -210,23 +211,23 @@ h6 {
|
|
210
211
|
margin-bottom: 0.3em;
|
211
212
|
}
|
212
213
|
|
213
|
-
h1 {
|
214
|
+
h1, .h1 {
|
214
215
|
font-size: 1.6em;
|
215
216
|
text-transform: uppercase;
|
216
217
|
margin-top: 2em;
|
217
218
|
}
|
218
219
|
|
219
|
-
h1#content {
|
220
|
+
h1#content, .h1#content {
|
220
221
|
margin-top: 2em;
|
221
222
|
}
|
222
223
|
|
223
|
-
h2 {
|
224
|
+
h2, .h2 {
|
224
225
|
margin-top: 1.3em;
|
225
226
|
font-size: 1.3em;
|
226
227
|
font-weight: 400;
|
227
228
|
}
|
228
229
|
|
229
|
-
h3 {
|
230
|
+
h3, .h3 {
|
230
231
|
margin-top: 1.1em;
|
231
232
|
font-size: 1.1em;
|
232
233
|
font-weight: 100;
|
@@ -500,7 +501,7 @@ p {
|
|
500
501
|
margin-bottom: 1em;
|
501
502
|
}
|
502
503
|
|
503
|
-
h2 p {
|
504
|
+
h2 p, .h2 p {
|
504
505
|
display: inline;
|
505
506
|
}
|
506
507
|
|
@@ -673,7 +674,8 @@ To top button
|
|
673
674
|
h1,
|
674
675
|
h2,
|
675
676
|
h3,
|
676
|
-
h4
|
677
|
+
h4,
|
678
|
+
.h1, .h2, .h3, .h4 {
|
677
679
|
page-break-after: avoid;
|
678
680
|
margin-top: 1.2em;
|
679
681
|
}
|
@@ -717,16 +719,16 @@ To top button
|
|
717
719
|
line-height: 2.5em;
|
718
720
|
}
|
719
721
|
|
720
|
-
h1 {
|
722
|
+
h1, .h1 {
|
721
723
|
font-size: 1.5em;
|
722
724
|
line-height: 1.5;
|
723
725
|
}
|
724
726
|
|
725
|
-
h2 {
|
727
|
+
h2, .h2 {
|
726
728
|
font-size: 1.2em
|
727
729
|
}
|
728
730
|
|
729
|
-
h3 {
|
731
|
+
h3, .h3 {
|
730
732
|
font-size: 1em;
|
731
733
|
}
|
732
734
|
|
@@ -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;
|
@@ -400,6 +398,10 @@ h1 {
|
|
400
398
|
mso-fareast-language: JA;
|
401
399
|
mso-bidi-font-weight: normal; }
|
402
400
|
|
401
|
+
h1 {
|
402
|
+
mso-outline-level: 1;
|
403
|
+
mso-list: l1 level1 lfo6; }
|
404
|
+
|
403
405
|
h1.Annex {
|
404
406
|
mso-style-priority: 1;
|
405
407
|
mso-style-unhide: no;
|
@@ -459,7 +461,7 @@ h1.Annex {
|
|
459
461
|
mso-fareast-language: JA;
|
460
462
|
mso-bidi-font-weight: normal; }
|
461
463
|
|
462
|
-
h2 {
|
464
|
+
h2, .h2 {
|
463
465
|
mso-style-priority: 2;
|
464
466
|
mso-style-unhide: no;
|
465
467
|
mso-style-qformat: yes;
|
@@ -475,8 +477,6 @@ h2 {
|
|
475
477
|
line-height: 12.5pt;
|
476
478
|
mso-pagination: widow-orphan;
|
477
479
|
page-break-after: avoid;
|
478
|
-
mso-outline-level: 2;
|
479
|
-
mso-list: l1 level2 lfo6;
|
480
480
|
mso-hyphenate: none;
|
481
481
|
tab-stops: 27.0pt 35.0pt;
|
482
482
|
font-size: {{normalfontsize}};
|
@@ -489,7 +489,11 @@ h2 {
|
|
489
489
|
mso-fareast-language: JA;
|
490
490
|
mso-bidi-font-weight: normal; }
|
491
491
|
|
492
|
-
|
492
|
+
h2 {
|
493
|
+
mso-outline-level: 2;
|
494
|
+
mso-list: l1 level2 lfo6; }
|
495
|
+
|
496
|
+
h3, .h3 {
|
493
497
|
mso-style-priority: 3;
|
494
498
|
mso-style-unhide: no;
|
495
499
|
mso-style-qformat: yes;
|
@@ -505,8 +509,6 @@ h3 {
|
|
505
509
|
line-height: {{normalfontsize}};
|
506
510
|
mso-pagination: widow-orphan;
|
507
511
|
page-break-after: avoid;
|
508
|
-
mso-outline-level: 3;
|
509
|
-
mso-list: l1 level3 lfo6;
|
510
512
|
mso-hyphenate: none;
|
511
513
|
tab-stops: list 36.0pt left 44.0pt;
|
512
514
|
font-size: {{normalfontsize}};
|
@@ -518,7 +520,11 @@ h3 {
|
|
518
520
|
mso-fareast-language: JA;
|
519
521
|
mso-bidi-font-weight: normal; }
|
520
522
|
|
521
|
-
|
523
|
+
h3 {
|
524
|
+
mso-outline-level: 3;
|
525
|
+
mso-list: l1 level3 lfo6; }
|
526
|
+
|
527
|
+
h4, .h4 {
|
522
528
|
mso-style-priority: 4;
|
523
529
|
mso-style-unhide: no;
|
524
530
|
mso-style-qformat: yes;
|
@@ -534,8 +540,6 @@ h4 {
|
|
534
540
|
line-height: {{normalfontsize}};
|
535
541
|
mso-pagination: widow-orphan;
|
536
542
|
page-break-after: avoid;
|
537
|
-
mso-outline-level: 4;
|
538
|
-
mso-list: l1 level4 lfo6;
|
539
543
|
mso-hyphenate: none;
|
540
544
|
tab-stops: 51.05pt 57.0pt 68.0pt;
|
541
545
|
font-size: {{normalfontsize}};
|
@@ -547,7 +551,11 @@ h4 {
|
|
547
551
|
mso-fareast-language: JA;
|
548
552
|
mso-bidi-font-weight: normal; }
|
549
553
|
|
550
|
-
|
554
|
+
h4 {
|
555
|
+
mso-outline-level: 4;
|
556
|
+
mso-list: l1 level4 lfo6; }
|
557
|
+
|
558
|
+
h5, .h5 {
|
551
559
|
mso-style-priority: 5;
|
552
560
|
mso-style-unhide: no;
|
553
561
|
mso-style-qformat: yes;
|
@@ -563,8 +571,6 @@ h5 {
|
|
563
571
|
line-height: {{normalfontsize}};
|
564
572
|
mso-pagination: widow-orphan;
|
565
573
|
page-break-after: avoid;
|
566
|
-
mso-outline-level: 5;
|
567
|
-
mso-list: l1 level5 lfo6;
|
568
574
|
mso-hyphenate: none;
|
569
575
|
tab-stops: 51.05pt list 54.0pt;
|
570
576
|
font-size: {{normalfontsize}};
|
@@ -576,7 +582,11 @@ h5 {
|
|
576
582
|
mso-fareast-language: JA;
|
577
583
|
mso-bidi-font-weight: normal; }
|
578
584
|
|
579
|
-
|
585
|
+
h5 {
|
586
|
+
mso-outline-level: 5;
|
587
|
+
mso-list: l1 level5 lfo6; }
|
588
|
+
|
589
|
+
h6, .h6 {
|
580
590
|
mso-style-priority: 6;
|
581
591
|
mso-style-unhide: no;
|
582
592
|
mso-style-qformat: yes;
|
@@ -592,8 +602,6 @@ h6 {
|
|
592
602
|
line-height: {{normalfontsize}};
|
593
603
|
mso-pagination: widow-orphan;
|
594
604
|
page-break-after: avoid;
|
595
|
-
mso-outline-level: 6;
|
596
|
-
mso-list: l1 level6 lfo6;
|
597
605
|
mso-hyphenate: none;
|
598
606
|
tab-stops: 51.05pt list 72.0pt;
|
599
607
|
font-size: {{normalfontsize}};
|
@@ -605,6 +613,10 @@ h6 {
|
|
605
613
|
mso-fareast-language: JA;
|
606
614
|
mso-bidi-font-weight: normal; }
|
607
615
|
|
616
|
+
h6 {
|
617
|
+
mso-outline-level: 6;
|
618
|
+
mso-list: l1 level6 lfo6; }
|
619
|
+
|
608
620
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
609
621
|
mso-style-priority: 39;
|
610
622
|
mso-style-unhide: no;
|
@@ -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;
|
@@ -369,6 +367,10 @@ h1
|
|
369
367
|
mso-ansi-language:EN-GB;
|
370
368
|
mso-fareast-language:JA;
|
371
369
|
mso-bidi-font-weight:normal;}
|
370
|
+
h1 {
|
371
|
+
mso-outline-level:1;
|
372
|
+
mso-list:l1 level1 lfo6;
|
373
|
+
}
|
372
374
|
h1.Annex
|
373
375
|
{mso-style-priority:1;
|
374
376
|
mso-style-unhide:no;
|
@@ -426,7 +428,7 @@ h1.Annex
|
|
426
428
|
mso-ansi-language:EN-GB;
|
427
429
|
mso-fareast-language:JA;
|
428
430
|
mso-bidi-font-weight:normal;}
|
429
|
-
h2
|
431
|
+
h2, .h2
|
430
432
|
{mso-style-priority:2;
|
431
433
|
mso-style-unhide:no;
|
432
434
|
mso-style-qformat:yes;
|
@@ -442,8 +444,6 @@ h2
|
|
442
444
|
line-height:12.5pt;
|
443
445
|
mso-pagination:widow-orphan;
|
444
446
|
page-break-after:avoid;
|
445
|
-
mso-outline-level:2;
|
446
|
-
mso-list:l1 level2 lfo6;
|
447
447
|
mso-hyphenate:none;
|
448
448
|
tab-stops:27.0pt 35.0pt;
|
449
449
|
font-size:$normalfontsize;
|
@@ -455,7 +455,11 @@ h2
|
|
455
455
|
mso-ansi-language:EN-GB;
|
456
456
|
mso-fareast-language:JA;
|
457
457
|
mso-bidi-font-weight:normal;}
|
458
|
-
|
458
|
+
h2 {
|
459
|
+
mso-outline-level:2;
|
460
|
+
mso-list:l1 level2 lfo6;
|
461
|
+
}
|
462
|
+
h3, .h3
|
459
463
|
{mso-style-priority:3;
|
460
464
|
mso-style-unhide:no;
|
461
465
|
mso-style-qformat:yes;
|
@@ -471,8 +475,6 @@ h3
|
|
471
475
|
line-height:$normalfontsize;
|
472
476
|
mso-pagination:widow-orphan;
|
473
477
|
page-break-after:avoid;
|
474
|
-
mso-outline-level:3;
|
475
|
-
mso-list:l1 level3 lfo6;
|
476
478
|
mso-hyphenate:none;
|
477
479
|
tab-stops:list 36.0pt left 44.0pt;
|
478
480
|
font-size:$normalfontsize;
|
@@ -483,7 +485,11 @@ h3
|
|
483
485
|
mso-ansi-language:EN-GB;
|
484
486
|
mso-fareast-language:JA;
|
485
487
|
mso-bidi-font-weight:normal;}
|
486
|
-
|
488
|
+
h3 {
|
489
|
+
mso-outline-level:3;
|
490
|
+
mso-list:l1 level3 lfo6;
|
491
|
+
}
|
492
|
+
h4, .h4
|
487
493
|
{mso-style-priority:4;
|
488
494
|
mso-style-unhide:no;
|
489
495
|
mso-style-qformat:yes;
|
@@ -499,8 +505,6 @@ h4
|
|
499
505
|
line-height:$normalfontsize;
|
500
506
|
mso-pagination:widow-orphan;
|
501
507
|
page-break-after:avoid;
|
502
|
-
mso-outline-level:4;
|
503
|
-
mso-list:l1 level4 lfo6;
|
504
508
|
mso-hyphenate:none;
|
505
509
|
tab-stops:51.05pt 57.0pt 68.0pt;
|
506
510
|
font-size:$normalfontsize;
|
@@ -511,7 +515,11 @@ h4
|
|
511
515
|
mso-ansi-language:EN-GB;
|
512
516
|
mso-fareast-language:JA;
|
513
517
|
mso-bidi-font-weight:normal;}
|
514
|
-
|
518
|
+
h4 {
|
519
|
+
mso-outline-level:4;
|
520
|
+
mso-list:l1 level4 lfo6;
|
521
|
+
}
|
522
|
+
h5, .h5
|
515
523
|
{mso-style-priority:5;
|
516
524
|
mso-style-unhide:no;
|
517
525
|
mso-style-qformat:yes;
|
@@ -527,8 +535,6 @@ h5
|
|
527
535
|
line-height:$normalfontsize;
|
528
536
|
mso-pagination:widow-orphan;
|
529
537
|
page-break-after:avoid;
|
530
|
-
mso-outline-level:5;
|
531
|
-
mso-list:l1 level5 lfo6;
|
532
538
|
mso-hyphenate:none;
|
533
539
|
tab-stops:51.05pt list 54.0pt;
|
534
540
|
font-size:$normalfontsize;
|
@@ -539,7 +545,11 @@ h5
|
|
539
545
|
mso-ansi-language:EN-GB;
|
540
546
|
mso-fareast-language:JA;
|
541
547
|
mso-bidi-font-weight:normal;}
|
542
|
-
|
548
|
+
h5 {
|
549
|
+
mso-outline-level:5;
|
550
|
+
mso-list:l1 level5 lfo6;
|
551
|
+
}
|
552
|
+
h6, .h6
|
543
553
|
{mso-style-priority:6;
|
544
554
|
mso-style-unhide:no;
|
545
555
|
mso-style-qformat:yes;
|
@@ -555,8 +565,6 @@ h6
|
|
555
565
|
line-height:$normalfontsize;
|
556
566
|
mso-pagination:widow-orphan;
|
557
567
|
page-break-after:avoid;
|
558
|
-
mso-outline-level:6;
|
559
|
-
mso-list:l1 level6 lfo6;
|
560
568
|
mso-hyphenate:none;
|
561
569
|
tab-stops:51.05pt list 72.0pt;
|
562
570
|
font-size:$normalfontsize;
|
@@ -567,6 +575,10 @@ h6
|
|
567
575
|
mso-ansi-language:EN-GB;
|
568
576
|
mso-fareast-language:JA;
|
569
577
|
mso-bidi-font-weight:normal;}
|
578
|
+
h6 {
|
579
|
+
mso-outline-level:6;
|
580
|
+
mso-list:l1 level6 lfo6;
|
581
|
+
}
|
570
582
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
571
583
|
{mso-style-priority:39;
|
572
584
|
mso-style-unhide:no;
|
@@ -976,7 +976,7 @@
|
|
976
976
|
<fo:block-container>
|
977
977
|
<xsl:if test="$level >= 3">
|
978
978
|
<!-- <xsl:variable name="list_level" select="count(ancestor-or-self::rsd:ul) + count(ancestor-or-self::rsd:ul)"/> -->
|
979
|
-
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
979
|
+
<!-- <xsl:attribute name="margin-left">13mm</xsl:attribute> -->
|
980
980
|
</xsl:if>
|
981
981
|
<fo:block-container margin-left="0mm">
|
982
982
|
<xsl:choose>
|
@@ -994,7 +994,7 @@
|
|
994
994
|
</xsl:template>
|
995
995
|
|
996
996
|
<xsl:template name="listProcessing">
|
997
|
-
<fo:list-block provisional-distance-between-starts="
|
997
|
+
<fo:list-block provisional-distance-between-starts="6mm"> <!-- 12mm -->
|
998
998
|
<xsl:if test="ancestor::rsd:ul | ancestor::rsd:ol">
|
999
999
|
<!-- <xsl:attribute name="margin-bottom">0pt</xsl:attribute> -->
|
1000
1000
|
</xsl:if>
|
@@ -1005,13 +1005,17 @@
|
|
1005
1005
|
</fo:list-block>
|
1006
1006
|
</xsl:template>
|
1007
1007
|
|
1008
|
+
|
1008
1009
|
<xsl:template match="rsd:li">
|
1009
1010
|
<fo:list-item space-after="4pt">
|
1010
1011
|
<fo:list-item-label end-indent="label-end()">
|
1011
1012
|
<fo:block color="{$color_blue}" font-weight="bold">
|
1012
1013
|
<xsl:choose>
|
1013
|
-
<xsl:when test="local-name(..) = 'ul'
|
1014
|
-
|
1014
|
+
<xsl:when test="local-name(..) = 'ul'">
|
1015
|
+
<xsl:call-template name="setULLabel"/>
|
1016
|
+
</xsl:when>
|
1017
|
+
<!-- <xsl:when test="local-name(..) = 'ul' and (../ancestor::rsd:ul or ../ancestor::rsd:ol)">—</xsl:when> --> <!-- - — dash -->
|
1018
|
+
<!-- <xsl:when test="local-name(..) = 'ul'">•</xsl:when> -->
|
1015
1019
|
<xsl:otherwise> <!-- for ordered lists -->
|
1016
1020
|
<xsl:choose>
|
1017
1021
|
<xsl:when test="../@type = 'arabic'">
|
@@ -2347,7 +2351,7 @@
|
|
2347
2351
|
|
2348
2352
|
|
2349
2353
|
<attribute name="border">0pt solid black</attribute>
|
2350
|
-
<attribute name="font-size">
|
2354
|
+
<attribute name="font-size">9.5pt</attribute> <!-- 8pt -->
|
2351
2355
|
|
2352
2356
|
</xsl:variable>
|
2353
2357
|
|
@@ -3748,6 +3752,7 @@
|
|
3748
3752
|
</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
|
3749
3753
|
<xsl:apply-templates/>
|
3750
3754
|
</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
|
3755
|
+
<xsl:apply-templates select="@language"/>
|
3751
3756
|
<xsl:apply-templates/>
|
3752
3757
|
</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
|
3753
3758
|
<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
|
@@ -3795,7 +3800,7 @@
|
|
3795
3800
|
|
3796
3801
|
<xsl:choose>
|
3797
3802
|
<xsl:when test="ancestor::*[local-name() = 'table']">inherit</xsl:when>
|
3798
|
-
<xsl:otherwise>
|
3803
|
+
<xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
|
3799
3804
|
</xsl:choose>
|
3800
3805
|
|
3801
3806
|
|
@@ -5277,7 +5282,7 @@
|
|
5277
5282
|
|
5278
5283
|
<xsl:choose>
|
5279
5284
|
<xsl:when test="ancestor::*[local-name() = 'table']">inherit</xsl:when>
|
5280
|
-
<xsl:otherwise>
|
5285
|
+
<xsl:otherwise>95%</xsl:otherwise><!-- 110% -->
|
5281
5286
|
</xsl:choose>
|
5282
5287
|
|
5283
5288
|
|
@@ -5999,6 +6004,53 @@
|
|
5999
6004
|
</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
|
6000
6005
|
<!-- 0xA0 to space replacement -->
|
6001
6006
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
|
6007
|
+
</xsl:template><xsl:variable name="ul_labels_">
|
6008
|
+
|
6009
|
+
|
6010
|
+
|
6011
|
+
|
6012
|
+
|
6013
|
+
|
6014
|
+
|
6015
|
+
|
6016
|
+
|
6017
|
+
|
6018
|
+
|
6019
|
+
|
6020
|
+
|
6021
|
+
|
6022
|
+
|
6023
|
+
<label level="1" font-size="75%">o</label> <!-- white circle -->
|
6024
|
+
<label level="2">—</label> <!-- em dash -->
|
6025
|
+
<label level="3" font-size="140%">•</label> <!-- bullet -->
|
6026
|
+
|
6027
|
+
|
6028
|
+
|
6029
|
+
</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
|
6030
|
+
<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
|
6031
|
+
<xsl:variable name="list_level">
|
6032
|
+
<xsl:choose>
|
6033
|
+
<xsl:when test="$list_level_ <= 3"><xsl:value-of select="$list_level_"/></xsl:when>
|
6034
|
+
<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
|
6035
|
+
</xsl:choose>
|
6036
|
+
</xsl:variable>
|
6037
|
+
<xsl:choose>
|
6038
|
+
<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
|
6039
|
+
<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
|
6040
|
+
</xsl:when>
|
6041
|
+
<xsl:when test="$list_level mod 3 = 0">
|
6042
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
|
6043
|
+
</xsl:when>
|
6044
|
+
<xsl:when test="$list_level mod 2 = 0">
|
6045
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
|
6046
|
+
</xsl:when>
|
6047
|
+
<xsl:otherwise>
|
6048
|
+
<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
|
6049
|
+
</xsl:otherwise>
|
6050
|
+
</xsl:choose>
|
6051
|
+
</xsl:template><xsl:template match="label" mode="ul_labels">
|
6052
|
+
<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
|
6053
|
+
<xsl:value-of select="."/>
|
6002
6054
|
</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
|
6003
6055
|
<xsl:choose>
|
6004
6056
|
<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
|
@@ -6452,6 +6504,10 @@
|
|
6452
6504
|
</svg>
|
6453
6505
|
</fo:instream-foreign-object>
|
6454
6506
|
</fo:inline>
|
6507
|
+
</xsl:template><xsl:template match="@language">
|
6508
|
+
<xsl:copy-of select="."/>
|
6509
|
+
</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
|
6510
|
+
<xsl:call-template name="title"/>
|
6455
6511
|
</xsl:template><xsl:template name="convertDate">
|
6456
6512
|
<xsl:param name="date"/>
|
6457
6513
|
<xsl:param name="format" select="'short'"/>
|
data/metanorma.yml
CHANGED
@@ -14,6 +14,7 @@ html_headerfont: '"Source Sans Pro",sans-serif'
|
|
14
14
|
html_monospacefont: '"Source Code Pro",monospace'
|
15
15
|
html_normalfontsize: "15px"
|
16
16
|
html_footnotefontsize: "0.9em"
|
17
|
+
html_monospacefontsize: "12px"
|
17
18
|
scripts: lib/isodoc/ribose/html/scripts.html
|
18
19
|
scripts_pdf: lib/isodoc/ribose/html/scripts.pdf.html
|
19
20
|
standardstylesheet: lib/isodoc/ribose/html/rsd.scss
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-ribose
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.
|
4
|
+
version: 1.8.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-
|
11
|
+
date: 2021-12-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|