isodoc 1.2.4 → 1.3.0

data/lib/isodoc/function/inline.rb

@@ -67,19 +67,6 @@ module IsoDoc::Function
       out << "Termbase #{node['base']}, term ID #{node['target']}"
     end
 
-    def concept_parse(node, out)
-      content = node.first_element_child.children.select do |c|
-        !%w{locality localityStack}.include? c.name 
-      end.select { |c| !c.text? || /\S/.match(c) }
-      if content.empty?
-        out << "[Term defined in "
-        parse(node.first_element_child, out)
-        out << "]"
-      else
-        content.each { |n| parse(n, out) }
-      end
-    end
-
     def stem_parse(node, out)
       ooml = if node["type"] == "AsciiMath"
                "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
@@ -131,25 +118,5 @@ module IsoDoc::Function
         p.b(**{ role: "strong" }) { |e| e << text }
       end
     end
-
-    def variant_parse(node, out)
-      if node["lang"] == @lang && node["script"] == @script
-        node.children.each { |n| parse(n, out) }
-      else
-        return if found_matching_variant_sibling(node)
-        return unless !node.at("./preceding-sibling::xmlns:variant")
-        node.children.each { |n| parse(n, out) }
-      end
-    end
-
-    def found_matching_variant_sibling(node)
-      prev = node.xpath("./preceding-sibling::xmlns:variant")
-      foll = node.xpath("./following-sibling::xmlns:variant")
-      found = false
-      (prev + foll).each do |n|
-        found = true if n["lang"] == @lang && n["script"] == @script
-      end
-      found
-    end
   end
 end

data/lib/isodoc/function/lists.rb

@@ -38,7 +38,8 @@ module IsoDoc::Function
     end
 
     def ol_attrs(node)
-      { type: ol_depth(node), id: node["id"], style: keep_style(node) }
+      { type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
+        id: node["id"], style: keep_style(node) }
     end
 
     def ol_parse(node, out)

data/lib/isodoc/function/references.rb

@@ -80,7 +80,8 @@ module IsoDoc::Function
     end
 
     def docid_prefix(prefix, docid)
-      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix)
+      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
+        !/^#{prefix}\b/.match(docid)
       docid_l10n(docid)
     end
 
@@ -90,7 +91,7 @@ module IsoDoc::Function
     end
 
     def date_note_process(b, ref)
-      date_note = b.at(ns("./note[@type = 'ISO DATE']"))
+      date_note = b.at(ns("./note[@type = 'Unpublished-Status']"))
       return if date_note.nil?
       date_note.children.first.replace("<p>#{date_note.content}</p>")
       footnote_parse(date_note, ref)
@@ -111,7 +112,7 @@ module IsoDoc::Function
     # reference not to be rendered because it is deemed implicit
     # in the standards environment
     def implicit_reference(b)
-      false
+      b["hidden"] == "true"
     end
 
     def prefix_bracketed_ref(ref, text)
@@ -160,7 +161,7 @@ module IsoDoc::Function
     end
 
     def norm_ref(isoxml, out, num)
-      f = isoxml.at(ns(norm_ref_xpath)) or return num
+      f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true" or return num
       out.div do |div|
         num = num + 1
         clause_name(num, f.at(ns("./title")), div, nil)
@@ -180,10 +181,9 @@ module IsoDoc::Function
     end
 
     def bibliography(isoxml, out)
-      f = isoxml.at(ns(bibliography_xpath)) || return
+      f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
       page_break(out)
       out.div do |div|
-        #div.h1 @bibliography_lbl, **{ class: "Section3" }
         div.h1 **{class: "Section3"} do |h1|
           f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
         end
@@ -192,6 +192,7 @@ module IsoDoc::Function
     end
 
     def bibliography_parse(node, out)
