metanorma-itu 1.1.3 → 1.2.4

data/lib/isodoc/itu/xref.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "metadata"
 require "fileutils"
 
 module IsoDoc
@@ -11,15 +10,17 @@ module IsoDoc
       end
 
       def annex_name_lbl(clause, num)
-        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
-        l10n("<b>#{lbl} #{num}</b>")
+        lbl = clause["obligation"] == "informative" ? 
+          @labels["appendix"] : @labels["annex"]
+        l10n("<strong>#{lbl} #{num}</strong>")
       end
 
       def annex_names(clause, num)
-        lbl = clause["obligation"] == "informative" ? @labels["appendix"] : @labels["annex"]
+        lbl = clause["obligation"] == "informative" ? 
+          @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
-            xref: "#{lbl} #{num}", level: 1 }
+            xref: "#{lbl} #{num}", level: 1, value: num }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -33,13 +34,16 @@ module IsoDoc
 
       def back_anchor_names(docxml)
         super
-        if annexid = docxml&.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
+        if annexid =
+            docxml&.at(ns("//bibdata/ext/structuredidentifier/annexid"))&.text
           docxml.xpath(ns("//annex")).each { |c| annex_names(c, annexid) }
         else
-          docxml.xpath(ns("//annex[@obligation = 'informative']")).each_with_index do |c, i|
+          docxml.xpath(ns("//annex[@obligation = 'informative']"))
+            .each_with_index do |c, i|
             annex_names(c, RomanNumerals.to_roman(i + 1))
           end
-          docxml.xpath(ns("//annex[not(@obligation = 'informative')]")).each_with_index do |c, i|
+          docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
+            .each_with_index do |c, i|
             annex_names(c, (65 + i + (i > 7 ? 1 : 0)).chr.to_s)
           end
         end
@@ -49,7 +53,8 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, xref: "#{@labels["annex_subclause"]} #{num}",
             level: level, type: "clause" }
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).each_with_index do |c, i|
+        clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
+          .each_with_index do |c, i|
           annex_names1(c, "#{num}.#{i + 1}", level + 1)
         end
       end
@@ -58,11 +63,11 @@ module IsoDoc
         d.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
         d.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         @hierarchical_assets ?
-          hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
-          sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
-        n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
-        n = section_names(d.at(ns("//bibliography/clause[.//references[@normative = 'true']] | "\
-                                  "//bibliography/references[@normative = 'true']")), n, 1)
+          hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), 
+                                   "Preface") :
+                                  sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
+        n = section_names(d.at(ns("//clause[@type = 'scope']")), 0, 1)
+        n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
         n = section_names(d.at(ns("//sections/terms | "\
                                   "//sections/clause[descendant::terms]")), n, 1)
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -72,15 +77,17 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-      MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
-        "//foreword | //introduction | //acknowledgements | "\
-        "//references[@normative = 'true'] | "\
-        "//sections/terms | //preface/clause | "\
-        "//sections/definitions | //clause[parent::sections]".freeze
+      def middle_sections
+        "//clause[@type = 'scope'] | "\
+          "//foreword | //introduction | //acknowledgements | "\
+          " #{@klass.norm_ref_xpath} | "\
+          "//sections/terms | //preface/clause | "\
+          "//sections/definitions | //clause[parent::sections]"
+      end
 
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
-        d.xpath(ns(MIDDLE_SECTIONS)).each do |c|
+        d.xpath(ns(middle_sections)).each do |c|
           hierarchical_asset_names(c, @anchors[c["id"]][:label])
         end
       end
@@ -94,7 +101,7 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "-#{(96 + j).chr.to_s}")
+          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] =
             anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
@@ -104,7 +111,8 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
+        clause.xpath(ns(".//figure | "\
+                        ".//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0
@@ -113,13 +121,14 @@ module IsoDoc
           label = "#{num}#{hiersep}#{c.print}" +
             (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
-                                            t["unnumbered"])
+          @anchors[t["id"]] = 
+            anchor_struct(label, nil, @labels["figure"], "figure",
+                          t["unnumbered"])
         end
       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] || "???")
@@ -133,16 +142,17 @@ module IsoDoc
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|
           next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] =
-            anchor_struct("#{num}-#{c.increment(t).print}", nil,
-                          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                          "formula", t["unnumbered"])
+          @anchors[t["id"]] = anchor_struct(
+            "#{num}-#{c.increment(t).print}", nil,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"])
         end
       end
 
       def reference_names(ref)
         super
-        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
+        @anchors[ref["id"]] = 
+          { xref: @anchors[ref["id"]][:xref].sub(/^\[/, '').sub(/\]$/, '') }
       end
 
       def termnote_anchor_names(docxml)
@@ -152,8 +162,12 @@ module IsoDoc
           notes.each do |n|
             return if n["id"].nil? || n["id"].empty?
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-            @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"],
-                                              "termnote", false)
+            @anchors[n["id"]] = 
+              { label: termnote_label(idx).strip, type: "termnote",
+                value: idx,
+              xref: l10n("#{anchor(t['id'], :xref)}, "\
+                         "#{@labels["note_xref"]} #{c.print}") }
+
           end
         end
       end

data/lib/metanorma/itu/processor.rb

@@ -33,13 +33,17 @@ module Metanorma
       def output(isodoc_node, inname, outname, format, options={})
         case format
         when :html
-          IsoDoc::ITU::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::ITU::HtmlConvert.new(options).convert(inname, isodoc_node, 
+                                                        nil, outname)
         when :doc
-          IsoDoc::ITU::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::ITU::WordConvert.new(options).convert(inname, isodoc_node, 
+                                                        nil, outname)
         when :pdf
-          IsoDoc::ITU::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::ITU::PdfConvert.new(options).convert(inname, isodoc_node, 
+                                                       nil, outname)
         when :presentation
-          IsoDoc::ITU::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::ITU::PresentationXMLConvert.new(options).convert(
+            inname, isodoc_node, nil, outname)
         else
           super
         end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.1.3"
+    VERSION = "1.2.4"
   end
 end

data/metanorma-itu.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +264,6 @@ files:
 - lib/asciidoctor/itu/cleanup.rb
 - lib/asciidoctor/itu/converter.rb
 - lib/asciidoctor/itu/front.rb
-- lib/asciidoctor/itu/i18n-en.yaml
 - lib/asciidoctor/itu/isodoc.rng
 - lib/asciidoctor/itu/itu.rng
 - lib/asciidoctor/itu/macros.rb
@@ -292,6 +291,8 @@ files:
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
 - lib/isodoc/itu/i18n-en.yaml
+- lib/isodoc/itu/i18n.rb
+- lib/isodoc/itu/init.rb
 - lib/isodoc/itu/itu.recommendation-annex.xsl
 - lib/isodoc/itu/itu.recommendation.xsl
 - lib/isodoc/itu/itu.resolution.xsl
@@ -300,6 +301,7 @@ files:
 - lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb
+- lib/isodoc/itu/word_cleanup.rb
 - lib/isodoc/itu/word_convert.rb
 - lib/isodoc/itu/xref.rb
 - lib/metanorma-itu.rb

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

@@ -1,16 +0,0 @@
-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.
-term_def_boilerplate: 
-  "This Recommendation defines the following terms:"
-internal_terms_boilerplate:
-  "This Recommendation defines the following terms:"
-external_terms_boilerplate:
-   "This Recommendation uses the following terms defined elsewhere:"
-no_terms_boilerplate:
-  None.
-symbols_boilerplate:
-  "This Recommendation uses the following abbreviations and acronyms:"
-norm_empty_pref:
-  None.
-clause_empty:
-  None.