metanorma-un 0.5.7 → 0.5.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -5
  3. data/lib/asciidoctor/un/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/un/converter.rb +1 -1
  5. data/lib/asciidoctor/un/isodoc.rng +51 -3
  6. data/lib/isodoc/un/base_convert.rb +1 -1
  7. data/lib/isodoc/un/html/html_unece_intro.html +1 -1
  8. data/lib/isodoc/un/html/htmlstyle.css +3 -3
  9. data/lib/isodoc/un/html/htmlstyle.scss +2 -2
  10. data/lib/isodoc/un/html/unece.css +19 -20
  11. data/lib/isodoc/un/html/unece.scss +19 -20
  12. data/lib/isodoc/un/html/word_unece_intro.html +1 -1
  13. data/lib/isodoc/un/html/wordstyle.css +17 -17
  14. data/lib/isodoc/un/html/wordstyle.scss +17 -17
  15. data/lib/isodoc/un/html_convert.rb +5 -3
  16. data/lib/isodoc/un/un.plenary-attachment.xsl +253 -45
  17. data/lib/isodoc/un/un.plenary.xsl +253 -45
  18. data/lib/isodoc/un/un.recommendation.xsl +254 -46
  19. data/lib/isodoc/un/word_convert.rb +7 -3
  20. data/lib/isodoc/un/xref.rb +4 -2
  21. data/lib/metanorma/un/processor.rb +11 -8
  22. data/lib/metanorma/un/version.rb +1 -1
  23. data/metanorma-unece.gemspec +2 -2
  24. metadata +6 -6
data/lib/isodoc/un/html/unece.scss CHANGED
@@ -27,7 +27,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre
27
27
  text-align:left;
28
28
  mso-pagination:widow-orphan;
29
29
  tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
30
- font-size:10.0pt;
30
+ font-size:$monospacefontsize;
31
31
  font-family:$monospacefont;
32
32
  mso-fareast-font-family:Calibri;
33
33
  mso-bidi-font-family:"Courier New";
@@ -43,7 +43,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
43
43
  text-align:left;
44
44
  mso-pagination:widow-orphan;
45
45
  tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
46
- font-size:10.5pt;
46
+ font-size:$normalfontsize;
47
47
  font-family:$bodyfont;
48
48
  mso-fareast-font-family:Calibri;
49
49
  mso-bidi-font-family:"Courier New";
@@ -60,7 +60,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
60
60
  tab-stops: 33.15pt;
61
61
  line-height:12.0pt;
62
62
  mso-pagination:widow-orphan;
63
- font-size:10.5pt;
63
+ font-size:$normalfontsize;
64
64
  font-weight:normal;
65
65
  font-family:$bodyfont;
66
66
  mso-fareast-font-family:$bodyfont;
@@ -153,10 +153,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
153
153
  line-height:12.0pt;
154
154
  mso-pagination:widow-orphan;
155
155
  tab-stops:20.15pt;
156
- font-size:10.0pt;
156
+ font-size:$smallerfontsize;
157
157
  mso-bidi-font-size:11.0pt;
158
158
  font-family:$bodyfont;
159
- font-size:10.0pt;
160
159
  mso-fareast-font-family:$bodyfont;
161
160
  mso-bidi-font-family:$bodyfont;
162
161
  mso-ansi-language:EN-GB;}
@@ -410,7 +409,7 @@ p.zzCopyright, li.zzCopyright
410
409
  tab-stops:20.15pt 25.7pt 481.15pt;
411
410
  padding:0cm;
412
411
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
413
- font-size:10.5pt;
412
+ font-size:$normalfontsize;
414
413
  font-family:$bodyfont;
415
414
  mso-fareast-font-family:$bodyfont;
416
415
  mso-bidi-font-family:$bodyfont;
@@ -491,7 +490,7 @@ p.Quote, li.Quote, div.Quote
491
490
  line-height:12.0pt;
492
491
  mso-pagination:widow-orphan;
493
492
  tab-stops:20.15pt;
494
- font-size:10.5pt;
493
+ font-size:$normalfontsize;
495
494
  font-family:$bodyfont;
496
495
  mso-fareast-font-family:$bodyfont;
497
496
  mso-bidi-font-family:$bodyfont;
@@ -506,7 +505,7 @@ p.QuoteAttribution
506
505
  line-height:12.0pt;
507
506
  mso-pagination:widow-orphan;
508
507
  tab-stops:20.15pt;
509
- font-size:10.5pt;
508
+ font-size:$normalfontsize;
510
509
  font-family:$bodyfont;
511
510
  mso-fareast-font-family:$bodyfont;
512
511
  mso-bidi-font-family:$bodyfont;
@@ -562,7 +561,7 @@ p.Formula, li.Formula, div.Formula
562
561
  line-height:12.0pt;
563
562
  mso-pagination:widow-orphan;
564
563
  tab-stops:right 487.45pt;
565
- font-size:10.5pt;
564
+ font-size:$normalfontsize;
566
565
  font-family:$bodyfont;
567
566
  mso-fareast-font-family:$bodyfont;
568
567
  mso-bidi-font-family:$bodyfont;
@@ -681,14 +680,14 @@ table.MsoISOTable, table.MsoISOTableBig
681
680
  mso-border-insideh:.75pt solid windowtext;
682
681
  mso-border-insidev:.75pt solid windowtext;
683
682
  margin-bottom:12pt;
684
- font-size:10.0pt;
683
+ font-size:$smallerfontsize;
685
684
  font-family:$bodyfont;}
686
685
  table.MsoISOTable th, table.MsoISOTableBig th
687
686
  {border:solid windowtext 1pt;
688
687
  mso-border-alt:solid windowtext 1pt;
689
688
  padding:0cm 2.85pt 0cm 2.85pt;}
690
689
  table.MsoISOTable p, table.MsoISOTableBig p
691
- {font-size:10.0pt; }
690
+ {font-size:$smallerfontsize; }
692
691
  table.MsoISOTable td, table.MsoISOTableBig td
693
692
  {border:solid windowtext 1pt;
694
693
  mso-border-alt:solid windowtext 1pt;
@@ -708,7 +707,7 @@ table.MsoTableGrid
708
707
  mso-para-margin-bottom:.0001pt;
709
708
  mso-pagination:widow-orphan;
710
709
  margin-bottom:12pt;
711
- font-size:10.0pt;
710
+ font-size:$smallerfontsize;
712
711
  font-family:$bodyfont;}
713
712
  div.formula
714
713
  {tab-stops:right 487.45pt;}
@@ -743,7 +742,7 @@ div.coverpage_warning
743
742
  vertical-align:super;}
744
743
 
745
744
  aside {
746
- font-size:10.0pt;
745
+ font-size:$footnotefontsize;
747
746
  }
748
747
 