+      node["hidden"] != true or return
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
         clause_parse_title(node, div, node.at(ns("./title")), out,
@@ -202,15 +203,9 @@ module IsoDoc::Function
 
     def format_ref(ref, prefix, isopub, date, allparts)
       ref = docid_prefix(prefix, ref)
-      return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
+      return "[#{ref}]" if ref && /^\d+$/.match(ref) && !prefix &&
         !/^\[.*\]$/.match(ref)
         ref
     end
-
-    # def ref_names(ref)
-    #  linkend = ref.text
-    # linkend.gsub!(/[\[\]]/, "") unless /^\[\d+\]$/.match linkend
-    # @anchors[ref["id"]] = { xref: linkend }
-    # end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -96,6 +96,7 @@ module IsoDoc::Function
       @meta.subtitle isoxml, out
       @meta.docstatus isoxml, out
       @meta.docid isoxml, out
+      @meta.otherid isoxml, out
       @meta.docnumeric isoxml, out
       @meta.doctype isoxml, out
       @meta.author isoxml, out
@@ -104,6 +105,7 @@ module IsoDoc::Function
       @meta.version isoxml, out
       @meta.url isoxml, out
       @meta.keywords isoxml, out
+      @meta.note isoxml, out
       @meta.get
     end
 
@@ -213,14 +215,12 @@ module IsoDoc::Function
         when "verification" then requirement_component_parse(node, out)
         when "import" then requirement_component_parse(node, out)
         when "index" then index_parse(node, out)
-        when "concept" then concept_parse(node, out)
         when "termref" then termrefelem_parse(node, out)
         when "copyright-statement" then copyright_parse(node, out)
         when "license-statement" then license_parse(node, out)
         when "legal-statement" then legal_parse(node, out)
         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

data/lib/isodoc/html_function/postprocess.rb

@@ -186,14 +186,22 @@ module IsoDoc::HtmlFunction
       docxml
     end
 
+    def footnote_backlinks1(x, fn)
+      xdup = x.dup
+      xdup.remove["id"]
+      if fn.elements.empty?
+        fn.children.first.previous = xdup
+      else
+        fn.elements.first.children.first.previous = xdup
+      end
+    end
+
     def footnote_backlinks(docxml)
       seen = {}
       docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
         seen[x["href"]] and next or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        xdup = x.dup
-        xdup.remove["id"]
-        fn.elements.first.children.first.previous = xdup
+        footnote_backlinks1(x, fn)
         x["id"] ||= "fnref:#{i + 1}"
         fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
       end
@@ -221,6 +229,7 @@ module IsoDoc::HtmlFunction
     MATHJAX = <<~"MATHJAX".freeze
       <script type="text/x-mathjax-config">
         MathJax.Hub.Config({
+          "HTML-CSS": { preferredFont: "STIX" },
           asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
        });
       </script>

data/lib/isodoc/i18n.rb

@@ -4,8 +4,21 @@ module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)
       ret = load_yaml1(lang, script)
-      return ret.merge(YAML.load_file(i18nyaml)) if i18nyaml
-      ret
+      return normalise_hash(ret.merge(YAML.load_file(i18nyaml))) if i18nyaml
+      normalise_hash(ret)
+    end
+
+    def normalise_hash(ret)
+      if ret.is_a? Hash 
+        ret.each do |k, v|
+          ret[k] = normalise_hash(v)
+        end
+        ret
+      elsif ret.is_a? Array then ret.map { |n| normalise_hash(n) }
+      elsif ret.is_a? String then ret.unicode_normalize(:nfc) 
+      else
+        ret
+      end
     end
 
     def load_yaml1(lang, script)
@@ -42,55 +55,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 +79,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

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 require_relative './metadata_date'
+require_relative './metadata_contributor'
 
 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)
@@ -20,7 +16,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, i18n, fonts_options = {})
-      @metadata = {}
+      @metadata = { lang: lang, script: script }
       DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = 'XXX' }
       @lang = lang
       @script = script
@@ -42,113 +38,37 @@ module IsoDoc
       @metadata[key] = value
     end
 
-    def extract_person_names(authors)
-      authors.reduce([]) do |ret, a|
-        if a.at(ns('./name/completename'))
-          ret << a.at(ns('./name/completename')).text
-        else
-          fn = []
-          forenames = a.xpath(ns('./name/forename'))
-          forenames.each { |f| fn << f.text }
-          surname = a&.at(ns('./name/surname'))&.text
-          ret << fn.join(' ') + ' ' + surname
-        end
-      end
-    end
+    NOLANG = "[not(@language) or @language = '']".freeze
 
-    def extract_person_affiliations(authors)
-      authors.reduce([]) do |m, a|
-        name = a&.at(ns('./affiliation/organization/name'))&.text
-        location = a&.at(ns('./affiliation/organization/address/'\
-                            'formattedAddress'))&.text
-        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
-          (name || location || ''))
-        m
-      end
-    end
-
-    def extract_person_names_affiliations(authors)
-      names = extract_person_names(authors)
-      affils = extract_person_affiliations(authors)
-      ret = {}
-      affils.each_with_index do |a, i|
-        ret[a] ||= []
-        ret[a] << names[i]
-      end
-      ret
-    end
-
-    def personal_authors(isoxml)
-      authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
-                                "or xmlns:role/@type = 'editor']/person"))
-      set(:authors, extract_person_names(authors))
-      set(:authors_affiliations, extract_person_names_affiliations(authors))
-    end
-
-    def author(xml, _out)
-      personal_authors(xml)
-      agency(xml)
-    end
-
-    def bibdate(isoxml, _out)
-      isoxml.xpath(ns('//bibdata/date')).each do |d|
-        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
-      end
+    def currlang
+      "[@language = '#{@lang}']"
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
-      t = b.split(/[- ]/).map(&:capitalize).join(' ')
-      set(:doctype, t)
-    end
-
-    def iso?(org)
-      name = org&.at(ns('./name'))&.text
-      abbrev = org&.at(ns('./abbreviation'))&.text
-      (abbrev == 'ISO' ||
-       name == 'International Organization for Standardization')
-    end
-
-    def agency(xml)
-      agency = ''
-      publisher = []
-      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
-                   'organization')).each do |org|
-        name = org&.at(ns('./name'))&.text
-        agency1 = org&.at(ns('./abbreviation'))&.text || name
-        publisher << name if name
-        agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
-      end
-      set(:agency, agency.sub(%r{/$}, ''))
-      set(:publisher, multiple_and(publisher, @labels['and']))
-    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)
+      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
+      set(:doctype, status_print(b))
+      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
+      set(:doctype_display, status_print(b1))
     end
 
-    def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns('//bibdata/status/stage'))
+    def docstatus(xml, _out)
       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 s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
+      s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
+      set(:stage, status_print(s.text))
+      s1 and set(:stage_display, status_print(s1.text))
+      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
+        set(:substage, i)
+      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+        set(:substage_display, i1)
+      (i2 = xml&.at(ns('//bibdata/status/iteration'))&.text) and
+        set(:iteration, i2)
+      set(:unpublished, unpublished(s.text))
+      unpublished(s.text) && set(:stageabbr, stage_abbr(s.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 +76,7 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/-/).map(&:capitalize).join(' ')
+      status.split(/[- ]/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)
@@ -164,18 +84,23 @@ module IsoDoc
       set(:docnumber, dn&.text)
     end
 
+    def otherid(isoxml, _out)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN"]'))
+      set(:isbn, dn&.text)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN10"]'))
+      set(:isbn10, dn&.text)
+    end
+
     def docnumeric(isoxml, _out)
       dn = isoxml.at(ns('//bibdata/docnumber'))
       set(:docnumeric, dn&.text)
     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
 
@@ -191,7 +116,7 @@ module IsoDoc
     end
 
     def title(isoxml, _out)
-      main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+      main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"))&.text
       set(:doctitle, main)
     end
 
@@ -231,5 +156,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