metanorma-itu 2.2.15 → 2.3.1

data/lib/isodoc/itu/xref.rb

@@ -1,6 +1,6 @@
 require "isodoc"
 require "fileutils"
-require_relative "./xref_section"
+require_relative "xref_section"
 
 module IsoDoc
   module ITU
@@ -20,59 +20,10 @@ module IsoDoc
         @hierarchical_assets = options[:hierarchicalassets]
       end
 
-      def back_anchor_names(docxml)
-        super
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          if annexid = docxml
-              .at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
-            docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
-          else
-            informative_annex_names(docxml)
-            normative_annex_names(docxml)
-          end
-        end
-      end
-
-      def informative_annex_names(docxml)
-        i = Counter.new(0, numerals: :roman)
-        docxml.xpath(ns("//annex[@obligation = 'informative']"))
-          .each do |c|
-          i.increment(c)
-          annex_names(c, i.print.upcase)
-        end
-      end
-
-      def normative_annex_names(docxml)
-        i = Counter.new("@", skip_i: true)
-        docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
-          .each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
-        end
-      end
-
-      def initial_anchor_names(doc)
-        @doctype = doc&.at(ns("//bibdata/ext/doctype"))&.text
-        if @parse_settings.empty? || @parse_settings[:clauses]
-          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? || @parse_settings[:clauses]
-          n = Counter.new
-          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          n = section_names(
-            doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")), n, 1
-          )
-          n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-          clause_names(doc, n)
-        end
-      end
-
       def middle_sections
         "//clause[@type = 'scope'] | " \
-          "//foreword | //introduction | //acknowledgements | " \
-          " #{@klass.norm_ref_xpath} | " \
+          "//foreword | //introduction | //acknowledgements |  " \
+          "#{@klass.norm_ref_xpath} | " \
           "//sections/terms | //preface/clause | " \
           "//sections/definitions | //clause[parent::sections]"
       end
@@ -90,8 +41,7 @@ module IsoDoc
       end
 
       def middle_section_asset_names(doc)
-        return super unless @hierarchical_assets
-
+        @hierarchical_assets or return super
         doc.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])
         end

data/lib/isodoc/itu/xref_section.rb

@@ -1,6 +1,45 @@
 module IsoDoc
   module ITU
     class Xref < IsoDoc::Xref
+      def clause_order_annex(docxml)
+        if docxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
+          [{ path: "//annex", multi: true }]
+        else
+          [{ path: "//annex[not(@obligation = 'informative')]", multi: true },
+           { path: "//annex[@obligation = 'informative']", multi: true }]
+        end
+      end
+
+      def annex_anchor_names(xml)
+        t = clause_order_annex(xml)
+        if annexid = xml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
+          xml.xpath(ns(t[0][:path])).each do |c|
+            annex_names(c, annexid.text)
+          end
+        else
+          annex_names_with_counter(xml, t[0][:path],
+                                   Counter.new("@", skip_i: true))
+          annex_names_with_counter(xml, t[1][:path],
+                                   Counter.new(0, numerals: :roman))
+        end
+      end
+
+      def annex_names_with_counter(docxml, xpath, counter)
+        docxml.xpath(ns(xpath)).each do |c|
+          annex_names(c, counter.increment(c).print.upcase)
+        end
+      end
+
+      def clause_order_preface(_docxml)
+        [{ path: "//boilerplate/*", multi: true },
+         { path: "//preface/*", multi: true }]
+      end
+
+      def initial_anchor_names(doc)
+        @doctype = doc&.at(ns("//bibdata/ext/doctype"))&.text
+        super
+      end
+
       def annextype(clause)
         if clause["obligation"] == "informative" then @labels["appendix"]
         else @labels["annex"]
@@ -38,19 +77,21 @@ module IsoDoc
         end
       end
 
-      def clause_names(docxml, sect_num)
-        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')]" \
-                        "[not(@type = 'scope')][not(descendant::terms)]"))
-          .each do |c|
-          section_names(c, sect_num, 1)
-        end
-        docxml.xpath(ns("//sections/clause[@unnumbered = 'true']")).each do |c|
-          unnumbered_section_names(c, 1)
+      def main_anchor_names(xml)
+        n = Counter.new
+        clause_order_main(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            section_names(c, n, 1)
+            a[:multi] or break
+          end
         end
       end
 
       def section_names(clause, num, lvl)
-        return num if clause.nil?
+        clause.nil? and return num
+        clause["unnumbered"] == "true" and return unnumbered_section_names(
+          clause, 1
+        )
 
         num.increment(clause)
         lbl = @doctype == "resolution" ? @labels["section"] : @labels["clause"]
@@ -79,11 +120,11 @@ module IsoDoc
       end
 
       def unnumbered_section_names(clause, lvl)
-        return if clause.nil?
-
+        clause.nil? and return
         lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
+          { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl,
+            type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
         end
@@ -92,7 +133,8 @@ module IsoDoc
       def unnumbered_section_names1(clause, level)
         lbl = clause&.at(ns("./title"))&.text || "[#{clause['id']}]"
         @anchors[clause["id"]] =
-          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level, type: "clause" }
+          { label: lbl, xref: l10n(%{"#{lbl}"}), level: level,
+            type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, level + 1)
         end

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.2 -->
+<!-- VERSION v1.2.4 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>
@@ -2046,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.15".freeze
+    VERSION = "2.3.1".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.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.2.15
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
 - lib/isodoc/itu/presentation_bibdata.rb
+- lib/isodoc/itu/presentation_preface.rb
 - lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb