isodoc 1.0.26 → 1.1.1

data/lib/isodoc/function/lists.rb

@@ -1,8 +1,11 @@
 module IsoDoc::Function
   module Lists
+    def ul_attrs(node)
+      { id: node["id"], style: keep_style(node) }
+    end
 
     def ul_parse(node, out)
-      out.ul **attr_code(id: node["id"]) do |ul|
+      out.ul **attr_code(ul_attrs(node)) do |ul|
         node.children.each { |n| parse(n, ul) }
       end
     end
@@ -34,9 +37,12 @@ module IsoDoc::Function
       ol_style(type)
     end
 
+    def ol_attrs(node)
+      { type: ol_depth(node), id: node["id"], style: keep_style(node) }
+    end
+
     def ol_parse(node, out)
-      style = ol_depth(node)
-      out.ol **attr_code(type: style, id: node["id"] ) do |ol|
+      out.ol **attr_code(ol_attrs(node)) do |ol|
         node.children.each { |n| parse(n, ol) }
       end
     end
@@ -67,12 +73,12 @@ module IsoDoc::Function
       %w{dt dd}.include? n.name
     end
 
-    def dl_attr(node)
-      attr_code(id: node["id"])
+    def dl_attrs(node)
+      attr_code(id: node["id"], style: keep_style(node))
     end
 
     def dl_parse(node, out)
-      out.dl  **dl_attr(node) do |v|
+      out.dl  **dl_attrs(node) do |v|
         node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
           v.dt **attr_code(id: dt["id"]) do |term|
             dt_parse(dt, term) 

data/lib/isodoc/function/references.rb

@@ -5,32 +5,35 @@ module IsoDoc::Function
     # references anyway; keeping here instead of in IsoDoc::Iso for now
     def docid_l10n(x)
       return x if x.nil?
-      x.gsub(/All Parts/i, @all_parts_lbl.downcase)
+      x.gsub(/All Parts/i, @all_parts_lbl.downcase) if @all_parts_lbl
+      x
     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
-          identifier = "[#{identifier}]" if id["type"] == "metanorma"
-          r << "#{identifier}, "
+          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
         end
-        reference_format(b, r)
+        ref << ", " unless biblio && !identifiers[1]
+        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)
-        identifier = "[#{identifier}]" if id["type"] == "metanorma" && !biblio
-        ref << identifier
+        identifiers = render_identifier(bibitem_ref_code(b))
+        if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
+        else
+          ref << "#{identifiers[0] || identifiers[1]}"
+          ref << ", #{identifiers[1]}" if identifiers[0] && identifiers[1]
+        end
         date_note_process(b, ref)
-        ref << ", "
+        ref << ", " unless biblio && !identifiers[1]
         reference_format(b, ref)
       end
     end
@@ -38,29 +41,41 @@ 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
-      end
+      prefix_bracketed_ref(r, t[0] || "[#{ordinal}]")
+      t[1] and r << "#{t[1]}"
     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)
@@ -70,13 +85,12 @@ module IsoDoc::Function
 
     def omit_docid_prefix(prefix)
       return true if prefix.nil? || prefix.empty?
-      return %w(ISO IEC ITU metanorma).include? prefix
+      return %w(ISO IEC ITU W3C metanorma).include? prefix
     end
 
     def date_note_process(b, ref)
-      date_note = b.at(ns("./note[text()][contains(.,'ISO DATE:')]"))
+      date_note = b.at(ns("./note[@type = 'ISO DATE']"))
       return if date_note.nil?
-      date_note.content = date_note.content.gsub(/ISO DATE: /, "")
       date_note.children.first.replace("<p>#{date_note.content}</p>")
       footnote_parse(date_note, ref)
     end
@@ -100,7 +114,7 @@ module IsoDoc::Function
     end
 
     def prefix_bracketed_ref(ref, text)
-      ref << "[#{text}]"
+      ref << text.to_s
       insert_tab(ref, 1)
     end
 
@@ -115,12 +129,6 @@ module IsoDoc::Function
       end
     end
 
-    ISO_PUBLISHER_XPATH =
-      "./contributor[xmlns:role/@type = 'publisher']/"\
-      "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
-      "xmlns:name = 'International Organization for Standardization' or "\
-      "xmlns:name = 'International Electrotechnical Commission']".freeze
-
     def is_standard(b)
       ret = false
       b.xpath(ns("./docidentifier")).each do |id|
@@ -145,22 +153,33 @@ module IsoDoc::Function
       end
     end
 
+    def norm_ref_xpath
+      "//bibliography/references[@normative = 'true'] | "\
+      "//bibliography/clause[.//references[@normative = 'true']]"
+    end
+
     def norm_ref(isoxml, out, num)
-      q = "//bibliography/references[@normative = 'true']"
-      f = isoxml.at(ns(q)) or return num
+      f = isoxml.at(ns(norm_ref_xpath)) or return num
       out.div do |div|
         num = num + 1
         clause_name(num, @normref_lbl, div, nil)
-        biblio_list(f, div, false)
+        if f.name == "clause"
+          f.elements.each { |e| parse(e, div) unless e.name == "title" }
+        else
+          biblio_list(f, div, false)
+        end
       end
       num
     end
 
-    BIBLIOGRAPHY_XPATH = "//bibliography/clause[.//references[@normative = 'false']] | "\
-      "//bibliography/references[@normative = 'false']".freeze
+    def bibliography_xpath 
+      "//bibliography/clause[.//references]"\
+      "[not(.//references[@normative = 'true'])] | "\
+      "//bibliography/references[@normative = 'false']"
+    end
 
     def bibliography(isoxml, out)
-      f = isoxml.at(ns(BIBLIOGRAPHY_XPATH)) || return
+      f = isoxml.at(ns(bibliography_xpath)) || return
       page_break(out)
       out.div do |div|
         div.h1 @bibliography_lbl, **{ class: "Section3" }
@@ -171,7 +190,7 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        anchor(node['id'], :label, false) and
+        @xrefs.anchor(node['id'], :label, false) and
           clause_parse_title(node, div, node.at(ns("./title")), out) or
           div.h2 title, **{ class: "Section3" }
         biblio_list(node, div, true)
@@ -185,17 +204,6 @@ module IsoDoc::Function
         ref
     end
 
-    def reference_names(ref)
-      isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-      docid = bibitem_ref_code(ref)
-      prefix = docid["type"]
-      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)
-      @anchors[ref["id"]] = { xref: reference }
-    end
-
     # def ref_names(ref)
     #  linkend = ref.text
     # linkend.gsub!(/[\[\]]/, "") unless /^\[\d+\]$/.match linkend

data/lib/isodoc/function/reqt.rb

@@ -2,7 +2,7 @@ module IsoDoc::Function
   module Blocks
     def recommendation_labels(node)
       [node.at(ns("./label")), node.at(ns("./title")), 
-       anchor(node['id'], :label, false)]
+       @xrefs.anchor(node['id'], :label, false)]
     end
 
     def recommendation_name(node, out, type)
@@ -60,8 +60,12 @@ module IsoDoc::Function
       %w(label title subject classification tag value inherit).include? n.name
     end
 
+    def reqt_attrs(node, klass)
+      attr_code(class: klass, id: node["id"], style: keep_style(node))
+    end
+
     def recommendation_parse(node, out)
-      out.div **{ class: "recommend" } do |t|
+      out.div **reqt_attrs(node, "recommend") do |t|
         recommendation_name(node, t, @recommendation_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -71,7 +75,7 @@ module IsoDoc::Function
     end
 
     def requirement_parse(node, out)
-      out.div **{ class: "require" } do |t|
+      out.div **reqt_attrs(node, "require") do |t|
         recommendation_name(node, t, @requirement_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -81,7 +85,7 @@ module IsoDoc::Function
     end
 
     def permission_parse(node, out)
-      out.div **{ class: "permission" } do |t|
+      out.div **reqt_attrs(node, "permission") do |t|
         recommendation_name(node, t, @permission_lbl)
         recommendation_attributes(node, out)
         node.children.each do |n|
@@ -90,9 +94,14 @@ module IsoDoc::Function
       end
     end
 
+    def reqt_component_attrs(node)
+      attr_code(class: "requirement-" + node.name,
+                style: keep_style(node))
+    end
+
     def requirement_component_parse(node, out)
       return if node["exclude"] == "true"
-      out.div **{ class: "requirement-" + node.name } do |div|
+      out.div **reqt_component_attrs(node) do |div|
         node.children.each do |n|
           parse(n, div)
         end

data/lib/isodoc/function/section.rb

@@ -11,11 +11,12 @@ module IsoDoc::Function
     def inline_header_title(out, node, c1)
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
-          if anchor(node['id'], :label, false) && !@suppressheadingnumbers
-            b << "#{anchor(node['id'], :label)}#{clausedelim}"
+          if @xrefs.anchor(node['id'], :label, false) && !@suppressheadingnumbers
+            b << "#{@xrefs.anchor(node['id'], :label)}#{clausedelim}"
             clausedelimspace(out)
           end
           c1&.children&.each { |c2| parse(c2, b) }
+          clausedelimspace(out) if /\S/.match(c1&.text)
         end
       end
     end
@@ -25,8 +26,8 @@ module IsoDoc::Function
       if node["inline-header"] == "true"
         inline_header_title(out, node, c1)
       else
-        div.send "h#{anchor(node['id'], :level, false) || '1'}" do |h|
-          lbl = anchor(node['id'], :label, false)
+        div.send "h#{@xrefs.anchor(node['id'], :level, false) || '1'}" do |h|
+          lbl = @xrefs.anchor(node['id'], :label, false)
           h << "#{lbl}#{clausedelim}" if lbl && !@suppressheadingnumbers
           clausedelimspace(out) if lbl && !@suppressheadingnumbers
           c1&.children&.each { |c2| parse(c2, h) }
@@ -57,14 +58,10 @@ module IsoDoc::Function
       div.parent.at(".//h1")
     end
 
-    MIDDLE_CLAUSE =
-      "//clause[parent::sections][not(xmlns:title = 'Scope')]"\
-      "[not(descendant::terms)]".freeze
-
     def clause(isoxml, out)
-      isoxml.xpath(ns(self.class::MIDDLE_CLAUSE)).each do |c|
+      isoxml.xpath(ns(middle_clause)).each do |c|
         out.div **attr_code(id: c["id"]) do |s|
-          clause_name(anchor(c['id'], :label),
+          clause_name(@xrefs.anchor(c['id'], :label),
                       c&.at(ns("./title")), s, nil)
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|
             parse(c1, s)
@@ -75,7 +72,7 @@ module IsoDoc::Function
 
     def annex_name(annex, name, div)
       div.h1 **{ class: "Annex" } do |t|
-        t << "#{anchor(annex['id'], :label)}<br/><br/>"
+        t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
         t.b do |b|
           name&.children&.each { |c2| parse(c2, b) }
         end

data/lib/isodoc/function/table.rb

@@ -3,7 +3,7 @@ module IsoDoc::Function
 
     def table_title_parse(node, out)
       name = node.at(ns("./name"))
-      lbl = anchor(node['id'], :label, false)
+      lbl = @xrefs.anchor(node['id'], :label, false)
       lbl = nil if labelled_ancestor(node)
       return if name.nil? && lbl.nil?
       out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
@@ -44,12 +44,12 @@ module IsoDoc::Function
       end
     end
 
-    def make_table_attr(node)
+    def table_attrs(node)
       width = node["width"] ? "width:#{node['width']};" : nil
       attr_code(
         id: node["id"],
         class: "MsoISOTable",
-        style: "border-width:1px;border-spacing:0;#{width}",
+        style: "border-width:1px;border-spacing:0;#{width}#{keep_style(node)}",
         title: node["alt"]
       )
     end
@@ -66,7 +66,7 @@ module IsoDoc::Function
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
-      out.table **make_table_attr(node) do |t|
+      out.table **table_attrs(node) do |t|
         tcaption(node, t)
         thead_parse(node, t)
         tbody_parse(node, t)
@@ -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/terms.rb

@@ -40,10 +40,10 @@ module IsoDoc::Function
     end
 
     def termnote_parse(node, out)
-      out.div **{ class: "Note" } do |div|
+      out.div **note_attrs(node) do |div|
         first = node.first_element_child
         div.p do |p|
-          p << "#{anchor(node['id'], :label) || '???'}: "
+          p << "#{@xrefs.anchor(node['id'], :label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end
       end
@@ -59,7 +59,7 @@ module IsoDoc::Function
 
     def termdef_parse(node, out)
       out.p **{ class: "TermNum", id: node["id"] } do |p|
-        p << "#{get_anchors[node["id"]][:label]}#{clausedelim}"
+        p << "#{@xrefs.get[node["id"]][:label]}#{clausedelim}"
       end
       set_termdomain("")
       node.children.each { |n| parse(n, out) }

data/lib/isodoc/function/to_word_html.rb

@@ -18,7 +18,7 @@ module IsoDoc::Function
 
     def init_file(filename, debug)
       filepath = Pathname.new(filename)
-      filename = filepath.sub_ext('').to_s
+      filename = filepath.sub_ext('').sub(/\.presentation$/, "").to_s
       dir = "#{filename}_files"
       unless debug
         Dir.mkdir(dir, 0777) unless File.exists?(dir)
@@ -45,7 +45,7 @@ module IsoDoc::Function
         head.style do |style|
           @standardstylesheet.open
           stylesheet = @standardstylesheet.read.
-            gsub("FILENAME", File.basename(filename))
+            gsub("FILENAME", File.basename(filename).sub(/\.presentation$/, ""))
           style.comment "\n#{stylesheet}\n"
         end
       end
@@ -79,7 +79,7 @@ module IsoDoc::Function
 
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
-                  boilerplate docxml, div3
+        boilerplate docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3
@@ -102,6 +102,7 @@ module IsoDoc::Function
       @meta.relations isoxml, out
       @meta.version isoxml, out
       @meta.url isoxml, out
+      @meta.keywords isoxml, out
       @meta.get
     end
 
@@ -109,8 +110,15 @@ module IsoDoc::Function
       out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
     end
 
+    def middle_admonitions(isoxml, out)
+      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+        parse(x, out)
+      end
+    end
+
     def middle(isoxml, out)
       middle_title(out)
+      middle_admonitions(isoxml, out)
       i = scope isoxml, out, 0
       i = norm_ref isoxml, out, i
       i = terms_defs isoxml, out, i
@@ -120,20 +128,20 @@ module IsoDoc::Function
       bibliography isoxml, out
     end
 
-      def boilerplate(node, out)
-        boilerplate = node.at(ns("//boilerplate")) or return
-        out.div **{class: "authority"} do |s|
-          boilerplate.children.each do |n|
-            if n.name == "title"
-              s.h1 do |h|
-                n.children.each { |nn| parse(nn, h) }
-              end
-            else
-              parse(n, s)
+    def boilerplate(node, out)
+      boilerplate = node.at(ns("//boilerplate")) or return
+      out.div **{class: "authority"} do |s|
+        boilerplate.children.each do |n|
+          if n.name == "title"
+            s.h1 do |h|
+              n.children.each { |nn| parse(nn, h) }
             end
+          else
+            parse(n, s)
           end
         end
       end
+    end
 
     def parse(node, out)
       if node.text?
@@ -211,6 +219,7 @@ module IsoDoc::Function
         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