metanorma-standoc 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7d2f716300883df02cd6bcb01d5cfbb36390d6dfa355be0a41e55c9eeb10aa
-  data.tar.gz: 341e8403521c9bf5709593425e29317dd80c73f2c078afa2df481b9656c5b7d2
+  metadata.gz: f7e924f78d6a7faa7600c28fc8c620014dd16ea0246ab146fdbc96a3053a7763
+  data.tar.gz: 903657557475a6c7dde6657427f2a56456ad10c7587c40981cca2429b9f44e8c
 SHA512:
-  metadata.gz: cfbbce08097ed466ff9e0253f1c07769acd6384fca6688394495e488a14cf20ca239e668c03c106e969cf60afbccd88f0e197052dad9a5a32962f5b816e558cc
-  data.tar.gz: 889e1eabbe45186cd1814c99fe0b6f97317beedcb26c676c4a637ec3242b25d3b9f4e353238cbf1bd2bde8a3d18416e6774a674051c210465f36e34b729cfa81
+  metadata.gz: 183934838205bfca5d8d94bd540eefc23e6fcf552086f730d779e1fc4e7b2b292bbf10fd934f281336ad999c4bd9331444f729d825319ee5be5945a1c26f8147
+  data.tar.gz: 2a859472f86af39724db162280a4e3aff7775a88398e1b859a81cc7fa982eab255f5b7e60100d7ad143cfa3f2535093f201bd3446984474e949d8932bc8497e2

data/lib/isodoc/html/htmlstyle.css

@@ -318,6 +318,13 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/metanorma/standoc/base.rb

@@ -11,30 +11,28 @@ require_relative "localbib"
 require_relative "init"
 require "mn-requirements"
 
-require 'set'
-
 module Asciidoctor
   module Compliance
-    ADMONITION_STYLES.add('EDITOR') unless ADMONITION_STYLES.include?('EDITOR')
+    ADMONITION_STYLES.add("EDITOR") unless ADMONITION_STYLES.include?("EDITOR")
   end
 end
 
 module Metanorma
   module Standoc
     module Base
-      #XML_ROOT_TAG = "standard-document".freeze
-      #XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
+      # XML_ROOT_TAG = "standard-document".freeze
+      # XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
       FONTS_MANIFEST = "fonts-manifest".freeze
 
       attr_accessor :log
 
       def xml_root_tag
-        #self.class::XML_ROOT_TAG
+        # self.class::XML_ROOT_TAG
         "metanorma"
       end
 
       def xml_namespace
-        #self.class::XML_NAMESPACE
+        # self.class::XML_NAMESPACE
         "https://www.metanorma.org/ns/standoc"
       end
 

data/lib/metanorma/standoc/basicdoc.rng

@@ -382,33 +382,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
     <a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
     <element name="review">
       <ref name="RequiredId"/>
-      <attribute name="reviewer">
-        <a:documentation>The party who has offered the comment</a:documentation>
-      </attribute>
-      <optional>
-        <attribute name="type">
-          <a:documentation>The type of reviewer comment</a:documentation>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="date">
-          <a:documentation>The date when the comment was made</a:documentation>
-          <data type="dateTime"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="from">
-          <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
-If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="to">
-          <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
+      <ref name="ReviewAttributes"/>
       <oneOrMore>
         <ref name="paragraph">
           <a:documentation>Reviewer comments content</a:documentation>
@@ -416,6 +390,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
       </oneOrMore>
     </element>
   </define>
+  <define name="ReviewAttributes">
+    <attribute name="reviewer">
+      <a:documentation>The party who has offered the comment</a:documentation>
+    </attribute>
+    <optional>
+      <attribute name="type">
+        <a:documentation>The type of reviewer comment</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="date">
+        <a:documentation>The date when the comment was made</a:documentation>
+        <data type="dateTime"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="from">
+        <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
+If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="to">
+        <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="NumberingAttributes">
     <optional>
       <attribute name="unnumbered">
@@ -857,6 +860,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
   <define name="tr">
     <a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
     <element name="tr">
+      <ref name="TrAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="td">
@@ -869,6 +873,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="TrAttributes">
+    <empty/>
+  </define>
   <define name="tr-no-id">
     <a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
     <element name="tr">
