isodoc 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cfc6c450ad2b744b1669dcdbc33ec716c9f1bb2ab8b0923a4e77f17123c9c3b
-  data.tar.gz: 98efcb5075af4c7a941a7d6855ca074be4ad9e89fc0b9d20f5c7ef96da97b03b
+  metadata.gz: 73982c33aa666aee412b32318f01d964e21a7d2dfbb6d3afca3b19c7c0268549
+  data.tar.gz: 90fb6621afc2fedcc1c0db06d83a8bc53d96f0d62eb382cdb4d94f773a25c477
 SHA512:
-  metadata.gz: d398f662be10cc30b34205c10346d040f36f2217fa6a026304cf8015312f9227e799f4687b044f226ac6884307a03177e184cf5c2a99cad5ed06dd83050ba836
-  data.tar.gz: f67b3a92994c67c13565a91e822b205e3c2f93f9dacc32effcbf8d35c85ed7f20eb2be85a6f32cd0f2d319e5a6e2f5f3d6948ed1217d18c2535e98ceb8ca08f7
+  metadata.gz: 0bb5d3dff4fd0f0ca32f424d3600685d974658a3fa69fa5593c91e59b3b9eb9dbc1f1bb62c28ae43277debf62ced423a4c3bff485411f14ef6777f74c126d999
+  data.tar.gz: 6b9e739460d40e0d74129563cbcdce6573348d7838380723dca798411f7e4a0f2882c50bd5a275cd7b3e58ec27cb87014a512dc41b2545707301bfbc007b8894

data/isodoc.gemspec

@@ -32,18 +32,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.4.1"
+  spec.add_dependency "html2doc", "~> 1.4.3"
   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 "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.4.3"
+  spec.add_dependency "metanorma-utils", "~> 1.4.5"
   spec.add_dependency "mn2pdf"
-  spec.add_dependency "mn-requirements", "~> 0.1.7"
+  spec.add_dependency "mn-requirements", "~> 0.2.0"
   spec.add_dependency "relaton-cli"
-  spec.add_dependency "relaton-render", "~> 0.5.0"
+  spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"

data/lib/isodoc/base_style/blocks.scss

@@ -35,7 +35,7 @@
     @include blockTitle();
   }
 
-  > img {
+  > img, > svg {
     margin-left: auto;
     margin-right: auto;
     display: block;

data/lib/isodoc/function/inline.rb

@@ -60,14 +60,17 @@ module IsoDoc
         "#{url}##{anchor.text.strip}"
       end
 
-      def eref_url(bibitemid)
-        return nil if @bibitems.nil? || @bibitems[bibitemid].nil?
+      def eref_url(id)
+        @bibitems.nil? and return nil
 
-        url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']")) and
+        b = @bibitems[id]
+        b.nil? and return nil
+
+        url = b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) and
           return url.text
-        @bibitems[bibitemid]["hidden"] == "true" and
-          return @bibitems[bibitemid].at(ns("./uri"))&.text
-        "##{bibitemid}"
+        url = b.at(ns("./uri[@type = 'citation']")) and return url.text
+        b["hidden"] == "true" and return b.at(ns("./uri"))&.text
+        "##{id}"
       end
 
       def eref_parse(node, out)
@@ -101,10 +104,9 @@ module IsoDoc
 
       def stem_parse(node, out)
         ooml = case node["type"]
-               when "AsciiMath"
-                 "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
-                 "#{@closemathdelim}"
-               when "MathML" then node.first_element_child.to_s
+               when "AsciiMath" then asciimath_parse(node)
+               when "MathML" then mathml_parse(node)
+               when "LaTeX" then latexmath_parse(node)
                else HTMLEntities.new.encode(node.text)
                end
         out.span **{ class: "stem" } do |span|
@@ -112,6 +114,24 @@ module IsoDoc
         end
       end
 
+      MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
+
+      def mathml_parse(node)
+        node.at("./m:math", MATHML)&.to_xml
+      end
+
+      def asciimath_parse(node)
+        a = node.at(ns("./asciimath"))&.text || node.text
+
+        "#{@openmathdelim}#{HTMLEntities.new.encode(a)}"\
+          "#{@closemathdelim}"
+      end
+
+      def latexmath_parse(node)
+        a = node.at(ns("./latexmath"))&.text || node.text
+        HTMLEntities.new.encode(a)
+      end
+
       def image_title_parse(out, caption)
         unless caption.nil?
           out.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|

data/lib/isodoc/function/references.rb

@@ -56,15 +56,14 @@ module IsoDoc
         ret.empty? and
           ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
         ret.empty? and
-          ret = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
-                          "@type = 'metanorma' "\
-                          "or @type = 'metanorma-ordinal' or "\
-                          "@type = 'ISSN' or @type = 'ISBN')]"\
-                          "[@language = '#{@lang}']")) ||
-            bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
-                      "@type = 'metanorma' "\
-                      "or @type = 'metanorma-ordinal' or "\
-                      "@type = 'ISSN' or @type = 'ISBN')]"))
+          ret = bib.at(ns(<<~XPATH,
+            ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')][@language = '#{@lang}']
+          XPATH
+                         )) ||
+            bib.at(ns(<<~XPATH,
+              ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')]
+            XPATH
+                     ))
         ret
       end
 
