metanorma-standoc 2.1.4 → 2.2.0.1

data/lib/metanorma/standoc/validate_table.rb

@@ -0,0 +1,91 @@
+module Metanorma
+  module Standoc
+    module Validate
+      def table_validate(doc)
+        doc.xpath("//table[colgroup]").each do |t|
+          maxrowcols_validate(t, t.xpath("./colgroup/col").size)
+        end
+        doc.xpath("//table[.//*[@colspan] | .//*[@rowspan]]").each do |t|
+          maxrowcols_validate(t, max_td_count(t), mode: "row_cols")
+        end
+        doc.xpath("//table[.//*[@rowspan]]").each do |t|
+          maxrowcols_validate(t, max_td_count(t), mode: "thead_row")
+        end
+      end
+
+      def max_td_count(table)
+        max = 0
+        table.xpath("./tr").each do |tr|
+          n = tr.xpath("./td | ./th").size
+          max < n and max = n
+        end
+        max
+      end
+
+      def maxrowcols_validate(table, maxcols, mode: "row_cols")
+        case mode
+        when "row_cols"
+          maxrowcols_validate0(table, maxcols, "*", mode)
+        when "thead_row"
+          %w{thead tbody tfoot}.each do |w|
+            maxrowcols_validate0(table, maxcols, w, mode)
+          end
+        end
+      end
+
+      def maxrowcols_validate0(table, maxcols, tablechild, mode)
+        cells2d = table.xpath("./#{tablechild}/tr")
+          .each_with_object([]) { |_r, m| m << {} }
+        table.xpath("./#{tablechild}/tr").each_with_index do |tr, r|
+          curr = 0
+          tr.xpath("./td | ./th").each do |td|
+            curr = maxcols_validate1(td, r, curr, cells2d, maxcols, mode)
+          end
+        end
+        maxrows_validate(table, cells2d, tablechild, mode)
+      end
+
+      # code doesn't actually do anything, since Asciidoctor refuses to generate
+      # table with inconsistent column count
+      def maxcols_validate1(tcell, row, curr, cells2d, maxcols, mode)
+        rs = tcell&.attr("rowspan")&.to_i || 1
+        cs = tcell&.attr("colspan")&.to_i || 1
+        curr = table_tracker_update(cells2d, row, curr, rs, cs)
+        maxcols_check(curr + cs - 1, maxcols, tcell) if mode == "row_cols"
+        curr + cs
+      end
+
+      def table_tracker_update(cells2d, row, curr, rowspan, colspan)
+        cells2d[row] ||= {}
+        while cells2d[row][curr]
+          curr += 1
+        end
+        (row..(row + rowspan - 1)).each do |y2|
+          cells2d[y2] ||= {}
+          (curr..(curr + colspan - 1)).each { |x2| cells2d[y2][x2] = 1 }
+        end
+        curr
+      end
+
+      def maxrows_validate(table, cells2d, tablechild, mode)
+        err = "are inconsistent"
+        mode == "thead_row" and err = "cannot go outside #{tablechild}"
+        err = "Table rows in table #{err}: check rowspan"
+        if cells2d.any? { |x| x.size != cells2d.first.size }
+          @log.add("Table", table, err)
+          @fatalerror << err
+        end
+      end
+
+      # if maxcols or maxrows negative, do not check them
+      def maxcols_check(col, maxcols, tcell)
+        if maxcols.positive? && col > maxcols
+          @log.add("Table", tcell, "Table exceeds maximum number of columns "\
+                                   "defined (#{maxcols})")
+          @fatalerror << "Table exceeds maximum number of columns defined "\
+                         "(#{maxcols})"
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

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

data/metanorma-standoc.gemspec

@@ -23,12 +23,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.1.0"
+  spec.add_dependency "isodoc", "~> 2.2.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-lutaml"
   spec.add_dependency "ruby-jing"
@@ -55,5 +54,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
-  #spec.metadata["rubygems_mfa_required"] = "true"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/spec/metanorma/{refs_dl_spec.rb → biblio_spec.rb}

@@ -840,7 +840,7 @@ RSpec.describe Metanorma::Standoc do
 
     INPUT
     output = <<~OUTPUT
-                #{BLANK_HDR}
+      #{BLANK_HDR}
            <sections>
          <clause id='_' inline-header='false' obligation='normative'>
            <title>Section</title>
