metanorma-iso 2.0.8.1 → 2.1.2

data/lib/isodoc/iso/html/wordstyle-dis.scss

@@ -276,6 +276,7 @@ h1, .h1
 	mso-style-name:"Heading 1";
 	mso-style-link:"Heading 1 Char";
 	mso-style-next:Normal;
+	mso-outline-level:1;
 	margin-top:13.5pt;
 	margin-right:0cm;
 	margin-bottom:12.0pt;
@@ -297,7 +298,6 @@ h1, .h1
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 h1 {
-	mso-outline-level:1;
 	mso-list:l1 level1 lfo6;
 }
 h1.ForewordTitle {
@@ -321,7 +321,6 @@ h1.Annex
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	font-weight:normal;
-	mso-outline-level:1;
 	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
@@ -368,6 +367,7 @@ h2, .h2
         mso-style-parent:"Heading 1";
         mso-style-link:"Heading 2 Char";
         mso-style-next:Normal;
+        mso-outline-level:2;
         margin-top:3.0pt;
         margin-right:0cm;
         margin-bottom:12.0pt;
@@ -389,7 +389,6 @@ h2, .h2
         mso-bidi-font-weight:normal;}
 h2
 	{ mso-list:l1 level2 lfo6;
-        mso-outline-level:2;
         }
 .h3Annex
 	{mso-style-priority:3;
@@ -446,7 +445,6 @@ h3, .h3
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 h3      {mso-list:l1 level3 lfo6;
-	mso-outline-level:3;
         }
 .h4Annex
 	{mso-style-priority:4;
@@ -482,6 +480,7 @@ h4, .h4
 	mso-style-parent:"Heading 3";
 	mso-style-link:"Heading 4 Char";
 	mso-style-next:Normal;
+	mso-outline-level:4;
 	margin-top:3.0pt;
 	margin-right:0cm;
 	margin-bottom:12.0pt;
@@ -501,7 +500,6 @@ h4, .h4
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 h4      {mso-list:l1 level4 lfo6;
-	mso-outline-level:4;
         }
 .h5Annex
 	{mso-style-priority:5;
@@ -537,6 +535,7 @@ h5, .h5
 	mso-style-parent:"Heading 4";
 	mso-style-link:"Heading 5 Char";
 	mso-style-next:Normal;
+	mso-outline-level:5;
 	margin-top:3.0pt;
 	margin-right:0cm;
 	margin-bottom:6.0pt;
@@ -556,7 +555,6 @@ h5, .h5
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 h5      {mso-list:l1 level5 lfo6;
-	mso-outline-level:5;
         }
 h6, .h6
 	{mso-style-priority:6;
@@ -566,6 +564,7 @@ h6, .h6
 	mso-style-parent:"Heading 5";
 	mso-style-link:"Heading 6 Char";
 	mso-style-next:Normal;
+	mso-outline-level:6;
 	margin-top:3.0pt;
 	margin-right:0cm;
 	margin-bottom:12.0pt;
@@ -585,8 +584,124 @@ h6, .h6
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 h6      {mso-list:l1 level6 lfo6;
-	mso-outline-level:6;
         }
+p.a2, li.a2, div.a2
+	{mso-style-name:a2;
+	mso-style-unhide:no;
+	mso-style-parent:Base_Heading;
+	mso-style-next:Normal;
+	margin-top:13.5pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:13.5pt;
+	mso-line-height-rule:exactly;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	mso-list:l11 level2 lfo4;
+	tab-stops:list 18.0pt left 25.0pt 36.0pt;
+	font-size:14.0pt;
+	mso-bidi-font-size:11.0pt;
+	font-family:$headerfont;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Times New Roman";
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:EN-US;
+	font-weight:bold;
+	mso-bidi-font-weight:normal;}
+p.a3, li.a3, div.a3
+	{mso-style-name:a3;
+	mso-style-unhide:no;
+	mso-style-parent:Base_Heading;
+	mso-style-next:Normal;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:12.5pt;
+	mso-line-height-rule:exactly;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	mso-list:l11 level3 lfo4;
+	tab-stops:32.0pt list 36.0pt;
+	font-size:11.0pt;
+	font-family:$headerfont;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Times New Roman";
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:EN-US;
+	font-weight:bold;
+	mso-bidi-font-weight:normal;}
+p.a4, li.a4, div.a4
+	{mso-style-name:a4;
+	mso-style-unhide:no;
+	mso-style-parent:Base_Heading;
+	mso-style-next:Normal;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:12.0pt;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	mso-list:l11 level4 lfo4;
+	tab-stops:44.0pt list 54.0pt;
+	font-size:11.0pt;
+	font-family:$headerfont;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Times New Roman";
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:EN-US;
+	font-weight:bold;
+	mso-bidi-font-style:italic;}
+p.a5, li.a5, div.a5
+	{mso-style-name:a5;
+	mso-style-unhide:no;
+	mso-style-parent:Base_Heading;
+	mso-style-next:Normal;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:12.0pt;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	mso-list:l11 level5 lfo4;
+	tab-stops:list 54.0pt left 57.0pt 68.0pt;
+	font-size:11.0pt;
+	font-family:$headerfont;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Times New Roman";
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:EN-US;
+	font-weight:bold;
+	mso-bidi-font-style:italic;}
+p.a6, li.a6, div.a6
+	{mso-style-name:a6;
+	mso-style-unhide:no;
+	mso-style-parent:Base_Heading;
+	mso-style-next:Normal;
+	margin-top:0cm;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:12.0pt;
+	mso-pagination:widow-orphan;
+	mso-outline-level:1;
+	mso-list:l11 level6 lfo4;
+	tab-stops:57.0pt 68.0pt list 72.0pt;
+	font-size:11.0pt;
+	font-family:$headerfont;
+	mso-fareast-font-family:Calibri;
+	mso-bidi-font-family:"Times New Roman";
+	mso-ansi-language:EN-GB;
+	mso-fareast-language:EN-US;
+	font-weight:bold;}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
@@ -675,7 +790,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
-p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape, p.msoheaderlandscape, li.msoheaderlandscape, div.msoheaderlandscape
+p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         {mso-style-name:msoheaderlandscape;
         mso-style-noshow:yes;
         mso-style-priority:99;
@@ -716,7 +831,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;}
-p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape, p.msofooterlandscape, li.msofooterlandscape, div.msofooterlandscape
+p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         {mso-style-name:msofooterlandscape;
         mso-style-noshow:yes;
         mso-style-priority:99;
@@ -810,7 +925,7 @@ p.MsoListContinue, li.MsoListContinue, div.MsoListContinue
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:"MS Mincho";
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -830,7 +945,7 @@ p.MsoListContinueCxSpFirst, li.MsoListContinueCxSpFirst, div.MsoListContinueCxSp
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:"MS Mincho";
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -850,7 +965,7 @@ p.MsoListContinueCxSpMiddle, li.MsoListContinueCxSpMiddle, div.MsoListContinueCx
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:"MS Mincho";
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -870,7 +985,7 @@ p.MsoListContinueCxSpLast, li.MsoListContinueCxSpLast, div.MsoListContinueCxSpLa
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:"MS Mincho";
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -889,7 +1004,7 @@ p.MsoListContinue2, li.MsoListContinue2, div.MsoListContinue2
 	mso-pagination:widow-orphan;
 	tab-stops:40.0pt;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -908,7 +1023,7 @@ p.MsoListContinue3, li.MsoListContinue3, div.MsoListContinue3
 	mso-pagination:widow-orphan;
 	tab-stops:60.0pt;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -927,7 +1042,7 @@ p.MsoListContinue4, li.MsoListContinue4, div.MsoListContinue4
 	mso-pagination:widow-orphan;
 	tab-stops:80.0pt;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -947,7 +1062,7 @@ p.MsoListContinue5, li.MsoListContinue5, div.MsoListContinue5
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -968,7 +1083,7 @@ p.MsoListContinue5CxSpFirst, li.MsoListContinue5CxSpFirst, div.MsoListContinue5C
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -989,7 +1104,7 @@ p.MsoListContinue5CxSpMiddle, li.MsoListContinue5CxSpMiddle, div.MsoListContinue
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -1010,7 +1125,7 @@ p.MsoListContinue5CxSpLast, li.MsoListContinue5CxSpLast, div.MsoListContinue5CxS
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:$normalfontsize;
-	font-size:$bodyfont;
+	font-family:$bodyfont;
 	mso-fareast-font-family:Calibri;
 	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-language:EN-GB;
@@ -1639,14 +1754,14 @@ div.colophon
         {page:WordSection4;}
 
   /* List Definitions */
-@list l0
+@list l11
 	{mso-list-id:145051656;
-	mso-list-template-ids:2112159680;}
-@list l0:level1
+	mso-list-template-ids:2132838916;}
+@list l11:level1
 	{mso-level-number-format:alpha-upper;
 	mso-level-style-link:ANNEX;
 	mso-level-suffix:none;
-	mso-level-text:"Annex\00A0%1";
+	mso-level-text:"Annex %1";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:0cm;
@@ -1654,85 +1769,85 @@ div.colophon
 	mso-ansi-font-size:14.0pt;
 	mso-bidi-font-size:14.0pt;
 	font-family:$bodyfont;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level2
+@list l11:level2
 	{mso-level-style-link:a2;
 	mso-level-text:"%1\.%2";
 	mso-level-tab-stop:18.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level3
+@list l11:level3
 	{mso-level-style-link:a3;
 	mso-level-text:"%1\.%2\.%3";
 	mso-level-tab-stop:36.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level4
+@list l11:level4
 	{mso-level-style-link:a4;
 	mso-level-text:"%1\.%2\.%3\.%4";
 	mso-level-tab-stop:54.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level5
+@list l11:level5
 	{mso-level-style-link:a5;
 	mso-level-text:"%1\.%2\.%3\.%4\.%5";
 	mso-level-tab-stop:54.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level6
+@list l11:level6
 	{mso-level-style-link:a6;
 	mso-level-text:"%1\.%2\.%3\.%4\.%5\.%6";
 	mso-level-tab-stop:72.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;
+	mso-bidi-font-family:"Times New Roman";
 	mso-ansi-font-weight:bold;
 	mso-ansi-font-style:normal;}
-@list l0:level7
+@list l11:level7
 	{mso-level-reset-level:level2;
 	mso-level-suffix:space;
-	mso-level-text:"Figure\00A0%1\.%7\00A0—";
+	mso-level-text:"Figure %1\.%7 —";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;}
-@list l0:level8
+	mso-bidi-font-family:"Times New Roman";}
+@list l11:level8
 	{mso-level-reset-level:level2;
 	mso-level-suffix:space;
-	mso-level-text:"Table\00A0%1\.%8\00A0—";
+	mso-level-text:"Table %1\.%8 —";
 	mso-level-tab-stop:none;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;}
-@list l0:level9
+	mso-bidi-font-family:"Times New Roman";}
+@list l11:level9
 	{mso-level-number-format:roman-lower;
 	mso-level-text:"\(%9\)";
 	mso-level-tab-stop:306.0pt;
 	mso-level-number-position:left;
 	margin-left:0cm;
 	text-indent:0cm;
-	mso-bidi-font-family:$bodyfont;}
+	mso-bidi-font-family:"Times New Roman";}
 @list l1
 	{mso-list-id:866942648;
 	mso-list-template-ids:-1756330000;}

data/lib/isodoc/iso/html_convert.rb

@@ -63,8 +63,8 @@ module IsoDoc
         if level == "h1" &&
             header.parent.at(".//h2#{toc_exclude_class}")
           <<~HDR
-            <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a></li>
-            <div class="collapse-button"></div></div>
+            <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
+            <div class="collapse-button"></div></div></li>
           HDR
         else
           %(<li class="#{level}"><a href="##{header['id']}">\
@@ -112,6 +112,11 @@ module IsoDoc
         end
       end
 
+      def ol_attrs(node)
+        ret = super
+        ret.merge(class: OL_STYLE.invert[ret[:type]])
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/iso/i18n-en.yaml

@@ -22,6 +22,7 @@ see_also: see also
 secretariat: Secretariat
 edition: edition
 termsrelated: Terms related to 
+availablefrom: Available from
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
 doctype_dict:
@@ -39,9 +40,37 @@ stage_dict:
   "10": New work item proposal
   "20": Working draft
   "30": Committee draft
-  "40": Draft
-  "50": Final draft
-  "60": International standard
+  "40": 
+    international-standard: Draft International Standard
+    technical-specification: Draft Technical Specification
+    technical-report: Draft Technical Report
+    publicly-available-specification: Draft Publicly Available Specification
+    international-workshop-agreement: Draft International Workshop Agreement
+    guide: Draft Guide
+    amendment: Draft Amendment
+    technical-corrigendum: Draft Technical Corrigendum
+    directive: Draft Directive
+  "50": 
+    international-standard: Final Draft International Standard
+    technical-specification: Final Draft Technical Specification
+    technical-report: Final Draft Technical Report
+    publicly-available-specification: Final Draft Publicly Available Specification
+    international-workshop-agreement: Final Draft International Workshop Agreement
+    guide: Final Draft Guide
+    amendment: Final Draft Amendment
+    technical-corrigendum: Final Draft Technical Corrigendum
+    directive: Final Draft Directive
+  "60": 
+    international-standard: International Standard
+    technical-specification: Technical Specification
+    technical-report: Technical Report
+    publicly-available-specification: Publicly Available Specification
+    international-workshop-agreement: International Workshop Agreement
+    guide: Guide
+    amendment: Amendment
+    technical-corrigendum: Technical Corrigendum
+    directive: Directive
   "90": Review
   "95": Withdrawal
-
+locality:
+  appendix: Appendix

data/lib/isodoc/iso/i18n-fr.yaml

@@ -21,6 +21,7 @@ see_also: voir aussi
 secretariat: Secrétariat
 edition: édition
 termsrelated: Termes liés 
+availablefrom: Disponible sur
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique
@@ -36,8 +37,34 @@ stage_dict:
   "10": Nouvelle proposition d'élément de travail
   "20": Brouillon de travail
   "30": Projet de comité
-  "40": Brouillon
-  "50": Version finale
-  "60": Norme internationale
+  "40": 
+    international-standard: Brouillon de la norme internationale
+    technical-specification: Brouillon de la spécification technique
+    technical-report: Brouillon du rapport technique
+    publicly-available-specification: Brouillon de la spécification disponible publiquement
+    international-workshop-agreement: Brouillon de l’accord internationale d’atelier
+    guide: Brouillon du guide
+    amendment: Brouillon de l’amendement
+    technical-corrigendum: Brouillon du rectificatif technique
+  "50": 
+    international-standard: Version finale de la norme internationale
+    technical-specification: Version finale de la spécification technique
+    technical-report: Version finale du rapport technique
+    publicly-available-specification: Version finale de la spécification disponible publiquement
+    international-workshop-agreement: Version finale de l’accord internationale d’atelier
+    guide: Version finale du guide
+    amendment: Version finale de l’amendement
+    technical-corrigendum: Version finale du rectificatif technique
+  "60": 
+    international-standard: Norme internationale
+    technical-specification: Spécification technique
+    technical-report: Rapport technique
+    publicly-available-specification: Spécification disponible publiquement
+    international-workshop-agreement: Accord internationale d’atelier
+    guide: Guide
+    amendment: Amendement
+    technical-corrigendum: Rectificatif technique
   "90": Révision
   "95": Retrait
+locality:
+  appendix: Appendice

data/lib/isodoc/iso/i18n-ru.yaml

@@ -22,6 +22,7 @@ secretariat: Секретариат
 scope: Область применения
 edition: издание
 termsrelated: Термины, связанные 
+availablefrom: Доступна с
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация
@@ -37,9 +38,37 @@ stage_dict:
   "10": Предложение нового рабочего элемента
   "20": Рабочий проект
   "30": Проект комитета
-  "40": Проект Международного стандарта
-  "50": Окончательный проект Международного стандарта
-  "60": Международный стандарт
+  "40": 
+    international-standard: Проект Международного стандарта
+    technical-specification: Проект Технической Спецификации
+    technical-report: Проект Технического Отчета
+    publicly-available-specification: Проект Общедоступной Спецификации
+    international-workshop-agreement: Проект Соглашения Международного Семинара
+    guide: Проект Руководства
+    amendment: Проект Поправки
+    technical-corrigendum: Проект Технического Исправления
+    directive: Проект Директивы
+  "50": 
+    international-standard: Окончательный проект Международного стандарта
+    technical-specification: Окончательный проект Технической Спецификации
+    technical-report: Окончательный проект Технического Отчета
+    publicly-available-specification: Окончательный проект Общедоступной Спецификации
+    international-workshop-agreement: Окончательный проект Соглашения Международного Семинара
+    guide: Окончательный проект Руководства
+    amendment: Окончательный проект Поправки
+    technical-corrigendum: Окончательный проект Технического Исправления
+    directive: Окончательный проект Директивы
+  "60": 
+    international-standard: Международный Стандарт
+    technical-specification: Техническая Спецификация
+    technical-report: Технический Отчет
+    publicly-available-specification: Общедоступная Спецификация
+    international-workshop-agreement: Соглашение Международного Семинара
+    guide: Руководство
+    amendment: Поправка
+    technical-corrigendum: Техническое Исправление
+    directive: Директива
   "90": Пересмотр
   "95": Отмена
-
+locality:
+  appendix: Приложение

data/lib/isodoc/iso/i18n-zh-Hans.yaml

@@ -19,6 +19,7 @@ see_also: 另见
 secretariat: 秘书处
 edition: 版
 termsrelated: 相关术语 
+availablefrom: 可从
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格
@@ -34,8 +35,37 @@ stage_dict:
   "10": 新工作项提案
   "20": 工作草案
   "30": 委员会草案
-  "40": 草稿
-  "50": 最终草案
-  "60": 国际标准
+  "40": 
+    international-standard: 国际标准草稿
+    technical-specification: 技术规格草稿
+    technical-report: 技术报告草稿
+    publicly-available-specification: 公开可用的规范草稿
+    international-workshop-agreement: 国际研讨会协议草稿
+    guide: 指南草稿
+    amendment: 修正草稿
+    technical-corrigendum: 技术勘误草稿
+    directive: 指令草稿
+  "50": 
+    international-standard: 国际标准最终草案
+    technical-specification: 技术规格最终草案
+    technical-report: 技术报告最终草案
+    publicly-available-specification: 公开可用的规范最终草案
+    international-workshop-agreement: 国际研讨会协议最终草案
+    guide: 指南最终草案
+    amendment: 修正最终草案
+    technical-corrigendum: 技术勘误最终草案
+    directive: 指令最终草案
+  "60": 
+    international-standard: 国际标准
+    technical-specification: 技术规格
+    technical-report: 技术报告
+    publicly-available-specification: 公开可用的规范
+    international-workshop-agreement: 国际研讨会协议
+    guide: 指南
+    amendment: 修正
+    technical-corrigendum: 技术勘误
+    directive: 指令
   "90": 回顾
   "95": 提款
+locality:
+  appendix: 附录

data/lib/isodoc/iso/i18n.rb

@@ -13,7 +13,7 @@ module IsoDoc
               load_file("i18n-zh-Hans.yaml")
             else load_file("i18n-en.yaml")
             end
-        super.merge(y)
+        super.deep_merge(y)
       end
     end
   end