@@ -210,7 +209,7 @@ module IsoDoc
         page_break(out)
         out.div do |div|
           div.h1 **{ class: "Section3" } do |h1|
-            f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(f, div, true)
         end

data/lib/isodoc/function/utils.rb

@@ -1,3 +1,5 @@
+require "metanorma-utils"
+
 module IsoDoc
   module Function
     module Utils
@@ -18,24 +20,8 @@ module IsoDoc
         [1..count].each { out << tab }
       end
 
-      # add namespaces for Word fragments
-      NOKOHEAD = <<~HERE.freeze
-        <!DOCTYPE html SYSTEM
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml">
-        <head> <title></title> <meta charset="UTF-8" /> </head>
-        <body> </body> </html>
-      HERE
-
-      # block for processing XML document fragments as XHTML,
-      # to allow for HTMLentities
       def noko(&block)
-        doc = ::Nokogiri::XML.parse(NOKOHEAD)
-        fragment = doc.fragment("")
-        ::Nokogiri::XML::Builder.with fragment, &block
-        fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-          l.gsub(/\s*\n/, "")
-        end
+        Metanorma::Utils::noko_html(&block)
       end
 
       def attr_code(attributes)
@@ -44,7 +30,7 @@ module IsoDoc
         end
       end
 
-      DOCTYPE_HDR = "<!DOCTYPE html SYSTEM "\
+      DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
       def to_xhtml(xml)
@@ -55,19 +41,13 @@ module IsoDoc
           File.open("#{@filename}.#{@format}.err", "w:UTF-8") do |f|
             f.write xml
           end
-          abort "Malformed Output XML for #{@format}: #{e} "\
+          abort "Malformed Output XML for #{@format}: #{e} " \
                 "(see #{@filename}.#{@format}.err)"
         end
       end
 
       def numeric_escapes(xml)
