isodoc 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7850182b408d69f4ae9de09a385c8813c366a2ffd15122596ac3cd95e1b62f6
-  data.tar.gz: 2920db0b8a2d7887a326ad5f58f23550c0eb949e33fdbcf7dd7601d805b08e8f
+  metadata.gz: 7d8386094c2e6b1ea70008d548b0f0c475242457dcb58152a04bd7e59403cc7b
+  data.tar.gz: 4606afd5a06cede44afc418efc3e67267a5f75c615626475df57f6e881f8adcc
 SHA512:
-  metadata.gz: e80f26545cd13b3e3bab7624d140cf2844afdf3471a45a8b77102fdaf2ca633e4a80df7a315718f3b35a8e3b95b9706a1e03785a19afef1bb5cf47dcf22a9d0d
-  data.tar.gz: 4ccdbce4a6e6e854137a938ec3e26361952f355b0cffd3776e646109cff971e0514dd5e222add212be371771e85bd75df5c6a3852800d7b12a07c5a2112a45aa
+  metadata.gz: 453d7f0089ed9325a0e1b9fbe49b223365811f3115d3b08cc3862be80e56933a3a229273c84b6c52a153e8b8772b8aab50b06215cff2cba76547e8f6105002f3
+  data.tar.gz: a40f39df17dffbd8ef3286d841c1f5e96ff6abcbc1e41433895126217fa77b78cc650e4f7ba8ccea3948d6cb569cd1725b74e8df19d7cd7f608c9c95960b02a9

data/isodoc.gemspec

@@ -29,16 +29,17 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.3.0"
+  spec.add_dependency "html2doc", "~> 1.4.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "isodoc-i18n", "~> 1.0.0"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
-  spec.add_dependency "emf2svg", "<= 1.3"
+  spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils"
   spec.add_dependency "nokogiri", "~> 1.12.0"
   spec.add_dependency "relaton-cli"
+  spec.add_dependency "relaton-render", ">= 0.3.1"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
@@ -56,4 +57,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/convert.rb

@@ -43,6 +43,8 @@ module IsoDoc
     # tocfigures: add ToC for figures
     # toctables: add ToC for tables
     # tocrecommendations: add ToC for rcommendations
+    # fonts: fontist fonts to install
+    # fontlicenseagreement: fontist font license agreement
     def initialize(options)
       @libdir ||= File.dirname(__FILE__) # rubocop:disable Lint/DisjunctiveAssignmentInConstructor
       options.merge!(default_fonts(options)) do |_, old, new|
@@ -57,10 +59,7 @@ module IsoDoc
       init_stylesheets(options)
       init_covers(options)
       init_toc(options)
-      @normalfontsize = options[:normalfontsize]
-      @smallerfontsize = options[:smallerfontsize]
-      @monospacefontsize = options[:monospacefontsize]
-      @footnotefontsize = options[:footnotefontsize]
+      init_fonts(options)
       @i18nyaml = options[:i18nyaml]
       @ulstyle = options[:ulstyle]
       @olstyle = options[:olstyle]
@@ -96,6 +95,15 @@ module IsoDoc
       @tmpfilesdir_suffix = tmpfilesdir_suffix
     end
 
+    def init_fonts(options)
+      @normalfontsize = options[:normalfontsize]
+      @smallerfontsize = options[:smallerfontsize]
+      @monospacefontsize = options[:monospacefontsize]
+      @footnotefontsize = options[:footnotefontsize]
+      @fontist_fonts = options[:fonts]
+      @fontlicenseagreement = options[:fontlicenseagreement]
+    end
+
     def init_covers(options)
       @header = options[:header]
       @htmlcoverpage = options[:htmlcoverpage]
@@ -173,7 +181,7 @@ module IsoDoc
     end
 
     def i18n_init(lang, script, i18nyaml = nil)
-      @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
     end
 
     def l10n(expr, lang = @lang, script = @script)

data/lib/isodoc/css.rb

