isodoc 1.0.25 → 1.1.0

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
@@ -207,7 +204,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

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

@@ -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
@@ -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?
@@ -210,6 +218,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)
@@ -116,7 +121,7 @@ module IsoDoc::Function
       h1.traverse do |x|
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])
         x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-        x.remove if x.name == "a" && x["epub:type"] == "footnote"
+        x.remove if x.name == "a" && x["class"] == "FootnoteRef"
         x.remove if x.name == "span" && /mso-bookmark/.match(x["style"])
         x.replace(x.children) if x.name == "a"
       end
@@ -142,7 +147,7 @@ module IsoDoc::Function
     end
 
     def populate_template(docxml, _format = nil)
-      meta = @meta.get.merge(@labels || {})
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).
         gsub('<', '<').gsub('>', '>').gsub('&', '&')
@@ -150,6 +155,7 @@ module IsoDoc::Function
 
     def save_dataimage(uri, relative_dir = true)
       %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
+      imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml
       imgtype = "png" unless /^[a-z0-9]+$/.match imgtype
       Tempfile.open(["image", ".#{imgtype}"]) do |f|
         f.binmode

data/lib/isodoc/headlesshtml_convert.rb

@@ -14,15 +14,21 @@ module IsoDoc
       "_headlessimages"
     end
 
-    def convert(filename, file = nil, debug = false)
-      file = File.read(filename, encoding: "utf-8") if file.nil?
+    def initialize(options)
+      @format = :html
+      @suffix = "headless.html"
+      super
+    end
+
+    def convert(input_filename, file = nil, debug = false, output_filename = nil)
+      file = File.read(input_filename, encoding: "utf-8") if file.nil?
       @openmathdelim, @closemathdelim = extract_delims(file)
-      docxml, outname_html, dir = convert_init(file, filename, debug)
-      result = convert1(docxml, outname_html, dir)
+      docxml, filename, dir = convert_init(file, input_filename, debug)
+      result = convert1(docxml, filename, dir)
       return result if debug
-      postprocess(result, filename + ".tmp", dir)
+      postprocess(result, filename + ".tmp.html", dir)
       FileUtils.rm_rf dir
-      strip_head(filename + ".tmp.html", outname_html + ".headless.html")
+      strip_head(filename + ".tmp.html", output_filename || "#{filename}.#{@suffix}")
       FileUtils.rm_rf ["#{filename}.tmp.html", tmpimagedir]
     end
 

data/lib/isodoc/html_convert.rb

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

data/lib/isodoc/html_function/footnotes.rb

@@ -65,7 +65,7 @@ module IsoDoc::HtmlFunction
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
       fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-      attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
+      attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
       out.a **attrs do |a|
         a.sup { |sup| sup << fn }
       end

data/lib/isodoc/html_function/html.rb

@@ -3,6 +3,18 @@ require "base64"
 
 module IsoDoc::HtmlFunction
   module Html
+    def convert1(docxml, filename, dir)
+      @xrefs.parse docxml
+      noko do |xml|
+        xml.html **{ lang: "#{@lang}" } do |html|
+          info docxml, nil
+          populate_css()
+          html.head { |head| define_head head, filename, dir }
+          make_body(html, docxml)
+        end
+      end.join("\n")
+    end
+
     def make_body1(body, _docxml)
       body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
@@ -90,12 +102,15 @@ module IsoDoc::HtmlFunction
     def sourcecode_parse(node, out)
       name = node.at(ns("./name"))
       class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
-      out.pre **attr_code(id: node["id"], class: class1) do |div|
+      out.pre **sourcecode_attrs(node).merge(class: class1) do |div|
         @sourcecode = true
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
       end
       sourcecode_name_parse(node, out, name)
     end
+
+    def table_long_strings_cleanup(docxml)
+    end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -18,7 +18,7 @@ module IsoDoc::HtmlFunction
       #result = populate_template(result, :html)
       result = from_xhtml(move_images(to_xhtml(result)))
       result = html5(script_cdata(inject_script(result)))
-      File.open("#{filename}.html", "w:UTF-8") { |f| f.write(result) }
+      File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
 
     def html5(doc)
@@ -159,7 +159,8 @@ module IsoDoc::HtmlFunction
     def inject_script(doc)
       return doc unless @scripts
       scripts = File.read(@scripts, encoding: "UTF-8")
-      doc.sub("</body>", scripts + "\n</body>")
+      a = doc.split(%r{</body>})
+      a[0] + scripts + "</body>" + a[1]
     end
 
     def update_footnote_filter(fn, x, i, seen)
@@ -178,7 +179,7 @@ module IsoDoc::HtmlFunction
     def html_footnote_filter(docxml)
       seen = {}
       i = 1
-      docxml.xpath('//a[@epub:type = "footnote"]').each do |x|
+      docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         i, seen = update_footnote_filter(fn, x, i, seen)
       end
@@ -187,7 +188,7 @@ module IsoDoc::HtmlFunction
 
     def footnote_backlinks(docxml)
       seen = {}
-      docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
+      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
@@ -200,7 +201,7 @@ module IsoDoc::HtmlFunction
     end
 
     def footnote_format(docxml)
-      docxml.xpath("//a[@epub:type = 'footnote']/sup").each do |x|
+      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
         footnote_reference_format(x)
       end
       docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\

data/lib/isodoc/metadata.rb

@@ -218,5 +218,11 @@ module IsoDoc
       a = xml.at(ns("//bibdata/uri[@type = 'pdf']")) and set(:pdf, a.text)
       a = xml.at(ns("//bibdata/uri[@type = 'doc']")) and set(:doc, a.text)
     end
+
+    def keywords(isoxml, _out)
+      ret = []
+      isoxml.xpath(ns("//bibdata/keyword")).each { |kw| ret << kw.text }
+      set(:keywords, ret)
+    end
   end
 end

data/lib/isodoc/metadata_date.rb

@@ -14,14 +14,26 @@ module IsoDoc
         "10": @labels["month_october"],
         "11": @labels["month_november"],
         "12": @labels["month_december"],
-      }
+    }
     end
 
-      def monthyr(isodate)
-        m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
-        return isodate unless m && m[:yr] && m[:mo]
-        IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
-                                     @lang, @script)
-      end
+    def monthyr(isodate)
+      m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
+      return isodate unless m && m[:yr] && m[:mo]
+      IsoDoc::Function::I18n::l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
+                                   @lang, @script)
+    end
+
+    def MMMddyyyy(isodate)
+      return nil if isodate.nil?
+      arr = isodate.split("-")
+      date = if arr.size == 1 and (/^\d+$/.match isodate)
+               Date.new(*arr.map(&:to_i)).strftime("%Y")
+             elsif arr.size == 2
+               Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+             else
+               Date.parse(isodate).strftime("%B %d, %Y")
+             end
+    end
   end
 end