isodoc 2.4.1 → 2.4.3

data/lib/isodoc/html_function/html.rb

@@ -7,7 +7,7 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         bibitem_lookup(docxml)
         noko do |xml|
-          xml.html **{ lang: @lang.to_s } do |html|
+          xml.html lang: @lang.to_s do |html|
             info docxml, nil
             populate_css
             html.head { |head| define_head head, filename, dir }
@@ -19,7 +19,7 @@ module IsoDoc
       def make_body1(body, _docxml)
         return if @bare
 
-        body.div **{ class: "title-section" } do |div1|
+        body.div class: "title-section" do |div1|
           div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
@@ -28,14 +28,14 @@ module IsoDoc
       def make_body2(body, _docxml)
         return if @bare
 
-        body.div **{ class: "prefatory-section" } do |div2|
+        body.div class: "prefatory-section" do |div2|
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
@@ -51,8 +51,8 @@ module IsoDoc
 
       def googlefonts
         <<~HEAD.freeze
-          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet"/>
+          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet"/>
         HEAD
       end
 
@@ -66,11 +66,11 @@ module IsoDoc
           <script type="text/javascript">#{toclevel}</script>
 
           <!--Google fonts-->
-          <link rel="preconnect" href="https://fonts.gstatic.com">#{' '}
+          <link rel="preconnect" href="https://fonts.gstatic.com"/>
           #{googlefonts}
           <!--Font awesome import for the link icon-->
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous"/>
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous"/>
           <style class="anchorjs"></style>
         HEAD
       end
@@ -91,10 +91,10 @@ module IsoDoc
 
       def sourcecode_parse(node, out)
         name = node.at(ns("./name"))
-        out.pre **sourcecode_attrs(node).merge(class: "sourcecode") do |div|
-          @sourcecode = true unless node.at(ns(".//sourcecode"))
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
-          @sourcecode = false
+        tag = node.at(ns(".//sourcecode | .//table")) ? "div" : "pre"
+        attr = sourcecode_attrs(node).merge(class: "sourcecode")
+        out.send tag, **attr do |div|
+          sourcecode_parse1(node, div)
         end
         sourcecode_name_parse(node, out, name)
       end

data/lib/isodoc/html_function/postprocess.rb

@@ -27,7 +27,20 @@ module IsoDoc
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
         html = footnote_format(footnote_backlinks(html_toc(html)))
-        mathml(html_list_clean(remove_placeholder_paras(html)))
+        html = mathml(html_list_clean(remove_placeholder_paras(html)))
+        sourcecode_cleanup(html)
+      end
+
+      def sourcecode_cleanup(html)
+        ann = ".//div[@class = 'annotation']"
+        html.xpath("//pre[#{ann}] | //div[@class = 'sourcecode'][#{ann}]")
+          .each do |p|
+          ins = p.after("<pre class='sourcecode'/>").next_element
+          p.xpath(ann).each do |d|
+            ins << d.remove.children
+          end
+        end
+        html
       end
 
       def remove_placeholder_paras(html)

data/lib/isodoc/metadata.rb

@@ -170,7 +170,7 @@ module IsoDoc
     end
 
     def code_css(isoxml, _out)
-      c = isoxml.at(ns("//misc-container/source-highlighter-css")) or return
+      c = isoxml.at(ns("//metanorma-extension/source-highlighter-css")) or return
       set(:code_css, c.text)
     end
   end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -17,8 +17,8 @@ module IsoDoc
     def toc_metadata(docxml)
       return unless @tocfigures || @toctables || @tocrecommendations
 
-      ins = docxml.at(ns("//misc-container")) ||
-        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      ins = docxml.at(ns("//metanorma-extension"))  ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").next_element
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and
@@ -41,7 +41,7 @@ module IsoDoc
       return unless @fontist_fonts
 
       ins = xmldoc.at(ns("//presentation-metadata")) ||
-        xmldoc.at(ns("//misc-container")) || xmldoc.at(ns("//bibdata"))
+        xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
       CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
         ins.next = presmeta("fonts", f)
       end

data/lib/isodoc/presentation_function/block.rb

@@ -1,4 +1,5 @@
 require_relative "./image"
+require_relative "./sourcecode"
 require "rouge"
 
 module IsoDoc
@@ -26,104 +27,6 @@ module IsoDoc
       end
     end
 
-    def sourcehighlighter_theme
-      "igorpro"
-    end
-
-    def sourcehighlighter_css(docxml)
-      @sourcehighlighter or return
-      ins = docxml.at(ns("//misc-container")) ||
-        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
-      x = Rouge::Theme.find(sourcehighlighter_theme)
-        .render(scope: "sourcecode")
-      ins << "<source-highlighter-css>#{x}</source-highlighter-css>"
-    end
-
-    def sourcehighlighter
-      @sourcehighlighter or return
-      f = Rouge::Formatters::HTML.new
-      { formatter: f,
-        formatter_line: Rouge::Formatters::HTMLTable.new(f, {}) }
-    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)
-      wrapper, code =
-        if elem["linenums"] == "true" then sourcecode_table_to_elem(elem, p)
-        else
-          r = Nokogiri::XML.fragment(@highlighter[:formatter].format(p))
-          [r, r]
-        end
-      elem.children = source_restore_markup(wrapper, code, markup)
-    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, code, markup)
-      text = source_restore_callouts(code, markup[:call])
-      ret = if code == wrapper
-              text
-            else
-              code.replace(text)
-              to_xml(wrapper)
-            end
-      "#{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+$/, " #{callouts[0][:xml]} ")
-          callouts.shift
-        end
-      end.join("\n")
-    end
-
-    def sourcecode_table_to_elem(elem, tokens)
-      r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
-      pre = r.at(".//td[@class = 'rouge-code']/pre")
-      %w(style).each { |n| elem[n] and pre[n] = elem[n] }
-      pre.name = "sourcecode"
-      [r, pre]
-    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
-
     def formula(docxml)
       docxml.xpath(ns("//formula")).each { |f| formula1(f) }
     end

data/lib/isodoc/presentation_function/math.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return localized unless twitter_cldr_reader_symbols[:decimal]
 
       integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])
-      return localized if fraction.nil? || fraction.length.zero?
+      return localized if fraction.nil? || fraction.empty?
 
       [integer, decorate_fraction_part(fraction, locale)]
         .join(twitter_cldr_reader_symbols[:decimal])
@@ -97,14 +97,25 @@ module IsoDoc
     end
 
     def mathml1(node, locale)
+      mathml_style_inherit(node)
       asciimath_dup(node)
       localize_maths(node, locale)
-      return unless node.elements.size == 1 && node.elements.first.name == "mn"
+      mathml_number_to_number(node)
+    end
+
+    def mathml_style_inherit(node)
+      node.at("./ancestor::xmlns:strong") or return
+      node.children =
+        "<mstyle fontweight='bold'>#{node.children.to_xml}</mstyle>"
+    end
 
+    def mathml_number_to_number(node)
+      (node.elements.size == 1 && node.elements.first.name == "mn") or return
+      repl = node.at("./m:mn", MATHML).children
       if node.parent.name == "stem"
-        node.parent.replace(node.at("./m:mn", MATHML).children)
+        node.parent.replace(repl)
       else
-        node.replace(node.at("./m:mn", MATHML).children)
+        node.replace(repl)
       end
     end
   end

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -0,0 +1,122 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def sourcehighlighter_css(docxml)
+      @sourcehighlighter or return
+      ins = docxml.at(ns("//metanorma-extension")) ||
+        docxml.at(ns("//bibdata")).after("<metanorma-extension/>").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
+      Rouge::Formatter.enable_escape!
+      f = Rouge::Formatters::HTML.new
+      opts = { gutter_class: "rouge-gutter", code_class: "rouge-code" }
+      f1 = Rouge::Formatters::HTMLLineTable.new(f, opts)
+      { formatter: f, formatter_line: f1 }
+    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
+      source_remove_annotations(ret, elem)
+      ret
+    end
+
+    def source_remove_annotations(ret, elem)
+      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)
+      lexer = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+       Rouge::Lexer.find("plaintext"))
+      l = Rouge::Lexers::Escape.new(start: "{^^{", end: "}^^}", lang: lexer)
+      source = to_xml(elem.children).gsub(/</, "{^^{<").gsub(/>/, ">}^^}")
+      l.lex(@c.decode(source))
+    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/presentation_xml_convert.rb

@@ -24,6 +24,7 @@ module IsoDoc
     end
 
     def conversions(docxml)
+      semantic_xml_insert(docxml)
       bibdata docxml
       @xrefs.parse docxml
       section docxml
@@ -84,6 +85,43 @@ module IsoDoc
       related docxml
     end
 
+    def semantic_xml_insert(xml)
+      @semantic_xml_insert or return
+      embed = to_xml(embedable_semantic_xml(xml))
+      ins = metanorma_extension_insert_pt(xml)
+      ins = ins.at(ns("./metanorma")) || ins.add_child("<metanorma/>").first
+      ins << "<source>#{embed}</source>"
+    end
+
+    def metanorma_extension_insert_pt(xml)
+      xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+        &.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>")
+          .previous_element
+    end
+
+    def embedable_semantic_xml(xml)
+      xml = embedable_semantic_xml_tags(xml)
+      embedable_semantic_xml_attributes(xml)
+    end
+
+    def embedable_semantic_xml_tags(xml)
+      Nokogiri::XML(to_xml(xml).gsub(%r{(</?)([[:alpha:]])},
+                                     "\\1semantic__\\2")).root
+    end
+
+    def embedable_semantic_xml_attributes(xml)
+      Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
+        tag_name == "*" or tag_name = "semantic__#{tag_name}"
+        xml.xpath(ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
+          elem.attributes[attr_name].value =
+            "semantic__#{elem.attributes[attr_name].value}"
+        end
+      end
+      xml
+    end
+
     def postprocess(result, filename, _dir)
       to_xml_file(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.1".freeze
+  VERSION = "2.4.3".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
@@ -244,11 +244,11 @@ module IsoDoc
 
       def info(isoxml, out)
         @tocfigurestitle =
-          isoxml&.at(ns("//misc-container/toc[@type = 'figure']/title"))&.text
+          isoxml&.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
         @toctablestitle =
-          isoxml&.at(ns("//misc-container/toc[@type = 'table']/title"))&.text
+          isoxml&.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
         @tocrecommendationstitle = isoxml
-          &.at(ns("//misc-container/toc[@type = 'recommendation']/title"))&.text
+          &.at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
         super
       end
     end