isodoc 1.7.5 → 1.7.6

data/lib/isodoc/html_function/html.rb

@@ -1,129 +1,139 @@
 require "fileutils"
 require "base64"
 
-module IsoDoc::HtmlFunction
-  module Html
-    def convert1(docxml, filename, dir)
-      noko do |xml|
-        xml.html **{ lang: @lang.to_s } do |html|
-          info docxml, nil
-          populate_css
-          html.head { |head| define_head head, filename, dir }
-          make_body(html, docxml)
-        end
-      end.join("\n")
-    end
+module IsoDoc
+  module HtmlFunction
+    module Html
+      def convert1(docxml, filename, dir)
+        noko do |xml|
+          xml.html **{ lang: @lang.to_s } 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)
-      return if @bare
+      def make_body1(body, _docxml)
+        return if @bare
 
-      body.div **{ class: "title-section" } do |div1|
-        div1.p { |p| p << "&nbsp;" } # placeholder
+        body.div **{ class: "title-section" } do |div1|
+          div1.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
       end
-      section_break(body)
-    end
 
-    def make_body2(body, _docxml)
-      return if @bare
+      def make_body2(body, _docxml)
+        return if @bare
 
-      body.div **{ class: "prefatory-section" } do |div2|
-        div2.p { |p| p << "&nbsp;" } # placeholder
+        body.div **{ class: "prefatory-section" } do |div2|
+          div2.p { |p| p << "&nbsp;" } # placeholder
+        end
+        section_break(body)
       end
-      section_break(body)
-    end
 
-    def make_body3(body, docxml)
-      body.div **{ class: "main-section" } do |div3|
-        boilerplate docxml, div3
-        preface_block docxml, div3
-        abstract docxml, div3
-        foreword docxml, div3
-        introduction docxml, div3
-        preface docxml, div3
-        acknowledgements docxml, div3
-        middle docxml, div3
-        footnotes div3
-        comments div3
+      def make_body3(body, docxml)
+        body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
+          preface_block docxml, div3
+          abstract docxml, div3
+          foreword docxml, div3
+          introduction docxml, div3
+          preface docxml, div3
+          acknowledgements docxml, div3
+          middle docxml, div3
+          footnotes div3
+          comments div3
+        end
       end
-    end
 
-    def googlefonts
-      <<~HEAD.freeze
-        <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-        <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
-      HEAD
-    end
+      def googlefonts
+        <<~HEAD.freeze
+          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+        HEAD
+      end
 
-    def html_head
-      <<~HEAD.freeze
-        <title>#{@meta&.get&.dig(:doctitle)}</title>
-        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-
-        <!--TOC script import-->
-        <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
-        <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">
-        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-        <style class="anchorjs"></style>
-      HEAD
-    end
+      def html_head
+        <<~HEAD.freeze
+          <title>#{@meta&.get&.dig(:doctitle)}</title>
+          <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+
+          <!--TOC script import-->
+          <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
+          <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">
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+          <style class="anchorjs"></style>
+        HEAD
+      end
 
-    def html_button
-      return "" if @bare
+      def html_button
+        return "" if @bare
 
-      '<button onclick="topFunction()" id="myBtn" '\
+        '<button onclick="topFunction()" id="myBtn" '\
         'title="Go to top">Top</button>'.freeze
-    end
+      end
 
-    def html_main(docxml)
-      docxml.at("//head").add_child(html_head)
-      d = docxml.at('//div[@class="main-section"]')
-      d.name = "main"
-      d.children.empty? or d.children.first.previous = html_button
-    end
+      def html_main(docxml)
+        docxml.at("//head").add_child(html_head)
+        d = docxml.at('//div[@class="main-section"]')
+        d.name = "main"
+        d.children.empty? or d.children.first.previous = html_button
+      end
 