@@ -1694,16 +1701,22 @@ which can be bookmarks as well as block or section references</a:documentation>
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as a footnote.
 The target of a footnote is the location it is embedded in within the text</a:documentation>
     <element name="fn">
-      <attribute name="reference">
-        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
-      </attribute>
-      <oneOrMore>
-        <ref name="paragraph">
-          <a:documentation>The content of the footnote</a:documentation>
-        </ref>
-      </oneOrMore>
+      <ref name="FnAttributes"/>
+      <ref name="FnBody"/>
     </element>
   </define>
+  <define name="FnBody">
+    <oneOrMore>
+      <ref name="paragraph">
+        <a:documentation>The content of the footnote</a:documentation>
+      </ref>
+    </oneOrMore>
+  </define>
+  <define name="FnAttributes">
+    <attribute name="reference">
+      <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
+    </attribute>
+  </define>
   <define name="callout">
     <a:documentation>Inline reference to a paragraph or paragraphs, appearing as annotation of source code</a:documentation>
     <element name="callout">

data/lib/metanorma/standoc/biblio-standoc.rng

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
-  <!--
-    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
-    of relaton
-    
-    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
-    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
-  -->
   <include href="biblio.rng">
+    <!-- ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix -->
+    <!--
+      Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+      of relaton
+      
+      Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+      (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+    -->
     <define name="BibData">
       <a:documentation>The bibliographic description of a standardisation document</a:documentation>
       <ref name="StandardBibliographicItem"/>
@@ -91,6 +92,9 @@ a standards definition organization</a:documentation>
         <a:documentation>Representation of the identifier for the standardisation document, giving its individual semantic components</a:documentation>
       </ref>
     </zeroOrMore>
+    <ref name="DocumentImages">
+      <a:documentation>Coverpage and other images to be rendered with document</a:documentation>
+    </ref>
   </define>
   <define name="doctype">
     <a:documentation>Classification of the standardisation document</a:documentation>
@@ -268,6 +272,32 @@ and not those document components</a:documentation>
       </optional>
     </element>
   </define>
+  <define name="DocumentImages">
+    <zeroOrMore>
+      <element name="coverpage-image">
+        <a:documentation>Images to be displayed on the coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="innercoverpage-image">
+        <a:documentation>Images to be displayed on the inner coverpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="tocside-image">
+        <a:documentation>Images to be displayed on the Table of Contents page of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+    <zeroOrMore>
+      <element name="backpage-image">
+        <a:documentation>Images to be displayed on the backpage of the document</a:documentation>
+        <ref name="image-no-id"/>
+      </element>
+    </zeroOrMore>
+  </define>
   <define name="StandardBibliographicItem">
     <ref name="BibliographicItem"/>
     <zeroOrMore>

data/lib/metanorma/standoc/biblio.rng

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  instantiations of this grammar may replace leaf strings
-  with more elaborated types; e.g. title (text) replaced with
-  title-main, title-intro, title-part; type replaced with
-  enum.
-  
-  some renaming at leaf nodes is permissible
-  
-  obligations can change both from optional to mandatory,
-  and from mandatory to optional; optional elements may
-  be omitted; freely positioned alternatives may be replaced
-  with strict ordering
-  
-  DO NOT introduce a namespace here. We do not want a distinct namespace
-  for these elements, and a distinct namespace for any grammar inheriting
-  these elements; we just want one namespace for any child grammars
-  of this.
--->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <!--
+    ALERT: we cannot have comments on root element, as they intervene with https://github.com/metanorma/metanorma/issues/437 fix
+    
+    Instantiations of this grammar may replace leaf strings
+    with more elaborated types; e.g. title (text) replaced with
+    title-main, title-intro, title-part; type replaced with
+    enum.
+    
+    Some renaming at leaf nodes is permissible
+    
+    Obligations can change both from optional to mandatory,
+    and from mandatory to optional; optional elements may
+    be omitted; freely positioned alternatives may be replaced
+    with strict ordering
+    
+    DO NOT introduce a namespace here. We do not want a distinct namespace
+    for these elements, and a distinct namespace for any grammar inheriting
+    these elements; we just want one namespace for any child grammars
+    of this.
+  -->
   <!--
     https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
     iso8601date = xsd:string { pattern = "([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?" }
@@ -1241,6 +1243,11 @@ Refer to `BibliographicItem` for definitions</a:documentation>
   </define>
   <define name="formattedref">
     <element name="formattedref">
+      <optional>
+        <attribute name="format">
+          <a:documentation>format of formatted reference; Metanorma assumes references are formatted as Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1812,6 +1819,11 @@ May be used to differentiate rendering of notes in bibliographies</a:documentati
     <a:documentation>Abstract of bibliographic item</a:documentation>
     <element name="abstract">
       <ref name="LocalizedStringAttributes"/>
+      <optional>
+        <attribute name="format">
+          <a:documentation>What format the formatted abstract is in. In Metanorma, assumed to be Metanorma XML</a:documentation>
+        </attribute>
+      </optional>
       <choice>
         <oneOrMore>
           <ref name="BasicBlockNoId">

data/lib/metanorma/standoc/blocks.rb

@@ -214,10 +214,30 @@ module Metanorma
         noko do |xml|
           xml.passthrough **attr_code(formats:
                                       node.attr("format") || "metanorma") do |p|
-            p << @c.encode(node.content, :basic, :hexadecimal)
+            content = @c.encode(node.content, :basic, :hexadecimal)
+            p << content
+            passthrough_validate(node, node.content, content)
           end
         end
       end
+
+      PASSTHROUGH_ERR = <<~ERRMSG.freeze
+        This is not valid Metanorma XML. If you intended a different format, such as HTML, you need to specify `format=` on the pass markup;
+        refer to https://www.metanorma.org/author/topics/blocks/passthroughs/
+      ERRMSG
+
+      # need to validate Metanorma XML before it passes to textcleanup,
+      # where passthrough wrapper and escaped tags are removed:
+      # <passthrough format="metanorma>&lt;tag&gt</passthrough> => <tag>
+      # Do not treat not well-formed XML as invalid,
+      # as it may be fragment, e.g. unterminated start of element markup
+      def passthrough_validate(node, content, encoded_content)
+        valid, = validate_document_fragment(content.dup)
+        err =
+          "Invalid passthrough content: #{encoded_content}\n#{PASSTHROUGH_ERR}"
+        !valid and
+          @log.add("Metanorma XML Syntax", node, err, severity: 0)
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup.rb

@@ -19,6 +19,7 @@ require_relative "cleanup_image"
 require_relative "cleanup_reqt"
 require_relative "cleanup_text"
 require_relative "cleanup_toc"
+require_relative "cleanup_review"
 require_relative "cleanup_dochistory"
 require "relaton_iev"
 
@@ -82,6 +83,7 @@ module Metanorma
         boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> introduced
         xref_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
+        review_cleanup(xmldoc)
         toc_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         linebreak_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -58,7 +58,7 @@ module Metanorma
         end
       end
 
-      def indirect_eref_to_xref(eref, ident)
+      def indirect_eref_to_xref(eref, ident, id_map=nil)
         loc = eref.at("./localityStack[locality[@type = 'anchor']]") ||
           eref.at("./locality[@type = 'anchor']")
         loc = loc&.remove&.text || ident
@@ -66,18 +66,30 @@ module Metanorma
         eref.delete("bibitemid")
         eref.delete("citeas")
         eref["target"] = loc
-        eref.document.at("//*[@id = '#{loc}']") and return
+        if id_map
+          return if id_map.has_key?(loc)
+        else
+          eref.document.at("//*[@id = '#{loc}']") and return
+        end
         eref.children = %(** Missing target #{loc})
         eref["target"] = ident
       end
 
       def resolve_local_indirect_erefs(xmldoc, refs, prefix)
+        # Pre-index elements by ID
+        id_map = xmldoc.xpath("//*[@id]").each_with_object({}) do |node, map|
+          map[node["id"]] = node
+        end
+
+        # Pre-index all <eref> elements by bibitemid
+        eref_map = xmldoc.xpath("//eref[@bibitemid]").group_by { |e| e["bibitemid"] }
+
         refs.each_with_object([]) do |r, m|
           id = r.sub(/^#{prefix}_/, "")
-          n = xmldoc.at("//*[@id = '#{id}']")
+          n = id_map[id]
           if n&.at("./ancestor-or-self::*[@type = '#{prefix}']")
-            xmldoc.xpath("//eref[@bibitemid = '#{r}']").each do |e|
-              indirect_eref_to_xref(e, id)
+            eref_map[r]&.each do |e|
+              indirect_eref_to_xref(e, id, id_map)
             end
           else m << r
           end

data/lib/metanorma/standoc/cleanup_block.rb

@@ -219,7 +219,7 @@ module Metanorma
         doc.xpath("//ol[@explicit-type]").each do |x|
           x.delete("explicit-type")
           @log.add("Style", x,
-                   "Style override set for ordered list")
+                   "Style override set for ordered list", display: false)
         end
       end
 

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -145,10 +145,9 @@ module Metanorma
         elem.xpath(IDREF).each do |s|
           if (ret = Metanorma::Utils::to_ncname(s.value)) != (orig = s.value)
             s.value = ret
-            output = s.parent.dup
-            output.children.remove
             @log.add("Anchors", s.parent,
-                     "normalised identifier in #{output} from #{orig}")
+                     "normalised identifier to #{ret} from #{orig}",
+                     display: false)
           end
         end
       end
@@ -157,10 +156,9 @@ module Metanorma
         elem.xpath("//xref/@target").each do |s|
           if (ret = to_xreftarget(s.value)) != (orig = s.value)
             s.value = ret
-            output = s.parent.dup
-            output.children.remove
             @log.add("Anchors", s.parent,
-                     "normalised identifier in #{output} from #{orig}")
+                     "normalised identifier to #{ret} from #{orig}",
+                     display: false)
           end
         end
       end