@@ -888,4 +888,87 @@ RSpec.describe Metanorma::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "processes microformatting of formatted references" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [bibliography]
+      === Normative References
+
+      * [[[A, B]]], span:surname[Wozniak], span:initials[S.] & span:givenname[Steve] span:surname[Jobs]. span:pubyear[1996]. span:title[_Work_]. In span:surname.editor[Gates], span:initials.editor[W. H], Collected Essays. span:docid.ISO[ISO 1234]. span:pubplace[Geneva]: span:publisher[International Standardization Organization]. span:uri.citation[http://www.example.com]. span:type[inbook]
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+         <sections> </sections>
+         <bibliography>
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>
+               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.
+             </p>
+             <bibitem id='A' type="inbook">
+               <formattedref format='application/x-isodoc+xml'>
+                 Wozniak, S. &amp; Steve Jobs. 1996.
+                 <em>Work</em>
+                 . In Gates, W. H, Collected Essays. ISO 1234. Geneva: International
+                 Standardization Organization.
+                 <link target='http://www.example.com'/>
+                 .
+               </formattedref>
+               <title>
+                 <em>Work</em>
+               </title>
+               <uri type='citation'>
+                 <link target='http://www.example.com'/>
+               </uri>
+               <docidentifier>B</docidentifier>
+               <docidentifier type='ISO'>ISO 1234</docidentifier>
+               <date type='published'>1996</date>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <initial>S.</initial>
+                     <surname>Wozniak</surname>
+                   </name>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='author'/>
+                 <person>
+                   <name>
+                     <forename>Steve</forename>
+                     <surname>Jobs</surname>
+                   </name>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='editor'/>
+                 <person>
+                   <name>
+                     <initial>W. H</initial>
+                     <surname>Gates</surname>
+                   </name>
+                 </person>
+               </contributor>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Standardization Organization</name>
+                 </organization>
+               </contributor>
+               <place/>
+             </bibitem>
+           </references>
+         </bibliography>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/metanorma/blocks_spec.rb

@@ -764,7 +764,7 @@ RSpec.describe Metanorma::Standoc do
       ====
     INPUT
     output = <<~OUTPUT
-                   #{BLANK_HDR}
+      #{BLANK_HDR}
             <sections>
                 <clause id='_' inline-header='false' obligation='normative'>
       <title>Clause</title>
@@ -940,6 +940,9 @@ RSpec.describe Metanorma::Standoc do
 
       .Final stages: All kernels are fully gelatinized
       image::spec/examples/rice_images/rice_image3_3.png[]
+
+      [%key]
+      A:: B
       ====
     INPUT
     output = <<~OUTPUT
@@ -956,7 +959,14 @@ RSpec.describe Metanorma::Standoc do
       <figure id="_">
         <name>Final stages: All kernels are fully gelatinized</name>
         <image src="spec/examples/rice_images/rice_image3_3.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-      </figure></figure>
+      </figure>
+      <dl id='_' key='true'>
+        <dt>A</dt>
+        <dd>
+          <p id='_'>B</p>
+        </dd>
+      </dl>
+      </figure>
       </sections>
       </standard-document>
     OUTPUT
@@ -1070,6 +1080,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}
@@ -1559,7 +1619,7 @@ RSpec.describe Metanorma::Standoc do
   it "processes recommendation" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc,tag=X,multilingual-rendering=common]
+      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user;developer, implementer",inherit="/ss/584/2015/level/1; /ss/584/2015/level/2",options="unnumbered",type=verification,model=ogc,tag=X,multilingual-rendering=common]
       ====
       I recommend this
       ====
@@ -1568,7 +1628,7 @@ RSpec.describe Metanorma::Standoc do
       #{BLANK_HDR}
               <sections>
          <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
-         <label>/ogc/recommendation/wfs/2</label>
+         <identifier>/ogc/recommendation/wfs/2</identifier>
        <subject>user</subject>
        <subject>developer, implementer</subject>
        <inherit>/ss/584/2015/level/1</inherit>
@@ -1669,7 +1729,7 @@ RSpec.describe Metanorma::Standoc do
       . List
       =====
 
-      [requirement,type="general",label="/req/core/quantities-uom"]
+      [requirement,type="general",identifier="/req/core/quantities-uom"]
       ======
       ======
       ====
@@ -1694,7 +1754,7 @@ RSpec.describe Metanorma::Standoc do
         </description>
       </permission>
       <requirement id='_' type='general'>
-      <label>/req/core/quantities-uom</label>
+      <identifier>/req/core/quantities-uom</identifier>
       </requirement>
       </permission>
       </sections>
