metanorma-iso 1.5.11 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +83 -0
  3. data/README.adoc +5 -6
  4. data/lib/asciidoctor/iso/base.rb +5 -5
  5. data/lib/asciidoctor/iso/basicdoc.rng +50 -3
  6. data/lib/asciidoctor/iso/boilerplate-fr.xml +2 -2
  7. data/lib/asciidoctor/iso/cleanup.rb +33 -6
  8. data/lib/asciidoctor/iso/front.rb +5 -0
  9. data/lib/asciidoctor/iso/isodoc.rng +61 -3
  10. data/lib/asciidoctor/iso/isostandard-amd.rng +8 -4
  11. data/lib/asciidoctor/iso/isostandard.rng +27 -10
  12. data/lib/asciidoctor/iso/validate.rb +13 -1
  13. data/lib/asciidoctor/iso/validate_section.rb +21 -9
  14. data/lib/isodoc/iso/base_convert.rb +2 -1
  15. data/lib/isodoc/iso/html/header.html +4 -8
  16. data/lib/isodoc/iso/html/htmlstyle.css +1 -1
  17. data/lib/isodoc/iso/html/htmlstyle.scss +1 -1
  18. data/lib/isodoc/iso/html/isodoc.css +42 -42
  19. data/lib/isodoc/iso/html/isodoc.scss +42 -42
  20. data/lib/isodoc/iso/html/style-human.css +9 -9
  21. data/lib/isodoc/iso/html/style-human.scss +7 -7
  22. data/lib/isodoc/iso/html/style-iso.css +7 -7
  23. data/lib/isodoc/iso/html/style-iso.scss +5 -5
  24. data/lib/isodoc/iso/html/wordstyle.css +67 -67
  25. data/lib/isodoc/iso/html/wordstyle.scss +67 -67
  26. data/lib/isodoc/iso/html_convert.rb +4 -0
  27. data/lib/isodoc/iso/i18n-en.yaml +1 -0
  28. data/lib/isodoc/iso/i18n-fr.yaml +2 -0
  29. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -0
  30. data/lib/isodoc/iso/i18n.rb +10 -11
  31. data/lib/isodoc/iso/iso.amendment.xsl +381 -86
  32. data/lib/isodoc/iso/iso.international-standard.xsl +381 -86
  33. data/lib/isodoc/iso/metadata.rb +1 -0
  34. data/lib/isodoc/iso/sections.rb +1 -1
  35. data/lib/isodoc/iso/word_convert.rb +4 -0
  36. data/lib/isodoc/iso/xref.rb +34 -8
  37. data/lib/metanorma/iso/processor.rb +11 -9
  38. data/lib/metanorma/iso/version.rb +1 -1
  39. data/metanorma-iso.gemspec +2 -2
  40. data/spec/asciidoctor-iso/amd_spec.rb +14 -14
  41. data/spec/asciidoctor-iso/base_spec.rb +20 -18
  42. data/spec/asciidoctor-iso/blocks_spec.rb +22 -22
  43. data/spec/asciidoctor-iso/cleanup_spec.rb +36 -30
  44. data/spec/asciidoctor-iso/inline_spec.rb +7 -7
  45. data/spec/asciidoctor-iso/lists_spec.rb +9 -9
  46. data/spec/asciidoctor-iso/refs_spec.rb +177 -146
  47. data/spec/asciidoctor-iso/section_spec.rb +12 -7
  48. data/spec/asciidoctor-iso/table_spec.rb +4 -4
  49. data/spec/asciidoctor-iso/validate_spec.rb +401 -85
  50. data/spec/isodoc/amd_spec.rb +13 -13
  51. data/spec/isodoc/blocks_spec.rb +1 -0
  52. data/spec/isodoc/metadata_spec.rb +2 -0
  53. data/spec/isodoc/ref_spec.rb +2 -2
  54. data/spec/isodoc/section_spec.rb +20 -0
  55. data/spec/isodoc/xref_spec.rb +12 -0
  56. metadata +7 -12
  57. data/.github/workflows/macos.yml +0 -49
  58. data/.github/workflows/ubuntu.yml +0 -53
  59. data/.github/workflows/windows.yml +0 -50
  60. data/lib/asciidoctor/iso/macros.rb +0 -21
  61. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +0 -86
  62. data/spec/asciidoctor-iso/macros_spec.rb +0 -310
data/lib/isodoc/iso/html/wordstyle.scss CHANGED
@@ -61,7 +61,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
61
61
  line-height:12.0pt;
62
62
  mso-pagination:widow-orphan;
63
63
  tab-stops:20.15pt;
64
- font-size:11.0pt;
64
+ font-size:$normalfontsize;
65
65
  font-family:$bodyfont;
66
66
  mso-fareast-font-family:"SimSun",serif;
67
67
  mso-bidi-font-family:$bodyfont;
@@ -76,7 +76,7 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
76
76
  line-height:12.0pt;
77
77
  mso-pagination:widow-orphan;
78
78
  tab-stops:20.15pt;
79
- font-size:11.0pt;
79
+ font-size:$normalfontsize;
80
80
  font-family:$bodyfont;
81
81
  mso-fareast-font-family:"SimSun",serif;
82
82
  mso-bidi-font-family:$bodyfont;
@@ -117,7 +117,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
117
117
  margin-bottom:12.0pt;
118
118
  /* do not put in margin-left, it is specific to list level */
119
119
  mso-pagination:widow-orphan;
120
- font-size:11.0pt;
120
+ font-size:$normalfontsize;
121
121
  font-family:$bodyfont;
122
122
  mso-ansi-language:EN-AU;
123
123
  mso-fareast-language:EN-US;}
@@ -131,7 +131,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
131
131
  margin-bottom:12.0pt;
132
132
  /* do not put in margin-left, it is specific to list level */
133
133
  mso-pagination:widow-orphan;
134
- font-size:11.0pt;
134
+ font-size:$normalfontsize;
135
135
  font-family:$bodyfont;
136
136
  mso-ansi-language:EN-AU;
137
137
  mso-fareast-language:EN-US;}
@@ -145,7 +145,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
145
145
  margin-bottom:12.0pt;
146
146
  /* do not put in margin-left, it is specific to list level */
147
147
  mso-pagination:widow-orphan;
148
- font-size:11.0pt;
148
+ font-size:$normalfontsize;
149
149
  font-family:$bodyfont;
150
150
  mso-ansi-language:EN-AU;
151
151
  mso-fareast-language:EN-US;}
@@ -159,7 +159,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
159
159
  margin-bottom:12.0pt;
160
160
  /* do not put in margin-left, it is specific to list level */
161
161
  mso-pagination:widow-orphan;
162
- font-size:11.0pt;
162
+ font-size:$normalfontsize;
163
163
  font-family:$bodyfont;
164
164
  mso-ansi-language:EN-AU;
165
165
  mso-fareast-language:EN-US;}
@@ -184,14 +184,14 @@ h1
184
184
  mso-list:l1 level1 lfo6;
185
185
  mso-hyphenate:none;
186
186
  tab-stops:20.0pt list 21.6pt left 28.0pt;
187
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
187
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
188
188
  font-style: italic ;
189
- font-size:11.0pt;
189
+ font-size:$normalfontsize;
190
190
  font-weight: normal ;
191
- {% else %}
191
+ {% else %}
192
192
  font-size:13.0pt;
193
- {% endif %}
194
- mso-bidi-font-size:11.0pt;
193
+ {% endif %}
194
+ mso-bidi-font-size:$normalfontsize;
195
195
  font-family:$headerfont;
196
196
  mso-fareast-font-family:"SimHei",serif;
197
197
  mso-font-kerning:0pt;
@@ -224,7 +224,7 @@ h1.Annex
224
224
  mso-hyphenate:none;
225
225
  tab-stops:20.0pt list 21.6pt left 28.0pt;
226
226
  font-size:13.0pt;
227
- mso-bidi-font-size:11.0pt;
227
+ mso-bidi-font-size:$normalfontsize;
228
228
  font-family:$headerfont;
229
229
  mso-fareast-font-family:"SimHei",serif;
230
230
  mso-font-kerning:0pt;
@@ -248,15 +248,15 @@ h1.Annex
248
248
  page-break-after:avoid;
249
249
  mso-hyphenate:none;
250
250
  tab-stops:27.0pt 35.0pt;
251
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
251
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
252
252
  font-style: italic ;
253
- font-size:11.0pt;
253
+ font-size:$normalfontsize;
254
254
  font-weight: normal ;
255
- {% else %}
255
+ {% else %}
256
256
  font-size:13.0pt;
257
257
  font-weight:bold;
258
- {% endif %}
259
- mso-bidi-font-size:11.0pt;
258
+ {% endif %}
259
+ mso-bidi-font-size:$normalfontsize;
260
260
  font-family:$headerfont;
