metanorma-standoc 1.10.4.1 → 1.10.8

data/spec/asciidoctor/section_spec.rb

@@ -1202,7 +1202,7 @@ RSpec.describe Asciidoctor::Standoc do
         </annex>
         <annex id='_' obligation='' language='' script=''>
           <references id='app' obligation='informative' normative="false">
-            <title>Bibliography</title>
+            <title>Normative Reference</title>
           </references>
         </annex>
       </standard-document>

data/spec/asciidoctor/validate_spec.rb

@@ -340,6 +340,29 @@ RSpec.describe Asciidoctor::Standoc do
   # INPUT
   # end
 
+  it "warns and aborts if concept attributes are malformed" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.err"
+    begin
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+
+        == Symbols and Abbreviated Terms
+        [[def]]DEF:: def
+
+        {{<<def>>,term,option="noital"}}
+      INPUT
+      expect { Asciidoctor.convert(input, *OPTIONS) }.to raise_error(RuntimeError)
+    rescue SystemExit, RuntimeError
+    end
+    expect(File.read("test.err"))
+      .to include 'processing {{&lt;&lt;def&gt;&gt;,term,option="noital"}}: error processing ,term,option="noital" as CSV'
+    expect(File.exist?("test.xml")).to be false
+  end
+
   it "warns and aborts if concept/xref does not point to term or definition" do
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err"
@@ -467,4 +490,32 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.read("test.err"))
       .to include "Could not resolve footnoteblock:[id1]"
   end
+
+  it "Warning if xref/@target does not point to a real identifier" do
+    FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :no-pdf:
+
+      <<id1>>
+
+      [[id2]]
+      [NOTE]
+      --
+      |===
+      |a |b
+
+      |c |d
+      |===
+
+      * A
+      * B
+      * C
+      --
+    INPUT
+    expect(File.read("test.err"))
+      .to include "Crossreference target id1 is undefined"
+  end
 end

data/spec/assets/xref_error.adoc

@@ -1,5 +1,6 @@
 = X
 A
+:no-pdf:
 
 == Clause
 

data/spec/fixtures/datamodel_description_sections_tree.xml

@@ -1,13 +1,13 @@
-  <preface>
-    <foreword id='_' obligation='informative'>
-      <title>Foreword</title>
-      <p id='_'>mine text</p>
-    </foreword>
-  </preface>
+<preface>
+  <foreword id='_' obligation='informative'>
+    <title>Foreword</title>
+    <p id='_'>mine text</p>
+  </foreword>
+</preface>
   <sections>
     <clause id='_' inline-header='false' obligation='normative'>
       <title>Wrapper nested package package</title>
-      <clause id='_' inline-header='false' obligation='normative'>
+      <clause id='section-EAPK_9C96A88B_E98B_490b_8A9C_24AEDAC64293' inline-header='false' obligation='normative'>
         <title>Wrapper nested package overview</title>
         <p id='_'>Diagram text</p>
         <figure id='figure-EAID_0E029ABF_C35A_49e3_9EEA_FFD4F32780A8'>
@@ -24,7 +24,7 @@
       </clause>
       <clause id='_' inline-header='false' obligation='normative'>
         <title>ISO 19135 Procedures for item registration XML package</title>
-        <clause id='_' inline-header='false' obligation='normative'>
+        <clause id='section-EAPK_9C96A88B_E98B_490b_8A9C_24AEDAC64293' inline-header='false' obligation='normative'>
           <title>ISO 19135 Procedures for item registration XML overview</title>
           <p id='_'>Diagram text</p>
           <figure id='figure-EAID_0E029ABF_C35A_49e3_9EEA_FFD4F32780A8'>
@@ -34,8 +34,11 @@
         </clause>
         <clause id='_' inline-header='false' obligation='normative'>
           <title>Defining tables</title>
-          <table id='tab-P-iso_19135_procedures_for_item_registration_xml-C-re_register' width='100%'>
-            <name>Elements of ISO 19135 Procedures for item registration XML::RE_Register</name>
+          <table id='section-EAID_82206E96_8D23_48dd_AC2F_31939C484AF2' width='100%'>
+            <name>
+              Elements of &#8220;ISO 19135 Procedures for item registration
+              XML::RE_Register&#8221; (interface)
+            </name>
             <tbody>
               <tr>
                 <th valign='top' align='left'>Name:</th>
@@ -74,14 +77,14 @@
               <tr>
                 <th valign='top' align='left'>Abstract:</th>
                 <td colspan='7' valign='top' align='left'>
-                  <p id='_'>false</p>
+                  <p id='_'>True</p>
                 </td>
               </tr>
               <tr>
                 <th valign='top' rowspan='2' align='left'>Associations:</th>
                 <td colspan='4' valign='top' align='left'>
                   <p id='_'>
-                    <em>Association with:</em>
+                    <em>Association with</em>
                   </p>
                 </td>
                 <td valign='top' align='left'>
@@ -96,7 +99,7 @@
                 </td>
                 <td valign='top' align='left'>
                   <p id='_'>
-                    <em>Provides:</em>
+                    <em>Provides</em>
                   </p>
                 </td>
               </tr>
@@ -159,14 +162,14 @@
                     languages other than the operating language of the register.
                     The attribute
                     <em>alternativeLanguages</em>
-                      shall be represented as a set of instances of RE_Locale,
+                     shall be represented as a set of instances of RE_Locale,
                     each specifying an additional unique locale used by items in
                     the register. Every member of the set shall be used by at
                     least one item in the register. The
                     <em>locale</em>
-                      of every
+                     of every
                     <em>alternativeExpression</em>
-                      used by any item in the register shall be included in this
+                     used by any item in the register shall be included in this
                     set of RE_Locales. This attribute provides a summary of
                     alternative locales used by items in a register. Register
                     owners shall specify and publish their policy as to whether
@@ -226,7 +229,7 @@
                     within the set of registers maintained by the register
                     owner. In the case of a hierarchical register, the &#8220;
                     <em>name&#8221;</em>
-                      of a subregister shall uniquely identify that subregister
+                     of a subregister shall uniquely identify that subregister
                     within the scope EXAMPLE &#239;&#191;&#189;ISO/TC 211
                     Register of Feature Data Dictionaries and Feature
                     Catalogues&#239;&#191;&#189; might be the name of the
@@ -285,9 +288,9 @@
                     as its value a set of URI&#8217;s, each referencing
                     information about online resources associated with the
                     register. EXAMPLE
-                    &#239;&#191;&#189;http://www.digest.org/Navigate2.htm&#239;&#191;&#189; and &#239;&#191;&#189;http://www.epa.gov/opppmsd1/PPISdata/index.html&#239;&#191;&#189; are sample valuescorresponding value of the attribute
+                    &#239;&#191;&#189;http://www.digest.org/Navigate2.htm&#239;&#191;&#189; and &#239;&#191;&#189;http://www.epa.gov/opppmsd1/PPISdata/index.html&#239;&#191;&#189; are sample valuescorresponding value of the attribute 
                     <em>OnLineResource.linkage</em>
-                      specifies a resource providing access to the complete
+                     specifies a resource providing access to the complete
                     content of the register. EXAMPLE
                     &#239;&#191;&#189;http://www.digest.org/Navigate2.htm&#239;&#191;&#189; and &#239;&#191;&#189;http://www.epa.gov/opppmsd1/PPISdata/index.html&#239;&#191;&#189; are sample values of
                     <em>OnLineResource.linkage</em>
@@ -306,14 +309,11 @@
                 </td>
               </tr>
               <tr>
-                <td valign='top' align='left'>
-                  <p id='_'>
-                    <strong>Constraints:</strong>
-                  </p>
-                </td>
+                <th valign='top' align='left'>Constraints:</th>
                 <td colspan='7' valign='top' align='left'>
                   <p id='_'>
                     <tt>count(self.version +self.dateOfLastChange) &gt;= 1</tt>
+                      : ``
                   </p>
                 </td>
               </tr>

data/spec/spec_helper.rb

@@ -40,11 +40,9 @@ RSpec.configure do |config|
   end
 
   config.around :each do |example|
-    begin
-      example.run
-    rescue SystemExit
-      fail "Unexpected exit encountered"
-    end
+    example.run
+  rescue SystemExit
+    fail "Unexpected exit encountered"
   end
 end
 
@@ -231,7 +229,7 @@ def stub_fetch_ref(**opts)
   xml = ""
 
   hit = double("hit")
-  expect(hit).to receive(:"[]").with("title") do
+  expect(hit).to receive(:[]).with("title") do
     Nokogiri::XML(xml).at("//docidentifier").content
   end.at_least(:once)
 
@@ -261,7 +259,7 @@ end
 private
 
 def get_xml(search, code, opts)
-  c = code.gsub(%r{[\/\s:-]}, "_").sub(%r{_+$}, "").downcase
+  c = code.gsub(%r{[/\s:-]}, "_").sub(%r{_+$}, "").downcase
   o = opts.keys.join "_"
   file = examples_path("#{[c, o].join '_'}.xml")
   if File.exist? file