isodoc 2.4.1 → 2.4.2

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -0,0 +1,114 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def sourcehighlighter_css(docxml)
+      @sourcehighlighter or return
+      ins = docxml.at(ns("//misc-container")) ||
+        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      ins << "<source-highlighter-css>#{sourcehighlighter_css_file}" \
+             "</source-highlighter-css>"
+    end
+
+    def sourcehighlighter_css_file
+      File.read(File.join(File.dirname(__FILE__), "..", "base_style",
+                          "rouge.css"))
+    end
+
+    def sourcehighlighter
+      @sourcehighlighter or return
+      f = Rouge::Formatters::HTML.new
+      opts = { gutter_class: "rouge-gutter", code_class: "rouge-code" }
+      { formatter: f,
+        formatter_line: Rouge::Formatters::HTMLLineTable.new(f, opts) }
+    end
+
+    def sourcecode(docxml)
+      sourcehighlighter_css(docxml)
+      @highlighter = sourcehighlighter
+      docxml.xpath(ns("//sourcecode")).each do |f|
+        sourcecode1(f)
+      end
+    end
+
+    def sourcecode1(elem)
+      source_highlight(elem)
+      source_label(elem)
+    end
+
+    def source_highlight(elem)
+      @highlighter or return
+      markup = source_remove_markup(elem)
+      p = source_lex(elem)
+      elem.children = if elem["linenums"] == "true"
+                        r = sourcecode_table_to_elem(elem, p)
+                        source_restore_markup_table(r, markup)
+                      else
+                        r = @highlighter[:formatter].format(p)
+                        source_restore_markup(Nokogiri::XML.fragment(r), markup)
+                      end
+    end
+
+    def source_remove_markup(elem)
+      ret = {}
+      name = elem.at(ns("./name")) and ret[:name] = name.remove.to_xml
+      ret[:ann] = elem.xpath(ns("./annotation")).each(&:remove)
+      ret[:call] = elem.xpath(ns("./callout")).each_with_object([]) do |c, m|
+        m << { xml: c.remove.to_xml, line: c.line - elem.line }
+      end
+      ret
+    end
+
+    def source_restore_markup(wrapper, markup)
+      ret = source_restore_callouts(wrapper, markup[:call])
+      "#{markup[:name]}#{ret}#{markup[:ann]}"
+    end
+
+    def source_restore_markup_table(wrapper, markup)
+      source_restore_callouts_table(wrapper, markup[:call])
+      ret = to_xml(wrapper)
+      "#{markup[:name]}#{ret}#{markup[:ann]}"
+    end
+
+    def source_restore_callouts(code, callouts)
+      text = to_xml(code)
+      text.split(/[\n\r]/).each_with_index do |c, i|
+        while !callouts.empty? && callouts[0][:line] == i
+          c.sub!(/\s+$/, " <span class='c'>#{callouts[0][:xml]}</span> ")
+          callouts.shift
+        end
+      end.join("\n")
+    end
+
+    def source_restore_callouts_table(table, callouts)
+      table.xpath(".//td[@class = 'rouge-code']/sourcecode")
+        .each_with_index do |c, i|
+        while !callouts.empty? && callouts[0][:line] == i
+          c << " <span class='c'>#{callouts[0][:xml]}</span> "
+          callouts.shift
+        end
+      end
+    end
+
+    def sourcecode_table_to_elem(elem, tokens)
+      r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
+      r.xpath(".//td[@class = 'rouge-code']/pre").each do |pre|
+        %w(style).each { |n| elem[n] and pre[n] = elem[n] }
+        pre.name = "sourcecode"
+        pre.children = to_xml(pre.children).sub(/\s+$/, "")
+      end
+      r
+    end
+
+    def source_lex(elem)
+      l = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+       Rouge::Lexer.find("plaintext"))
+      l.lex(@c.decode(elem.children.to_xml))
+    end
+
+    def source_label(elem)
+      labelled_ancestor(elem) and return
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      prefix_name(elem, block_delim,
+                  l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
+    end
+  end
+end

data/lib/isodoc/presentation_function/terms.rb

@@ -46,9 +46,8 @@ module IsoDoc
     end
 
     def concept1_linkmention(ref, renderterm, opts)
-      return unless opts[:linkmention] == "true" &&
-        !renderterm.nil? && !ref.nil?
-
+      (opts[:linkmention] == "true" &&
+        !renderterm.nil? && !ref.nil?) or return
       ref2 = ref.clone
       r2 = renderterm.clone
       renderterm.replace(ref2).children = r2
@@ -56,16 +55,14 @@ module IsoDoc
 
     def concept1_ref(_node, ref, opts)
       ref.nil? and return
-      return ref.remove if opts[:ref] == "false"
-
+      opts[:ref] == "false" and return ref.remove
       r = concept1_ref_content(ref)
       ref = r.at("./descendant-or-self::xmlns:xref | " \
                  "./descendant-or-self::xmlns:eref | " \
                  "./descendant-or-self::xmlns:termref")
       %w(xref eref).include? ref&.name and get_linkend(ref)
-      if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
+      opts[:linkref] == "false" && %w(xref eref).include?(ref&.name) and
         ref.replace(ref.children)
-      end
     end
 
     def concept1_ref_content(ref)
@@ -97,9 +94,8 @@ module IsoDoc
 
     def designation(docxml)
       docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
-      docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
-        designation1(p)
-      end
+      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
+        .each { |p| designation1(p) }
     end
 
     def merge_second_preferred(term)
@@ -112,11 +108,10 @@ module IsoDoc
     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("#{to_xml(n1.children)}; #{Common::to_xml(n2.children)}")
-      end
+      merge_preferred_eligible?(pref, second) or return
+      n1 = pref.at(ns("./expression/name"))
+      n2 = second.remove.at(ns("./expression/name"))
+      n1.children = l10n("#{to_xml(n1.children)}; #{Common::to_xml(n2.children)}")
     end
 
     def merge_preferred_eligible?(first, second)
@@ -132,7 +127,6 @@ module IsoDoc
       s = desgn.at(ns("./termsource"))
       name = desgn.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return
-
       designation_annotate(desgn, name)
       s and desgn.next = s
     end
@@ -156,8 +150,7 @@ module IsoDoc
     def designation_field(desgn, name)
       f = desgn.xpath(ns("./field-of-application | ./usage-info"))
         &.map { |u| to_xml(u.children) }&.join(", ")
-      return nil if f&.empty?
-
+      f&.empty? and return nil
       name << ", &#x3c;#{f}&#x3e;"
     end
 
@@ -178,27 +171,21 @@ module IsoDoc
       loc = [desgn&.at(ns("./expression/@language"))&.text,
              desgn&.at(ns("./expression/@script"))&.text,
              desgn&.at(ns("./@geographic-area"))&.text].compact
-      return if loc.empty?
-
+      loc.empty? and return
       name << ", #{loc.join(' ')}"
     end
 
     def designation_pronunciation(desgn, name)
       f = desgn.at(ns("./expression/pronunciation")) or return
-
       name << ", /#{to_xml(f.children)}/"
     end
 
     def termexample(docxml)
-      docxml.xpath(ns("//termexample")).each do |f|
-        example1(f)
-      end
+      docxml.xpath(ns("//termexample")).each { |f| example1(f) }
     end
 
     def termnote(docxml)
-      docxml.xpath(ns("//termnote")).each do |f|
-        termnote1(f)
-      end
+      docxml.xpath(ns("//termnote")).each { |f| termnote1(f) }
     end
 
     def termnote1(elem)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.1".freeze
+  VERSION = "2.4.2".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -19,14 +19,14 @@ module IsoDoc
       end
 
       def make_body1(body, _docxml)
-        body.div **{ class: "WordSection1" } do |div1|
+        body.div class: "WordSection1" do |div1|
           div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
+        body.div class: "WordSection2" do |div2|
           boilerplate docxml, div2
           preface_block docxml, div2
           abstract docxml, div2
@@ -40,7 +40,7 @@ module IsoDoc
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "WordSection3" } do |div3|
+        body.div class: "WordSection3" do |div3|
           middle docxml, div3
           footnotes div3
           comments div3
@@ -93,7 +93,7 @@ module IsoDoc
 
       def dl_parse_table(node, out)
         list_title_parse(node, out)
-        out.table **{ class: "dl" } do |v|
+        out.table class: "dl" do |v|
           node.elements.select { |n| dt_dd?(n) }
             .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)
@@ -104,10 +104,10 @@ module IsoDoc
 
       def dl_parse_table1(table, dterm, ddefn)
         table.tr do |tr|
-          tr.td **{ valign: "top", align: "left" } do |term|
+          tr.td valign: "top", align: "left" do |term|
             dt_parse(dterm, term)
           end
-          tr.td **{ valign: "top" } do |listitem|
+          tr.td valign: "top" do |listitem|
             ddefn.children.each { |n| parse(n, listitem) }
           end
         end
@@ -118,7 +118,7 @@ module IsoDoc
         return if remainder.empty?
 
         out.tr do |tr|
-          tr.td **{ colspan: 2 } do |td|
+          tr.td colspan: 2 do |td|
             remainder.each { |n| parse(n, td) }
           end
         end
@@ -149,8 +149,8 @@ module IsoDoc
 
       def note_p_parse(node, div)
         name = node&.at(ns("./name"))&.remove
-        div.p **{ class: "Note" } do |p|
-          p.span **{ class: "note_label" } do |s|
+        div.p class: "Note" do |p|
+          p.span class: "note_label" do |s|
             name&.children&.each { |n| parse(n, s) }
           end
           insert_tab(p, 1)
@@ -161,8 +161,8 @@ module IsoDoc
 
       def note_parse1(node, div)
         name = node&.at(ns("./name"))&.remove
-        div.p **{ class: "Note" } do |p|
-          p.span **{ class: "note_label" } do |s|
+        div.p class: "Note" do |p|
+          p.span class: "note_label" do |s|
             name&.children&.each { |n| parse(n, s) }
           end
           insert_tab(p, 1)
@@ -173,7 +173,7 @@ module IsoDoc
       def termnote_parse(node, out)
         name = node&.at(ns("./name"))&.remove
         out.div **note_attrs(node) do |div|
-          div.p **{ class: "Note" } do |p|
+          div.p class: "Note" do |p|
             if name
               name.children.each { |n| parse(n, p) }
               p << termnote_delim
@@ -196,10 +196,10 @@ module IsoDoc
 
       def example_table_attr(node)
         super.merge(
-          style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
-                 "mso-table-rspace:15.0cm;margin-right:423.0pt;"\
-                 "mso-table-anchor-horizontal:column;"\
-                 "mso-table-overlap:never;border-collapse:collapse;"\
+          style: "mso-table-lspace:15.0cm;margin-left:423.0pt;" \
+                 "mso-table-rspace:15.0cm;margin-right:423.0pt;" \
+                 "mso-table-anchor-horizontal:column;" \
+                 "mso-table-overlap:never;border-collapse:collapse;" \
                  "#{keep_style(node)}",
         )
       end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,32 +1,15 @@
 require "fileutils"
 require_relative "./postprocess_cover"
+require_relative "./postprocess_toc"
 
 module IsoDoc
   module WordFunction
     module Postprocess
-      # add namespaces for Word fragments
-      WORD_NOKOHEAD = <<~HERE.freeze
-        <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml"
-        xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"
-        xmlns:w="urn:schemas-microsoft-com:office:word"
-        xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
-        <head> <title></title> <meta charset="UTF-8" /> </head>
-        <body> </body> </html>
-      HERE
-
-      def to_word_xhtml_fragment(xml)
-        doc = ::Nokogiri::XML.parse(WORD_NOKOHEAD)
-        ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
-      end
-
       def table_note_cleanup(docxml)
         super
         # preempt html2doc putting MsoNormal there
         docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]")
-          .each do |p|
-          p["class"] = "Note"
-        end
+          .each { |p| p["class"] = "Note" }
       end
 
       def postprocess(result, filename, dir)
@@ -56,23 +39,6 @@ module IsoDoc
         "Sourcecode"
       end
 
-      def wordstylesheet_update
-        return if @wordstylesheet.nil?
-
-        f = File.open(@wordstylesheet.path, "a")
-        @landscapestyle.empty? or f.write(@landscapestyle)
-        s = @meta.get[:code_css] and
-          f.write(s.gsub(/sourcecode/, "p.#{sourcecode_style}"))
-        if @wordstylesheet_override && @wordstylesheet
-          f.write(@wordstylesheet_override.read)
-          @wordstylesheet_override.close
-        elsif @wordstylesheet_override && !@wordstylesheet
-          @wordstylesheet = @wordstylesheet_override
-        end
-        f.close
-        @wordstylesheet
-      end
-
       def word_admonition_images(docxml)
         docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
           i["width"], i["height"] =
@@ -84,6 +50,7 @@ module IsoDoc
       def word_cleanup(docxml)
         word_annex_cleanup(docxml)
         word_preface(docxml)
+        word_sourcecode_annotations(docxml)
         word_sourcecode_table(docxml)
         word_nested_tables(docxml)
         word_colgroup(docxml)
@@ -101,18 +68,29 @@ module IsoDoc
         docxml
       end
 
-      def word_sourcecode_table(docxml)
-        docxml.xpath("//p[@class='Sourcecode']/div[@class='table_container']")
-          .each do |d|
-            pre = d.at(".//p[@class='Sourcecode']")
-            to_sourcecode_para(pre)
-            d["id"] = d.parent["id"]
-            d.parent.replace(d)
+      def word_sourcecode_annotations(html)
+        ann = ".//div[@class = 'annotation']"
+        html.xpath("//p[@class = '#{sourcecode_style}'][#{ann}]")
+          .each do |p|
+          ins = p.after("<p class='#{sourcecode_style}'/>").next_element
+          p.xpath(ann).each do |d|
+            ins << d.remove.children
           end
+        end
+      end
+
+      def word_sourcecode_table(docxml)
+        s = "p[@class='#{sourcecode_style}']"
+        docxml.xpath("//#{s}/div[@class='table_container']").each do |d|
+          pre = d.at(".//#{s}")
+          to_sourcecode_para(pre)
+          d["id"] = d.parent["id"]
+          d.parent.replace(d)
+        end
       end
 
       def to_sourcecode_para(pre)
-        @sourcecode = true
+        @sourcecode = "pre"
         pre.traverse do |x|
           x.text? or next
           ret = []
@@ -173,8 +151,7 @@ module IsoDoc
       end
 
       def style_update(node, css)
-        return unless node
-
+        node or return
         node["style"] =
           node["style"] ? node["style"].sub(/;?$/, ";#{css}") : css
       end
@@ -182,11 +159,11 @@ module IsoDoc
       def word_image_caption(docxml)
         docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']")
           .each do |t|
-          if t&.previous_element&.name == "img"
+          if t.previous_element&.name == "img"
             img = t.previous_element
             t.previous_element.swap("<p class='figure'>#{img.to_xml}</p>")
           end
-          style_update(t&.previous_element, "page-break-after:avoid;")
+          style_update(t.previous_element, "page-break-after:avoid;")
         end
       end
 
@@ -213,16 +190,14 @@ module IsoDoc
 
       def word_table_align(docxml)
         docxml.xpath("//td[@align]/p | //th[@align]/p").each do |p|
-          next if p["align"]
-
+          p["align"] and next
           style_update(p, "text-align: #{p.parent['align']}")
         end
       end
 
       def word_table_separator(docxml)
         docxml.xpath("//p[@class = 'TableTitle']").each do |t|
-          next unless t.children.empty?
-
+          t.children.empty? or next
           t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
           t.children = "&#xa0;"
         end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -23,164 +23,36 @@ module IsoDoc
           introxml.to_xml(encoding: "US-ASCII")
       end
 
