metanorma-itu 2.4.7 → 2.4.8

data/lib/isodoc/itu/metadata.rb

@@ -1,4 +1,5 @@
 require "twitter_cldr"
+require_relative "metadata_date"
 
 module IsoDoc
   module ITU
@@ -35,20 +36,20 @@ module IsoDoc
           slogantitle: "//bibdata/title[@type='slogan']",
           positiontitle: "//bibdata/title[@type='position-sp']" }.freeze
 
-      def title(isoxml, _out)
+      def title(xml, _out)
         TITLE_XPATHS.each do |k, v|
-          titleset(isoxml, k, v.sub("@_lang", @lang))
+          titleset(xml, k, v.sub("@_lang", @lang))
         end
-        titleset(isoxml, :doctitle_en,
+        titleset(xml, :doctitle_en,
                  "//bibdata/title[@language='en'][@type = 'main']") or
-          titleset(isoxml, :doctitle_en,
+          titleset(xml, :doctitle_en,
                    "//bibdata/title[@language='#{@lang}'][@type = 'main']")
       end
 
-      def titleset(isoxml, key, xpath)
-        value = isoxml.at(ns(xpath)) or return
-        out = @isodoc.noko do |xml|
-          xml.span do |s|
+      def titleset(xml, key, xpath)
+        value = xml.at(ns(xpath)) or return
+        out = @isodoc.noko do |x|
+          x.span do |s|
             value.children.each { |c| @isodoc.parse(c, s) }
           end
         end.join
@@ -56,7 +57,7 @@ module IsoDoc
         true
       end
 
-      def subtitle(_isoxml, _out)
+      def subtitle(_xml, _out)
         nil
       end
 
@@ -101,12 +102,11 @@ module IsoDoc
         @metadata[key] << value
       end
 
-      PERSON_ATTRS = { affiliations: "./affiliation/organization/name",
-                       addresses: "./affiliation/organization/address/" \
-                                     "formattedAddress",
-                       emails: "./email",
-                       faxes: "./phone[@type = 'fax']",
-                       phones: "./phone[not(@type = 'fax')]" }.freeze
+      PERSON_ATTRS =
+        { affiliations: "./affiliation/organization/name",
+          addresses: "./affiliation/organization/address/formattedAddress",
+          emails: "./email", faxes: "./phone[@type = 'fax']",
+          phones: "./phone[not(@type = 'fax')]" }.freeze
 
       def person_attributes(authors)
         PERSON_ATTRS.each_key { |k| set(k, []) }
@@ -117,21 +117,21 @@ module IsoDoc
         end
       end
 
-      def docid(isoxml, _out)
+      def docid(xml, _out)
         { docnumber: "ITU", recommendationnumber: "ITU-Recommendation",
           docnumber_lang: "ITU-lang", docnumber_td: "ITU-TemporaryDocument",
           docnumber_provisional: "ITU-provisional" }
           .each do |k, v|
-            dn = isoxml.at(ns("//bibdata/docidentifier[@type = '#{v}']")) and
+            dn = xml.at(ns("//bibdata/docidentifier[@type = '#{v}']")) and
               set(k, dn.text)
           end
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
-        oblig = isoxml.at(ns("//annex/@obligation"))&.text
+        dn = xml.at(ns("//bibdata/ext/structuredidentifier/annexid"))
+        oblig = xml.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
         dn and set(:annexid, @i18n.l10n("#{lbl} #{dn.text}"))
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
+        dn = xml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
           set(:amendmentid, @i18n.l10n("#{@labels['amendment']} #{dn.text}"))
-        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
+        dn = xml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
           set(:corrigendumid,
               @i18n.l10n("#{@labels['corrigendum']} #{dn.text}"))
       end
@@ -140,36 +140,27 @@ module IsoDoc
         %w(in-force-prepublished draft).include? status.downcase
       end
 
-      def bibdate(isoxml, _out)
-        pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
-        pubdate and set(:pubdate_monthyear, monthyr(pubdate.text))
-        pubdate = isoxml.at(ns("//bibdata/date[@format = 'ddMMMyyyy'][@type = 'published']"))
-        pubdate and set(:pubdate_ddMMMyyyy, monthyr(pubdate.text))
-        pubdate = isoxml.at(ns("//bibdata/date[not(@format)][@type = 'published']")) ||
-          isoxml.at(ns("//bibdata/copyright/from"))
-        pubdate and
-          set(:placedate_year,
-              @labels["placedate"]
-          .sub("%", pubdate.text.sub(/^(\d\d\d\d).*$/, "\\1")))
+      def bibdate(xml, _out)
+        d = xml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
+        d and set(:pubdate_monthyear, monthyr(d.text))
+        d = xml.at(ns("//bibdata/date[@format = 'ddMMMyyyy'][@type = 'published']"))
+        d and set(:pubdate_ddMMMyyyy, monthyr(d.text))
+        d = xml.at(ns("//bibdata/date[not(@format)][@type = 'published']")) ||
+          xml.at(ns("//bibdata/copyright/from"))
+        d and set(:placedate_year, @labels["placedate"]
+                    .sub("%", d.text.sub(/^(\d\d\d\d).*$/, "\\1")))
       end
 
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-
-        "#{m[:mo]}/#{m[:yr]}"
-      end
-
-      def keywords(isoxml, _out)
+      def keywords(xml, _out)
         super
         set(:keywords, get[:keywords].sort)
-        q = isoxml.xpath(ns("//bibdata/ext/question/identifier"))
+        q = xml.xpath(ns("//bibdata/ext/question/identifier"))
         q.empty? or set(:questions,
                         q.map { |x| x.text.sub(/^Q/, "") }.join(", "))
       end
 
-      def doctype(isoxml, _out)
-        d = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
+      def doctype(xml, _out)
+        d = xml&.at(ns("//bibdata/ext/doctype"))&.text
         set(:doctype_original, d)
         set(:doctype_abbreviated, @labels.dig("doctype_abbrev", d))
         if d == "recommendation-annex"
@@ -181,69 +172,40 @@ module IsoDoc
           set(:draft_new_doctype, @labels["draft_new"].sub("%", d))
       end
 
-      def ip_notice_received(isoxml, _out)
-        received = isoxml.at(ns("//bibdata/ext/ip-notice-received"))&.text ||
+      def ip_notice_received(xml, _out)
+        received = xml.at(ns("//bibdata/ext/ip-notice-received"))&.text ||
           "false"
         set(:ip_notice_received, received)
       end
 
-      def ddMMMYYYY(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo] && m[:dd]
-
-        mmm = DateTime.parse(isodate).localize(@lang.to_sym)
-          .to_additional_s("yMMM")
-        @i18n.l10n("#{m[:dd]} #{mmm}")
-      end
-
-      def ddMMMMYYYY(date1, date2)
-        m1 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date1
-        m2 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date2
-        if m1 && m1[:yr] && m1[:mo] && m1[:dd]
-          dd1 = m1[:dd].sub(/^0/, "")
-          if m2 && m2[:yr] && m2[:mo] && m2[:dd]
-            dd2 = m2[:dd].sub(/^0/, "")
-            if m1[:yr] == m2[:yr]
-              if m1[:mo] == m2[:mo]
-                @i18n.l10n("#{dd1}&#x2013;#{dd2} #{months[m1[:mo].to_sym]} #{m1[:yr]}")
-              else
-                @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} &#x2013; " \
-                           "#{dd2} #{months[m2[:mo].to_sym]} #{m1[:yr]}")
-              end
-            else
-              @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]} &#x2013; " \
-                         "#{dd2} #{months[m2[:mo].to_sym]} #{m2[:yr]}")
-            end
-          else
-            date2.nil? ? @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]}") : "#{date1}/#{date2}"
-          end
-        else
-          date2.nil? ? date1 : "#{date1}/#{date2}"
-        end
+      def contribution(xml, _out)
+        a = xml.at(ns("//bibdata/ext/timing")) and set(:timing, a.text)
+        a = xml.at(ns("//bibdata/ext/recommendationstatus/approvalstage/@process")) and
+          set(:approval_process, a.text)
       end
 
