metanorma-rsd 1.4.3 → 1.4.4

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 (27) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +2 -3
  3. data/.github/workflows/ubuntu.yml +3 -4
  4. data/.github/workflows/windows.yml +3 -4
  5. data/README.adoc +5 -5
  6. data/lib/asciidoctor/rsd/biblio.rng +2 -12
  7. data/lib/asciidoctor/rsd/converter.rb +47 -2
  8. data/lib/asciidoctor/rsd/isodoc.rng +1 -3
  9. data/lib/isodoc/rsd/base_convert.rb +62 -0
  10. data/lib/isodoc/rsd/html/header.html +15 -15
  11. data/lib/isodoc/rsd/html/html_rsd_titlepage.html +1 -1
  12. data/lib/isodoc/rsd/html/htmlstyle.scss +6 -7
  13. data/lib/isodoc/rsd/html/logo.png +0 -0
  14. data/lib/isodoc/rsd/html/rsd.scss +57 -60
  15. data/lib/isodoc/rsd/html/word_rsd_intro.html +5 -5
  16. data/lib/isodoc/rsd/html/word_rsd_titlepage.html +69 -14
  17. data/lib/isodoc/rsd/html/wordstyle.scss +43 -30
  18. data/lib/isodoc/rsd/html_convert.rb +16 -8
  19. data/lib/isodoc/rsd/metadata.rb +17 -21
  20. data/lib/isodoc/rsd/pdf_convert.rb +16 -8
  21. data/lib/isodoc/rsd/word_convert.rb +15 -8
  22. data/lib/metanorma-rsd.rb +1 -0
  23. data/lib/metanorma/rsd.rb +2 -2
  24. data/lib/metanorma/rsd/version.rb +1 -1
  25. data/metanorma-rsd.gemspec +1 -1
  26. data/metanorma.yml +4 -1
  27. metadata +5 -3
data/lib/isodoc/rsd/html/word_rsd_intro.html CHANGED
@@ -1,8 +1,8 @@
1
- <div class="zzCopyright">
2
- <div id="boilerplate-copyright-destination" style='color:windowtext'/>
3
- <div id="boilerplate-feedback-destination" style='color:windowtext'/>
4
- </div>
5
-
6
1
  <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
7
2
 
8
3
  WORDTOC
4
+
5
+ <div class="zzCopyright">
6
+ <div id="boilerplate-feedback-destination" style='color:windowtext'/>
7
+ <div id="boilerplate-copyright-destination" style='color:windowtext'/>
8
+ </div>
data/lib/isodoc/rsd/html/word_rsd_titlepage.html CHANGED
@@ -1,15 +1,15 @@
1
- <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
2
- normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }} {{ draftinfo }}</span></b><b
3
- style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
1
+ <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>RR {{ docnumber }}:{{docyear}} {{ draftinfo }}</span></b></p>
4
2
 
5
- <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"><span
6
- style='mso-no-proof:yes'>Ribose&nbsp;{{ tc | join: "/" }}</span></p>
3
+ {% if tc %}
4
+ <p class="MsoNormal" align="right" style='text-align:right'><span
5
+ style='mso-no-proof:yes'>Ribose&#xA0;{{ tc | join: "/" }}</span></p>
6
+ {% endif %}
7
7
 
8
8
  <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
9
9
  style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
10
10
  </b><br/><span lang="EN-GB" style='font-size:16.0pt'>{{ docsubtitle }}</span></p>
11
11
 
12
- <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
12
+ <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
13
13
 
14
14
  <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
15
15
  mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -30,12 +30,6 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
30
30
  lang="EN-GB" style='font-size:16.0pt'>Ribose {{ doctype }}</span></p>
31
31
 
32
32
 
33
- {% if security %}
34
- <p class="MsoNormal" align="center" style='text-align:center;border:none;
35
- mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
36
- lang="EN-GB" style='font-size:16.0pt'> Classification: {{ security }}</span></p>
37
- {% endif %}
38
-
39
33
  {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
40
34
  <p class="MsoNormal" align="center" style='text-align:center;border:none;
41
35
  mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
@@ -43,7 +37,34 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
43
37
  {% endif %}
44
38
  </div>
45
39
 
46
- <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
40
+ <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
41
+
42
+ {% for author in authors %}
43
+ <p class="MsoNormal">{{ author }}</p>
44
+ {% endfor %}
45
+
46
+ <p/>
47
+
48
+ <p/>
49
+
50
+ <p/>
51
+
52
+ {% if draft %}
53
+ <p class="MsoNormal">Version {{draft}}<br/>
54
+ {{ revdate_MMMddyyyy || circulateddate }}</p>
55
+ {% endif %}
56
+
57
+ {% if security %}
58
+ <p class="MsoNormal">&#xA0;</p>
59
+
60
+ <p class="MsoNormal"><i> {{ security }}</i></p>
61
+ {% endif %}
62
+
63
+ {% if recipient %}
64
+ <p class="MsoNormal">&#xA0;</p>
65
+
66
+ <p class="MsoNormal">Recipient: {{ recipient }}</p>
67
+ {% endif %}
47
68
 
48
69
  <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
49
70
  mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -56,9 +77,43 @@ margin-left:4.25pt;margin-right:4.25pt'>
56
77
  </div>
57
78
 
58
79
  <div align="center" style='text-align:center'>
59
- <div id=boilerplate-copyright-destination"/>
80
+ <div id="boilerplate-copyright-destination"/>
60
81
  </div>
61
82
 
62
83
 
84
+ <p class="MsoHeader"><v:shapetype id="_x0000_t75" coordsize="21600,21600"
85
+ o:spt="75" o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f"
86
+ stroked="f">
87
+ <v:stroke joinstyle="miter"/>
88
+ <v:formulas>
89
+ <v:f eqn="if lineDrawn pixelLineWidth 0"/>
90
+ <v:f eqn="sum @0 1 0"/>
91
+ <v:f eqn="sum 0 0 @1"/>
92
+ <v:f eqn="prod @2 1 2"/>
93
+ <v:f eqn="prod @3 21600 pixelWidth"/>
94
+ <v:f eqn="prod @3 21600 pixelHeight"/>
95
+ <v:f eqn="sum @0 0 1"/>
96
+ <v:f eqn="prod @6 1 2"/>
97
+ <v:f eqn="prod @7 21600 pixelWidth"/>
98
+ <v:f eqn="sum @8 21600 0"/>
99
+ <v:f eqn="prod @7 21600 pixelHeight"/>
100
+ <v:f eqn="sum @10 21600 0"/>
101
+ </v:formulas>
102
+ <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
103
+ <o:lock v:ext="edit" aspectratio="t"/>
104
+ </v:shapetype><v:shape id="Picture_x0020_39" o:spid="_x0000_s1026" type="#_x0000_t75"
105
+ alt="A close up of a logo&#10;&#10;Description automatically generated"
106
+ style='position:absolute;margin-left:.15pt;margin-top:96pt;width:123.65pt;
107
+ height:31.1pt;z-index:251658240;visibility:visible;mso-wrap-style:square;
108
+ mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
109
+ mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
110
+ mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
111
+ mso-position-horizontal-relative:text;mso-position-vertical:absolute;
112
+ mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;
113
+ mso-width-relative:page;mso-height-relative:page'>
114
+ <v:imagedata src="{{ logo }}" o:title="A close up of a logo&#10;&#10;Description automatically generated"/>
115
+ <w:wrap type="square"/>
116
+ </v:shape>
117
+ </p>
63
118
 
64
119
 
data/lib/isodoc/rsd/html/wordstyle.scss CHANGED
@@ -71,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
71
71
  margin:0cm;
72
72
  margin-bottom:12.0pt;
73
73
  mso-pagination:widow-orphan;
74
- font-size:10.5pt;
74
+ font-size:12.0pt;
75
75
  font-family:$bodyfont;
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
@@ -84,9 +84,9 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
84
84
  margin-right:0cm;
85
85
  margin-bottom:12.0pt;
86
86
  /* do not put in margin-left, it is specific to list level */
87
- mso-add-space:auto;
87
+ /*mso-add-space:auto;*/
88
88
  mso-pagination:widow-orphan;
89
- font-size:10.5pt;
89
+ font-size:12.0pt;
90
90
  font-family:$bodyfont;
91
91
  mso-ansi-language:EN-AU;
92
92
  mso-fareast-language:EN-US;}
@@ -99,9 +99,9 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
99
99
  margin-right:0cm;
100
100
  margin-bottom:12.0pt;
101
101
  /* do not put in margin-left, it is specific to list level */
102
- mso-add-space:auto;
102
+ /*mso-add-space:auto;*/
103
103
  mso-pagination:widow-orphan;
104
- font-size:10.5pt;
104
+ font-size:12.0pt;
105
105
  font-family:$bodyfont;
106
106
  mso-ansi-language:EN-AU;
107
107
  mso-fareast-language:EN-US;}
@@ -114,9 +114,9 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
114
114
  margin-right:0cm;
115
115
  margin-bottom:12.0pt;
116
116
  /* do not put in margin-left, it is specific to list level */
117
- mso-add-space:auto;
117
+ /*mso-add-space:auto;*/
118
118
  mso-pagination:widow-orphan;
119
- font-size:10.5pt;
119
+ font-size:12.0pt;
120
120
  font-family:$bodyfont;
121
121
  mso-ansi-language:EN-AU;
122
122
  mso-fareast-language:EN-US;}
@@ -129,9 +129,9 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
129
129
  margin-right:0cm;
130
130
  margin-bottom:12.0pt;
131
131
  /* do not put in margin-left, it is specific to list level */
132
- mso-add-space:auto;
132
+ /*mso-add-space:auto;*/
133
133
  mso-pagination:widow-orphan;
134
- font-size:10.5pt;
134
+ font-size:12.0pt;
135
135
  font-family:$bodyfont;
136
136
  mso-ansi-language:EN-AU;
137
137
  mso-fareast-language:EN-US;}
@@ -153,7 +153,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
153
153
  margin-bottom:.0001pt;
154
154
  mso-pagination:widow-orphan;
155
155
  tab-stops:center 216.0pt right 482.0pt;
156
- font-size:10.5pt;
156
+ font-size:12.0pt;
157
157
  font-family:$bodyfont;
158
158
  mso-fareast-font-family:"Times New Roman";
159
159
  mso-ansi-language:EN-US;
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
164
164
  margin-bottom:.0001pt;
165
165
  mso-pagination:widow-orphan;
166
166
  tab-stops:center 367.0pt right 734.0pt;
167
- font-size:10.5pt;
167
+ font-size:12.0pt;
168
168
  font-family:$bodyfont;
169
169
  mso-fareast-font-family:"Times New Roman";
170
170
  mso-ansi-language:EN-US;
@@ -175,7 +175,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
175
175
  margin-bottom:.0001pt;
176
176
  mso-pagination:widow-orphan;
177
177
  tab-stops:right 482.0pt;
178
- font-size:10.5pt;
178
+ font-size:10.0pt;
179
179
  font-family:$bodyfont;
180
180
  mso-fareast-font-family:"Times New Roman";
181
181
  mso-ansi-language:EN-US;
@@ -186,7 +186,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
186
186
  margin-bottom:.0001pt;
187
187
  mso-pagination:widow-orphan;
188
188
  tab-stops:right 734.0pt;
189
- font-size:10.5pt;
189
+ font-size:10.0pt;
190
190
  font-family:$bodyfont;
191
191
  mso-fareast-font-family:"Times New Roman";
192
192
  mso-ansi-language:EN-US;
@@ -289,7 +289,7 @@ p.MsoTitleCxSpLast, li.MsoTitleCxSpLast, div.MsoTitleCxSpLast
289
289
  a:link, span.MsoHyperlink
290
290
  {mso-style-unhide:no;
291
291
  mso-style-parent:"";
292
- color:blue;
292
+ color:#ED7D31;
293
293
  text-decoration:underline;
294
294
  text-underline:single;}
295
295
  a:visited, span.MsoHyperlinkFollowed
@@ -362,6 +362,7 @@ h1
362
362
  font-family:$headerfont;
363
363
  mso-fareast-font-family:$headerfont;
364
364
  color:#0E1A85;
365
+ font-weight:normal;
365
366
  mso-font-kerning:0pt;
366
367
  mso-ansi-language:EN-GB;
367
368
  mso-fareast-language:JA;
@@ -386,9 +387,10 @@ h1.Annex
386
387
  mso-list:l1 level1 lfo6;
387
388
  mso-hyphenate:none;
388
389
  tab-stops:20.0pt list 21.6pt left 28.0pt;
389
- font-size:12.0pt;
390
+ font-size:13.0pt;
390
391
  mso-bidi-font-size:11.0pt;
391
392
  font-family:$headerfont;
393
+ font-weight:normal;
392
394
  mso-fareast-font-family:$headerfont;
393
395
  color:#0E1A85;
394
396
  mso-font-kerning:0pt;
@@ -416,7 +418,7 @@ h1.Annex
416
418
  font-size:12.0pt;
417
419
  mso-bidi-font-size:11.0pt;
418
420
  font-family:$headerfont;
419
- font-weight:bold;
421
+ font-weight:normal;
420
422
  mso-fareast-font-family:$headerfont;
421
423
  color:#0E1A85;
422
424
  mso-ansi-language:EN-GB;
@@ -444,6 +446,7 @@ h2
444
446
  font-size:12.0pt;
445
447
  mso-bidi-font-size:11.0pt;
446
448
  font-family:$headerfont;
449
+ font-weight:normal;
447
450
  mso-fareast-font-family:$headerfont;
448
451
  color:#0E1A85;
449
452
  mso-ansi-language:EN-GB;
@@ -470,6 +473,7 @@ h3
470
473
  tab-stops:list 36.0pt left 44.0pt;
471
474
  font-size:11.0pt;
472
475
  font-family:$headerfont;
476
+ font-weight:normal;
473
477
  color:#0E1A85;
474
478
  mso-fareast-font-family:$headerfont;
475
479
  mso-ansi-language:EN-GB;
@@ -496,6 +500,7 @@ h4
496
500
  tab-stops:51.05pt 57.0pt 68.0pt;
497
501
  font-size:11.0pt;
498
502
  font-family:$headerfont;
503
+ font-weight:normal;
499
504
  color:#0E1A85;
500
505
  mso-fareast-font-family:$headerfont;
501
506
  mso-ansi-language:EN-GB;
@@ -522,6 +527,7 @@ h5
522
527
  tab-stops:51.05pt list 54.0pt;
523
528
  font-size:11.0pt;
524
529
  font-family:$headerfont;
530
+ font-weight:normal;
525
531
  mso-fareast-font-family:$headerfont;
526
532
  color:#0E1A85;
527
533
  mso-ansi-language:EN-GB;
@@ -548,6 +554,7 @@ h6
548
554
  tab-stops:51.05pt list 72.0pt;
549
555
  font-size:11.0pt;
550
556
  font-family:$headerfont;
557
+ font-weight:normal;
551
558
  color:#0E1A85;
552
559
  mso-fareast-font-family:$headerfont;
553
560
  mso-ansi-language:EN-GB;
@@ -567,12 +574,12 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
567
574
  mso-pagination:widow-orphan;
568
575
  mso-hyphenate:none;
569
576
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
570
- font-size:10.5pt;
577
+ font-size:12.0pt;
571
578
  font-family:$bodyfont;
572
579
  mso-fareast-font-family:$bodyfont;
573
580
  mso-bidi-font-family:$bodyfont;
574
581
  mso-ansi-language:EN-GB;
575
- font-weight:bold;
582
+ font-weight:normal;
576
583
  mso-bidi-font-weight:normal;}
577
584
  p.MsoToc2, li.MsoToc2, div.MsoToc2
578
585
  {mso-style-noshow:yes;
@@ -590,12 +597,12 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
590
597
  mso-pagination:widow-orphan;
591
598
  mso-hyphenate:none;
592
599
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
593
- font-size:10.5pt;
600
+ font-size:12.0pt;
594
601
  font-family:$bodyfont;
595
602
  mso-fareast-font-family:$bodyfont;
596
603
  mso-bidi-font-family:$bodyfont;
597
604
  mso-ansi-language:EN-GB;
598
- font-weight:bold;
605
+ font-weight:normal;
599
606
  mso-bidi-font-weight:normal;}
600
607
  p.MsoToc3, li.MsoToc3, div.MsoToc3
601
608
  {mso-style-noshow:yes;
@@ -613,12 +620,12 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
613
620
  mso-pagination:widow-orphan;
614
621
  mso-hyphenate:none;
615
622
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
616
- font-size:10.5pt;
623
+ font-size:12.0pt;
617
624
  font-family:$bodyfont;
618
625
  mso-fareast-font-family:$bodyfont;
619
626
  mso-bidi-font-family:$bodyfont;
620
627
  mso-ansi-language:EN-GB;
621
- font-weight:bold;
628
+ font-weight:normal;
622
629
  mso-bidi-font-weight:normal;}
623
630
  span.MsoFootnoteReference
624
631
  {mso-style-priority:99;
@@ -653,7 +660,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
653
660
  text-align:justify;
654
661
  line-height:12.0pt;
655
662
  mso-pagination:widow-orphan;
656
- font-size:10.5pt;
663
+ font-size:12.0pt;
657
664
  font-family:$bodyfont;
658
665
  mso-fareast-font-family:$bodyfont;
659
666
  mso-bidi-font-family:$bodyfont;
@@ -667,12 +674,13 @@ span.Heading1Char
667
674
  mso-style-link:"Heading 1";
668
675
  mso-ansi-font-size:13.0pt;
669
676
  font-family:$headerfont;
677
+ color:#0E1A85;
678
+ font-weight:normal;
670
679
  mso-ascii-font-family:Cambria;
671
680
  mso-fareast-font-family:$headerfont;
672
681
  mso-hansi-font-family:$headerfont;
673
682
  mso-ansi-language:EN-GB;
674
683
  mso-fareast-language:JA;
675
- font-weight:bold;
676
684
  mso-bidi-font-weight:normal;}
677
685
  span.Heading2Char
678
686
  {mso-style-name:"Heading 2 Char";
@@ -683,12 +691,13 @@ span.Heading2Char
683
691
  mso-style-link:"Heading 2";
684
692
  mso-ansi-font-size:12.0pt;
685
693
  font-family:$headerfont;
694
+ color:#0E1A85;
695
+ font-weight:normal;
686
696
  mso-ascii-font-family:Cambria;
687
697
  mso-fareast-font-family:$headerfont;
688
698
  mso-hansi-font-family:$headerfont;
689
699
  mso-ansi-language:EN-GB;
690
700
  mso-fareast-language:JA;
691
- font-weight:bold;
692
701
  mso-bidi-font-weight:normal;}
693
702
  span.Heading3Char
694
703
  {mso-style-name:"Heading 3 Char";
@@ -699,12 +708,13 @@ span.Heading3Char
699
708
  mso-style-link:"Heading 3";
700
709
  mso-ansi-font-size:11.0pt;
701
710
  font-family:$headerfont;
711
+ color:#0E1A85;
712
+ font-weight:normal;
702
713
  mso-ascii-font-family:$headerfont;
703
714
  mso-fareast-font-family:$headerfont;
704
715
  mso-hansi-font-family:$headerfont;
705
716
  mso-ansi-language:EN-GB;
706
717
  mso-fareast-language:JA;
707
- font-weight:bold;
708
718
  mso-bidi-font-weight:normal;}
709
719
  span.Heading4Char
