metanorma-cc 1.8.3 → 2.0.1

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.
@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
68
68
  font-family: {{monospacefont}} !important;
69
69
  font-variant-ligatures: none; }
70
70
 
71
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
72
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
73
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
74
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
75
+ font-size: {{monospacefontsize}}; }
76
+
71
77
  article, aside, details, figcaption, figure,
72
78
  footer, header, hgroup, menu, nav, section {
73
79
  display: block; }
@@ -79,6 +85,9 @@ table {
79
85
  h1, h2, h3, h4, h5, h6 {
80
86
  font-family: {{headerfont}}; }
81
87
 
88
+ .h1, .h2, .h3, .h4, .h5, .h6 {
89
+ font-family: {{headerfont}}; }
90
+
82
91
  blockquote, q {
83
92
  quotes: none; }
84
93
  blockquote:before, blockquote:after, q:before, q:after {
@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
68
68
  font-family: {{monospacefont}} !important;
69
69
  font-variant-ligatures: none; }
70
70
 
71
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
72
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
73
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
74
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
75
+ font-size: {{monospacefontsize}}; }
76
+
71
77
  article, aside, details, figcaption, figure,
72
78
  footer, header, hgroup, menu, nav, section {
73
79
  display: block; }
@@ -79,6 +85,9 @@ table {
79
85
  h1, h2, h3, h4, h5, h6 {
80
86
  font-family: {{headerfont}}; }
81
87
 
88
+ .h1, .h2, .h3, .h4, .h5, .h6 {
89
+ font-family: {{headerfont}}; }
90
+
82
91
  blockquote, q {
83
92
  quotes: none; }
84
93
  blockquote:before, blockquote:after, q:before, q:after {
@@ -287,6 +296,12 @@ code *, pre *, tt *, kbd *, samp * {
287
296
  font-family: {{monospacefont}} !important;
288
297
  font-variant-ligatures: none; }
289
298
 
299
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
300
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
301
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
302
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
303
+ font-size: {{monospacefontsize}}; }
304
+
290
305
  article, aside, details, figcaption, figure,
291
306
  footer, header, hgroup, menu, nav, section {
292
307
  display: block; }
@@ -298,6 +313,9 @@ table {
298
313
  h1, h2, h3, h4, h5, h6 {
299
314
  font-family: {{headerfont}}; }
300
315
 
316
+ .h1, .h2, .h3, .h4, .h5, .h6 {
317
+ font-family: {{headerfont}}; }
318
+
301
319
  blockquote, q {
302
320
  quotes: none; }
303
321
  blockquote:before, blockquote:after, q:before, q:after {
@@ -609,50 +627,54 @@ nav #toc {
609
627
  #toggle {
610
628
  display: none; } }
611
629
 
612
- #toc ul {
630
+ #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
613
631
  margin: 0;
614
632
  padding: 0;
615
633
  list-style: none; }
616
- #toc ul li a {
634
+ #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
617
635
  padding: 5px 10px; }
618
- #toc ul a {
636
+ #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
619
637
  color: #485094;
620
638
  text-decoration: none;
621
639
  display: block; }
622
- #toc ul a:hover {
640
+ #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
623
641
  box-shadow: none;
624
642
  color: white; }
625
643
 
626
- #toc .h2 {
644
+ #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
627
645
  padding-left: 30px; }
628
646
 
629
- #toc .h3 {
647
+ #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
630
648
  padding-left: 50px; }
631
649
 
632
- #toc .toc-active, #toc li:hover {
650
+ #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
633
651
  background: #1d1d1d;
634
652
  box-shadow: inset -5px 0px 10px -5px #1d1d1d !important; }
635
- #toc .toc-active a, #toc li:hover a {
653
+ #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
636
654
  color: white; }
637
655
 
638
656
  @media print {
639
- #toc .toc-active, #toc li:hover {
657
+ #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
640
658
  background: white;
641
659
  box-shadow: none !important; }
642
- #toc .toc-active a {
660
+ #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
643
661
  color: #485094; }
644
- #toc li:hover a {
662
+ #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
645
663
  color: black; } }
646
664
 
647
- #toc ul {
665
+ #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
648
666
  margin-bottom: 0.25em; }
649
667
 
650
- #toc li {
668
+ #toc li, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li {
651
669
  list-style-type: none; }
652
- #toc li:before {
670
+ #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
653
671
  content: " " !important;
654
672
  display: none; }
655
673
 
674
+ #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
675
+ margin-top: 0;
676
+ margin-bottom: 0; }
677
+
656
678
  .rule {
657
679
  width: 100%;
658
680
  height: 1px;
@@ -723,26 +745,26 @@ nav #toc {
723
745
  top: 20px; }
724
746
 
725
747
  /* Typograpy */
726
- h1, h2, h3, h4, h5, h6 {
748
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
727
749
  color: #0e1a85;
728
750
  font-weight: 600;
729
751
  margin-top: 2em;
730
752
  margin-bottom: 0.3em; }
731
753
 
732
- h1 {
754
+ h1, .h1 {
733
755
  font-size: 1.4em;
734
756
  text-transform: uppercase;
735
757
  margin-top: 2em; }
736
- h1#content {
758
+ h1#content, #content.h1 {
737
759
  margin-top: 2em; }
738
760
 
739
- h2 {
761
+ h2, .h2 {
740
762
  font-size: 1.3em;
741
763
  font-weight: 400; }
742
- h2 p {
764
+ h2 p, .h2 p {
743
765
  display: inline; }
744
766
 
745
- h3 {
767
+ h3, .h3 {
746
768
  font-size: 1.1em;
747
769
  font-weight: 400; }
748
770
 
@@ -1031,7 +1053,7 @@ a.anchorjs-link:hover {
1031
1053
  margin: 2cm 1cm 2cm 1cm; }
1032
1054
 
1033
1055
  @media print {
1034
- h1, .title-section1 {
1056
+ h1, .h1, .title-section1 {
1035
1057
  page-break-before: always; }
1036
1058
  h1.toc-contents {
1037
1059
  margin-top: 2em; } }
@@ -56,7 +56,7 @@ nav {
56
56
  $colorFg: white);
57
57
  }
58
58
 
59
- #toc {
59
+ #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
60
60
  @include toc($colorLink: #485094, $colorLinkActiveBg: #1d1d1d, $colorLinkActiveFg: white);
61
61
 
62
62
  ul {
@@ -73,6 +73,11 @@ nav {
73
73
  }
74
74
  }
75
75
 
76
+ #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
77
+ margin-top: 0;
78
+ margin-bottom: 0;
79
+ }
80
+
76
81
  .rule {
77
82
  @include rule(1px, #0e1a85, 2em 0);
78
83
 
@@ -96,14 +101,14 @@ nav {
96
101
 
97
102
  /* Typograpy */
98
103
 
99
- h1, h2, h3, h4, h5, h6 {
104
+ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
100
105
  color: #0e1a85;
101
106
  font-weight: 600;
102
107
  margin-top: 2em;
103
108
  margin-bottom: 0.3em;
104
109
  }
105
110
 
106
- h1 {
111
+ h1, .h1 {
107
112
  font-size: 1.4em;
108
113
  text-transform: uppercase;
109
114
  margin-top: 2em;
@@ -113,7 +118,7 @@ h1 {
113
118
  }
114
119
  }
115
120
 
116
- h2 {
121
+ h2, .h2 {
117
122
  font-size: 1.3em;
118
123
  font-weight: 400;
119
124
 
@@ -122,7 +127,7 @@ h2 {
122
127
  }
123
128
  }
124
129
 
125
- h3 {
130
+ h3, .h3 {
126
131
  font-size: 1.1em;
127
132
  font-weight: 400;
128
133
  }
@@ -401,7 +406,7 @@ a.anchorjs-link:hover {
401
406
  }
402
407
 
403
408
  @media print {
404
- h1, .title-section1 {
409
+ h1, .h1, .title-section1 {
405
410
  page-break-before: always;
406
411
  }
407
412
 
@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
17
17
  else {
18
18
  $('nav').show();
19
19
  $('nav').animate({ 'left': '0px' }, 'slow');
20
- $('.container').animate({ 'padding-left': '360px' }, 'slow');
21
20
  }
22
21
  });
23
22
  </script>
@@ -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-name: "Heading 1";
376
376
  mso-style-unhide: no;
@@ -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;
@@ -457,7 +459,7 @@ h1.Annex {
457
459
  mso-fareast-language: JA;
458
460
  mso-bidi-font-weight: normal; }
459
461
 
460
- h2 {
462
+ h2, .h2 {
461
463
  mso-style-priority: 2;
462
464
  mso-style-name: "Heading 2";
463
465
  mso-style-unhide: no;
@@ -473,8 +475,6 @@ h2 {
473
475
  line-height: 12.5pt;
474
476
  mso-pagination: widow-orphan;
475
477
  page-break-after: avoid;
476
- mso-outline-level: 2;
477
- mso-list: l1 level2 lfo6;
478
478
  mso-hyphenate: none;
479
479
  tab-stops: 27.0pt 35.0pt;
480
480
  font-size: 12.0pt;
@@ -486,7 +486,11 @@ h2 {
486
486
  mso-fareast-language: JA;
487
487
  mso-bidi-font-weight: normal; }
488
488
 
489
- h3 {
489
+ h2 {
490
+ mso-outline-level: 2;
491
+ mso-list: l1 level2 lfo6; }
492
+
493
+ h3, .h3 {
490
494
  mso-style-priority: 3;
491
495
  mso-style-name: "Heading 3";
492
496
  mso-style-unhide: no;
@@ -502,8 +506,6 @@ h3 {
502
506
  line-height: 12.0pt;
503
507
  mso-pagination: widow-orphan;
504
508
  page-break-after: avoid;
505
- mso-outline-level: 3;
506
- mso-list: l1 level3 lfo6;
507
509
  mso-hyphenate: none;
508
510
  tab-stops: list 36.0pt left 44.0pt;
509
511
  font-size: 11.0pt;
@@ -514,7 +516,11 @@ h3 {
514
516
  mso-fareast-language: JA;
515
517
  mso-bidi-font-weight: normal; }
516
518
 
517
- h4 {
519
+ h3 {
520
+ mso-outline-level: 3;
521
+ mso-list: l1 level3 lfo6; }
522
+
523
+ h4, .h4 {
518
524
  mso-style-priority: 4;
519
525
  mso-style-name: "Heading 4";
520
526
  mso-style-unhide: no;
@@ -530,8 +536,6 @@ h4 {
530
536
  line-height: 12.0pt;
531
537
  mso-pagination: widow-orphan;
532
538
  page-break-after: avoid;
533
- mso-outline-level: 4;
534
- mso-list: l1 level4 lfo6;
535
539
  mso-hyphenate: none;
536
540
  tab-stops: 51.05pt 57.0pt 68.0pt;
537
541
  font-size: 11.0pt;
@@ -542,7 +546,11 @@ h4 {
542
546
  mso-fareast-language: JA;
543
547
  mso-bidi-font-weight: normal; }
544
548
 
545
- h5 {
549
+ h4 {
550
+ mso-outline-level: 4;
551
+ mso-list: l1 level4 lfo6; }
552
+
553
+ h5, .h5 {
546
554
  mso-style-priority: 5;
547
555
  mso-style-name: "Heading 5";
548
556
  mso-style-unhide: no;
@@ -558,8 +566,6 @@ h5 {
558
566
  line-height: 12.0pt;
559
567
  mso-pagination: widow-orphan;
560
568
  page-break-after: avoid;
561
- mso-outline-level: 5;
562
- mso-list: l1 level5 lfo6;
563
569
  mso-hyphenate: none;
564
570
  tab-stops: 51.05pt list 54.0pt;
565
571
  font-size: 11.0pt;
@@ -570,7 +576,11 @@ h5 {
570
576
  mso-fareast-language: JA;
571
577
  mso-bidi-font-weight: normal; }
572
578
 
573
- h6 {
579
+ h5 {
580
+ mso-outline-level: 5;
581
+ mso-list: l1 level5 lfo6; }
582
+
583
+ h6, .h6 {
574
584
  mso-style-priority: 6;
575
585
  mso-style-name: "Heading 6";
576
586
  mso-style-unhide: no;
@@ -586,8 +596,6 @@ h6 {
586
596
  line-height: 12.0pt;
587
597
  mso-pagination: widow-orphan;
588
598
  page-break-after: avoid;
589
- mso-outline-level: 6;
590
- mso-list: l1 level6 lfo6;
591
599
  mso-hyphenate: none;
592
600
  tab-stops: 51.05pt list 72.0pt;
593
601
  font-size: 11.0pt;
@@ -598,6 +606,10 @@ h6 {
598
606
  mso-fareast-language: JA;
599
607
  mso-bidi-font-weight: normal; }
600
608
 
609
+ h6 {
610
+ mso-outline-level: 6;
611
+ mso-list: l1 level6 lfo6; }
612
+
601
613
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
602
614
  mso-style-priority: 39;
603
615
  mso-style-name: "TOC 1";
@@ -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-name:"Heading 1";
346
346
  mso-style-unhide:no;
@@ -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;
@@ -424,7 +426,7 @@ h1.Annex
424
426
  mso-ansi-language:EN-GB;
425
427
  mso-fareast-language:JA;
426
428
  mso-bidi-font-weight:normal;}
427
- h2
429
+ h2, .h2
428
430
  {mso-style-priority:2;
429
431
  mso-style-name:"Heading 2";
430
432
  mso-style-unhide:no;
@@ -440,8 +442,6 @@ h2
440
442
  line-height:12.5pt;
441
443
  mso-pagination:widow-orphan;
442
444
  page-break-after:avoid;
443
- mso-outline-level:2;
444
- mso-list:l1 level2 lfo6;
445
445
  mso-hyphenate:none;
446
446
  tab-stops:27.0pt 35.0pt;
447
447
  font-size:12.0pt;
@@ -452,7 +452,11 @@ h2
452
452
  mso-ansi-language:EN-GB;
453
453
  mso-fareast-language:JA;
454
454
  mso-bidi-font-weight:normal;}
455
- h3
455
+ h2 {
456
+ mso-outline-level:2;
457
+ mso-list:l1 level2 lfo6;
458
+ }
459
+ h3, .h3
456
460
  {mso-style-priority:3;
457
461
  mso-style-name:"Heading 3";
458
462
  mso-style-unhide:no;
@@ -468,8 +472,6 @@ h3
468
472
  line-height:12.0pt;
469
473
  mso-pagination:widow-orphan;
470
474
  page-break-after:avoid;
471
- mso-outline-level:3;
472
- mso-list:l1 level3 lfo6;
473
475
  mso-hyphenate:none;
474
476
  tab-stops:list 36.0pt left 44.0pt;
475
477
  font-size:11.0pt;
@@ -479,7 +481,11 @@ h3
479
481
  mso-ansi-language:EN-GB;
480
482
  mso-fareast-language:JA;
481
483
  mso-bidi-font-weight:normal;}
482
- h4
484
+ h3 {
485
+ mso-outline-level:3;
486
+ mso-list:l1 level3 lfo6;
487
+ }
488
+ h4, .h4
483
489
  {mso-style-priority:4;
484
490
  mso-style-name:"Heading 4";
485
491
  mso-style-unhide:no;
@@ -495,8 +501,6 @@ h4
495
501
  line-height:12.0pt;
496
502
  mso-pagination:widow-orphan;
497
503
  page-break-after:avoid;
498
- mso-outline-level:4;
499
- mso-list:l1 level4 lfo6;
500
504
  mso-hyphenate:none;
501
505
  tab-stops:51.05pt 57.0pt 68.0pt;
502
506
  font-size:11.0pt;
@@ -506,7 +510,11 @@ h4
506
510
  mso-ansi-language:EN-GB;
507
511
  mso-fareast-language:JA;
508
512
  mso-bidi-font-weight:normal;}
509
- h5
513
+ h4 {
514
+ mso-outline-level:4;
515
+ mso-list:l1 level4 lfo6;
516
+ }
517
+ h5, .h5
510
518
  {mso-style-priority:5;
511
519
  mso-style-name:"Heading 5";
512
520
  mso-style-unhide:no;
@@ -522,8 +530,6 @@ h5
522
530
  line-height:12.0pt;
523
531
  mso-pagination:widow-orphan;
524
532
  page-break-after:avoid;
525
- mso-outline-level:5;
526
- mso-list:l1 level5 lfo6;
527
533
  mso-hyphenate:none;
528
534
  tab-stops:51.05pt list 54.0pt;
529
535
  font-size:11.0pt;
@@ -533,7 +539,11 @@ h5
533
539
  mso-ansi-language:EN-GB;
534
540
  mso-fareast-language:JA;
535
541
  mso-bidi-font-weight:normal;}
536
- h6
542
+ h5 {
543
+ mso-outline-level:5;
544
+ mso-list:l1 level5 lfo6;
545
+ }
546
+ h6, .h6
537
547
  {mso-style-priority:6;
538
548
  mso-style-name:"Heading 6";
539
549
  mso-style-unhide:no;
@@ -549,8 +559,6 @@ h6
549
559
  line-height:12.0pt;
550
560
  mso-pagination:widow-orphan;
551
561
  page-break-after:avoid;
552
- mso-outline-level:6;
553
- mso-list:l1 level6 lfo6;
554
562
  mso-hyphenate:none;
555
563
  tab-stops:51.05pt list 72.0pt;
556
564
  font-size:11.0pt;
@@ -560,6 +568,10 @@ h6
560
568
  mso-ansi-language:EN-GB;
561
569
  mso-fareast-language:JA;
562
570
  mso-bidi-font-weight:normal;}
571
+ h6 {
572
+ mso-outline-level:6;
573
+ mso-list:l1 level6 lfo6;
574
+ }
563
575
  p.MsoToc1, li.MsoToc1, div.MsoToc1
564
576
  {mso-style-priority:39;
565
577
  mso-style-name:"TOC 1";
File without changes
File without changes
File without changes
File without changes
@@ -3,13 +3,13 @@ require "isodoc/cc/html_convert"
3
3
  require "isodoc/cc/word_convert"
4
4
  require "isodoc/cc/presentation_xml_convert"
5
5
  require "metanorma/cc"
6
- require "asciidoctor/standoc/converter"
7
- require "asciidoctor/generic/converter"
6
+ require "metanorma/standoc/converter"
7
+ require "metanorma/generic/converter"
8
8
  require_relative "validate_section"
9
9
 
10
- module Asciidoctor
10
+ module Metanorma
11
11
  module CC
12
- class Converter < Asciidoctor::Generic::Converter
12
+ class Converter < Metanorma::Generic::Converter
13
13
  XML_ROOT_TAG = "csd-standard".freeze
14
14
  XML_NAMESPACE = "https://www.metanorma.org/ns/csd".freeze
15
15
 
@@ -35,13 +35,13 @@ module Asciidoctor
35
35
  end
36
36
 
37
37
  def outputs(node, ret)
38
- File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
39
- presentation_xml_converter(node).convert(@filename + ".xml")
40
- html_converter(node).convert(@filename + ".presentation.xml",
38
+ File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
39
+ presentation_xml_converter(node).convert("#{@filename}.xml")
40
+ html_converter(node).convert("#{@filename}.presentation.xml",
41
41
  nil, false, "#{@filename}.html")
42
- doc_converter(node).convert(@filename + ".presentation.xml",
42
+ doc_converter(node).convert("#{@filename}.presentation.xml",
43
43
  nil, false, "#{@filename}.doc")
44
- pdf_converter(node)&.convert(@filename + ".presentation.xml",
44
+ pdf_converter(node)&.convert("#{@filename}.presentation.xml",
45
45
  nil, false, "#{@filename}.pdf")
46
46
  end
47
47
 
@@ -52,7 +52,7 @@ module Asciidoctor
52
52
  def pdf_converter(node)
53
53
  return if node.attr("no-pdf")
54
54
 
55
- IsoDoc::CC::PdfConvert.new(html_extract_attributes(node))
55
+ IsoDoc::CC::PdfConvert.new(pdf_extract_attributes(node))
56
56
  end
57
57
 
58
58
  def doc_converter(node)
@@ -1796,6 +1796,20 @@
1796
1796
  <data type="ID"/>
1797
1797
  </attribute>
1798
1798
  </optional>
1799
+ <optional>
1800
+ <attribute name="language"/>
1801
+ </optional>
1802
+ <optional>
1803
+ <attribute name="script"/>
1804
+ </optional>
1805
+ <optional>
1806
+ <attribute name="tag"/>
1807
+ </optional>
1808
+ <optional>
1809
+ <attribute name="multilingual-rendering">
1810
+ <ref name="MultilingualRenderingType"/>
1811
+ </attribute>
1812
+ </optional>
1799
1813
  <oneOrMore>
1800
1814
  <ref name="preferred"/>
1801
1815
  </oneOrMore>
@@ -1959,7 +1973,11 @@
1959
1973
  </optional>
1960
1974
  <element name="name">
1961
1975
  <zeroOrMore>
1962
- <ref name="PureTextElement"/>
1976
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1963
1981
  </zeroOrMore>
1964
1982
  </element>
1965
1983
  <optional>
@@ -1973,7 +1991,7 @@
1973
1991
  </element>
1974
1992
  </optional>
1975
1993
  <optional>
1976
- <element name="grammar-info">
1994
+ <element name="grammar">
1977
1995
  <ref name="Grammar"/>
1978
1996
  </element>
1979
1997
  </optional>
File without changes
@@ -1,9 +1,9 @@
1
1
  require "nokogiri"
2
2
  require "metanorma-generic"
3
3
 
4
- module Asciidoctor
4
+ module Metanorma
5
5
  module CC
6
- class Converter < Asciidoctor::Generic::Converter
6
+ class Converter < Metanorma::Generic::Converter
7
7
  def section_validate(doc)
8
8
  advisory = doc.root.at("//bibdata/ext[doctype = 'advisory']")
9
9
  symbols_validate(doc.root) unless advisory
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module CC
3
- VERSION = "1.8.3".freeze
3
+ VERSION = "2.0.1".freeze
4
4
  end
5
5
  end
data/lib/metanorma-cc.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require "asciidoctor" unless defined? Asciidoctor::Converter
2
- require_relative "asciidoctor/cc/converter"
2
+ require_relative "metanorma/cc/converter"
3
3
  require_relative "isodoc/cc/html_convert"
4
4
  require_relative "isodoc/cc/word_convert"
5
5
  require_relative "isodoc/cc/pdf_convert"
data/metanorma-cc.gemspec CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
28
28
  spec.require_paths = ["lib"]
29
29
  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
30
30
 
31
- spec.add_dependency "metanorma-generic", "~> 1.11.0"
31
+ spec.add_dependency "metanorma-generic", "~> 2.0.0"
32
32
 
33
33
  spec.add_development_dependency "debug"
34
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
data/metanorma.yml CHANGED
@@ -6,7 +6,7 @@ xml_root_tag: csd-standard
6
6
  html_bodyfont: '"Source Sans Pro",sans-serif'
7
7
  html_headerfont: '"Source Sans Pro",sans-serif'
8
8
  html_monospacefont: '"Source Code Pro",monospace'
9
- validate_rng_file: lib/asciidoctor/cc/cc.rng
9
+ validate_rng_file: lib/metanorma/cc/cc.rng
10
10
  htmlcoverpage: lib/isodoc/cc/html/html_cc_titlepage.html
11
11
  htmlintropage: lib/isodoc/cc/html/html_cc_intro.html
12
12
  htmlstylesheet: lib/isodoc/cc/html/htmlstyle.scss