isodoc 1.2.1 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a0527fbc7f1b53775ff475d0306709ad4ffb42d5aa17ab1907124684d6a891
-  data.tar.gz: ea38f9755d51aef103ca9d63f496a5a12d89211be9e3bd0c48bb5a21409318ca
+  metadata.gz: dcbc3f4f71f739273b06483080ad077fcda05b20f8eca96858300543b0fb2784
+  data.tar.gz: f0c4a29519de6c22dbc47af2193d8f4ee0a2c925c5d0c9f58414813be28070ef
 SHA512:
-  metadata.gz: c54dd45f7dac502a8cb36dcf5cd6c6ec19b7accf8a03d12b7e393d5d284cbc6ed055c4f024a8b643b56fc3fe9c0344b007a491de98dfdc93eb28cc74f7079f35
-  data.tar.gz: c626b8d0a3f08e48d62a082d0f0a33037b06918d3b1d767a8777ec2da04c507a9e16d1ee79827c9911eb8d4242c449fa46cbe1c4fc4ac387fefa1f5a363303fd
+  metadata.gz: 5eb17f999c954a1185f60807f5c9b4dcdde33391fd95546d51dca4a00aee8d742736155313153a5007205d06d189c5ee69b39152db57478669e54e7622fde568
+  data.tar.gz: e0122186b16428b61c7009d7c8560ab12de531a8ec3bac56e58e89528f4a2a0acd2e1ab4ce4453919f7ed2707e7724037175852a3dc148a53bb0eef63aa5f695

data/isodoc.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "metanorma", "~> 1.1.0"
+  spec.add_dependency "relaton-cli"
 
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -1,6 +1,6 @@
 term_def_boilerplate: 
 scope: Domaine d'application
-symbolabbrev: Symboles et termes abrégés
+symbolsabbrev: Symboles et termes abrégés
 abbrev: Termes abrégés
 symbols: Symboles
 table_of_contents: Sommaire

data/lib/isodoc/base_style/all.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }

data/lib/isodoc/base_style/metanorma_word.css

@@ -16,6 +16,12 @@ td {
 tr {
   page-break-after: avoid; }
 
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
 span.stem {
   font-family: "Cambria Math",serif;
   mso-ascii-font-family: "Cambria Math";

data/lib/isodoc/base_style/metanorma_word.scss

@@ -13,6 +13,12 @@ table.MsoISOTable tr
 td { page-break-inside:avoid; }
 tr { page-break-after:avoid; }
 
+table.MsoISOTableBig tr
+    {page-break-inside:auto;}
+
+table.MsoISOTableBig td
+    {page-break-inside:auto;}
+
 span.stem
     {font-family:"Cambria Math",serif;
     mso-ascii-font-family:"Cambria Math";

data/lib/isodoc/base_style/reset.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }

data/lib/isodoc/base_style/reset.scss

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0;

data/lib/isodoc/convert.rb

@@ -6,7 +6,7 @@ require_relative "i18n"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    attr_reader :options
+    attr_accessor :options
     attr_accessor :i18n
 
     # htmlstylesheet: Generic stylesheet for HTML

data/lib/isodoc/function/blocks.rb

@@ -181,6 +181,7 @@ module IsoDoc::Function
     def quote_attribution(node, out)
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
+      return if author.nil? && source.nil?
       out.p **{ class: "QuoteAttribution" } do |p|
         p << "&mdash; #{author.text}" if author
         p << ", " if author && source

data/lib/isodoc/function/cleanup.rb

@@ -6,9 +6,9 @@ module IsoDoc::Function
 
     def termref_cleanup(docxml)
       docxml.
+        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
         gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source}: ")).
-        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[\/TERMREF\]\s*}, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
     end

data/lib/isodoc/function/references.rb

@@ -54,7 +54,8 @@ module IsoDoc::Function
     def bibitem_ref_code(b)
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(b)
-      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN']")) 
+      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+                    "@type = 'ISBN']")) 
       return [id, id1, id2] if id || id1 || id2
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
       id << "(NO ID)"
@@ -193,7 +194,8 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        clause_parse_title(node, div, node.at(ns("./title")), out, { class: "Section3" })
+        clause_parse_title(node, div, node.at(ns("./title")), out,
+                           { class: "Section3" })
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/section.rb

@@ -182,7 +182,6 @@ module IsoDoc::Function
       page_break(out)
       out.div **attr_code(id: f["id"]) do |s|
         clause_name(nil, f.at(ns("./title")), s, { class: "AbstractTitle" })
-        #s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << @i18n.abstract }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -201,6 +200,19 @@ module IsoDoc::Function
       end
     end
 
+    def is_clause?(name)
+      %w(clause references definitions terms foreword introduction abstract
+      acknowledgements).include? name
+    end
+
+    def preface_block(isoxml, out)
+      p = isoxml.at(ns("//preface")) or return
+      p.elements.each do |e|
+        next if is_clause?(e.name)
+        parse(e, out)
+      end
+    end
+
     def copyright_parse(node, out)
       out.div **{class: "boilerplate-copyright"} do |div|
         node.children.each { |n| parse(n, div) }

data/lib/isodoc/function/table.rb

@@ -82,6 +82,7 @@ module IsoDoc::Function
     def make_tr_attr(td, row, totalrows, header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       td["align"] and style += "text-align:#{td['align']};"
+      td["valign"] and style += "vertical-align:#{td['valign']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}

data/lib/isodoc/function/to_word_html.rb

@@ -80,6 +80,7 @@ module IsoDoc::Function
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3
@@ -103,6 +104,7 @@ module IsoDoc::Function
       @meta.version isoxml, out
       @meta.url isoxml, out
       @meta.keywords isoxml, out
+      @meta.note isoxml, out
       @meta.get
     end
 
@@ -220,6 +222,7 @@ module IsoDoc::Function
         when "feedback-statement" then feedback_parse(node, out)
         when "passthrough" then passthrough_parse(node, out)
         when "variant" then variant_parse(node, out)
+        when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
         else
           error_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -184,7 +184,7 @@ module IsoDoc::Function
 
     def labelled_ancestor(node)
       !node.ancestors('example, requirement, recommendation, permission, '\
-                             'table, figure, sourcecode').empty?
+                             'note, table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -31,6 +31,7 @@ module IsoDoc::HtmlFunction
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3

data/lib/isodoc/i18n.rb

@@ -1,6 +1,5 @@
 require "yaml"
 
-# TODO: Cleanup and generalize
 module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)
@@ -43,55 +42,6 @@ module IsoDoc
       @labels.each do |k, v|
         self.class.send(:define_method, k.downcase) { v }
       end
-=begin
-      @term_def_boilerplate = y["term_def_boilerplate"]
-      @scope_lbl = y["scope"]
-      @symbols_lbl = y["symbols"]
-      @table_of_contents_lbl = y["table_of_contents"]
-      @introduction_lbl = y["introduction"]
-      @foreword_lbl = y["foreword"]
-      @abstract_lbl = y["abstract"]
-      @termsdef_lbl = y["termsdef"]
-      @termsdefsymbols_lbl = y["termsdefsymbols"]
-      @normref_lbl = y["normref"]
-      @bibliography_lbl = y["bibliography"]
-      @clause_lbl = y["clause"]
-      @annex_lbl = y["annex"]
-      @appendix_lbl = y["appendix"]
-      @no_terms_boilerplate = y["no_terms_boilerplate"]
-      @internal_terms_boilerplate = y["internal_terms_boilerplate"]
-      @norm_with_refs_pref = y["norm_with_refs_pref"]
-      @norm_empty_pref = y["norm_empty_pref"]
-      @external_terms_boilerplate = y["external_terms_boilerplate"]
-      @internal_external_terms_boilerplate =
-        y["internal_external_terms_boilerplate"]
-      @note_lbl = y["note"]
-      @note_xref_lbl = y["note_xref"]
-      @termnote_lbl = y["termnote"]
-      @figure_lbl = y["figure"]
-      @list_lbl = y["list"]
-      @formula_lbl = y["formula"]
-      @inequality_lbl = y["inequality"]
-      @table_lbl = y["table"]
-      @key_lbl = y["key"]
-      @example_lbl = y["example"]
-      @example_xref_lbl = y["example_xref"]
-      @where_lbl = y["where"]
-      @wholeoftext_lbl = y["wholeoftext"]
-      @draft_lbl = y["draft_label"]
-      @inform_annex_lbl = y["inform_annex"]
-      @norm_annex_lbl = y["norm_annex"]
-      @modified_lbl = y["modified"]
-      @deprecated_lbl = y["deprecated"]
-      @source_lbl = y["source"]
-      @and_lbl = y["and"]
-      @all_parts_lbl = y["all_parts"]
-      @permission_lbl = y["permission"]
-      @recommendation_lbl = y["recommendation"]
-      @requirement_lbl = y["requirement"]
-      @locality = y["locality"]
-      @admonition = y["admonition"]
-=end
     end
 
     def self.l10n(x, lang = @lang, script = @script)
@@ -116,6 +66,14 @@ module IsoDoc
       end
     end
 
+    def multiple_and(names, andword)
+      return '' if names.empty?
+      return names[0] if names.length == 1
+      (names.length == 2) &&
+        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
+      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
+    end
+
     #module_function :l10n
 
   end

data/lib/isodoc/metadata.rb

@@ -4,11 +4,6 @@ require_relative './metadata_date'
 
 module IsoDoc
   class Metadata
-    DATETYPES = %w{published accessed created implemented obsoleted confirmed
-                   updated issued received transmitted copied unchanged
-                   circulated vote-started
-                   vote-ended}.freeze
-
     attr_accessor :fonts_options
 
     def ns(xpath)
@@ -98,8 +93,9 @@ module IsoDoc
 
     def doctype(isoxml, _out)
       b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
-      t = b.split(/[- ]/).map(&:capitalize).join(' ')
-      set(:doctype, t)
+      set(:doctype, status_print(b))
+      b = isoxml&.at(ns('//local_bibdata/ext/doctype'))&.text || return
+      set(:doctype_display, status_print(b))
     end
 
     def iso?(org)
@@ -109,7 +105,7 @@ module IsoDoc
        name == 'International Organization for Standardization')
     end
 
-    def agency(xml)
+    def agency1(xml)
       agency = ''
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
@@ -119,36 +115,48 @@ module IsoDoc
         publisher << name if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
+      [agency, publisher]
+    end
+
+    def agency(xml)
+      agency, publisher = agency1(xml)
       set(:agency, agency.sub(%r{/$}, ''))
-      set(:publisher, multiple_and(publisher, @labels['and']))
+      set(:publisher, @i18n.multiple_and(publisher, @labels['and']))
+      agency_addr(xml)
     end
 
-    def multiple_and(names, andword)
-      return '' if names.empty?
-      return names[0] if names.length == 1
-      (names.length == 2) &&
-        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
-      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
+    def agency_addr(xml)
+      a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/"\
+                    "organization")) or return
+      n = a.at(ns("./subdivision")) and set(:subdivision, n.text)
+      n = a.at(ns("./address/formattedAddress")) and
+        set(:pub_address, n.children.to_xml)
+      n = a.at(ns("./phone[not(@type = 'fax')]")) and set(:pub_phone, n.text)
+      n = a.at(ns("./phone[@type = 'fax']")) and set(:pub_fax, n.text)
+      n = a.at(ns("./email")) and set(:pub_email, n.text)
+      n = a.at(ns("./uri")) and set(:pub_uri, n.text)
     end
 
     def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns('//bibdata/status/stage'))
       set(:unpublished, true)
-      if docstatus
-        set(:stage, status_print(docstatus.text))
-        (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
-          set(:substage, i)
-        (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
-          set(:iteration, i)
-        set(:unpublished, unpublished(docstatus.text))
-        unpublished(docstatus.text) &&
-          set(:stageabbr, stage_abbr(docstatus.text))
-      end
+      return unless docstatus = isoxml.at(ns('//bibdata/status/stage'))
+      docstatus_local = isoxml.at(ns('//local_bibdata/status/stage'))
+      set(:stage, status_print(docstatus.text))
+      docstatus_local and
+        set(:stage_display, status_print(docstatus_local.text))
+      (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
+        set(:substage, i)
+      (i = isoxml&.at(ns('//local_bibdata/status/substage'))&.text) &&
+        set(:substage_display, i)
+      (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
+        set(:iteration, i)
+      set(:unpublished, unpublished(docstatus.text))
+      unpublished(docstatus.text) &&
+        set(:stageabbr, stage_abbr(docstatus.text))
     end
 
     def stage_abbr(docstatus)
-      status_print(docstatus).split(/ /)
-                             .map { |s| s[0].upcase }.join('')
+      status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join('')
     end
 
     def unpublished(status)
@@ -156,7 +164,7 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/-/).map(&:capitalize).join(' ')
+      status.split(/[- ]/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)
@@ -170,12 +178,10 @@ module IsoDoc
     end
 
     def draftinfo(draft, revdate)
-      draftinfo = ''
-      if draft
-        draftinfo = " (#{@labels['draft_label']} #{draft}"
-        draftinfo += ", #{revdate}" if revdate
-        draftinfo += ')'
-      end
+      return "" unless draft
+      draftinfo = " (#{@labels['draft_label']} #{draft}"
+      draftinfo += ", #{revdate}" if revdate
+      draftinfo += ')'
       l10n(draftinfo, @lang, @script)
     end
 
@@ -231,5 +237,13 @@ module IsoDoc
       isoxml.xpath(ns('//bibdata/keyword')).each { |kw| ret << kw.text }
       set(:keywords, ret)
     end
+
+    def note(isoxml, _out)
+      ret = []
+      isoxml.xpath(ns("//bibdata/note[@type = 'title-footnote']")).each do |n|
+        ret << n.text
+      end
+      set(:title_footnote, ret)
+    end
   end
 end

data/lib/isodoc/metadata_date.rb

@@ -1,5 +1,10 @@
 module IsoDoc
   class Metadata
+    DATETYPES = %w{published accessed created implemented obsoleted confirmed
+                   updated issued received transmitted copied unchanged
+                   circulated vote-started
+                   vote-ended}.freeze
+
     def months
     {
         "01": @labels["month_january"],

data/lib/isodoc/presentation_function/bibdata.rb

@@ -0,0 +1,24 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def bibdata(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      b = a.dup
+      b.name = "local_bibdata"
+      bibdata_i18n(b)
+      a.next = b
+    end
+
+    def bibdata_i18n(b)
+      hash_translate(b, @i18n.get["doctype_dict"], "./ext/doctype")
+      hash_translate(b, @i18n.get["stage_dict"], "./status/stage")
+      hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
+    end
+
+    def hash_translate(bibdata, hash, xpath)
+      hash.is_a? Hash or return
+      x = bibdata.at(ns(xpath)) or return
+      hash[x.text] or return
+      x.children = hash[x.text]
+    end
+  end
+end