isodoc 1.0.24 → 1.0.29

data/lib/isodoc/function/reqt.rb

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

@@ -16,6 +16,7 @@ module IsoDoc::Function
             clausedelimspace(out)
           end
           c1&.children&.each { |c2| parse(c2, b) }
+          clausedelimspace(out) if /\S/.match(c1&.text)
         end
       end
     end
@@ -109,20 +110,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 +208,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

@@ -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,7 +40,7 @@ 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) || '???'}: "

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?
@@ -157,7 +165,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 +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)
@@ -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,12 +115,13 @@ 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"])
         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
@@ -141,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('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')
@@ -149,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/function/xref_counter.rb

@@ -15,26 +15,60 @@ module IsoDoc::Function
         @num = 0
         @letter = ""
         @subseq = ""
+        @letter_override = nil
+        @number_override = nil
+      end
+
+      def new_subseq_increment(node)
+        @subseq = node["subsequence"]
+        @num += 1
+        @letter = node["subsequence"] ? "a" : ""
+        if node["number"]
+          /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+          if n || a
+            @letter_override = @letter = a if a
+            @number_override = @num = n.to_i if n
+          else
+            @letter_override = node["number"]
+            @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+          end
+        end
+      end
+
+      def sequence_increment(node)
+        if node["number"]
+          @number_override = node["number"]
+          @num = @number_override.to_i if /^\d+$/.match(@number_override)
+        else
+          @num += 1
+        end
+      end
+
+      def subsequence_increment(node)
+        if node["number"]
+          @letter_override = node["number"]
+          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        else
+          @letter = (@letter.ord + 1).chr.to_s
+        end
       end
 
       def increment(node)
         return self if node["unnumbered"]
+        @letter_override = nil
+        @number_override = nil
         if node["subsequence"] != @subseq
-          @subseq = node["subsequence"]
-          @num += 1
-          @letter = node["subsequence"] ? "a" : ""
+          new_subseq_increment(node)
+        elsif @letter.empty?
+          sequence_increment(node)
         else
-          if @letter.empty?
-            @num += 1
-          else
-            @letter = (@letter.ord + 1).chr.to_s
-          end
+          subsequence_increment(node)
         end
         self
       end
 
       def print
-        "#{@num}#{@letter}"
+        "#{@number_override || @num}#{@letter_override || @letter}"
       end
 
       def listlabel(depth)

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_gen_seq.rb

@@ -1,15 +1,20 @@
 module IsoDoc::Function
   module XrefGen
+    def subfigure_increment(j, c, t)
+      if t.parent.name == "figure" then j += 1
+        else
+          j = 0
+          c.increment(t)
+        end
+      j
+    end
+
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
       clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
@@ -80,11 +85,7 @@ module IsoDoc::Function
       j = 0
       clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?

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