metanorma-standoc 2.3.4 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a2a480483e6cad337d48919668d1276a587c0c6173ffc7ea8cb773f605b1fb
-  data.tar.gz: 5a9bf620c79d8ec2993a96727f7b8c2874ee8d8c3865a5efd71941fb83ed8fc1
+  metadata.gz: d7c637a8a2cab495ee675be427ab80dbfa3268f7630cc1161ca3f1b75c40688c
+  data.tar.gz: db253ce3dde5b476d87a404d6de2d99606410262ad091edacea453c18476910c
 SHA512:
-  metadata.gz: 226d8eaa68590e2dbf12917371afe5f2c4c60242397e459543da0ec3471a7a0abc7f5736e92b43f053854329f460bbc70155040bd0ae1df89efa0a62f8765d8e
-  data.tar.gz: 65a7c4e9794199fd48f3d18f3009a41d02ae837753d9e9e9cd41f755384f7b89f3376f5a6c9182de5f184eb4934a9fc9682b8ea708037aa315d9e243f83485bf
+  metadata.gz: 1ba632dd7ca73b0c6314212c57d9a56ed2da84f52b4ab2cd32c46d53a1a994d096d2b6a43cdc4dd161f2ddfff19a2ac7d4c113e6181054631cb3494421ff02b0
+  data.tar.gz: bc6cf925cc3bd5aa0777044a2568368600adcffe486e164d1ca7d0dd31370c729e45eafc62e0d3dd64d0238d618efdf9a2fc4405dddfe5af25d982f93de69966

data/lib/metanorma/standoc/validate.rb

@@ -42,12 +42,11 @@ module Metanorma
       end
 
       def content_validate(doc)
-        nested_asset_validate_basic(doc)
-        nested_note_validate(doc)
-        xref_validate(doc)
+        repeat_id_validate(doc.root) # feeds xref_validate
+        xref_validate(doc) # feeds nested_asset_validate
+        nested_asset_validate(doc)
         section_validate(doc)
         norm_ref_validate(doc)
-        repeat_id_validate(doc.root)
         iev_validate(doc.root)
         concept_validate(doc, "concept", "refterm")
         concept_validate(doc, "related", "preferred//name")
@@ -58,6 +57,11 @@ module Metanorma
           clean_abort(@fatalerror.join("\n"), doc)
       end
 
+      def nested_asset_validate(doc)
+        nested_asset_validate_basic(doc)
+        nested_note_validate(doc)
+      end
+
       def nested_asset_validate_basic(doc)
         a = "//formula | //example | //figure | //termnote | //termexample | " \
             "//table"
@@ -76,11 +80,21 @@ module Metanorma
         end
       end
 
-      def nested_asset_report(outer, inner, _doc)
+      def nested_asset_report(outer, inner, doc)
         outer.name == "figure" && inner.name == "figure" and return
-        err = "There is an instance of #{inner.name} nested within #{outer.name}"
+        outer.name != "formula" && inner.name == "formula" and return
+        err =
+          "There is an instance of #{inner.name} nested within #{outer.name}"
         @log.add("Syntax", inner, err)
-        @fatalerror << "#{err}:\n#{inner.to_xml}"
+        nested_asset_xref_report(outer, inner, doc)
+      end
+
+      def nested_asset_xref_report(outer, inner, _doc)
+        i = @doc_xrefs[inner["id"]] or return
+        err2 = "There is a crossreference to an instance of #{inner.name} " \
+               "nested within #{outer.name}: #{i.to_xml}"
+        @log.add("Style", i, err2)
+        @fatalerror << err2
       end
 
       def norm_ref_validate(doc)
@@ -103,8 +117,8 @@ module Metanorma
           @log.add("Anchors", x, concept_validate_msg(doc, tag, refterm, x))
           found = true
         end
-        found and
-          @fatalerror << "#{tag.capitalize} not cross-referencing term or symbol"
+        found and @fatalerror << "#{tag.capitalize} not cross-referencing " \
+                                 "term or symbol"
       end
 
       def concept_validate_ids(doc)
@@ -126,20 +140,19 @@ module Metanorma
         ret
       end
 
-      def repeat_id_validate1(ids, elem)
-        if ids[elem["id"]]
+      def repeat_id_validate1(elem)
+        if @doc_ids[elem["id"]]
           @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
-                                    "used at line #{ids[elem['id']]}")
+                                    "used at line #{@doc_ids[elem['id']]}")
           @fatalerror << "Multiple instances of same ID: #{elem['id']}"
-        else ids[elem["id"]] = elem.line
         end
-        ids
+        @doc_ids[elem["id"]] = elem.line
       end
 
       def repeat_id_validate(doc)
-        ids = {}
+        @doc_ids = {}
         doc.xpath("//*[@id]").each do |x|
-          ids = repeat_id_validate1(ids, x)
+          repeat_id_validate1(x)
         end
       end
 
@@ -188,11 +201,12 @@ module Metanorma
 
       # manually check for xref/@target, xref/@to integrity
       def xref_validate(doc)
-        ids = doc.xpath("//*/@id").each_with_object({}) { |x, m| m[x.text] = 1 }
-        doc.xpath("//xref/@target | //xref/@to").each do |x|
-          ids[x.text] and next
+        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
+          .each_with_object({}) do |x, m|
+          m[x.text] = x
+          @doc_ids[x] and next
           @log.add("Anchors", x.parent,
-                   "Crossreference target #{x.text} is undefined")
+                   "Crossreference target #{x} is undefined")
         end
       end
 

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.3.4".freeze
+    VERSION = "2.3.6".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.6
 platform: ruby
 authors:
 - Ribose Inc.