metanorma-standoc 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9031c28646f9cd9a481ad67911f2f0f7e5bd058368f80888a788753e5f63fa3
-  data.tar.gz: 25b16459f351f266f19b2f00d70b5bf7f6f5c95325a0d61d43fbe5f3fa518802
+  metadata.gz: 219579e1dcc116cb03bfddaa5d11819180d7e5b8b306f499335a39a61c2e8075
+  data.tar.gz: 7d8c958d3ae1e834d5e8a93c8ee3c8ebb4040e4dcee899f1bc66c87e538cdad7
 SHA512:
-  metadata.gz: 885e62405f3198482ffd7e152b25bef8ab09fc227a8107984297e8fa15b64552b2e745f4ce5e1d60dd37df6dc5cf5c505fb9acfeedd1bdc4ef77954e01218893
-  data.tar.gz: 69cac251a0696b46dd25f37fb23828780e1945e57464e829c91ab5d88ac481311d130c4ff0e670ee89d56fd998eff4ea48e3c5a0c4b24c514021431fb785d852
+  metadata.gz: a4925a6bbee7f29186d5a98cd90a51c647b4443b383f5b09e714554c1bc12da5f88c7c7143236077d96ea3685f2885c4057f245c687a5404d9f6c77489ea8063
+  data.tar.gz: 3644084092782115188b9240f0e8dc68e4ef4b2bb663e5e4270214ab861018ec3a3c4bfd082fbb49f9134af62e714acb309fa774d7ebeaac85a4b20444ef5ef9

data/lib/metanorma/standoc/base.rb

@@ -26,17 +26,54 @@ module Metanorma
       end
 
       def init(node)
+        init_vars
+        init_misc(node)
+        init_processing(node)
+        init_toc(node)
+        init_output(node)
+        init_i18n(node)
+        init_biblio(node)
+        @metadata_attrs = metadata_attrs(node)
+      end
+
+      def init_vars
         @fn_number ||= 0
-        @draft = false
         @refids = Set.new
         @anchors = {}
         @internal_eref_namespaces = []
+        @seen_headers = []
+        @embed_hdr = []
+      end
+
+      def init_misc(node)
         @draft = node.attributes.has_key?("draft")
+        @index_terms = node.attr("index-terms")
+        @boilerplateauthority = node.attr("boilerplate-authority")
+        @embed_hdr = node.attr("embed_hdr")
+      end
+
+      def init_processing(node)
         @novalid = node.attr("novalid")
         @smartquotes = node.attr("smartquotes") != "false"
         @keepasciimath = node.attr("mn-keep-asciimath") &&
           node.attr("mn-keep-asciimath") != "false"
+        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
+        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
+        @datauriimage = node.attr("data-uri-image") != "false"
+      end
+
+      def init_toc(node)
+        @htmltoclevels = node.attr("htmltoclevels")
+        @doctoclevels = node.attr("doctoclevels")
+        @toclevels = node.attr("toclevels")
+        @tocfigures = node.attr("toc-figures")
+        @toctables = node.attr("toc-tables")
+        @tocrecommendations = node.attr("toc-recommendations")
+      end
+
+      def init_output(node)
         @fontheader = default_fonts(node)
+        @log = Metanorma::Utils::Log.new
         @files_to_delete = []
         @filename = if node.attr("docfile")
                       File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
@@ -44,35 +81,26 @@ module Metanorma
                     end
         @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
-        @no_isobib_cache = node.attr("no-isobib-cache")
-        @no_isobib = node.attr("no-isobib")
-        @index_terms = node.attr("index-terms")
-        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
-        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @bibdb = nil
-        @seen_headers = []
-        @datauriimage = node.attr("data-uri-image") != "false"
-        @boilerplateauthority = node.attr("boilerplate-authority")
-        @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
-        @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
-        @log = Metanorma::Utils::Log.new
-        init_bib_caches(node)
-        init_iev_caches(node)
+      end
+
+      def init_i18n(node)
         @lang = (node.attr("language") || "en")
         @script = (node.attr("script") ||
                    Metanorma::Utils.default_script(node.attr("language")))
         @isodoc = isodoc(@lang, @script, node.attr("i18nyaml"))
         @i18n = @isodoc.i18n