-    def sourcecodelang(lang)
-      return unless lang
-
-      case lang.downcase
-      when "javascript" then "lang-js"
-      when "c" then "lang-c"
-      when "c+" then "lang-cpp"
-      when "console" then "lang-bsh"
-      when "ruby" then "lang-rb"
-      when "html" then "lang-html"
-      when "java" then "lang-java"
-      when "xml" then "lang-xml"
-      when "perl" then "lang-perl"
-      when "python" then "lang-py"
-      when "xsl" then "lang-xsl"
-      else
-        ""
+      def sourcecodelang(lang)
+        return unless lang
+
+        case lang.downcase
+        when "javascript" then "lang-js"
+        when "c" then "lang-c"
+        when "c+" then "lang-cpp"
+        when "console" then "lang-bsh"
+        when "ruby" then "lang-rb"
+        when "html" then "lang-html"
+        when "java" then "lang-java"
+        when "xml" then "lang-xml"
+        when "perl" then "lang-perl"
+        when "python" then "lang-py"
+        when "xsl" then "lang-xsl"
+        else
+          ""
+        end
       end
-    end
 
-    def sourcecode_parse(node, out)
-      name = node.at(ns("./name"))
-      class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
-      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
+      def sourcecode_parse(node, out)
+        name = node.at(ns("./name"))
+        class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
+        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
-      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) }
+      def underline_parse(node, out)
+        out.span **{ style: "text-decoration: underline;" } do |e|
+          node.children.each { |n| parse(n, e) }
+        end
       end
-    end
 
-    def table_long_strings_cleanup(docxml); end
+      def table_long_strings_cleanup(docxml); end
+
+      def image_parse(node, out, caption)
+        if svg = node.at("./m:svg", "m" => "http://www.w3.org/2000/svg")
+          svg_parse(svg, out)
+          return
+        end
+        super
+      end
+    end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -1,4 +1,4 @@
-require "base64"
+require_relative "./image"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -8,38 +8,6 @@ module IsoDoc
       text.capitalize
     end
 
-    def figure(docxml)
-      docxml.xpath(ns("//image")).each { |f| svg_extract(f) }
-      docxml.xpath(ns("//figure")).each { |f| figure1(f) }
-      docxml.xpath(ns("//svgmap")).each do |s|
-        if f = s.at(ns("./figure")) then s.replace(f)
-        else s.remove
-        end
-      end
-    end
-
-    def svg_extract(elem)
-      return unless %r{^data:image/svg\+xml;base64,}.match?(elem["src"])
-
-      svg = Base64.strict_decode64(elem["src"]
-        .sub(%r{^data:image/svg\+xml;base64,}, ""))
-      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, "")) do |config|
-        config.huge
-      end
-      elem.replace(x)
-    end
-
-    def figure1(elem)
-      return sourcecode1(elem) if elem["class"] == "pseudocode" ||
-        elem["type"] == "pseudocode"
-      return if labelled_ancestor(elem) && elem.ancestors("figure").empty? ||
-        elem.at(ns("./figure")) && !elem.at(ns("./name"))
-
-      lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, "&nbsp;&mdash; ",
-                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
-    end
-
     def prefix_name(node, delim, number, elem)
       return if number.nil? || number.empty?
 

data/lib/isodoc/presentation_function/concept.rb

