metanorma-itu 2.1.8.1 → 2.1.9

data/lib/isodoc/itu/xref.rb

@@ -24,7 +24,7 @@ module IsoDoc
         super
         if @parse_settings.empty? || @parse_settings[:clauses]
           if annexid = docxml
-            &.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
+              .at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
             docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
           else
             informative_annex_names(docxml)
@@ -57,14 +57,6 @@ module IsoDoc
           doc.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
           doc.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         end
-        if @parse_settings.empty?
-          if @hierarchical_assets
-            hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
-                                     "Preface")
-          else
-            sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
-          end
-        end
         if @parse_settings.empty? || @parse_settings[:clauses]
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
@@ -75,11 +67,6 @@ module IsoDoc
           n = section_names(doc.at(ns("//sections/definitions")), n, 1)
           clause_names(doc, n)
         end
-        if @parse_settings.empty?
-          middle_section_asset_names(doc)
-          termnote_anchor_names(doc)
-          termexample_anchor_names(doc)
-        end
       end
 
       def middle_sections
@@ -90,6 +77,18 @@ module IsoDoc
           "//sections/definitions | //clause[parent::sections]"
       end
 
+      def asset_anchor_names(doc)
+        super
+        if @parse_settings.empty?
+          if @hierarchical_assets
+            hierarchical_asset_names(doc.xpath("//xmlns:preface/child::*"),
+                                     "Preface")
+          else
+            sequential_asset_names(doc.xpath("//xmlns:preface/child::*"))
+          end
+        end
+      end
+
       def middle_section_asset_names(doc)
         return super unless @hierarchical_assets
 
@@ -98,47 +97,28 @@ module IsoDoc
         end
       end
 
-      def sequential_figure_names(clause)
-        c = Counter.new
-        j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
-          if t.parent.name == "figure" then j += 1
-          else
-            j = 0
-            c.increment(t)
-          end
-          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
-          next if t["id"].nil? || t["id"].empty?
-
-          @anchors[t["id"]] =
-            anchor_struct(label, nil, @labels["figure"], "figure",
-                          t["unnumbered"])
-        end
+      def sequential_figure_body(subfignum, counter, block)
+        label = counter.print
+        label &&= label +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels["figure"], "figure", block["unnumbered"]
+        )
       end
 
-      def hierarchical_figure_names(clause, num)
-        c = Counter.new
-        j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
-          if t.parent.name == "figure" then j += 1
-          else
-            j = 0
-            c.increment(t)
-          end
-          label = "#{num}#{hiersep}#{c.print}" + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr}")
-          next if t["id"].nil? || t["id"].empty?
+      def hierarchical_figure_body(num, subfignum, counter, block)
+        label = "#{num}#{hiersep}#{counter.print}" +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{(subfignum + 96).chr}")
 
-          @anchors[t["id"]] =
-            anchor_struct(label, nil, @labels["figure"], "figure",
-                          t["unnumbered"])
-        end
+        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                              "figure", block["unnumbered"])
       end
 
       def sequential_formula_names(clause)
-        clause&.first&.xpath(ns(middle_sections))&.each do |c|
+        clause.first&.xpath(ns(middle_sections))&.each do |c|
           if c["id"] && @anchors[c["id"]]
-            hierarchical_formula_names(c,
-                                       @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
+            hierarchical_formula_names(c, @anchors[c["id"]][:label] ||
+                                       @anchors[c["id"]][:xref] || "???")
           else
             hierarchical_formula_names(c, "???")
           end
@@ -147,9 +127,7 @@ module IsoDoc
 
       def hierarchical_formula_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}-#{c.increment(t).print}", nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -168,7 +146,7 @@ module IsoDoc
         docxml.xpath(ns("//term[termnote]")).each do |t|
           c = Counter.new
           notes = t.xpath(ns("./termnote"))
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] =
               { label: termnote_label(idx).strip, type: "termnote", value: idx,

data/lib/metanorma/itu/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.1.8.1".freeze
+    VERSION = "2.1.9".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,3 +1,3 @@
 template:
-  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  # skip authoritative identifier, it is inserted in front of formattedref within metanorma
   standard: "<em>{{ title }}</em> ,_{{ edition | capitalize_first }} . {{ extent }}." 

data/metanorma-itu.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "twitter_cldr", ">= 3.0.0"
   spec.add_dependency "tzinfo-data" # we need this for windows only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.1.8.1
+  version: 2.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement