metanorma-iso 2.1.1 → 2.1.2

data/lib/isodoc/iso/html/word_iso_titlepage-prf.html

@@ -0,0 +1,58 @@
+<p class="zzCover" align="right" style='text-align:right'><span lang="EN-GB"><span style='mso-no-proof:yes'><b>{{ docnumber_reference }}</b></span></span></p>
+
+{% if revdate %}
+{% assign doc_date = revdate %}
+{% elsif publisheddate %}
+{% assign doc_date = publisheddate %}
+{% elsif issueddate %}
+{% assign doc_date = issueddate %}
+{% elsif createddate %}
+{% assign doc_date = createddate %}
+{% endif %}
+
+{% if doc_date %}
+<p class="zzCover" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'><b>{{ doc_date }}</b></span></span></p>
+{% endif %}
+
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{agency}}/{{ editorialgroup | join: "/" }}</span></p>
+
+<!--
+{% if doctitleamdlabel %}
+<p class="zzCover"><b>{{ doctitleamdlabel }}</b></p>
+{% endif %}
+
+{% if doctitlecorrlabel %}
+<p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
+{% endif %}
+-->
+
+{% if secretariat %}
+<p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{ labels["secretariat"] }}: <span>{{ secretariat }}</span></span></p>
+{% endif %}
+
+<p class="zzCover">
+<span lang="EN-GB"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}</b>
+</p>
+{% if doctitleamdlabel %}
+<p class="zzCover"><b>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</b></p>
+{% endif %}
+{% if doctitlecorrlabel %}
+<p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
+{% endif %}
+
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}</i>
+</p>
+{% if docsubtitleamdlabel %}
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</i></p>
+{% endif %}
+{% if docsubtitlecorrlabel %}
+<p class="zzCover" style='font-weight:normal;'><i>{{ docsubtitlecorrlabel }}</i></p>
+{% endif %}
+
+<div class="coverpage-warning" id="coverpage-note-destination"/>
+
+</div>
+
+<!--</div>-->
+
+

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -72,16 +72,20 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
 
 
 <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
-
+{% if unpublished %}
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
 margin-left:4.25pt;margin-right:4.25pt'>
 
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ stageabbr }} stage{% endif %}<o:p></o:p></span></p>
+lang="EN-GB" style='font-size:40.0pt'>{{ stageabbr }} stage<o:p></o:p></span></p>
 
 </div>
+{% else %}
+<p class="MsoNormal" align="center" style='text-align:center;border:none;'><span
+lang="EN-GB" style='font-size:40.0pt'><o:p></o:p></span></p>
+{% endif %}
 
 <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
 

data/lib/isodoc/iso/html_convert.rb

@@ -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

@@ -40,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

@@ -37,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

@@ -38,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

@@ -35,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