metanorma-standoc 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c2c98697be18adacdad75abadd4f5d323d6082091a17de0a70f3ffa2488317
-  data.tar.gz: 8824f124552d8e6ac6d38c5330dbd194bd6171bf24f0b870b9b7dff281e6df52
+  metadata.gz: 75e40756e5df255cdb9b0f3bb4d4d2f020ac176558e26bc673bf9b0cf9197d48
+  data.tar.gz: d1c03ebbfa2bffdc9e526370584ee26757c43e0d545c279a15b89000743efc18
 SHA512:
-  metadata.gz: cfe8279a23b6c7323927907f5063e2b1dc98b64ad83d742ced62f4bdd6b098bd520cbcaa051319ad0d247efab17d2d989554bce9ba70ba8251fa01e28f384fe5
-  data.tar.gz: 261168bf0efc23682c9e9a1fb8294a0e6ecf3c541a3ed4fcc6fb31a8116c211c967b8b8f4c26c021d8eceb84a284996bcf0952443bef289705229d669c86e819
+  metadata.gz: 70c270785a8fa09a9734bca27b90a119b3bd7c9b78ab48f88aed19e6e5f805086996acc55412741c260b2ae272bac27b3ede2e6158aa215c12b0751bba98462a
+  data.tar.gz: 81881b81ae25e30dd2e4cfc22ff424fe268355697f62feaf18e3e07c2f55769fc64ab9f9a228cd5e815abf3144db6ec5d215702786863cb04d952d6b1f8ed9d4

data/lib/metanorma/standoc/base.rb

@@ -168,9 +168,14 @@ module Metanorma
         Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
       end
 
-      def clean_exit
-        @log.write("#{@output_dir}#{@filename}.err") unless @novalid
+      def schema_version
+        f = File.read(File.join(File.dirname(__FILE__), "isodoc.rng"))
+        m = / VERSION (v\S+)/.match(f)
+        m[1]
+      end
 
+      def clean_exit
+        @novalid or @log.write("#{@output_dir}#{@filename}.err")
         @files_to_delete.each { |f| FileUtils.rm f }
       end
 
@@ -185,7 +190,8 @@ module Metanorma
 
       def makexml1(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>",
-                  "<#{xml_root_tag} type='semantic' version='#{version}'>"]
+                  "<#{xml_root_tag} type='semantic' version='#{version}' " \
+                  "schema-version='#{schema_version}'>"]
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</#{xml_root_tag}>"
@@ -225,8 +231,7 @@ module Metanorma
       def metadata_attrs(node)
         node.attributes.each_with_object([]) do |(k, v), ret|
           %w(presentation semantic).each do |t|
-            next unless /^#{t}-metadata-/.match?(k)
-
+            /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
             csv_split(v, ",")&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"

data/lib/metanorma/standoc/blocks.rb

@@ -197,8 +197,9 @@ module Metanorma
                  type: node.attr("type"))))
       end
 
+      # term sources occasionally turning up as "source source"?
       def paragraph(node)
-        node.role == "source" and return termsource(node)
+        node.role&.sub(/ .*$/, "") == "source" and return termsource(node)
         noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content

data/lib/metanorma/standoc/cleanup_block.rb

@@ -79,8 +79,7 @@ module Metanorma
       def single_subfigure_cleanup(xmldoc)
         xmldoc.xpath("//figure[figure]").each do |e|
           s = e.xpath("./figure")
-          return unless s.size == 1
-
+          s.size == 1 or next
           s[0].replace(s[0].children)
         end
       end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -238,7 +238,6 @@ module Metanorma
       def bibdata_embed_id_cleanup(xmldoc)
         @embed_id.nil? and return
         bibdata = xmldoc.at("//bibdata")
-        #require "debug"; binding.b
         @embed_id.each do |d|
           bibdata = bibdata.at("./relation[@type = 'derivedFrom']/bibitem")
           ident = bibdata.at("./docidentifier[@primary = 'true']") ||

data/lib/metanorma/standoc/cleanup_footnotes.rb

@@ -42,11 +42,15 @@ module Metanorma
           outnum = idx
           seen[content] = outnum
         end
-        fnote["reference"] = (outnum - 1 + "a".ord).chr
+        fnote["reference"] = table_footnote_number(outnum)
         fnote["table"] = true
         [idx, seen]
       end
 
+      def table_footnote_number(outnum)
+        (outnum - 1 + "a".ord).chr
+      end
+
       def table_footnote_renumber(xmldoc)
         xmldoc.xpath("//table | //figure").each do |t|
           seen = {}

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -113,7 +113,7 @@ module Metanorma
       def gather_unitsml(unitsml, xmldoc, tag)
         tags = xmldoc.xpath(".//m:#{tag}", "m" => UNITSML_NS)
           .each_with_object({}) do |x, m|
-          m[x["id"]] = x.remove
+          m[x["xml:id"]] = x.remove
         end
         return if tags.empty?
 

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -116,9 +116,7 @@ module Metanorma
 
       def biblio_hidden_inherit(xmldoc)
         xmldoc.xpath("//references[@hidden = 'true']").each do |r|
-          r.xpath("./bibitem").each do |b|
-            b["hidden"] = true
-          end
+          r.xpath("./bibitem").each { |b| b["hidden"] = true }
         end
       end
 
@@ -164,7 +162,7 @@ module Metanorma
 
       def format_ref(ref, type)
         ret = Nokogiri::XML.fragment(ref)
-        ret.traverse { |x| x.remove if x.name == "fn"}
+        ret.traverse { |x| x.remove if x.name == "fn" }
         ref = to_xml(ret)
         return @isodoc.docid_prefix(type, ref) if type != "metanorma"
         return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
@@ -182,18 +180,27 @@ module Metanorma
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           docid = select_docid(ref) or next
           reference = format_ref(docid.children.to_xml, docid["type"])
-          @anchors[ref["id"]] = { xref: reference }
+          @anchors[ref["id"]] = { xref: reference, id: idtype2cit(ref) }
+        end
+      end
+
+      def idtype2cit(ref)
+        ref.xpath("./docidentifier/@type").each_with_object({}) do |t, m|
+          m[t.text] and next
+          docid = select_docid(ref, t.text) or next
+          m[t.text] = format_ref(docid.children.to_xml, docid["type"])
         end
       end
 
-      def select_docid(ref)
-        ref.at("./docidentifier[@type = 'metanorma']") ||
-          ref.at("./docidentifier[@primary = 'true'][@language = '#{@lang}']") ||
-          ref.at("./docidentifier[@primary = 'true'][not(@language)]") ||
-          ref.at("./docidentifier[@primary = 'true']") ||
-          ref.at("./docidentifier[not(@type = 'DOI')][@language = '#{@lang}']") ||
-          ref.at("./docidentifier[not(@type = 'DOI')][not(@language)]") ||
-          ref.at("./docidentifier[not(@type = 'DOI')]")
+      def select_docid(ref, type = nil)
+        type and t = "[@type = '#{type}']"
+        ref.at("./docidentifier[@type = 'metanorma']#{t}") ||
+          ref.at("./docidentifier[@primary = 'true'][@language = '#{@lang}']#{t}") ||
+          ref.at("./docidentifier[@primary = 'true'][not(@language)]#{t}") ||
+          ref.at("./docidentifier[@primary = 'true']#{t}") ||
+          ref.at("./docidentifier[not(@type = 'DOI')][@language = '#{@lang}']#{t}") ||
+          ref.at("./docidentifier[not(@type = 'DOI')][not(@language)]#{t}") ||
+          ref.at("./docidentifier[not(@type = 'DOI')]#{t}")
       end
 
       def fetch_termbase(_termbase, _id)

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -72,17 +72,17 @@ module Metanorma
         elem.name = name
         elem["bibitemid"] = elem["target"]
         if ref = @anchors&.dig(elem["target"], :xref)
+          t = @anchors.dig(elem["target"], :id, elem["style"]) and
+            ref = t
           elem["citeas"] = @c.decode(ref)
-        else
-          elem["citeas"] = ""
-          xref_to_eref1(elem)
+        else xref_to_eref1(elem)
         end
         elem.delete("target")
-        elem.delete("style")
         extract_localities(elem)
       end
 
       def xref_to_eref1(elem)
+        elem["citeas"] = ""
         @internal_eref_namespaces.include?(elem["type"]) or
           @log.add("Crossreferences", elem,
                    "#{elem['target']} does not have a corresponding " \
@@ -132,7 +132,7 @@ module Metanorma
 
       def xref_compound_cleanup(xmldoc)
         xmldoc.xpath("//xref").each do |x|
-          /;/.match?(x["target"]) or next
+          x["target"].include?(";") or next
           locations = x["target"].split(";")
           x["target"] = locations.first.sub(/^[^!]*!/, "")
           xref_compound_cleanup1(x, locations)

data/lib/metanorma/standoc/converter.rb

@@ -22,6 +22,7 @@ module Metanorma
       Asciidoctor::Extensions.register do
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
+        preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
@@ -86,7 +87,7 @@ module Metanorma
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
-                @c = HTMLEntities.new
+        @c = HTMLEntities.new
       end
 
       class << self

data/lib/metanorma/standoc/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.2 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -210,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1349,15 +1353,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>
@@ -2131,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/standoc/macros.rb

@@ -12,6 +12,7 @@ require_relative "./macros_embed"
 require_relative "./datamodel/attributes_table_preprocessor"
 require_relative "./datamodel/diagram_preprocessor"
 require "metanorma-plugin-datastruct"
+require "metanorma-plugin-glossarist"
 require "metanorma-plugin-lutaml"
 
 module Metanorma

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -35,12 +35,12 @@ module Metanorma
         end
 
         def merge1(old, new)
-          %i(link docid date title series).each do |k|
+          %i(link docid date title series biblionote).each do |k|
             merge_by_type(old, new, k, :type)
           end
           merge_extent(old, new)
           merge_contributor(old, new)
-          %i(place biblionote version edition).each do |k|
+          %i(place version edition).each do |k|
             merge_simple(old, new, k)
           end
           merge_relations(old, new)

data/lib/metanorma/standoc/ref.rb

@@ -14,25 +14,28 @@ module Metanorma
         end
       end
 
-      def isorefrender1(bib, match, year, allp = "")
+      def isorefrender1(bib, match, code, year, allp = "")
         bib.title(**plaintxt) { |i| i << ref_normalise(match[:text]) }
         docid(bib, match[:usrlbl]) if match[:usrlbl]
+        docid(bib, code[:usrlabel]) if code && code[:usrlabel]
         docid(bib, id_and_year(match[:code], year) + allp)
         docnumber(bib, match[:code])
       end
 
-      def isorefmatchescode(match)
+      def isorefmatchescode(match, _item)
+        code = analyse_ref_code(match[:code])
         yr = norm_year(match[:year])
         { code: match[:code], year: yr, match: match,
-          title: match[:text], usrlbl: match[:usrlbl],
-          lang: (@lang || :all) }
+          title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel],
+          analyse_code: code, lang: (@lang || :all) }
       end
 
       def isorefmatchesout(item, xml)
         if item[:doc] then use_retrieved_relaton(item, xml)
         else
           xml.bibitem **attr_code(ref_attributes(item[:ref][:match])) do |t|
-            isorefrender1(t, item[:ref][:match], item[:ref][:year])
+            isorefrender1(t, item[:ref][:match], item[:ref][:analyse_code],
+                          item[:ref][:year])
             item[:ref][:year] and t.date type: "published" do |d|
               set_date_range(d, item[:ref][:year])
             end
@@ -41,21 +44,24 @@ module Metanorma
         end
       end
 
-      def isorefmatches2code(match)
+      def isorefmatches2code(match, _item)
+        code = analyse_ref_code(match[:code])
         { code: match[:code], no_year: true, lang: (@lang || :all),
           note: match[:fn], year: nil, match: match,
-          title: match[:text], usrlbl: match[:usrlbl] }
+          analyse_code: code,
+          title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel] }
       end
 
       def isorefmatches2out(item, xml)
         if item[:doc] then use_retrieved_relaton(item, xml)
-        else isorefmatches2_1(xml, item[:ref][:match])
+        else isorefmatches2_1(xml, item[:ref][:match],
+                              item[:ref][:analyse_code])
         end
       end
 
-      def isorefmatches2_1(xml, match)
+      def isorefmatches2_1(xml, match, code)
         xml.bibitem **attr_code(ref_attributes(match)) do |t|
-          isorefrender1(t, match, "--")
+          isorefrender1(t, match, code, "--")
           t.date type: "published" do |d|
             d.on "--"
           end
@@ -68,13 +74,14 @@ module Metanorma
         end
       end
 
-      def isorefmatches3code(match)
+      def isorefmatches3code(match, _item)
+        code = analyse_ref_code(match[:code])
         yr = norm_year(match[:year])
         hasyr = !yr.nil? && yr != "--"
         { code: match[:code], match: match, yr: yr, hasyr: hasyr,
           year: hasyr ? yr : nil,
           all_parts: true, no_year: yr == "--",
-          text: match[:text], usrlbl: match[:usrlbl],
+          title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel],
           lang: (@lang || :all) }
       end
 
@@ -82,14 +89,15 @@ module Metanorma
         if item[:doc] then use_retrieved_relaton(item, xml)
         else
           isorefmatches3_1(xml, item[:ref][:match],
+                           item[:ref][:analyse_code],
                            item[:ref][:yr],
                            item[:ref][:hasyr], item[:doc])
         end
       end
 
-      def isorefmatches3_1(xml, match, year, _hasyr, _ref)
+      def isorefmatches3_1(xml, match, code, year, _hasyr, _ref)
         xml.bibitem(**attr_code(ref_attributes(match))) do |t|
-          isorefrender1(t, match, year, " (all parts)")
+          isorefrender1(t, match, code, year, " (all parts)")
           conditional_date(t, match, year == "--")
           iso_publisher(t, match[:code])
           if match.names.include?("fn") && match[:fn]
@@ -110,7 +118,9 @@ module Metanorma
         end
         # code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
         docid(bib, match[:usrlbl]) if match[:usrlbl]
-        docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
+        docid(bib, code[:usrlabel]) if code[:usrlabel]
+        code[:id] and
+          docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
         code[:type] == "repo" and
           bib.docidentifier code[:key], type: "repository"
       end
@@ -122,10 +132,10 @@ module Metanorma
           t.formattedref format: "application/x-isodoc+xml" do |i|
             i << ref_normalise_no_format(match[:text])
           end
-          yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code[:id])
+          yr_match = refitem1yr(code[:id])
           refitem_render1(match, code, t)
           /^\d+$|^\(.+\)$/.match?(code[:id]) or
-            docnumber(t, code[:id].sub(/[:-](19|20)[0-9][0-9]$/, ""))
+            docnumber(t, code[:id]&.sub(/[:-](19|20)[0-9][0-9]$/, ""))
           conditional_date(t, yr_match || match, false)
         end
       end
@@ -143,16 +153,17 @@ module Metanorma
         ((code[:id] && code[:numeric]) || code[:nofetch]) and
           return { code: nil, match: match, analyse_code: code,
                    hidden: code[:hidden] }
-        year = refitem1yr(code[:id])
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
-          year: year,
+          year: (m = refitem1yr(code[:id])) ? m[:year] : nil,
           title: match[:text], match: match, hidden: code[:hidden],
-          usrlbl: match[:usrlbl], lang: (@lang || :all) }
+          usrlbl: match[:usrlbl] || code[:usrlabel], lang: (@lang || :all) }
       end
 
       def refitem1yr(code)
-        yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code)
-        yr_match ? yr_match[:year] : nil
+        yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])$/.match(code)
+        /[:-](?:19|20)[0-9][0-9].*?[:-](?:19|20)[0-9][0-9]$/.match(code) and
+          yr_match = nil
+        yr_match
       end
 
       def refitemout(item, xml)
@@ -200,13 +211,17 @@ module Metanorma
         matched, matched2, matched3 = reference1_matches(item)
         if matched3.nil? && matched2.nil? && matched.nil?
           refitemcode(item, node).merge(process: 0)
-        elsif !matched.nil? then isorefmatchescode(matched).merge(process: 1)
-        elsif !matched2.nil? then isorefmatches2code(matched2).merge(process: 2)
-        elsif !matched3.nil? then isorefmatches3code(matched3).merge(process: 3)
+        elsif !matched.nil? then isorefmatchescode(matched,
+                                                   item).merge(process: 1)
+        elsif !matched2.nil? then isorefmatches2code(matched2,
+                                                     item).merge(process: 2)
+        elsif !matched3.nil? then isorefmatches3code(matched3,
+                                                     item).merge(process: 3)
         end
       end
 
       def reference1out(item, xml)
+        item[:ref][:analyse_code] ||= analyse_ref_code(item[:ref][:code])
         case item[:ref][:process]
         when 0 then refitemout(item, xml)
         when 1 then isorefmatchesout(item, xml)

data/lib/metanorma/standoc/ref_utility.rb

@@ -52,6 +52,7 @@ module Metanorma
       end
 
       def docnumber(bib, code)
+        code or return
         bib.docnumber do |d|
           d << @c.decode(code).sub(/^[^\d]*/, "")
         end
@@ -105,12 +106,59 @@ module Metanorma
         ret.merge(numeric: true)
       end
 
-      # ref id = (usrlbl)code[:-]year
-      # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
-      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key)
       def analyse_ref_code(code)
         ret = { id: code }
         code.nil? || code.empty? and return ret
