metanorma-iso 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0edbd95491be3f96c45fd1c6f96102f7f8ca6704d2785d13bd0c3547683cc935
-  data.tar.gz: 6ae381ed1c51d983281ef2f089bf913342c81608d669bdc03195800b63424c81
+  metadata.gz: e7a22ee7f3e6246a8f153899417b7d2a36091350715cde6b80d41546dbd19ace
+  data.tar.gz: 0c472f64ad70121d9f9c87775cdcf664b338aa10d49fa6dccb8545006fec4c6f
 SHA512:
-  metadata.gz: 2076c7e06dd7401e9d947bd829bbef193ed35326295be2ebc0457dba8687a7a50eb5bfc9a12efdd07dd70bcb6d133719d005b26f3ad7c84f6d0a16500a211dec
-  data.tar.gz: 01ab00b3f882f37b8ad24776d61758913d34842cf841625a51ce772c0eddb3ea82829522d69827d3416ead67009bcbd0c9fe4fbee6932f929c9fb66a62324b73
+  metadata.gz: 0c69a24170dbb064699e1452495d8fc7f654aeaee2595066678ee728819cef75ddc4f1ed1c0da002908ffc27d91e54db4c9a0dddb9ac9dd6c5bad8b196fe774f
+  data.tar.gz: f2573191de13d2240c413e869038ef61cd3a84c3642993f8e0c6b6b13109e7edbb595ee93f68e9233b586b45c60a2d1909c228f5c43c1aeaba1adef07162ddda

data/lib/isodoc/iso/base_convert.rb

@@ -14,8 +14,7 @@ module IsoDoc
       end
 
       def implicit_reference(bib)
-        return true if bib&.at(ns("./docidentifier"))&.text == "IEV"
-
+        bib.at(ns("./docidentifier"))&.text == "IEV" and return true
         super
       end
 
@@ -29,8 +28,7 @@ module IsoDoc
       end
 
       def example_span_label(_node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.span class: "example_label" do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -55,9 +53,8 @@ module IsoDoc
 
       def node_begins_with_para(node)
         node.elements.each do |e|
-          next if e.name == "name"
-          return true if e.name == "p"
-
+          e.name == "name" and next
+          e.name == "p" and return true
           return false
         end
         false
@@ -187,8 +184,7 @@ module IsoDoc
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
             figure_key(out) if n.name == "dl"
-            next if n.name == "note" && n["type"] == "units"
-
+            n.name == "note" && n["type"] == "units" and next
             parse(n, div) unless n.name == "name"
           end
           figure_name_parse(node, div, node.at(ns("./name")))
@@ -204,6 +200,11 @@ module IsoDoc
           end
         end
       end
+
+      def convert_i18n_init(docxml)
+        super
+        update_i18n(docxml)
+      end
     end
   end
 end

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -11,7 +11,7 @@
 <p class="coverpage_docnumber">{{ edition_display | capitalize }}</p>
 {% endif %}
 
-{% if correcteddate != "XXX" %}
+{% if correcteddate and correcteddate != ""  and correcteddate != "XXX" %}
 <p class="coverpage_docnumber">{{ labels["corrected_version"] }} : {{ correcteddate }}</p>
 {% endif %}
 

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

@@ -17,7 +17,7 @@
 {% if doc_date %}
 <p class="zzCover" align="right" style='text-align:right;font-weight:normal;'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ doc_date }}</span></span></p>
 {% endif %}
-{% if correcteddate %}
+{% if correcteddate and correcteddate != ""  and correcteddate != "XXX" %}
 <p class="zzCover">{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
 {% endif %}
 

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

@@ -13,7 +13,7 @@
 {% 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 %}
-{% if correcteddate %}
+{% if correcteddate and correcteddate != ""  and correcteddate != "XXX" %}
 <p class="zzCover">{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
 {% endif %}
 

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

@@ -33,7 +33,7 @@ style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ edition_display | capitalize }}</span></p>
 {% endif %}
 
-{% if correcteddate %}
+{% if correcteddate and correcteddate != ""  and correcteddate != "XXX" %}
 <p class="MsoNormal" align="right" style='text-align:right'>{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
 {% endif %}
 

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

@@ -10,6 +10,7 @@ term_def_boilerplate: |
       </ul>
 all_rights_reserved: Alle Rechte vorbehalten
 reference_number: Referenznummer
+reference_number_abbrev: Ref.nr
 price_based_on: Preis basierend auf % Seiten
 descriptor: Deskriptor
 under_preparation: In Vorbereitung. (Stadium zum Zeitpunkt der Veröffentlichung %).
@@ -30,6 +31,9 @@ corrected_version: Korrigierte Version
 fast-track-procedue: Beschleunigtes Verfahren
 multiple_and: "%1 und %2"
 multiple_or: "%1 oder %2"
+classification-UDC: UDK
+edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} AUSGABE"
+edition_replacement: "Diese {{ var1 | ordinal_word: 'edition', '' }} Ausgabe ersetzt die {{ var2 | ordinal_word: 'edition', '' }} Ausgabe"
 doctype_dict:
   international-standard: Internationaler Standard
   technical-specification: Technische Spezifikation
@@ -40,6 +44,8 @@ doctype_dict:
   amendment: Änderung
   technical-corrigendum: Technische Berichtigung
   directive: Richtlinie
+  committee-document: Ausschussdokument
+  recommendation: ISO-Empfehlung
 stage_dict:
   "00": Vorläufiges Arbeitselement
   "10": Neuer Arbeitselementvorschlag

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

