metanorma-iso 2.0.8.1 → 2.1.2

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 (79) hide show
  1. checksums.yaml +4 -4
  2. data/lib/html2doc/lists.rb +169 -0
  3. data/lib/isodoc/iso/base_convert.rb +11 -1
  4. data/lib/isodoc/iso/html/html_iso_titlepage.html +7 -0
  5. data/lib/isodoc/iso/html/isodoc-dis.css +407 -427
  6. data/lib/isodoc/iso/html/isodoc-dis.scss +482 -438
  7. data/lib/isodoc/iso/html/isodoc.css +38 -13
  8. data/lib/isodoc/iso/html/isodoc.scss +38 -12
  9. data/lib/isodoc/iso/html/style-human.css +14 -1
  10. data/lib/isodoc/iso/html/style-human.scss +10 -1
  11. data/lib/isodoc/iso/html/style-iso.css +35 -23
  12. data/lib/isodoc/iso/html/style-iso.scss +31 -23
  13. data/lib/isodoc/iso/html/word_iso_intro-dis.html +3 -1
  14. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +26 -13
  15. data/lib/isodoc/iso/html/word_iso_titlepage-prf.html +58 -0
  16. data/lib/isodoc/iso/html/word_iso_titlepage.html +16 -6
  17. data/lib/isodoc/iso/html/wordstyle-dis.css +168 -48
  18. data/lib/isodoc/iso/html/wordstyle-dis.scss +158 -43
  19. data/lib/isodoc/iso/html_convert.rb +7 -2
  20. data/lib/isodoc/iso/i18n-en.yaml +33 -4
  21. data/lib/isodoc/iso/i18n-fr.yaml +30 -3
  22. data/lib/isodoc/iso/i18n-ru.yaml +33 -4
  23. data/lib/isodoc/iso/i18n-zh-Hans.yaml +33 -3
  24. data/lib/isodoc/iso/i18n.rb +1 -1
  25. data/lib/isodoc/iso/init.rb +17 -1
  26. data/lib/isodoc/iso/iso.amendment.xsl +1711 -367
  27. data/lib/isodoc/iso/iso.international-standard.xsl +1711 -367
  28. data/lib/isodoc/iso/metadata.rb +72 -78
  29. data/lib/isodoc/iso/presentation_bibdata.rb +74 -0
  30. data/lib/isodoc/iso/presentation_xml_convert.rb +52 -100
  31. data/lib/isodoc/iso/presentation_xref.rb +132 -0
  32. data/lib/isodoc/iso/sections.rb +3 -3
  33. data/lib/isodoc/iso/word_cleanup.rb +17 -0
  34. data/lib/isodoc/iso/word_convert.rb +32 -12
  35. data/lib/isodoc/iso/word_dis_cleanup.rb +235 -0
  36. data/lib/isodoc/iso/word_dis_convert.rb +122 -0
  37. data/lib/isodoc/iso/xref.rb +78 -29
  38. data/lib/metanorma/iso/base.rb +20 -1
  39. data/lib/metanorma/iso/biblio.rng +69 -42
  40. data/lib/metanorma/iso/boilerplate-fr.xml +4 -1
  41. data/lib/metanorma/iso/boilerplate-ru.xml +4 -3
  42. data/lib/metanorma/iso/boilerplate.xml +4 -3
  43. data/lib/metanorma/iso/cleanup.rb +29 -1
  44. data/lib/metanorma/iso/front.rb +31 -6
  45. data/lib/metanorma/iso/front_id.rb +2 -0
  46. data/lib/metanorma/iso/isodoc.rng +65 -0
  47. data/lib/metanorma/iso/isostandard.rng +30 -12
  48. data/lib/metanorma/iso/macros.rb +29 -0
  49. data/lib/metanorma/iso/version.rb +1 -1
  50. data/lib/metanorma-iso.rb +1 -0
  51. data/lib/relaton/render/config.yml +4 -0
  52. data/lib/relaton/render/general.rb +13 -0
  53. data/metanorma-iso.gemspec +1 -1
  54. data/spec/isodoc/amd_spec.rb +35 -60
  55. data/spec/isodoc/blocks_spec.rb +783 -179
  56. data/spec/isodoc/i18n_spec.rb +331 -100
  57. data/spec/isodoc/inline_spec.rb +35 -42
  58. data/spec/isodoc/iso_spec.rb +51 -170
  59. data/spec/isodoc/metadata_spec.rb +240 -99
  60. data/spec/isodoc/postproc_spec.rb +68 -7
  61. data/spec/isodoc/ref_spec.rb +66 -69
  62. data/spec/isodoc/section_spec.rb +88 -80
  63. data/spec/isodoc/table_spec.rb +2 -2
  64. data/spec/isodoc/terms_spec.rb +2 -2
  65. data/spec/isodoc/word_dis_spec.rb +1886 -0
  66. data/spec/isodoc/xref_spec.rb +138 -64
  67. data/spec/metanorma/amd_spec.rb +53 -1
  68. data/spec/metanorma/base_spec.rb +195 -20
  69. data/spec/metanorma/blocks_spec.rb +54 -0
  70. data/spec/metanorma/lists_spec.rb +2 -2
  71. data/spec/metanorma/section_spec.rb +2 -2
  72. data/spec/spec_helper.rb +23 -4
  73. data/spec/vcr_cassettes/withdrawn_iso.yml +25 -25
  74. metadata +15 -10
  75. data/docs/asciiiso-syntax.adoc +0 -307
  76. data/docs/guidance.adoc +0 -487
  77. data/docs/navigation.adoc +0 -23
  78. data/docs/quickstart.adoc +0 -179
  79. data/spec/vcr_cassettes/docrels.yml +0 -385