@@ -29,10 +29,10 @@ module IsoDoc
       @wordstylesheet = generate_css(localpath(@wordstylesheet_name), false)
       @standardstylesheet =
         generate_css(localpath(@standardstylesheet_name), false)
-      @htmlstylesheet_override_name and @htmlstylesheet_override =
-        File.open(localpath(@htmlstylesheet_override_name))
-      @wordstylesheet_override_name and @wordstylesheet_override =
-        File.open(localpath(@wordstylesheet_override_name))
+      @htmlstylesheet_override_name and
+        @htmlstylesheet_override = File.open(localpath(@htmlstylesheet_override_name))
+      @wordstylesheet_override_name and
+        @wordstylesheet_override = File.open(localpath(@wordstylesheet_override_name))
     end
 
     def default_fonts(_options)
@@ -80,12 +80,12 @@ module IsoDoc
 
       [File.join(Gem.loaded_specs["isodoc"].full_gem_path,
                  "lib", "isodoc"),
-                 File.dirname(filename)].each do |name|
-                   SassC.load_paths << name
-                 end
-                 SassC::Engine.new(scss_fontheader(stripwordcss) + stylesheet,
-                                   syntax: :scss, importer: SasscImporter)
-                   .render
+       File.dirname(filename)].each do |name|
+        SassC.load_paths << name
+      end
+      SassC::Engine.new(scss_fontheader(stripwordcss) + stylesheet,
+                        syntax: :scss, importer: SasscImporter)
+        .render
     end
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
@@ -96,6 +96,7 @@ module IsoDoc
       stylesheet = File.read(filename, encoding: "UTF-8")
       stylesheet = populate_template(stylesheet, :word)
       stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
+      stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-") unless stripwordcss
       if File.extname(filename) == ".scss"
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
       end

data/lib/isodoc/function/blocks.rb

@@ -9,12 +9,6 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
       end
 
-      def middle_admonitions(isoxml, out)
-        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-          parse(x, out)
-        end
-      end
-
       def figure_name_parse(_node, div, name)
         return if name.nil?
 
@@ -74,12 +68,6 @@ module IsoDoc
         end
       end
 
-      def admonition_name_parse(_node, div, name)
-        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
-          name.children.each { |n| parse(n, p) }
-        end
-      end
-
       def sourcecode_attrs(node)
         attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
       end
@@ -109,33 +97,6 @@ module IsoDoc
         @annotation = false
       end
 
-      def admonition_class(_node)
-        "Admonition"
-      end
-
-      def admonition_name(node, type)
-        name = node&.at(ns("./name")) and return name
-        name = Nokogiri::XML::Node.new("name", node.document)
-        return unless type && @i18n.admonition[type]
-
-        name << @i18n.admonition[type]&.upcase
-        name
-      end
-
-      def admonition_attrs(node)
-        attr_code(id: node["id"], class: admonition_class(node),
-                  style: keep_style(node))
-      end
-
-      def admonition_parse(node, out)
-        type = node["type"]
-        name = admonition_name(node, type)
-        out.div **admonition_attrs(node) do |t|
-          admonition_name_parse(node, t, name) if name
-          node.children.each { |n| parse(n, t) unless n.name == "name" }
-        end
-      end
-
       def formula_where(dlist, out)
         return unless dlist
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -94,7 +94,8 @@ module IsoDoc
       end
 
       def note_attrs(node)
-        attr_code(id: node["id"], class: "Note", style: keep_style(node))
+        attr_code(id: node["id"], class: "Note", style: keep_style(node),
+                  coverpage: node["coverpage"])
       end
 
       def note_parse(node, out)
@@ -108,6 +109,40 @@ module IsoDoc
         end
         @note = false
       end
+
+      def middle_admonitions(isoxml, out)
+        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+          parse(x, out)
+        end
+      end
+
+      def admonition_name_parse(_node, div, name)
+        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def admonition_class(_node)
+        "Admonition"
+      end
+
+      def admonition_name(node, _type)
+        node&.at(ns("./name"))
+      end
+
+      def admonition_attrs(node)
+        attr_code(id: node["id"], class: admonition_class(node),
+                  style: keep_style(node), coverpage: node["coverpage"])
+      end
+
+      def admonition_parse(node, out)
+        type = node["type"]
+        name = admonition_name(node, type)
+        out.div **admonition_attrs(node) do |t|
+          admonition_name_parse(node, t, name) if name
+          node.children.each { |n| parse(n, t) unless n.name == "name" }
+        end
+      end
     end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -14,6 +14,10 @@ module IsoDoc
         end
       end
 
+      def span_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
+
       def callout_parse(node, out)
         out << " &lt;#{node.text}&gt;"
       end

data/lib/isodoc/function/references.rb

@@ -10,7 +10,6 @@ module IsoDoc
         text
       end
 
-      # TODO generate formatted ref if not present
       def nonstd_bibitem(list, bib, ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           ids = bibitem_ref_code(bib)
@@ -126,13 +125,6 @@ module IsoDoc
         { id: bib["id"], class: biblio ? "Biblio" : "NormRef" }
       end
 
-      def iso_title(bib)
-        bib.at(ns("./title[@language = '#{@lang}' and @type = 'main']")) ||
-          bib.at(ns("./title[@language = '#{@lang}']")) ||
-          bib.at(ns("./title[@type = 'main']")) ||
-          bib.at(ns("./title"))
-      end
-
       # reference not to be rendered because it is deemed implicit
       # in the standards environment
       def implicit_reference(bib)
@@ -145,13 +137,8 @@ module IsoDoc
       end
 
       def reference_format(bib, out)
-        if ftitle = bib.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, out) }
-        else
-          out.i do |i|
-            iso_title(bib)&.children&.each { |n| parse(n, i) }
-          end
-        end
+        ftitle = bib.at(ns("./formattedref"))
+        ftitle&.children&.each { |n| parse(n, out) }
       end
 
       def standard?(bib)
@@ -171,7 +158,7 @@ module IsoDoc
           if b.name == "bibitem"
             next if implicit_reference(b)
 
-            i += 1
+            i += 1 unless b["hidden"]
             if standard?(b) then std_bibitem_entry(div, b, i, biblio)
             else nonstd_bibitem(div, b, i, biblio)
             end
@@ -190,7 +177,7 @@ module IsoDoc
         (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
           return num
         out.div do |div|
-          num = num + 1
+          num += 1
           clause_name(num, f.at(ns("./title")), div, nil)
           if f.name == "clause"
             f.elements.each { |e| parse(e, div) unless e.name == "title" }

data/lib/isodoc/function/section.rb

@@ -157,6 +157,11 @@ module IsoDoc
            acknowledgements).include? name
       end
 
+      def single_term_clause?(elem)
+        t = elem.xpath(ns("./clause | ./terms | ./definitions | ./references"))
+        t.size == 1 && %w(terms definitions references).include?(t[0].name)
+      end
+
       def preface_block(isoxml, out)
         p = isoxml.at(ns("//preface")) or return
         p.elements.each do |e|

data/lib/isodoc/function/to_word_html.rb

@@ -183,7 +183,7 @@ module IsoDoc
           when "formula" then formula_parse(node, out)
           when "table" then table_parse(node, out)
           when "figure" then figure_parse(node, out)
-          when "example" then example_parse(node, out)
+          when "example", "termexample" then example_parse(node, out)
           when "image" then image_parse(node, out, nil)
           when "sourcecode" then sourcecode_parse(node, out)
           when "pre" then pre_parse(node, out)
@@ -197,7 +197,6 @@ module IsoDoc
           when "termsource" then termref_parse(node, out)
           when "modification" then modification_parse(node, out)
           when "termnote" then termnote_parse(node, out)
-          when "termexample" then example_parse(node, out)
           when "terms" then terms_parse(node, out)
           when "definitions" then symbols_parse(node, out)
           when "references" then bibliography_parse(node, out)
@@ -205,15 +204,11 @@ module IsoDoc
           when "requirement" then requirement_parse(node, out)
           when "recommendation" then recommendation_parse(node, out)
           when "permission" then permission_parse(node, out)
