isodoc 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f76ecc765fd3176ab1e46bd2b91b2a1d5746554772047b7137581ecc54a1ab9
-  data.tar.gz: b98fe5eee6522b4d5992c4213f3180e1c95f92f358b0c56ff3a2b5f66973a900
+  metadata.gz: dcbc3f4f71f739273b06483080ad077fcda05b20f8eca96858300543b0fb2784
+  data.tar.gz: f0c4a29519de6c22dbc47af2193d8f4ee0a2c925c5d0c9f58414813be28070ef
 SHA512:
-  metadata.gz: 1a2649fdf7365e2554c0e0bdec19aa0cf6e50fad624d4252dd99aa88d436b95b1ff24e823c6a0a9be4afa7e875921b11310e67595b308a9c81c8758b6e8cf302
-  data.tar.gz: d21cdae8851e757e999a54809868e15a8004fcc387afa78e79e60a4605df07108c454fc3c04e0a3e79f3a5c14af9ca8cdbbb855eca9fa47e254e3ff4a40d3ac4
+  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/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/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/function/to_word_html.rb

@@ -104,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
 

data/lib/isodoc/i18n.rb

@@ -42,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)
@@ -115,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)
@@ -110,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']/"\
@@ -120,41 +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
-        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
+      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)
@@ -176,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
 
@@ -237,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/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.5".freeze
+  VERSION = "1.2.6".freeze
 end

data/lib/isodoc/xslfo_convert.rb

@@ -23,6 +23,10 @@ module IsoDoc
       nil
     end
 
+    def pdf_options(docxml)
+      ""
+    end
+
     def convert(input_filename, file = nil, debug = false, output_filename = nil)
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       docxml, filename, dir = convert_init(file, input_filename, debug)
@@ -34,7 +38,8 @@ module IsoDoc
       FileUtils.rm_rf dir
       ::Metanorma::Output::XslfoPdf.new.convert(input_filename,
                                                 output_filename || "#{filename}.#{@suffix}", 
-                                               File.join(@libdir, pdf_stylesheet(docxml)))
+                                               File.join(@libdir, pdf_stylesheet(docxml)),
+                                               pdf_options(docxml))
     end
 
     def xref_parse(node, out)

data/spec/isodoc/metadata_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc do
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title>The Incredible Mr Ripley</title>
@@ -73,6 +73,9 @@ RSpec.describe IsoDoc do
       </name>
     </person>
   </contributor>
+  <note type="title-footnote"><p>A footnote</p></note>
+  <note type="iso"><p>A note</p></note>
+  <note type="title-footnote"><p>Another footnote</p></note>
   <language>en</language>
   <script>Latn</script>
   <status>
@@ -125,13 +128,13 @@ INPUT
 :obsoleteddate=>"2014",
 :pdf=>"URL D",
 :publisheddate=>"2011",
-:publisher=>"",
 :receiveddate=>"XXX",
 :revdate=>"2016-05-01",
 :revdate_monthyear=>"May 2016",
 :stage=>"Committee Draft",
 :stageabbr=>"CD",
 :substage=>"Withdrawn",
+:title_footnote=>["A footnote", "Another footnote"],
 :transmitteddate=>"2020",
 :unchangeddate=>"2019",
 :unpublished=>true,
@@ -148,7 +151,7 @@ OUTPUT
     arr = c.convert_init(<<~"INPUT", "test", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
@@ -169,7 +172,15 @@ OUTPUT
     <role type="publisher"/>
     <organization>
       <name>International Organization for Standardization</name>
+      <subdivision>Subdivision</subdivision>
       <abbreviation>ISO</abbreviation>
+      <address>
+  <formattedAddress>1 Infinity Loop + California</formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
      </organization>
   </contributor>
   <contributor>
@@ -215,8 +226,6 @@ OUTPUT
 INPUT
 {:accesseddate=>"XXX",
 :agency=>"ISO/IEC/IEEE",
-:authors=>[],
-:authors_affiliations=>{},
 :circulateddate=>"XXX",
 :confirmeddate=>"XXX",
 :copieddate=>"XXX",
@@ -228,20 +237,24 @@ INPUT
 :docyear=>"2016",
 :draft=>"12",
 :draftinfo=>" (draft 12, 2016-05)",
-:edition=>nil,
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
-:keywords=>[],
 :obsoleteddate=>"XXX",
 :obsoletes=>"IEC 8121",
 :obsoletes_part=>"3.1",
 :partof=>"IEC 8122",
+:pub_address=>"1 Infinity Loop + California",
+:pub_email=>"x@example.com",
+:pub_fax=>"4444444",
+:pub_phone=>"3333333",
+:pub_uri=>"http://www.example.com",
 :publisheddate=>"2011-01",
 :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers",
 :receiveddate=>"XXX",
 :revdate=>"2016-05",
 :revdate_monthyear=>"May 2016",
 :stage=>"Published",
+:subdivision=>"Subdivision",
 :transmitteddate=>"XXX",
 :unchangeddate=>"XXX",
 :unpublished=>false,
@@ -261,7 +274,7 @@ OUTPUT
   </bibdata>
   </iso-standard>
     INPUT
-  expect(Hash[c.info(Nokogiri::XML(<<~"INPUT"), nil).sort]).to be_equivalent_to <<~"OUTPUT"
+  expect(metadata(c.info(Nokogiri::XML(<<~"INPUT"), nil))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata type="standard">
   <title language="fr" format="text/plain">Céréales et légumineuses</ti>
@@ -308,8 +321,6 @@ OUTPUT
 INPUT
 {:accesseddate=>"XXX",
 :agency=>"ISO/IEC",
-:authors=>[],
-:authors_affiliations=>{},
 :circulateddate=>"XXX",
 :confirmeddate=>"XXX",
 :copieddate=>"XXX",
@@ -318,12 +329,8 @@ INPUT
 :docnumeric=>"17301",
 :doctitle=>"Cereals and pulses",
 :docyear=>"2016",
-:draft=>nil,
-:draftinfo=>"",
-:edition=>nil,
 :implementeddate=>"XXX",
 :issueddate=>"XXX",
-:keywords=>[],
 :obsoleteddate=>"XXX",
 :publisheddate=>"2011-01",
 :publisher=>"International Organization for Standardization et International Electrotechnical Commission",

data/spec/spec_helper.rb

@@ -29,6 +29,10 @@ def xmlpp(x)
   s
 end
 
+def metadata(x)
+  Hash[x.sort].delete_if{ |k, v| v.nil? || v.respond_to?(:empty?) && v.empty? }
+end
+
 def strip_guid(x)
   x.gsub(%r{ id="_[^"]+"}, ' id="_"').gsub(%r{ target="_[^"]+"}, ' target="_"').
     gsub(%r( href="#[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{13}"), ' href="#_"').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement