metanorma-itu 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4acc57d157430e9c4a9e37bd8f8aa0da066a3c4afb8ba55a13b3ecf43f9bf286
-  data.tar.gz: 16e233430fd7a3b309d9df84618e34b2fa1f518481d5ed626f5bf77724ea962a
+  metadata.gz: 7ab874eac40d7f8d7ba5d8bc82ace71a87675477a7d87c8d750af1b22525ba9a
+  data.tar.gz: eb6f6a31df466a149f6e7692006c7ae398f4ce81cc56c9cbaa775b31130aa2f2
 SHA512:
-  metadata.gz: e332ff239cac846ceaad36f20bb88641e8893821485fa73b148b7d82d635d0435caf541356fedbf782e51600a29f2a84c81e61f21eefa4151873635b8f395179
-  data.tar.gz: 35015e7389c327bff50c85b0a9f9e1a1f3ceeedfbf73edc3d77ade41ac56c91cefeab0d7eeb1dba9511eaea81f4b2540fe148f7ce4412d02b26b4e977a16fa2e
+  metadata.gz: 16b46298780e33ce35de12137b9014e7485ee61cf47dd08419e29f95009e3f36fe6dcb5317503f6edf76e8edb1f67e216fcf7b05c14bfe08be8b4d0e9c237581
+  data.tar.gz: 96b2af6193b2659473240eb41be5de6cd1cd441bf15be385da48181a99177195211392c0c590c7a608089de06b58fe6d8cd933461847f507de2d9582a1455c8d

data/lib/isodoc/itu/i18n-ar.yaml

@@ -23,6 +23,7 @@ annex_subclause: فقرة
 keywords: الكلمات الدالة
 in: في
 to: إلى
+nested_xref: "%2 في %1"
 where: ":حيث,"
 where_one: "حيث,"
 blankclause: تم ترك هذا الشرط فارغًا عمدًا

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

@@ -22,6 +22,7 @@ annex_subclause: Klausel
 keywords: Schlüsselwörter
 in: in
 to: bis
+nested_xref: "%2 in %1"
 where: "wobei:"
 where_one: "wobei"
 blankclause: Diese Klausel ist absichtlich leer gelassen

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

@@ -25,6 +25,7 @@ in: in
 to: to
 where: "where:"
 where_one: "where"
+nested_xref: "%2 in %1"
 blankclause: This clause is intentionally left blank.
 norm_with_refs_pref:
   The following ITU-T Recommendations and other references contain provisions which, through reference in this text, constitute provisions of this Recommendation. At the time of publication, the editions indicated were valid. All Recommendations and other references are subject to revision; users of this Recommendation are therefore encouraged to investigate the possibility of applying the most recent edition of the Recommendations and other references listed below. A list of the currently valid ITU-T Recommendations is regularly published. The reference to a document within this Recommendation does not give it, as a stand-alone document, the status of a Recommendation.

data/lib/isodoc/itu/i18n-es.yaml

@@ -23,6 +23,7 @@ annex_subclause: cláusula
 keywords: Palabras clave
 in: en
 to: a
+nested_xref: "%2 en %1"
 where: "donde:"
 where_one: "donde"
 blankclause: Esta cláusula se deja en blanco intencionalmente.

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

@@ -23,6 +23,7 @@ annex_subclause: article
 keywords: Mots clés
 in: dans
 to: à
+nested_xref: "%2 dans %1"
 where: "où:"
 where_one: "où"
 blankclause: Cette clause est laissée en blanc intentionnellement.

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

@@ -23,6 +23,7 @@ annex_subclause: пункт
 keywords: Ключевые слова
 in: в
 to: до
+nested_xref: "%2 в %1"
 where: "где:"
 where_one: "где"
 blankclause: Этот пункт намеренно оставлен пустым.

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

@@ -21,8 +21,9 @@ clause: 条款
 section: 节
 annex_subclause: 条款
 keywords: 关键词
-in: in
-to: to
+in: 中的
+to: 至
+nested_xref: "%1中的%2"
 where:  式中：
 where_one:  式中
 blankclause: This clause is intentionally left blank.

data/lib/isodoc/itu/i18n.rb

@@ -1,22 +1,14 @@
 module IsoDoc
   module ITU
     class I18n < IsoDoc::I18n
-      def load_yaml2x(str)
-        YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "i18n-#{str}.yaml"))
+      def load_file(fname)
+        f = File.join(File.dirname(__FILE__), fname)
+        File.exist?(f) ? YAML.load_file(f) : {}
       end
 
       def load_yaml1(lang, script)
-        y = case lang
-            when "en", "fr", "ru", "de", "es", "ar"
-              load_yaml2x(lang)
-            when "zh"
-              if script == "Hans" then load_yaml2x("zh-Hans")
-              else load_yaml2x("en")
-              end
-            else load_yaml2x("en")
-            end
-        super.deep_merge(y)
+        y = load_file("i18n-#{yaml_lang(lang, script)}.yaml")
+        y.empty? ? load_file("i18n-en.yaml").merge(super) : super.deep_merge(y)
       end
     end
   end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -18,10 +18,6 @@ module IsoDoc
         super
       end
 
-      def prefix_container(container, linkend, node, _target)
-        l10n("#{linkend} #{@i18n.get['in']} #{anchor_xref(node, container)}")
-      end
-
       def eref(docxml)
         docxml.xpath(ns("//eref")).each { |f| eref1(f) }
       end

data/lib/isodoc/itu/xref.rb

@@ -52,12 +52,12 @@ module IsoDoc
         "-#{(subfignum + 96).chr}"
       end
 
-      def sequential_figure_body(subfignum, counter, block, klass)
+      def sequential_figure_body(subfig, counter, elem, klass, container: false)
         label = counter.print
-        label &&= label + subfigure_label(subfignum)
-        @anchors[block["id"]] = anchor_struct(
-          label, nil, @labels[klass] || klass.capitalize, klass,
-          block["unnumbered"]
+        label &&= label + subfigure_label(subfig)
+        @anchors[elem["id"]] = anchor_struct(
+          label, container ? elem : nil, @labels[klass] || klass.capitalize,
+          klass, elem["unnumbered"]
         )
       end
 
@@ -69,7 +69,7 @@ module IsoDoc
         )
       end
 
-      def sequential_formula_names(clause)
+      def sequential_formula_names(clause, container: false)
         clause.first&.xpath(ns(middle_sections))&.each do |c|
           if c["id"] && @anchors[c["id"]]
             hierarchical_formula_names(c, @anchors[c["id"]][:label] ||

data/lib/metanorma/itu/biblio.rng

@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/metanorma/itu/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.3.5".freeze
+    VERSION = "2.3.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc