metanorma-iso 2.6.4 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ff504ac48bda4f62c1ee4cd49ff6141e13af90f37133a4faa82dc8d748a9a2
-  data.tar.gz: 0c25aee1137b842ddd80a3f2f1e864716b87107a890b06d16741440c60b7ac52
+  metadata.gz: 0edbd95491be3f96c45fd1c6f96102f7f8ca6704d2785d13bd0c3547683cc935
+  data.tar.gz: 6ae381ed1c51d983281ef2f089bf913342c81608d669bdc03195800b63424c81
 SHA512:
-  metadata.gz: f6c5182d1ba3431432f225fe815da40ab9876bfddb57472873511d8a03d8fddc727c0cead2ecaf1ce27730cec97ba7d0d498cc6e7ccdea47d159087b3da5582e
-  data.tar.gz: 8667df175c997de98d6bbcbe695e5e12de3f692fe180861f64db69d933eb5a0ad239eb52e1419765dc612e20325398cec17b914804a5e39916f773cf9761a359
+  metadata.gz: 2076c7e06dd7401e9d947bd829bbef193ed35326295be2ebc0457dba8687a7a50eb5bfc9a12efdd07dd70bcb6d133719d005b26f3ad7c84f6d0a16500a211dec
+  data.tar.gz: 01ab00b3f882f37b8ad24776d61758913d34842cf841625a51ce772c0eddb3ea82829522d69827d3416ead67009bcbd0c9fe4fbee6932f929c9fb66a62324b73

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

@@ -81,3 +81,7 @@
 <p><b>Descriptors:</b> {{ keywords | join: ", " }}
 {% endif %}
 
+{%if fast_track == "true" %}
+<div><span class="subtitle">{{ labels["fast-track-procedure"] }}</span></div>
+{% endif %}
+

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

@@ -59,6 +59,10 @@
 
 <div class="coverpage-warning" id="coverpage-note-destination"/>
 
+{%if fast_track == "true" %}
+<div><p class="zzCover">{{ labels["fast-track-procedure"] }}</p></div>
+{% endif %}
+
 </div>
 
 <!--</div>-->

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

@@ -54,6 +54,10 @@
 
 <div class="coverpage-warning" id="coverpage-note-destination"/>
 
+{%if fast_track == "true" %}
+<div><p class="zzCover">{{ labels["fast-track-procedure"] }}</p></div>
+{% endif %}
+
 </div>
 
 <!--</div>-->

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

@@ -127,6 +127,10 @@ documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-si
 
 <div class="coverpage-warning" id="coverpage-note-destination"/>
 
+{%if fast_track == "true" %}
+<div><p class="zzCover">{{ labels["fast-track-procedure"] }}</p></div>
+{% endif %}
+
 <!--</div>-->
 
 

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

@@ -27,6 +27,7 @@ availablefrom: Verfügbar ab
 voting_begins_on: Die Abstimmung beginnt am
 voting_terminates_on: Die Abstimmung endet am
 corrected_version: Korrigierte Version
+fast-track-procedue: Beschleunigtes Verfahren
 multiple_and: "%1 und %2"
 multiple_or: "%1 oder %2"
 doctype_dict:

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

@@ -27,6 +27,7 @@ availablefrom: Available from
 voting_begins_on: Voting begins on
 voting_terminates_on: Voting terminates on
 corrected_version: Corrected version
+fast-track-procedure: Fast track procedure
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
 doctype_dict:

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

@@ -26,6 +26,7 @@ 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
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique

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

@@ -1,4 +1,5 @@
 descriptor: 記述子
+fast-track-procedure:  ファストトラック手順
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

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

@@ -27,6 +27,7 @@ availablefrom: Доступна с
 voting_begins_on: Голосование начинается в
 voting_terminates_on: Голосование заканчивается в
 corrected_version: Исправленная версия
+fast-track-procedure: Ускоренная процедура
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация

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

@@ -24,6 +24,7 @@ availablefrom: 可从
 voting_begins_on: 投票开始于
 voting_terminates_on: 投票终止于
 corrected_version: 修正版本
+fast-track-procedure: 快速通道程序
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格

data/lib/isodoc/iso/iso.amendment.xsl

@@ -561,7 +561,7 @@
 											<fo:table-cell display-align="after" padding-bottom="3mm" role="SKIP">
 												<fo:block-container height="22.5mm" display-align="center" role="SKIP">
 
-													<xsl:variable name="iso-fast-track">false</xsl:variable>
+													<xsl:variable name="iso-fast-track" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:fast-track)"/>
 
 													<xsl:if test="normalize-space($iso-fast-track) = 'true'">
 														<xsl:attribute name="height">28mm</xsl:attribute>
@@ -590,7 +590,13 @@
 																	<fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold" role="SKIP">
 																		<fo:block-container height="13.2mm" role="SKIP">
 																			<fo:block>