@@ -198,6 +196,9 @@ module Metanorma
           p.name = "passthrough"
           p.children = select_odd_chars(p.children.to_xml)
         end
+        doc.xpath("//passthrough[@format = 'metanorma']").each do |p|
+          p.replace(p.children)
+        end
         doc.xpath("//identifier").each do |p|
           p.children = select_odd_chars(p.children.to_xml)
         end

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -26,9 +26,6 @@ module Metanorma
         asciimath2mathml_err(elem.to_xml, e)
       end
 
-      # https://medium.com/@rickwang_wxc/in-ruby-given-a-string-detect-if-it-is-valid-numeric-c58275eace60
-      NUMERIC_REGEX = %r{^((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?$}
-
       MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
 
       def asciimath_parse(expr, elem)
@@ -191,6 +188,8 @@ module Metanorma
           .each { |x| mathml_number_format(x) }
         mathml_unitsml(xmldoc)
       end
+
+      include ::Metanorma::Standoc::Regex
     end
   end
 end

data/lib/metanorma/standoc/cleanup_review.rb

@@ -0,0 +1,60 @@
+module Metanorma
+  module Standoc
+    module Cleanup
+      def review_cleanup(xmldoc)
+        reviews = xmldoc.xpath("//review")
+        reviews.empty? and return
+        ctr = xmldoc.root.add_child("<review-container/>").first
+        reviews.each do |r|
+          review_set_location(r)
+          ctr << r
+        end
+      end
+
+      def review_insert_bookmark(review, id)
+        parent = review.parent
+        children = parent.children
+        index = children.index(review)
+        x = previous_review_siblings(children, index) ||
+          following_review_siblings(children, index)
+        ins = if x then x.at(".//text()")
+              else review.before("<p> </p>").previous.at(".//text()")
+              end
+        ins.previous = "<bookmark id='#{id}'/>"
+      end
+
+      def previous_review_siblings(children, index)
+        x = nil
+        (index - 1).downto(0) do |i|
+          node = children[i]
+          if node.element? && node.name != "review" && node.text.strip != ""
+            x = node
+            break
+          end
+        end
+        x
+      end
+
+      def following_review_siblings(children, index)
+        x = nil
+        (index + 1).upto(children.size - 1) do |i|
+          node = children[i]
+          if node.element? && node.name != "review" && node.text.strip != ""
+            x = node
+            break
+          end
+        end
+        x
+      end
+
+      def review_set_location(review)
+        unless review["from"]
+          id = "_#{UUIDTools::UUID.random_create}"
+          review_insert_bookmark(review, id)
+          review["from"] = id
+        end
+        review["to"] ||= review["from"]
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -96,9 +96,7 @@ module Metanorma
           y.name == "annex" || !y.ancestors("annex").empty? and next
           y.wrap("<annex/>")
           y.parent["id"] = "_#{UUIDTools::UUID.random_create}"
-          %w(obligation language script).each do |w|
-            y.parent[w] = y[w]
-          end
+          %w(obligation language script).each { |w| y.parent[w] = y[w] }
         end
       end
 
@@ -192,7 +190,7 @@ module Metanorma
         xmldoc.at("//sections") or return
         ins = insert_before(xmldoc, "//sections")
         xmldoc.xpath("//sections//*[@beforeclauses = 'true']")
-          .reverse.each do |x|
+          .reverse_each do |x|
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
@@ -201,46 +199,13 @@ module Metanorma
 
       # only move clausebefore notes at the very end of preface
       def endofpreface_clausebefore(xml, ins)
-        xml.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
+        xml.xpath("//preface//*[@beforeclauses = 'true']").reverse_each do |x|
           textafter = xml.xpath("//preface//*") & x.xpath("./following::*")
           textafter.text.strip.empty? or break
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
       end
-
-      def insert_before(xmldoc, xpath)
-        unless ins = xmldoc.at(xpath).children.first
-          xmldoc.at(xpath) << " "
-          ins = xmldoc.at(xpath).children.first
-        end
-        ins
-      end
-
-      def floatingtitle_cleanup(xmldoc)
-        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
-        floating_title_preface2sections(xmldoc)
-      end
-
-      def pop_floating_title(xmldoc)
-        loop do
-          found = false
-          xmldoc.xpath("//floating-title").each do |t|
-            t.next_element.nil? or next
-            %w(sections annex preface).include? t.parent.name and next
-            t.parent.next = t
-            found = true
-          end
-          break unless found
-        end
-      end
-
-      def floating_title_preface2sections(xmldoc)
-        t = xmldoc.at("//preface/floating-title") or return
-        s = xmldoc.at("//sections")
-        t.next_element or
-          s.children.first.previous = t.remove
-      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -156,6 +156,31 @@ module Metanorma
           end
         end
       end
+
+      def floatingtitle_cleanup(xmldoc)
+        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
+        floating_title_preface2sections(xmldoc)
+      end
+
+      def pop_floating_title(xmldoc)
+        loop do
+          found = false
+          xmldoc.xpath("//floating-title").each do |t|
+            t.next_element.nil? or next
+            %w(sections annex preface).include? t.parent.name and next
+            t.parent.next = t
+            found = true
+          end
+          break unless found
+        end
+      end
+
+      def floating_title_preface2sections(xmldoc)
+        t = xmldoc.at("//preface/floating-title") or return
+        s = xmldoc.at("//sections")
+        t.next_element or
+          s.children.first.previous = t.remove
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_table.rb

@@ -47,6 +47,8 @@ module Metanorma
         sources_table_cleanup(xmldoc)
         notes_table_cleanup(xmldoc)
         header_rows_cleanup(xmldoc)
+        tr_style_cleanup(xmldoc)
+        td_style_cleanup(xmldoc)
       end
 
       def sources_table_cleanup(xmldoc)
@@ -75,6 +77,26 @@ module Metanorma
           end
         end
       end
+
+      def tr_style_cleanup(xmldoc)
+        xmldoc.xpath("//tr[.//tr-style]").each do |tr|
+          ret = tr.xpath(".//tr-style").each_with_object([]) do |s, m|
+            m << s.text
+          end
+          tr["style"] = ret.join(";")
+        end
+        xmldoc.xpath(".//tr-style").each(&:remove)
+      end
+
+      def td_style_cleanup(xmldoc)
+        xmldoc.xpath("//td[.//td-style] | //th[.//td-style]").each do |tr|
+          ret = tr.xpath(".//td-style").each_with_object([]) do |s, m|
+            m << s.text
+          end
+          tr["style"] = ret.join(";")
+        end
+        xmldoc.xpath(".//td-style").each(&:remove)
+      end
     end
   end
 end