710
720
  {mso-style-name:"Heading 4 Char";
@@ -715,12 +725,13 @@ span.Heading4Char
715
725
  mso-style-link:"Heading 4";
716
726
  mso-ansi-font-size:11.0pt;
717
727
  font-family:$headerfont;
728
+ color:#0E1A85;
729
+ font-weight:normal;
718
730
  mso-ascii-font-family:$headerfont;
719
731
  mso-fareast-font-family:$headerfont;
720
732
  mso-hansi-font-family:$headerfont;
721
733
  mso-ansi-language:EN-GB;
722
734
  mso-fareast-language:JA;
723
- font-weight:bold;
724
735
  mso-bidi-font-weight:normal;}
725
736
  span.Heading5Char
726
737
  {mso-style-name:"Heading 5 Char";
@@ -731,12 +742,13 @@ span.Heading5Char
731
742
  mso-style-link:"Heading 5";
732
743
  mso-ansi-font-size:11.0pt;
733
744
  font-family:$headerfont;
745
+ color:#0E1A85;
746
+ font-weight:normal;
734
747
  mso-ascii-font-family:$headerfont;
735
748
  mso-fareast-font-family:$headerfont;
736
749
  mso-hansi-font-family:$headerfont;
737
750
  mso-ansi-language:EN-GB;
738
751
  mso-fareast-language:JA;
739
- font-weight:bold;
740
752
  mso-bidi-font-weight:normal;}
741
753
  span.Heading6Char
742
754
  {mso-style-name:"Heading 6 Char";
@@ -747,12 +759,13 @@ span.Heading6Char
747
759
  mso-style-link:"Heading 6";
748
760
  mso-ansi-font-size:11.0pt;
749
761
  font-family:$headerfont;
762
+ color:#0E1A85;
763
+ font-weight:normal;
750
764
  mso-ascii-font-family:$headerfont;
751
765
  mso-fareast-font-family:$headerfont;
752
766
  mso-hansi-font-family:$headerfont;
753
767
  mso-ansi-language:EN-GB;
754
768
  mso-fareast-language:JA;
755
- font-weight:bold;
756
769
  mso-bidi-font-weight:normal;}
757
770
  p.Tablebody, li.Tablebody, div.Tablebody
758
771
  {mso-style-name:"Table body";
@@ -1146,7 +1159,7 @@ table.MsoNormalTable
1146
1159
  mso-para-margin:0cm;
1147
1160
  mso-para-margin-bottom:.0001pt;
1148
1161
  mso-pagination:widow-orphan;
1149
- font-size:10.0pt;
1162
+ font-size:12.0pt;
1150
1163
  font-family:$bodyfont;}
1151
1164
  ol
1152
1165
  {margin-bottom:0cm;
data/lib/isodoc/rsd/html_convert.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require "isodoc"
2
- require "isodoc/acme/html_convert"
2
+ require "isodoc/generic/html_convert"
3
3
  require "isodoc/rsd/metadata"
4
4
 
5
5
  module IsoDoc
@@ -7,19 +7,27 @@ module IsoDoc
7
7
  # A {Converter} implementation that generates HTML output, and a document
8
8
  # schema encapsulation of the document for validation
9
9
  #
10
- class HtmlConvert < IsoDoc::Acme::HtmlConvert
10
+ class HtmlConvert < IsoDoc::Generic::HtmlConvert
11
11
  def configuration
12
12
  Metanorma::Rsd.configuration
13
13
  end
14
14
 
15
- def metadata_init(lang, script, labels)
16
- @meta = Metadata.new(lang, script, labels)
15
+ def make_body3(body, docxml)
16
+ body.div **{ class: "main-section" } do |div3|
17
+ boilerplate docxml, div3
18
+ abstract docxml, div3
19
+ foreword docxml, div3
20
+ executivesummary docxml, div3
21
+ introduction docxml, div3
22
+ preface docxml, div3
23
+ acknowledgements docxml, div3
24
+ middle docxml, div3
25
+ footnotes div3
26
+ comments div3
17
27
  end
28
+ end
18
29
 
19
- def info(isoxml, out)
20
- @meta.security isoxml, out
21
- super
22
- end
30
+ include BaseConvert
23
31
  end
24
32
  end
25
33
  end