749
748
  .example-title {
@@ -765,24 +764,24 @@ div.example {
765
764
 
766
765
  p.example, li.example, div.example, td.example {
767
766
  mso-pagination:none;
768
- font-size:10.0pt;
767
+ font-size:$smallerfontsize;
769
768
  font-family:$bodyfont;}
770
769
 
771
770
  td.example p.MsoListParagraph {
772
- font-size: 10.0pt;
771
+ font-size: $smallerfontsize;
773
772
  }
774
773
 
775
774
  div.example p.MsoListParagraph {
776
- font-size: 10.0pt;
775
+ font-size: $smallerfontsize;
777
776
  }
778
777
 
779
778
  div.Note p.MsoListParagraph {
780
- font-size: 10.0pt;
779
+ font-size: $smallerfontsize;
781
780
  margin-left: 1.0cm;
782
781
  }
783
782
 
784
783
  div.Note span.stem {
785
- font-size: 10.0pt; }
784
+ font-size: $smallerfontsize; }
786
785
 
787
786
  div.Note p.Sourcecode, div.Note pre.Sourcecode {
788
787
  font-size: 8.0pt;
@@ -790,13 +789,13 @@ div.Note p.Sourcecode, div.Note pre.Sourcecode {
790
789
  }
791
790
 
792
791
  div.Note table.dl {
793
- font-size: 10.0pt;
792
+ font-size: $smallerfontsize;
794
793
  margin-left: 1.0cm;
795
794
  }
796
795
 
797
796
  span.note_label, span.example_label, td.example_label, td.note_label
798
797
  {
799
- font-size: 10.0pt;
798
+ font-size: $smallerfontsize;
800
799
  font-family:$bodyfont;
801
800
  }
802
801
 
data/lib/isodoc/un/html/word_unece_intro.html CHANGED
@@ -9,7 +9,7 @@
9
9
  {% endif %}
10
10
 
11
11
  {% if toc %}
12
- <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
12
+ <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
13
13
 
14
14
  WORDTOC
15
15
  {% endif %}
data/lib/isodoc/un/html/wordstyle.css CHANGED
@@ -81,7 +81,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
81
81
  margin: 0cm;
82
82
  margin-bottom: 12.0pt;
83
83
  mso-pagination: widow-orphan;
84
- font-size: 10.5pt;
84
+ font-size: {{normalfontsize}};
85
85
  font-family: {{bodyfont}};
86
86
  mso-fareast-font-family: "Times New Roman";
87
87
  mso-ansi-language: EN-US;
@@ -96,7 +96,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
96
96
  margin-bottom: 12.0pt;
97
97
  /* do not put in margin-left, it is specific to list level */
98
98
  mso-pagination: widow-orphan;
99
- font-size: 10.5pt;
99
+ font-size: {{normalfontsize}};
100
100
  font-family: {{bodyfont}};
101
101
  mso-ansi-language: EN-AU;
102
102
  mso-fareast-language: EN-US; }
@@ -111,7 +111,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
111
111
  margin-bottom: 12.0pt;
112
112
  /* do not put in margin-left, it is specific to list level */
113
113
  mso-pagination: widow-orphan;
114
- font-size: 10.5pt;
114
+ font-size: {{normalfontsize}};
115
115
  font-family: {{bodyfont}};
116
116
  mso-ansi-language: EN-AU;
117
117
  mso-fareast-language: EN-US; }
@@ -126,7 +126,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
126
126
  margin-bottom: 12.0pt;
127
127
  /* do not put in margin-left, it is specific to list level */
128
128
  mso-pagination: widow-orphan;
129
- font-size: 10.5pt;
129
+ font-size: {{normalfontsize}};
130
130
  font-family: {{bodyfont}};
131
131
  mso-ansi-language: EN-AU;
132
132
  mso-fareast-language: EN-US; }
@@ -141,7 +141,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
141
141
  margin-bottom: 12.0pt;
142
142
  /* do not put in margin-left, it is specific to list level */
143
143
  mso-pagination: widow-orphan;
144
- font-size: 10.5pt;
144
+ font-size: {{normalfontsize}};
145
145
  font-family: {{bodyfont}};
146
146
  mso-ansi-language: EN-AU;
147
147
  mso-fareast-language: EN-US; }
@@ -164,7 +164,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
164
164
  margin-bottom: .0001pt;
165
165
  mso-pagination: widow-orphan;
166
166
  tab-stops: center 216.0pt right 482.0pt;
167
- font-size: 10.5pt;
167
+ font-size: {{normalfontsize}};
168
168
  font-family: {{bodyfont}};
169
169
  mso-fareast-font-family: "Times New Roman";
170
170
  mso-ansi-language: EN-US;
@@ -176,7 +176,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
176
176
  margin-bottom: .0001pt;
177
177
  mso-pagination: widow-orphan;