@@ -276,6 +276,7 @@ h1, .h1
276
276
  mso-style-name:"Heading 1";
277
277
  mso-style-link:"Heading 1 Char";
278
278
  mso-style-next:Normal;
279
+ mso-outline-level:1;
279
280
  margin-top:13.5pt;
280
281
  margin-right:0cm;
281
282
  margin-bottom:12.0pt;
@@ -297,7 +298,6 @@ h1, .h1
297
298
  mso-fareast-language:JA;
298
299
  mso-bidi-font-weight:normal;}
299
300
  h1 {
300
- mso-outline-level:1;
301
301
  mso-list:l1 level1 lfo6;
302
302
  }
303
303
  h1.ForewordTitle {
@@ -321,7 +321,6 @@ h1.Annex
321
321
  mso-pagination:widow-orphan;
322
322
  page-break-after:avoid;
323
323
  font-weight:normal;
324
- mso-outline-level:1;
325
324
  mso-list:l1 level1 lfo6;
326
325
  mso-hyphenate:none;
327
326
  tab-stops:20.0pt list 21.6pt left 28.0pt;
@@ -368,6 +367,7 @@ h2, .h2
368
367
  mso-style-parent:"Heading 1";
369
368
  mso-style-link:"Heading 2 Char";
370
369
  mso-style-next:Normal;
370
+ mso-outline-level:2;
371
371
  margin-top:3.0pt;
372
372
  margin-right:0cm;
373
373
  margin-bottom:12.0pt;
@@ -389,7 +389,6 @@ h2, .h2
389
389
  mso-bidi-font-weight:normal;}
390
390
  h2
391
391
  { mso-list:l1 level2 lfo6;
392
- mso-outline-level:2;
393
392
  }
394
393
  .h3Annex
395
394
  {mso-style-priority:3;
@@ -446,7 +445,6 @@ h3, .h3
446
445
  mso-fareast-language:JA;
447
446
  mso-bidi-font-weight:normal;}
448
447
  h3 {mso-list:l1 level3 lfo6;
449
- mso-outline-level:3;
450
448
  }
451
449
  .h4Annex
452
450
  {mso-style-priority:4;
@@ -482,6 +480,7 @@ h4, .h4
482
480
  mso-style-parent:"Heading 3";
483
481
  mso-style-link:"Heading 4 Char";
484
482
  mso-style-next:Normal;
483
+ mso-outline-level:4;
485
484
  margin-top:3.0pt;
486
485
  margin-right:0cm;
487
486
  margin-bottom:12.0pt;
@@ -501,7 +500,6 @@ h4, .h4
501
500
  mso-fareast-language:JA;
502
501
  mso-bidi-font-weight:normal;}
503
502
  h4 {mso-list:l1 level4 lfo6;
504
- mso-outline-level:4;
505
503
  }
506
504
  .h5Annex
507
505
  {mso-style-priority:5;
@@ -537,6 +535,7 @@ h5, .h5
537
535
  mso-style-parent:"Heading 4";
538
536
  mso-style-link:"Heading 5 Char";
539
537
  mso-style-next:Normal;
538
+ mso-outline-level:5;
540
539
  margin-top:3.0pt;
541
540
  margin-right:0cm;
542
541
  margin-bottom:6.0pt;
@@ -556,7 +555,6 @@ h5, .h5
556
555
  mso-fareast-language:JA;
557
556
  mso-bidi-font-weight:normal;}
558
557
  h5 {mso-list:l1 level5 lfo6;
559
- mso-outline-level:5;
560
558
  }
561
559
  h6, .h6
562
560
  {mso-style-priority:6;
@@ -566,6 +564,7 @@ h6, .h6
566
564
  mso-style-parent:"Heading 5";
567
565
  mso-style-link:"Heading 6 Char";
568
566
  mso-style-next:Normal;
567
+ mso-outline-level:6;
569
568
  margin-top:3.0pt;
570
569
  margin-right:0cm;
571
570
  margin-bottom:12.0pt;
@@ -585,8 +584,124 @@ h6, .h6
585
584
  mso-fareast-language:JA;
586
585
  mso-bidi-font-weight:normal;}