@@ -0,0 +1,68 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def concept(docxml)
+      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
+    end
+
+    def concept1(node)
+      xref = node&.at(ns("./xref/@target"))&.text or
+        return concept_render(node, ital: node["ital"] || "true",
+                                    ref: node["ref"] || "true",
+                                    linkref: node["linkref"] || "true",
+                                    linkmention: node["linkmention"] || "false")
+      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
+        concept_render(node, ital: node["ital"] || "false",
+                             ref: node["ref"] || "false",
+                             linkref: node["linkref"] || "true",
+                             linkmention: node["linkmention"] || "false")
+      else concept_render(node, ital: node["ital"] || "true",
+                                ref: node["ref"] || "true",
+                                linkref: node["linkref"] || "true",
+                                linkmention: node["linkmention"] || "false")
+      end
+    end
+
+    def concept_render(node, opts)
+      node&.at(ns("./refterm"))&.remove
+      r = node.at(ns("./renderterm"))
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      ref && opts[:ref] != "false" and r&.next = " "
+      opts[:ital] == "true" and r&.name = "em"
+      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
+        ref2 = ref.clone
+        r2 = r.clone
+        r.replace(ref2).children = r2
+      end
+      concept1_ref(node, ref, opts)
+      if opts[:ital] == "false"
+        r = node.at(ns(".//renderterm"))
+        r&.replace(r&.children)
+      end
+      node.replace(node.children)
+    end
+
+    def concept1_ref(_node, ref, opts)
+      ref.nil? and return
+      return ref.remove if opts[:ref] == "false"
+
+      r = concept1_ref_content(ref)
+      ref = r.at("./descendant-or-self::xmlns:xref | "\
+                 "./descendant-or-self::xmlns:eref | "\
+                 "./descendant-or-self::xmlns:termref")
+      %w(xref eref).include? ref&.name and get_linkend(ref)
+      if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
+        ref.replace(ref.children)
+      end
+    end
+
+    def concept1_ref_content(ref)
+      if non_locality_elems(ref).select do |c|
+           !c.text? || /\S/.match(c)
+         end.empty?
+        ref.replace(@i18n.term_defined_in.sub(/%/,
+                                              ref.to_xml))
+      else ref.replace("[#{ref.to_xml}]")
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/image.rb