261
261
  mso-fareast-font-family:"SimHei",serif;
262
262
  mso-ansi-language:EN-GB;
@@ -284,14 +284,14 @@ h2
284
284
  mso-outline-level:3;
285
285
  mso-hyphenate:none;
286
286
  tab-stops:list 36.0pt left 44.0pt;
287
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
287
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
288
288
  font-style: italic ;
289
- font-size:11.0pt;
289
+ font-size:$normalfontsize;
290
290
  font-weight: normal ;
291
- {% else %}
291
+ {% else %}
292
292
  font-size:13.0pt;
293
293
  font-weight:bold;
294
- {% endif %}
294
+ {% endif %}
295
295
  font-family:$headerfont;
296
296
  mso-fareast-font-family:"SimHei",serif;
297
297
  mso-ansi-language:EN-GB;
@@ -317,14 +317,14 @@ h3 {mso-list:l1 level3 lfo6;
317
317
  page-break-after:avoid;
318
318
  mso-hyphenate:none;
319
319
  tab-stops:51.05pt 57.0pt 68.0pt;
320
- font-size:11.0pt;
320
+ font-size:$normalfontsize;
321
321
  font-family:$headerfont;
322
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
322
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
323
323
  font-style: italic ;
324
324
  font-weight: normal ;
325
- {% else %}
325
+ {% else %}
326
326
  font-weight:bold;
327
- {% endif %}
327
+ {% endif %}
328
328
  mso-fareast-font-family:"SimHei",serif;
329
329
  mso-ansi-language:EN-GB;
330
330
  mso-fareast-language:JA;
@@ -349,14 +349,14 @@ h4 {mso-list:l1 level4 lfo6;
349
349
  page-break-after:avoid;
350
350
  mso-hyphenate:none;
351
351
  tab-stops:51.05pt list 54.0pt;
352
- font-size:11.0pt;
352
+ font-size:$normalfontsize;
353
353
  font-family:$headerfont;
354
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
354
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
355
355
  font-style: italic ;
356
356
  font-weight: normal ;
357
- {% else %}
357
+ {% else %}
358
358
  font-weight:bold;
359
- {% endif %}
359
+ {% endif %}
360
360
  mso-fareast-font-family:"SimHei",serif;
361
361
  mso-ansi-language:EN-GB;
362
362
  mso-fareast-language:JA;
@@ -381,14 +381,14 @@ h6
381
381
  page-break-after:avoid;
382
382
  mso-hyphenate:none;
383
383
  tab-stops:51.05pt list 72.0pt;
384
- font-size:11.0pt;
384
+ font-size:$normalfontsize;
385
385
  font-family:$headerfont;
386
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
386
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
387
387
  font-style: italic ;
388
388
  font-weight: normal ;
389
- {% else %}
389
+ {% else %}
390
390
  font-weight:bold;
391
- {% endif %}
391
+ {% endif %}
392
392
  mso-fareast-font-family:"SimHei",serif;
393
393
  mso-ansi-language:EN-GB;
394
394
  mso-fareast-language:JA;
@@ -410,7 +410,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
410
410
  mso-pagination:widow-orphan;
411
411
  mso-hyphenate:none;
412
412
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
413
- font-size:11.0pt;
413
+ font-size:$normalfontsize;
414
414
  font-family:$bodyfont;
415
415
  mso-fareast-font-family:"SimHei",serif;
416
416
  mso-bidi-font-family:$bodyfont;
@@ -433,7 +433,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
433
433
  mso-pagination:widow-orphan;
434
434
  mso-hyphenate:none;
435
435
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
436
- font-size:11.0pt;
436
+ font-size:$normalfontsize;
437
437
  font-family:$bodyfont;
438
438
  mso-fareast-font-family:"SimSun",serif;
439
439
  mso-bidi-font-family:$bodyfont;
@@ -456,7 +456,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
456
456
  mso-pagination:widow-orphan;
457
457
  mso-hyphenate:none;
458
458
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
459
- font-size:11.0pt;
459
+ font-size:$normalfontsize;
460
460
  font-family:$bodyfont;
461
461
  mso-fareast-font-family:"SimSun",serif;
462
462
  mso-bidi-font-family:$bodyfont;
@@ -473,11 +473,11 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
473
473
  margin-bottom:30.0pt;
474
474
  margin-left:0cm;
475
475
  text-align:justify;
476
- line-height:11.0pt;
476
+ line-height:$normalfontsize;
477
477
  mso-line-height-rule:exactly;
478
478
  mso-pagination:widow-orphan;
479
479
  tab-stops:20.15pt;
480
- font-size:11.0pt;
480
+ font-size:$normalfontsize;
481
481
  font-family:$headerfont;
482
482
  mso-fareast-font-family:"SimHei",serif;
483
483
  mso-bidi-font-family:$headerfont;
@@ -494,11 +494,11 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
494
494
  margin-bottom:30.0pt;
495
495
  margin-left:0cm;
496
496
  text-align:justify;
497
- line-height:11.0pt;
497
+ line-height:$normalfontsize;
498
498
  mso-line-height-rule:exactly;
499
499
  mso-pagination:widow-orphan;
500
500
  tab-stops:20.15pt;
501
- font-size:11.0pt;
501
+ font-size:$normalfontsize;
502
502
  font-family:$headerfont;
503
503
  mso-fareast-font-family:"SimHei",serif;
504
504
  mso-bidi-font-family:$headerfont;
@@ -515,11 +515,11 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
515
515
  margin-bottom:6.0pt;
516
516
  margin-left:0cm;
517
517
  text-align:justify;
518
- line-height:11.0pt;
518
+ line-height:$normalfontsize;
519
519
  mso-line-height-rule:exactly;
520
520
  mso-pagination:widow-orphan;
521
521
  tab-stops:right 487.6pt;
522
- font-size:11.0pt;
522
+ font-size:$normalfontsize;
523
523
  font-family:$headerfont;
524
524
  mso-fareast-font-family:"SimHei",serif;
525
525
  mso-bidi-font-family:$headerfont;
@@ -534,11 +534,11 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
534
534
  margin-bottom:6.0pt;
535
535
  margin-left:0cm;
536
536
  text-align:justify;
537
- line-height:11.0pt;
537
+ line-height:$normalfontsize;
538
538
  mso-line-height-rule:exactly;
539
539
  mso-pagination:widow-orphan;
540
540
  tab-stops:right 734.0pt;
541
- font-size:11.0pt;
541
+ font-size:$normalfontsize;
542
542
  font-family:$headerfont;
543
543
  mso-fareast-font-family:"SimHei",serif;
544
544
  mso-bidi-font-family:$headerfont;
@@ -558,7 +558,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
558
558
  line-height:12.0pt;
559
559
  mso-pagination:widow-orphan;
560
560
  tab-stops:20.15pt;
561
- font-size:10.0pt;
561
+ font-size:$footnotefontsize;
562
562
  font-family:$bodyfont;
563
563
  mso-fareast-font-family:"SimSun",serif;
564
564
  mso-bidi-font-family:$bodyfont;
@@ -576,7 +576,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
576
576
  text-align:justify;
577
577
  line-height:12.0pt;
578
578
  mso-pagination:widow-orphan;
579
- font-size:11.0pt;
579
+ font-size:$normalfontsize;
580
580
  font-family:$bodyfont;
581
581
  mso-fareast-font-family:"SimSun",serif;
582
582
  mso-bidi-font-family:$bodyfont;
@@ -616,10 +616,10 @@ span.Heading1Char
616
616
  mso-hansi-font-family:$headerfont;
617
617
  mso-ansi-language:EN-GB;
618
618
  mso-fareast-language:JA;
619
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
620
- {% else %}
619
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
620
+ {% else %}
621
621
  font-weight:bold;
622
- {% endif %}
622
+ {% endif %}
623
623
  mso-bidi-font-weight:normal;}
624
624
  span.Heading2Char
625
625
  {mso-style-name:"Heading 2 Char";
@@ -644,7 +644,7 @@ span.Heading3Char
644
644
  mso-style-locked:yes;
645
645
  mso-style-parent:"";
646
646
  mso-style-link:"Heading 3";
647
- mso-ansi-font-size:11.0pt;
647
+ mso-ansi-font-size:$normalfontsize;
648
648
  font-family:$headerfont;
649
649
  mso-ascii-font-family:$headerfont;
650
650
  mso-fareast-font-family:"SimHei",serif;
@@ -660,7 +660,7 @@ span.Heading4Char
660
660
  mso-style-locked:yes;
661
661
  mso-style-parent:"";
662
662
  mso-style-link:"Heading 4";
663
- mso-ansi-font-size:11.0pt;
663
+ mso-ansi-font-size:$normalfontsize;
664
664
  font-family:$headerfont;
665
665
  mso-ascii-font-family:$headerfont;
666
666
  mso-fareast-font-family:"SimHei",serif;
@@ -676,7 +676,7 @@ span.Heading5Char
676
676
  mso-style-locked:yes;
677
677
  mso-style-parent:"";
678
678
  mso-style-link:"Heading 5";
679
- mso-ansi-font-size:11.0pt;
679
+ mso-ansi-font-size:$normalfontsize;
680
680
  font-family:$headerfont;
681
681
  mso-ascii-font-family:$headerfont;
682
682
  mso-fareast-font-family:"SimHei",serif;
@@ -692,7 +692,7 @@ span.Heading6Char
692
692
  mso-style-locked:yes;
693
693
  mso-style-parent:"";
694
694
  mso-style-link:"Heading 6";
695
- mso-ansi-font-size:11.0pt;
695
+ mso-ansi-font-size:$normalfontsize;
696
696
  font-family:$headerfont;
697
697
  mso-ascii-font-family:$headerfont;
698
698
  mso-fareast-font-family:"SimHei",serif;
@@ -718,7 +718,7 @@ p.a2, li.a2, div.a2
718
718
  mso-list:l0 level2 lfo12;
719
719
  tab-stops:1.0cm 36.0pt;
720
720
  font-size:13.0pt;
721
- mso-bidi-font-size:11.0pt;
721
+ mso-bidi-font-size:$normalfontsize;
722
722
  font-family:$bodyfont;
723
723
  mso-fareast-font-family:"SimHei",serif;
724
724
  mso-bidi-font-family:$headerfont;
@@ -743,7 +743,7 @@ p.a3, li.a3, div.a3
743
743
  mso-list:l0 level3 lfo12;
744
744
  tab-stops:20.15pt list 36.0pt;
745
745
  font-size:12.0pt;
746
- mso-bidi-font-size:11.0pt;
746
+ mso-bidi-font-size:$normalfontsize;
747
747
  font-family:$bodyfont;
748
748
  mso-fareast-font-family:"SimHei",serif;
749
749
  mso-bidi-font-family:$headerfont;
@@ -767,7 +767,7 @@ p.a4, li.a4, div.a4
767
767
  mso-outline-level:1;
768
768
  mso-list:l0 level4 lfo12;
769
769
  tab-stops:20.15pt 44.0pt list 54.0pt;
770
- font-size:11.0pt;
770
+ font-size:$normalfontsize;
771
771
  font-family:$bodyfont;
772
772
  mso-fareast-font-family:"SimHei",serif;
773
773
  mso-bidi-font-family:$headerfont;
@@ -791,7 +791,7 @@ p.a5, li.a5, div.a5
791
791
  mso-outline-level:1;
792
792
  mso-list:l0 level5 lfo12;
793
793
  tab-stops:20.15pt list 54.0pt left 62.35pt 68.0pt;
794
- font-size:11.0pt;
794
+ font-size:$normalfontsize;
795
795
  font-family:$bodyfont;
796
796
  mso-fareast-font-family:"SimHei",serif;
797
797
  mso-bidi-font-family:$headerfont;
@@ -815,7 +815,7 @@ p.a6, li.a6, div.a6
815
815
  mso-outline-level:1;
816
816
  mso-list:l0 level6 lfo12;
817
817
  tab-stops:20.15pt 62.35pt 68.0pt list 72.0pt;
818
- font-size:11.0pt;
818
+ font-size:$normalfontsize;
819
819
  font-family:$bodyfont;
820
820
  mso-fareast-font-family:"SimHei",serif;
821
821
  mso-bidi-font-family:$headerfont;
@@ -830,8 +830,8 @@ span.FooterChar
830
830
  mso-style-locked:yes;
831
831
  mso-style-parent:"";
832
832
  mso-style-link:Footer;
833
- mso-ansi-font-size:11.0pt;
834
- mso-bidi-font-size:11.0pt;
833
+ mso-ansi-font-size:$normalfontsize;
834
+ mso-bidi-font-size:$normalfontsize;
835
835
  mso-ansi-language:EN-GB;}
836
836
  span.HeaderChar
837
837
  {mso-style-name:"Header Char";
@@ -841,8 +841,8 @@ span.HeaderChar
841
841
  mso-style-locked:yes;
842
842
  mso-style-parent:"";
843
843
  mso-style-link:Header;
844
- mso-ansi-font-size:11.0pt;
845
- mso-bidi-font-size:11.0pt;
844
+ mso-ansi-font-size:$normalfontsize;
845
+ mso-bidi-font-size:$normalfontsize;
846
846
  mso-ansi-language:EN-GB;
847
847
  font-weight:bold;
848
848
  mso-bidi-font-weight:normal;}
@@ -854,8 +854,8 @@ span.BodyTextChar
854
854
  mso-style-locked:yes;
855
855
  mso-style-parent:"";
856
856
  mso-style-link:"Body Text";
857
- mso-ansi-font-size:11.0pt;
858
- mso-bidi-font-size:11.0pt;
857
+ mso-ansi-font-size:$normalfontsize;
858
+ mso-bidi-font-size:$normalfontsize;
859
859
  font-family:$bodyfont;
860
860
  mso-fareast-font-family:"SimSun",serif;
861
861
  mso-ansi-language:EN-GB;}
@@ -914,8 +914,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
914
914
  margin-left:0cm;
915
915
  line-height:10.5pt;
916
916
  mso-pagination:widow-orphan;
917
- font-size:10.0pt;
918
- mso-bidi-font-size:11.0pt;
917
+ font-size:$smallerfontsize;
918
+ mso-bidi-font-size:$normalfontsize;
919
919
  font-family:$bodyfont;
920
920
  mso-fareast-font-family:"SimSun",serif;
921
921
  mso-bidi-font-family:$bodyfont;
@@ -1389,7 +1389,7 @@ table.MsoNormalTable
1389
1389
  mso-para-margin:0cm;
1390
1390
  mso-para-margin-bottom:.0001pt;
1391
1391
  mso-pagination:widow-orphan;
1392
- font-size:10.0pt;
1392
+ font-size:$smallerfontsize;
1393
1393
  font-family:$bodyfont;}
1394
1394
  ol
1395
1395
  {margin-bottom:0cm;
data/lib/isodoc/iso/html_convert.rb CHANGED
@@ -25,6 +25,10 @@ module IsoDoc
25
25
  options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
26
26
  monospacefont: (options[:alt] ? '"Space Mono",monospace' :
27
27
  '"Courier New",monospace'),
28
+ normalfontsize: "1.0em",
29
+ smallerfontsize: "0.9em",
30
+ footnotefontsize: "0.9em",
31
+ monospacefontsize: "0.8em",
28
32
  }