587
586
  h6 {mso-list:l1 level6 lfo6;
588
- mso-outline-level:6;
589
587
  }
588
+ p.a2, li.a2, div.a2
589
+ {mso-style-name:a2;
590
+ mso-style-unhide:no;
591
+ mso-style-parent:Base_Heading;
592
+ mso-style-next:Normal;
593
+ margin-top:13.5pt;
594
+ margin-right:0cm;
595
+ margin-bottom:12.0pt;
596
+ margin-left:0cm;
597
+ text-indent:0cm;
598
+ line-height:13.5pt;
599
+ mso-line-height-rule:exactly;
600
+ mso-pagination:widow-orphan;
601
+ mso-outline-level:1;
602
+ mso-list:l11 level2 lfo4;
603
+ tab-stops:list 18.0pt left 25.0pt 36.0pt;
604
+ font-size:14.0pt;
605
+ mso-bidi-font-size:11.0pt;
606
+ font-family:$headerfont;
607
+ mso-fareast-font-family:Calibri;
608
+ mso-bidi-font-family:"Times New Roman";
609
+ mso-ansi-language:EN-GB;
610
+ mso-fareast-language:EN-US;
611
+ font-weight:bold;
612
+ mso-bidi-font-weight:normal;}
613
+ p.a3, li.a3, div.a3
614
+ {mso-style-name:a3;
615
+ mso-style-unhide:no;
616
+ mso-style-parent:Base_Heading;
617
+ mso-style-next:Normal;
618
+ margin-top:0cm;
619
+ margin-right:0cm;
620
+ margin-bottom:12.0pt;
621
+ margin-left:0cm;
622
+ text-indent:0cm;
623
+ line-height:12.5pt;
624
+ mso-line-height-rule:exactly;
625
+ mso-pagination:widow-orphan;
626
+ mso-outline-level:1;
627
+ mso-list:l11 level3 lfo4;
628
+ tab-stops:32.0pt list 36.0pt;
629
+ font-size:11.0pt;
630
+ font-family:$headerfont;
631
+ mso-fareast-font-family:Calibri;
632
+ mso-bidi-font-family:"Times New Roman";
633
+ mso-ansi-language:EN-GB;
634
+ mso-fareast-language:EN-US;
635
+ font-weight:bold;
636
+ mso-bidi-font-weight:normal;}
637
+ p.a4, li.a4, div.a4
638
+ {mso-style-name:a4;
639
+ mso-style-unhide:no;
640
+ mso-style-parent:Base_Heading;
641
+ mso-style-next:Normal;
642
+ margin-top:0cm;
643
+ margin-right:0cm;
644
+ margin-bottom:12.0pt;
645
+ margin-left:0cm;
646
+ text-indent:0cm;
647
+ line-height:12.0pt;
648
+ mso-pagination:widow-orphan;
649
+ mso-outline-level:1;
650
+ mso-list:l11 level4 lfo4;
651
+ tab-stops:44.0pt list 54.0pt;
652
+ font-size:11.0pt;
653
+ font-family:$headerfont;
654
+ mso-fareast-font-family:Calibri;
655
+ mso-bidi-font-family:"Times New Roman";
656
+ mso-ansi-language:EN-GB;
657
+ mso-fareast-language:EN-US;
658
+ font-weight:bold;
659
+ mso-bidi-font-style:italic;}
660
+ p.a5, li.a5, div.a5
661
+ {mso-style-name:a5;
662
+ mso-style-unhide:no;
663
+ mso-style-parent:Base_Heading;
664
+ mso-style-next:Normal;
665
+ margin-top:0cm;
666
+ margin-right:0cm;
667
+ margin-bottom:12.0pt;
668
+ margin-left:0cm;
669
+ text-indent:0cm;
670
+ line-height:12.0pt;
671
+ mso-pagination:widow-orphan;
672
+ mso-outline-level:1;
673
+ mso-list:l11 level5 lfo4;
674
+ tab-stops:list 54.0pt left 57.0pt 68.0pt;
675
+ font-size:11.0pt;
676
+ font-family:$headerfont;
677
+ mso-fareast-font-family:Calibri;
678
+ mso-bidi-font-family:"Times New Roman";
679
+ mso-ansi-language:EN-GB;
680
+ mso-fareast-language:EN-US;
681
+ font-weight:bold;
682
+ mso-bidi-font-style:italic;}
683
+ p.a6, li.a6, div.a6
684
+ {mso-style-name:a6;
685
+ mso-style-unhide:no;
686
+ mso-style-parent:Base_Heading;
687
+ mso-style-next:Normal;
688
+ margin-top:0cm;
689
+ margin-right:0cm;
690
+ margin-bottom:12.0pt;
691
+ margin-left:0cm;
692
+ text-indent:0cm;
693
+ line-height:12.0pt;
694
+ mso-pagination:widow-orphan;
695
+ mso-outline-level:1;
696
+ mso-list:l11 level6 lfo4;
697
+ tab-stops:57.0pt 68.0pt list 72.0pt;
698
+ font-size:11.0pt;
699
+ font-family:$headerfont;
700
+ mso-fareast-font-family:Calibri;
701
+ mso-bidi-font-family:"Times New Roman";
702
+ mso-ansi-language:EN-GB;
703
+ mso-fareast-language:EN-US;
704
+ font-weight:bold;}
590
705
  p.MsoToc1, li.MsoToc1, div.MsoToc1
591
706
  {mso-style-priority:39;
592
707
  mso-style-unhide:no;
@@ -675,7 +790,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
675
790
  mso-ansi-language:EN-GB;
676
791
  font-weight:bold;
677
792
  mso-bidi-font-weight:normal;}
678
- p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape, p.msoheaderlandscape, li.msoheaderlandscape, div.msoheaderlandscape
793
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
679
794
  {mso-style-name:msoheaderlandscape;
680
795
  mso-style-noshow:yes;
681
796
  mso-style-priority:99;
@@ -716,7 +831,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
716
831
  mso-fareast-font-family:"SimHei",serif;
717
832
  mso-bidi-font-family:$headerfont;
718
833
  mso-ansi-language:EN-GB;}
719
- p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape, p.msofooterlandscape, li.msofooterlandscape, div.msofooterlandscape
834
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
720
835
  {mso-style-name:msofooterlandscape;
721
836
  mso-style-noshow:yes;
722
837
  mso-style-priority:99;
@@ -810,7 +925,7 @@ p.MsoListContinue, li.MsoListContinue, div.MsoListContinue
810
925
  mso-pagination:widow-orphan;
811
926
  font-size:$normalfontsize;
812
927
  mso-bidi-font-size:10.0pt;
813
- font-size:$bodyfont;
928
+ font-family:$bodyfont;
814
929
  mso-fareast-font-family:"MS Mincho";
815
930
  mso-bidi-font-family:"Times New Roman";
816
931
  mso-ansi-language:EN-GB;
@@ -830,7 +945,7 @@ p.MsoListContinueCxSpFirst, li.MsoListContinueCxSpFirst, div.MsoListContinueCxSp
830
945
  mso-pagination:widow-orphan;
831
946
  font-size:$normalfontsize;
832
947
  mso-bidi-font-size:10.0pt;
833
- font-size:$bodyfont;
948
+ font-family:$bodyfont;
834
949
  mso-fareast-font-family:"MS Mincho";
835
950
  mso-bidi-font-family:"Times New Roman";
836
951
  mso-ansi-language:EN-GB;
@@ -850,7 +965,7 @@ p.MsoListContinueCxSpMiddle, li.MsoListContinueCxSpMiddle, div.MsoListContinueCx
850
965
  mso-pagination:widow-orphan;
851
966
  font-size:$normalfontsize;
852
967
  mso-bidi-font-size:10.0pt;
853
- font-size:$bodyfont;
968
+ font-family:$bodyfont;
854
969
  mso-fareast-font-family:"MS Mincho";
855
970
  mso-bidi-font-family:"Times New Roman";
856
971
  mso-ansi-language:EN-GB;
@@ -870,7 +985,7 @@ p.MsoListContinueCxSpLast, li.MsoListContinueCxSpLast, div.MsoListContinueCxSpLa
870
985
  mso-pagination:widow-orphan;
871
986
  font-size:$normalfontsize;
872
987
  mso-bidi-font-size:10.0pt;
873
- font-size:$bodyfont;
988
+ font-family:$bodyfont;
874
989
  mso-fareast-font-family:"MS Mincho";
875
990
  mso-bidi-font-family:"Times New Roman";
876
991
  mso-ansi-language:EN-GB;
@@ -889,7 +1004,7 @@ p.MsoListContinue2, li.MsoListContinue2, div.MsoListContinue2
889
1004
  mso-pagination:widow-orphan;
890
1005
  tab-stops:40.0pt;
891
1006
  font-size:$normalfontsize;
892
- font-size:$bodyfont;
1007
+ font-family:$bodyfont;
893
1008
  mso-fareast-font-family:Calibri;
894
1009
  mso-bidi-font-family:"Times New Roman";
895
1010
  mso-ansi-language:EN-GB;
@@ -908,7 +1023,7 @@ p.MsoListContinue3, li.MsoListContinue3, div.MsoListContinue3
908
1023
  mso-pagination:widow-orphan;
909
1024
  tab-stops:60.0pt;
910
1025
  font-size:$normalfontsize;
911
- font-size:$bodyfont;
1026
+ font-family:$bodyfont;
912
1027
  mso-fareast-font-family:Calibri;
913
1028
  mso-bidi-font-family:"Times New Roman";
914
1029
  mso-ansi-language:EN-GB;
@@ -927,7 +1042,7 @@ p.MsoListContinue4, li.MsoListContinue4, div.MsoListContinue4
927
1042
  mso-pagination:widow-orphan;
928
1043
  tab-stops:80.0pt;
929
1044
  font-size:$normalfontsize;
930
- font-size:$bodyfont;
1045
+ font-family:$bodyfont;
931
1046
  mso-fareast-font-family:Calibri;
932
1047
  mso-bidi-font-family:"Times New Roman";
933
1048
  mso-ansi-language:EN-GB;
@@ -947,7 +1062,7 @@ p.MsoListContinue5, li.MsoListContinue5, div.MsoListContinue5
947
1062
  line-height:12.0pt;
948
1063
  mso-pagination:widow-orphan;
949
1064
  font-size:$normalfontsize;
950
- font-size:$bodyfont;
1065
+ font-family:$bodyfont;
951
1066
  mso-fareast-font-family:Calibri;
952
1067
  mso-bidi-font-family:"Times New Roman";
953
1068
  mso-ansi-language:EN-GB;
@@ -968,7 +1083,7 @@ p.MsoListContinue5CxSpFirst, li.MsoListContinue5CxSpFirst, div.MsoListContinue5C
968
1083
  line-height:12.0pt;
969
1084
  mso-pagination:widow-orphan;
970
1085
  font-size:$normalfontsize;
971
- font-size:$bodyfont;
1086
+ font-family:$bodyfont;
972
1087
  mso-fareast-font-family:Calibri;
973
1088
  mso-bidi-font-family:"Times New Roman";
974
1089
  mso-ansi-language:EN-GB;
@@ -989,7 +1104,7 @@ p.MsoListContinue5CxSpMiddle, li.MsoListContinue5CxSpMiddle, div.MsoListContinue
989
1104
  line-height:12.0pt;
990
1105
  mso-pagination:widow-orphan;
991
1106
  font-size:$normalfontsize;
992
- font-size:$bodyfont;
1107
+ font-family:$bodyfont;
993
1108
  mso-fareast-font-family:Calibri;
994
1109
  mso-bidi-font-family:"Times New Roman";
995
1110
  mso-ansi-language:EN-GB;
@@ -1010,7 +1125,7 @@ p.MsoListContinue5CxSpLast, li.MsoListContinue5CxSpLast, div.MsoListContinue5CxS
1010
1125
  line-height:12.0pt;
1011
1126
  mso-pagination:widow-orphan;
1012
1127
  font-size:$normalfontsize;
1013
- font-size:$bodyfont;
1128
+ font-family:$bodyfont;
1014
1129
  mso-fareast-font-family:Calibri;
1015
1130
  mso-bidi-font-family:"Times New Roman";
1016
1131
  mso-ansi-language:EN-GB;
@@ -1639,14 +1754,14 @@ div.colophon
1639
1754
  {page:WordSection4;}
1640
1755
 
1641
1756
  /* List Definitions */
1642
- @list l0
1757
+ @list l11
1643
1758
  {mso-list-id:145051656;
1644
- mso-list-template-ids:2112159680;}
1645
- @list l0:level1
1759
+ mso-list-template-ids:2132838916;}
1760
+ @list l11:level1
1646
1761
  {mso-level-number-format:alpha-upper;
1647
1762
  mso-level-style-link:ANNEX;
1648
1763
  mso-level-suffix:none;
1649
- mso-level-text:"Annex\00A0%1";
1764
+ mso-level-text:"Annex %1";
1650
1765
  mso-level-tab-stop:none;
1651
1766
  mso-level-number-position:left;
1652
1767
  margin-left:0cm;
@@ -1654,85 +1769,85 @@ div.colophon
1654
1769
  mso-ansi-font-size:14.0pt;
1655
1770
  mso-bidi-font-size:14.0pt;
1656
1771
  font-family:$bodyfont;
1657
- mso-bidi-font-family:$bodyfont;
1772
+ mso-bidi-font-family:"Times New Roman";
1658
1773
  mso-ansi-font-weight:bold;
1659
1774
  mso-ansi-font-style:normal;}
1660
- @list l0:level2
1775
+ @list l11:level2
1661
1776
  {mso-level-style-link:a2;
1662
1777
  mso-level-text:"%1\.%2";
1663
1778
  mso-level-tab-stop:18.0pt;
1664
1779
  mso-level-number-position:left;
1665
1780
  margin-left:0cm;
1666
1781
  text-indent:0cm;
1667
- mso-bidi-font-family:$bodyfont;
1782
+ mso-bidi-font-family:"Times New Roman";
1668
1783
  mso-ansi-font-weight:bold;
1669
1784
  mso-ansi-font-style:normal;}
1670
- @list l0:level3
1785
+ @list l11:level3
1671
1786
  {mso-level-style-link:a3;
1672
1787
  mso-level-text:"%1\.%2\.%3";
1673
1788
  mso-level-tab-stop:36.0pt;
1674
1789
  mso-level-number-position:left;
1675
1790
  margin-left:0cm;
1676
1791
  text-indent:0cm;
1677
- mso-bidi-font-family:$bodyfont;
1792
+ mso-bidi-font-family:"Times New Roman";
1678
1793
  mso-ansi-font-weight:bold;
1679
1794
  mso-ansi-font-style:normal;}
1680
- @list l0:level4
1795
+ @list l11:level4
1681
1796
  {mso-level-style-link:a4;
1682
1797
  mso-level-text:"%1\.%2\.%3\.%4";
1683
1798
  mso-level-tab-stop:54.0pt;
1684
1799
  mso-level-number-position:left;
1685
1800
  margin-left:0cm;
1686
1801
  text-indent:0cm;
1687
- mso-bidi-font-family:$bodyfont;
1802
+ mso-bidi-font-family:"Times New Roman";
1688
1803
  mso-ansi-font-weight:bold;
1689
1804
  mso-ansi-font-style:normal;}
