metanorma-itu 2.2.15 → 2.3.0

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -3,6 +3,7 @@ require "roman-numerals"
 require "isodoc"
 require_relative "../../relaton/render/general"
 require_relative "presentation_bibdata"
+require_relative "presentation_preface"
 
 module IsoDoc
   module ITU
@@ -17,60 +18,6 @@ module IsoDoc
         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
@@ -139,7 +86,7 @@ module IsoDoc
 
         t = elem.at(ns("./title")) and t["depth"] = "1"
         lbl = @xrefs.anchor(elem["id"], :label, false) or return
-        elem.elements.first.previous =
+        elem.previous =
           "<p keep-with-next='true' class='supertitle'>" \
           "#{@i18n.get['section'].upcase} #{lbl}</p>"
       end
@@ -184,7 +131,7 @@ module IsoDoc
         !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
         ret += datefn
         ret.empty? and return ret
-        ret.gsub(/-/, "&#x2011;").gsub(/ /, "&#xa0;")
+        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
       end
 
       def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
@@ -192,7 +139,7 @@ module IsoDoc
         !idents[:metanorma] && idents[:sdo] and ret = "[#{ret}]"
         ret += datefn
         ret.empty? and return ret
-        ret.gsub(/-/, "&#x2011;").gsub(/ /, "&#xa0;")
+        ret.gsub("-", "&#x2011;").gsub(/ /, "&#xa0;")
       end
 
       def toc_title(docxml)
@@ -201,6 +148,64 @@ module IsoDoc
         super
       end
 
+      def middle_title(isoxml)
+        s = isoxml.at(ns("//sections")) or return
+        titfn = isoxml.at(ns("//note[@type = 'title-footnote']"))
+        if @meta.get[:doctype] == "Resolution"
+          middle_title_resolution(isoxml, s.children.first)
+        else
+          middle_title_recommendation(isoxml, s.children.first)
+        end
+        titfn and renumber_footnotes(isoxml)
+      end
+
+      def renumber_footnotes(isoxml)
+        (isoxml.xpath(ns("//fn")) - isoxml.xpath(ns("//table//fn | //figure//fn")))
+          .each_with_index do |fn, i|
+            fn["reference"] = (i + 1).to_s
+          end
+      end
+
+      def middle_title_resolution(isoxml, out)
+        res = isoxml.at(ns("//bibdata/title[@type = 'resolution']"))
+        out.previous =
+          "<p class='zzSTDTitle1' align='center'>#{res.children.to_xml}</p>"
+        t = @meta.get[:doctitle] and
+          out.previous = "<p class='zzSTDTitle2'>#{t}</p>"
+        middle_title_resolution_subtitle(isoxml, out)
+      end
+
+      def middle_title_resolution_subtitle(isoxml, out)
+        ret = "<p align='center' class='zzSTDTitle2'><em>("
+        d = isoxml.at(ns("//bibdata/title[@type = 'resolution-placedate']"))
+        ret += "#{d.children.to_xml.strip}</em>)"
+        ret += "#{title_footnotes(isoxml)}</p>"
+        out.previous = ret
+      end
+
+      def middle_title_recommendation(isoxml, out)
+        ret = ""
+        type = @meta.get[:doctype]
+        @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
+          type = @meta.get[:draft_new_doctype]
+        id = @meta.get[:docnumber] and
+          ret += "<<p class='zzSTDTitle1'>#{type} #{id}</p>"
+        t = @meta.get[:doctitle] and
+          ret += "<p class='zzSTDTitle2'>#{t}"
+        ret += "#{title_footnotes(isoxml)}</p>"
+        s = @meta.get[:docsubtitle] and ret += "<p class='zzSTDTitle3'>#{s}</p>"
+        out.previous = ret
+      end
+
+      def title_footnotes(isoxml)
+        ret = ""
+        isoxml.xpath(ns("//note[@type = 'title-footnote']"))
+          .each_with_index do |f, i|
+          ret += "<fn reference='H#{i}'>#{f.remove.children.to_xml}</fn>"
+        end
+        ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -21,38 +21,11 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div class: "WordSection2" do |div2|
-          info docxml, div2
-          boilerplate docxml, div2
-          front docxml, div2
-          div2.p { |p| p << "&#xa0;" } # placeholder
-        end
-        section_break(body)
-      end
-
-      def front(isoxml, out)
-        if !isoxml.at(ns("//preface/abstract"))
-          keywords(isoxml, out)
-        end
-        super # do keyword with abstract
-      end
-
       def abstract(clause, out)
         out.div **attr_code(id: clause["id"], class: "Abstract") do |s|
           clause_name(clause, "Summary", s, class: "AbstractTitle")
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
-        keywords(nil, out)
-      end
-
-      def keywords(_docxml, out)
-        kw = @meta.get[:keywords]
-        kw.nil? || kw.empty? and return
-        out.div **attr_code(class: "Keyword") do |div|
-          clause_name(nil, "Keywords", div, class: "IntroTitle")
-          div.p "#{kw.join(', ')}."
-        end
       end
 
       def formula_parse1(node, out)

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.3 -->
 <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>

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "2.2.15".freeze
+    VERSION = "2.3.0".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.0"
   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.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !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