isodoc 2.9.4 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa1b06e38f973ba312a0f2d90d306c7ffb34e377f2fcc4a59c42775ba9f2a927
-  data.tar.gz: b74dcbe6b71b90da2ec4f205754bb08028d5bd1d45f085f7e35d6c3c47dc55cc
+  metadata.gz: 9d98a917ee770ef1034262fa29628010e3254f3ddb5d8dfe63be54c57c3d58c0
+  data.tar.gz: 64b2107fddc44c0096653fc0319c7b0df81285327ab83600471b1b99971f3dbd
 SHA512:
-  metadata.gz: 9cbe711521cc25e29f1879fa47ca42347a5ecfc0f94526166a4acb73f5787d5a5d577d68e3fe756cedce0c862b4aebfb54022fea51f296cbbeeff173e2ad5521
-  data.tar.gz: a07f6c1bdd5457be3cad8fececa4974de6bc95a952c73e31b718e22606a6d4c6807293729a784d55655a4419e10486c7de171dd1630ceb2f275605b263955e5d
+  metadata.gz: 1b1ac5b466169fd9f2698b79617ef4d2c6dd9dbf35b0cca715102ddddfcb2a0013be3bd02153263da42a7f3cde0150ccffa4f3e16e7b750dd0f73be23420e4b1
+  data.tar.gz: 26338d106c6e1cb5133c305c97ec5a8bb1c75292120ce2928efb93572ea6ff79b203eef4a6d73419d097cad76d6a0e22e71beac64a0f483dc09919e8d7d25e86

data/lib/isodoc/convert.rb

@@ -10,7 +10,8 @@ require "mn-requirements"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
-                  :requirements_processor, :doctype, :bibrender
+                  :requirements_processor, :doctype, :bibrender,
+                  :tempfile_cache, :wordcoverpage, :wordintropage
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -89,11 +90,15 @@ module IsoDoc
                                                            i18nhash: @i18n.get))
     end
 
+    def convert1_namespaces(html)
+      html.add_namespace("epub", "http://www.idpf.org/2007/ops")
+    end
+
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
       noko do |xml|
         xml.html lang: @lang.to_s do |html|
-          html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
+          convert1_namespaces(html.parent)
           info docxml, nil
           populate_css
           html.head { |head| define_head head, filename, dir }
@@ -177,5 +182,19 @@ module IsoDoc
       else "##{node['target']}"
       end
     end
+
+    # use a different class than self for rendering, as a result
+    # of document-specific criteria
+    # but pass on any singleton methods defined on top of the self instance
+    def swap_renderer(oldklass, newklass, file, input_filename, debug)
+      ref = oldklass # avoid oldklass == self for indirection of methods
+      oldklass.singleton_methods.each do |x|
+        newklass.define_singleton_method(x) do |*args|
+          ref.public_send(x, *args)
+        end
+      end
+      oldklass.singleton_methods.empty? or
+        newklass.convert_init(file, input_filename, debug)
+    end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -8,7 +8,7 @@ module IsoDoc
         node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
           if node.elements.empty? && node.text.strip.empty?
-            l << node["target"].sub(/^mailto:/, "")
+            l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic, :hexadecimal)
           else node.children.each { |n| parse(n, l) }
           end
         end

data/lib/isodoc/presentation_function/math.rb

@@ -100,7 +100,7 @@ module IsoDoc
     end
 
     def maths_just_numeral(node)
-      mn = node.at("./m:mn", MATHML).children
+      mn = node.at(".//m:mn", MATHML).children
       if node.parent.name == "stem"
         node.parent.replace(mn)
       else
@@ -127,12 +127,22 @@ module IsoDoc
     end
 
     def mathml_number(node, locale)
-      justnumeral = node.elements.size == 1 && node.elements.first.name == "mn"
+      justnumeral = numeric_mathml?(node)
       justnumeral or asciimath_dup(node)
       localize_maths(node, locale)
       justnumeral and maths_just_numeral(node)
     end
 
+    def numeric_mathml?(node)
+      m = {}
+      node.traverse do |x|
+        %w(mstyle mrow math text).include?(x.name) and next
+        m[x.name] ||= 0
+        m[x.name] += 1
+      end
+      m.keys.size == 1 && m["mn"] == 1
+    end
+
     def mathml_style_inherit(node)
       node.at("./ancestor::xmlns:strong") or return
       node.children =

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.9.4".freeze
+  VERSION = "2.10.0".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -5,6 +5,14 @@ require_relative "lists"
 module IsoDoc
   module WordFunction
     module Body
