isodoc 2.7.3 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9c5b4a4ae20094a096ef37012c56b2f125a636c0aa426d135f1b8257cbf205
-  data.tar.gz: a1f5bbeed6904bd7d958ee0fdaeb4b180f0bf5405a42d556f7e787153247130d
+  metadata.gz: 7399ef0fe36a0b345f15af67b09daec6f68ed36ce2226af1469ace300d4e3fa9
+  data.tar.gz: 5d03fbb31c3a38b11ca47d34a1673326f68e7db9f577de5995944b4c1e77d1f1
 SHA512:
-  metadata.gz: a9aa50e9e6b759064321dbb68b46bbe9ab6d321ac73d584aad19b8ecedb109ee48119d06e72c03f7802910946d73ae72e08b24b502d3495d04e7805141de522a
-  data.tar.gz: fb4483cd05281ce5278d745c2ecc7f8b73139e1e47a643700c9112747ce475869c570a1555d836277cb6ed90c7d544b43eda21bc6b81a5f08b7470fb14ad8f73
+  metadata.gz: 3b5fb43c2a320525f7a1ce8e30d376ee687fd3295e16aa9336e846db7f93958d130e50b896216cbc651e4b33037840c97d9df2b6a9f578cc8dfef34a89bed098
+  data.tar.gz: 5b9bb3130bde935c9d420c02092d5c341ed2bdb18e7a5aaa2e718a58798c165c8130b7a036ff4619b19ef2655d41223a7f13b5c110bd0e5b2881a877920d0119

data/.gitignore

@@ -0,0 +1 @@
+spec/assets/img.svg

data/Gemfile

@@ -6,7 +6,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
+eval_gemfile("Gemfile.devel") rescue nil

data/isodoc.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.7.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
-  spec.add_dependency "emf2svg"
   spec.add_dependency "liquid", "~> 5"
   #spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
@@ -44,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
+  spec.add_dependency "vectory", "~> 0.6"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/lib/isodoc/base_style/all.css

@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

data/lib/isodoc/base_style/reset.css

@@ -132,6 +132,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

data/lib/isodoc/base_style/reset.scss

@@ -163,6 +163,9 @@ a.FootnoteRef, span.FootnoteRef {
   text-decoration: line-through;
 }
 
