isodoc 1.2.8 → 1.4.2

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
 
@@ -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/section.rb

@@ -56,7 +56,7 @@ module IsoDoc::Function
     end
 
     def clause(isoxml, out)
-      isoxml.xpath(ns(middle_clause)).each do |c|
+      isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
         out.div **attr_code(clause_attrs(c)) do |s|
           clause_name(nil, c&.at(ns("./title")), s, nil)
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|

data/lib/isodoc/function/table.rb

@@ -58,11 +58,21 @@ module IsoDoc::Function
       end
     end
 
+    def colgroup(node, t)
+      colgroup = node.at(ns("./colgroup")) or return
+      t.colgroup do |cg|
+        colgroup.xpath(ns("./col")).each do |c|
+          cg.col **{ style: "width: #{c['width']};" }
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.table **table_attrs(node) do |t|
         tcaption(node, t)
+        colgroup(node, t)
         thead_parse(node, t)
         tbody_parse(node, t)
         tfoot_parse(node, t)

data/lib/isodoc/function/to_word_html.rb

@@ -109,7 +109,7 @@ module IsoDoc::Function
       @meta.get
     end
 
-    def middle_title(out)
+    def middle_title(_isoxml, out)
       out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
     end
 
@@ -120,7 +120,7 @@ module IsoDoc::Function
     end
 
     def middle(isoxml, out)
-      middle_title(out)
+      middle_title(isoxml, out)
       middle_admonitions(isoxml, out)
       i = scope isoxml, out, 0
       i = norm_ref isoxml, out, i
@@ -157,6 +157,7 @@ module IsoDoc::Function
         when "sub" then sub_parse(node, out)
         when "tt" then tt_parse(node, out)
         when "strike" then strike_parse(node, out)
+        when "underline" then underline_parse(node, out)
         when "keyword" then keyword_parse(node, out)
         when "smallcap" then smallcap_parse(node, out)
         when "br" then br_parse(node, out)
@@ -215,6 +216,7 @@ 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 "index-xref" then index_xref_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)

data/lib/isodoc/function/utils.rb

@@ -161,7 +161,7 @@ module IsoDoc::Function
     end
 
     def save_dataimage(uri, _relative_dir = true)
-      %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri
+      %r{^data:(image|application)/(?<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|
@@ -173,7 +173,7 @@ module IsoDoc::Function
     end
 
     def image_localfile(i)
-      if /^data:image/.match? i['src']
+      if /^data:/.match? i['src']
         save_dataimage(i['src'], false)
       elsif %r{^([A-Z]:)?/}.match? i['src']
         i['src']

data/lib/isodoc/gem_tasks.rb

@@ -97,6 +97,10 @@ module IsoDoc
         $bodyfont: '{{bodyfont}}';
         $headerfont: '{{headerfont}}';
         $monospacefont: '{{monospacefont}}';
+        $normalfontsize: '{{normalfontsize}}';
+        $smallerfontsize: '{{smallerfontsize}}';
+        $footnotefontsize: '{{footnotefontsize}}';
+        $monospacefontsize: '{{monospacefontsize}}';
       TEXT
     end
 

data/lib/isodoc/html_function/html.rb

@@ -60,6 +60,7 @@ module IsoDoc::HtmlFunction
     <script type="text/javascript">#{toclevel}</script>
 
     <!--Google fonts-->
+      <link rel="preconnect" href="https://fonts.gstatic.com"> 
       #{googlefonts}
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
@@ -110,6 +111,12 @@ module IsoDoc::HtmlFunction
       sourcecode_name_parse(node, out, name)
     end
 
+    def underline_parse(node, out)
+      out.span **{ style: "text-decoration: underline;" } do |e|
+        node.children.each { |n| parse(n, e) }
+      end
+    end
+
     def table_long_strings_cleanup(docxml)
     end
   end

data/lib/isodoc/html_function/mathvariant_to_plain.rb

@@ -0,0 +1,82 @@
+module IsoDoc
+  module HtmlFunction
+    # Class for recursively converting mathvariant text into plain text symbols
+    class MathvariantToPlain
+      MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
+      MATHVARIANT_SPECIAL_CASE_MAPPINGS_1 = %w[bold italic sans-serif]
+        .permutation
+        .each_with_object(:sansbolditalic)
+        .map { |n, y| [n, y] }
+        .to_h
+        .freeze
+      MATHVARIANT_SPECIAL_CASE_MAPPINGS_2 = {
+        %w[bold fraktur] => :frakturbold,
+        %w[bold script] => :scriptbold,
+        %w[sans-serif bold] => :sansbold,
+        %w[sans-serif italic] => :sansitalic,
+        %w[sans-serif bold-italic] => :sansbolditalic,
+        %w[bold-sans-serif italic] => :sansbolditalic,
+        %w[sans-serif-italic bold] => :sansbolditalic,
+      }.freeze
+      MATHVARIANT_TO_PLANE_MAPPINGS = {
+        %w[double-struck] => :doublestruck,
+        %w[bold-fraktur] => :frakturbold,
+        %w[script] => :script,
+        %w[bold-script] => :scriptbold,
+        %w[fraktur] => :fraktur,
+        %w[sans-serif] => :sans,
+        %w[bold-sans-serif] => :sansbold,
+        %w[sans-serif-italic] => :sansitalic,
+        %w[sans-serif-bold-italic] => :sansbolditalic,
+        %w[monospace] => :monospace,
+      }.freeze
+
+      attr_reader :docxml
+
+      # @param [Nokogiri::Document] docxml
+      def initialize(docxml)
+        @docxml = docxml
+      end
+
+      def convert
+        docxml.xpath("//m:math", MATHML).each do |elem|
+          next if nothing_to_style(elem)
+          mathml1(elem)
+        end
+        docxml
+      end
+
+      private
+
+      def nothing_to_style(elem)
+        !elem.at("./*[@mathvariant][not(@mathvariant = 'normal')][not(@mathvariant = 'italic')]")
+      end
+
+      def mathml1(base_elem)
+        MATHVARIANT_SPECIAL_CASE_MAPPINGS_1
+          .merge(MATHVARIANT_SPECIAL_CASE_MAPPINGS_2)
+          .merge(MATHVARIANT_TO_PLANE_MAPPINGS)
+          .each_pair do |mathvariant_list, plain_font|
+            base_elem.xpath(mathvariant_xpath(mathvariant_list)).each do |elem|
+              toPlane(elem, plain_font)
+            end
+          end
+      end
+
+      def mathvariant_xpath(list)
+        list
+          .map { |variant| "//*[@mathvariant = '#{variant}']" }
+          .join
+      end
+
+      def toPlane(elem, font)
+        elem.traverse do |n|
+          next unless n.text?
+
+          n.replace(Plane1Converter.conv(HTMLEntities.new.decode(n.text), font))
+        end
+        elem
+      end
+    end
+  end
+end

data/lib/isodoc/html_function/postprocess.rb

@@ -1,35 +1,47 @@
+require "isodoc/html_function/mathvariant_to_plain"
+
 module IsoDoc::HtmlFunction
   module Html
-    def postprocess(result, filename, dir)
+    def postprocess(result, filename, _dir)
       result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
       toHTML(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end
 
     def script_cdata(result)
-      result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>").
-        gsub(%r{\]\]>\s*</script>}, "</script>").
-        gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>").
-        gsub(%r{</script>\s*\]\]>}, "</script>")
+      result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
+        .gsub(%r{\]\]>\s*</script>}, "</script>")
+        .gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>")
+        .gsub(%r{</script>\s*\]\]>}, "</script>")
     end
 
     def toHTML(result, filename)
-      result = (from_xhtml(html_cleanup(to_xhtml(result))))
-      #result = populate_template(result, :html)
+      result = from_xhtml(html_cleanup(to_xhtml(result)))
+      # result = populate_template(result, :html)
       result = from_xhtml(move_images(to_xhtml(result)))
       result = html5(script_cdata(inject_script(result)))
       File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
 
     def html5(doc)
-      doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>").
-        sub(%r{<\?xml[^>]+>}, "")
+      doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>")
+        .sub(%r{<\?xml[^>]+>}, "")
     end
 
     def html_cleanup(x)
-      footnote_format(footnote_backlinks(html_toc(
-        term_header((html_footnote_filter(html_preface(htmlstyle(x))))))
-                        ))
+      mathml(
+        footnote_format(
+          footnote_backlinks(
+            html_toc(
+              term_header(html_footnote_filter(html_preface(htmlstyle(x))))
+            )
+          )
+        )
+      )
+    end
+
+    def mathml(docxml)
+      IsoDoc::HtmlFunction::MathvariantToPlain.new(docxml).convert
     end
 
     def htmlstylesheet
@@ -76,14 +88,14 @@ module IsoDoc::HtmlFunction
     def html_cover(docxml)
       doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="title-section"]')
-      #d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+      # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
       d.children.first.add_previous_sibling populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
     end
 
     def html_intro(docxml)
       doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
       d = docxml.at('//div[@class="prefatory-section"]')
-      #d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
+      # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
       d.children.first.add_previous_sibling populate_template(doc.to_xml(encoding: "US-ASCII"), :html)
     end
 
@@ -93,19 +105,19 @@ module IsoDoc::HtmlFunction
     end
 
     def toclevel_classes
-      (1..@htmlToClevels).inject([]) { |m, i| m << "h#{i}" }
+      (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
     end
 
     def toclevel
       ret = toclevel_classes.map { |l| "#{l}:not(:empty):not(.TermNum):not(.noTOC)" }
       <<~HEAD.freeze
-    function toclevel() { return "#{ret.join(',')}";}
+        function toclevel() { return "#{ret.join(',')}";}
       HEAD
     end
 
     # needs to be same output as toclevel
     def html_toc(docxml)
-      idx = docxml.at("//div[@id = 'toc']") or return docxml
+      (idx = docxml.at("//div[@id = 'toc']")) or (return docxml)
       toc = "<ul>"
       path = toclevel_classes.map do |l|
         "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][text()]"
@@ -125,7 +137,7 @@ module IsoDoc::HtmlFunction
       docxml.xpath("//*[local-name() = 'img']").each do |i|
         i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
                                                         @maxheight, @maxwidth)
-        next if /^data:image/.match i["src"]
+        next if /^data:/.match i["src"]
         @datauriimage ? datauri(i) : move_image1(i)
       end
       docxml
@@ -133,9 +145,10 @@ module IsoDoc::HtmlFunction
 
     def datauri(i)
       type = i["src"].split(".")[-1]
+      supertype = type == "xml" ? "application" : "image"
       bin = IO.binread(image_localfile(i))
       data = Base64.strict_encode64(bin)
-      i["src"] = "data:image/#{type};base64,#{data}"
+      i["src"] = "data:#{supertype}/#{type};base64,#{data}"
     end
 
     def image_suffix(i)
@@ -186,14 +199,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

data/lib/isodoc/metadata_contributor.rb

@@ -17,9 +17,10 @@ module IsoDoc
     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}" :
+        subdivs = a&.xpath(ns('./affiliation/organization/subdivision'))&.map(&:text)&.join(", ")
+        name and subdivs and !subdivs.empty? and name = l10n("#{name}, #{subdivs}", @lang, @script)
+        location = a&.at(ns('./affiliation/organization/address/formattedAddress'))&.text
+        m << (!name.nil? && !location.nil? ? l10n("#{name}, #{location}", @lang, @script) :
           (name || location || ''))
         m
       end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -25,13 +25,13 @@ module IsoDoc
       hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
     end
 
-    def hash_translate(bibdata, hash, xpath)
+    def hash_translate(bibdata, hash, xpath, lang = @lang)
       x = bibdata.at(ns(xpath)) or return
       x["language"] = ""
       hash.is_a? Hash or return
       hash[x.text] or return
       x.next = x.dup
-      x.next["language"] = @lang
+      x.next["language"] = lang
       x.next.children = hash[x.text]
     end
 
@@ -40,7 +40,7 @@ module IsoDoc
     end
 
     def i18n_safe(k)
-      k.gsub(/\s|\./, "_")
+      k.to_s.gsub(/\s|\./, "_")
     end
 
     def i8n_name(h, pref)