@@ -1710,7 +1770,7 @@ RSpec.describe Metanorma::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System &amp; Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
+      [.recommendation,identifier="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System &amp; Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
       ====
       I recommend _this_.
 
@@ -1769,7 +1829,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~"OUTPUT"
          #{BLANK_HDR}
                  <sections>
-                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><label>/ogc/recommendation/wfs/2</label><subject>user</subject>
+                 <recommendation id="ABC"  obligation="permission,recommendation" filename="reqt1.rq"><identifier>/ogc/recommendation/wfs/2</identifier><subject>user</subject>
           <classification><tag>control-class</tag><value>Technical</value></classification><classification><tag>priority</tag><value>P0</value></classification><classification><tag>family</tag><value>System &amp; Communications Protection</value></classification><classification><tag>family</tag><value>System and Communications Protocols</value></classification>
                   <description><p id="_">I recommend <em>this</em>.</p>
                  </description><specification exclude="false" type="tabular" keep-with-next="true" keep-lines-together="true"><p id="_">This is the object of the recommendation:</p><table id="_">  <tbody>    <tr>      <td valign="top" align="left">Object</td>      <td valign="top" align="left">Value</td>    </tr>    <tr>      <td valign="top" align="left">Mission</td>      <td valign="top" align="left">Accomplished</td>    </tr>  </tbody></table></specification><description>

data/spec/metanorma/cleanup_blocks_spec.rb

@@ -803,7 +803,7 @@ RSpec.describe Metanorma::Standoc do
       [%metadata]
       model:: ogc
       type:: class
-      label:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
+      identifier:: http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules[*req/core*]
       subject:: Encoding of logical models
       inherit:: urn:iso:dis:iso:19156:clause:7.2.2
       inherit:: urn:iso:dis:iso:19156:clause:8
@@ -812,6 +812,7 @@ RSpec.describe Metanorma::Standoc do
       inherit:: http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used
       inherit:: <<ref2>>
       inherit:: <<ref3>>
+      target:: http://www.example.com
       classification:: priority:P0
       classification:: domain:Hydrology,Groundwater
       classification:: control-class:Technical
@@ -826,22 +827,14 @@ RSpec.describe Metanorma::Standoc do
         <clause id='_' inline-header='false' obligation='normative'>
           <title>Clause</title>
           <requirement id='_' subsequence='A' obligation='recommendation,requirement' model='ogc' type='class'>
-            <label>
-              <link target='http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules'>
-                <strong>req/core</strong>
-              </link>
-            </label>
+            <identifier>http://www.opengis.net/spec/waterml/2.0/req/xsd-xml-rules</identifier>
             <subject>Encoding of logical models</subject>
             <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
             <inherit>urn:iso:dis:iso:19156:clause:7.2.2</inherit>
             <inherit>urn:iso:dis:iso:19156:clause:8</inherit>
-            <inherit>
-              <link target='http://www.opengis.net/doc/IS/GML/3.2/clause/2.4'/>
-            </inherit>
+            <inherit>http://www.opengis.net/doc/IS/GML/3.2/clause/2.4</inherit>
             <inherit>O&amp;M Abstract model, OGC 10-004r3, clause D.3.4</inherit>
-            <inherit>
-              <link target='http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used'/>
-            </inherit>
+            <inherit>http://www.opengis.net/spec/SWE/2.0/req/core/core-concepts-used</inherit>
             <inherit>
               <xref target='ref2'/>
             </inherit>
@@ -849,21 +842,25 @@ RSpec.describe Metanorma::Standoc do
               <xref target='ref3'/>
             </inherit>
             <classification>
-              <tag>control-class</tag>
-              <value>Technical</value>
-            </classification>
-            <classification>
-              <tag>domain</tag>
-              <value>Groundwater</value>
-            </classification>
-            <classification>
-              <tag>domain</tag>
-              <value>Hydrology</value>
-            </classification>
-            <classification>
-              <tag>priority</tag>
-              <value>P0</value>
-            </classification>
+                 <tag>priority</tag>
+                 <value>P0</value>
+               </classification>
+               <classification>
+                 <tag>domain</tag>
+                 <value>Hydrology</value>
+               </classification>
+               <classification>
+                 <tag>domain</tag>
+                 <value>Groundwater</value>
+               </classification>
+               <classification>
+                 <tag>control-class</tag>
+                 <value>Technical</value>
+               </classification>
+               <classification>
+                 <tag>target</tag>
+                 <value><link target='http://www.example.com'/></value>
+               </classification>
             <description>
               <p id='_'>I recommend this</p>
             </description>
@@ -1184,4 +1181,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/inline_spec.rb

@@ -59,6 +59,8 @@ RSpec.describe Metanorma::Standoc do
       [underline]#underline#
       [smallcap]#smallcap#
       [keyword]#keyword#
+      [css font-family:"Noto Sans JP"]#text#
+      [css font-family:'Noto Sans JP']#text#
     INPUT
     output = <<~OUTPUT
            #{BLANK_HDR}
@@ -80,6 +82,8 @@ RSpec.describe Metanorma::Standoc do
       <underline>underline</underline>
       <smallcap>smallcap</smallcap>
       <keyword>keyword</keyword>
+      <span style="font-family:&quot;Noto Sans JP&quot;">text</span>
+      <span style="font-family:'Noto Sans JP'">text</span>
       </sections>
       </standard-document>
     OUTPUT

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

@@ -13,6 +13,7 @@ RSpec.describe Metanorma::Standoc do
       autonumber:table[3]
       add:[a <<clause>>] del:[B]
       identifier:[a http://example.com]
+      span:category[text]
 
       [bibliography]
       == Bibliography
@@ -38,6 +39,7 @@ RSpec.describe Metanorma::Standoc do
                     </add>
                     <del>B</del>
                     <identifier>a http://example.com</identifier>
+                    <span class='category'>text</span>
         </foreword>
       </preface>
       <sections> </sections>
@@ -1706,7 +1708,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'/>
@@ -1734,6 +1736,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'>
@@ -1748,7 +1751,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>
@@ -1779,6 +1782,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>