metanorma-standoc 3.0.7 → 3.0.9

data/lib/metanorma/standoc/validate_term.rb

@@ -16,7 +16,7 @@ module Metanorma
       def iev_validate(xmldoc)
         @iev = init_iev or return
         xmldoc.xpath("//term").each do |t|
-          t.xpath(".//termsource").each do |src|
+          t.xpath("./source | ./preferred/source | ./admitted/source | ./deprecates/source | ./related/source").each do |src|
             (/^IEC[  ]60050-/.match(src.at("./origin/@citeas")&.text) &&
           loc = src.xpath(SOURCELOCALITY)&.text) or next
             iev_validate1(t, loc, xmldoc)
@@ -46,15 +46,16 @@ module Metanorma
 
       def concept_validate_ids(doc)
         @concept_ids ||= doc.xpath("//term | //definitions//dt")
-          .each_with_object({}) { |x, m| m[x["id"]] = true }
+          .each_with_object({}) { |x, m| m[x["anchor"]] = true }
         @concept_terms_tags ||= doc.xpath("//terms")
-          .each_with_object({}) { |t, m| m[t["id"]] = true }
+          .each_with_object({}) { |t, m| m[t["anchor"]] = true }
         nil
       end
 
       def concept_validate_msg(_doc, tag, refterm, xref)
+        t = @doc_ids.dig(xref["target"], :anchor) || xref["target"]
         ret = <<~LOG
-          #{tag.capitalize} #{xref.at("../#{refterm}")&.text} is pointing to #{xref['target']}, which is not a term or symbol
+          #{tag.capitalize} #{xref.at("../#{refterm}")&.text} is pointing to #{t}, which is not a term or symbol
         LOG
         if @concept_terms_tags[xref["target"]]
           ret = ret.strip
@@ -79,7 +80,7 @@ module Metanorma
       def preferred_validate_report(terms)
         terms.each do |k, v|
           v.size > 1 or next
-          loc = v.map { |x| x["id"] }.join(", ")
+          loc = v.map { |x| x["anchor"] }.join(", ")
           err = "Term #{k} occurs twice as preferred designation: #{loc}"
           @log.add("Terms", v.first, err, severity: 1)
         end
@@ -92,7 +93,7 @@ module Metanorma
           c = d.ancestors.detect do |x|
             section_containers.include?(x.name)
           end
-          c["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          c["id"] or add_id(c["id"])
           m[c["id"]] ||= { clause: c, designations: [] }
           m[c["id"]][:designations] << d
         end
@@ -106,7 +107,7 @@ module Metanorma
           end.join(", ")
           err = <<~ERROR
             Clause not recognised as a term clause, but contains designation markup
-             (preferred:[], admitted:[], alt:[], deprecated:[]):<br/>
+             (<code>preferred:[], admitted:[], alt:[], deprecated:[]</code>):<br/>
             #{desgns}</br>
             Ensure the parent clause is recognised as a terms clause by inserting <code>[heading=terms and definitions]</code> above the title,
             in case the heading is not automatically recognised. See also <a href="https://www.metanorma.org/author/topics/sections/concepts/#clause-title">Metanorma documentation</a>.

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.7".freeze
+    VERSION = "3.0.9".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -34,10 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iev", "~> 0.3.5"
   spec.add_dependency "isodoc", "~> 3.1.4"
   spec.add_dependency "metanorma", ">= 1.6.0"
-  spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.3"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.0"
-  spec.add_dependency "metanorma-utils", "~> 1.10.0"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.31"
+  spec.add_dependency "metanorma-utils", "~> 1.11.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "concurrent-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: metanorma-plugin-datastruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-glossarist
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.31
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement