metanorma-standoc 1.10.0 → 1.10.3.1

data/lib/asciidoctor/standoc/macros_plantuml.rb

@@ -12,7 +12,6 @@ module Asciidoctor
           end
         end
         raise "PlantUML not installed"
-        nil
       end
 
       def self.run(umlfile, outfile)
@@ -59,7 +58,7 @@ module Asciidoctor
         Tempfile.open(["plantuml", ".pml"], encoding: "utf-8") do |f|
           f.write(src)
           [f, File.join(File.dirname(f.path),
-                        (fn || File.basename(f.path, ".pml")) + ".png")]
+                        "#{fn || File.basename(f.path, '.pml')}.png")]
         end
       end
 
@@ -81,7 +80,8 @@ module Asciidoctor
       def abort(parent, reader, attrs, msg)
         warn msg
         attrs["language"] = "plantuml"
-        create_listing_block parent, reader.source, attrs.reject { |k, _v| k == 1 }
+        create_listing_block parent, reader.source,
+                             (attrs.reject { |k, _v| k == 1 })
       end
 
       def process(parent, reader, attrs)

data/lib/asciidoctor/standoc/macros_terms.rb

@@ -46,7 +46,20 @@ module Asciidoctor
 
       def process(_parent, _target, attrs)
         termref = attrs["termxref"] || attrs["name"]
-        "<concept><termxref>#{attrs['name']}</termxref>"\
+        "<concept type='term'><termxref>#{attrs['name']}</termxref>"\
+          "<renderterm>#{termref}</renderterm><xrefrender/></concept>"
+      end
+    end
+
+    class SymbolRefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :symbol
+      name_positional_attributes "name", "termxref"
+      using_format :short
+
+      def process(_parent, _target, attrs)
+        termref = attrs["termxref"] || attrs["name"]
+        "<concept type='symbol'><termxref>#{attrs['name']}</termxref>"\
           "<renderterm>#{termref}</renderterm><xrefrender/></concept>"
       end
     end
@@ -68,24 +81,38 @@ module Asciidoctor
       def preprocess_attrs(target)
         m = /^(?<id>&lt;&lt;.+?&gt;&gt;)?(?<rest>.*)$/.match(target)
         ret = { id: m[:id]&.sub(/^&lt;&lt;/, "")&.sub(/&gt;&gt;$/, "") }
-        m2 = /^(?<rest>.*)(?<opt>,option=.+)?$/.match(m[:rest].sub(/^,/, ""))
-        ret[:opt] = m2[:opt]&.sub(/^,option=/, "")
-        attrs = CSV.parse_line(m2[:rest]) || []
+        if m2 = /^(?<rest>.*?)(?<opt>,option=.+)$/.match(m[:rest].sub(/^,/, ""))
+          ret[:opt] = CSV.parse_line(m2[:opt].sub(/^,option=/, "")
+            .sub(/^"(.+)"$/, "\\1").sub(/^'(.+)'$/, "\\1"))
+          attrs = CSV.parse_line(m2[:rest]) || []
+        else
+          attrs = CSV.parse_line(m[:rest].sub(/^,/, "")) || []
+        end
         ret.merge(term: attrs[0], word: attrs[1] || attrs[0],
                   xrefrender: attrs[2])
       end
 
+      def generate_attrs(opts)
+        ret = ""
+        opts.include?("noital") and ret += " ital='false'"
+        opts.include?("noref") and ret += " ref='false'"
+        opts.include?("ital") and ret += " ital='true'"
+        opts.include?("ref") and ret += " ref='true'"
+        ret
+      end
+
       def process(parent, target, _attrs)
         attrs = preprocess_attrs(target)
         termout = Asciidoctor::Inline.new(parent, :quoted, attrs[:term]).convert
         wordout = Asciidoctor::Inline.new(parent, :quoted, attrs[:word]).convert
         xrefout = Asciidoctor::Inline.new(parent, :quoted,
                                           attrs[:xrefrender]).convert
-        attrs[:id] and return "<concept key='#{attrs[:id]}'><refterm>"\
+        optout = generate_attrs(attrs[:opt] || [])
+        attrs[:id] and return "<concept#{optout} key='#{attrs[:id]}'><refterm>"\
           "#{termout}</refterm><renderterm>#{wordout}</renderterm>"\
           "<xrefrender>#{xrefout}</xrefrender></concept>"
-        "<concept><termxref>#{termout}</termxref><renderterm>#{wordout}"\
-          "</renderterm><xrefrender>#{xrefout}</xrefrender></concept>"
+        "<concept#{optout}><termxref>#{termout}</termxref><renderterm>"\
+          "#{wordout}</renderterm><xrefrender>#{xrefout}</xrefrender></concept>"
       end
     end
   end

data/lib/asciidoctor/standoc/ref.rb

@@ -4,7 +4,7 @@ module Asciidoctor
   module Standoc
     module Refs
       def iso_publisher(bib, code)
-        code.sub(/ .*$/, "").split(/\//).each do |abbrev|
+        code.sub(/ .*$/, "").split("/").each do |abbrev|
           bib.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization do |org|
@@ -18,75 +18,78 @@ module Asciidoctor
         { format: "text/plain" }
       end
 
-      def ref_attributes(m)
-        { id: m[:anchor], type: "standard" }
+      def ref_attributes(match)
+        { id: match[:anchor], type: "standard" }
       end
 
-      def isorefrender1(bib, m, yr, allp = "")
-        bib.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
-        docid(bib, m[:usrlbl]) if m[:usrlbl]
-        docid(bib, id_and_year(m[:code], yr) + allp)
-        docnumber(bib, m[:code])
+      def isorefrender1(bib, match, yr, allp = "")
+        bib.title(**plaintxt) { |i| i << ref_normalise(match[:text]) }
+        docid(bib, match[:usrlbl]) if match[:usrlbl]
+        docid(bib, id_and_year(match[:code], yr) + allp)
+        docnumber(bib, match[:code])
       end
 
-      def isorefmatches(xml, m)
-        yr = norm_year(m[:year])
-        ref = fetch_ref xml, m[:code], yr, title: m[:text], usrlbl: m[:usrlbl],
-          lang: (@lang || :all)
-        return use_my_anchor(ref, m[:anchor]) if ref
+      def isorefmatches(xml, match)
+        yr = norm_year(match[:year])
+        ref = fetch_ref xml, match[:code], yr,
+                        title: match[:text], usrlbl: match[:usrlbl],
+                        lang: (@lang || :all)
+        return use_my_anchor(ref, match[:anchor]) if ref
 
-        xml.bibitem **attr_code(ref_attributes(m)) do |t|
-          isorefrender1(t, m, yr)
+        xml.bibitem **attr_code(ref_attributes(match)) do |t|
+          isorefrender1(t, match, yr)
           yr and t.date **{ type: "published" } do |d|
             set_date_range(d, yr)
           end
-          iso_publisher(t, m[:code])
+          iso_publisher(t, match[:code])
         end
       end
 
-      def isorefmatches2(xml, m)
-        ref = fetch_ref xml, m[:code], nil, no_year: true, note: m[:fn],
-          title: m[:text], usrlbl: m[:usrlbl], lang: (@lang || :all)
-        return use_my_anchor(ref, m[:anchor]) if ref
+      def isorefmatches2(xml, match)
+        ref = fetch_ref xml, match[:code], nil,
+                        no_year: true, note: match[:fn],
+                        title: match[:text], usrlbl: match[:usrlbl],
+                        lang: (@lang || :all)
+        return use_my_anchor(ref, match[:anchor]) if ref
 
-        isorefmatches2_1(xml, m)
+        isorefmatches2_1(xml, match)
       end
 
-      def isorefmatches2_1(xml, m)
-        xml.bibitem **attr_code(ref_attributes(m)) do |t|
-          isorefrender1(t, m, "--")
+      def isorefmatches2_1(xml, match)
+        xml.bibitem **attr_code(ref_attributes(match)) do |t|
+          isorefrender1(t, match, "--")
           t.date **{ type: "published" } do |d|
             d.on "--"
           end
-          iso_publisher(t, m[:code])
-          unless m[:fn].nil?
+          iso_publisher(t, match[:code])
+          unless match[:fn].nil?
             t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
-            p << (m[:fn]).to_s
+              p << (match[:fn]).to_s
             end
           end
         end
       end
 
-      def isorefmatches3(xml, m)
-        yr = norm_year(m[:year])
+      def isorefmatches3(xml, match)
+        yr = norm_year(match[:year])
         hasyr = !yr.nil? && yr != "--"
-        ref = fetch_ref(xml, m[:code], hasyr ? yr : nil,
-                        all_parts: true,
-                        no_year: yr == "--", text: m[:text], usrlbl: m[:usrlbl],
+        ref = fetch_ref(xml, match[:code], hasyr ? yr : nil,
+                        all_parts: true, no_year: yr == "--",
+                        text: match[:text], usrlbl: match[:usrlbl],
                         lang: (@lang || :all))
-        return use_my_anchor(ref, m[:anchor]) if ref
+        return use_my_anchor(ref, match[:anchor]) if ref
 
-        isorefmatches3_1(xml, m, yr, hasyr, ref)
+        isorefmatches3_1(xml, match, yr, hasyr, ref)
       end
 
-      def isorefmatches3_1(xml, m, yr, _hasyr, _ref)
-        xml.bibitem(**attr_code(ref_attributes(m))) do |t|
-          isorefrender1(t, m, yr, " (all parts)")
-          conditional_date(t, m, yr == "--")
-          iso_publisher(t, m[:code])
-          if m.names.include?("fn") && m[:fn]
+      def isorefmatches3_1(xml, match, yr, _hasyr, _ref)
+        xml.bibitem(**attr_code(ref_attributes(match))) do |t|
+          isorefrender1(t, match, yr, " (all parts)")
+          conditional_date(t, match, yr == "--")
+          iso_publisher(t, match[:code])
+          if match.names.include?("fn") && match[:fn]
             t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
-              p << (m[:fn]).to_s
+              p << (match[:fn]).to_s
             end
           end
           t.extent **{ type: "part" } do |e|
@@ -95,23 +98,23 @@ module Asciidoctor
         end
       end
 
-      def refitem_render1(m, code, bib)
+      def refitem_render1(match, code, bib)
         if code[:type] == "path"
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "URI" }
           bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), **{ type: "citation" }
         end