+      def convert1_namespaces(html)
+        super
+        html.add_namespace("v", "urn:schemas-microsoft-com:vml")
+        html.add_namespace("o", "urn:schemas-microsoft-com:office:office")
+        html.add_namespace("w", "urn:schemas-microsoft-com:office:word")
+        html.add_namespace("m", "http://schemas.microsoft.com/office/2004/12/omml")
+      end
+
       def define_head(head, filename, _dir)
         head.style do |style|
           loc = File.join(File.dirname(__FILE__), "..", "base_style",

data/lib/isodoc/word_function/postprocess.rb

@@ -7,17 +7,21 @@ module IsoDoc
   module WordFunction
     module Postprocess
       def postprocess(result, filename, dir)
+        result = postprocess_cleanup(result)
         filename = filename.sub(/\.doc$/, "")
         header = generate_header(filename, dir)
-        result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
+        @wordstylesheet = wordstylesheet_update
         toWord(result, filename, dir, header)
         @files_to_delete.each { |f| FileUtils.rm_f f }
       end
 
-      def toWord(result, filename, dir, header)
-        result = from_xhtml(word_cleanup(to_xhtml(result)))
+      def postprocess_cleanup(result)
+        result = cleanup(to_xhtml(textcleanup(result)))
+        from_xhtml(word_cleanup(result))
           .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
-        @wordstylesheet = wordstylesheet_update
+      end
+
+      def toWord(result, filename, dir, header)
         Html2Doc.new(
           filename: filename, imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
@@ -60,6 +64,7 @@ module IsoDoc
         word_tab_clean(docxml)
         authority_cleanup(docxml)
         word_footnote_format(docxml)
+        word_remove_empty_sections(docxml)
         docxml
       end
 

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -6,21 +6,30 @@ module IsoDoc
         word_intro(docxml, @wordToClevels) if @wordintropage
       end
 
+      def word_remove_empty_sections(docxml)
+        %w(WordSection1 WordSection2).each do |x|
+          ins = docxml.at("//div[@class='#{x}']") or next
+          @c.decode(ins.text).gsub(/\p{Z}|\p{C}/, "").strip.empty? or next
+          ins.next_element.remove
+          ins.remove
+        end
+      end
+
       def word_cover(docxml)
+        ins = docxml.at('//div[@class="WordSection1"]') or return
         cover = File.read(@wordcoverpage, encoding: "UTF-8")
         cover = populate_template(cover, :word)
         coverxml = to_word_xhtml_fragment(cover)
-        docxml.at('//div[@class="WordSection1"]').children.first.previous =
-          coverxml.to_xml(encoding: "US-ASCII")
+        ins.children.first.previous = coverxml.to_xml(encoding: "US-ASCII")
       end
 
       def word_intro(docxml, level)
+        ins = docxml.at('//div[@class="WordSection2"]') or return
         intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"),
                            docxml, level)
         intro = populate_template(intro, :word)
         introxml = to_word_xhtml_fragment(intro)
-        docxml.at('//div[@class="WordSection2"]').children.first.previous =
-          introxml.to_xml(encoding: "US-ASCII")
+        ins.children.first.previous = introxml.to_xml(encoding: "US-ASCII")
       end
 
       # add namespaces for Word fragments
@@ -90,10 +99,7 @@ module IsoDoc
       def generate_header(filename, _dir)
         @header or return nil
         template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-        meta = @meta.get.merge(@labels ? { labels: @labels } : {})
-          .merge(@meta.labels ? { labels: @meta.labels } : {})
-        meta[:filename] = filename
-        params = meta.transform_keys(&:to_s)
+        params = header_params(filename)
         Tempfile.open(%w(header html),
                       mode: File::BINARY | File::SHARE_DELETE,
                       encoding: "utf-8") do |f|
@@ -102,6 +108,13 @@ module IsoDoc
         end
       end
 
+      def header_params(filename)
+        meta = @meta.get.merge(@labels ? { labels: @labels } : {})
+          .merge(@meta.labels ? { labels: @meta.labels } : {})
+        meta[:filename] = filename
+        meta.transform_keys(&:to_s)
+      end
+
       def word_section_breaks(docxml)
         @landscapestyle = ""
         word_section_breaks1(docxml, "WordSection2")

data/lib/isodoc/xref/xref_gen.rb

@@ -88,6 +88,7 @@ module IsoDoc
 
       def admonition_anchor_names(sections)
         sections.each do |s|
+          s.at(ns(".//admonition[@type = 'box']")) or next
           notes = s.xpath(child_asset_path("admonition[@type = 'box']"))
           admonition_anchor_names1(notes, Counter.new)
           admonition_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -132,20 +133,19 @@ module IsoDoc
         end
       end
 
-      def list_item_anchor_names(list, list_anchor, depth, prev_label,
-refer_list)
+      def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           bare_label, label =
             list_item_value(li, c, depth, { list_anchor: list_anchor, prev_label: prev_label,
-                                            refer_list: refer_list })
+                                            refer_list: depth == 1 ? refer_list : nil })
           li["id"] and @anchors[li["id"]] =
                          { label: bare_label, bare_xref: "#{label})",
                            xref: "#{label})",
                            type: "listitem", refer_list: refer_list,
                            container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
-            list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+            list_item_anchor_names(ol, list_anchor, depth + 1, label, refer_list)
           end
         end
       end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -105,11 +105,12 @@ module IsoDoc
         termnote_anchor_names(doc)
         termexample_anchor_names(doc)
         note_anchor_names(doc.xpath(ns("//table | //figure")))
-        note_anchor_names(doc.xpath(ns(sections_xpath)))
-        admonition_anchor_names(doc.xpath(ns(sections_xpath)))
-        example_anchor_names(doc.xpath(ns(sections_xpath)))
-        list_anchor_names(doc.xpath(ns(sections_xpath)))
-        deflist_anchor_names(doc.xpath(ns(sections_xpath)))
+        sections = doc.xpath(ns(sections_xpath))
+        note_anchor_names(sections)
+        admonition_anchor_names(sections)
+        example_anchor_names(sections)
+        list_anchor_names(sections)
+        deflist_anchor_names(sections)
         bookmark_anchor_names(doc)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc