metanorma-standoc 2.1.2 → 2.1.5

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -68,7 +68,7 @@ module Metanorma
       end
 
       def remove_missing_ref(node, target)
-        if node.at("../concept[@type = 'symbol']")
+        if node.at("./parent::concept[@type = 'symbol']")
           remove_missing_ref_symbol(node, target)
         else
           remove_missing_ref_term(node, target)

data/lib/metanorma/standoc/utils.rb

@@ -60,7 +60,7 @@ module Metanorma
                         "[not(ancestor::boilerplate)]".freeze
 
       def isodoc(lang, script, i18nyaml = nil)
-        conv = html_converter(EmptyAttr.new)
+        conv = presentation_xml_converter(EmptyAttr.new)
         i18n = conv.i18n_init(lang, script, i18nyaml)
         conv.metadata_init(lang, script, i18n)
         conv

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.1.2".freeze
+    VERSION = "2.1.5".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"
 

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/blocks_spec.rb

@@ -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>
@@ -1065,6 +1070,56 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "ignores index terms when processing figures marked up as examples" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      ====
+      image::spec/examples/rice_images/rice_image3_1.png[]
+      ====
+
+      ====
+      ((indexterm))
+
+      image::spec/examples/rice_images/rice_image3_3.png[]
+      ====
+
+      ====
+      (((indexterm2)))
+
+      image::spec/examples/rice_images/rice_image3_2.png[]
+      ====
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+               <sections>
+           <figure id='_'>
+             <image src='spec/examples/rice_images/rice_image3_1.png' id='_' mimetype='image/png' height='auto' width='auto'/>
+           </figure>
+           <example id='_'>
+             <p id='_'>
+               indexterm
+               <index>
+                 <primary>indexterm</primary>
+               </index>
+             </p>
+             <figure id='_'>
+               <image src='spec/examples/rice_images/rice_image3_3.png' id='_' mimetype='image/png' height='auto' width='auto'/>
+             </figure>
+           </example>
+           <figure id='_'>
+             <index>
+               <primary>indexterm2</primary>
+             </index>
+             <image src='spec/examples/rice_images/rice_image3_2.png' id='_' mimetype='image/png' height='auto' width='auto'/>
+           </figure>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes images" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}

data/spec/metanorma/cleanup_blocks_spec.rb

@@ -1184,4 +1184,87 @@ RSpec.describe Metanorma::Standoc do
       .gsub(%r{<style.*?</style>}m, "<style/>")))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "removes paras with indexterms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      == Clause 1
+
+      Paragraph
+
+      (((index)))
+
+      [NOTE]
+      --
+
+      (((index)))
+
+      Note
+      --
+
+      [NOTE]
+      --
+
+      (((index)))
+
+      --
+
+      == Clause 2
+
+      Paragraph
+
+      ((index))
+
+    INPUT
+
+    output = <<~OUTPUT
+       #{BLANK_HDR}
+               <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause 1</title>
+             <p id='_'>
+               Paragraph
+               <index>
+                 <primary>index</primary>
+               </index>
+             </p>
+             <note id='_'>
+               <p id='_'>
+                 <index>
+                   <primary>index</primary>
+                 </index>
+                 Note
+               </p>
+             </note>
+             <note id='_'>
+               <p id='_'>
+                 <index>
+                   <primary>index</primary>
+                 </index>
+               </p>
+             </note>
+           </clause>
+           <clause id='_' inline-header='false' obligation='normative'>
+              <title>Clause 2</title>
+              <p id='_'>Paragraph</p>
+              <p id='_'>
+                index
+                <index>
+                  <primary>index</primary>
+                </index>
+              </p>
+            </clause>
+         </sections>
+       </standard-document>
+    OUTPUT
+    xml = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    xml.xpath("//*[local-name() = 'image']").each do |x|
+      x.replace("<image/>")
+    end
+    expect(xmlpp(strip_guid(xml.to_xml)
+      .gsub(%r{<style.*?</style>}m, "<style/>")))
+      .to be_equivalent_to xmlpp(output)
+  end
+
 end

data/spec/metanorma/cleanup_sections_spec.rb

@@ -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

data/spec/metanorma/cleanup_spec.rb

@@ -1299,7 +1299,7 @@ RSpec.describe Metanorma::Standoc do
              <sourcecode id='L__xf6_we'>
                <name>
                  See
-                 <eref type='inline' bibitemid='L__xf6_wner2016' citeas='L&amp;#xf6;wner et al. 2016'/>
+                 <eref type='inline' bibitemid='L__xf6_wner2016' citeas='Löwner et al. 2016'/>
                </name>
                ABC
              </sourcecode>

data/spec/metanorma/isobib_cache_spec.rb

@@ -50,7 +50,7 @@ ISO_124_DATED = <<~XML.freeze
          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
          <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
          <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
-         <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7:en</docidentifier>
+         <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
          <docnumber>124</docnumber>
          <date type="published">
            <on>2014-03</on>
@@ -82,6 +82,7 @@ ISO_124_DATED = <<~XML.freeze
          <relation type="obsoletes">
            <bibitem type="standard">
              <formattedref format="text/plain">ISO 124:2011</formattedref>
+             <docidentifier type='ISO' primary='true'>ISO 124:2011</docidentifier>
            </bibitem>
          </relation>
          <place>Geneva</place>
@@ -95,7 +96,7 @@ ISO_124_DATED = <<~XML.freeze
              <text>Latex and raw rubber</text>
            </ics>
            <structuredidentifier type="ISO">
-             <project-number part="">ISO 124</project-number>
+             <project-number>ISO 124</project-number>
            </structuredidentifier>
          </ext>
        </bibdata>
@@ -209,7 +210,7 @@ ISO_123_DATED = <<~XML.freeze
            <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
            <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
            <docidentifier type="ISO" primary="true">ISO 123:2001</docidentifier>
-           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
            <docnumber>123</docnumber>
            <date type="published">
              <on>2001-05</on>
@@ -247,6 +248,7 @@ ISO_123_DATED = <<~XML.freeze
            <relation type="obsoletes">
              <bibitem type="standard">
                <formattedref format="text/plain">ISO 123:1985</formattedref>
+               <docidentifier type='ISO' primary='true'>ISO 123:1985</docidentifier>
              </bibitem>
            </relation>
            <place>Geneva</place>
@@ -260,7 +262,7 @@ ISO_123_DATED = <<~XML.freeze
                <text>Latex and raw rubber</text>
              </ics>
              <structuredidentifier type="ISO">
-               <project-number part="">ISO 123</project-number>
+               <project-number>ISO 123</project-number>
              </structuredidentifier>
            </ext>
          </bibdata>

data/spec/metanorma/macros_spec.rb

@@ -167,6 +167,38 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes the macro for editorial notes" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      EDITOR: Note1
+
+      [EDITOR]
+      ====
+      Note2
+      ====
+
+      [EDITOR]
+      Note3
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note1</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note2</p>
+           </admonition>
+           <admonition id='_' type='editorial'>
+             <p id='_'>Note3</p>
+           </admonition>
+         </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes the Metanorma::Standoc concept and related macros" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1612,15 +1644,9 @@ RSpec.describe Metanorma::Standoc do
                  <doctype>standard</doctype>
                  <editorialgroup>
                    <agency>ISO</agency>
-                   <technical-committee/>
-                   <subcommittee/>
-                   <workgroup/>
                  </editorialgroup>
                  <approvalgroup>
            <agency>ISO</agency>
-           <technical-committee/>
-           <subcommittee/>
-           <workgroup/>
          </approvalgroup>
                  <stagename>International standard</stagename>
                </ext>
@@ -1680,7 +1706,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                 <docidentifier type='ISO' primary='true'>ISO 131</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
                 <docnumber>131</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -1708,6 +1734,7 @@ RSpec.describe Metanorma::Standoc do
                 <relation type='obsoletes'>
                   <bibitem type='standard'>
                     <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                    <docidentifier type='ISO' primary='true'>ISO/R 357:1963</docidentifier>
                   </bibitem>
                 </relation>
                 <relation type='instance'>
@@ -1722,7 +1749,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                     <docidentifier type='ISO' primary='true'>ISO 131:1979</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1:en</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
                     <docnumber>131</docnumber>
                     <date type='published'>
                       <on>1979-11</on>
@@ -1753,6 +1780,7 @@ RSpec.describe Metanorma::Standoc do
                     <relation type='obsoletes'>
                       <bibitem type='standard'>
                         <formattedref format='text/plain'>ISO/R 357:1963</formattedref>
+                        <docidentifier type='ISO' primary='true'>ISO/R 357:1963</docidentifier>
                       </bibitem>
                     </relation>
                     <place>Geneva</place>

data/spec/metanorma/refs_dl_spec.rb

@@ -43,7 +43,6 @@ RSpec.describe Metanorma::Standoc do
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
-        <fetched/>
         <title type='title-main' format='text/plain'>Standard</title>
         <title type='main' format='text/plain'>Standard</title>
          <docidentifier type="ISO">ISO 123</docidentifier>
@@ -102,6 +101,7 @@ RSpec.describe Metanorma::Standoc do
       docid::
         type::: ISO
         id::: TC211
+        primary::: true
       docnumber:: 211
       edition:: 1
       language::
@@ -256,6 +256,7 @@ RSpec.describe Metanorma::Standoc do
       ==== Relation
       type:: updates
       bibitem::
+        title::: Geographic information
         formattedref::: ISO 19115:2003
         bib_locality:::
           type:::: page
@@ -267,6 +268,7 @@ RSpec.describe Metanorma::Standoc do
       bibitem::
         type::: standard
         formattedref::: ISO 19115:2003/Cor 1:2006
+        title::: Geographic information
 
       ==== Series
       type:: main
@@ -289,6 +291,7 @@ RSpec.describe Metanorma::Standoc do
 
       ==== Series
       type:: alt
+      title:: seriestitle
       formattedref::
         content::: serieref
         language::: en
@@ -317,7 +320,7 @@ RSpec.describe Metanorma::Standoc do
         <uri type="src">https://www.iso.org/standard/53798.html</uri>
         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:53798:en</uri>
         <uri type="rss">https://www.iso.org/contents/data/standard/05/37/53798.detail.rss</uri>
-        <docidentifier type="ISO">TC211</docidentifier>
+        <docidentifier type='ISO' primary='true'>TC211</docidentifier>
         <docnumber>211</docnumber>
         <date type="issued">
           <on>2014</on>
@@ -417,12 +420,14 @@ RSpec.describe Metanorma::Standoc do
         </copyright>
         <relation type="updates">
           <bibitem>
-            <formattedref format="text/plain">ISO 19115:2003</formattedref>
+            <title type='title-main' format='text/plain'>Geographic information</title>
+            <title type='main' format='text/plain'>Geographic information</title>
             </bibitem>
         </relation>
         <relation type="updates">
           <bibitem type="standard">
-            <formattedref format="text/plain">ISO 19115:2003/Cor 1:2006</formattedref>
+          <title type='title-main' format='text/plain'>Geographic information</title>
+          <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <series type="main">
@@ -437,6 +442,7 @@ RSpec.describe Metanorma::Standoc do
         </series>
         <series type="alt">
           <formattedref format="text/plain" language="en" script="Latn">serieref</formattedref>
+          <title format='text/plain'>seriestitle</title>
         </series>
         <medium>
           <form>medium form</form>
@@ -596,6 +602,7 @@ RSpec.describe Metanorma::Standoc do
       contributor.role:: author
       relation::
       relation.type:: updates
+      relation.bibitem.title:: Geographic information
       relation.bibitem.formattedref:: ISO 19115:2003
       relation.bibitem.bib_locality.type:: page
       relation.bibitem.bib_locality.reference_from:: 7
@@ -603,6 +610,7 @@ RSpec.describe Metanorma::Standoc do
       relation::
       relation.type:: updates
       relation.bibitem.type:: standard
+      relation.bibitem.title:: Geographic information
       relation.bibitem.formattedref:: ISO 19115:2003/Cor 1:2006
       series::
       series.type:: main
@@ -622,6 +630,7 @@ RSpec.describe Metanorma::Standoc do
       series.partnumber:: part5678
       series::
       series.type:: alt
+      series.title:: seriestitle
       series.formattedref.content:: serieref
       series.formattedref.language:: en
       series.formattedref.script:: Latn
@@ -740,12 +749,14 @@ RSpec.describe Metanorma::Standoc do
         </copyright>
         <relation type="updates">
           <bibitem>
-            <formattedref format="text/plain">ISO 19115:2003</formattedref>
+            <title type='title-main' format='text/plain'>Geographic information</title>
+            <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <relation type="updates">
           <bibitem type="standard">
-            <formattedref format="text/plain">ISO 19115:2003/Cor 1:2006</formattedref>
+          <title type='title-main' format='text/plain'>Geographic information</title>
+          <title type='main' format='text/plain'>Geographic information</title>
           </bibitem>
         </relation>
         <series type="main">
@@ -760,6 +771,7 @@ RSpec.describe Metanorma::Standoc do
         </series>
         <series type="alt">
           <formattedref format="text/plain" language="en" script="Latn">serieref</formattedref>
+          <title format='text/plain'>seriestitle</title>
         </series>
         <medium>
           <form>medium form</form>
@@ -842,7 +854,6 @@ RSpec.describe Metanorma::Standoc do
                <docidentifier>B</docidentifier>
              </bibitem>
              <bibitem id='iso123' type='standard'>
-               <fetched/>
                <title type='title-main' format='text/plain'>Standard</title>
                <title type='main' format='text/plain'>Standard</title>
                <docidentifier type='ISO'>ISO 123</docidentifier>