@@ -0,0 +1,112 @@
+require "base64"
+require "emf2svg"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def figure(docxml)
+      docxml.xpath(ns("//image")).each { |f| svg_extract(f) }
+      docxml.xpath(ns("//figure")).each { |f| figure1(f) }
+      docxml.xpath(ns("//svgmap")).each do |s|
+        if f = s.at(ns("./figure")) then s.replace(f)
+        else s.remove
+        end
+      end
+      docxml.xpath(ns("//image")).each { |f| svg_emf_double(f) }
+    end
+
+    def svg_extract(elem)
+      return unless %r{^data:image/svg\+xml;}.match?(elem["src"])
+
+      svg = Base64.strict_decode64(elem["src"]
+        .sub(%r{^data:image/svg\+xml;(charset=[^;]+;)?base64,}, ""))
+      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, "")) do |config|
+        config.huge
+      end
+      elem["src"] = ""
+      elem.children = x
+    end
+
+    def figure1(elem)
+      return sourcecode1(elem) if elem["class"] == "pseudocode" ||
+        elem["type"] == "pseudocode"
+      return if labelled_ancestor(elem) && elem.ancestors("figure").empty? ||
+        elem.at(ns("./figure")) && !elem.at(ns("./name"))
+
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, "&nbsp;&mdash; ",
+                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+    end
+
+    def svg_emf_double(img)
+      if emf?(img["mimetype"])
+        img = emf_encode(img)
+        img.children.first.previous = emf_to_svg(img)
+      elsif img["mimetype"] == "image/svg+xml"
+        src = svg_to_emf(img) and img << "<emf src='#{src}'/>"
+      end
+    end
+
+    def emf_encode(img)
+      img["mimetype"] = "image/svg+xml"
+      unless %r{^data:image}.match?(img["src"])
+        img["src"] = Metanorma::Utils::datauri(img["src"])
+      end
+      img.children = "<emf src='#{img['src']}'/>"
+      img["src"] = ""
+      img
+    end
+
+    def emf_to_svg(img)
+      emf = Metanorma::Utils::save_dataimage(img.at(ns("./emf/@src")).text)
+      Emf2svg.from_file(emf).sub(/<\?[^>]+>/, "")
+    end
+
+    def svg_to_emf(node)
+      uri = svg_to_emf_uri(node)
+      ret = svg_to_emf_filename(uri)
+      File.exists?(ret) and return ret
+      exe = inkscape_installed? or return nil
+      uri = Metanorma::Utils::external_path uri
+      exe = Metanorma::Utils::external_path exe
+      system(%(#{exe} --export-type="emf" #{uri})) and
+        return Metanorma::Utils::datauri(ret)
+
+      warn %(Fail on #{exe} --export-type="emf" #{uri})
+
+      nil
+    end
+
+    def svg_to_emf_uri(node)
+      uri = if node&.elements&.first&.name == "svg"
+              a = Base64.strict_encode64(node.children.to_xml)
+              "data:image/svg+xml;base64,#{a}"
+            else node["src"]
+            end
+      if %r{^data:}.match?(uri)
+        uri = save_dataimage(uri)
+        @tempfile_cache << uri
+      end
+      uri
+    end
+
+    def svg_to_emf_filename(uri)
+      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.emf"
+    end
+
+    def emf_to_svgfilename(uri)
+      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.svg"
+    end
+
+    def inkscape_installed?
+      cmd = "inkscape"
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
+  end
+end

data/lib/isodoc/presentation_function/inline.rb

@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require_relative "./concept"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -69,7 +70,7 @@ module IsoDoc
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
       non_locality_elems(node).each(&:remove)
-      node.add_child(link)
+      node.add_child(cleanup_entities(link))
     end
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
@@ -90,8 +91,7 @@ module IsoDoc
           ret += eref_localities0(rr, j, target, delim, node)
           delim = ","
         end
-      else
-        ret += eref_localities0(ref, idx, target, delim, node)
+      else ret += eref_localities0(ref, idx, target, delim, node)
       end
       ret
     end
@@ -157,71 +157,6 @@ module IsoDoc
       get_linkend(node)
     end
 
-    def concept(docxml)
-      docxml.xpath(ns("//concept")).each { |f| concept1(f) }
-    end
-
-    def concept1(node)
-      xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, ital: node["ital"] || "true",
-                                    ref: node["ref"] || "true",
-                                    linkref: node["linkref"] || "true",
-                                    linkmention: node["linkmention"] || "false")
-      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, ital: node["ital"] || "false",
-                             ref: node["ref"] || "false",
-                             linkref: node["linkref"] || "true",
-                             linkmention: node["linkmention"] || "false")
-      else concept_render(node, ital: node["ital"] || "true",
-                                ref: node["ref"] || "true",
-                                linkref: node["linkref"] || "true",
-                                linkmention: node["linkmention"] || "false")
-      end
-    end
-
-    def concept_render(node, opts)
-      node&.at(ns("./refterm"))&.remove
-      r = node.at(ns("./renderterm"))
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      ref && opts[:ref] != "false" and r&.next = " "
-      opts[:ital] == "true" and r&.name = "em"
-      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
-        ref2 = ref.clone
-        r2 = r.clone
-        r.replace(ref2).children = r2
-      end
-      concept1_ref(node, ref, opts)
-      if opts[:ital] == "false"
-        r = node.at(ns(".//renderterm"))
-        r&.replace(r&.children)
-      end
-      node.replace(node.children)
-    end
-
-    def concept1_ref(_node, ref, opts)
-      ref.nil? and return
-      return ref.remove if opts[:ref] == "false"
-
-      r = concept1_ref_content(ref)
-      ref = r.at("./descendant-or-self::xmlns:xref | "\
-                 "./descendant-or-self::xmlns:eref | "\
-                 "./descendant-or-self::xmlns:termref")
-      %w(xref eref).include? ref&.name and get_linkend(ref)
-      if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
-        ref.replace(ref.children)
-      end
-    end
-
-    def concept1_ref_content(ref)
-      if non_locality_elems(ref).select do |c|
-           !c.text? || /\S/.match(c)
-         end.empty?
-        ref.replace(@i18n.term_defined_in.sub(/%/,
-                                              ref.to_xml))
-      else ref.replace("[#{ref.to_xml}]")
-      end
-    end
-
     def variant(docxml)
       docxml.xpath(ns("//variant")).each { |f| variant1(f) }
       docxml.xpath(ns("//variant[@remove = 'true']")).each(&:remove)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.5".freeze
+  VERSION = "1.7.6".freeze
 end