-																				<xsl:text>FAST TRACK PROCEDURE</xsl:text>
+																				<!-- <xsl:text>FAST TRACK PROCEDURE</xsl:text>  -->
+																				<xsl:variable name="fast_track_procedure_text">
+																					<xsl:call-template name="getLocalizedString">
+																						<xsl:with-param name="key">fast-track-procedure</xsl:with-param>
+																					</xsl:call-template>
+																				</xsl:variable>
+																				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($fast_track_procedure_text))"/>
 																			</fo:block>
 																		</fo:block-container>
 																	</fo:block>
@@ -11089,14 +11095,16 @@
 
 	<xsl:template match="*[local-name() = 'annex']">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
+		<fo:block>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_annex_style"/>
 
 		</fo:block>
-		<xsl:apply-templates/>
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="refine_annex_style">

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -561,7 +561,7 @@
 											<fo:table-cell display-align="after" padding-bottom="3mm" role="SKIP">
 												<fo:block-container height="22.5mm" display-align="center" role="SKIP">
 
-													<xsl:variable name="iso-fast-track">false</xsl:variable>
+													<xsl:variable name="iso-fast-track" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:fast-track)"/>
 
 													<xsl:if test="normalize-space($iso-fast-track) = 'true'">
 														<xsl:attribute name="height">28mm</xsl:attribute>
@@ -590,7 +590,13 @@
 																	<fo:block background-color="rgb(77,77,77)" color="white" fox:border-radius="5pt" text-align="center" display-align="center" font-size="19pt" font-weight="bold" role="SKIP">
 																		<fo:block-container height="13.2mm" role="SKIP">
 																			<fo:block>
-																				<xsl:text>FAST TRACK PROCEDURE</xsl:text>
+																				<!-- <xsl:text>FAST TRACK PROCEDURE</xsl:text>  -->
+																				<xsl:variable name="fast_track_procedure_text">
+																					<xsl:call-template name="getLocalizedString">
+																						<xsl:with-param name="key">fast-track-procedure</xsl:with-param>
+																					</xsl:call-template>
+																				</xsl:variable>
+																				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($fast_track_procedure_text))"/>
 																			</fo:block>
 																		</fo:block-container>
 																	</fo:block>
@@ -11089,14 +11095,16 @@
 
 	<xsl:template match="*[local-name() = 'annex']">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
+		<fo:block>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_annex_style"/>
 
 		</fo:block>
-		<xsl:apply-templates/>
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="refine_annex_style">

data/lib/isodoc/iso/metadata.rb

@@ -237,11 +237,13 @@ module IsoDoc
 
       def doctype(isoxml, _out)
         super
-        ics = []
-        isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
+        ics = isoxml.xpath(ns("//bibdata/ext/ics/code"))
+          .each_with_object([]) { |i, m| m << i.text }
         set(:ics, ics.empty? ? nil : ics.join(", "))
         a = isoxml.at(ns("//bibdata/ext/horizontal")) and
           set(:horizontal, a.text)
+        a = isoxml.at(ns("//bibdata/ext/fast-track")) and
+          set(:fast_track, a.text)
       end
     end
   end

data/lib/metanorma/iso/basicdoc.rng

@@ -95,8 +95,89 @@
       <ref name="pagebreak"/>
       <ref name="hr"/>
       <ref name="bookmark"/>
+      <ref name="amend"/>
     </choice>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <ref name="AmendType"/>
+    </element>
+  </define>
+  <define name="AmendType">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <attribute name="change">
+      <choice>
+        <value>add</value>
+        <value>modify</value>
+        <value>delete</value>
+        <value>replace</value>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="path_end"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <element name="location">
+        <zeroOrMore>
+          <choice>
+            <ref name="locality"/>
+            <ref name="localityStack"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="description">
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="newcontent">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -939,18 +1020,12 @@
     </optional>
     <optional>
       <attribute name="width">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="height">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
@@ -965,6 +1040,14 @@
       </attribute>
     </optional>
   </define>
+  <define name="ImageSize">
+    <choice>
+      <data type="string">
+        <param name="pattern">\d+([.]\d+)?(%?)</param>
+      </data>
+      <value>auto</value>
+    </choice>
+  </define>
   <define name="video">
     <element name="video">
       <attribute name="id">

data/lib/metanorma/iso/biblio-standoc.rng

@@ -9,11 +9,42 @@
   -->
   <include href="biblio.rng">
     <define name="BibData">
-      <ref name="BibliographicItem"/>
+      <ref name="StandardBibliographicItem"/>
       <optional>
         <ref name="ext"/>
       </optional>
     </define>