-        docid(bib, m[:usrlbl]) if m[:usrlbl]
+        docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
         code[:type] == "repo" and
           bib.docidentifier code[:key], **{ type: "repository" }
       end
 
-      def refitem_render(xml, m, code)
-        xml.bibitem **attr_code(id: m[:anchor]) do |t|
+      def refitem_render(xml, match, code)
+        xml.bibitem **attr_code(id: match[:anchor]) do |t|
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
-            i << ref_normalise_no_format(m[:text])
+            i << ref_normalise_no_format(match[:text])
           end
-          refitem_render1(m, code, t)
+          refitem_render1(match, code, t)
           docnumber(t, code[:id]) unless /^\d+$|^\(.+\)$/.match?(code[:id])
         end
       end
@@ -128,7 +131,7 @@ module Asciidoctor
 
       def analyse_ref_repo_path(ret)
         return ret unless m =
-          /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/.match(ret[:id])
+                            /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/.match(ret[:id])
 
         id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "") : m[:id]
         ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
@@ -156,16 +159,17 @@ module Asciidoctor
         nil
       end
 
-      def refitem1(xml, _item, m)
-        code = analyse_ref_code(m[:code])
+      def refitem1(xml, _item, match)
+        code = analyse_ref_code(match[:code])
         unless code[:id] && code[:numeric] || code[:nofetch]
           ref = fetch_ref(xml, code[:id],
-                          m.names.include?("year") ? m[:year] : nil,
-                          title: m[:text],
-                          usrlbl: m[:usrlbl], lang: (@lang || :all))
-          return use_my_anchor(ref, m[:anchor]) if ref
+                          match.names.include?("year") ? match[:year] : nil,
+                          title: match[:text],
+                          usrlbl: match[:usrlbl], lang: (@lang || :all)) and
+            return use_my_anchor(ref, match[:anchor])
         end
