metanorma-standoc 1.10.7 → 1.11.1

data/lib/asciidoctor/standoc/lists.rb

@@ -4,21 +4,19 @@ module Asciidoctor
       def li(xml_ul, item)
         xml_ul.li do |xml_li|
           if item.blocks?
-            xml_li.p(**id_attr(item)) { |t| t << item.text }
+            xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
             xml_li << item.content
           else
-            xml_li.p(**id_attr(item)) { |p| p << item.text }
+            xml_li.p(**attr_code(id_attr(item))) { |p| p << item.text }
           end
         end
       end
 
       def ul_li(xml_ul, item)
         xml_ul.li **ul_li_attrs(item) do |xml_li|
+          xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
           if item.blocks?
-            xml_li.p(**id_attr(item)) { |t| t << item.text }
             xml_li << item.content
-          else
-            xml_li.p(**id_attr(item)) { |p| p << item.text }
           end
         end
       end
@@ -57,9 +55,8 @@ module Asciidoctor
       end
 
       def ol_attrs(node)
-        attr_code(keep_attrs(node)
-          .merge(id: Metanorma::Utils::anchor_or_uuid(node),
-                 type: olist_style(node.style)))
+        attr_code(id_attr(node).merge(keep_attrs(node)
+          .merge(type: olist_style(node.style))))
       end
 
       def olist(node)
@@ -79,22 +76,23 @@ module Asciidoctor
         end
       end
 
-      def dd(dd, xml_dl)
-        if dd.nil?
+      def dd(ddefn, xml_dl)
+        if ddefn.nil?
           xml_dl.dd
           return
         end
         xml_dl.dd do |xml_dd|
-          xml_dd.p { |t| t << dd.text } if dd.text?
-          xml_dd << dd.content if dd.blocks?
+          xml_dd.p { |t| t << ddefn.text } if ddefn.text?
+          xml_dd << ddefn.content if ddefn.blocks?
         end
       end
 
       def dl_attrs(node)
-        attr_code(keep_attrs(node)
-                  .merge(id: Metanorma::Utils::anchor_or_uuid(node),
-                         metadata: node.option?("metadata") ? "true" : nil,
-                         key: node.option?("key") ? "true" : nil))
+        attr_code(id_attr(node).merge(keep_attrs(node)
+          .merge(
+            metadata: node.option?("metadata") ? "true" : nil,
+            key: node.option?("key") ? "true" : nil,
+          )))
       end
 
       def dlist(node)

data/lib/asciidoctor/standoc/macros_plantuml.rb

@@ -28,32 +28,38 @@ module Asciidoctor
       # sleep need for windows because dot works in separate process and
       # plantuml process may finish earlier then dot, as result png file
       # maybe not created yet after plantuml finish
+      #
+      # # Warning: metanorma/metanorma-standoc#187
+      # Windows Ruby 2.4 will crash if a Tempfile is "mv"ed.
+      # This is why we need to copy and then unlink.
       def self.generate_file(parent, reader)
         localdir = Metanorma::Utils::localdir(parent.document)
         imagesdir = parent.document.attr("imagesdir")
         umlfile, outfile = save_plantuml parent, reader, localdir
-        run(umlfile, outfile) or raise "No image output from PlantUML (#{umlfile}, #{outfile})!"
+        run(umlfile, outfile) or
+          raise "No image output from PlantUML (#{umlfile}, #{outfile})!"
         umlfile.unlink
 
-        path = Pathname.new(localdir) + (imagesdir || "plantuml")
-        File.writable?(localdir) or raise "Destination path #{path} not writable for PlantUML!"
-        path.mkpath
-        File.writable?(path) or raise "Destination path #{path} not writable for PlantUML!"
-        # File.exist?(path) or raise "Destination path #{path} already exists for PlantUML!"
-
-        # Warning: metanorma/metanorma-standoc#187
-        # Windows Ruby 2.4 will crash if a Tempfile is "mv"ed.
-        # This is why we need to copy and then unlink.
+        path = path_prep(localdir, imagesdir)
         filename = File.basename(outfile.to_s)
-        FileUtils.cp(outfile, path) && outfile.unlink
+        FileUtils.cp(outfile, path) and outfile.unlink
 
         imagesdir ? filename : File.join(path, filename)
       end
 