1690
- @list l0:level5
1805
+ @list l11:level5
1691
1806
  {mso-level-style-link:a5;
1692
1807
  mso-level-text:"%1\.%2\.%3\.%4\.%5";
1693
1808
  mso-level-tab-stop:54.0pt;
1694
1809
  mso-level-number-position:left;
1695
1810
  margin-left:0cm;
1696
1811
  text-indent:0cm;
1697
- mso-bidi-font-family:$bodyfont;
1812
+ mso-bidi-font-family:"Times New Roman";
1698
1813
  mso-ansi-font-weight:bold;
1699
1814
  mso-ansi-font-style:normal;}
1700
- @list l0:level6
1815
+ @list l11:level6
1701
1816
  {mso-level-style-link:a6;
1702
1817
  mso-level-text:"%1\.%2\.%3\.%4\.%5\.%6";
1703
1818
  mso-level-tab-stop:72.0pt;
1704
1819
  mso-level-number-position:left;
1705
1820
  margin-left:0cm;
1706
1821
  text-indent:0cm;
1707
- mso-bidi-font-family:$bodyfont;
1822
+ mso-bidi-font-family:"Times New Roman";
1708
1823
  mso-ansi-font-weight:bold;
1709
1824
  mso-ansi-font-style:normal;}
1710
- @list l0:level7
1825
+ @list l11:level7
1711
1826
  {mso-level-reset-level:level2;
1712
1827
  mso-level-suffix:space;
1713
- mso-level-text:"Figure\00A0%1\.%7\00A0—";
1828
+ mso-level-text:"Figure %1\.%7 —";
1714
1829
  mso-level-tab-stop:none;
1715
1830
  mso-level-number-position:left;
1716
1831
  margin-left:0cm;
1717
1832
  text-indent:0cm;
1718
- mso-bidi-font-family:$bodyfont;}
1719
- @list l0:level8
1833
+ mso-bidi-font-family:"Times New Roman";}
1834
+ @list l11:level8
1720
1835
  {mso-level-reset-level:level2;
1721
1836
  mso-level-suffix:space;
1722
- mso-level-text:"Table\00A0%1\.%8\00A0—";
1837
+ mso-level-text:"Table %1\.%8 —";
1723
1838
  mso-level-tab-stop:none;
1724
1839
  mso-level-number-position:left;
1725
1840
  margin-left:0cm;
1726
1841
  text-indent:0cm;
1727
- mso-bidi-font-family:$bodyfont;}
1728
- @list l0:level9
1842
+ mso-bidi-font-family:"Times New Roman";}
1843
+ @list l11:level9
1729
1844
  {mso-level-number-format:roman-lower;
1730
1845
  mso-level-text:"\(%9\)";
1731
1846
  mso-level-tab-stop:306.0pt;
1732
1847
  mso-level-number-position:left;
1733
1848
  margin-left:0cm;
1734
1849
  text-indent:0cm;
1735
- mso-bidi-font-family:$bodyfont;}
1850
+ mso-bidi-font-family:"Times New Roman";}
1736
1851
  @list l1
1737
1852
  {mso-list-id:866942648;
1738
1853
  mso-list-template-ids:-1756330000;}
@@ -63,8 +63,8 @@ module IsoDoc
63
63
  if level == "h1" &&