@@ -10,6 +10,7 @@ term_def_boilerplate: |
       </ul>
 all_rights_reserved: All rights reserved
 reference_number: Reference number
+reference_number_abbrev: Ref. No.
 price_based_on: Price based on % pages
 descriptor: Descriptor
 under_preparation: Under preparation. (Stage at the time of publication %).
@@ -22,6 +23,8 @@ see: see
 see_also: see also
 secretariat: Secretariat
 edition: edition
+edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} EDITION"
+edition_replacement: "This {{ var1 | ordinal_word: 'edition', '' }} edition supersedes the {{ var2 | ordinal_word: 'edition', '' }} edition"
 termsrelated: Terms related to 
 availablefrom: Available from
 voting_begins_on: Voting begins on
@@ -30,6 +33,7 @@ corrected_version: Corrected version
 fast-track-procedure: Fast track procedure
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
+classification-UDC: UDC
 doctype_dict:
   international-standard: International Standard
   technical-specification: Technical Specification
@@ -40,6 +44,8 @@ doctype_dict:
   amendment: Amendment
   technical-corrigendum: Technical Corrigendum
   directive: Directive
+  committee-document: Committee Document
+  recommendation: ISO Recommendation
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

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

@@ -10,6 +10,7 @@ term_def_boilerplate: |
       </p> </li> </ul>
 all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence
+reference_number_abbrev: Réf. №
 price_based_on: Prix basé sur % pages
 descriptor: Descripteur
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
@@ -21,12 +22,15 @@ see: voir
 see_also: voir aussi
 secretariat: Secrétariat
 edition: édition
+edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} ÉDITION"
+edition_replacement: "Cette {{ var1 | ordinal_word: 'edition', '' }} édition annule et remplace la {{ var2 | ordinal_word: 'edition', '' }} édition"
 termsrelated: Termes liés 
 availablefrom: Disponible sur
 voting_begins_on: Le vote commence le
 voting_terminates_on: Le vote se termine le
 corrected_version: Version corrigée
 fast-track-procedure: Procédure accélérée
+classification-UDC: CDU
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique
@@ -37,6 +41,8 @@ doctype_dict:
   amendment: Amendement
   technical-corrigendum: Rectificatif technique
   directive: Directive
+  committee-document: Document du comité
+  recommendation: Recommandation ISO
 stage_dict:
   "00": Élément de travail préliminaire
   "10": Nouvelle proposition d'élément de travail

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

@@ -8,7 +8,8 @@ term_def_boilerplate: |
       <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
-reference_number: Ссылочный номер
+reference_number: Ссылочный номерS
+reference_number_abbrev: Исх. №
 descriptor: Дескриптор
 price_based_on: Цена рассчитана на % стр.
 under_preparation: В стадии подготовки. (Стадия на момент публикации %).
@@ -22,12 +23,15 @@ see_also: см. также
 secretariat: Секретариат
 scope: Область применения
 edition: издание
+edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} ИЗДАНИЕ"
+edition_replacement: "Настоящее {{ var1 | ordinal_word: 'edition', 'case:nom' }} издание заменяет {{ var2 | ordinal_word: 'edition', 'case:acc' }} издание"
 termsrelated: Термины, связанные 
 availablefrom: Доступна с
 voting_begins_on: Голосование начинается в
 voting_terminates_on: Голосование заканчивается в
 corrected_version: Исправленная версия
 fast-track-procedure: Ускоренная процедура
+classification-UDC: УДК
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация
@@ -38,6 +42,8 @@ doctype_dict:
   amendment: Поправка
   technical-corrigendum: Техническое Исправление
   directive: Директива
+  committee-document: Документ комитета
+  recommendation: Рекомендации ИСО
 stage_dict:
   "00": Предварительный рабочий элемент
   "10": Предложение нового рабочего элемента

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

@@ -8,6 +8,7 @@ term_def_boilerplate: |
       </p> </li> </ul>
 all_rights_reserved: 版权所有
 reference_number: 参考编号
+reference_number_abbrev: 参考编号
 price_based_on: 价格基于%页
 descriptor: 描述符
 under_preparation: 制定中（出版时最新状态为%）
@@ -25,6 +26,7 @@ voting_begins_on: 投票开始于
 voting_terminates_on: 投票终止于
 corrected_version: 修正版本
 fast-track-procedure: 快速通道程序
+classification-UDC: 通用十进制图书分类法
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格
@@ -35,6 +37,8 @@ doctype_dict:
   amendment: 修正
   technical-corrigendum: 技术勘误
   directive: 指令
+  committee-document: 委员会文件
+  recommendation: ISO推荐
 stage_dict:
   "00": 初步工作项
   "10": 新工作项提案

data/lib/isodoc/iso/init.rb

@@ -20,7 +20,22 @@ module IsoDoc
                                        i18nyaml: i18nyaml || @i18nyaml)
       end
 
-      def amd?(docxml)
+      def update_i18n(docxml)
+        @docscheme =
+          docxml.at(ns("//presentation-metadata[name" \
+                       "[text() = 'document-scheme']]/value"))&.text || "2024"
+        %w(1951 1972).include?(@docscheme) and
+          i18n_conditional_set("reference_number", "reference_number_abbrev")
+        %w(1951).include?(@docscheme) and
+          i18n_conditional_set("edition_ordinal", "edition_ordinal_old")
+      end
+
+      def i18n_conditional_set(old, new)
+        @i18n.get[new] or return
+        @i18n.set(old, @i18n.get[new])
+      end
+
+      def amd?(_docxml)
         %w(amendment technical-corrigendum).include? @doctype
       end