metanorma-standoc 2.1.1 → 2.1.4

data/lib/metanorma/standoc/lists.rb

@@ -38,9 +38,8 @@ module Metanorma
 
         noko do |xml|
           xml.ul **ul_attrs(node) do |xml_ul|
-            node.items.each do |item|
-              ul_li(xml_ul, item)
-            end
+            list_caption(node, xml_ul)
+            node.items.each { |item| ul_li(xml_ul, item) }
           end
         end.join("\n")
       end
@@ -62,6 +61,7 @@ module Metanorma
       def olist(node)
         noko do |xml|
           xml.ol **ol_attrs(node) do |xml_ol|
+            list_caption(node, xml_ol)
             node.items.each { |item| li(xml_ol, item) }
           end
         end.join("\n")
@@ -98,6 +98,7 @@ module Metanorma
       def dlist(node)
         noko do |xml|
           xml.dl **dl_attrs(node) do |xml_dl|
+            list_caption(node, xml_dl)
             node.items.each do |terms, dd|
               dt(terms, xml_dl)
               dd(dd, xml_dl)
@@ -115,6 +116,10 @@ module Metanorma
           end
         end.join("\n")
       end
+
+      def list_caption(node, out)
+        a = node.title and out.name { |n| n << a }
+      end
     end
   end
 end

data/lib/metanorma/standoc/macros.rb

@@ -191,6 +191,7 @@ module Metanorma
       end
     end
 
+    # inject ZWNJ to prevent Asciidoctor from attempting regex substitutions
     class PassInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :"pass-format"
@@ -198,7 +199,21 @@ module Metanorma
       def process(parent, target, attrs)
         format = target || "metanorma"
         out = Asciidoctor::Inline.new(parent, :quoted, attrs[1]).convert
-        %{<passthrough formats="#{format}">#{out}</passthrough>}
+          .gsub(/((?![<>&])[[:punct:]])/, "\\1&#x200c;")
+        %{<passthrough-inline formats="#{format}">#{out}</passthrough-inline>}
+      end
+    end
+
+    class IdentifierInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :identifier
+      parse_content_as :raw
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+          .gsub(/((?![<>&])[[:punct:]])/, "\\1&#x200c;")
+        %{<identifier>#{out}</identifier>}
       end
     end
 
@@ -213,5 +228,17 @@ module Metanorma
                       type: :xref, target: "_#{UUIDTools::UUID.random_create}")
       end
     end
+
+    class NamedEscapePreprocessor < Asciidoctor::Extensions::Preprocessor
+      def process(_document, reader)
+        c = HTMLEntities.new
+        lines = reader.readlines.map do |l|
+          l.split(/(&[A-Za-z][^;]*;)/).map do |s|
+            /^&[A-Za-z]/.match?(s) ? c.encode(c.decode(s), :hexadecimal) : s
+          end.join
+        end
+        ::Asciidoctor::Reader.new lines
+      end
+    end
   end
 end

data/lib/metanorma/standoc/macros_note.rb

@@ -18,15 +18,10 @@ module Metanorma
         (document.find_by context: :paragraph).each do |para|
           next unless /^TODO: /.match? para.lines[0]
 
-          parent = para.parent
           para.set_attr("name", "todo")
           para.set_attr("caption", "TODO")
           para.lines[0].sub!(/^TODO: /, "")
-          todo = Asciidoctor::Block
-            .new(parent, :admonition, attributes: para.attributes,
-                                      source: para.lines,
-                                      content_model: :compound)
-          parent.blocks[parent.blocks.index(para)] = todo
+          para.context = :admonition
         end
       end
     end
@@ -42,5 +37,31 @@ module Metanorma
         %{<footnoteblock>#{out}</footnoteblock>}
       end
     end
+
+    class EditorAdmonitionBlock < Asciidoctor::Extensions::BlockProcessor
+      use_dsl
+      named :EDITOR
+      on_contexts :example, :paragraph
+
+      def process(parent, reader, attrs)
+        attrs["name"] = "editorial"
+        attrs["caption"] = "EDITOR"
+        create_block(parent, :admonition, reader.lines, attrs,
+                     content_model: :compound)
+      end
+    end
+
+    class EditorInlineAdmonitionBlock < Asciidoctor::Extensions::Treeprocessor
+      def process(document)
+        (document.find_by context: :paragraph).each do |para|
+          next unless /^EDITOR: /.match? para.lines[0]
+
+          para.set_attr("name", "editorial")
+          para.set_attr("caption", "EDITOR")
+          para.lines[0].sub!(/^EDITOR: /, "")
+          para.context = :admonition
+        end
+      end
+    end
   end
 end

data/lib/metanorma/standoc/ref.rb

@@ -82,7 +82,8 @@ module Metanorma
       def isorefmatches3out(item, xml)
         if item[:doc] then use_retrieved_relaton(item, xml)
         else
-          isorefmatches3_1(xml, item[:ref][:match], item[:ref][:yr],
+          isorefmatches3_1(xml, item[:ref][:match],
+                           item[:ref][:yr],
                            item[:ref][:hasyr], item[:doc])
         end
       end
@@ -117,6 +118,7 @@ module Metanorma
 
       def refitem_render(xml, match, code)
         xml.bibitem **attr_code(id: match[:anchor],
+                                suppress_identifier: code[:dropid],
                                 hidden: code[:hidden]) do |t|
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
             i << ref_normalise_no_format(match[:text])

data/lib/metanorma/standoc/ref_sect.rb

@@ -84,7 +84,8 @@ module Metanorma
         if ref[:code].nil? || ref[:no_year] || @bibdb.nil?
           res << [ref, idx, nil]
         else
-          @bibdb.fetch_async(ref[:code], ref[:year], ref) do |doc|
+          @bibdb.fetch_async(HTMLEntities.new.decode(ref[:code]),
+                             ref[:year], ref) do |doc|
             res << [ref, idx, doc]
           end
         end
@@ -119,7 +120,9 @@ module Metanorma
       def use_retrieved_relaton(item, xml)
         xml.parent.add_child(smart_render_xml(item[:doc], item[:ref][:code],
                                               item[:ref]))
-        use_my_anchor(xml, item[:ref][:match][:anchor], item.dig(:ref, :analyse_code, :hidden))
+        use_my_anchor(xml, item[:ref][:match][:anchor],
+                      hidden: item.dig(:ref, :analyse_code, :hidden),
+                      dropid: item.dig(:ref, :analyse_code, :dropid))
       end
 
       def init_bib_caches(node)

data/lib/metanorma/standoc/ref_utility.rb

@@ -31,9 +31,11 @@ module Metanorma
         end
       end
 
-      def use_my_anchor(ref, id, hidden)
+      def use_my_anchor(ref, id, opt)
         ref.parent.elements.last["id"] = id
-        hidden and ref.parent.elements.last["hidden"] = hidden
+        opt[:hidden] and ref.parent.elements.last["hidden"] = opt[:hidden]
+        opt[:dropid] and
+          ref.parent.elements.last["suppress_identifier"] = opt[:dropid]
         ref
       end
 
@@ -57,6 +59,7 @@ module Metanorma
 
       def mn_code(code)
         code.sub(/^\(/, "[").sub(/\).*$/, "]")
+          .sub(/^dropid\((.+)\)$/, "\\1")
           .sub(/^hidden\((.+)\)$/, "\\1")
           .sub(/^nofetch\((.+)\)$/, "\\1")
       end
@@ -73,6 +76,12 @@ module Metanorma
         ret.merge(id: m[:id], hidden: true)
       end
 
+      def analyse_ref_dropid(ret)
+        return ret unless m = /^dropid\((?<id>.+)\)$/.match(ret[:id])
+
+        ret.merge(id: m[:id], dropid: true)
+      end
+
       def analyse_ref_repo_path(ret)
         return ret unless m =
                             /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/
@@ -89,14 +98,16 @@ module Metanorma
       end
 
       # ref id = (usrlbl)code[:-]year
-      # code = nofetch(code) | hidden(code) | (repo|path):(key,code) |
+      # code = nofetch(code) | hidden(code) | dropid(code) | (repo|path):(key,code) |
       # \[? number \]? | ident
       def analyse_ref_code(code)
         ret = { id: code }
         return ret if code.blank?
 
         analyse_ref_nofetch(
-          analyse_ref_hidden(analyse_ref_repo_path(analyse_ref_numeric(ret))),
+          analyse_ref_hidden(
+            analyse_ref_dropid(analyse_ref_repo_path(analyse_ref_numeric(ret))),
+          ),
         )
       end
 
@@ -110,7 +121,11 @@ module Metanorma
       end
 
       def ref_attributes(match)
-        { id: match[:anchor], type: "standard" }
+
+code = analyse_ref_code(match[:code])
+
+        { id: match[:anchor], type: "standard",
+          suppress_identifier: code[:dropid] || nil }
       end
 
       MALFORMED_REF = <<~REF.freeze

data/lib/metanorma/standoc/section.rb

@@ -152,7 +152,7 @@ module Metanorma
         attrs[:bibitem] = true if node.option? "bibitem"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
-        xml.send "clause", **attr_code(attrs) do |xml_section|
+        xml.send :clause, **attr_code(attrs) do |xml_section|
           xml_section.title { |n| n << node.title } unless node.title.nil?
           xml_section << node.content
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils", "~> 1.2.8"
-  spec.add_dependency "relaton-cli", "~> 1.9.0"
+  spec.add_dependency "relaton-cli", "~> 1.12.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 
@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-iso"
+  spec.add_development_dependency "metanorma-iso", "~>2.1.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

data/spec/examples/datamodel/address_class_profile.presentation.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation" version="2.0.4">
+<bibdata type="standard">
+<title language="en" format="text/plain">Document title</title>
+<language current="true">en</language><script current="true">Latn</script><status><stage language="">published</stage></status><copyright><from>2022</from></copyright><ext><doctype language="">article</doctype></ext></bibdata><localized-strings><localized-string key="scope" language="en">Scope</localized-string><localized-string key="symbolsabbrev" language="en">Symbols and abbreviated terms</localized-string><localized-string key="abbrev" language="en">Abbreviated terms</localized-string><localized-string key="symbols" language="en">Symbols</localized-string><localized-string key="table_of_contents" language="en">Table of contents</localized-string><localized-string key="introduction" language="en">Introduction</localized-string><localized-string key="foreword" language="en">Foreword</localized-string><localized-string key="abstract" language="en">Abstract</localized-string><localized-string key="acknowledgements" language="en">Acknowledgements</localized-string><localized-string key="termsdef" language="en">Terms and definitions</localized-string><localized-string key="termsdefsymbolsabbrev" language="en">Terms, definitions, symbols and abbreviated terms</localized-string><localized-string key="termsdefsymbols" language="en">Terms, definitions and symbols</localized-string><localized-string key="termsdefabbrev" language="en">Terms, definitions and abbreviated terms</localized-string><localized-string key="normref" language="en">Normative references</localized-string><localized-string key="bibliography" language="en">Bibliography</localized-string><localized-string key="preface" language="en">Preface</localized-string><localized-string key="clause" language="en">Clause</localized-string><localized-string key="annex" language="en">Annex</localized-string><localized-string key="appendix" language="en">Appendix</localized-string><localized-string key="no_terms_boilerplate" language="en"><p>No terms and definitions are listed in this document.</p>
+</localized-string><localized-string key="internal_terms_boilerplate" language="en"><p>For the purposes of this document, 
+    the following terms and definitions apply.</p>
+</localized-string><localized-string key="norm_with_refs_pref" language="en">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</localized-string><localized-string key="norm_empty_pref" language="en">There are no normative references in this document.</localized-string><localized-string key="external_terms_boilerplate" language="en"><p>For the purposes of this document, 
+  the terms and definitions given in % apply.</p>
+</localized-string><localized-string key="internal_external_terms_boilerplate" language="en"><p>For the purposes of this document, the terms and definitions 
+  given in % and the following apply.</p>
+</localized-string><localized-string key="term_defined_in" language="en">[term defined in %]</localized-string><localized-string key="binary_and" language="en">%1 and %2</localized-string><localized-string key="multiple_and" language="en">%1, and %2</localized-string><localized-string key="binary_or" language="en">%1 or %2</localized-string><localized-string key="multiple_or" language="en">%1, or %2</localized-string><localized-string key="chain_and" language="en">%1 and %2</localized-string><localized-string key="chain_or" language="en">%1 or %2</localized-string><localized-string key="chain_from" language="en">%1 from %2</localized-string><localized-string key="chain_to" language="en">%1 to %2</localized-string><localized-string key="note" language="en">NOTE</localized-string><localized-string key="note_xref" language="en">Note</localized-string><localized-string key="termnote" language="en">Note % to entry</localized-string><localized-string key="list" language="en">List</localized-string><localized-string key="deflist" language="en">Definition List</localized-string><localized-string key="figure" language="en">Figure</localized-string><localized-string key="formula" language="en">Formula</localized-string><localized-string key="inequality" language="en">Formula</localized-string><localized-string key="table" language="en">Table</localized-string><localized-string key="requirement" language="en">Requirement</localized-string><localized-string key="recommendation" language="en">Recommendation</localized-string><localized-string key="permission" language="en">Permission</localized-string><localized-string key="key" language="en">Key</localized-string><localized-string key="example" language="en">EXAMPLE</localized-string><localized-string key="example_xref" language="en">Example</localized-string><localized-string key="where" language="en">where</localized-string><localized-string key="wholeoftext" language="en">Whole of text</localized-string><localized-string key="draft_label" language="en">draft</localized-string><localized-string key="inform_annex" language="en">informative</localized-string><localized-string key="norm_annex" language="en">normative</localized-string><localized-string key="modified" language="en">modified</localized-string><localized-string key="deprecated" language="en">DEPRECATED</localized-string><localized-string key="source" language="en">SOURCE</localized-string><localized-string key="and" language="en">and</localized-string><localized-string key="all_parts" language="en">All Parts</localized-string><localized-string key="toc_figures" language="en">List of figures</localized-string><localized-string key="toc_tables" language="en">List of tables</localized-string><localized-string key="toc_recommendations" language="en">List of recommendations</localized-string><localized-string key="month_january" language="en">January</localized-string><localized-string key="month_february" language="en">February</localized-string><localized-string key="month_march" language="en">March</localized-string><localized-string key="month_april" language="en">April</localized-string><localized-string key="month_may" language="en">May</localized-string><localized-string key="month_june" language="en">June</localized-string><localized-string key="month_july" language="en">July</localized-string><localized-string key="month_august" language="en">August</localized-string><localized-string key="month_september" language="en">September</localized-string><localized-string key="month_october" language="en">October</localized-string><localized-string key="month_november" language="en">November</localized-string><localized-string key="month_december" language="en">December</localized-string><localized-string key="obligation" language="en">Obligation</localized-string><localized-string key="subject" language="en">Subject</localized-string><localized-string key="inherits" language="en">Inherits</localized-string><localized-string key="admonition.danger" language="en">Danger</localized-string><localized-string key="admonition.warning" language="en">Warning</localized-string><localized-string key="admonition.caution" language="en">Caution</localized-string><localized-string key="admonition.important" language="en">Important</localized-string><localized-string key="admonition.safety_precautions" language="en">Safety Precautions</localized-string><localized-string key="locality.section" language="en">Section</localized-string><localized-string key="locality.clause" language="en">Clause</localized-string><localized-string key="locality.part" language="en">Part</localized-string><localized-string key="locality.paragraph" language="en">Paragraph</localized-string><localized-string key="locality.chapter" language="en">Chapter</localized-string><localized-string key="locality.page" language="en">Page</localized-string><localized-string key="locality.table" language="en">Table</localized-string><localized-string key="locality.annex" language="en">Annex</localized-string><localized-string key="locality.figure" language="en">Figure</localized-string><localized-string key="locality.example" language="en">Example</localized-string><localized-string key="locality.note" language="en">Note</localized-string><localized-string key="locality.formula" language="en">Formula</localized-string><localized-string key="grammar_abbrevs.masculine" language="en">m</localized-string><localized-string key="grammar_abbrevs.feminine" language="en">f</localized-string><localized-string key="grammar_abbrevs.neuter" language="en">n</localized-string><localized-string key="grammar_abbrevs.common" language="en">common</localized-string><localized-string key="grammar_abbrevs.singular" language="en">sg</localized-string><localized-string key="grammar_abbrevs.dual" language="en">dual</localized-string><localized-string key="grammar_abbrevs.pl" language="en">pl</localized-string><localized-string key="grammar_abbrevs.isPreposition" language="en">prep</localized-string><localized-string key="grammar_abbrevs.isParticiple" language="en">part</localized-string><localized-string key="grammar_abbrevs.isAdjective" language="en">adj</localized-string><localized-string key="grammar_abbrevs.isAdverb" language="en">adv</localized-string><localized-string key="grammar_abbrevs.isNoun" language="en">noun</localized-string><localized-string key="grammar_abbrevs.isVerb" language="en">verb</localized-string><localized-string key="relatedterms.deprecates" language="en">deprecates</localized-string><localized-string key="relatedterms.supersedes" language="en">supersedes</localized-string><localized-string key="relatedterms.narrower" language="en">narrower</localized-string><localized-string key="relatedterms.broader" language="en">broader</localized-string><localized-string key="relatedterms.equivalent" language="en">equivalent</localized-string><localized-string key="relatedterms.compare" language="en">compare</localized-string><localized-string key="relatedterms.contrast" language="en">contrast</localized-string><localized-string key="relatedterms.see" language="en">see</localized-string><localized-string key="Clause.sg" language="en">Clause</localized-string><localized-string key="Clause.pl" language="en">Clauses</localized-string><localized-string key="Annex.sg" language="en">Annex</localized-string><localized-string key="Annex.pl" language="en">Annexes</localized-string><localized-string key="Appendix.sg" language="en">Appendix</localized-string><localized-string key="Appendix.pl" language="en">Appendixes</localized-string><localized-string key="Note.sg" language="en">Note</localized-string><localized-string key="Note.pl" language="en">Notes</localized-string><localized-string key="Note_%_to_entry.sg" language="en">Note % to entry</localized-string><localized-string key="Note_%_to_entry.pl" language="en">Notes % to entry</localized-string><localized-string key="List.sg" language="en">List</localized-string><localized-string key="List.pl" language="en">Lists</localized-string><localized-string key="Figure.sg" language="en">Figure</localized-string><localized-string key="Figure.pl" language="en">Figures</localized-string><localized-string key="Formula.sg" language="en">Formula</localized-string><localized-string key="Formula.pl" language="en">Formulas</localized-string><localized-string key="Table.sg" language="en">Table</localized-string><localized-string key="Table.pl" language="en">Tables</localized-string><localized-string key="Requirement.sg" language="en">Requirement</localized-string><localized-string key="Requirement.pl" language="en">Requirements</localized-string><localized-string key="Recommendation.sg" language="en">Recommendation</localized-string><localized-string key="Recommendation.pl" language="en">Recommendations</localized-string><localized-string key="Permission.sg" language="en">Permission</localized-string><localized-string key="Permission.pl" language="en">Permissions</localized-string><localized-string key="Example.sg" language="en">Example</localized-string><localized-string key="Example.pl" language="en">Examples</localized-string><localized-string key="Part.sg" language="en">Part</localized-string><localized-string key="Part.pl" language="en">Parts</localized-string><localized-string key="Section.sg" language="en">Section</localized-string><localized-string key="Section.pl" language="en">Sections</localized-string><localized-string key="Paragraph.sg" language="en">Paragraph</localized-string><localized-string key="Paragraph.pl" language="en">Paragraphs</localized-string><localized-string key="Chapter.sg" language="en">Chapter</localized-string><localized-string key="Chapter.pl" language="en">Chapters</localized-string><localized-string key="Page.sg" language="en">Page</localized-string><localized-string key="Page.pl" language="en">Pages</localized-string><localized-string key="language" language="en">en</localized-string><localized-string key="script" language="en">Latn</localized-string></localized-strings>
+<sections> </sections>
+</standard-document>

data/spec/metanorma/base_spec.rb

@@ -6,6 +6,42 @@ RSpec.describe Metanorma::Standoc do
     expect(Metanorma::Standoc::VERSION).not_to be nil
   end
 
+  it "processes named entities" do
+    FileUtils.rm_f "test.doc"
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+      :no-pdf:
+
+      Text &times; text
+    INPUT
+    output = <<~OUTPUT
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+        <bibdata type='standard'>
+          <title language='en' format='text/plain'>Document title</title>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage>published</stage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+          </copyright>
+          <ext>
+            <doctype>standard</doctype>
+          </ext>
+        </bibdata>
+        <sections>
+        <p id='_'>Text × text</p>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "assigns default scripts to major languages" do
     FileUtils.rm_f "test.doc"
     input = <<~INPUT
@@ -29,7 +65,7 @@ RSpec.describe Metanorma::Standoc do
                <from>#{Time.now.year}</from>
              </copyright>
              <ext>
-               <doctype>article</doctype>
+               <doctype>standard</doctype>
              </ext>
            </bibdata>
            <sections> </sections>
@@ -125,7 +161,7 @@ RSpec.describe Metanorma::Standoc do
             </owner>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
         <sections> </sections>
@@ -468,7 +504,7 @@ RSpec.describe Metanorma::Standoc do
            <keyword>b</keyword>
            <keyword>c</keyword>
            <ext>
-           <doctype>article</doctype>
+           <doctype>standard</doctype>
              <editorialgroup>
                <technical-committee number="1" type="A">TC</technical-committee>
                <technical-committee number="11" type="A1">TC1</technical-committee>
@@ -789,7 +825,7 @@ RSpec.describe Metanorma::Standoc do
             <from>#{Time.now.year}</from>
           </copyright>
           <ext>
-            <doctype>article</doctype>
+            <doctype>standard</doctype>
           </ext>
         </bibdata>
         <sections> </sections>
@@ -924,7 +960,7 @@ RSpec.describe Metanorma::Standoc do
           </bibitem>
         </relation>
         <ext>
-          <doctype>article</doctype>
+          <doctype>standard</doctype>
         </ext>
       </bibdata>
       <sections> </sections>

data/spec/metanorma/blocks_spec.rb

@@ -304,7 +304,7 @@ RSpec.describe Metanorma::Standoc do
            <from>#{Date.today.year}</from>
          </copyright>
          <ext>
-         <doctype>article</doctype>
+         <doctype>standard</doctype>
          </ext>
        </bibdata>
        <sections><p id="foreword">Foreword</p>
@@ -412,6 +412,8 @@ RSpec.describe Metanorma::Standoc do
 
       NOTE: This is a note
 
+      WARNING: This is not a note
+
       [NOTE,keep-separate=true,tag=X,multilingual-rendering=common]
       ====
       XYZ
@@ -428,6 +430,9 @@ RSpec.describe Metanorma::Standoc do
               <termnote id="_">
               <p id="_">This is a note</p>
             </termnote>
+            <admonition id='_' type='warning'>
+          <p id='_'>This is not a note</p>
+        </admonition>
              <termnote id='_' tag='X' multilingual-rendering='common'>
         <p id='_'>XYZ</p>
       </termnote>
@@ -440,6 +445,32 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes term notes outside of terms sections" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+
+      [NOTE%termnote]
+      ====
+      XYZ
+      ====
+    INPUT
+    output = <<~OUTPUT
+                   #{BLANK_HDR}
+            <sections>
+                <clause id='_' inline-header='false' obligation='normative'>
+      <title>Clause</title>
+      <termnote id='_'>
+        <p id='_'>XYZ</p>
+      </termnote>
+    </clause>
+            </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes term notes as plain notes in nonterm clauses" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -722,6 +753,32 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes term examples outside of terms sections" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+
+      [%termexample]
+      ====
+      XYZ
+      ====
+    INPUT
+    output = <<~OUTPUT
+                   #{BLANK_HDR}
+            <sections>
+                <clause id='_' inline-header='false' obligation='normative'>
+      <title>Clause</title>
+      <termexample id='_'>
+        <p id='_'>XYZ</p>
+      </termexample>
+    </clause>
+            </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes term examples as plain examples in nonterm clauses" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}

data/spec/metanorma/cleanup_sections_spec.rb

@@ -467,7 +467,7 @@ RSpec.describe Metanorma::Standoc do
                    <from>#{Time.now.year}</from>
                  </copyright>
                  <ext>
-                   <doctype>article</doctype>
+                   <doctype>standard</doctype>
                  </ext>
                </bibdata>
                <preface>
@@ -762,7 +762,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -996,7 +996,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -1233,7 +1233,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -1467,7 +1467,7 @@ RSpec.describe Metanorma::Standoc do
                     <from>#{Time.now.year}</from>
                   </copyright>
                   <ext>
-                    <doctype>article</doctype>
+                    <doctype>standard</doctype>
                   </ext>
                 </bibdata>
                 <preface>
@@ -1713,7 +1713,7 @@ RSpec.describe Metanorma::Standoc do
                      <li>
                        <p id='_'>
                          <xref target='cl2'>
-                           Clause 
+                           Clause#{' '}
                            <em>A</em>
                            <stem type='MathML'>
                              <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -1726,7 +1726,7 @@ RSpec.describe Metanorma::Standoc do
                          <li>
                            <p id='_'>
                              <xref target='a1'>
-                               Clause 
+                               Clause#{' '}
                                <em>A</em>
                                <stem type='MathML'>
                                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -1766,7 +1766,7 @@ RSpec.describe Metanorma::Standoc do
              <title>Clause2</title>
              <variant-title type='sub'>&#8220;A&#8221; &#8216;B&#8217;</variant-title>
              <variant-title type='toc'>
-               Clause 
+               Clause#{' '}
                <em>A</em>
                <stem type='MathML'>
                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -1780,7 +1780,7 @@ RSpec.describe Metanorma::Standoc do
          <annex id='a1' inline-header='false' obligation='normative'>
            <title>Clause</title>
            <variant-title type='toc'>
-             Clause 
+             Clause#{' '}
              <em>A</em>
              <stem type='MathML'>
                <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -1795,4 +1795,55 @@ RSpec.describe Metanorma::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "processes bibliography annex" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [appendix]
+      == Bibliography
+
+      [bibliography]
+      === Bibliography
+    INPUT
+    output = <<~OUTPUT
+      <annex id='_' obligation='' language='' script=''>
+          <title>Bibliography</title>
+          <references id='_' normative='false' obligation='informative'>
+            <title>Bibliography</title>
+          </references>
+      </annex>
+    OUTPUT
+    ret = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    expect(xmlpp(strip_guid(ret.at("//xmlns:annex").to_xml)))
+      .to be_equivalent_to(output)
+  end
+
+  it "processes terms annex" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [appendix]
+      == Terms and definitions
+
+      === Terms and definitions
+    INPUT
+    output = <<~OUTPUT
+      <annex id='_' obligation='' language='' script=''>
+        <terms id='_' obligation='normative'>
+          <title>Terms and definitions</title>
+          <term id='term-Terms-and-definitions'>
+            <preferred>
+              <expression>
+                <name>Terms and definitions</name>
+              </expression>
+            </preferred>
+          </term>
+        </terms>
+      </annex>
+    OUTPUT
+    ret = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    expect(xmlpp(strip_guid(ret.at("//xmlns:annex").to_xml)))
+      .to be_equivalent_to(output)
+  end
 end