+    <define name="docrelation">
+      <element name="relation">
+        <attribute name="type">
+          <ref name="DocRelationType"/>
+        </attribute>
+        <optional>
+          <element name="description">
+            <ref name="FormattedString"/>
+          </element>
+        </optional>
+        <element name="bibitem">
+          <ref name="StandardReducedBibliographicItem"/>
+        </element>
+        <choice>
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="localityStack"/>
+          </zeroOrMore>
+        </choice>
+        <choice>
+          <zeroOrMore>
+            <ref name="sourceLocality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="sourceLocalityStack"/>
+          </zeroOrMore>
+        </choice>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <element name="ext">
@@ -161,4 +192,16 @@
       </optional>
     </element>
   </define>
+  <define name="StandardBibliographicItem">
+    <ref name="BibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
+  <define name="StandardReducedBibliographicItem">
+    <ref name="ReducedBibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
 </grammar>

data/lib/metanorma/iso/biblio.rng

@@ -241,6 +241,9 @@
     </element>
   </define>
   <define name="FullNameType">
+    <optional>
+      <ref name="name_abbreviation"/>
+    </optional>
     <choice>
       <group>
         <zeroOrMore>
@@ -266,6 +269,11 @@
       <ref name="variantname"/>
     </zeroOrMore>
   </define>
+  <define name="name_abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -870,6 +878,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="btitle">
     <element name="title">

data/lib/metanorma/iso/front.rb

@@ -16,6 +16,7 @@ module Metanorma
         metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
+        a = node.attr("fast-track") and xml.send "fast-track", a != "false"
       end
 
       STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,

data/lib/metanorma/iso/front_id.rb

@@ -82,7 +82,7 @@ module Metanorma
 
       # unpublished is for internal use
       def iso_id_params_core(node)
-        pub = (node.attr("publisher") || "ISO").split(/[;,]/)
+        pub = iso_id_pub(node)
         ret = { number: node.attr("docnumber"),
                 part: node.attr("partnumber"),
                 language: node.attr("language") || "en",
@@ -94,6 +94,11 @@ module Metanorma
         ret
       end
 
+      def iso_id_pub(node)
+        (node.attr("publisher") || default_publisher).split(/[;,]/)
+          .map(&:strip).map { |x| org_abbrev[x] || x }
+      end
+
       def iso_id_params_add(node)
         stage = iso_id_stage(node)
         ret = { number: node.attr("amendment-number") ||
@@ -136,7 +141,7 @@ module Metanorma
         iso_id_out_common(xml, params, with_prf)
         @amd and return
         iso_id_out_non_amd(xml, params, with_prf)
-      rescue StandardError => e
+      rescue StandardError, *STAGE_ERROR => e
         clean_abort("Document identifier: #{e}", xml)
       end
 

data/lib/metanorma/iso/isodoc.rng

@@ -17,10 +17,19 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.9 -->
+<!-- VERSION v1.2.12 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
+    <define name="amend">
+      <element name="amend">
+        <ref name="BlockAttributes"/>
+        <ref name="AmendType"/>
+        <zeroOrMore>
+          <ref name="autonumber"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -2319,69 +2328,6 @@
       <ref name="CitationType"/>
     </element>
   </define>
-  <define name="amend">
-    <element name="amend">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <attribute name="change">
-        <choice>
-          <value>add</value>
-          <value>modify</value>
-          <value>delete</value>
-          <value>replace</value>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="path"/>
-      </optional>
-      <optional>
-        <attribute name="path_end"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <ref name="BlockAttributes"/>
-      <optional>
-        <element name="location">
-          <zeroOrMore>
-            <ref name="locality"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="autonumber"/>
-      </zeroOrMore>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="newcontent">
-          <optional>
-            <attribute name="id">
-              <data type="ID"/>
-            </attribute>
-          </optional>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="autonumber">
     <element name="autonumber">
       <attribute name="type">

data/lib/metanorma/iso/relaton-iso.rng

@@ -26,6 +26,9 @@
       <optional>
         <ref name="updates_document_type"/>
       </optional>
+      <optional>
+        <ref name="fast_track"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -222,4 +225,9 @@
       <text/>
     </element>
   </define>
+  <define name="fast_track">
+    <element name="fast-track">
+      <data type="boolean"/>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iso/reqt.rng

@@ -207,20 +207,4 @@
       <value>permission</value>
     </choice>
   </define>
-  <define name="classification">
-    <element name="classification">
-      <ref name="classification_tag"/>
-      <ref name="classification_value"/>
-    </element>
-  </define>
-  <define name="classification_tag">
-    <element name="tag">
-      <text/>
-    </element>
-  </define>
-  <define name="classification_value">
-    <element name="value">
-      <text/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.6.4".freeze
+    VERSION = "2.7.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.7.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.0"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso", "~> 0.6.0"
+  spec.add_dependency "pubid-iso"
   spec.add_dependency "pubid-cen"
   spec.add_dependency "pubid-iec"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pubid-cen
   requirement: !ruby/object:Gem::Requirement