isodoc 1.0.22 → 1.0.27

data/lib/isodoc/function/references.rb

@@ -9,24 +9,26 @@ module IsoDoc::Function
     end
 
     # TODO generate formatted ref if not present
-    def nonstd_bibitem(list, b, ordinal, bibliography)
-      list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
-        id = bibitem_ref_code(b)
-        identifier = render_identifier(id)
-        if bibliography then ref_entry_code(r, ordinal, identifier, id)
+    def nonstd_bibitem(list, b, ordinal, biblio)
+      list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+        ids = bibitem_ref_code(b)
+        identifiers = render_identifier(ids)
+        if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
         else
-          r << "#{identifier}, "
+          ref << "#{identifiers[0] || identifiers[1]}, "
+          ref << "#{identifiers[1]}, " if identifiers[0] && identifiers[1]
         end
-        reference_format(b, r)
+        reference_format(b, ref)
       end
     end
 
     def std_bibitem_entry(list, b, ordinal, biblio)
       list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        prefix_bracketed_ref(ref, ordinal) if biblio
-        id = bibitem_ref_code(b)
-        identifier = render_identifier(id)
-        ref << identifier
+        ids = bibitem_ref_code(b)
+        identifiers = render_identifier(ids)
+        prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
+        ref << "#{identifiers[0] || identifiers[1]}"
+        ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         date_note_process(b, ref)
         ref << ", "
         reference_format(b, ref)
@@ -36,29 +38,43 @@ module IsoDoc::Function
     # if t is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and t
     def ref_entry_code(r, ordinal, t, id)
-      if id["type"] == "metanorma"
-        prefix_bracketed_ref(r, t)
-      else
-        prefix_bracketed_ref(r, ordinal)
-        if !t.empty? && !%w(DOI ISSN ISBN).include?(id["type"])
-          r << "#{t}, "
-        end
+      prefix_bracketed_ref(r, t[0] || "[#{ordinal}]")
+      if t[1]
+        r << "#{t[1]}, "
       end
     end
 
+    def pref_ref_code(b)
+      b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
+              "or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"))
+    end
+
+    # returns [metanorma, non-metanorma, DOI/ISSN/ISBN] identifiers
     def bibitem_ref_code(b)
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
-      id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                   "or @type = 'ISSN' or @type = 'ISBN')]"))
-      id ||= b.at(ns("./docidentifier")) 
-      return id if id
+      id1 = pref_ref_code(b)
+      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)"
-      id
+      [nil, id, nil]
+    end
+
+    def bracket_if_num(x)
+      return nil if x.nil?
+      x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+      return "[#{x}]" if /^\d+$/.match(x)
+      x
     end
 
     def render_identifier(id)
-      docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
+      [
+        bracket_if_num(id[0]),
+        id[1].nil? ? nil :
+        docid_prefix(id[1]["type"], id[1].text.sub(/^\[/, "").sub(/\]$/, "")),
+        id[2].nil? ? nil :
+        docid_prefix(id[2]["type"], id[2].text.sub(/^\[/, "").sub(/\]$/, "")),
+      ]
     end
 
     def docid_prefix(prefix, docid)
@@ -98,7 +114,7 @@ module IsoDoc::Function
     end
 
     def prefix_bracketed_ref(ref, text)
-      ref << "[#{text}]"
+      ref << text.to_s
       insert_tab(ref, 1)
     end
 
@@ -144,8 +160,7 @@ module IsoDoc::Function
     end
 
     def norm_ref(isoxml, out, num)
-      q = "//bibliography/references[title = 'Normative References' or "\
-        "title = 'Normative references']"
+      q = "//bibliography/references[@normative = 'true']"
       f = isoxml.at(ns(q)) or return num
       out.div do |div|
         num = num + 1
@@ -155,8 +170,8 @@ module IsoDoc::Function
       num
     end
 
-    BIBLIOGRAPHY_XPATH = "//bibliography/clause[title = 'Bibliography'] | "\
-      "//bibliography/references[title = 'Bibliography']".freeze
+    BIBLIOGRAPHY_XPATH = "//bibliography/clause[.//references[@normative = 'false']] | "\
+      "//bibliography/references[@normative = 'false']".freeze
 
     def bibliography(isoxml, out)
       f = isoxml.at(ns(BIBLIOGRAPHY_XPATH)) || return
@@ -186,12 +201,11 @@ module IsoDoc::Function
 
     def reference_names(ref)
       isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-      docid = bibitem_ref_code(ref)
-      prefix = docid["type"]
+      ids = bibitem_ref_code(ref)
+      identifiers = render_identifier(ids)
       date = ref.at(ns("./date[@type = 'published']"))
       allparts = ref.at(ns("./extent[@type='part'][referenceFrom='all']"))
-      reference = format_ref(docid_l10n(docid.text), prefix, isopub, date,
-                             allparts)
+      reference = docid_l10n(identifiers[0] || identifiers[1])
       @anchors[ref["id"]] = { xref: reference }
     end
 

data/lib/isodoc/function/reqt.rb

@@ -20,17 +20,32 @@ module IsoDoc::Function
 
     def recommendation_attributes1(node) 
       out = [] 
-      oblig = node["obligation"] and out << "Obligation: #{oblig}" 
-      subj = node&.at(ns("./subject"))&.text and out << "Subject: #{subj}" 
-      node.xpath(ns("./inherit")).each { |i| out << "Inherit: #{i.text}" }
+      oblig = node["obligation"] and
+        out << l10n("#{@labels['obligation']}: #{oblig}")
+      subj = node&.at(ns("./subject"))&.text and
+        out << l10n("#{@labels['subject']}: #{subj}")
+      node.xpath(ns("./inherit")).each do |i|
+        out << recommendation_attr_parse(i, @labels["inherits"])
+      end
       node.xpath(ns("./classification")).each do |c|
-        tag = c.at(ns("./tag")) or next
-        value = c.at(ns("./value")) or next
-        out << "#{tag.text.capitalize}: #{value.text}"
+        line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
       end
       out
     end
 
+    def recommendation_attr_parse(node, label)
+      noko do |xml|
+        xml << "#{label}: "
+        node.children.each { |n| parse(n, xml) }
+      end.join
+    end
+
+    def recommendation_attr_keyvalue(node, key, value)
+      tag = node.at(ns("./#{key}")) or return nil
+      value = node.at(ns("./#{value}")) or return nil
+      "#{tag.text.capitalize}: #{value.text}"
+    end
+
     def recommendation_attributes(node, out)
       ret = recommendation_attributes1(node)
       return if ret.empty?

data/lib/isodoc/function/section.rb

@@ -109,20 +109,29 @@ module IsoDoc::Function
       num
     end
 
-    def terms_defs_title(f)
-      symbols = f.at(ns(".//definitions"))
-      return @termsdefsymbols_lbl if symbols
-      @termsdef_lbl
-    end
-
     TERM_CLAUSE = "//sections/terms | "\
       "//sections/clause[descendant::terms]".freeze
 
+    def term_def_title(title)
+      case title&.text
+      when "Terms, definitions, symbols and abbreviated terms"
+        @labels["termsdefsymbolsabbrev"]
+      when "Terms, definitions and symbols"
+        @labels["termsdefsymbols"]
+      when "Terms, definitions and abbreviated terms"
+        @labels["termsdefabbrev"]
+      when "Terms and definitions"
+        @labels["termsdef"]
+      else
+        title
+      end
+    end
+
     def terms_defs(isoxml, out, num)
       f = isoxml.at(ns(TERM_CLAUSE)) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name(num, terms_defs_title(f), div, nil)
+        clause_name(num, term_def_title(f&.at(ns("./title"))), div, nil)
         f.elements.each do |e|
           parse(e, div) unless %w{title source}.include? e.name
         end
@@ -198,7 +207,8 @@ module IsoDoc::Function
 
     def preface(isoxml, out)
       title_attr = { class: "IntroTitle" }
-      isoxml.xpath(ns("//preface/clause")).each do |f|
+      isoxml.xpath(ns("//preface/clause | //preface/terms | //preface/definitions | "\
+                      "//preface/references")).each do |f|
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
           clause_name(nil, f&.at(ns("./title")), div, title_attr)

data/lib/isodoc/function/table.rb

@@ -91,7 +91,6 @@ module IsoDoc::Function
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
         border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
-        padding:0;
       STYLE
       header and scope = (td["colspan"] ? "colgroup" : "col")
       !header and td.name == "th" and scope =

data/lib/isodoc/function/to_word_html.rb

@@ -21,7 +21,7 @@ module IsoDoc::Function
       filename = filepath.sub_ext('').to_s
       dir = "#{filename}_files"
       unless debug
-        Dir.mkdir(dir) unless File.exists?(dir)
+        Dir.mkdir(dir, 0777) unless File.exists?(dir)
         FileUtils.rm_rf "#{dir}/*"
       end
       @filename = filename
@@ -157,7 +157,7 @@ module IsoDoc::Function
         when "clause" then clause_parse(node, out)
         when "xref" then xref_parse(node, out)
         when "eref" then eref_parse(node, out)
-        when "origin" then eref_parse(node, out)
+        when "origin" then origin_parse(node, out)
         when "link" then link_parse(node, out)
         when "ul" then ul_parse(node, out)
         when "ol" then ol_parse(node, out)
@@ -210,6 +210,8 @@ module IsoDoc::Function
         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)
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/utils.rb

@@ -49,7 +49,12 @@ module IsoDoc::Function
         /^(\&[^ \t\r\n#;]+;)/.match(t) ? 
           HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
       end.join("")
-      Nokogiri::XML.parse(xml)
+      begin
+        Nokogiri::XML.parse(xml) { |config| config.strict }
+      rescue Nokogiri::XML::SyntaxError => e
+        File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml }
+        abort "Malformed Output XML for #{@format}: #{e} (see #{@filename}.#{@format}.err)"
+      end
     end
 
     def to_xhtml_fragment(xml)
@@ -64,7 +69,7 @@ module IsoDoc::Function
 
     CLAUSE_ANCESTOR =
       ".//ancestor::*[local-name() = 'annex' or "\
-      "local-name() = 'acknowledgements' or "\
+      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'appendix' or local-name() = 'foreword' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
       "local-name() = 'clause' or local-name() = 'references']/@id".freeze
@@ -78,7 +83,7 @@ module IsoDoc::Function
       ".//ancestor::*[local-name() = 'annex' or "\
       "local-name() = 'foreword' or local-name() = 'appendix' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'acknowledgements' or "\
+      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'clause' or local-name() = 'references' or "\
       "local-name() = 'figure' or local-name() = 'formula' or "\
       "local-name() = 'table' or local-name() = 'example']/@id".freeze
@@ -110,7 +115,8 @@ module IsoDoc::Function
     end
 
     def header_strip(h)
-      h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[123456][^>]*>/, "")
+      h = h.to_s.gsub(%r{<br\s*/>}, " ").gsub(/<\/?h[123456][^>]*>/, "").
+        gsub(/<\/?b[^>]*>/, "")
       h1 = to_xhtml_fragment(h.dup)
       h1.traverse do |x|
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])

data/lib/isodoc/function/xref_gen.rb

@@ -40,6 +40,7 @@ module IsoDoc::Function
 
     SECTIONS_XPATH =
       "//foreword | //introduction | //acknowledgements | //preface/clause | "\
+      "//preface/terms | preface/definitions | preface/references | "\
       "//sections/terms | //annex | "\
       "//sections/clause | //sections/definitions | "\
       "//bibliography/references | //bibliography/clause".freeze
@@ -68,7 +69,7 @@ module IsoDoc::Function
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
       "xmlns:example | ./xmlns:example".freeze
 
-    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions"
+    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | ./references"
 
     def example_anchor_names(sections)
       sections.each do |s|

data/lib/isodoc/function/xref_sect_gen.rb