+      def self.path_prep(localdir, imagesdir)
+        path = Pathname.new(localdir) + (imagesdir || "plantuml")
+        File.writable?(localdir) or
+          raise "Destination path #{path} not writable for PlantUML!"
+        path.mkpath
+        File.writable?(path) or
+          raise "Destination path #{path} not writable for PlantUML!"
+        # File.exist?(path) or raise "Destination path #{path} already exists for PlantUML!"
+        path
+      end
+
       def self.save_plantuml(_parent, reader, _localdir)
-        src = reader.source
-        reader.lines.first.sub(/\s+$/, "").match /^@startuml($| )/ or
-          src = "@startuml\n#{src}\n@enduml\n"
+        src = prep_source(reader)
         /^@startuml (?<fn>[^\n]+)\n/ =~ src
         Tempfile.open(["plantuml", ".pml"], encoding: "utf-8") do |f|
           f.write(src)
@@ -62,6 +68,15 @@ module Asciidoctor
         end
       end
 
+      def self.prep_source(reader)
+        src = reader.source
+        reader.lines.first.sub(/\s+$/, "").match /^@startuml($| )/ or
+          src = "@startuml\n#{src}\n@enduml\n"
+        %r{@enduml\s*$}m.match?(src) or
+          raise "@startuml without matching @enduml in PlantUML!"
+        src
+      end
+
       def self.generate_attrs(attrs)
         %w(id align float title role width height alt)
           .inject({}) do |memo, key|

data/lib/asciidoctor/standoc/macros_terms.rb

@@ -2,6 +2,18 @@ require "csv"
 
 module Asciidoctor
   module Standoc
+    class PreferredTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :preferred
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<preferred><expression><name>#{out}</name></expression></preferred>}
+      end
+    end
+
     class AltTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :alt
@@ -9,8 +21,9 @@ module Asciidoctor
       using_format :short
 
       def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<admitted>#{out}</admitted>}
+        out = Asciidoctor::Inline.new(parent, :quoted,
+                                      attrs["text"]).convert
+        %{<admitted><expression><name>#{out}</name></expression></admitted>}
       end
     end
 
@@ -21,8 +34,9 @@ module Asciidoctor
       using_format :short
 
       def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<deprecates>#{out}</deprecates>}
+        out = Asciidoctor::Inline.new(parent, :quoted,
+                                      attrs["text"]).convert
+        %{<deprecates><expression><name>#{out}</name></expression></deprecates>}
       end
     end
 
@@ -33,7 +47,8 @@ module Asciidoctor
       using_format :short
 
       def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        out = Asciidoctor::Inline.new(parent, :quoted,
+                                      attrs["text"]).convert
         %{<domain>#{out}</domain>}
       end
     end
@@ -116,9 +131,12 @@ module Asciidoctor
 
       def process(parent, target, _attrs)
         attrs = preprocess_attrs(target)
-        term = Asciidoctor::Inline.new(parent, :quoted, attrs[:term]).convert
-        word = Asciidoctor::Inline.new(parent, :quoted, attrs[:word]).convert
-        xref = Asciidoctor::Inline.new(parent, :quoted, attrs[:render]).convert
+        term = Asciidoctor::Inline.new(parent, :quoted,
+                                       attrs[:term]).convert
+        word = Asciidoctor::Inline.new(parent, :quoted,
+                                       attrs[:word]).convert
+        xref = Asciidoctor::Inline.new(parent, :quoted,
+                                       attrs[:render]).convert
         opt = generate_attrs(attrs[:opt] || [])
         if attrs[:id] then "<concept#{opt} key='#{attrs[:id]}'><refterm>"\
           "#{term}</refterm><renderterm>#{word}</renderterm>"\
@@ -130,5 +148,34 @@ module Asciidoctor
         raise("processing {{#{target}}}: #{e.message}")
       end
     end
+
+    # Possibilities:
+    # related:relation[<<id>>, term]
+    # related:relation[<<termbase:id>>, term]
+    # related:relation[term] equivalent to a crossreference to term:[term]
+    class RelatedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :related
+      parse_content_as :text
+
+      def preprocess_attrs(target)
+        m = /^(?<id>&lt;&lt;.+?&gt;&gt;, ?)?(?<rest>.*)$/.match(target)
+        { id: m[:id]&.sub(/^&lt;&lt;/, "")&.sub(/&gt;&gt;, ?$/, ""),
+          term: m[:rest] }
+      end
+
+      def process(parent, target, attrs)
+        out = preprocess_attrs(attrs["text"])
+        term = Asciidoctor::Inline.new(parent, :quoted,
+                                       out[:term]).convert
+        if out[:id] then "<related type='#{target}' key='#{out[:id]}'>"\
+          "<refterm>#{term}</refterm></related>"
+        else "<related type='#{target}'><termxref>#{term}</termxref>"\
+          "<xrefrender>#{term}</xrefrender></related>"
+        end
+      rescue StandardError => e
+        raise("processing related:#{target}[#{attrs['text']}]: #{e.message}")
+      end
+    end
   end
 end

data/lib/asciidoctor/standoc/ref.rb

@@ -161,7 +161,7 @@ module Asciidoctor
 
       def refitem1(xml, _item, match)
         code = analyse_ref_code(match[:code])
-        unless code[:id] && code[:numeric] || code[:nofetch]
+        unless (code[:id] && code[:numeric]) || code[:nofetch]
           ref = fetch_ref(xml, code[:id],
                           match.names.include?("year") ? match[:year] : nil,
                           title: match[:text],

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -16,16 +16,14 @@ module Asciidoctor
       end
 
       def bibliography_parse(attrs, xml, node)
-        node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
-        node.attr("style") == "bibliography" or
-          @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
+        x = biblio_prep(attrs, xml, node) and return x
         @biblio = true
-        xml.references **attr_code(attrs.merge(
-          normative: node.attr("normative") || false)) do |xml_section|
-            xml_section.title { |t| t << node.title }
-            xml_section << node.content
-          end
-          @biblio = false
+        attrs = attrs.merge(normative: node.attr("normative") || false)
+        xml.references **attr_code(attrs) do |xml_section|
+          xml_section.title { |t| t << node.title }
+          xml_section << node.content
+        end
+        @biblio = false
       end
 
       def bibitem_parse(attrs, xml, node)
@@ -33,15 +31,14 @@ module Asciidoctor
         biblio = @biblio
         @biblio = false
         @norm_ref = false
-        clause_parse(attrs, xml, node)
+        ret = clause_parse(attrs, xml, node)
         @biblio = biblio
         @norm_ref = norm_ref
+        ret
       end
 
       def norm_ref_parse(attrs, xml, node)
-        node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
-        node.attr("style") == "bibliography" or
-          @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
+        x = biblio_prep(attrs, xml, node) and return x
         @norm_ref = true
         attrs = attrs.merge(normative: node.attr("normative") || true)
         xml.references **attr_code(attrs) do |xml_section|
@@ -51,6 +48,17 @@ module Asciidoctor
         @norm_ref = false
       end
 
+      def biblio_prep(attrs, xml, node)
+        if node.option? "bibitem"
+          bibitem_parse(attrs, xml, node)
+        else
+          node.attr("style") == "bibliography" or
+            @log.add("AsciiDoc Input", node,
+                     "Section not marked up as [bibliography]!")
+          nil
+        end
+      end
+
       def global_ievcache_name
         "#{Dir.home}/.iev/cache"
       end
@@ -74,7 +82,7 @@ module Asciidoctor
         xml
       rescue RelatonBib::RequestError
         @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
-                 "no access to online site")
+                                      "no access to online site")
         nil
       end
 
@@ -87,10 +95,10 @@ module Asciidoctor
         unless xml.at("/bibitem/title[text()]")
           @log.add("Bibliography", nil,
                    "ERROR: No title retrieved for #{code}")
-          xml.root << "<title>#{title || "(MISSING TITLE)"}</title>"
+          xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
         end
         usrlbl and xml.at("/bibitem/docidentifier").next =
-          "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
+                     "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
       end
 
       def smart_render_xml(xml, code, opts)
@@ -113,7 +121,7 @@ module Asciidoctor
         @bibdb = Relaton::DbCache.init_bib_caches(
           local_cache: local,
           flush_caches: node.attr("flush-caches"),
-          global_cache: global
+          global_cache: global,
         )
       end
 
@@ -128,7 +136,7 @@ module Asciidoctor
             FileUtils.rm_f @iev_localname unless @iev_localname.nil?
           end
         end
-        #@iev = Iev::Db.new(globalname, localname) unless @no_isobib
+        # @iev = Iev::Db.new(globalname, localname) unless @no_isobib
       end
     end
   end

data/lib/asciidoctor/standoc/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

data/lib/asciidoctor/standoc/section.rb

@@ -18,7 +18,7 @@ module Asciidoctor
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
         ret1 = sectiontype_streamline(ret)
-        return ret1 if "symbols and abbreviated terms" == ret1
+        return ret1 if ret1 == "symbols and abbreviated terms"
         return nil unless !level || node.level == 1
         return nil if @seen_headers.include? ret
 
@@ -49,7 +49,8 @@ module Asciidoctor
                 script: node.attributes["script"],
                 number: node.attributes["number"],
                 type: node.attributes["type"],
-                annex: (if (node.attr("style") == "appendix" || node.role == "appendix") &&
+                annex: (if (node.attr("style") == "appendix" ||
+                            node.role == "appendix") &&
                           node.level == 1
                           true
                         end),
@@ -84,13 +85,11 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @definitions then symbols_parse(a, xml, node)
-            elsif @norm_ref then norm_ref_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "normative references"
+            elsif @norm_ref ||
+                (node.attr("style") == "bibliography" &&
+                 sectiontype(node, false) == "normative references")
               norm_ref_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
+            elsif @biblio || node.attr("style") == "bibliography"
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract"
               abstract_parse(a, xml, node)
@@ -118,7 +117,9 @@ module Asciidoctor
       def preamble(node)
         noko do |xml|
           xml.foreword **attr_code(section_attributes(node)) do |xml_abstract|
-            xml_abstract.title { |t| t << (node.blocks[0].title || @i18n.foreword) }
+            xml_abstract.title do |t|
+              t << (node.blocks[0].title || @i18n.foreword)
+            end
             content = node.content
             xml_abstract << content
           end
@@ -143,7 +144,7 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         attrs[:bibitem] = true if node.option? "bibitem"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
@@ -154,7 +155,7 @@ module Asciidoctor
       end
 
       def annex_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.annex **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }
@@ -180,7 +181,7 @@ module Asciidoctor
 
       def acknowledgements_parse(attrs, xml, node)
         xml.acknowledgements **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title || @i18n.acknowledgements }
+          xml_section.title { |t| (t << node.title) || @i18n.acknowledgements }
           content = node.content
           xml_section << content
         end

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true.
+require "asciidoctor/standoc/utils"
+
 
 module Asciidoctor
   module Standoc
@@ -13,7 +15,7 @@ module Asciidoctor
       def initialize(xmldoc, log)
         @xmldoc = xmldoc
         @log = log
-        @termlookup = { term: {}, symbol: {} }
+        @termlookup = { term: {}, symbol: {}, secondary2primary: {} }
         @idhash = {}
       end
 
@@ -22,6 +24,7 @@ module Asciidoctor
         @termlookup = replace_automatic_generated_ids_terms
         set_termxref_tags_target
         concept_cleanup
+        related_cleanup
       end
 
       private
@@ -29,6 +32,19 @@ module Asciidoctor
       def concept_cleanup
         xmldoc.xpath("//concept").each do |n|
           n.delete("type")
+          refterm = n.at("./refterm") or next
+          p = @termlookup[:secondary2primary][refterm.text] and
+            refterm.children = p
+        end
+      end
+
+      def related_cleanup
+        xmldoc.xpath("//related").each do |n|
+          refterm = n.at("./refterm") or next
+          p = @termlookup[:secondary2primary][refterm.text] and
+            refterm.children = p
+          refterm.replace("<preferred><expression><name>#{refterm.children.to_xml}"\
+                          "</name></expression></preferred>")
         end
       end
 
@@ -47,8 +63,7 @@ module Asciidoctor
             remove_missing_ref(node, target)
             next
           end
-          x = node.at("../xrefrender")
-          modify_ref_node(x, target)
+          x = node.at("../xrefrender") and modify_ref_node(x, target)
           node.name = "refterm"
         end
       end
@@ -66,12 +81,12 @@ module Asciidoctor
                 %(Error: Term reference in `term[#{target}]` missing: \
                 "#{target}" is not defined in document))
         node.name = "strong"
-        node.at("../xrefrender").remove
+        node&.at("../xrefrender")&.remove
         display = node&.at("../renderterm")&.remove&.children
         display = [] if display.nil? || display&.to_xml == node.text
         d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
         node.children = "term <tt>#{node.text}</tt>#{d} "\
-          "not resolved via ID <tt>#{target}</tt>"
+                        "not resolved via ID <tt>#{target}</tt>"
       end
 
       def remove_missing_ref_symbol(node, target)
@@ -79,12 +94,12 @@ module Asciidoctor
                 %(Error: Symbol reference in `symbol[#{target}]` missing: \
                 "#{target}" is not defined in document))
         node.name = "strong"
-        node.at("../xrefrender").remove
+        node&.at("../xrefrender")&.remove
         display = node&.at("../renderterm")&.remove&.children
         display = [] if display.nil? || display&.to_xml == node.text
         d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
         node.children = "symbol <tt>#{node.text}</tt>#{d} "\
-          "not resolved via ID <tt>#{target}</tt>"
+                        "not resolved via ID <tt>#{target}</tt>"
       end
 
       def modify_ref_node(node, target)
@@ -92,24 +107,40 @@ module Asciidoctor
         s = termlookup[:symbol][target]
         t = termlookup[:term][target]
         type = node.parent["type"]