-        c = HTMLEntities.new
-        xml.split(/(&[^ \r\n\t#;]+;)/).map do |t|
-          if /^(&[^ \t\r\n#;]+;)/.match?(t)
-            c.encode(c.decode(t), :hexadecimal)
-          else t
-          end
-        end.join
+        Metanorma::Utils::numeric_escapes(xml)
       end
 
       def to_xhtml_prep(xml)
@@ -77,8 +57,7 @@ module IsoDoc
       end
 
       def to_xhtml_fragment(xml)
-        doc = ::Nokogiri::XML.parse(NOKOHEAD)
-        doc.fragment(xml)
+        Metanorma::Utils::to_xhtml_fragment(xml)
       end
 
       def from_xhtml(xml)
@@ -87,11 +66,11 @@ module IsoDoc
       end
 
       CLAUSE_ANCESTOR =
-        ".//ancestor::*[local-name() = 'annex' or "\
-        "local-name() = 'definitions' 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 "\
+        ".//ancestor::*[local-name() = 'annex' or " \
+        "local-name() = 'definitions' 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
 
       def get_clause_id(node)
@@ -99,12 +78,12 @@ module IsoDoc
       end
 
       NOTE_CONTAINER_ANCESTOR =
-        ".//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() = 'term' or "\
-        "local-name() = 'clause' or local-name() = 'references' or "\
-        "local-name() = 'figure' or local-name() = 'formula' or "\
+        ".//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() = '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
 
       # no recursion on references
@@ -121,7 +100,7 @@ module IsoDoc
 
         if array.length == 1 then array[0]
         else
-          @i18n.l10n("#{array[0..-2].join(', ')} "\
+          @i18n.l10n("#{array[0..-2].join(', ')} " \
                      "#{@i18n.and} #{array.last}",
                      @lang, @script)
         end
@@ -197,7 +176,17 @@ module IsoDoc
         end
       end
 
+      def save_svg(img)
+        Tempfile.open(["image", ".svg"]) do |f|
+          f.write(img.to_xml)
+          @tempfile_cache << f # persist to the end
+          f.path
+        end
+      end
+
       def image_localfile(img)
+        img.name == "svg" && !img["src"] and
+          return save_svg(img)
         case img["src"]
         when /^data:/ then save_dataimage(img["src"], false)
         when %r{^([A-Z]:)?/} then img["src"]
@@ -206,7 +195,7 @@ module IsoDoc
       end
 
       def labelled_ancestor(node)
-        !node.ancestors("example, requirement, recommendation, permission, "\
+        !node.ancestors("example, requirement, recommendation, permission, " \
                         "note, table, figure, sourcecode").empty?
       end
 

data/lib/isodoc/html_function/postprocess.rb

@@ -1,5 +1,6 @@
 require "isodoc/html_function/mathvariant_to_plain"
 require_relative "postprocess_footnotes"
+require_relative "postprocess_cover"
 require "metanorma-utils"
 
 module IsoDoc
@@ -11,16 +12,9 @@ module IsoDoc
         @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>")
-      end
-
       def toHTML(result, filename)
         result = from_xhtml(html_cleanup(to_xhtml(result)))
-        result = from_xhtml(move_images(to_xhtml(result)))
+        result = from_xhtml(move_images(resize_images(to_xhtml(result))))
         result = html5(script_cdata(inject_script(result)))
         File.open(filename, "w:UTF-8") { |f| f.write(result) }
       end
@@ -56,132 +50,20 @@ module IsoDoc
         IsoDoc::HtmlFunction::MathvariantToPlain.new(docxml).convert
       end
 
-      def htmlstylesheet(file)
-        return if file.nil?
-
-        file.open if file.is_a?(Tempfile)
-        stylesheet = file.read
-        xml = Nokogiri::XML("<style/>")
-        xml.children.first << Nokogiri::XML::Comment
-          .new(xml, "\n#{stylesheet}\n")
-        file.close
-        file.unlink if file.is_a?(Tempfile)
-        xml.root.to_s
-      end
-
-      def htmlstyle(docxml)
-        return docxml unless @htmlstylesheet
-
-        head = docxml.at("//*[local-name() = 'head']")
-        head << htmlstylesheet(@htmlstylesheet)
-        s = htmlstylesheet(@htmlstylesheet_override) and head << s
-        @bare and
-          head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
-        docxml
-      end
-
-      def html_preface(docxml)
-        html_cover(docxml) if @htmlcoverpage && !@bare
-        html_intro(docxml) if @htmlintropage && !@bare
-        docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
-        docxml.at("//body") << sourcecode_highlighter
-        html_main(docxml)
-        authority_cleanup(docxml)
-        docxml
-      end
-
-      def authority_cleanup1(docxml, klass)
-        dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
-        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or "\
-                         "@class = 'boilerplate-#{klass}']")
-        auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
-        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-        dest and auth and dest.replace(auth.remove)
-      end
-
-      def authority_cleanup(docxml)
-        %w(copyright license legal feedback).each do |t|
-          authority_cleanup1(docxml, t)
-        end
-        coverpage_note_cleanup(docxml)
-      end
-
-      def coverpage_note_cleanup(docxml)
-        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
-          auth = docxml.xpath("//*[@coverpage]")
-          if auth.empty? then dest.remove
-          else
-            auth.each do |x|
-              dest << x.remove
-            end
-          end
-        end
-        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
-      end
-
-      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(
-          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(
-          populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
-        )
-      end
-
-      def html_toc_entry(level, header)
-        content = header.at("./following-sibling::p"\
-                            "[@class = 'variant-title-toc']") || header
-        %(<li class="#{level}"><a href="##{header['id']}">\
-      #{header_strip(content)}</a></li>)
-      end
-
-      def toclevel_classes
-        (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
-      end
-
-      def toclevel
-        ret = toclevel_classes.map do |l|
-          "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
-        end
-        <<~HEAD.freeze
-          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
-        toc = "<ul>"
-        path = toclevel_classes.map do |l|
-          "//main//#{l}#{toc_exclude_class}"
-        end
-        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
-          h["id"] ||= "toc#{tocidx}"
-          toc += html_toc_entry(h.name, h)
+      def resize_images(docxml)
+        docxml.xpath("//*[local-name() = 'img' or local-name() = 'svg']")
+          .each do |i|
+          i["width"], i["height"] = Html2Doc.new({})
+            .image_resize(i, image_localfile(i), @maxheight, @maxwidth)
         end
-        idx.children = "#{toc}</ul>"
         docxml
       end
 
-      def toc_exclude_class
-        "[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
-          "[string-length(normalize-space(.))>0]"
-      end
-
       # presupposes that the image source is local
       def move_images(docxml)
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
         docxml.xpath("//*[local-name() = 'img']").each do |i|
-          i["width"], i["height"] = Html2Doc.new({})
-            .image_resize(i, image_localfile(i), @maxheight, @maxwidth)
           next if /^data:/.match? i["src"]
 
           @datauriimage ? datauri(i) : move_image1(i)
@@ -212,38 +94,6 @@ module IsoDoc
         img["src"] = File.join(rel_tmpimagedir, fname)
       end
 
-      def inject_script(doc)
-        return doc unless @scripts
-
-        scripts = File.read(@scripts, encoding: "UTF-8")
-        scripts_override = ""
-        @scripts_override and
-          scripts_override = File.read(@scripts_override, encoding: "UTF-8")
-        a = doc.split(%r{</body>})
-        "#{a[0]}#{scripts}#{scripts_override}</body>#{a[1]}"
-      end
-
-      def sourcecode_highlighter
-        '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
-          'loader/run_prettify.js"></script>'
-      end
-
-      MATHJAX_ADDR =
-        "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
-      MATHJAX = <<~"MATHJAX".freeze
-        <script type="text/x-mathjax-config">
-          MathJax.Hub.Config({
-            "HTML-CSS": { preferredFont: "STIX" },
-            asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
-         });
-        </script>
-        <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
-      MATHJAX
-
-      def mathjax(open, close)
-        MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
-      end
-
       def term_header(docxml)
         %w(h1 h2 h3 h4 h5 h6 h7 h8).each do |h|
           docxml.xpath("//p[@class = 'TermNum'][../#{h}]").each do |p|

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -0,0 +1,167 @@
+require "isodoc/html_function/mathvariant_to_plain"
+require_relative "postprocess_footnotes"
+require "metanorma-utils"
+
+module IsoDoc
+  module HtmlFunction
+    module Html
+      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>")
+      end
+
+      def htmlstylesheet(file)
+        return if file.nil?
+
+        file.open if file.is_a?(Tempfile)
+        stylesheet = file.read
+        xml = Nokogiri::XML("<style/>")
+        xml.children.first << Nokogiri::XML::Comment
+          .new(xml, "\n#{stylesheet}\n")
+        file.close
+        file.unlink if file.is_a?(Tempfile)
+        xml.root.to_s
+      end
+
+      def htmlstyle(docxml)
+        return docxml unless @htmlstylesheet
+
+        head = docxml.at("//*[local-name() = 'head']")
+        head << htmlstylesheet(@htmlstylesheet)
+        s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        @bare and
+          head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
+        docxml
+      end
+
+      def html_preface(docxml)
+        html_cover(docxml) if @htmlcoverpage && !@bare
+        html_intro(docxml) if @htmlintropage && !@bare
+        docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
+        docxml.at("//body") << sourcecode_highlighter
+        html_main(docxml)
+        authority_cleanup(docxml)
+        docxml
+      end
+
+      def authority_cleanup1(docxml, klass)
+        dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
+        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or "\
+                         "@class = 'boilerplate-#{klass}']")
+        auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
+        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+        dest and auth and dest.replace(auth.remove)
+      end
+
+      def authority_cleanup(docxml)
+        %w(copyright license legal feedback).each do |t|
+          authority_cleanup1(docxml, t)
+        end
+        coverpage_note_cleanup(docxml)
+      end
+
+      def coverpage_note_cleanup(docxml)
+        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
+          auth = docxml.xpath("//*[@coverpage]")
+          if auth.empty? then dest.remove
+          else
+            auth.each do |x|
+              dest << x.remove
+            end
+          end
+        end
+        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
+      end
+
+      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(
+          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(
+          populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
+        )
+      end
+
+      def html_toc_entry(level, header)
+        content = header.at("./following-sibling::p"\
+                            "[@class = 'variant-title-toc']") || header
+        %(<li class="#{level}"><a href="##{header['id']}">\
+      #{header_strip(content)}</a></li>)
+      end
+
+      def toclevel_classes
+        (1..@htmlToClevels).reduce([]) { |m, i| m << "h#{i}" }
+      end
+
+      def toclevel
+        ret = toclevel_classes.map do |l|
+          "#{l}:not(:empty):not(.TermNum):not(.noTOC)"
+        end
+        <<~HEAD.freeze
+          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
+        toc = "<ul>"
+        path = toclevel_classes.map do |l|
+          "//main//#{l}#{toc_exclude_class}"
+        end
+        docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
+          h["id"] ||= "toc#{tocidx}"
+          toc += html_toc_entry(h.name, h)
+        end
+        idx.children = "#{toc}</ul>"
+        docxml
+      end
+
+      def toc_exclude_class
+        "[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
+          "[string-length(normalize-space(.))>0]"
+      end
+
+      def inject_script(doc)
+        return doc unless @scripts
+
+        scripts = File.read(@scripts, encoding: "UTF-8")
+        scripts_override = ""
+        @scripts_override and
+          scripts_override = File.read(@scripts_override, encoding: "UTF-8")
+        a = doc.split(%r{</body>})
+        "#{a[0]}#{scripts}#{scripts_override}</body>#{a[1]}"
+      end
+
+      def sourcecode_highlighter
+        '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
+          'loader/run_prettify.js"></script>'
+      end
+
+      MATHJAX_ADDR =
+        "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
+      MATHJAX = <<~"MATHJAX".freeze
+        <script type="text/x-mathjax-config">
+          MathJax.Hub.Config({
+            "HTML-CSS": { preferredFont: "STIX" },
+            asciimath2jax: { delimiters: [['OPEN', 'CLOSE']] }
+         });
+        </script>
+        <script src="#{MATHJAX_ADDR}?config=MML_HTMLorMML-full" async="async"></script>
+      MATHJAX
+
+      def mathjax(open, close)
+        MATHJAX.gsub("OPEN", open).gsub("CLOSE", close)
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/image.rb

@@ -53,7 +53,13 @@ module IsoDoc
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, block_delim,
-                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+                  l10n("#{figure_label(elem)} #{lbl}"), "name")
+    end
+
+    def figure_label(elem)
+      klass = elem["class"] || "figure"
+      klasslbl = @i18n.get[klass] || klass
+      lower2cap klasslbl
     end
 
     def eps2svg(img)
@@ -102,6 +108,11 @@ module IsoDoc
 
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
+      if node.elements&.first&.name == "svg" &&
+          (!node["height"] || node["height"] == "auto")
+        node["height"] = node.elements.first["height"]
+        node["width"] = node.elements.first["width"]
+      end
       ret = imgfile_suffix(uri, "emf")
       File.exist?(ret) and return ret
       inkscape_convert(uri, ret, '--export-type="emf"')
@@ -137,7 +148,7 @@ module IsoDoc
     end
 
     def svg_to_emf_uri_convert(node)
-      if node&.elements&.first&.name == "svg"
+      if node.elements&.first&.name == "svg"
         a = Base64.strict_encode64(node.children.to_xml)
         "data:image/svg+xml;base64,#{a}"
       else node["src"]

data/lib/isodoc/presentation_function/inline.rb

@@ -212,9 +212,9 @@ module IsoDoc
     end
 
     def variant1(node)
-      if (!node["lang"] || node["lang"] == @lang) &&
-          (!node["script"] || node["script"] == @script)
-      elsif found_matching_variant_sibling(node)
+      if !((!node["lang"] || node["lang"] == @lang) &&
+          (!node["script"] || node["script"] == @script)) &&
+          found_matching_variant_sibling(node)
         node["remove"] = "true"
       end
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -101,14 +101,19 @@ module IsoDoc
       pref = nil
       term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
         if i.zero? then pref = p
-        elsif merge_preferred_eligible?(pref, p)
-          pref.at(ns("./expression/name")) <<
-            l10n("; #{p.at(ns('./expression/name')).children.to_xml}")
-          p.remove
+        else merge_second_preferred1(pref, p)
         end
       end
     end
 
+    def merge_second_preferred1(pref, second)
+      if merge_preferred_eligible?(pref, second)
+        n1 = pref.at(ns("./expression/name"))
+        n2 = second.remove.at(ns("./expression/name"))
+        n1.children = l10n("#{n1.children.to_xml}; #{n2.children.to_xml}")
+      end
+    end
+
     def merge_preferred_eligible?(first, second)
       firstex = first.at(ns("./expression")) || {}
       secondex = second.at(ns("./expression")) || {}

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,7 +1,8 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def prefix_container(container, linkend, _target)
-      l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
+    def prefix_container(container, linkend, node, _target)
+      # l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
+      l10n("#{anchor_xref(node, container)}, #{linkend}")
     end
 
     def anchor_value(id)
@@ -24,13 +25,24 @@ module IsoDoc
     end
 
     def anchor_linkend1(node)
-      linkend = @xrefs.anchor(node["target"], :xref)
+      linkend = anchor_xref(node, node["target"])
       container = @xrefs.anchor(node["target"], :container, false)
       prefix_container?(container, node) and
-        linkend = prefix_container(container, linkend, node["target"])
+        linkend = prefix_container(container, linkend, node, node["target"])
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
+    def anchor_xref(node, target)
+      x = @xrefs.anchor(target, :xref)
+      t = @xrefs.anchor(target, :title)
+      if node["style"] == "basic" && t then t
+      elsif node["style"] == "full" && t
+        l10n("#{x}, #{t}")
+      else
+        x
+      end
+    end
+
     def prefix_container?(container, node)
       type = @xrefs.anchor(node["target"], :type)
       container &&
@@ -55,7 +67,8 @@ module IsoDoc
       container = @xrefs.anchor(locs.first[:node]["target"], :container,
                                 false)
       prefix_container?(container, locs.first[:node]) and
-        ret = prefix_container(container, ret, locs.first[:node]["target"])
+        ret = prefix_container(container, ret, locs.first[:node],
+                               locs.first[:node]["target"])
       ret
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.3.1".freeze
+  VERSION = "2.3.3".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -38,6 +38,8 @@ module IsoDoc
       def image_parse(node, out, caption)
         if emf = node.at(ns("./emf"))
           node["src"] = emf["src"]
+          node["height"] ||= emf["height"]
+          node["width"] ||= emf["width"]
           node["mimetype"] = "image/x-emf"
           node.children.remove
         end

data/lib/isodoc/word_function/postprocess.rb

@@ -42,8 +42,7 @@ module IsoDoc
           .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.new(
-          filename: filename,
-          imagedir: @localdir,
+          filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],
@@ -110,8 +109,8 @@ module IsoDoc
           t.xpath(".//tr").each_with_index do |tr, r|
             tr.xpath("./td | ./th").each_with_index do |td, _i|
               x = 0
-              rs = td&.attr("rowspan")&.to_i || 1
-              cs = td&.attr("colspan")&.to_i || 1
+              rs = td.attr("rowspan")&.to_i || 1
+              cs = td.attr("colspan")&.to_i || 1
               while cells2d[r][x]
                 x += 1
               end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -20,22 +20,38 @@ module IsoDoc
         idx
       end
 
+      FIGURE_NO_CLASS = <<~XPATH.freeze
+        .//figure[not(@class)] | .//figure[@class = 'pseudocode'] | .//sourcecode[not(ancestor::example)]
+      XPATH
+
       def sequential_figure_names(clause)
         c = Counter.new
         j = 0
-        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .noblank.each do |t|
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          sequential_figure_body(j, c, t)
+          sequential_figure_body(j, c, t, "figure")
+        end
+        sequential_figure_class_names(clause)
+      end
+
+      def sequential_figure_class_names(clause)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .each do |t|
+          c[t["class"]] ||= Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          sequential_figure_body(j, c[t["class"]], t, t["class"])
         end
       end
 
-      def sequential_figure_body(subfignum, counter, block)
+      def sequential_figure_body(subfignum, counter, block, klass)
         label = counter.print
         label &&= label + (subfignum.zero? ? "" : "-#{subfignum}")
 
         @anchors[block["id"]] = anchor_struct(
-          label, nil, @labels["figure"], "figure", block["unnumbered"]
+          label, nil, @labels[klass] || klass.capitalize, klass,
+          block["unnumbered"]
         )
       end
 
@@ -134,21 +150,32 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
-        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .noblank.each do |t|
+        clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           # next if labelled_ancestor(t) && t.ancestors("figure").empty?
-
           j = subfigure_increment(j, c, t)
-          hierarchical_figure_body(num, j, c, t)
+          hierarchical_figure_body(num, j, c, t, "figure")
+        end
+        hierarchical_figure_class_names(clause, num)
+      end
+
+      def hierarchical_figure_class_names(clause, num)
+        c = {}
+        j = 0
+        clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
+          .noblank.each do |t|
+          c[t["class"]] ||= Counter.new
+          j = subfigure_increment(j, c[t["class"]], t)
+          hierarchical_figure_body(num, j, c[t["class"]], t, t["class"])
         end
       end
 
-      def hierarchical_figure_body(num, subfignum, counter, block)
+      def hierarchical_figure_body(num, subfignum, counter, block, klass)
         label = "#{num}#{hiersep}#{counter.print}" +
           (subfignum.zero? ? "" : "#{hierfigsep}#{subfignum}")
 
-        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                              "figure", block["unnumbered"])
+        @anchors[block["id"]] =
+          anchor_struct(label, nil, @labels[klass] || klass.capitalize,
+                        klass, block["unnumbered"])
       end
 
       def hierarchical_table_names(clause, num)

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -51,8 +51,13 @@ module IsoDoc
         bookmark_anchor_names(doc)
       end
 
-      def preface_clause_name(clause)
-        clause.at(ns("./title"))&.text || clause.name.capitalize
+      def clause_title(clause, use_elem_name: false)
+        ret = clause.at(ns("./title"))&.text
+        if use_elem_name && !ret
+          clause.name.capitalize
+        else
+          ret
+        end
       end
 
       SUBCLAUSES =
@@ -62,25 +67,30 @@ module IsoDoc
       def preface_names(clause)
         return if clause.nil?
 
-        @anchors[clause["id"]] =
-          { label: nil, level: 1, xref: preface_clause_name(clause),
-            type: "clause", elem: @labels["clause"] }
+        preface_name_anchors(clause, 1,
+                             clause_title(clause, use_elem_name: true))
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text,
-                         "#{preface_clause_name(clause)}, #{i + 1}", 2)
+                         "#{clause_title(clause)}, #{i + 1}", 2)
         end
       end
 
       def preface_names1(clause, title, parent_title, level)
         label = title || parent_title
-        @anchors[clause["id"]] = { label: nil, level: level, xref: label,
-                                   type: "clause", elem: @labels["clause"] }
+        preface_name_anchors(clause, level, title || parent_title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
                          level + 1)
         end
       end
 
+      def preface_name_anchors(clause, level, title)
+        @anchors[clause["id"]] =
+          { label: nil, level: level,
+            xref: title, title: nil,
+            type: "clause", elem: @labels["clause"] }
+      end
+
       def middle_section_asset_names(doc)
         middle_sections = "//clause[@type = 'scope'] | "\
                           "#{@klass.norm_ref_xpath} | "\
@@ -90,35 +100,38 @@ module IsoDoc
       end
 
       def clause_names(docxml, num)
-        docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, _i|
+        docxml.xpath(ns(@klass.middle_clause(docxml)))
+          .each_with_index do |c, _i|
           section_names(c, num, 1)
         end
       end
 
       def section_names(clause, num, lvl)
-        return num if clause.nil?
+        clause.nil? and return num
 
         num.increment(clause)
-        @anchors[clause["id"]] =
-          { label: num.print, xref: l10n("#{@labels['clause']} #{num.print}"),
-            level: lvl, type: "clause", elem: @labels["clause"] }
-        i = Counter.new
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        section_name_anchors(clause, num.print, lvl)
+        clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
           section_names1(c, "#{num.print}.#{i.increment(c).print}", lvl + 1)
         end
         num
       end
 
       def section_names1(clause, num, level)
-        @anchors[clause["id"]] =
-          { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-            type: "clause", elem: @labels["clause"] }
+        section_name_anchors(clause, num, level)
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 
+      def section_name_anchors(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
+            title: clause_title(clause), level: level, type: "clause",
+            elem: @labels["clause"] }
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
@@ -127,21 +140,23 @@ module IsoDoc
         l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
       end
 
-      def annex_name_anchors(clause, num)
-        { label: annex_name_lbl(clause, num),
-          elem: @labels["annex"], type: "clause",
-          subtype: "annex", value: num.to_s, level: 1,
-          xref: "#{@labels['annex']} #{num}" }
+      def annex_name_anchors(clause, num, level)
+        label = level == 1 ? annex_name_lbl(clause, num) : num
+        @anchors[clause["id"]] =
+          { label: label,
+            elem: @labels["annex"], type: "clause",
+            subtype: "annex", value: num.to_s, level: level,
+            title: clause_title(clause),
+            xref: "#{@labels['annex']} #{num}" }
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] = annex_name_anchors(clause, num)
+        annex_name_anchors(clause, num, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        num.to_s, 1)
         else
-          i = Counter.new
-          clause.xpath(ns(SUBCLAUSES)).each do |c|
+          clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
             annex_names1(c, "#{num}.#{i.increment(c).print}", 2)
           end
         end
@@ -149,9 +164,7 @@ module IsoDoc
       end
 
       def annex_names1(clause, num, level)
-        @anchors[clause["id"]] = { xref: "#{@labels['annex']} #{num}",
-                                   elem: @labels["annex"], type: "clause",
-                                   label: num, level: level, subtype: "annex" }
+        annex_name_anchors(clause, num, level)
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -48,6 +48,7 @@ termnote: ملاحظة % للقيد
 list: قائمة
 deflist: قائمة تعريف
 figure: شكل
+diagram: رسم بياني
 formula: معادلة
 inequality: عدم مساواة
 table: جدول

data/lib/isodoc-yaml/i18n-de.yaml

@@ -54,6 +54,7 @@ termnote: Hinweis % zum Eintrag
 list: Liste
 deflist: Definitionsliste
 figure: Abbildung
+diagram: Diagramm
 formula: Formel
 inequality: Formel
 table: Tabelle

data/lib/isodoc-yaml/i18n-en.yaml

@@ -54,13 +54,14 @@ termnote: Note % to entry
 list: List
 deflist: Definition List
 figure: Figure
+diagram: Diagram
 formula: Formula
 inequality: Formula
 table: Table
 requirement: Requirement
 recommendation: Recommendation
 permission: Permission
-# OGC
+# Modspec
 recommendationtest: Recommendation test
 requirementtest: Requirement test
 permissiontest: Permission test

data/lib/isodoc-yaml/i18n-es.yaml

@@ -54,6 +54,7 @@ termnote: Nota % a la entrada
 list: Lista
 deflist: Lista de definiciones
 figure: Figura
+diagram: Diagrama
 formula: Fórmula
 inequality: Fórmula
 table: Tabla

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -49,6 +49,7 @@ note: NOTE
 note_xref: Note
 termnote: Note % à l’article
 figure: Figure
+diagram: Diagramme
 formula: Formule
 inequality: Formule
 list: Liste

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -59,6 +59,7 @@ termnote: Примечание % к определению
 list: Список
 deflist: Список определений
 figure: Рисунок
+diagram: Диаграмма
 formula: Формула
 inequality: Формула
 table: Таблица

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -47,6 +47,7 @@ note: 注
 note_xref: 注
 termnote: 注%
 figure: 图
+diagram: 图表
 formula: 公式
 inequality: 公式
 list: 列项

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -446,6 +446,7 @@ files:
 - lib/isodoc/html_function/html.rb
 - lib/isodoc/html_function/mathvariant_to_plain.rb
 - lib/isodoc/html_function/postprocess.rb
+- lib/isodoc/html_function/postprocess_cover.rb
 - lib/isodoc/html_function/postprocess_footnotes.rb
 - lib/isodoc/i18n.rb
 - lib/isodoc/init.rb