-      def techreport(isoxml, _out)
-        if a = isoxml.at(ns("//bibdata/ext/meeting"))&.text
+      def techreport(xml, _out)
+        if a = xml.at(ns("//bibdata/ext/meeting"))&.text
           set(:meeting, a)
           set(:meeting_acronym, a)
         end
-        a = isoxml.at(ns("//bibdata/ext/meeting/@acronym"))&.text and
+        a = xml.at(ns("//bibdata/ext/meeting/@acronym"))&.text and
           set(:meeting_acronym, a)
-        a = isoxml.at(ns("//bibdata/ext/meeting-place"))&.text and
+        a = xml.at(ns("//bibdata/ext/meeting-place"))&.text and
           set(:meeting_place, a)
-        a = isoxml.at(ns("//bibdata/ext/intended-type"))&.text and
+        a = xml.at(ns("//bibdata/ext/intended-type"))&.text and
           set(:intended_type, a)
-        a = isoxml.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
-        meeting(isoxml)
+        a = xml.at(ns("//bibdata/ext/source"))&.text and set(:source, a)
+        meeting(xml)
       end
 
-      def meeting(isoxml)
+      def meeting(xml)
         resolution =
-          isoxml.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
-        if o = isoxml.at(ns("//bibdata/ext/meeting-date/on"))&.text
+          xml.at(ns("//bibdata/ext/doctype"))&.text == "resolution"
+        if o = xml.at(ns("//bibdata/ext/meeting-date/on"))&.text
           set(:meeting_date, resolution ? ddMMMMYYYY(o, nil) : ddMMMYYYY(o))
-        elsif f = isoxml.at(ns("//bibdata/ext/meeting-date/from"))&.text
-          t = isoxml.at(ns("//bibdata/ext/meeting-date/to"))&.text
+        elsif f = xml.at(ns("//bibdata/ext/meeting-date/from"))&.text
+          t = xml.at(ns("//bibdata/ext/meeting-date/to"))&.text
           set(:meeting_date,
               resolution ? ddMMMMYYYY(f, t) : "#{ddMMMYYYY(f)}/#{ddMMMYYYY(t)}")
         end

data/lib/isodoc/itu/metadata_date.rb

@@ -0,0 +1,45 @@
+module IsoDoc
+  module ITU
+    class Metadata < IsoDoc::Metadata
+      def monthyr(isodate)
+        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
+        m && m[:yr] && m[:mo] or return isodate
+        "#{m[:mo]}/#{m[:yr]}"
+      end
+
+      def ddMMMYYYY(isodate)
+        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match isodate
+        m && m[:yr] && m[:mo] && m[:dd] or return isodate
+        mmm = DateTime.parse(isodate).localize(@lang.to_sym)
+          .to_additional_s("yMMM")
+        @i18n.l10n("#{m[:dd]} #{mmm}")
+      end
+
+      def ddMMMMYYYY(date1, date2)
+        m1 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date1
+        m2 = /(?<yr>\d\d\d\d)-(?<mo>\d\d)-(?<dd>\d\d)/.match date2
+        if m1 && m1[:yr] && m1[:mo] && m1[:dd]
+          dd1 = m1[:dd].sub(/^0/, "")
+          if m2 && m2[:yr] && m2[:mo] && m2[:dd]
+            dd2 = m2[:dd].sub(/^0/, "")
+            if m1[:yr] == m2[:yr]
+              if m1[:mo] == m2[:mo]
+                @i18n.l10n("#{dd1}&#x2013;#{dd2} #{months[m1[:mo].to_sym]} #{m1[:yr]}")
+              else
+                @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} &#x2013; " \
+                           "#{dd2} #{months[m2[:mo].to_sym]} #{m1[:yr]}")
+              end
+            else
+              @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]} &#x2013; " \
+                         "#{dd2} #{months[m2[:mo].to_sym]} #{m2[:yr]}")
+            end
+          else
+            date2.nil? ? @i18n.l10n("#{dd1} #{months[m1[:mo].to_sym]} #{m1[:yr]}") : "#{date1}/#{date2}"
+          end
+        else
+          date2.nil? ? date1 : "#{date1}/#{date2}"
+        end
+      end
+    end
+  end
+end

data/lib/isodoc/itu/presentation_contribution.rb

@@ -0,0 +1,153 @@
+module IsoDoc
+  module ITU
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def contribution_table_insert_pt(docxml)
+        docxml.at(ns("//preface")) || docxml.at(ns("//sections"))
+          .add_previous_sibling("<preface> </preface>").first
+        docxml.at(ns("//preface")).children.first.before(" ").previous
+      end
+
+      def contribution_table(_doc)
+        @doctype == "contribution" or return
+        bureau = bold_and_upcase(@meta.get[:bureau_full])
+        <<~TABLE
+          <clause unnumbered="true" type="contribution-metadata">
+          <table class="contribution-metadata" unnumbered="true" width="100%">
+          <colgroup><col width="11.8%"/><col width="41.2%"/><col width="47.0%"/></colgroup>
+          <thead>
+          <tr><th rowspan="3"><image height="56" width="56" src="#{@meta.get[:logo_small]}"/></th>
+          <td rowspan="3"><p style="font-size:8pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.international_telecommunication_union.upcase}</p>
+          <p class="bureau_big" style="font-size:13pt;margin-top:6pt;margin-bottom:0pt;">#{bureau}</p>
+          <p style="font-size:10pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.studyperiod.sub('%', @meta.get[:study_group_period]).upcase}</p></th>
+          <th align="right"><p style="font-size:16pt;">#{@meta.get[:docnumber]}</p></th></tr>
+          <tr><th align="right"><p  style="font-size:14pt;">#{@meta.get[:group].upcase}</p></th></tr>
+          <tr>
+          <th align="right"><p style="font-size:14pt;">#{@i18n.l10n("#{@i18n.original}: #{@i18n.current_language}")}</p></th>
+          </tr></thead>
+          <tbody>
+          <tr><th align="left" width="95">#{colon_i18n(@i18n.questions)}</th><td>#{@meta.get[:questions]}</td>
+          <td align="right">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td></tr>
+          <tr><th align="center" colspan="3">#{@i18n.get['doctype_dict']['contribution'].upcase}</th></tr>
+          <tr><th align="left" width="95">#{colon_i18n(@i18n.document_source)}</th><td colspan="2">#{@meta.get[:source]}</td></tr>
+          <tr><th align="left" width="95">#{colon_i18n(@i18n.title)}</th><td colspan="2">#{@meta.get[:doctitle_en]}</td></tr>
+          #{contribution_table_contacts}
+          </tbody></table>
+          </clause>
+        TABLE
+      end
+
+      def colon_i18n(text)
+        @i18n.l10n("#{text}:")
+      end
+
+      def bold_and_upcase(xml)
+        x = Nokogiri::XML("<root>#{xml}</root>")
+        x.traverse do |e|
+          e.text? or next
+          e.replace("<strong>#{e.text.upcase}</strong>")
+        end
+        x.root.children.to_xml
+      end
+
+      def contribution_table_contacts
+        n = (0..@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
+          ret << contribution_table_contact(i)
+        end
+        n.map do |x|
+          lbl = colon_i18n(@i18n.contact)
+          "<tr><th align='left' width='95'>#{lbl}</th>#{x}</tr>"
+        end.join("\n")
+      end
+
+      def contribution_table_contact(idx)
+        @meta.get[:emails][idx] and
+          e = "<br/>#{@i18n.email}<tab/>#{@meta.get[:emails][idx]}"
+        <<~CELL
+          <td>#{@meta.get[:authors][idx]}<br/>
+          #{@meta.get[:affiliations][idx]}<br/>
+          #{@meta.get[:addresses][idx]}</td>
+          <td>#{@i18n.tel_abbrev}<tab/>#{@meta.get[:phones][idx]}#{e}</td>
+        CELL
+      end
+
+      def extract_clause_data(clause, type)
+        x = clause.at(ns("./clause[@type = '#{type}']")) or return
+        ret = x.dup
+        ret.at(ns("./title"))&.remove
+        ret.children.to_xml
+      end
+
+      def contribution_justification_contact(idx)
+        @meta.get[:emails][idx] and
+          e = ", #{@i18n.email}<tab/>#{@meta.get[:emails][idx]}"
+        <<~CELL
+          #{@meta.get[:authors][idx]}<br/>
+          #{@meta.get[:affiliations][idx]}<br/>
+          #{@meta.get[:addresses][idx]}#{e}
+        CELL
+      end
+
+      def contrib_justification_contacts
+        (0..@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
+          ret << contribution_justification_contact(i)
+        end
+      end
+
+      def contribution_justification_title(_doc)
+        n = @meta.get[:docnumber]
+        if @meta.get[:subdoctype] == "recommendation"
+          "A.1 justification for proposed draft new Recommendation #{n}"
+        else
+          s = @meta.get[:subdoctype]
+          "A.13 justification for proposed draft new #{s} "\
+            "#{n} “#{@meta.get[:doctitle_en]}”"
+        end
+      end
+
+      def contribution_justification_auths
+        auths = contrib_justification_contacts
+        auths_tail = auths[1..auths.size].map do |x|
+          "<tr><td colspan='2'>#{x}</td></td>"
+        end.join("\n")
+        [auths, auths_tail]
+      end
+
+      def contribution_justification(doc)
+        @doctype == "contribution" or return
+        annex = doc.at(ns("//annex[@type = 'justification']")) or return
+        auths, auths_tail = contribution_justification_auths
+        annex.children = <<~TABLE
+          <title>#{contribution_justification_title(doc)}</title>
+          <table class="contribution-metadata" unnumbered="true" width="100%">
+            <colgroup><col width="15.9%"/><col width="6.1%"/><col width="45.5%"/><col width="17.4%"/><col width="15.1%"/></colgroup>
+            <tbody>
+            <tr>
+            <th align="left">#{colon_i18n(@i18n.questions)}</th><td>#{@meta.get[:questions]}</td>
+            <th align="left">Proposed new ITU-T #{@meta.get[:subdoctype]}</th>
+            <td colspan="2">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td>
+            </tr>
+            <tr><th align="left">Reference and title:</th>
+            <td colspan="4">Draft new #{@meta.get[:subdoctype]} on “#{@meta.get[:doctitle_en]}”</td>
+            </tr>
+            <tr>
+            <th align="left">Base text:</th><td colspan="2">#{extract_clause_data(annex, 'basetext')}</td>
+            <th align="left">Timing:</th><td>#{@meta.get[:timing]}</td>
+            </tr>
+            <tr><th align="left" rowspan="#{auths.size - 1}">Editor(s):</th>
+            <td colspan="2">#{auths[0]}</td>
+            <th align="left" rowspan="#{auths.size - 1}">Approval process:</th>
+            <td rowspan="#{auths.size - 1}">#{@meta.get[:approval_process]}</td>
+            </tr>
+            #{auths_tail}
+            <tr><td colspan="5"><p><strong>Scope</strong> (defines the intent or object of the Recommendation and the aspects covered, thereby indicating the limits of its applicability):</p>#{extract_clause_data(annex, 'scope')}</td></tr>
+            <tr><td colspan="5"><p><strong>Summary</strong> (provides a brief overview of the purpose and contents of the Recommendation, thus permitting readers to judge its usefulness for their work):</p>#{extract_clause_data(annex, 'summary')}</td></tr>
+            <tr><td colspan="5"><p><strong>Relations to ITU-T Recommendations or to other standards</strong> (approved or under development):</p>#{extract_clause_data(annex, 'relatedstandards')}</td></tr>
+            <tr><td colspan="5"><p><strong>Liaisons with other study groups or with other standards bodies:</strong></p>#{extract_clause_data(annex, 'liaisons')}</td></tr>
+            <tr><td colspan="5"><p><strong>Supporting members that are committing to contributing actively to the work item:</strong></p>#{extract_clause_data(annex, 'supportingmembers')}</td></tr>
+            </tbody>
+          </table>
+        TABLE
+      end
+    end
+  end
+end

data/lib/isodoc/itu/presentation_preface.rb

@@ -3,6 +3,7 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def insert_preface_sections(docxml)
         if @doctype == "contribution"
+          contribution_justification(docxml)
           x = contribution_table(docxml) and
             contribution_table_insert_pt(docxml).next = x
         else
@@ -18,74 +19,6 @@ module IsoDoc
         docxml.at(ns("//preface")).children[-1]
       end
 
-      def contribution_table_insert_pt(docxml)
-        docxml.at(ns("//preface")) || docxml.at(ns("//sections"))
-          .add_previous_sibling("<preface> </preface>").first
-        docxml.at(ns("//preface")).children.first.before(" ").previous
-      end
-
-      def contribution_table(_doc)
-        @doctype == "contribution" or return
-        bureau = bold_and_upcase(@meta.get[:bureau_full])
-        <<~TABLE
-          <clause unnumbered="true" type="contribution-metadata">
-          <table class="contribution-metadata" unnumbered="true" width="100%">
-          <colgroup><col width="11.8%"/><col width="41.2%"/><col width="47.0%"/></colgroup>
-          <thead>
-          <tr><th rowspan="3"><image height="56" width="56" src="#{@meta.get[:logo_small]}"/></th>
-          <td rowspan="3"><p style="font-size:8pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.international_telecommunication_union.upcase}</p>
-          <p class="bureau_big" style="font-size:13pt;margin-top:6pt;margin-bottom:0pt;">#{bureau}</p>
-          <p style="font-size:10pt;margin-top:6pt;margin-bottom:0pt;">#{@i18n.studyperiod.sub('%', @meta.get[:study_group_period]).upcase}</p></th>
-          <th align="right"><p style="font-size:16pt;">#{@meta.get[:docnumber]}</p></th></tr>
-          <tr><th align="right"><p  style="font-size:14pt;">#{@meta.get[:group].upcase}</p></th></tr>
-          <tr>
-          <th align="right"><p style="font-size:14pt;">#{@i18n.l10n("#{@i18n.original}: #{@i18n.current_language}")}</p></th>
-          </tr></thead>
-          <tbody>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.questions)}</th><td>#{@meta.get[:questions]}</td>
-          <td align="right">#{@i18n.l10n("#{@meta.get[:meeting_place]}, #{@meta.get[:meeting_date]}")}</td></tr>
-          <tr><th align="center" colspan="3">#{@i18n.get['doctype_dict']['contribution'].upcase}</th></tr>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.document_source)}</th><td colspan="2">#{@meta.get[:source]}</td></tr>
-          <tr><th align="left" width="95">#{colon_i18n(@i18n.title)}</th><td colspan="2">#{@meta.get[:doctitle_en]}</td></tr>
-          #{contribution_table_contacts}
-          </tbody></table>
-          </clause>
-        TABLE
-      end
-
-      def colon_i18n(text)
-        @i18n.l10n("#{text}:")
-      end
-
-      def bold_and_upcase(xml)
-        x = Nokogiri::XML("<root>#{xml}</root>")
-        x.traverse do |e|
-          e.text? or next
-          e.replace("<strong>#{e.text.upcase}</strong>")
-        end
-        x.root.children.to_xml
-      end
-
-      def contribution_table_contacts
-        n = (0..@meta.get[:authors]&.size).each_with_object([]) do |i, ret|
-          ret << contribution_table_contact(i)
-        end
-        n.map do |x|
-          lbl = colon_i18n(@i18n.contact)
-          "<tr><th align='left' width='95'>#{lbl}</th>#{x}</tr>"
-        end.join("\n")
-      end
-
-      def contribution_table_contact(idx)
-        <<~CELL
-          <td>#{@meta.get[:authors][idx]}<br/>
-          #{@meta.get[:affiliations][idx]}<br/>
-          #{@meta.get[:addresses][idx]}</td>
-          <td>#{@i18n.tel_abbrev}<tab/>#{@meta.get[:phones][idx]}<br/>
-          #{@i18n.email}<tab/>#{@meta.get[:emails][idx]}</td>
-        CELL
-      end
-
       def insert_editors_clause(doc)
         ret = extract_editors(doc) or return
         eds = ret[:names].each_with_object([]).with_index do |(_x, acc), i|
@@ -140,15 +73,16 @@ module IsoDoc
 
       def keywords_abstract_swap(abstract, keywords, docxml)
         @doctype == "contribution" and return
-        keywords or return
-        if abstract then abstract.next = keywords
+        k = keywords or return
+        if abstract then abstract.next = k
         else
           p = contribution_table_insert_pt(docxml)
-          p.next = keywords
+          p.next = k
         end
       end
 
       def abstract_render(abstract)
+        abstract or return
         @doctype == "contribution" or return
         abstract.at(ns("./title"))&.remove
         abstract.children = <<~TABLE

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -5,6 +5,7 @@ require_relative "../../relaton/render/general"
 require_relative "presentation_bibdata"
 require_relative "presentation_preface"
 require_relative "presentation_ref"
+require_relative "presentation_contribution"
 
 module Nokogiri
   module XML
@@ -127,12 +128,6 @@ module IsoDoc
         type
       end
 
-      def info(isoxml, out)
-        @meta.ip_notice_received isoxml, out
-        @meta.techreport isoxml, out
-        super
-      end
-
       def middle_title(isoxml)
         s = isoxml.at(ns("//sections")) or return
         titfn = isoxml.at(ns("//note[@type = 'title-footnote']"))