@@ -5,10 +5,9 @@ module IsoDoc::Function
         annex_names(c, (65 + i).chr.to_s)
       end
       docxml.xpath(
-        ns("//bibliography/clause[not(xmlns:title = 'Normative References' or "\
-           "xmlns:title = 'Normative references')] |"\
-           "//bibliography/references[not(xmlns:title = 'Normative References'"\
-           " or xmlns:title = 'Normative references')]")).each do |b|
+           ns("//bibliography/clause[.//references[@normative = 'false']] | "\
+           "//bibliography/references[@normative = 'false']"
+           )).each do |b|
         preface_names(b)
       end
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
@@ -17,23 +16,13 @@ module IsoDoc::Function
     end
 
     def initial_anchor_names(d)
-      preface_names(d.at(ns("//preface/abstract")))
-      preface_names(d.at(ns("//foreword")))
-      preface_names(d.at(ns("//introduction")))
-      d.xpath(ns("//preface/clause")).each do |c|
-      preface_names(c)
-      end
-      preface_names(d.at(ns("//acknowledgements")))
+      d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
-      sequential_asset_names(
-        d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                   "//preface/clause | //acknowledgements")))
+      sequential_asset_names(d.xpath(ns("//preface/*")))
       n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
       n = section_names(d.at(ns(
-        "//bibliography/clause[title = 'Normative References' or "\
-        "title = 'Normative references'] |"\
-        "//bibliography/references[title = 'Normative References' or "\
-        "title = 'Normative references']")), n, 1)
+        "//bibliography/clause[.//references[@normative = 'true']] | "\
+        "//bibliography/references[@normative = 'true']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
       n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -76,10 +65,8 @@ module IsoDoc::Function
 
     def middle_section_asset_names(d)
       middle_sections = "//clause[title = 'Scope'] | "\
-        "//references[title = 'Normative References' or title = "\
-        "'Normative references'] | "\
-        "//sections/terms | //preface/abstract | //foreword | "\
-        "//introduction | //preface/clause | //acknowledgements "\
+        "//references[@normative = 'true'] | "\
+        "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end
@@ -120,12 +107,25 @@ module IsoDoc::Function
       l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
     end
 
+    def single_annex_special_section(clause)
+      a = clause.xpath(ns("./references | ./terms | ./definitions"))
+      a.size == 1 or return nil
+      clause.xpath(ns("./clause | ./p | ./table | ./ol | ./ul | ./dl | "\
+                      "./note | ./admonition | ./figure")).size == 0 or
+                     return nil
+      a[0]
+    end
+
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                  type: "clause",
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-        annex_names1(c, "#{num}.#{i + 1}", 2)
+      if a = single_annex_special_section(clause)
+        annex_names1(a, "#{num}", 1)
+      else
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          annex_names1(c, "#{num}.#{i + 1}", 2)
+        end
       end
       hierarchical_asset_names(clause, num)
     end

data/lib/isodoc/headlesshtml_convert.rb

@@ -14,6 +14,11 @@ module IsoDoc
       "_headlessimages"
     end
 
+    def initialize(options)
+      @format = :html
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       file = File.read(filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)

data/lib/isodoc/html_convert.rb

@@ -14,6 +14,11 @@ module IsoDoc
       "_htmlimages"
     end
 
+    def initialize(options)
+      @format = :html
+      super
+    end
+
     def convert(filename, file = nil, debug = false)
       ret = super
       Dir.exists?(tmpimagedir) and Dir["#{tmpimagedir}/*"].empty? and

data/lib/isodoc/html_function/footnotes.rb

@@ -48,7 +48,7 @@ module IsoDoc::HtmlFunction
     end
 
     def table_footnote_parse(node, out)
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       tid = get_table_ancestor_id(node)
       make_table_footnote_link(out, tid + fn, fn)
       # do not output footnote text if we have already seen it for this table
@@ -64,7 +64,7 @@ module IsoDoc::HtmlFunction
     def footnote_parse(node, out)
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
       out.a **attrs do |a|
         a.sup { |sup| sup << fn }

data/lib/isodoc/html_function/html.rb

@@ -97,5 +97,8 @@ module IsoDoc::HtmlFunction
       end
       sourcecode_name_parse(node, out, name)
     end
+
+    def table_long_strings_cleanup(docxml)
+    end
   end
 end