64
64
  header.parent.at(".//h2#{toc_exclude_class}")
65
65
  <<~HDR
66
- <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a></li>
67
- <div class="collapse-button"></div></div>
66
+ <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
67
+ <div class="collapse-button"></div></div></li>
68
68
  HDR
69
69
  else
70
70
  %(<li class="#{level}"><a href="##{header['id']}">\
@@ -112,6 +112,11 @@ module IsoDoc
112
112
  end
113
113
  end
114
114
 
115
+ def ol_attrs(node)
116
+ ret = super
117
+ ret.merge(class: OL_STYLE.invert[ret[:type]])
118
+ end
119
+
115
120
  include BaseConvert
116
121
  include Init
117
122
  end
@@ -22,6 +22,7 @@ see_also: see also
22
22
  secretariat: Secretariat
23
23
  edition: edition
24
24
  termsrelated: Terms related to
25
+ availablefrom: Available from
25
26
  multiple_and: "%1 and %2"
26
27
  multiple_or: "%1 or %2"
27
28
  doctype_dict:
@@ -39,9 +40,37 @@ stage_dict:
39
40
  "10": New work item proposal
40
41
  "20": Working draft
41
42
  "30": Committee draft
42
- "40": Draft
43
- "50": Final draft
44
- "60": International standard
43
+ "40":
44
+ international-standard: Draft International Standard
45
+ technical-specification: Draft Technical Specification
46
+ technical-report: Draft Technical Report
47
+ publicly-available-specification: Draft Publicly Available Specification
48
+ international-workshop-agreement: Draft International Workshop Agreement
49
+ guide: Draft Guide
50
+ amendment: Draft Amendment
51
+ technical-corrigendum: Draft Technical Corrigendum
52
+ directive: Draft Directive
53
+ "50":
54
+ international-standard: Final Draft International Standard
55
+ technical-specification: Final Draft Technical Specification
56
+ technical-report: Final Draft Technical Report
57
+ publicly-available-specification: Final Draft Publicly Available Specification
58
+ international-workshop-agreement: Final Draft International Workshop Agreement
59
+ guide: Final Draft Guide
60
+ amendment: Final Draft Amendment
61
+ technical-corrigendum: Final Draft Technical Corrigendum
62
+ directive: Final Draft Directive
63
+ "60":
64
+ international-standard: International Standard
65
+ technical-specification: Technical Specification
66
+ technical-report: Technical Report
67
+ publicly-available-specification: Publicly Available Specification
68
+ international-workshop-agreement: International Workshop Agreement
69
+ guide: Guide
70
+ amendment: Amendment
71
+ technical-corrigendum: Technical Corrigendum
72
+ directive: Directive
45
73
  "90": Review
46
74
  "95": Withdrawal
47
-
75
+ locality:
76
+ appendix: Appendix
@@ -21,6 +21,7 @@ see_also: voir aussi
21
21
  secretariat: Secrétariat
22
22
  edition: édition
23
23
  termsrelated: Termes liés
24
+ availablefrom: Disponible sur
24
25
  doctype_dict:
25
26
  international-standard: Norme internationale
26
27
  technical-specification: Spécification technique
@@ -36,8 +37,34 @@ stage_dict:
36
37
  "10": Nouvelle proposition d'élément de travail
37
38
  "20": Brouillon de travail
38
39
  "30": Projet de comité
39
- "40": Brouillon
40
- "50": Version finale
41
- "60": Norme internationale
40
+ "40":
41
+ international-standard: Brouillon de la norme internationale
42
+ technical-specification: Brouillon de la spécification technique
43
+ technical-report: Brouillon du rapport technique
44
+ publicly-available-specification: Brouillon de la spécification disponible publiquement
45
+ international-workshop-agreement: Brouillon de l’accord internationale d’atelier
46
+ guide: Brouillon du guide
47
+ amendment: Brouillon de l’amendement
48
+ technical-corrigendum: Brouillon du rectificatif technique
49
+ "50":
50
+ international-standard: Version finale de la norme internationale
51
+ technical-specification: Version finale de la spécification technique
52
+ technical-report: Version finale du rapport technique
53
+ publicly-available-specification: Version finale de la spécification disponible publiquement
54
+ international-workshop-agreement: Version finale de l’accord internationale d’atelier
55
+ guide: Version finale du guide
56
+ amendment: Version finale de l’amendement
57
+ technical-corrigendum: Version finale du rectificatif technique
58
+ "60":
59
+ international-standard: Norme internationale
60
+ technical-specification: Spécification technique
61
+ technical-report: Rapport technique
62
+ publicly-available-specification: Spécification disponible publiquement
63
+ international-workshop-agreement: Accord internationale d’atelier
64
+ guide: Guide
65
+ amendment: Amendement
66
+ technical-corrigendum: Rectificatif technique
42
67
  "90": Révision
43
68
  "95": Retrait
69
+ locality:
70
+ appendix: Appendice
@@ -22,6 +22,7 @@ secretariat: Секретариат
22
22
  scope: Область применения
23
23
  edition: издание
24
24
  termsrelated: Термины, связанные
25
+ availablefrom: Доступна с
25
26
  doctype_dict:
26
27
  international-standard: Международный Стандарт
27
28
  technical-specification: Техническая Спецификация
@@ -37,9 +38,37 @@ stage_dict:
37
38
  "10": Предложение нового рабочего элемента
38
39
  "20": Рабочий проект
39
40
  "30": Проект комитета
40
- "40": Проект Международного стандарта
41
- "50": Окончательный проект Международного стандарта
42
- "60": Международный стандарт
41
+ "40":
42
+ international-standard: Проект Международного стандарта
43
+ technical-specification: Проект Технической Спецификации
44
+ technical-report: Проект Технического Отчета
45
+ publicly-available-specification: Проект Общедоступной Спецификации
46
+ international-workshop-agreement: Проект Соглашения Международного Семинара
47
+ guide: Проект Руководства
48
+ amendment: Проект Поправки
49
+ technical-corrigendum: Проект Технического Исправления
50
+ directive: Проект Директивы
51
+ "50":
52
+ international-standard: Окончательный проект Международного стандарта
53
+ technical-specification: Окончательный проект Технической Спецификации
54
+ technical-report: Окончательный проект Технического Отчета
55
+ publicly-available-specification: Окончательный проект Общедоступной Спецификации
56
+ international-workshop-agreement: Окончательный проект Соглашения Международного Семинара
57
+ guide: Окончательный проект Руководства
58
+ amendment: Окончательный проект Поправки
59
+ technical-corrigendum: Окончательный проект Технического Исправления
60
+ directive: Окончательный проект Директивы
61
+ "60":
62
+ international-standard: Международный Стандарт
63
+ technical-specification: Техническая Спецификация
64
+ technical-report: Технический Отчет
65
+ publicly-available-specification: Общедоступная Спецификация
66
+ international-workshop-agreement: Соглашение Международного Семинара
67
+ guide: Руководство
68
+ amendment: Поправка
69
+ technical-corrigendum: Техническое Исправление
70
+ directive: Директива
43
71
  "90": Пересмотр
44
72
  "95": Отмена
45
-
73
+ locality:
74
+ appendix: Приложение
@@ -19,6 +19,7 @@ see_also: 另见
19
19
  secretariat: 秘书处
20
20
  edition: 版
21
21
  termsrelated: 相关术语
22
+ availablefrom: 可从
22
23
  doctype_dict:
23
24
  international-standard: 国际标准
24
25
  technical-specification: 技术规格
@@ -34,8 +35,37 @@ stage_dict:
34
35
  "10": 新工作项提案
35
36
  "20": 工作草案
36
37
  "30": 委员会草案
37
- "40": 草稿
38
- "50": 最终草案
39
- "60": 国际标准
38
+ "40":
39
+ international-standard: 国际标准草稿
40
+ technical-specification: 技术规格草稿
41
+ technical-report: 技术报告草稿
42
+ publicly-available-specification: 公开可用的规范草稿
43
+ international-workshop-agreement: 国际研讨会协议草稿
44
+ guide: 指南草稿
45
+ amendment: 修正草稿
46
+ technical-corrigendum: 技术勘误草稿
47
+ directive: 指令草稿
48
+ "50":
49
+ international-standard: 国际标准最终草案
50
+ technical-specification: 技术规格最终草案
51
+ technical-report: 技术报告最终草案
52
+ publicly-available-specification: 公开可用的规范最终草案
53
+ international-workshop-agreement: 国际研讨会协议最终草案
54
+ guide: 指南最终草案
55
+ amendment: 修正最终草案
56
+ technical-corrigendum: 技术勘误最终草案
57
+ directive: 指令最终草案
58
+ "60":
59
+ international-standard: 国际标准
60
+ technical-specification: 技术规格
61
+ technical-report: 技术报告
62
+ publicly-available-specification: 公开可用的规范
63
+ international-workshop-agreement: 国际研讨会协议
64
+ guide: 指南
65
+ amendment: 修正
66
+ technical-corrigendum: 技术勘误
67
+ directive: 指令
40
68
  "90": 回顾
41
69
  "95": 提款
70
+ locality:
71
+ appendix: 附录
@@ -13,7 +13,7 @@ module IsoDoc
13
13
  load_file("i18n-zh-Hans.yaml")
14
14
  else load_file("i18n-en.yaml")
15
15
  end
16
- super.merge(y)
16
+ super.deep_merge(y)
17
17
  end
18
18
  end
19
19
  end