178
178
  tab-stops: center 367.0pt right 734.0pt;
179
- font-size: 10.5pt;
179
+ font-size: {{normalfontsize}};
180
180
  font-family: {{bodyfont}};
181
181
  mso-fareast-font-family: "Times New Roman";
182
182
  mso-ansi-language: EN-US;
@@ -188,7 +188,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
188
188
  margin-bottom: .0001pt;
189
189
  mso-pagination: widow-orphan;
190
190
  tab-stops: right 482.0pt;
191
- font-size: 10.5pt;
191
+ font-size: {{normalfontsize}};
192
192
  font-family: {{bodyfont}};
193
193
  mso-fareast-font-family: "Times New Roman";
194
194
  mso-ansi-language: EN-US;
@@ -200,7 +200,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
200
200
  margin-bottom: .0001pt;
201
201
  mso-pagination: widow-orphan;
202
202
  tab-stops: right 734.0pt;
203
- font-size: 10.5pt;
203
+ font-size: {{normalfontsize}};
204
204
  font-family: {{bodyfont}};
205
205
  mso-fareast-font-family: "Times New Roman";
206
206
  mso-ansi-language: EN-US;
@@ -592,7 +592,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
592
592
  mso-pagination: widow-orphan;
593
593
  mso-hyphenate: none;
594
594
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
595
- font-size: 10.5pt;
595
+ font-size: {{normalfontsize}};
596
596
  font-family: {{bodyfont}};
597
597
  mso-fareast-font-family: {{bodyfont}};
598
598
  mso-bidi-font-family: {{bodyfont}};
@@ -615,7 +615,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
615
615
  mso-pagination: widow-orphan;
616
616
  mso-hyphenate: none;
617
617
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
618
- font-size: 10.5pt;
618
+ font-size: {{normalfontsize}};
619
619
  font-family: {{bodyfont}};
620
620
  mso-fareast-font-family: {{bodyfont}};
621
621
  mso-bidi-font-family: {{bodyfont}};
@@ -638,7 +638,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
638
638
  mso-pagination: widow-orphan;
639
639
  mso-hyphenate: none;
640
640
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
641
- font-size: 10.5pt;
641
+ font-size: {{normalfontsize}};
642
642
  font-family: {{bodyfont}};
643
643
  mso-fareast-font-family: {{bodyfont}};
644
644
  mso-bidi-font-family: {{bodyfont}};
@@ -661,7 +661,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
661
661
  line-height: 12.0pt;
662
662
  mso-pagination: widow-orphan;
663
663
  tab-stops: 20.15pt;
664
- font-size: 9.0pt;
664
+ font-size: {{footnotefontsize}};
665
665
  font-family: {{bodyfont}};
666
666
  mso-fareast-font-family: {{bodyfont}};
667
667
  mso-bidi-font-family: {{bodyfont}};
@@ -680,7 +680,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
680
680
  text-align: justify;
681
681
  line-height: 12.0pt;
682
682
  mso-pagination: widow-orphan;
683
- font-size: 10.5pt;
683
+ font-size: {{normalfontsize}};
684
684
  font-family: {{bodyfont}};
685
685
  mso-fareast-font-family: {{bodyfont}};
686
686
  mso-bidi-font-family: {{bodyfont}};
@@ -796,9 +796,9 @@ p.Tablebody, li.Tablebody, div.Tablebody {
796
796
  margin-right: 0cm;
797
797
  margin-bottom: 3.0pt;
798
798
  margin-left: 0cm;
799
- line-height: 10.5pt;
799
+ line-height: {{normalfontsize}};
800
800
  mso-pagination: widow-orphan;
801
- font-size: 10.0pt;
801
+ font-size: {{smallerfontsize}};
802
802
  mso-bidi-font-size: 11.0pt;
803
803
  font-family: {{bodyfont}};
804
804
  mso-fareast-font-family: {{bodyfont}};
@@ -1225,7 +1225,7 @@ table.MsoNormalTable {
1225
1225
  mso-para-margin: 0cm;
1226
1226
  mso-para-margin-bottom: .0001pt;
1227
1227
  mso-pagination: widow-orphan;
1228
- font-size: 10.0pt;
1228
+ font-size: {{smallerfontsize}};
1229
1229
  font-family: {{bodyfont}}; }
1230
1230
 
1231
1231
  ol {
data/lib/isodoc/un/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:$normalfontsize;
75
75
  font-family:$bodyfont;
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
@@ -85,7 +85,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
85
85
  margin-bottom:12.0pt;
86
86
  /* do not put in margin-left, it is specific to list level */
87
87
  mso-pagination:widow-orphan;
88
- font-size:10.5pt;
88
+ font-size:$normalfontsize;
89
89
  font-family:$bodyfont;
90
90
  mso-ansi-language:EN-AU;
91
91
  mso-fareast-language:EN-US;}
@@ -99,7 +99,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
99
99
  margin-bottom:12.0pt;
100
100
  /* do not put in margin-left, it is specific to list level */
101
101
  mso-pagination:widow-orphan;
102
- font-size:10.5pt;
102
+ font-size:$normalfontsize;
103
103
  font-family:$bodyfont;
104
104
  mso-ansi-language:EN-AU;
105
105
  mso-fareast-language:EN-US;}
@@ -113,7 +113,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
113
113
  margin-bottom:12.0pt;
114
114
  /* do not put in margin-left, it is specific to list level */
115
115
  mso-pagination:widow-orphan;
116
- font-size:10.5pt;
116
+ font-size:$normalfontsize;
117
117
  font-family:$bodyfont;
118
118
  mso-ansi-language:EN-AU;
119
119
  mso-fareast-language:EN-US;}
@@ -127,7 +127,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
127
127
  margin-bottom:12.0pt;
128
128
  /* do not put in margin-left, it is specific to list level */
129
129
  mso-pagination:widow-orphan;
130
- font-size:10.5pt;
130
+ font-size:$normalfontsize;
131
131
  font-family:$bodyfont;
132
132
  mso-ansi-language:EN-AU;
133
133
  mso-fareast-language:EN-US;}
@@ -149,7 +149,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
149
149
  margin-bottom:.0001pt;
150
150
  mso-pagination:widow-orphan;
151
151
  tab-stops:center 216.0pt right 482.0pt;
152
- font-size:10.5pt;
152
+ font-size:$normalfontsize;
153
153
  font-family:$bodyfont;
154
154
  mso-fareast-font-family:"Times New Roman";
155
155
  mso-ansi-language:EN-US;
@@ -160,7 +160,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
160
160
  margin-bottom:.0001pt;
161
161
  mso-pagination:widow-orphan;
162
162
  tab-stops:center 367.0pt right 734.0pt;
163
- font-size:10.5pt;
163
+ font-size:$normalfontsize;
164
164
  font-family:$bodyfont;
165
165
  mso-fareast-font-family:"Times New Roman";
166
166
  mso-ansi-language:EN-US;
@@ -171,7 +171,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
171
171
  margin-bottom:.0001pt;
172
172
  mso-pagination:widow-orphan;
173
173
  tab-stops:right 482.0pt;
174
- font-size:10.5pt;
174
+ font-size:$normalfontsize;
175
175
  font-family:$bodyfont;
176
176
  mso-fareast-font-family:"Times New Roman";
177
177
  mso-ansi-language:EN-US;
@@ -182,7 +182,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
182
182
  margin-bottom:.0001pt;
183
183
  mso-pagination:widow-orphan;
184
184
  tab-stops:right 734.0pt;
185
- font-size:10.5pt;
185
+ font-size:$normalfontsize;
186
186
  font-family:$bodyfont;
187
187
  mso-fareast-font-family:"Times New Roman";
