metanorma-iso 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc04a8399e7b45c190653c58bfc3e837d48120f580e570ffa834e19249bec137
-  data.tar.gz: e68b35e9e0241a5f931ecce65e75f07fc32e302cfd3021b79237b31f9a4e4448
+  metadata.gz: c4aececcab24bcc1cf73e4ccaeb5b09d4dee655365401dbcfe659efe98233e65
+  data.tar.gz: c94f52a47cfb911bbd0386aba74596b5713248f8bb0630a0c5a2059afdc1d47a
 SHA512:
-  metadata.gz: e5f3990969c9e3d6b57d2747134248e057b30b89b7b1a3ef8dae30a1f24d9c4b30b8ec64720dbc8eb875d3330fa2bb9800fddfdcd727b656640d8ebff47b684b
-  data.tar.gz: f99909c4c26a7a4b94c2f24cc359e77fecd77c7cce23a7d39ba64ffa34363b5f26a12ebfe1ea658548e0155decef308f55024a1f8a18b8c8e613e3b2a4d56787
+  metadata.gz: 9a50262b7cddf480a0da235510757d0f5bf2784d4d3875900f63c8f28f0206482d648a366041f917edc9146f3665bc8eced9744e3bcc8638f4c6559605a5db6f
+  data.tar.gz: 6311eaa0ba4d80312075298fb9e5815e551d0dd7e1af65eb5a3ce89df0e2f161f5d629a094cc21c8172bed798e9e0af768a2af4c6f87aa8575459329b44cc239

data/lib/isodoc/iso/base_convert.rb

@@ -26,7 +26,7 @@ module IsoDoc
 
       def example_p_parse(node, div)
         name = node.at(ns("./fmt-name"))
-        para = node.at(ns("./p"))
+        para = node.at(ns("./p")) || node.at(ns("./semx/p"))
         div.p **attr_code(class: example_p_class) do |p|
           name and p.span class: "example_label" do |s|
             name.children.each { |n| parse(n, s) }
@@ -124,7 +124,7 @@ module IsoDoc
       end
 
       def table_parse_tail(node, out)
-        (dl = node.at(ns("./dl"))) && parse(dl, out)
+        (key = node.at(ns("./key"))) && parse(key, out)
         node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
           parse(n, out)
@@ -156,9 +156,9 @@ module IsoDoc
 
       def table_cleanup(docxml)
         super
-        docxml.xpath("//tfoot/div[@class = 'figdl']/p[@class = 'ListTitle']")
+        docxml.xpath("//tfoot//div[@class = 'figdl']/p[@class = 'ListTitle']")
           .each do |p|
-          p["align"] = "left"
+            p["align"] = "left"
         end
         docxml
       end

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

@@ -936,10 +936,6 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
   line-height: 12pt;
   mso-pagination: widow-orphan;
   tab-stops: 25.7pt 481.15pt;
-  border: none;
-  mso-border-alt: solid blue 0.5pt;
-  padding: 0cm;
-  mso-padding-alt: 1pt 4pt 1pt 4pt;
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10pt;
   font-family: {{bodyfont}};
@@ -950,6 +946,13 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
   mso-fareast-language: JA;
 }
 
+div.zzCopyrightContainer {
+  border: none;
+  mso-border-alt: solid blue 0.5pt;
+  padding: 0cm;
+  mso-padding-alt: 1pt 4pt 1pt 4pt;
+}
+
 p.zzAddress {
   mso-style-name: zzAddress;
   margin: 0cm;
@@ -1298,7 +1301,7 @@ div.figdl p, table.figdl p {
   font-size: {{smallerfontsize}};
 }
 
-table.formula_dl {
+div.formula_dl, p.formula_dl, table.formula_dl {
   margin-left: 20.15pt;
 }
 
@@ -1336,6 +1339,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt;
 }
 
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
+
 table.MsoTableGrid {
   mso-style-name: "Table Grid";
   mso-tstyle-rowband-size: 0;

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

@@ -852,10 +852,6 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:25.7pt 481.15pt;
-	border:none;
-	mso-border-alt:solid blue .5pt;
-	padding:0cm;
-	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
 	font-family:$bodyfont;
@@ -864,6 +860,12 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
 	color:blue;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;}
+div.zzCopyrightContainer {
+  border: none;
+  mso-border-alt: solid blue 0.5pt;
+  padding: 0cm;
+  mso-padding-alt: 1pt 4pt 1pt 4pt;
+}
 p.zzAddress {
 mso-style-name:zzAddress;
   margin:0cm;
@@ -1176,7 +1178,7 @@ div.figdl p, table.figdl p {
   font-size: $smallerfontsize;
 }
 
-table.formula_dl {
+div.formula_dl, p.formula_dl, table.formula_dl {
 	margin-left:20.15pt;
 }
 
@@ -1208,6 +1210,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+} 
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
 	mso-tstyle-rowband-size:0;

data/lib/isodoc/iso/html/isodoc.css

@@ -847,9 +847,6 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
   line-height: 12pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt 25.7pt 481.15pt;
-  border: none;
-  padding: 0cm;
-  mso-padding-alt: 1pt 4pt 1pt 4pt;
   font-size: 11pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun", serif;
@@ -870,9 +867,6 @@ p.zzCopyright1 {
   line-height: 12pt;
   mso-pagination: widow-orphan;
   tab-stops: 20.15pt 25.7pt 481.15pt;
-  border: none;
-  padding: 0cm;
-  mso-padding-alt: 1pt 4pt 1pt 4pt;
   font-size: 10pt;
   font-family: {{bodyfont}};
   mso-fareast-font-family: "SimSun", serif;
@@ -880,6 +874,12 @@ p.zzCopyright1 {
   mso-ansi-language: EN-GB;
 }
 
+div.zzCopyrightContainer {
+  border: none;
+  padding: 0cm;
+  mso-padding-alt: 1pt 4pt 1pt 4pt;
+}
+
 p.zzAddress {
   margin: 0cm;
   margin-bottom: 12pt;
@@ -1167,7 +1167,7 @@ div.figdl p, table.figdl p {
   font-size: {{smallerfontsize}};
 }
 
-table.formula_dl {
+div.formula_dl, p.formula_dl, table.formula_dl {
   margin-left: 20.15pt;
 }
 
@@ -1205,6 +1205,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt;
 }
 
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
+
 table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: {{smallerfontsize}};
 }

data/lib/isodoc/iso/html/isodoc.scss

@@ -771,9 +771,6 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	tab-stops:20.15pt 25.7pt 481.15pt;
-	border:none;
-	padding:0cm;
-	mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"SimSun",serif;
@@ -792,14 +789,16 @@ p.zzCopyright1
         line-height:12.0pt;
         mso-pagination:widow-orphan;
         tab-stops:20.15pt 25.7pt 481.15pt;
-        border:none;
-        padding:0cm;
-        mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
         font-size:10.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:"SimSun",serif;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
+div.zzCopyrightContainer {
+  border: none;
+  padding: 0cm;
+  mso-padding-alt: 1pt 4pt 1pt 4pt;
+}
 p.zzAddress {
   margin:0cm;
   margin-bottom:12pt;
@@ -1055,7 +1054,7 @@ div.figdl p, table.figdl p {
   font-size: $smallerfontsize;
 }
 
-table.formula_dl {
+div.formula_dl, p.formula_dl, table.formula_dl {
 	margin-left:20.15pt;
 }
 
@@ -1087,6 +1086,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+} 
 table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:$smallerfontsize; }
 table.MsoTableGrid

data/lib/isodoc/iso/html/style-human.css

@@ -1125,7 +1125,7 @@ ol {
 3.5 Bibliograhy
 */
 p.Biblio,
-p.NormRef {
+p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
   margin-left: 2em;
 }
@@ -1269,6 +1269,10 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table table.plain, table table.plain th, table table.plain td {
+  border: none !important;
+  font-size: 0.95em;
+}
 
 td > p:first-child, th > p:first-child {
   margin-top: 0em;
@@ -1408,7 +1412,7 @@ ol > li > p::before {
   font-size: {{smallerfontsize}};
 }
 
-dl.formula_dl {
+.formula_dl {
   background-color: #f7f7f7;
   margin-left: 20%;
   margin-right: 20%;

data/lib/isodoc/iso/html/style-human.scss

@@ -491,7 +491,7 @@ ol {
 */
 
 p.Biblio,
-p.NormRef {
+p.NormRef, div.Biblio, div.NormRef {
     margin-top: 1em;
     margin-left: 2em;
 }
@@ -719,7 +719,7 @@ ol>li>p::before {
     font-size: $smallerfontsize; 
 }
 
-dl.formula_dl {
+.formula_dl {
     background-color: #f7f7f7;
     margin-left: 20%;
     margin-right: 20%;

data/lib/isodoc/iso/html/style-iso.css

@@ -1190,7 +1190,7 @@ ol[class=roman_upper] ol[class=roman_upper] > li::before {
 /*
 3.5 Bibliograhy
 */
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
   margin-left: 2em;
 }
@@ -1335,6 +1335,10 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table table.plain, table table.plain th, table table.plain td {
+  border: none !important;
+  font-size: 0.95em;
+}
 
 td,
 th {
@@ -1468,7 +1472,7 @@ ol > li > p::before {
   margin-right: 20%;
 }
 
-dl.formula_dl {
+.formula_dl {
   background-color: #f7f7f7;
   margin-left: 20%;
   margin-right: 20%;

data/lib/isodoc/iso/html/style-iso.scss

@@ -525,7 +525,7 @@ ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
 3.5 Bibliograhy
 */
 
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
     margin-top: 1em;
     margin-left: 2em;
 }
@@ -747,7 +747,7 @@ ol > li > p::before {
     margin-right: 20%;
 }
 
-dl.formula_dl {
+.formula_dl {
     background-color: #f7f7f7;
     margin-left: 20%;
     margin-right: 20%;

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

@@ -13,7 +13,7 @@ date_first_printing: Datum des ersten Drucks
 date_printing: "Datum des {{ var1 | ordinal_word: '', '' }} Drucks"
 descriptor: Deskriptor
 reference: Referenz
-under_preparation: In Vorbereitung. (Stadium zum Zeitpunkt der Veröffentlichung %).
+under_preparation: "In Vorbereitung. Stadium zum Zeitpunkt der Veröffentlichung: %."
 withdrawn: Zurückgezogen.
 cancelled_and_replaced: Abgebrochen und ersetzt durch %.
 table_of_contents: Inhalt
@@ -38,6 +38,7 @@ iso-cen-parallel: ISO/CEN PARALLELVERARBEITUNG
 draft_comment_1: Bei diesem Dokument handelt es sich um einen Entwurf, der zur Kommentierung und Genehmigung in Umlauf gebracht wird. Sie unterliegt daher Änderungen und darf nicht als internationale Norm bezeichnet werden, bis sie als solche veröffentlicht wird.
 draft_comment_2: Zusätzlich zu ihrer Bewertung als akzeptabel für industrielle, technologische, kommerzielle und Benutzerzwecke müssen Entwürfe internationaler Normen gelegentlich auch im Hinblick auf ihr Potenzial geprüft werden, Normen zu werden, auf die in nationalen Vorschriften Bezug genommen werden kann.
 draft_comment_3: Empfänger dieses Entwurfs werden gebeten, mit ihren Kommentaren eine Mitteilung über alle relevanten Patentrechte einzureichen, die ihnen bekannt sind, und unterstützende Unterlagen einzureichen.
+subclause: ""
 doctype_dict:
   international-standard: Internationaler Standard
   technical-specification: Technische Spezifikation

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

@@ -13,7 +13,7 @@ date_first_printing: Date of the first printing
 date_printing: "Date of the {{ var1 | ordinal_word: '', '' }} printing"
 descriptor: Descriptor
 reference: Reference
-under_preparation: Under preparation. (Stage at the time of publication %).
+under_preparation: "Under preparation. Stage at the time of publication: %."
 withdrawn: Withdrawn.
 cancelled_and_replaced: Cancelled and replaced by %.
 table_of_contents: Contents
@@ -23,7 +23,7 @@ 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
+availablefrom: Available at
 voting_begins_on: Voting begins on
 voting_terminates_on: Voting terminates on
 corrected_version: Corrected version
@@ -38,6 +38,12 @@ iso-cen-parallel: ISO/CEN PARALLEL PROCESSING
 draft_comment_1: This document is a draft circulated for comments and approval. It is therefore subject to change and may not be referred to as an international standard until published as such.
 draft_comment_2: In addition to their evaluation as being acceptable for industrial, technological, commercial and user purposes, draft international standards may on occasion have to be considered in the light of their potential to become standards to which reference may be made in national regulations.
 draft_comment_3: Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.
+subclause: ""
+title_prefixes:
+  part: Part
+  amendment: AMENDMENT
+  corrigendum: TECHNICAL CORRIGENDUM
+  addendum: ADDENDUM
 doctype_dict:
   international-standard: International Standard
   technical-specification: Technical Specification

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

@@ -14,7 +14,7 @@ date_first_printing: Date de la première impression
 date_printing: "Date de la {{ var1 | ordinal_word: '', 'f' }} impression"
 descriptor: Descripteur
 reference: Référence
-under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
+under_preparation: "En cours d'élaboration. Stade au moment de la publication: %."
 withdrawn: Retiré.
 cancelled_and_replaced: Annulé et remplacé par %.
 date: Date
@@ -36,6 +36,12 @@ draft_comment_1: Ce document est un projet diffusé pour observations et approba
 draft_comment_2: Outre le fait d’être examinés pour établir s’ils sont acceptables à des fins industrielles, technologiques et commerciales, ainsi que du point de vue des utilisateurs, les projets de normes internationales doivent parfois être considérés du point de vue de leur possibilité de devenir des normes pouvant servir de référence dans la réglementation nationale.
 draft_comment_3: Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.
 website: site web
+subclause: ""
+title_prefixes:
+  part: Partie
+  amendment: AMENDEMENT
+  corrigendum: RECTIFICATIF TECHNIQUE
+  addendum: ADDITIF
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique

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

@@ -5,6 +5,7 @@ availablefrom: 入手先
 website: ウェブサイト
 see: 参照
 see_also: 第参照
+subclause: ""
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

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

@@ -12,7 +12,7 @@ price_based_on: Цена рассчитана на % стр.
 price: Цена
 date_first_printing: Дата первой печати
 date_printing: "Дата {{ var1 | ordinal_word: '', 'f.gen' }} печати"
-under_preparation: В стадии подготовки. (Стадия на момент публикации %).
+under_preparation: "В стадии подготовки. Стадия на момент публикации: %."
 withdrawn: Отозван.
 cancelled_and_replaced: Отменено и заменено на %.
 table_of_contents: Содержание
@@ -36,6 +36,12 @@ iso-cen-parallel: ISO/CEN параллельная разработка
 draft_comment_1: Настоящий документ является проектом стандарта, и рассылается органам-членам для ознакомления и внесения замечаний. До момента окончательного утверждения настоящего документа, в него могут быть внесены изменения, вследствие чего, до официальной публикации, на него нельзя ссылаться, как на принятый международный стандарт.
 draft_comment_2: Помимо оценки перспектив применимости проектов международных стандартов в промышленных, технологических, коммерческих и иных сферах непосредственно, участники могут также рассматривать предлагаемые к обсуждению документы в свете перспектив их использования в качестве референсной основы для подготовки национальных стандартов, параметры которых отвечают всем требованиям внутреннего законодательства.
 draft_comment_3: Получателям настоящего документа предлагается оставлять комментарии к тексту, уведомления об известных им нарушениях связанных патентных прав, а также предоставлять любую сопутствующую документацию.
+subclause: ""
+title_prefixes:
+  part: Часть
+  amendment: ПОПРАВКА
+  corrigendum: ТЕХНИЧЕСКОЕ ИСПРАВЛЕНИЕ
+  addendum: ДОПОЛНЕНИЕ
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация

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

@@ -9,7 +9,7 @@ reference_number_abbrev: 参考编号
 price_based_on: 价格基于%页
 descriptor: 描述符
 reference: 参考文献
-under_preparation: 制定中（出版时最新状态为%）
+under_preparation: "制定中。出版时最新状态为%"
 withdrawn: 撤回 .
 cancelled_and_replaced: 已取消并由%取代。
 date: 日期
@@ -23,6 +23,7 @@ corrected_version: 修正版本
 fast-track-procedure: 快速通道程序
 classification-UDC: 通用十进制图书分类法
 website: 网站
+subclause: ""
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格

data/lib/isodoc/iso/init.rb

@@ -21,9 +21,7 @@ module IsoDoc
       end
 
       def update_i18n(docxml)
-        @docscheme =
-          docxml.at(ns("//presentation-metadata[name" \
-                       "[text() = 'document-scheme']]/value"))&.text || "2024"
+        @docscheme ||= "2024"
         %w(1951 1972).include?(@docscheme) and
           i18n_conditional_set("reference_number", "reference_number_abbrev")
         %w(1951).include?(@docscheme) and
@@ -37,7 +35,8 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Iso::General.new(options
-          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get,
+                 config: @relatonrenderconfig))
       end
 
       def amd?(_docxml)