metanorma-itu 2.1.11 → 2.1.13

data/lib/isodoc/itu/presentation_bibdata.rb

@@ -0,0 +1,87 @@
+module IsoDoc
+  module ITU
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def bibdata_i18n(bib)
+        super
+        bibdata_dates(bib)
+        bibdata_title(bib)
+        amendment_id(bib)
+      end
+
+      def bibdata_dates(bib)
+        bib.xpath(ns("./date")).each do |d|
+          d.next = d.dup
+          d.next["format"] = "ddMMMyyyy"
+          d.next.children = ddMMMyyyy(d.text)
+        end
+      end
+
+      def bibdata_title(bib)
+        case bib.at(ns("./ext/doctype"))&.text
+        when "service-publication" then bibdata_title_service_population(bib)
+        when "resolution" then bibdata_title_resolution(bib)
+        end
+      end
+
+      def bibdata_title_resolution(bib)
+        place = bib.at(ns("./ext/meeting-place"))&.text
+        ed = bib.at(ns("./edition"))&.text
+        rev = ed && ed != "1" ? "#{@i18n.get['revision_abbreviation']} " : ""
+        year = bib.at(ns("./ext/meeting-date/from | ./ext/meeting-date/on"))
+          &.text&.gsub(/-.*$/, "")
+        num = bib.at(ns("./docnumber"))&.text
+        text = @i18n.l10n("#{@i18n.get['doctype_dict']['resolution'].upcase} " \
+                          "#{num} (#{rev}#{place}, #{year})")
+        bib.at(ns("./title")).next = <<~INS
+          <title language="#{@lang}" format="text/plain" type="resolution">#{text}</title>
+          <title language="#{@lang}" format="text/plain" type="resolution-placedate">#{place}, #{year}</title>
+        INS
+      end
+
+      def bibdata_title_service_population(bib)
+        date = bib&.at(ns("./date[@type = 'published']"))&.text or return
+        text = l10n(@i18n.get["position_on"].sub(/%/, ddmmmmyyyy(date)))
+        ins = bib.at(ns("./title"))
+        ins.next = <<~INS
+          <title language="#{@lang}" format="text/plain" type="position-sp">#{text}</title>
+        INS
+      end
+
+      def ddMMMyyyy(date)
+        d = date.split("-").map { |x| x.sub(/^0/, "") }
+        case @lang
+        when "zh"
+          d[0] += "年" if d[0]
+          d[1] += "月" if d[1]
+          d[2] += "日" if d[2]
+          d.join
+        when "ar"
+          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
+          d.join(".")
+        else
+          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
+          d.reverse.join(".")
+        end
+      end
+
+      def ddmmmmyyyy(date)
+        @lang == "zh" and return ddMMMyyyy(date)
+        d = date.split("-")
+        d[1] &&= @meta.months[d[1].to_sym]
+        d[2] &&= d[2].sub(/^0/, "")
+        l10n(d.reverse.join(" "))
+      end
+
+      def amendment_id(bib)
+        %w(amendment corrigendum).each do |w|
+          if dn = bib.at(ns("./ext/structuredidentifier/#{w}"))
+            dn["language"] = ""
+            dn.next = dn.dup
+            dn.next["language"] = @lang
+            dn.next.children = @i18n.l10n("#{@i18n.get[w]} #{dn.text}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -2,35 +2,89 @@ require_relative "init"
 require "roman-numerals"
 require "isodoc"
 require_relative "../../relaton/render/general"
+require_relative "presentation_bibdata"
 
 module IsoDoc
   module ITU
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def initialize(options)
-        @hierarchical_assets = options[:hierarchical_assets]
+        @hierarchical_assets = options[:hierarchicalassets]
         super
       end
 
+      def convert1(docxml, filename, dir)
+        insert_preface_sections(docxml)
+        super
+      end
+
+      def insert_preface_sections(docxml)
+        x = insert_editors_clause(docxml) and
+          editors_insert_pt(docxml).next = x
+      end
+
+      def editors_insert_pt(docxml)
+        docxml.at(ns("//preface")) || docxml.at(ns("//sections"))
+          .add_previous_sibling("<preface> </preface>").first
+        ins = docxml.at(ns("//preface/acknolwedgements")) and return ins
+        docxml.at(ns("//preface")).children[-1]
+      end
+
+      def insert_editors_clause(doc)
+        ret = extract_editors(doc) or return
+        eds = ret[:names].each_with_object([]).with_index do |(_x, acc), i|
+          acc << { name: ret[:names][i], affiliation: ret[:affiliations][i],
+                   email: ret[:emails][i] }
+        end
+        editors_clause(eds)
+      end
+
+      def extract_editors(doc)
+        e = doc.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
+        e.empty? and return
+        { names: @meta.extract_person_names(e),
+          affiliations: @meta.extract_person_affiliations(e),
+          emails: e.reduce([]) { |ret, p| ret << p.at(ns("./email"))&.text } }
+      end
+
+      def editors_clause(eds)
+        ed_lbl = @i18n.inflect(@i18n.get["editor_full"],
+                               number: eds.size > 1 ? "pl" : "sg")
+        ed_lbl &&= l10n("#{ed_lbl.capitalize}:")
+        mail_lbl = l10n("#{@i18n.get['email']}: ")
+        ret = <<~SUBMITTING
+          <clause id="_#{UUIDTools::UUID.random_create}" type="editors">
+          <table id="_#{UUIDTools::UUID.random_create}" unnumbered="true"><tbody>
+        SUBMITTING
+        ret += editor_table_entries(eds, ed_lbl, mail_lbl)
+        "#{ret}</tbody></table></clause>"
+      end
+
+      def editor_table_entries(eds, ed_lbl, mail_lbl)
+        eds.each_with_index.with_object([]) do |(n, i), m|
+          mail = ""
+          n[:email] and
+            mail = "#{mail_lbl}<link target='mailto:#{n[:email]}'>" \
+                   "#{n[:email]}</link>"
+          aff = n[:affiliation].empty? ? "" : "<br/>#{n[:affiliation]}"
+          th = "<th>#{i.zero? ? ed_lbl : ''}</th>"
+          m << "<tr>#{th}<td>#{n[:name]}#{aff}</td><td>#{mail}</td></tr>"
+        end.join("\n")
+      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 do |f|
-          eref1(f)
-        end
+        docxml.xpath(ns("//eref")).each { |f| eref1(f) }
       end
 
       def origin(docxml)
-        docxml.xpath(ns("//origin[not(termref)]")).each do |f|
-          eref1(f)
-        end
+        docxml.xpath(ns("//origin[not(termref)]")).each { |f| eref1(f) }
       end
 
       def quotesource(docxml)
-        docxml.xpath(ns("//quote/source")).each do |f|
-          eref1(f)
-        end
+        docxml.xpath(ns("//quote/source")).each { |f| eref1(f) }
       end
 
       def eref1(elem)
@@ -38,8 +92,7 @@ module IsoDoc
       end
 
       def note1(elem)
-        return if elem["type"] == "title-footnote"
-
+        elem["type"] == "title-footnote" and return
         super
       end
 
@@ -58,70 +111,6 @@ module IsoDoc
         node.add_child(link)
       end
 
-      def bibdata_i18n(bib)
-        super
-        bibdata_dates(bib)
-        bibdata_title(bib)
-        amendment_id(bib)
-      end
-
-      def bibdata_dates(bib)
-        bib.xpath(ns("./date")).each do |d|
-          d.next = d.dup
-          d.next["format"] = "ddMMMyyyy"
-          d.next.children = ddMMMyyyy(d.text)
-        end
-      end
-
-      def bibdata_title(bib)
-        case bib&.at(ns("./ext/doctype"))&.text
-        when "service-publication" then bibdata_title_service_population(bib)
-        when "resolution" then bibdata_title_resolution(bib)
-        end
-      end
-
-      def bibdata_title_resolution(bib)
-        place = bib&.at(ns("./ext/meeting-place"))&.text
-        ed = bib&.at(ns("./edition"))&.text
-        rev = ed && ed != "1" ? "#{@i18n.get['revision_abbreviation']} " : ""
-        year = bib&.at(ns("./ext/meeting-date/from | ./ext/meeting-date/on"))
-          &.text&.gsub(/-.*$/, "")
-        num = bib&.at(ns("./docnumber"))&.text
-        text = @i18n.l10n("#{@i18n.get['doctype_dict']['resolution'].upcase} "\
-                          "#{num} (#{rev}#{place}, #{year})")
-        ins = bib.at(ns("./title"))
-        ins.next = <<~INS
-          <title language="#{@lang}" format="text/plain" type="resolution">#{text}</title>
-          <title language="#{@lang}" format="text/plain" type="resolution-placedate">#{place}, #{year}</title>
-        INS
-      end
-
-      def bibdata_title_service_population(bib)
-        date = bib&.at(ns("./date[@type = 'published']"))&.text or return
-        text = l10n(@i18n.get["position_on"].sub(/%/, ddmmmmyyyy(date)))
-        ins = bib.at(ns("./title"))
-        ins.next = <<~INS
-          <title language="#{@lang}" format="text/plain" type="position-sp">#{text}</title>
-        INS
-      end
-
-      def ddMMMyyyy(date)
-        d = date.split("-").map { |x| x.sub(/^0/, "") }
-        case @lang
-        when "zh"
-          d[0] += "年" if d[0]
-          d[1] += "月" if d[1]
-          d[2] += "日" if d[2]
-          d.join
-        when "ar"
-          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
-          d.join(".")
-        else
-          d[1] = ::RomanNumerals.to_roman(d[1].to_i).upcase if d[1]
-          d.reverse.join(".")
-        end
-      end
-
       def bibrenderer
         ::Relaton::Render::ITU::General.new(language: @lang)
       end
@@ -138,53 +127,37 @@ module IsoDoc
           "#{f}#{xml.xpath(ns('./docidentifier | ./uri | ./note | ./date')).to_xml}"
       end
 
-      def ddmmmmyyyy(date)
-        @lang == "zh" and return ddMMMyyyy(date)
-        d = date.split("-")
-        d[1] &&= @meta.months[d[1].to_sym]
-        d[2] &&= d[2].sub(/^0/, "")
-        l10n(d.reverse.join(" "))
-      end
-
-      def amendment_id(bib)
-        %w(amendment corrigendum).each do |w|
-          if dn = bib.at(ns("./ext/structuredidentifier/#{w}"))
-            dn["language"] = ""
-            dn.next = dn.dup
-            dn.next["language"] = @lang
-            dn.next.children = @i18n.l10n("#{@i18n.get[w]} #{dn&.text}")
-          end
-        end
-      end
-
       def twitter_cldr_localiser_symbols
         { group: "'" }
       end
 
       def clause1(elem)
-        return super unless elem&.at(ns("//bibdata/ext/doctype"))&.text ==
-          "resolution"
-        return super unless %w(sections bibliography).include? elem.parent.name
-        return if @suppressheadingnumbers || elem["unnumbered"]
+        elem.at(ns("//bibdata/ext/doctype"))&.text ==
+          "resolution" or return super
+        %w(sections bibliography).include? elem.parent.name or return super
+        @suppressheadingnumbers || elem["unnumbered"] and return
 
         t = elem.at(ns("./title")) and t["depth"] = "1"
         lbl = @xrefs.anchor(elem["id"], :label, false) or return
         elem.elements.first.previous =
-          "<p keep-with-next='true' class='supertitle'>"\
+          "<p keep-with-next='true' class='supertitle'>" \
           "#{@i18n.get['section'].upcase} #{lbl}</p>"
       end
 
       def annex1(elem)
-        return super unless elem.at(ns("//bibdata/ext/doctype"))&.text ==
-          "resolution"
+        elem.at(ns("//bibdata/ext/doctype"))&.text == "resolution" or
+          return super
 
+        elem.elements.first.previous = annex1_supertitle(elem)
+        t = elem.at(ns("./title")) and
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+      end
+
+      def annex1_supertitle(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         res = elem.at(ns("//bibdata/title[@type = 'resolution']"))
         subhead = @i18n.l10n("(#{@i18n.get['to']} #{res.children.to_xml})")
-        elem.elements.first.previous =
-          "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
-        t = elem.at(ns("./title")) and
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+        "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
       end
 
       def ol_depth(node)

data/lib/isodoc/itu/word_convert.rb

@@ -8,7 +8,7 @@ module IsoDoc
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
-        @hierarchical_assets = options[:hierarchical_assets]
+        @hierarchical_assets = options[:hierarchicalassets]
         super
       end
 

data/lib/isodoc/itu/xref.rb

@@ -17,7 +17,7 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       def initialize(lang, script, klass, labels, options)
         super
-        @hierarchical_assets = options[:hierarchical_assets]
+        @hierarchical_assets = options[:hierarchicalassets]
       end
 
       def back_anchor_names(docxml)
@@ -70,10 +70,10 @@ module IsoDoc
       end
 
       def middle_sections
-        "//clause[@type = 'scope'] | "\
-          "//foreword | //introduction | //acknowledgements | "\
-          " #{@klass.norm_ref_xpath} | "\
-          "//sections/terms | //preface/clause | "\
+        "//clause[@type = 'scope'] | " \
+          "//foreword | //introduction | //acknowledgements | " \
+          " #{@klass.norm_ref_xpath} | " \
+          "//sections/terms | //preface/clause | " \
           "//sections/definitions | //clause[parent::sections]"
       end
 

data/lib/metanorma/itu/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/itu/converter.rb

@@ -124,12 +124,12 @@ module Metanorma
       end
 
       def html_extract_attributes(node)
-        super.merge(hierarchical_assets:
+        super.merge(hierarchicalassets:
                     node.attr("hierarchical-object-numbering"))
       end
 
       def doc_extract_attributes(node)
-        super.merge(hierarchical_assets:
+        super.merge(hierarchicalassets:
                     node.attr("hierarchical-object-numbering"))
       end
 

data/lib/metanorma/itu/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1153,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.1.11".freeze
+    VERSION = "2.1.13".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "metanorma-standoc", "~> 2.2.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -257,9 +257,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -267,10 +264,6 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - lib/isodoc/itu.rb
 - lib/isodoc/itu/base_convert.rb
 - lib/isodoc/itu/cleanup.rb
@@ -315,6 +308,7 @@ files:
 - lib/isodoc/itu/itu.technical-report.xsl
 - lib/isodoc/itu/metadata.rb
 - lib/isodoc/itu/pdf_convert.rb
+- lib/isodoc/itu/presentation_bibdata.rb
 - lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb
@@ -354,14 +348,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Metanorma for the ITU

data/.github/workflows/automerge.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-# source: https://github.com/marketplace/actions/merge-pull-requests#usage
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"