188
188
  mso-ansi-language:EN-US;
@@ -553,7 +553,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
553
553
  mso-pagination:widow-orphan;
554
554
  mso-hyphenate:none;
555
555
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
556
- font-size:10.5pt;
556
+ font-size:$normalfontsize;
557
557
  font-family:$bodyfont;
558
558
  mso-fareast-font-family:$bodyfont;
559
559
  mso-bidi-font-family:$bodyfont;
@@ -575,7 +575,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
575
575
  mso-pagination:widow-orphan;
576
576
  mso-hyphenate:none;
577
577
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
578
- font-size:10.5pt;
578
+ font-size:$normalfontsize;
579
579
  font-family:$bodyfont;
580
580
  mso-fareast-font-family:$bodyfont;
581
581
  mso-bidi-font-family:$bodyfont;
@@ -597,7 +597,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
597
597
  mso-pagination:widow-orphan;
598
598
  mso-hyphenate:none;
599
599
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
600
- font-size:10.5pt;
600
+ font-size:$normalfontsize;
601
601
  font-family:$bodyfont;
602
602
  mso-fareast-font-family:$bodyfont;
603
603
  mso-bidi-font-family:$bodyfont;
@@ -618,7 +618,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
618
618
  line-height:12.0pt;
619
619
  mso-pagination:widow-orphan;
620
620
  tab-stops:20.15pt;
621
- font-size:9.0pt;
621
+ font-size:$footnotefontsize;
622
622
  font-family:$bodyfont;
623
623
  mso-fareast-font-family:$bodyfont;
624
624
  mso-bidi-font-family:$bodyfont;
@@ -636,7 +636,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
636
636
  text-align:justify;
637
637
  line-height:12.0pt;
638
638
  mso-pagination:widow-orphan;
639
- font-size:10.5pt;
639
+ font-size:$normalfontsize;
640
640
  font-family:$bodyfont;
641
641
  mso-fareast-font-family:$bodyfont;
642
642
  mso-bidi-font-family:$bodyfont;
@@ -745,9 +745,9 @@ p.Tablebody, li.Tablebody, div.Tablebody
745
745
  margin-right:0cm;
746
746
  margin-bottom:3.0pt;
747
747
  margin-left:0cm;
748
- line-height:10.5pt;
748
+ line-height:$normalfontsize;
749
749
  mso-pagination:widow-orphan;
750
- font-size:10.0pt;
750
+ font-size:$smallerfontsize;
751
751
  mso-bidi-font-size:11.0pt;
752
752
  font-family:$bodyfont;
753
753
  mso-fareast-font-family:$bodyfont;
@@ -1130,7 +1130,7 @@ table.MsoNormalTable
1130
1130
  mso-para-margin:0cm;
1131
1131
  mso-para-margin-bottom:.0001pt;
1132
1132
  mso-pagination:widow-orphan;
1133
- font-size:10.0pt;
1133
+ font-size:$smallerfontsize;
1134
1134
  font-family:$bodyfont;}
1135
1135
  ol
1136
1136
  {margin-bottom:0cm;
data/lib/isodoc/un/html_convert.rb CHANGED
@@ -18,15 +18,17 @@ module IsoDoc
18
18
  {
19
19
  bodyfont: (
20
20
  options[:script] == "Hans" ?
21
- '"SimSun",serif' :
21
+ '"Source Han Sans",serif' :
22
22
  '"Times New Roman", serif'
23
23
  ),
24
24
  headerfont: (
25
25
  options[:script] == "Hans" ?
26
- '"SimHei",sans-serif' :
26
+ '"Source Han Sans",sans-serif' :
27
27
  '"Times New Roman", serif'
28
28
  ),
29
- monospacefont: '"Courier New",monospace'
29
+ monospacefont: '"Courier New",monospace',
30
+ normalfontsize: "15px",
31
+ footnotefontsize: "0.9em",
30
32
  }
31
33
  end
32
34