-          when "subject" then requirement_skip_parse(node, out)
-          when "classification" then requirement_skip_parse(node, out)
-          when "inherit" then requirement_component_parse(node, out)
-          when "description" then requirement_component_parse(node, out)
-          when "specification" then requirement_component_parse(node, out)
-          when "measurement-target" then requirement_component_parse(node, out)
-          when "verification" then requirement_component_parse(node, out)
-          when "import" then requirement_component_parse(node, out)
-          when "component" then requirement_component_parse(node, out)
+          when "subject", "classification"
+            requirement_skip_parse(node, out)
+          when "inherit", "description", "specification", "measurement-target",
+           "verification", "import", "component"
+            requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)
           when "termref" then termrefelem_parse(node, out)
@@ -235,6 +230,7 @@ module IsoDoc
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
           when "variant-title" then variant_title(node, out)
+          when "span" then span_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/html_function/postprocess.rb

@@ -103,6 +103,20 @@ module IsoDoc
         %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)
@@ -166,8 +180,8 @@ module IsoDoc
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
         docxml.xpath("//*[local-name() = 'img']").each do |i|
-          i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
-                                                          @maxheight, @maxwidth)
+          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)

data/lib/isodoc/metadata.rb

@@ -107,7 +107,8 @@ module IsoDoc
     end
 
     def version(isoxml, _out)
-      set(:edition, isoxml&.at(ns("//bibdata/edition"))&.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

data/lib/isodoc/presentation_function/bibdata.rb

@@ -1,7 +1,10 @@
+require "csv"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
       toc_metadata(docxml)
+      fonts_metadata(docxml)
       docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
@@ -34,6 +37,23 @@ module IsoDoc
       end
     end
 
+    def fonts_metadata(xmldoc)
+      return unless @fontist_fonts
+
+      ins = xmldoc.at(ns("//presentation-metadata")) ||
+        xmldoc.at(ns("//misc-container")) || xmldoc.at(ns("//bibdata"))
+      CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
+        ins.next = presmeta("fonts", f)
+      end
+      @fontlicenseagreement and
+        ins.next = presmeta("font-license-agreement", @fontlicenseagreement)
+    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 << s.children.to_xml }
@@ -59,16 +79,42 @@ module IsoDoc
       hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype")
       hash_translate(bib, @i18n.get["stage_dict"], "./status/stage")
       hash_translate(bib, @i18n.get["substage_dict"], "./status/substage")
+      edition_translate(bib)
     end
 
     def hash_translate(bibdata, hash, xpath, lang = @lang)
       x = bibdata.at(ns(xpath)) or return
-      x["language"] = ""
       hash.is_a? Hash or return
       hash[x.text] or return
-      x.next = x.dup
-      x.next["language"] = lang
-      x.next.children = hash[x.text]
+      tag_translate(x, lang, hash[x.text])
+    end
+
+    # does not allow %Spellout and %Ordinal in the ordinal expression to be mixed
+    def edition_translate(bibdata)
+      x = bibdata.at(ns("./edition")) or return
+      /^\d+$/.match?(x.text) or return
+      tag_translate(x, @lang,
+                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/,
+                                              edition_translate1(x.text.to_i)))
+    end
+
+    def edition_translate1(num)
+      ruleset = case @i18n.edition_ordinal
+                when /%Spellout/ then "SpelloutRules"
+                when /%Ordinal/ then "OrdinalRules"
+                else "Digit"
+                end
+      ruleset == "Digit" and return num.to_s
+      ed = @c.decode(@i18n.edition)
+      @i18n.inflect_ordinal(num, @i18n.inflection&.dig(ed) || {},
+                            ruleset)
+    end
+
+    def tag_translate(tag, lang, value)
+      tag["language"] = ""
+      tag.next = tag.dup
+      tag.next["language"] = lang
+      tag.next.children = value
     end
 
     def i18n_tag(key, value)

data/lib/isodoc/presentation_function/block.rb

@@ -71,7 +71,7 @@ module IsoDoc
 
     # introduce name element
     def note1(elem)
-      return if elem.parent.name == "bibitem"
+      return if elem.parent.name == "bibitem" || elem["notag"] == "true"
 
       n = @xrefs.get[elem["id"]]
       lbl = if n.nil? || n[:label].nil? || n[:label].empty?
@@ -82,6 +82,18 @@ module IsoDoc
       prefix_name(elem, "", lbl, "name")
     end
 
+    def admonition(docxml)
+      docxml.xpath(ns("//admonition")).each do |f|
+        admonition1(f)
+      end
+    end
+
+    def admonition1(elem)
+      return if elem.at(ns("./name")) || elem["notag"] == "true"
+
+      prefix_name(elem, "", @i18n.admonition[elem["type"]]&.upcase, "name")
+    end
+
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
         recommendation1(f, lower2cap(@i18n.recommendation))

data/lib/isodoc/presentation_function/section.rb

@@ -1,3 +1,5 @@
+require_relative "../../relaton/render/general"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)
@@ -40,6 +42,7 @@ module IsoDoc
     def annex(docxml)
       docxml.xpath(ns("//annex")).each do |f|
         annex1(f)
+        @xrefs.klass.single_term_clause?(f) and single_term_clause(f)
       end
     end
 
@@ -51,6 +54,16 @@ module IsoDoc
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
+    def single_term_clause(elem)
+      t = elem.at(ns("./terms | ./definitions | ./references"))
+      t.at(ns("./title")).remove
+      t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
+        .each do |c|
+          tit = c.at(ns("./title")) or return
+          tit["depth"] = tit["depth"].to_i - 1
+        end
+    end
+
     def term(docxml)
       docxml.xpath(ns("//term")).each do |f|
         term1(f)
@@ -64,13 +77,36 @@ module IsoDoc
 
     def references(docxml)
       bibliography_bibitem_number(docxml)
+      docxml.xpath(ns("//references/bibitem")).each do |x|
+        bibitem(x)
+      end
+      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def bibitem(xml)
+      bibrender(xml)
+    end
+
+    def bibrender(xml)
+      if f = xml.at(ns("./formattedref"))
+        code = render_identifier(bibitem_ref_code(xml))
+        f << " [#{code[:sdo]}] " if code[:sdo]
+      else
+        xml.children =
+          "#{bibrenderer.render(xml.to_xml)}"\
+          "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+      end
+    end
+
+    def bibrenderer
+      ::Relaton::Render::IsoDoc::General.new(language: @lang)
     end
 
     def bibliography_bibitem_number_skip(bibitem)
       @xrefs.klass.implicit_reference(bibitem) ||
         bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']"))
-      # || @xrefs.klass.standard?(bibitem)
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
+        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
     end
 
     def bibliography_bibitem_number(docxml)

data/lib/isodoc/presentation_xml_convert.rb

@@ -30,11 +30,15 @@ module IsoDoc
       inline docxml
     end
 
+    # parse annex after term, references,
+    # to deal with single-term and single-ref annexes
     def section(docxml)
+      references docxml
+      # triggers xrefs reparse, so put references before all other sections,
+      # which alter titles and thus can alter xrefs
       clause docxml
-      annex docxml
       term docxml
-      references docxml
+      annex docxml
       index docxml
       clausetitle docxml
       floattitle docxml
@@ -50,6 +54,7 @@ module IsoDoc
       formula docxml
       example docxml
       note docxml
+      admonition docxml
       ol docxml
       permission docxml
       requirement docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.8".freeze
+  VERSION = "2.1.0".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -39,16 +39,16 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
+          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
-        Html2Doc.process(
-          result,
+        Html2Doc.new(
           filename: filename,
           imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],
           liststyles: { ul: @ulstyle, ol: @olstyle }
-        )
+        ).process(result)
         header&.unlink
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
@@ -71,7 +71,7 @@ module IsoDoc
       def word_admonition_images(docxml)
         docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
           i["width"], i["height"] =
-            Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
+            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight, 300)
         end
       end
 

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -174,6 +174,20 @@ module IsoDoc
         %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 generate_header(filename, _dir)