-        @htmltoclevels = node.attr("htmltoclevels")
-        @doctoclevels = node.attr("doctoclevels")
-        @toclevels = node.attr("toclevels")
-        @metadata_attrs = metadata_attrs(node)
+      end
+
+      def init_biblio(node)
+        @no_isobib_cache = node.attr("no-isobib-cache")
+        @no_isobib = node.attr("no-isobib")
+        @bibdb = nil
+        init_bib_caches(node)
+        init_iev_caches(node)
       end
 
       def document(node)
-        init(node)
-        ret = makexml(node).to_xml(encoding: "US-ASCII", indent: 2)
-        outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
+        ret = document1(node)
         clean_exit
         ret
       rescue StandardError => e
@@ -81,6 +109,28 @@ module Metanorma
         raise e
       end
 
+      def document1(node)
+        init(node)
+        ret = makexml(node)
+          .to_xml(encoding: "UTF-8", indent: 2,
+                  save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+        outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
+        ret
+      end
+
+      def insert_xml_cr(doc)
+        doc
+          .gsub(%r{(</(clause|table|figure|p|bibitem|ul|ol|dl|dt|dd|li|example|
+                       sourcecode|formula|quote|references|annex|appendix|title|
+                       name|note|thead|tbody|tfoot|th|td|form|requirement|
+                       recommendation|permission|imagemap|svgmap|preferred|
+                       admitted|related|deprecates|letter-symbol|domain|
+                       graphical-symbol|expression|abbreviation-type|subject|
+                       pronunciation|grammar|term|terms|termnote|termexample|
+                       termsource|origin|termref|modification)>)}x, "\\1\n")
+          .gsub(%r{(<(title|name))}x, "\n\\1")
+      end
+
       def version
         flavour = self.class.name.sub(/::Converter$/, "").sub(/^.+::/, "")
         Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
@@ -110,7 +160,7 @@ module Metanorma
 
       def makexml(node)
         result = makexml1(node)
-        ret1 = cleanup(Nokogiri::XML(result))
+        ret1 = cleanup(Nokogiri::XML(insert_xml_cr(result)))
         ret1.root.add_namespace(nil, xml_namespace)
         validate(ret1) unless @novalid
         ret1

data/lib/metanorma/standoc/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>

data/lib/metanorma/standoc/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/metanorma/standoc/blocks.rb

@@ -174,11 +174,11 @@ module Metanorma
       def paragraph(node)
         return termsource(node) if node.role == "source"
 
-        noko do |xml|
+        ret = noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join("\n")
+        end.join
       end
 
       def quote_attrs(node)
@@ -188,7 +188,7 @@ module Metanorma
 
       def quote_attribution(node, out)
         if node.attr("citetitle")
-          m = /^(?<cite>[^,]+)(,(?<text>.*$))?$/m.match node.attr("citetitle")
+          m = /^(?<cite>[^,]+)(?:,(?<text>.*$))?$/m.match node.attr("citetitle")
           out.source **attr_code(target: m[:cite], type: "inline") do |s|
             s <<  m[:text]
           end
@@ -203,7 +203,7 @@ module Metanorma
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join("\n")
+        end.join
       end
 
       def listing_attrs(node)

data/lib/metanorma/standoc/cleanup_amend.rb

@@ -1,53 +1,56 @@
 module Metanorma
   module Standoc
     module Cleanup
-      def change_clauses(x)
-        x.xpath("//clause[@change]").each do |c|
-          a = create_amend(c)
+      def change_clauses(docxml)
+        docxml.xpath("//clause[@change]").each do |c|
+          create_amend(c)
         end
       end
 
-      def create_amend(c)
-        a = c.add_child("<amend id='_#{UUIDTools::UUID.random_create}'/>").first
-        c.elements.each do |e|
+      def create_amend(clause)
+        a = clause.add_child("<amend id='_#{UUIDTools::UUID.random_create}'/>")
+          .first
+        clause.elements.each do |e|
           e.parent = a unless %w(amend title).include? e.name
         end
-        create_amend1(c, a)
+        create_amend1(clause, a)
       end
 
-      def create_amend1(c, a)
-        create_amend2(c, a)
-        d = a.at("./description")
+      def create_amend1(clause, amend)
+        create_amend2(clause, amend)
+        d = amend.at("./description")
         d.xpath(".//autonumber").each { |e| d.previous = e }
-        d.xpath(".//p[normalize-space(.)='']").each { |e| e.remove }
-        move_attrs_to_amend(c, a)
-        a
+        d.xpath(".//p[normalize-space(.)='']").each(&:remove)
+        move_attrs_to_amend(clause, amend)
+        amend
       end
 
-      def create_amend2(c, a)
-        q = a.at("./quote") and q.name = "newcontent"
+      def create_amend2(_clause, amend)
+        q = amend.at("./quote") and q.name = "newcontent"
         if q.nil?
-          a.children = "<description>#{a.children.to_xml}</description>"
-        else
-          pre = q&.xpath("./preceding-sibling::*")&.remove
-          post = q&.xpath("./following-sibling::*")&.remove
-          pre.empty? or a << "<description>#{pre.to_xml}</description>"
-          a << q.remove
-          post.empty? or a << "<description>#{post.to_xml}</description>"
+          amend.children = "<description>#{amend.children.to_xml}</description>"
+          return
         end
+        pre = q&.xpath("./preceding-sibling::*")&.remove
+        post = q&.xpath("./following-sibling::*")&.remove
+        pre.empty? or amend << "<description>#{pre.to_xml}</description>"
+        amend << q.remove
+        post.empty? or amend << "<description>#{post.to_xml}</description>"
       end
 
-      def move_attrs_to_amend(c, a)
+      def move_attrs_to_amend(clause, amend)
         %w(change path path_end title).each do |e|
-          next unless c[e]
-          a[e] = c[e]
-          c.delete(e)
+          next unless clause[e]
+
+          amend[e] = clause[e]
+          clause.delete(e)
         end
-        return unless a["locality"]
-        loc = a.children.add_previous_sibling("<location/>")
-        extract_localities1(loc, a["locality"])
+        return unless amend["locality"]
+
+        loc = amend.children.add_previous_sibling("<location/>")
+        extract_localities1(loc, amend["locality"])
         loc1 = loc.at("./localityStack") and loc.replace(loc1.elements)
-        a.delete("locality")
+        amend.delete("locality")
       end
     end
   end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -56,9 +56,9 @@ module Metanorma
       TERM_CLAUSE = "//sections/terms | "\
                     "//sections/clause[descendant::terms]".freeze
 
-      NORM_REF = "//bibliography/references[@normative = 'true'] | "\
-                 "//bibliography/clause[.//references[@normative = 'true']]"
-        .freeze
+      NORM_REF =
+        "//bibliography/references[@normative = 'true'][not(@hidden)] | "\
+        "//bibliography/clause[.//references[@normative = 'true']]".freeze
 
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup
@@ -133,6 +133,7 @@ module Metanorma
       def bibdata_cleanup(xmldoc)
         bibdata_anchor_cleanup(xmldoc)
         bibdata_docidentifier_cleanup(xmldoc)
+        bibdata_embed_hdr_cleanup(xmldoc)
         biblio_indirect_erefs(xmldoc, @internal_eref_namespaces&.uniq)
       end
 
@@ -190,8 +191,8 @@ module Metanorma
       def resolve_local_indirect_erefs(xmldoc, refs, prefix)
         refs.each_with_object([]) do |r, m|
           id = r.sub(/^#{prefix}_/, "")
-          if n = xmldoc.at("//*[@id = '#{id}']") and
-              n.at("./ancestor-or-self::*[@type = '#{prefix}']")
+          n = xmldoc.at("//*[@id = '#{id}']")
+          if n&.at("./ancestor-or-self::*[@type = '#{prefix}']")
             xmldoc.xpath("//eref[@bibitemid = '#{r}']").each do |e|
               indirect_eref_to_xref(e, id)
             end
@@ -208,6 +209,29 @@ module Metanorma
           insert_indirect_biblio(xmldoc, refs, prefix)
         end
       end
+
+      def bibdata_embed_hdr_cleanup(xmldoc)
+        return if @embed_hdr.nil? || @embed_hdr.empty?
+
+        embed_recurse(xmldoc.at("//bibdata"), @embed_hdr.first)
+      end
+
+      def hdr2bibitem(hdr)
+        xml = Asciidoctor
+          .convert(hdr[:text], backend: Processor.new.asciidoctor_backend,
+                               header_footer: true)
+        b = Nokogiri::XML(xml).at("//xmlns:bibdata")
+        b.name = "bibitem"
+        b.delete("type")
+        embed_recurse(b, hdr)
+        b.to_xml
+      end
+
+      def embed_recurse(bibitem, node)
+        node[:child].map { |x| hdr2bibitem(x) }.each do |x|
+          bibitem << "<relation type='derivedFrom'>#{x}</relation>"
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_image.rb

@@ -2,6 +2,7 @@ module Metanorma
   module Standoc
     module Cleanup
       def svgmap_cleanup(xmldoc)
+        svg_uniqueids(xmldoc)
         svgmap_moveattrs(xmldoc)
         svgmap_populate(xmldoc)
         Metanorma::Utils::svgmap_rewrite(xmldoc, @localdir)
@@ -59,12 +60,125 @@ module Metanorma
       end
 
       def img_cleanup(xmldoc)
-        return xmldoc unless @datauriimage
+        if @datauriimage
+          xmldoc.xpath("//image").each do |i|
+            # do not datauri encode SVG, we need to deduplicate its IDs
+            unless read_in_if_svg(i, @localdir)
+              i["src"] = Metanorma::Utils::datauri(i["src"], @localdir)
+            end
+          end
+        end
+        svg_uniqueids(xmldoc)
+        xmldoc
+      end
+
+      def read_in_if_svg(img, localdir)
+        return false unless img["src"]
+
+        path = Metanorma::Utils::svgmap_rewrite0_path(img["src"], localdir)
+        File.file?(path) or return false
+        types = MIME::Types.type_for(path) or return false
+        types.first == "image/svg+xml" or return false
+        svg = File.read(path, encoding: "utf-8") or return false
+        img.replace(Nokogiri::XML(svg).root.to_xml)
+        true
+      end
+
+      IRI_TAG_PROPERTIES_MAP = {
+        clipPath: ["clip-path"],
+        "color-profile": nil,
+        cursor: nil,
+        filter: nil,
+        linearGradient: ["fill", "stroke"],
+        marker: ["marker", "marker-end", "marker-mid", "marker-start"],
+        mask: nil,
+        pattern: ["fill", "stroke"],
+        radialGradient: ["fill", "stroke"],
+      }.freeze
+
+      SVG_NS = "http://www.w3.org/2000/svg".freeze
+
+      def svg_uniqueids(xmldoc)
+        # only keep non-unique identifiers
+        ids = xmldoc.xpath("//m:svg//*/@id | //svg/@id", "m" => SVG_NS)
+          .map(&:text).group_by(&:itself).transform_values(&:count)
+          .delete_if { |_, v| v < 2 }
+        xmldoc.xpath("//m:svg", "m" => SVG_NS).each_with_index do |s, i|
+          ids = svg_uniqueids1(s, i, ids)
+        end
+      end
+
+      def svg_iri_properties(id_elems)
+        iri_tag_names = id_elems.each_with_object([]) do |e, m|
+          IRI_TAG_PROPERTIES_MAP.key?(e.name.to_sym) and m = m << e.name
+        end.uniq
+        iri_properties = iri_tag_names.each_with_object([]) do |t, m|
+          (IRI_TAG_PROPERTIES_MAP[t.to_sym] || [t]).each { |t1| m = m << t1 }
+        end.uniq
+        return [] if iri_properties.empty?
+
+        iri_properties << "style"
+      end
 
-        xmldoc.xpath("//image").each do |i|
-          i["src"] = Metanorma::Utils::datauri(i["src"], @localdir)
+      def svg_uniqueids1(svg, idx, ids)
+        id_elems = svg.xpath(".//*[@id] | ./@id/..")
+        iri_properties = svg_iri_properties(id_elems)
+        svg_uniqueids2(svg, iri_properties, idx, ids)
+        new_ids = id_elems.map { |x| x["id"] }
+          .map { |x| x + (ids[x] ? "_inject_#{idx}" : "") }
+        ids.merge(new_ids.each.map { |value| [value, true] }.to_h)
+      end
+
+      def svg_uniqueids2(svg, iri_properties, idx, ids)
+        svg.traverse do |e|
+          next unless e.element?
+
+          if e.name == "style"
+            svg_styleupdate(e, idx, ids)
+          elsif !e.attributes.empty?
+            svg_attrupdate(e, iri_properties, idx, ids)
+          end
+          svg_linkupdate(e, idx, ids)
+          svg_idupdate(e, idx, ids)
         end
       end
+
+      def svg_update_url(text, idx, ids)
+        text.gsub(/url\("?#([a-zA-Z][\w:.-]*)"?\)/) do |x|
+          if ids[$1] then "url(##{$1}_inject_#{idx})"
+          else x
+          end
+        end
+      end
+
+      def svg_styleupdate(elem, idx, ids)
+        elem.children = svg_update_url(elem.text, idx, ids)
+      end
+
+      def svg_attrupdate(elem, iri_properties, idx, ids)
+        iri_properties.each do |p|
+          next unless elem[p]
+
+          elem[p] = svg_update_url(elem[p], idx, ids)
+        end
+      end
+
+      def svg_linkupdate(elem, idx, ids)
+        %w(xlink:href href).each do |ref|
+          iri = elem[ref]&.strip
+          next unless /^#/.match?(iri)
+          next unless ids[iri.sub(/^#/, "")]
+
+          elem[ref] += "_inject_#{idx}"
+        end
+      end
+
+      def svg_idupdate(elem, idx, ids)
+        return unless elem["id"]
+        return unless ids[elem["id"]]
+
+        elem["id"] += "_inject_#{idx}"
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -16,7 +16,7 @@ module Metanorma
         insert = refs&.at("./bibitem")&.previous_element
         refs.xpath("./bibitem").each(&:remove)
         bib.reverse.each do |b|
-          insert and insert.next = b.to_xml or
+          (insert and insert.next = b.to_xml) or
             refs.children.first.add_previous_sibling b.to_xml
         end
         extract_notes_from_biblio(refs)
@@ -84,9 +84,39 @@ module Metanorma
         biblio_reorder(xmldoc)
         biblio_nested(xmldoc)
         biblio_renumber(xmldoc)
+        biblio_linkonly(xmldoc)
+        biblio_hidden_inherit(xmldoc)
         biblio_no_ext(xmldoc)
       end
 
+      def biblio_hidden_inherit(xmldoc)
+        xmldoc.xpath("//references[@hidden = 'true']").each do |r|
+          r.xpath("./bibitem").each do |b|
+            b["hidden"] = true
+          end
+        end
+      end
+
+      def biblio_linkonly(xmldoc)
+        return unless xmldoc.at("//xref[@hidden]")
+
+        ins = xmldoc.at("//bibliography")
+          .add_child("<references hidden='true' normative='true'/>").first
+        refs = xmldoc.xpath("//xref[@hidden]").each_with_object([]) do |x, m|
+          @refids << x["target"]
+          m << { id: x["target"], ref: x["hidden"] }
+          x.delete("hidden")
+        end
+        ins << insert_hidden_bibitems(refs)
+      end
+
+      def insert_hidden_bibitems(bib)
+        refs = bib.each_with_object([]) do |b, m|
+          m << reference1code(%(<ref id="#{b[:id]}">[#{b[:ref]}]</ref>), nil)
+        end
+        reference_populate(refs)
+      end
+
       def biblio_no_ext(xmldoc)
         xmldoc.xpath("//bibitem/ext").each(&:remove)
       end
@@ -114,10 +144,9 @@ module Metanorma
 
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
-          # isopub = ref.at(ISO_PUBLISHER_XPATH)
           docid = ref.at("./docidentifier[@type = 'metanorma']") ||
             ref.at("./docidentifier[not(@type = 'DOI')]") or next
-          reference = format_ref(docid.text, docid["type"])
+          reference = format_ref(docid.children.to_xml, docid["type"])
           @anchors[ref["id"]] = { xref: reference }
         end
       end

data/lib/metanorma/standoc/cleanup_ref_dl.rb

@@ -15,19 +15,25 @@ module Metanorma
         end
       end
 
-      def validate_ref_dl(bib, c)
+      # do not accept implicit id
+      def validate_ref_dl(bib, clause)
         id = bib["id"]
-        id ||= c["id"] unless /^_/.match?(c["id"]) # do not accept implicit id
+        id ||= clause["id"] unless /^_/.match?(clause["id"])
         unless id
-          @log.add("Anchors", c,
-                   "The following reference is missing an anchor:\n" + c.to_xml)
+          @log.add("Anchors", clause,
+                   "The following reference is missing an anchor:\n"\
+                   "#{clause.to_xml}")
           return
         end
         @refids << id
+        validate_ref_dl1(bib, id, clause)
+      end
+
+      def validate_ref_dl1(bib, id, clause)
         bib["title"] or
-          @log.add("Bibliography", c, "Reference #{id} is missing a title")
+          @log.add("Bibliography", clause, "Reference #{id} is missing a title")
         bib["docid"] or
-          @log.add("Bibliography", c,
+          @log.add("Bibliography", clause,
                    "Reference #{id} is missing a document identifier (docid)")
       end
 
@@ -76,27 +82,30 @@ module Metanorma
       end
 
       # definition list, with at most one level of unordered lists
-      def dl_bib_extract(c, nested = false)
-        dl = c.at("./dl") or return
+      def dl_bib_extract(clause, nested = false)
+        dl = clause.at("./dl") or return
         bib = {}
         key = ""
         dl.xpath("./dt | ./dd").each do |dtd|
           (dtd.name == "dt" and key = dtd.text.sub(/:+$/, "")) or
             add_to_hash(bib, key, dd_bib_extract(dtd))
         end
-        c.xpath("./clause").each do |c1|
+        clause.xpath("./clause").each do |c1|
           key = c1&.at("./title")&.text&.downcase&.strip
           next unless %w(contributor relation series).include? key
 
           add_to_hash(bib, key, dl_bib_extract(c1, true))
         end
-        if !nested && c.at("./title")
-          title = c.at("./title").remove.children.to_xml
-          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
-          bib["title"] = [bib["title"]] if bib["title"].is_a? String
-          bib["title"] = [] unless bib["title"]
-          bib["title"] << title if !title.empty?
-        end
+        dl_bib_extract_title(bib, clause, nested)
+      end
+
+      def dl_bib_extract_title(bib, clause, nested)
+        (!nested && clause.at("./title")) or return bib
+        title = clause.at("./title").remove.children.to_xml
+        bib["title"] = [bib["title"]] if bib["title"].is_a?(Hash) ||
+          bib["title"].is_a?(String)
+        bib["title"] = [] unless bib["title"]
+        bib["title"] << title if !title.empty?
         bib
       end
     end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -54,7 +54,7 @@ module Metanorma
       end
 
       def make_bibliography(xml, sect)
-        if xml.at("//sections/references")
+        if xml.at("//sections/references | //xref[@hidden]")
           biblio = sect.add_next_sibling("<bibliography/>").first
           xml.xpath("//sections/references").each do |r|
             biblio.add_child r.remove
@@ -193,7 +193,7 @@ module Metanorma
             next unless t.next_element.nil?
             next if %w(sections annex preface).include? t.parent.name
 
-            t.parent.parent << t
+            t.parent.next = t
             found = true
           end
           break unless found