+ruby { ruby-position: over; -webkit-ruby-position: before;}
+ruby  ruby { ruby-position: under; -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 
 table.rouge-line-table td.rouge-gutter {

data/lib/isodoc/function/inline.rb

@@ -87,12 +87,14 @@ module IsoDoc
       MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
       def mathml_parse(node)
-        node.at("./m:math", MATHML)&.to_xml
+        # node.xpath("./m:math", MATHML).map(&:to_xml).join
+        node.xpath(ns("./asciimath | ./latexmath")).each(&:remove)
+        node.xpath(ns("./br")).each { |e| e.namespace = nil }
+        node.elements
       end
 
       def asciimath_parse(node)
         a = node.at(ns("./asciimath"))&.text || node.text
-
         "#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
           "#{@closemathdelim}"
       end
@@ -155,6 +157,24 @@ module IsoDoc
           p.b(role: "strong") { |e| e << text }
         end
       end
+
+      def ruby_parse(node, out)
+        out.ruby do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
+
+      def rt_parse(node, out)
+        out.rt do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
+
+      def rb_parse(node, out)
+        out.rb do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
     end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -253,6 +253,9 @@ module IsoDoc
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
           when "columnbreak" then columnbreak_parse(node, out)
+          when "ruby" then ruby_parse(node, out)
+          when "rt" then rt_parse(node, out)
+          when "rb" then rb_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/html_function/html.rb

@@ -15,6 +15,11 @@ module IsoDoc
         end.join("\n")
       end
 
+      def preprocess_xslt(docxml)
+
+        super
+      end
+
       def make_body1(body, _docxml)
         return if @bare
 

data/lib/isodoc/html_function/postprocess.rb

@@ -85,7 +85,7 @@ module IsoDoc
       end
 
       def datauri(img)
-        img["src"] = Metanorma::Utils::datauri(img["src"], @localdir)
+        img["src"] = Vectory::Utils::datauri(img["src"], @localdir)
       end
 
       def image_suffix(img)

data/lib/isodoc/metadata.rb

@@ -106,12 +106,12 @@ module IsoDoc
     end
 
     def version(isoxml, _out)
-      set(:edition, isoxml&.at(ns("//bibdata/edition#{NOLANG}"))&.text)
+      set(:edition, isoxml.at(ns("//bibdata/edition#{NOLANG}"))&.text)
       set(:edition_display,
-          isoxml&.at(ns("//bibdata/edition#{currlang}"))&.text)
-      set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
-      set(:draft, isoxml&.at(ns("//bibdata/version/draft"))&.text)
-      revdate = isoxml&.at(ns("//bibdata/version/revision-date"))&.text
+          isoxml.at(ns("//bibdata/edition#{currlang}"))&.text)
+      set(:docyear, isoxml.at(ns("//bibdata/copyright/from"))&.text)
+      set(:draft, isoxml.at(ns("//bibdata/version/draft"))&.text)
+      revdate = isoxml.at(ns("//bibdata/version/revision-date"))&.text
       set(:revdate, revdate)
       set(:revdate_monthyear, monthyr(revdate))
       set(:draftinfo,
@@ -119,7 +119,7 @@ module IsoDoc
     end
 
     def title(isoxml, _out)
-      main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"))&.text
+      main = isoxml.at(ns("//bibdata/title[@language='#{@lang}']"))&.text
       set(:doctitle, main)
     end
 

data/lib/isodoc/metadata_date.rb

@@ -1,9 +1,9 @@
 module IsoDoc
   class Metadata
-    DATETYPES = %w{published accessed created implemented obsoleted confirmed
-                   updated corrected issued received transmitted copied unchanged
-                   circulated vote-started
-                   vote-ended}.freeze
+    DATETYPES =
+      %w{published accessed created implemented obsoleted confirmed updated
+         corrected issued received transmitted copied unchanged circulated
+         adapted announced vote-started vote-ended stable-until}.freeze
 
     def months
       {

data/lib/isodoc/presentation_function/bibdata.rb

@@ -3,84 +3,10 @@ require "csv"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
-      toc_metadata(docxml)
-      fonts_metadata(docxml)
-      preprocess_xslt_insert(docxml)
       docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)
-      a.next =
-        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
-        "</localized-strings>"
-    end
-
-    def extension_insert(xml, path = [])
-      ins = extension_insert_pt(xml)
-      path.each do |n|
-        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
-      end
-      ins
-    end
-
-    def extension_insert_pt(xml)
-      xml.at(ns("//metanorma-extension")) ||
-        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
-          &.next_element ||
-        xml.root.elements.first.before("<metanorma-extension/>")
-          .previous_element
-    end
-
-    def preprocess_xslt_insert(docxml)
-      content = ""
-      p = passthrough_xslt and content += p
-      p = preprocess_xslt_read and content += File.read(p)
-      content.empty? and return
-      ins = extension_insert(docxml, %w(render))
-      ins << content
-    end
-
-    def passthrough_xslt
-      @output_formats.nil? and return nil
-      @output_formats.empty? and return nil
-      @output_formats.each_key.with_object([]) do |k, m|
-        m << <<~XSLT
-          <preprocess-xslt format="#{k}">
-            <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-              <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-              <xsl:template match="@* | node()">
-              <xsl:copy>
-                <xsl:apply-templates select="@* | node()"/>
-              </xsl:copy>
-            </xsl:template>
-              <xsl:template match="*[local-name() = 'passthrough']">
-                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
-              <xsl:copy>
-                  <xsl:apply-templates select="@* | node()"/>
-              </xsl:copy>
-                </xsl:if>
-              </xsl:template>
-            </xsl:stylesheet>
-          </preprocess-xslt>
-        XSLT
-      end.join("\n")
-    end
-
-    # read in from file, but with `<preprocess-xslt @format="">` wrapper
-    def preprocess_xslt_read
-      html_doc_path("preprocess.xslt")
-    end
-
-    def toc_metadata(docxml)
-      @tocfigures || @toctables || @tocrecommendations or return
-      ins = extension_insert(docxml)
-      @tocfigures and
-        ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
-      @toctables and
-        ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
-      @tocfigures and
-        ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
-        "</title></toc>"
     end
 
     def address_precompose(bib)
@@ -92,26 +18,6 @@ module IsoDoc
       end
     end
 
-    def fonts_metadata(xmldoc)
-      ins = presmeta_insert_pt(xmldoc)
-      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
-        .map(&:strip).reverse.each do |f|
-        ins.next = presmeta("fonts", f)
-      end
-      @fontlicenseagreement and
-        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
-    end
-
-    def presmeta_insert_pt(xmldoc)
-      xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
-    end
-
-    def presmeta(name, value)
-      "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
-        "</presentation-metadata>"
-    end
-
     def address_precompose1(addr)
       ret = []
       addr.xpath(ns("./street")).each { |s| ret << to_xml(s.children) }
@@ -176,67 +82,5 @@ module IsoDoc
       tag.next["language"] = lang
       tag.next.children = value
     end
-
-    def i18n_tag(key, value)
-      "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
-        "</localized-string>"
-    end
-
-    def i18n_safe(key)
-      key.to_s.gsub(/\s|\./, "_")
-    end
-
-    def i8n_name(hash, pref)
-      case hash
-      when Hash then i8n_name1(hash, pref)
-      when Array
-        hash.reject { |a| blank?(a) }.each_with_object([])
-          .with_index do |(v1, g), i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
-          end
-      else [i18n_tag(pref, hash)]
-      end
-    end
-
-    def i8n_name1(hash, pref)
-      hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
-        case v
-        when Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
-        when Array
-          v.reject { |a| blank?(a) }.each_with_index do |v1, i|
-            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
-          end
-        else
-          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
-        end
-      end
-    end
-
-    # https://stackoverflow.com/a/31822406
-    def blank?(elem)
-      elem.nil? || (elem.respond_to?(:empty?) && elem.empty?)
-    end
-
-    def trim_hash(hash)
-      loop do
-        h_new = trim_hash1(hash)
-        break hash if hash == h_new
-
-        hash = h_new
-      end
-    end
-
-    def trim_hash1(hash)
-      hash.is_a?(Hash) or return hash
-      hash.each_with_object({}) do |(k, v), g|
-        blank?(v) and next
-        g[k] = case v
-               when Hash then trim_hash1(hash[k])
-               when Array
-                 hash[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
-               else v
-               end
-      end
-    end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -1,5 +1,4 @@
 require "base64"
-require "emf2svg"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -92,33 +91,56 @@ module IsoDoc
 
     def svg_prep(img)
       img["mimetype"] = "image/svg+xml"
-      %r{^data:image}.match?(img["src"]) or
-        img["src"] = Metanorma::Utils::datauri(img["src"])
+      %r{^data:}.match?(img["src"]) or
+        img["src"] = Vectory::Emf.from_path(img["src"]).to_uri.content
     end
 
     def emf_to_svg(img)
-      emf = Metanorma::Utils::save_dataimage(img.at(ns("./emf/@src")).text)
-      Emf2svg.from_file(emf).sub(/<\?[^>]+>/, "")
+      datauri_src = img.at(ns("./emf/@src")).text
+      Vectory::Emf.from_datauri(datauri_src)
+        .to_svg
+        .content
+        .sub(/<\?[^>]+>/, "")
     end
 
     def eps_to_svg(node)
-      uri = eps_to_svg_uri(node)
-      ret = imgfile_suffix(uri, "svg")
-      File.exist?(ret) and return ret
-      inkscape_convert(uri, ret, "--export-plain-svg")
+      if !node.text.strip.empty? || %r{^data:}.match?(node["src"])
+        return eps_to_svg_from_node(node)
+      end
+
+      target_path = imgfile_suffix(node["src"], "svg")
+      return target_path if File.exist?(target_path)
+
+      eps_to_svg_from_node(node, target_path)
+    end
+
+    def eps_to_svg_from_node(node, target_path = nil)
+      svg = Vectory::Eps.from_node(node).to_svg
+      return svg.write(target_path).path if target_path
+
+      svg.write.path
     end
 
     def svg_to_emf(node)
       @output_formats[:doc] or return
-      uri = svg_to_emf_uri(node)
+
       svg_impose_height_attr(node)
-      ret = imgfile_suffix(uri, "emf")
-      if File.exist?(ret) && File.exist?(node["src"])
-        warn "Exists: #{ret}, Exists: #{node['src']}"
-        return ret
+
+      if node.elements&.first&.name == "svg" || %r{^data:}.match?(node["src"])
+        return svg_to_emf_from_node(node)
       end
-      warn "Converting..."
-      inkscape_convert(uri, ret, '--export-type="emf"')
+
+      target_path = imgfile_suffix(node["src"], "emf")
+      return target_path if File.exist?(target_path)
+
+      svg_to_emf_from_node(node, target_path)
+    end
+
+    def svg_to_emf_from_node(node, target_path = nil)
+      emf = Vectory::Svg.from_node(node).to_emf
+      return emf.write(target_path).to_uri.content if target_path
+
+      emf.to_uri.content
     end
 
     def svg_impose_height_attr(node)
@@ -129,68 +151,8 @@ module IsoDoc
       node["width"] = e["width"]
     end
 
-    def inkscape_convert(uri, file, option)
-      exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
-                                         "to convert image #{uri}. Aborting."
-      uri = Metanorma::Utils::external_path uri
-      exe = Metanorma::Utils::external_path exe
-      warn %(#{exe} #{option} #{uri})
-      err = system %(#{exe} #{option} #{uri})
-      File.exist?(file) and return Metanorma::Utils::datauri(file)
-      file2 = uri + File.extname(file)
-      warn "Checking #{file2}"
-      File.exist?(file2) and return Metanorma::Utils::datauri(file2)
-      raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
-    end
-
-    def svg_to_emf_uri(node)
-      uri = svg_to_emf_uri_convert(node)
-      cache_dataimage(uri)
-    end
-
-    def eps_to_svg_uri(node)
-      uri = eps_to_svg_uri_convert(node)
-      cache_dataimage(uri)
-    end
-
-    def cache_dataimage(uri)
-      if %r{^data:}.match?(uri)
-        uri = save_dataimage(uri)
-      end
-      uri
-    end
-
-    def svg_to_emf_uri_convert(node)
-      if node.elements&.first&.name == "svg"
-        a = Base64.strict_encode64(node.children.to_xml)
-        "data:image/svg+xml;base64,#{a}"
-      else node["src"]
-      end
-    end
-
-    def eps_to_svg_uri_convert(node)
-      if node.text.strip.empty?
-        node["src"]
-      else
-        a = Base64.strict_encode64(node.children.to_xml)
-        "data:application/postscript;base64,#{a}"
-      end
-    end
-
     def imgfile_suffix(uri, suffix)
       "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.#{suffix}"
     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

@@ -137,6 +137,22 @@ module IsoDoc
       end
     end
 
+    def ruby(docxml)
+      (docxml.xpath(ns("//ruby")) - docxml.xpath(ns("//ruby//ruby")))
+        .each do |r|
+        ruby1(r)
+      end
+    end
+
+    def ruby1(elem)
+      v = elem.at(ns("./pronunciation | ./annotation")).remove
+      elem.xpath(ns("./ruby")).each do |r|
+        ruby1(r)
+      end
+      t = elem.children.to_xml
+      elem.replace("<ruby><rb>#{t}</rb><rt>#{v['value']}</rt></ruby>")
+    end
+
     private
 
     def found_matching_variant_sibling(node)

data/lib/isodoc/presentation_function/math.rb

@@ -7,8 +7,9 @@ module IsoDoc
     MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
     def mathml(docxml)
+      docxml.xpath("//m:math", MATHML).each { |f| mathml_linebreak(f) }
       locale = twitter_cldr_localiser
-      docxml.xpath("//m:math", MATHML).each do |f|
+      docxml.xpath("//m:math", MATHML).each do |f| # rubocop:disable Style/CombinableLoops
         mathml1(f, locale)
       end
     end
@@ -77,8 +78,7 @@ module IsoDoc
     end
 
     def parse_localize_number
-      return {} unless @localizenumber
-
+      @localizenumber or return {}
       m = %r{(?<group>[^#])?(?<groupdigits>#+0)(?<decimal>.)(?<fractdigits>#+)(?<fractgroup>[^#])?}
         .match(@localizenumber) or return {}
       ret = { decimal: m[:decimal], group_digits: m[:groupdigits].size,
@@ -90,17 +90,13 @@ module IsoDoc
     end
 
     def asciimath_dup(node)
-      return if @suppressasciimathdup || node.parent.at(ns("./asciimath"))
-
+      @suppressasciimathdup || node.parent.at(ns("./asciimath")) and return
       math = node.to_xml.gsub(/ xmlns=["'][^"']+["']/, "")
         .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
       ret = Plurimath::Math.parse(math, "mathml").to_asciimath
-      ret = HTMLEntities.new.encode(ret, :basic)
-      node.next = "<asciimath>#{ret}</asciimath>"
+      node.next = "<asciimath>#{@c.encode(ret, :basic)}</asciimath>"
     rescue StandardError => e
-      warn "Failure to convert MathML to AsciiMath"
-      warn node.parent.to_xml
-      warn e
+      warn "Failure to convert MathML to AsciiMath\n#{node.parent.to_xml}\n#{e}"
     end
 
     def maths_just_numeral(node)
@@ -114,6 +110,23 @@ module IsoDoc
 
     def mathml1(node, locale)
       mathml_style_inherit(node)
+      mathml_number(node, locale)
+    end
+
+    def mathml_linebreak(node)
+      node.at(".//*/@linebreak") or return
+      m = Plurimath::Math.parse(node.to_xml, :mathml)
+        .to_mathml(split_on_linebreak: true)
+      ret = Nokogiri::XML("<m>#{m}</m>").root
+      ret.elements.each_with_index do |e, i|
+        i.zero? or e.previous = "<br/>"
+      end
+      node.replace(<<~OUTPUT)
+        <math-with-linebreak>#{ret.children}</math-with-linebreak><math-no-linebreak>#{node.to_xml}</math-no-linebreak>
+      OUTPUT
+    end
+
+    def mathml_number(node, locale)
       justnumeral = node.elements.size == 1 && node.elements.first.name == "mn"
       justnumeral or asciimath_dup(node)
       localize_maths(node, locale)

data/lib/isodoc/presentation_function/metadata.rb

@@ -0,0 +1,184 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def metadata(docxml)
+      toc_metadata(docxml)
+      fonts_metadata(docxml)
+      preprocess_xslt_insert(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      a.next =
+        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join}" \
+        "</localized-strings>"
+    end
+
+    def extension_insert(xml, path = [])
+      ins = extension_insert_pt(xml)
+      path.each do |n|
+        ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
+      end
+      ins
+    end
+
+    def extension_insert_pt(xml)
+      xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+          &.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>")
+          .previous_element
+    end
+
+    def toc_metadata(docxml)
+      @tocfigures || @toctables || @tocrecommendations or return
+      ins = extension_insert(docxml)
+      @tocfigures and
+        ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
+      @toctables and
+        ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
+      @tocfigures and
+        ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
+        "</title></toc>"
+    end
+
+    def fonts_metadata(xmldoc)
+      ins = presmeta_insert_pt(xmldoc)
+      @fontist_fonts and CSV.parse_line(@fontist_fonts, col_sep: ";")
+        .map(&:strip).reverse.each do |f|
+        ins.next = presmeta("fonts", f)
+      end
+      @fontlicenseagreement and
+        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
+    end
+
+    def presmeta_insert_pt(xmldoc)
+      xmldoc.at(ns("//presentation-metadata")) ||
+        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
+    end
+
+    def presmeta(name, value)
+      "<presentation-metadata><name>#{name}</name><value>#{value}</value>" \
+        "</presentation-metadata>"
+    end
+
+    def preprocess_xslt_insert(docxml)
+      content = ""
+      p = passthrough_xslt and content += p
+      p = preprocess_xslt_read and content += File.read(p)
+      content.empty? and return
+      ins = extension_insert(docxml, %w(render))
+      ins << content
+    end
+
+    COPY_XSLT =
+      '<xsl:copy><xsl:apply-templates select="@* | node()"/></xsl:copy>'.freeze
+    COPY_CHILDREN_XSLT =
+      '<xsl:apply-templates select="node()"/>'.freeze
+
+    def xslt_template(content)
+      <<~XSLT
+        <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+          <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+          <xsl:template match="@* | node()">#{COPY_XSLT}</xsl:template>
+        #{content}
+        </xsl:stylesheet>
+      XSLT
+    end
+
+    def passthrough_xslt
+      @output_formats.nil? and return nil
+      @output_formats.empty? and return nil
+      @output_formats.each_key.with_object([]) do |k, m|
+        m << <<~XSLT
+          <preprocess-xslt format="#{k}">
+            #{xslt_template(<<~XSLT1)
+              <xsl:template match="*[local-name() = 'passthrough']">
+                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
+                #{COPY_XSLT}
+                </xsl:if>
+              </xsl:template>
+            XSLT1
+            }
+          </preprocess-xslt>
+        XSLT
+        m << <<~XSLT
+          <preprocess-xslt format="#{k}">
+            #{xslt_template(<<~XSLT1)
+              <xsl:template match="*[local-name() = 'math-with-linebreak']">
+              #{k == 'pdf' ? COPY_CHILDREN_XSLT : ''}
+              </xsl:template>
+              <xsl:template match="*[local-name() = 'math-no-linebreak']">
+              #{k == 'pdf' ? '' : COPY_CHILDREN_XSLT}
+              </xsl:template>
+            XSLT1
+            }
+          </preprocess-xslt>
+        XSLT
+      end.join("\n")
+    end
+
+    # read in from file, but with `<preprocess-xslt @format="">` wrapper
+    def preprocess_xslt_read
+      html_doc_path("preprocess.xslt")
+    end
+
+    def i18n_tag(key, value)
+      "<localized-string key='#{key}' language='#{@lang}'>#{value}" \
+        "</localized-string>"
+    end
+
+    def i18n_safe(key)
+      key.to_s.gsub(/\s|\./, "_")
+    end
+
+    def i8n_name(hash, pref)
+      case hash
+      when Hash then i8n_name1(hash, pref)
+      when Array
+        hash.reject { |a| blank?(a) }.each_with_object([])
+          .with_index do |(v1, g), i|
+            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+          end
+      else [i18n_tag(pref, hash)]
+      end
+    end
+
+    def i8n_name1(hash, pref)
+      hash.reject { |_k, v| blank?(v) }.each_with_object([]) do |(k, v), g|
+        case v
+        when Hash then i8n_name(v, i18n_safe(k)).each { |x| g << x }
+        when Array
+          v.reject { |a| blank?(a) }.each_with_index do |v1, i|
+            i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
+          end
+        else
+          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
+        end
+      end
+    end
+
+    # https://stackoverflow.com/a/31822406
+    def blank?(elem)
+      elem.nil? || (elem.respond_to?(:empty?) && elem.empty?)
+    end
+
+    def trim_hash(hash)
+      loop do
+        h_new = trim_hash1(hash)
+        break hash if hash == h_new
+
+        hash = h_new
+      end
+    end
+
+    def trim_hash1(hash)
+      hash.is_a?(Hash) or return hash
+      hash.each_with_object({}) do |(k, v), g|
+        blank?(v) and next
+        g[k] = case v
+               when Hash then trim_hash1(hash[k])
+               when Array
+                 hash[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }
+               else v
+               end
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_xml_convert.rb

@@ -8,6 +8,7 @@ require_relative "presentation_function/inline"
 require_relative "presentation_function/math"
 require_relative "presentation_function/section"
 require_relative "presentation_function/bibdata"
+require_relative "presentation_function/metadata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -35,6 +36,7 @@ module IsoDoc
 
     def conversions(docxml)
       semantic_xml_insert(docxml)
+      metadata docxml
       bibdata docxml
       @xrefs.parse docxml
       section docxml
@@ -86,6 +88,7 @@ module IsoDoc
       quotesource docxml # feeds docxml
       eref2link docxml
       mathml docxml
+      ruby docxml
       variant docxml
       identifier docxml
       date docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.7.3".freeze
+  VERSION = "2.8.0".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -42,6 +42,15 @@ module IsoDoc
       end
 
       def image_parse(node, out, caption)
+        emf_attributes(node)
+        attrs = { src: imgsrc(node),
+                  height: node["height"], alt: node["alt"],
+                  title: node["title"], width: node["width"] }
+        out.img **attr_code(attrs)
+        image_title_parse(out, caption)
+      end
+
+      def emf_attributes(node)
         if emf = node.at(ns("./emf"))
           node["src"] = emf["src"]
           node["height"] ||= emf["height"]
@@ -49,11 +58,6 @@ module IsoDoc
           node["mimetype"] = "image/x-emf"
           node.children.remove
         end
-        attrs = { src: imgsrc(node),
-                  height: node["height"], alt: node["alt"],
-                  title: node["title"], width: node["width"] }
-        out.img **attr_code(attrs)
-        image_title_parse(out, caption)
       end
 
       def xref_parse(node, out)
@@ -73,6 +77,23 @@ module IsoDoc
 
         url.sub(/#{File.extname(url)}$/, ".doc")
       end
+
+      def ruby_parse(node, out)
+        if r = node.at(ns("./rb[ruby]"))
+          double_ruby = r.at(ns("./ruby/rt")).remove
+          r.replace(r.at(ns("./ruby/rb")))
+        end
+        out.ruby do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+        double_ruby and out << "(#{double_ruby.text})"
+      end
+
+      def rt_parse(node, out)
+        out.rt **{ style: "font-size: 6pt;" } do |e|
+          node.children.each { |n| parse(n, e) }
+        end
+      end
     end
   end
 end

data/lib/isodoc.rb

@@ -10,6 +10,7 @@ require "html2doc"
 require "liquid"
 require "htmlentities"
 require "relaton-render"
+require "vectory"
 
 require "isodoc/common"
 require "isodoc/convert"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: emf2svg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vectory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +329,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"
@@ -410,6 +411,7 @@ files:
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
+- lib/isodoc/presentation_function/metadata.rb
 - lib/isodoc/presentation_function/refs.rb
 - lib/isodoc/presentation_function/reqt.rb
 - lib/isodoc/presentation_function/section.rb