-      def insert_toc(intro, docxml, level)
-        toc = ""
-        toc += make_WordToC(docxml, level)
-        toc += make_table_word_toc(docxml)
-        toc += make_figure_word_toc(docxml)
-        toc += make_recommendation_word_toc(docxml)
-        intro.sub(/WORDTOC/, toc)
-      end
-
-      def word_toc_entry(toclevel, heading)
-        bookmark = bookmarkid # Random.rand(1000000000)
-        <<~TOC
-          <p class="MsoToc#{toclevel}"><span class="MsoHyperlink"><span lang="EN-GB" style='mso-no-proof:yes'>
-          <a href="#_Toc#{bookmark}">#{heading}<span lang="EN-GB" class="MsoTocTextSpan">
-          <span style='mso-tab-count:1 dotted'>. </span>
-          </span><span lang="EN-GB" class="MsoTocTextSpan">
-          <span style='mso-element:field-begin'></span></span>
-          <span lang="EN-GB" class="MsoTocTextSpan"> PAGEREF _Toc#{bookmark} \\h </span>
-            <span lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-separator'></span></span><span
-            lang="EN-GB" class="MsoTocTextSpan">1</span>
-            <span lang="EN-GB" class="MsoTocTextSpan"></span><span
-            lang="EN-GB" class="MsoTocTextSpan"><span style='mso-element:field-end'></span></span></a></span></span></p>
-
-        TOC
-      end
-
-      def word_toc_preface(level)
-        <<~TOC
-          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
-            style='mso-spacerun:yes'>&#xA0;</span>TOC \\o "1-#{level}" \\h \\z \\u <span
-            style='mso-element:field-separator'></span></span>
-        TOC
-      end
-
-      WORD_TOC_SUFFIX1 = <<~TOC.freeze
-        <p class="MsoToc1"><span lang="EN-GB"><span
-          style='mso-element:field-end'></span></span><span
-          lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
-      TOC
-
-      def make_WordToC(docxml, level)
-        toc = ""
-        # docxml.xpath("//h1 | //h2[not(ancestor::*[@class = 'Section3'])]").
-        xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
-        docxml.xpath(xpath).each do |h|
-          toc += word_toc_entry(h.name[1].to_i, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
-      end
-
-      # inheriting gems need to add native Word name of style, if different
-      # including both CSS style name and human readable style name.
-      # Any human readable style name needs to come first for the Word template
-      # to work in regenerating the ToC
-      def table_toc_class
-        %w(TableTitle tabletitle)
-      end
-
-      def figure_toc_class
-        %w(FigureTitle figuretitle)
-      end
-
-      def reqt_toc_class
-        %w(RecommendationTitle RecommendationTestTitle
-           recommendationtitle recommendationtesttitle)
-      end
-
-      def toc_word_class_list(classes)
-        classes.map do |x|
-          / /.match?(x) ? %(&quot;#{x}&quot;) : x
-        end.join(",")
-      end
-
-      def word_toc_reqt_preface1
-        <<~TOC
-          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
-          style='mso-spacerun:yes'>&#xA0;</span>TOC \\h \\z \\t #{toc_word_class_list reqt_toc_class}
-          <span style='mso-element:field-separator'></span></span>
-        TOC
-      end
-
-      def word_toc_table_preface1
-        <<~TOC
-          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
-          \\h \\z \\t #{toc_word_class_list table_toc_class} <span style='mso-element:field-separator'></span></span>
-        TOC
-      end
-
-      def word_toc_figure_preface1
-        <<~TOC
-          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
-          \\h \\z \\t #{toc_word_class_list figure_toc_class} <span style='mso-element:field-separator'></span></span>
-        TOC
-      end
-
-      def table_toc_xpath
-        attr = table_toc_class.map { |x| "@class = '#{x}'" }
-        "//p[#{attr.join(' or ')}]"
-      end
-
-      def make_table_word_toc(docxml)
-        (docxml.at(table_toc_xpath) && @toctablestitle) or return ""
-        toc = %{<p class="TOCTitle">#{@toctablestitle}</p>}
-        docxml.xpath(table_toc_xpath).each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{word_toc_table_preface1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def figure_toc_xpath
-        attr = figure_toc_class.map { |x| "@class = '#{x}'" }
-        "//p[#{attr.join(' or ')}]"
-      end
-
-      def make_figure_word_toc(docxml)
-        (docxml.at(figure_toc_xpath) && @tocfigurestitle) or return ""
-        toc = %{<p class="TOCTitle">#{@tocfigurestitle}</p>}
-        docxml.xpath(figure_toc_xpath).each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{word_toc_figure_preface1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def reqt_toc_xpath
-        attr = reqt_toc_class.map { |x| "@class = '#{x}'" }
-        "//p[#{attr.join(' or ')}]"
-      end
-
-      def make_recommendation_word_toc(docxml)
-        (docxml.at(reqt_toc_xpath) && @tocrecommendationstitle) or return ""
-        toc = %{<p class="TOCTitle">#{@tocrecommendationstitle}</p>}
-        docxml.xpath(reqt_toc_xpath).sort_by do |h|
-          recommmendation_sort_key(h.text)
-        end.each do |h|
-          toc += word_toc_entry(1, header_strip(h))
-        end
-        toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{word_toc_reqt_preface1}}) + WORD_TOC_SUFFIX1
-      end
-
-      def recommmendation_sort_key(header)
-        m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
-        m ||= [header, nil]
-        ret = "#{recommmendation_sort_key1(m[1])}::"
-        m[2] and ret += ("%04d" % m[2].to_i).to_s
-        ret
-      end
-
-      def recommmendation_sort_key1(type)
-        case type&.downcase
-        when "requirement" then "04"
-        when "recommendation" then "05"
-        when "permission" then "06"
-        else type
+      # add namespaces for Word fragments
+      WORD_NOKOHEAD = <<~HERE.freeze
+        <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"
+        xmlns:w="urn:schemas-microsoft-com:office:word"
+        xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
+        <head> <title></title> <meta charset="UTF-8" /> </head>
+        <body> </body> </html>
+      HERE
+
+      def to_word_xhtml_fragment(xml)
+        doc = ::Nokogiri::XML.parse(WORD_NOKOHEAD)
+        ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
+      end
+
+      def wordstylesheet_update
+        @wordstylesheet.nil? and return
+        f = File.open(@wordstylesheet.path, "a")
+        @landscapestyle.empty? or f.write(@landscapestyle)
+        s = @meta.get[:code_css] and
+          f.write(s.gsub(/sourcecode/, "p.#{sourcecode_style}"))
+        if @wordstylesheet_override && @wordstylesheet
+          f.write(@wordstylesheet_override.read)
+          @wordstylesheet_override.close
+        elsif @wordstylesheet_override && !@wordstylesheet
+          @wordstylesheet = @wordstylesheet_override
         end
+        f.close
+        @wordstylesheet
       end
 
       def authority_cleanup1(docxml, klass)