+        analyse_ref_code_csv(ret) ||
+          analyse_ref_code_nested(ret)
+      end
+
+      def analyse_ref_code_csv(ret)
+        ret[:id].include?("=") or return nil
+        line = CSV.parse_line(ret[:id], liberal_parsing: true) or return nil
+        a = analyse_ref_code_csv_breakup(line)
+        analyse_ref_code_csv_map(a)
+      rescue StandardError
+        nil
+      end
+
+      def analyse_ref_code_csv_breakup(line)
+        line.each_with_object({}) do |x, m|
+          kv = x.split("=", 2)
+          kv.size == 1 and kv = ["code", kv.first]
+          m[kv[0].to_sym] = kv[1].delete_prefix('"').delete_suffix('"')
+            .delete_prefix("'").delete_suffix("'")
+        end
+      end
+
+      def analyse_ref_code_csv_map(source)
+        source.each_with_object({}) do |(k, v), ret|
+          case k
+          when :dropid, :hidden, :nofetch
+            ret[k] = v == "true"
+          when :repo, :path
+            ret[:type] = k.to_s
+            ret[:key] = v
+            ret[:nofetch] = true
+            source[:code] or
+              ret[:id] = v.sub(%r{^[^/]+/}, "")
+          when :"local-file"
+            ret[:localfile] = v
+          when :number
+            if source[:code] then ret[:usrlabel] = "(#{v})"
+            else ret[:numeric] = true
+            end
+          when :usrlabel
+            ret[:usrlabel] = "(#{v})"
+          when :code then ret[:id] = v
+          end
+        end
+      end
+
+      # ref id = (usrlbl)code[:-]year
+      # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
+      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key)
+      def analyse_ref_code_nested(ret)
         analyse_ref_numeric(
           analyse_ref_repo_path(
             analyse_ref_dropid(

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -70,7 +70,9 @@ module Metanorma
           ret = ""
           spans[:edition] and ret += "<edition>#{spans[:edition]}</edition>"
           spans[:version] and ret += "<version>#{spans[:version]}</version>"
-          spans[:note] and ret += "<note>#{spans[:note]}</note>"
+          spans[:note] and
+            ret += "<note type='#{spans[:note][:type]}'>#{spans[:note][:val]}" \
+                   "</note>".sub(/<note type=''>/, "<note>")
           ret
         end
 

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -45,9 +45,10 @@ module Metanorma
           when "pages", "volume", "issue"
             ret[:extent][span[:key].to_sym] ||= []
             ret[:extent][span[:key].to_sym] << span[:val]
-          when "pubplace", "title", "type", "series", "edition", "version",
-            "note"
+          when "pubplace", "title", "type", "series", "edition", "version"
             ret[span[:key].to_sym] = span[:val]
+          when "note"
+            ret[span[:key].to_sym] = { type: span[:type], val: span[:val] }
           when "in_title"
             ret[:in][:title] = span[:val]
           when "publisher"

data/lib/metanorma/standoc/terms.rb

@@ -6,10 +6,9 @@ module Metanorma
       end
 
       def nonterm_symbols_parse(attrs, xml, node)
-        defs = @definitions
-        @definitions = false
+        stash_symbols
         clause_parse(attrs, xml, node)
-        @definitions = defs
+        pop_symbols
       end
 
       def symbols_attrs(node, attr)
@@ -26,28 +25,45 @@ module Metanorma
         node.role == "nonterm" and return nonterm_symbols_parse(attr, xml, node)
         xml.definitions **attr_code(attr) do |xml_section|
           xml_section.title { |t| t << node.title }
-          defs = @definitions
-          termdefs = @term_def
+          stash_symbols
           @definitions = true
-          @term_def = false
+          stash_term_def
           xml_section << node.content
-          @definitions = defs
-          @term_def = termdefs
+          pop_symbols
+          pop_term_def
         end
       end
 
       def nonterm_term_def_subclause_parse(attrs, xml, node)
-        defs = @term_def
-        @term_def = false
+        stash_term_def
         clause_parse(attrs, xml, node)
-        @term_def = defs
+        pop_term_def
       end
 
       def terms_boilerplate_parse(attrs, xml, node)
-        defs = @term_def
-        @term_def = false
+        stash_term_def
         clause_parse(attrs.merge(type: "boilerplate"), xml, node)
-        @term_def = defs
+        pop_term_def
+      end
+
+      def stash_term_def
+        @stashed_term_def ||= []
+        @stashed_term_def.push(@term_def)
+        @term_def = false
+      end
+
+      def pop_term_def
+        @term_def = @stashed_term_def.pop
+      end
+
+      def stash_symbols
+        @stashed_definitions ||= []
+        @stashed_definitions.push(@definitions)
+        @definitions = false
+      end
+
+      def pop_symbols
+        @definitions = @stashed_definitions.pop
       end
 
       # subclause contains subclauses
@@ -106,14 +122,14 @@ module Metanorma
       end
 
       def add_term_source(node, xml_t, seen_xref, match)
-        if seen_xref.children[0].name == "concept"
-          xml_t.origin { |o| o << seen_xref.children[0].to_xml }
-        else
+        attrs = {}
+        body = seen_xref.children[0]
+        unless body.name == "concept"
           attrs = termsource_origin_attrs(node, seen_xref)
-          attrs.delete(:text)
-          xml_t.origin **attr_code(attrs) do |o|
-            o << seen_xref.children[0].children.to_xml
-          end
+          body = body.children
+        end
+        xml_t.origin **attr_code(attrs) do |o|
+          o << body.to_xml
         end
         add_term_source_mod(xml_t, match)
       end
@@ -136,15 +152,15 @@ module Metanorma
       def extract_termsource_refs(text, node)
         matched = TERM_REFERENCE_RE.match text
         matched.nil? and @log.add("AsciiDoc Input", node,
-                                  "term reference not in expected format:"\
+                                  "term reference not in expected format:" \
                                   "#{text}")
         matched
       end
 
       def termsource_attrs(node, matched)
-        status = node.attr("status") ||
+        status = node.attr("status")&.downcase ||
           (matched[:text] ? "modified" : "identical")
-        { status: status, type: node.attr("type") || "authoritative" }
+        { status: status, type: node.attr("type")&.downcase || "authoritative" }
       end
 
       def termsource(node)

data/lib/metanorma/standoc/validate.rb

@@ -1,6 +1,7 @@
 require "metanorma/standoc/utils"
 require_relative "./validate_section"
 require_relative "./validate_table"
+require_relative "./validate_xref"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -155,22 +156,6 @@ module Metanorma
         ret
       end
 
-      def repeat_id_validate1(elem)
-        if @doc_ids[elem["id"]]
-          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
-                                    "used at line #{@doc_ids[elem['id']]}")
-          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
-        end
-        @doc_ids[elem["id"]] = elem.line
-      end
-
-      def repeat_id_validate(doc)
-        @doc_ids = {}
-        doc.xpath("//*[@id]").each do |x|
-          repeat_id_validate1(x)
-        end
-      end
-
       def schema_validate(doc, schema)
         Tempfile.open(["tmp", ".xml"], encoding: "UTF-8") do |f|
           schema_validate1(f, doc, schema)
@@ -214,17 +199,6 @@ module Metanorma
         doc
       end
 
-      # manually check for xref/@target, xref/@to integrity
-      def xref_validate(doc)
-        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
-          .each_with_object({}) do |x, m|
-          m[x.text] = x
-          @doc_ids[x.text] and next
-          @log.add("Anchors", x.parent,
-                   "Crossreference target #{x} is undefined")
-        end
-      end
-
       def image_validate(doc)
         image_exists(doc)
         png_validate(doc)

data/lib/metanorma/standoc/validate_xref.rb

@@ -0,0 +1,32 @@
+module Metanorma
+  module Standoc
+    module Validate
+      def repeat_id_validate1(elem)
+        if @doc_ids[elem["id"]]
+          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
+                                    "used at line #{@doc_ids[elem['id']]}")
+          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
+        end
+        @doc_ids[elem["id"]] = elem.line
+      end
+
+      def repeat_id_validate(doc)
+        @doc_ids = {}
+        doc.xpath("//*[@id]").each do |x|
+          repeat_id_validate1(x)
+        end
+      end
+
+      # manually check for xref/@target, xref/@to integrity
+      def xref_validate(doc)
+        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
+          .each_with_object({}) do |x, m|
+          m[x.text] = x
+          @doc_ids[x.text] and next
+          @log.add("Anchors", x.parent,
+                   "Crossreference target #{x} is undefined")
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.4.2".freeze
+    VERSION = "2.4.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,9 +30,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.5.0"
+  spec.add_dependency "isodoc", "~> 2.5.4"
   spec.add_dependency "metanorma", ">= 1.5.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
+  spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"
   spec.add_dependency "metanorma-plugin-lutaml"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-plugin-glossarist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-lutaml
   requirement: !ruby/object:Gem::Requirement
@@ -514,6 +528,7 @@ files:
 - lib/metanorma/standoc/validate.rb
 - lib/metanorma/standoc/validate_section.rb
 - lib/metanorma/standoc/validate_table.rb
+- lib/metanorma/standoc/validate_xref.rb
 - lib/metanorma/standoc/version.rb
 - lib/metanorma/standoc/views/datamodel/model_representation.adoc.erb
 - lib/metanorma/standoc/views/datamodel/plantuml_representation.adoc.erb