-        if type == "term" || !type && t
+        if type == "term" || ((!type || node.parent.name == "related") && t)
           node["target"] = t
-        elsif type == "symbol" || !type && s
+        elsif type == "symbol" ||
+          ((!type || node.parent.name == "related") && s)
           node["target"] = s
         end
       end
 
       def replace_automatic_generated_ids_terms
         r = xmldoc.xpath("//term").each.with_object({}) do |n, res|
-          normalize_id_and_memorize(n, res, "./preferred", "term")
+          normalize_id_and_memorize(n, res, "./preferred//name",
+                                    "term")
         end
         s = xmldoc.xpath("//definitions//dt").each.with_object({}) do |n, res|
           normalize_id_and_memorize(n, res, ".", "symbol")
         end
-        { term: r, symbol: s }
+        { term: r, symbol: s, secondary2primary: pref_secondary2primary }
+      end
+
+      def pref_secondary2primary
+        xmldoc.xpath("//term").each.with_object({}) do |n, res|
+          n.xpath("./preferred//name").each_with_index do |p, i|
+            i.zero? and term = p.text
+            i.positive? and res[p.text] = term
+          end
+        end
       end
 
       def normalize_id_and_memorize(node, res_table, text_selector, prefix)
+        normalize_id_and_memorize_init(node, res_table, text_selector, prefix)
+        memorize_other_pref_terms(node, res_table, text_selector)
+      end
+
+      def normalize_id_and_memorize_init(node, res_table, text_selector, prefix)
         term_text = normalize_ref_id(node.at(text_selector).text)
         unless AUTOMATIC_GENERATED_ID_REGEXP.match(node["id"]).nil? &&
             !node["id"].nil?
@@ -120,6 +151,14 @@ module Asciidoctor
         res_table[term_text] = node["id"]
       end
 
+      def memorize_other_pref_terms(node, res_table, text_selector)
+        node.xpath(text_selector).each_with_index do |p, i|
+          next unless i.positive?
+
+          res_table[normalize_ref_id(p.text)] = node["id"]
+        end
+      end
+
       def normalize_ref_id(text)
         Metanorma::Utils::to_ncname(text.downcase.gsub(/[[:space:]]/, "-"))
       end

data/lib/asciidoctor/standoc/terms.rb

@@ -69,7 +69,7 @@ module Asciidoctor
 
       def term_def_subclause_parse1(attrs, xml, node)
         xml.term **attr_code(attrs) do |xml_section|
-          xml_section.preferred { |name| name << node.title }
+          term_designation(xml_section, node, "preferred", node.title)
           xml_section << node.content
         end
       end
@@ -84,6 +84,14 @@ module Asciidoctor
         end
       end
 
+      def term_designation(xml, _node, tag, text)
+        xml.send tag do |p|
+          p.expression do |e|
+            e.name { |name| name << text }
+          end
+        end
+      end
+
       def term_source_attrs(_node, seen_xref)
         { case: seen_xref.children[0]["case"],
           droploc: seen_xref.children[0]["droploc"],
@@ -124,7 +132,9 @@ module Asciidoctor
       def termsource(node)
         matched = extract_termsource_refs(node.content, node) || return
         noko do |xml|
-          attrs = { status: matched[:text] ? "modified" : "identical" }
+          status = node.attr("status") ||
+            (matched[:text] ? "modified" : "identical")
+          attrs = { status: status, type: node.attr("type") || "authoritative" }
           xml.termsource **attrs do |xml_t|
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
             add_term_source(node, xml_t, seen_xref, matched)