-        refitem_render(xml, m, code)
+
+        refitem_render(xml, match, code)
       end
 
       def ref_normalise(ref)
@@ -186,7 +190,7 @@ module Asciidoctor
       \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):
       (--|&\#821[12];)\]</ref>,?\s*
         (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
-        .freeze
+          .freeze
 
       ISO_REF_ALL_PARTS =
         %r{^<ref\sid="(?<anchor>[^"]+)">

data/lib/asciidoctor/standoc/section.rb

@@ -12,7 +12,7 @@ module Asciidoctor
       def sectiontype1(node)
         node&.attr("heading")&.downcase ||
           node.title.gsub(%r{<index>.*?</index>}m, "").gsub(/<[^>]+>/, "")
-          .strip.downcase
+            .strip.downcase
       end
 
       def sectiontype(node, level = true)
@@ -21,6 +21,7 @@ module Asciidoctor
         return ret1 if "symbols and abbreviated terms" == ret1
         return nil unless !level || node.level == 1
         return nil if @seen_headers.include? ret
+
         @seen_headers << ret
         ret1
       end
@@ -48,11 +49,14 @@ module Asciidoctor
                 script: node.attributes["script"],
                 number: node.attributes["number"],
                 type: node.attributes["type"],
-                annex: ( ((node.attr("style") == "appendix" || node.role == "appendix") && 
-                          node.level == 1) ? true : nil),
-                         preface: (
-                           (node.role == "preface" || node.attr("style") == "preface") ?  true : nil) }
+                annex: (if (node.attr("style") == "appendix" || node.role == "appendix") &&
+                          node.level == 1
+                          true
+                        end),
+                preface: (
+                           node.role == "preface" || node.attr("style") == "preface" ? true : nil) }
         return ret unless node.attributes["change"]
+
         ret.merge(change: node.attributes["change"],
                   path: node.attributes["path"],
                   path_end: node.attributes["path_end"],
@@ -75,7 +79,7 @@ module Asciidoctor
             symbols_parse(symbols_attrs(node, a), xml, node)
           when "acknowledgements"
             acknowledgements_parse(a, xml, node)
-          when "bibliography" 
+          when "bibliography"
             bibliography_parse(a, xml, node)
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
@@ -88,9 +92,9 @@ module Asciidoctor
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "bibliography"
               bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "abstract" 
+            elsif node.attr("style") == "abstract"
               abstract_parse(a, xml, node)
-            elsif node.attr("style") == "index" 
+            elsif node.attr("style") == "index"
               indexsect_parse(a, xml, node)
             elsif node.attr("style") == "appendix" && node.level == 1
               annex_parse(a, xml, node)
@@ -102,10 +106,13 @@ module Asciidoctor
       end
 
       def set_obligation(attrs, node)
-        attrs[:obligation] = node.attributes.has_key?("obligation") ?
-          node.attr("obligation") :
-          node.parent.attributes.has_key?("obligation") ?
-          node.parent.attr("obligation") : "normative"
+        attrs[:obligation] = if node.attributes.has_key?("obligation")
+                               node.attr("obligation")
+                             elsif node.parent.attributes.has_key?("obligation")
+                               node.parent.attr("obligation")
+                             else
+                               "normative"
+                             end
       end
 
       def preamble(node)

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -6,13 +6,14 @@ module Asciidoctor
     class TermLookupCleanup
       AUTOMATIC_GENERATED_ID_REGEXP = /\A_/.freeze
       EXISTING_TERM_REGEXP = /\Aterm-/.freeze
+      EXISTING_SYMBOL_REGEXP = /\Asymbol-/.freeze
 
       attr_reader :xmldoc, :termlookup, :log
 
       def initialize(xmldoc, log)
         @xmldoc = xmldoc
         @log = log
-        @termlookup = {}
+        @termlookup = { term: {}, symbol: {} }
         @idhash = {}
       end
 
@@ -20,13 +21,20 @@ module Asciidoctor
         @idhash = populate_idhash
         @termlookup = replace_automatic_generated_ids_terms
         set_termxref_tags_target
+        concept_cleanup
       end
 
       private
 
+      def concept_cleanup
+        xmldoc.xpath("//concept").each do |n|
+          n.delete("type")
+        end
+      end
+
       def populate_idhash
         xmldoc.xpath("//*[@id]").each_with_object({}) do |n, mem|
-          next unless /^term-/.match?(n["id"])
+          next unless /^(term|symbol)-/.match?(n["id"])
 
           mem[n["id"]] = true
         end
@@ -35,7 +43,7 @@ module Asciidoctor
       def set_termxref_tags_target
         xmldoc.xpath("//termxref").each do |node|
           target = normalize_ref_id(node.text)
-          if termlookup[target].nil?
+          if termlookup[:term][target].nil? && termlookup[:symbol][target].nil?
             remove_missing_ref(node, target)
             next
           end
@@ -46,6 +54,14 @@ module Asciidoctor
       end
 
       def remove_missing_ref(node, target)
+        if node.at("../concept[@type = 'symbol']")
+          remove_missing_ref_symbol(node, target)
+        else
+          remove_missing_ref_term(node, target)
+        end
+      end
+
+      def remove_missing_ref_term(node, target)
         log.add("AsciiDoc Input", node,
                 %(Error: Term reference in `term[#{target}]` missing: \
                 "#{target}" is not defined in document))
@@ -58,39 +74,64 @@ module Asciidoctor
           "not resolved via ID <tt>#{target}</tt>"
       end
 
+      def remove_missing_ref_symbol(node, target)
+        log.add("AsciiDoc Input", node,
+                %(Error: Symbol reference in `symbol[#{target}]` missing: \
+                "#{target}" is not defined in document))
+        node.name = "strong"
+        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>"
+      end
+
       def modify_ref_node(node, target)
         node.name = "xref"
-        node["target"] = termlookup[target]
+        s = termlookup[:symbol][target]
+        t = termlookup[:term][target]
+        type = node.parent["type"]
+        if type == "term" || !type && t
+          node["target"] = t
+        elsif type == "symbol" || !type && s
+          node["target"] = s
+        end
       end
 
       def replace_automatic_generated_ids_terms
-        xmldoc.xpath("//term").each.with_object({}) do |term_node, res|
-          normalize_id_and_memorize(term_node, res, "./preferred")
+        r = xmldoc.xpath("//term").each.with_object({}) do |n, res|
+          normalize_id_and_memorize(n, res, "./preferred", "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 }
       end
 
-      def normalize_id_and_memorize(term_node, res_table, text_selector)
-        term_text = normalize_ref_id(term_node.at(text_selector).text)
-        unless AUTOMATIC_GENERATED_ID_REGEXP.match(term_node["id"]).nil?
-          id = unique_text_id(term_text)
-          term_node["id"] = id
+      def normalize_id_and_memorize(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?
+          id = unique_text_id(term_text, prefix)
+          node["id"] = id
           @idhash[id] = true
         end
-        res_table[term_text] = term_node["id"]
+        res_table[term_text] = node["id"]
       end
 
       def normalize_ref_id(text)
-        text.downcase.gsub(/[[:space:]]/, "-")
+        Metanorma::Utils::to_ncname(text.downcase.gsub(/[[:space:]]/, "-"))
       end
 
-      def unique_text_id(text)
-        unless @idhash["term-#{text}"]
-          return "term-#{text}"
+      def unique_text_id(text, prefix)
+        unless @idhash["#{prefix}-#{text}"]
+          return "#{prefix}-#{text}"
         end
 
         (1..Float::INFINITY).lazy.each do |index|
-          unless @idhash["term-#{text}-#{index}"]
-            break("term-#{text}-#{index}")
+          unless @idhash["#{prefix}-#{text}-#{index}"]
+            break("#{prefix}-#{text}-#{index}")
           end
         end
       end