29
33
  end
30
34
 
data/lib/isodoc/iso/i18n-en.yaml CHANGED
@@ -11,3 +11,4 @@ term_def_boilerplate: |
11
11
  all_rights_reserved: All rights reserved
12
12
  reference_number: Reference Number
13
13
  price_based_on: Price based on % pages
14
+ under_preparation: Under preparation. (Stage at the time of publication %).
data/lib/isodoc/iso/i18n-fr.yaml CHANGED
@@ -11,3 +11,5 @@ term_def_boilerplate: |
11
11
  all_rights_reserved: Tous droits réservés
12
12
  reference_number: Numéro de référence
13
13
  price_based_on: Prix basé sur % pages
14
+ under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
15
+
data/lib/isodoc/iso/i18n-zh-Hans.yaml CHANGED
@@ -9,4 +9,5 @@ term_def_boilerplate: |
9
9
  all_rights_reserved: 版权所有
10
10
  reference_number: 参考编号
11
11
  price_based_on: 价格基于%页
12
+ under_preparation: 制定中（出版时最新状态为%）
12
13
 
data/lib/isodoc/iso/i18n.rb CHANGED
@@ -1,17 +1,16 @@
1
1
  module IsoDoc
2
2
  module Iso
3
3
  class I18n < IsoDoc::I18n
4
- def load_yaml(lang, script, i18nyaml = nil)
5
- y = if i18nyaml then YAML.load_file(i18nyaml)
6
- elsif lang == "en"
7
- YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
8
- elsif lang == "fr"
9
- YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
10
- elsif lang == "zh" && script == "Hans"
11
- YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
12
- else
13
- YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
14
- end
4
+ def load_yaml1(lang, script)
5
+ y = if lang == "en"
6
+ YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
7
+ elsif lang == "fr"
8
+ YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
9
+ elsif lang == "zh" && script == "Hans"
10
+ YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
11
+ else
12
+ YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
13
+ end
15
14
  super.merge(y)
16
15
  end
17
16
  end