metanorma-standoc 2.4.3 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ade5d859084779fe2f7357438926e03e0359adbf528d4db67a1851200f7e45
-  data.tar.gz: d17ee40a8d465764b0d7577a0ab69db5d96ab1c4e5c923b77059326d2e52e45c
+  metadata.gz: 8989224ddc5bb169f13c102066f005b7c72e0d6ff0cd7a2c2122ef57ed7f6923
+  data.tar.gz: ff257fb02f7feb16d680f111ae39c8806abaff034e087659586bbd43bc34a6e5
 SHA512:
-  metadata.gz: 794db303464ba57e25b5ccb240b794524842fe99a42cf136f7f0ff3d0e77f82eb017676b3a0b9ef491b655ffe42b50d9332d880c4a10c9ca7a705252e62c5199
-  data.tar.gz: 6f9f27b816283a7cf27fc3b441cfd9d04a72c7a26da7d66264f3984e391e4ab3f3be384e167e1a813d8bfabcc070d98f162908a5f1a9dd5670dca3614e002873
+  metadata.gz: 837c2c91f59f93374b747c23b71f5740b1e64d0e29e06d8e7e4076bb7c0ce24700b29b17434ece743d1e1fbcd7b6fa5b245526207525f2b6cbfb6c5a2be6dd29
+  data.tar.gz: ab6f75ce5add0b40f99d47a47b123ccfc090291b5e6adb4f1c41687e541f53f111dff9fecb6c6ecb46ff5aeaee8ad0af97bd444da8f9b00525b210fa8c1d7430

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_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_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,9 +22,11 @@ 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
+        inline_macro Metanorma::Standoc::DateInlineMacro
         inline_macro Metanorma::Standoc::SpanInlineMacro
         inline_macro Metanorma::Standoc::AltTermInlineMacro
         inline_macro Metanorma::Standoc::AdmittedTermInlineMacro

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.1 -->
+<!-- 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">
@@ -211,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -1009,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1050,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -2136,6 +2157,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/macros_inline.rb

@@ -27,7 +27,7 @@ module Metanorma
 
       def process(_parent, target, attr)
         args = preprocess_attrs(attr) or return
-        ret = "<index-xref also='#{target == 'also'}'>"\
+        ret = "<index-xref also='#{target == 'also'}'>" \
               "<primary>#{args[:primary]}</primary>"
         ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
         ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
@@ -69,7 +69,7 @@ module Metanorma
           rpend = attributes["rpend"]
         end
 
-        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>"\
+        "<ruby>#{target}<rp>#{rpbegin}</rp><rt>#{rt}</rt>" \
           "<rp>#{rpend}</rp></ruby>"
       end
     end
@@ -101,6 +101,18 @@ module Metanorma
       end
     end
 
+    class DateInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :date
+      using_format :short
+
+      def process(_parent, _target, attrs)
+        format = "%F"
+        attrs.size >= 2 and format = attrs[2]
+        %{<date format='#{format}' value='#{attrs[1]}'/>}
+      end
+    end
+
     class AddMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :add

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
@@ -125,7 +135,7 @@ module Metanorma
           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
@@ -146,7 +156,7 @@ module Metanorma
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
           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)
@@ -201,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

@@ -122,7 +122,7 @@ module Metanorma
         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
+        # @fatalerror << err2
       end
 
       def concept_validate(doc, tag, refterm)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.4.3".freeze
+    VERSION = "2.4.5".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   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.3
+  version: 2.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -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