metanorma-iso 3.0.2 → 3.0.4

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -69,8 +69,16 @@ module IsoDoc
         i18n.get.dig("stage_dict", stage.text).is_a?(Hash) or
           return hash_translate(bib, i18n.get["stage_dict"],
                                 "./status/stage", lang)
-        stagetype = i18n.get.dig("stage_dict", stage.text, type&.text) and
-          tag_translate(stage, lang, stagetype)
+        bibdata_i18n_stage1(stage, type, lang, i18n)
+      end
+
+      def bibdata_i18n_stage1(stage, type, lang, i18n)
+        stagetype = i18n.get.dig("stage_dict", stage.text, type&.text) or return
+        h = i18n.get.dig("stage_draft_variants", stagetype) and h.each do |k, v|
+          tag_translate(stage, lang, v)
+          stage.next["type"] = k
+        end
+        tag_translate(stage, lang, stagetype)
       end
     end
   end

data/lib/isodoc/iso/presentation_section.rb

@@ -0,0 +1,138 @@
+module IsoDoc
+  module Iso
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def comments(docxml)
+        warning_for_missing_metadata(docxml)
+        super
+      end
+
+      def warning_for_missing_metadata(docxml)
+        @meta.get[:unpublished] or return
+        ret = warning_for_missing_metadata_create(docxml)
+        ret.empty? and return
+        warning_for_missing_metadata_post(docxml, ret)
+      end
+
+      def warning_for_missing_metadata_create(docxml)
+        ret = ""
+        docxml.at(ns("//bibdata/ext//secretariat")) or
+          ret += "<p>Secretariat is missing.</p>"
+        docxml.at(ns("//bibdata/ext//editorialgroup")) or
+          ret += "<p>Editorial groups are missing.</p>"
+        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
+                     "or @type = 'created']")) ||
+          docxml.at(ns("//bibdata/version/revision-date")) or
+          ret += "<p>Document date is missing.</p>"
+        ret
+      end
+
+      def warning_for_missing_metadata_post(docxml, ret)
+        from = docxml.at(ns("//sections/*/@id"))&.text or return
+        id = UUIDTools::UUID.random_create
+        ret = <<~REVIEW
+          <review date='#{Date.today}' reviewer='Metanorma' id='_#{id}' from='#{from}' to='#{from}'>
+          <p><strong>Metadata warnings:</strong></p> #{ret}
+          </review>
+        REVIEW
+        unless ins = docxml.at(ns("//review-container"))
+          docxml.root << "<review-container></review-container>"
+          ins = docxml.at(ns("//review-container"))
+        end
+        ins.add_first_child ret
+      end
+
+      # Redo Amendment annex titles as numbered
+      def annex(isoxml)
+        amd?(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        super
+        amd?(isoxml) and @suppressheadingnumbers = true
+      end
+
+      # Redo Amendment annex subclause titles as numbered
+      def clause(docxml)
+        super
+        docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
+        amd?(docxml) or return
+        @suppressheadingnumbers = @oldsuppressheadingnumbers
+        docxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
+          f.xpath(ns("./fmt-title | ./fmt-xref-label")).each(&:remove)
+          clause1(f)
+        end
+        @suppressheadingnumbers = true
+      end
+
+      def clause1(node)
+        !node.at(ns("./title")) &&
+          !%w(sections preface bibliography).include?(node.parent.name) and
+          node["inline-header"] = "true"
+        super
+        clause1_section_prefix(node)
+      end
+
+      def clause1_section_prefix(node)
+        if node["type"] == "section" &&
+            c = node.at(ns("./fmt-title//span[@class = 'fmt-caption-delim']"))
+          c.add_first_child(":")
+          t = node.at(ns("./fmt-title"))
+          # French l10n needs tab to be treated as space
+          t.replace @i18n.l10n(to_xml(t).gsub("<tab/>", "<tab> </tab>"))
+            .gsub(%r{<tab>[^<]+</tab>}, "<tab/>")
+        end
+      end
+
+      def toc_title(docxml)
+        %w(amendment technical-corrigendum).include?(@doctype) and return
+        super
+      end
+
+      def middle_title(docxml)
+        @meta.get[:doctitlemain].nil? || @meta.get[:doctitlemain].empty? and
+          return
+        s = docxml.at(ns("//sections")) or return
+        ret = "#{middle_title_main}#{middle_title_amd}"
+        s.add_first_child ret
+      end
+
+      def middle_title_main
+        ret = "<span class='boldtitle'>#{@meta.get[:doctitleintro]}"
+        @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and
+          ret += " &#x2014; "
+        ret += @meta.get[:doctitlemain]
+        @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and
+          ret += " &#x2014; "
+        ret += "</span>#{middle_title_part}"
+        "<p class='zzSTDTitle1'>#{ret}</p>"
+      end
+
+      def middle_title_part
+        ret = ""
+        if a = @meta.get[:doctitlepart]
+          b = @meta.get[:doctitlepartlabel] and
+            ret += "<span class='nonboldtitle'>#{b}:</span> "
+          ret += "<span class='boldtitle'>#{a}</span>"
+        end
+        ret
+      end
+
+      def middle_title_amd
+        ret = ""
+        if a = @meta.get[:doctitleamdlabel]
+          ret += "<p class='zzSTDTitle2'>#{a}"
+          a = @meta.get[:doctitleamd] and ret += ": #{a}"
+          ret += "</p>"
+        end
+        a = @meta.get[:doctitlecorrlabel] and
+          ret += "<p class='zzSTDTitle2'>#{a}</p>"
+        ret
+      end
+
+      def move_norm_ref_to_sections(docxml)
+        amd?(docxml) or super
+      end
+
+      def enable_indexsect
+        true
+      end
+    end
+  end
+end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -2,6 +2,7 @@ require_relative "init"
 require "isodoc"
 require_relative "presentation_xref"
 require_relative "presentation_bibdata"
+require_relative "presentation_section"
 require_relative "presentation_terms"
 require_relative "../../relaton/render/general"
 
@@ -22,39 +23,6 @@ module IsoDoc
         super
       end
 
-      def section(docxml)
-        super
-        warning_for_missing_metadata(docxml)
-      end
-
-      def warning_for_missing_metadata(docxml)
-        @meta.get[:unpublished] or return
-        ret = warning_for_missing_metadata_create(docxml)
-        ret.empty? and return
-        warning_for_missing_metadata_post(docxml, ret)
-      end
-
-      def warning_for_missing_metadata_create(docxml)
-        ret = ""
-        docxml.at(ns("//bibdata/ext//secretariat")) or
-          ret += "<p>Secretariat is missing.</p>"
-        docxml.at(ns("//bibdata/ext//editorialgroup")) or
-          ret += "<p>Editorial groups are missing.</p>"
-        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
-                     "or @type = 'created']")) ||
-          docxml.at(ns("//bibdata/version/revision-date")) or
-          ret += "<p>Document date is missing.</p>"
-        ret
-      end
-
-      def warning_for_missing_metadata_post(docxml, ret)
-        id = UUIDTools::UUID.random_create
-        ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>" \
-              "<p><strong>Metadata warnings:<strong></p> #{ret}</review>"
-        ins = docxml.at(ns("//sections//fmt-title")) or return
-        ins.add_first_child ret
-      end
-
       def block(docxml)
         amend docxml
         figure docxml
@@ -79,26 +47,6 @@ module IsoDoc
         note docxml
       end
 
-      # Redo Amendment annex titles as numbered
-      def annex(isoxml)
-        amd?(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
-        super
-        amd?(isoxml) and @suppressheadingnumbers = true
-      end
-
-      # Redo Amendment annex subclause titles as numbered
-      def clause(docxml)
-        super
-        docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
-        amd?(docxml) or return
-        @suppressheadingnumbers = @oldsuppressheadingnumbers
-        docxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
-          f.xpath(ns("./fmt-title | ./fmt-xref-label")).each(&:remove)
-          clause1(f)
-        end
-        @suppressheadingnumbers = true
-      end
-
       def subfigure_delim
         "<span class='fmt-label-delim'>)</span>"
       end
@@ -123,25 +71,6 @@ module IsoDoc
         end
       end
 
-      def clause1(node)
-        !node.at(ns("./title")) &&
-          !%w(sections preface bibliography).include?(node.parent.name) and
-          node["inline-header"] = "true"
-        super
-        clause1_section_prefix(node)
-      end
-
-      def clause1_section_prefix(node)
-        if node["type"] == "section" &&
-            c = node.at(ns("./fmt-title//span[@class = 'fmt-caption-delim']"))
-          c.add_first_child(":")
-          t = node.at(ns("./fmt-title"))
-          # French l10n needs tab to be treated as space
-          t.replace @i18n.l10n(to_xml(t).gsub("<tab/>", "<tab> </tab>"))
-            .gsub(%r{<tab>[^<]+</tab>}, "<tab/>")
-        end
-      end
-
       def admonition1(elem)
         super
         admonition_outside_clauses(elem)
@@ -166,12 +95,7 @@ module IsoDoc
 
       def ol_depth(node)
         depth = node.ancestors(@iso_class ? "ol" : "ul, ol").size + 1
-        type = :alphabet
-        type = :arabic if [2, 7].include? depth
-        type = :roman if [3, 8].include? depth
-        type = :alphabet_upper if [4, 9].include? depth
-        type = :roman_upper if [5, 10].include? depth
-        type
+        @counter.ol_type(node, depth)
       end
 
       def note1(elem)
@@ -231,56 +155,6 @@ module IsoDoc
         super
       end
 
-      def toc_title(docxml)
-        %w(amendment technical-corrigendum).include?(@doctype) and return
-        super
-      end
-
-      def middle_title(docxml)
-        @meta.get[:doctitlemain].nil? || @meta.get[:doctitlemain].empty? and
-          return
-        s = docxml.at(ns("//sections")) or return
-        ret = "#{middle_title_main}#{middle_title_amd}"
-        s.add_first_child ret
-      end
-
-      def middle_title_main
-        ret = "<span class='boldtitle'>#{@meta.get[:doctitleintro]}"
-        @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and
-          ret += " &#x2014; "
-        ret += @meta.get[:doctitlemain]
-        @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and
-          ret += " &#x2014; "
-        ret += "</span>#{middle_title_part}"
-        "<p class='zzSTDTitle1'>#{ret}</p>"
-      end
-
-      def middle_title_part
-        ret = ""
-        if a = @meta.get[:doctitlepart]
-          b = @meta.get[:doctitlepartlabel] and
-            ret += "<span class='nonboldtitle'>#{b}:</span> "
-          ret += "<span class='boldtitle'>#{a}</span>"
-        end
-        ret
-      end
-
-      def middle_title_amd
-        ret = ""
-        if a = @meta.get[:doctitleamdlabel]
-          ret += "<p class='zzSTDTitle2'>#{a}"
-          a = @meta.get[:doctitleamd] and ret += ": #{a}"
-          ret += "</p>"
-        end
-        a = @meta.get[:doctitlecorrlabel] and
-          ret += "<p class='zzSTDTitle2'>#{a}</p>"
-        ret
-      end
-
-      def move_norm_ref_to_sections(docxml)
-        amd?(docxml) or super
-      end
-
       def twitter_cldr_localiser_symbols
         { group: "&#xA0;", fraction_group: "&#xA0;",
           fraction_group_digits: 3 }
@@ -305,8 +179,21 @@ module IsoDoc
         end
       end
 
-      def enable_indexsect
-        true
+      def ul_label_list(_elem)
+        if @docscheme == "1951"
+          %w(&#x2013;)
+        else
+          %w(&#x2014;)
+        end
+      end
+
+      def ol_label_template(_elem)
+        ret = super
+        @docscheme == "1951" and
+          ret[:alphabet] = <<~SPAN.strip
+            <span class="fmt-label-delim">(</span>%<span class="fmt-label-delim">)</span>
+          SPAN
+        ret
       end
 
       def fn_ref_label(fnote)

data/lib/isodoc/iso/word_convert.rb

@@ -21,9 +21,8 @@ module IsoDoc
       end
 
       def font_choice(options)
-        if options[:script] == "Hans" then '"Source Han Sans",serif'
-        else '"Cambria",serif'
-        end
+        options[:script] == "Hans" and return '"Source Han Sans",serif'
+        '"Cambria",serif'
       end
 
       def default_fonts(options)
@@ -55,8 +54,7 @@ module IsoDoc
         if @dis && use_dis?(input_filename, file)
           swap_renderer(self, @dis, file, input_filename, debug)
           @dis.convert(input_filename, file, debug, output_filename)
-        else
-          super
+        else super
         end
       end
 
@@ -90,17 +88,14 @@ module IsoDoc
 
       def colophon_section(_isoxml, out)
         stage = @meta.get[:stage_int]
-        return if !stage.nil? && stage < 60
-
+        !stage.nil? && stage < 60 and return
         br(out, "left")
         out.div class: "colophon" do |div|
         end
       end
 
       def indexsect_section(isoxml, out)
-        isoxml.xpath(ns("//indexsect")).each do |i|
-          indexsect(i, out)
-        end
+        isoxml.xpath(ns("//indexsect")).each { |i| indexsect(i, out) }
       end
 
       def indexsect(elem, out)
@@ -131,12 +126,6 @@ module IsoDoc
         TOC
       end
 
-      # KILL
-      def footnote_reference_format(link)
-        link.children =
-          "<span class='MsoFootnoteReference'>#{to_xml(link.children)}</span>)"
-      end
-
       def bibliography_attrs
         { class: "BiblioTitle" }
       end

data/lib/isodoc/iso/xref.rb

@@ -247,12 +247,6 @@ module IsoDoc
                           { unnum: false, container: true })
         end
       end
-
-      # KILL
-      def sequential_permission_childrenx(elem, lbl, klass, container: false)
-        container = true
-        super
-      end
     end
   end
 end

data/lib/metanorma/iso/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/iso/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/iso/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/iso/cleanup.rb

@@ -43,8 +43,8 @@ module Metanorma
 
       TERM_CLAUSE =
         "//sections/terms | " \
-        "//sections/clause//terms[not(preceding-sibling::clause)] | " \
-        "//sections//clause[descendant::terms][not(descendant::definitions)][@type = 'terms'] | " \
+        "//sections//terms[not(preceding-sibling::clause)] | " \
+        "//sections//clause[@type = 'terms'][not(descendant::definitions)] | " \
         "//sections/clause[not(@type = 'terms')][not(descendant::definitions)]//terms".freeze
 
       def sections_cleanup(xml)