metanorma-standoc 1.6.4 → 1.6.5

data/lib/asciidoctor/standoc/ref.rb

@@ -1,6 +1,6 @@
 module Asciidoctor
   module Standoc
-    module Lists
+    module Refs
       def iso_publisher(t, code)
         code.sub(/ .*$/, "").split(/\//).each do |abbrev|
           t.contributor do |c|
@@ -70,8 +70,7 @@ module Asciidoctor
 
       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)
+        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
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           isorefrender1(t, m, yr)
@@ -105,8 +104,7 @@ module Asciidoctor
       def conditional_date(t, m, noyr)
         m.names.include?("year") and !m[:year].nil? and
           t.date(**{ type: "published" }) do |d|
-          noyr and d.on "--" or
-            set_date_range(d, norm_year(m[:year]))
+          noyr and d.on "--" or set_date_range(d, norm_year(m[:year]))
         end
       end
 
@@ -114,8 +112,7 @@ module Asciidoctor
         yr = norm_year(m[: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],
-          lang: (@lang || :all)
+          no_year: yr == "--", text: m[:text], usrlbl: m[:usrlbl], lang: (@lang || :all)
         return use_my_anchor(ref, m[:anchor]) if ref
         isorefmatches3_1(xml, m, yr, hasyr, ref)
       end
@@ -140,8 +137,7 @@ module Asciidoctor
         end
         docid(t, m[:usrlbl]) if m[:usrlbl]
         docid(t, /^\d+$/.match(code[:id]) ? "[#{code[:id]}]" : code[:id])
-        code[:type] == "repo" and
-          t.docidentifier code[:key], **{ type: "repository" }
+        code[:type] == "repo" and t.docidentifier code[:key], **{ type: "repository" }
       end
 
       def refitem_render(xml, m, code)
@@ -155,9 +151,8 @@ module Asciidoctor
       end
 
       MALFORMED_REF = "no anchor on reference, markup may be malformed: see "\
-        "https://www.metanorma.com/author/topics/document-format/"\
-        "bibliography/ , https://www.metanorma.com/author/iso/topics/markup/"\
-        "#bibliographies".freeze
+        "https://www.metanorma.com/author/topics/document-format/bibliography/ , "\
+        "https://www.metanorma.com/author/iso/topics/markup/#bibliographies".freeze
 
       def analyse_ref_nofetch(ret)
         return ret unless m = /^nofetch\((?<id>.+)\)$/.match(ret[:id])
@@ -165,9 +160,8 @@ module Asciidoctor
       end
 
       def analyse_ref_repo_path(ret)
-        return ret unless m =
-          /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/.match(ret[:id])
-        id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "")  : m[:id]
+        return ret unless m = /^(?<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)
       end
 
@@ -194,8 +188,7 @@ module Asciidoctor
       def refitem1(xml, item, m)
         code = analyse_ref_code(m[:code])
         unless code[:id] && code[:numeric] || code[:nofetch]
-          ref = fetch_ref xml, code[:id],
-            m.names.include?("year") ? m[:year] : nil, title: m[:text],
+          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
         end
@@ -212,8 +205,7 @@ module Asciidoctor
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
-      (:(?<year>[0-9][0-9-]+))?\]</ref>,?\s*
-        (?<text>.*)$}xm
+      (:(?<year>[0-9][0-9-]+))?\]</ref>,?\s*(?<text>.*)$}xm
 
         ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):
@@ -239,8 +231,7 @@ module Asciidoctor
 
         def reference1(node, item, xml)
           matched, matched2, matched3 = reference1_matches(item)
-          if matched3.nil? && matched2.nil? && matched.nil?
-            refitem(xml, item, node)
+          if matched3.nil? && matched2.nil? && matched.nil? then refitem(xml, item, node)
           elsif !matched.nil? then isorefmatches(xml, matched)
           elsif !matched2.nil? then isorefmatches2(xml, matched2)
           elsif !matched3.nil? then isorefmatches3(xml, matched3)

data/lib/asciidoctor/standoc/table.rb

@@ -17,6 +17,7 @@ module Asciidoctor
         @table_fn_number = "a"
         noko do |xml|
           xml.table **attr_code(table_attrs(node)) do |xml_table|
+            colgroup(node, xml_table)
             table_name(node, xml_table)
             %i(head body foot).reject do |tblsec|
               node.rows[tblsec].empty?
@@ -28,6 +29,17 @@ module Asciidoctor
 
       private
 
+      def colgroup(node, xml_table)
+        return if node.option? "autowidth"
+        cols = node&.attr("cols")&.split(/,/) or return
+        return unless cols.size > 1 and cols.all? { |c| /\d/.match(c) }
+        xml_table.colgroup do |cg|
+          node.columns.each do |col|
+            cg.col **{ width: "#{col.attr 'colpcwidth'}%" }
+          end
+        end
+      end
+
       def table_name(node, xml_table)
         if node.title?
           xml_table.name do |n|

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true.
+
+module Asciidoctor
+  module Standoc
+    # Intelligent term lookup xml modifier
+    # Lookup all `term` and `calause` tags and replace `termxref` tags with
+    # `xref`:target tag
+    class TermLookupCleanup
+      AUTOMATIC_GENERATED_ID_REGEXP = /\A_/
+      EXISTING_TERM_REGEXP = /\Aterm-/
+
+      attr_reader :xmldoc, :termlookup, :log
+
+      def initialize(xmldoc, log)
+        @xmldoc = xmldoc
+        @log = log
+        @termlookup = {}
+      end
+
+      def call
+        @termlookup = replace_automatic_generated_ids_terms
+        set_termxref_tags_target
+      end
+
+      private
+
+      def set_termxref_tags_target
+        xmldoc.xpath('//termxref').each do |node|
+          target = normalize_ref_id(node.text)
+          if termlookup[target].nil?
+            remove_missing_ref(node, target)
+            next
+          end
+          modify_ref_node(node, target)
+        end
+      end
+
+      def remove_missing_ref(node, target)
+        log.add('AsciiDoc Input', node,
+                %(Error: Term reference in `term[#{target}]` missing: \
+                "#{target}" is not defined in document))
+        term_name_node = node.previous.previous
+        term_name_node.remove
+        term_name_node.name = "strong"
+        term_name_node.children.first.content =
+          %(term "#{term_name_node.text}" not resolved)
+        node.add_previous_sibling(term_name_node)
+        node.remove
+      end
+
+      def modify_ref_node(node, target)
+        node.name = 'xref'
+        node['target'] = termlookup[target]
+        node.children.remove
+        node.remove_attribute('defaultref')
+      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')
+        end
+      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?
+        term_node['id'] = unique_text_id(term_text)
+                  end
+        res_table[term_text] = term_node['id']
+      end
+
+      def normalize_ref_id(text)
+        text.downcase.gsub(/[[:space:]]/, '-')
+      end
+
+      def unique_text_id(text)
+        return "term-#{text}" if xmldoc.at("//*[@id = 'term-#{text}']").nil?
+        (1..Float::INFINITY).lazy.each do |index|
+          if xmldoc.at("//*[@id = 'term-#{text}-#{index}']").nil?
+            break("term-#{text}-#{index}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.6.4".freeze
+    VERSION = "1.6.5".freeze
   end
 end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -318,7 +318,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termnote id="_">
          <p id="_">This is a note</p>
@@ -383,7 +383,7 @@ RSpec.describe Asciidoctor::Standoc do
               <sections>
   <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-<term id="_">
+<term id="term-term1">
   <preferred>Term1</preferred>
 </term>
 <definitions id="_" obligation="normative" type="symbols">
@@ -528,7 +528,7 @@ RSpec.describe Asciidoctor::Standoc do
   <terms id="_" obligation="normative">
   <title>Terms and definitions</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-  <term id="_">
+  <term id="term-term1">
   <preferred>Term1</preferred>
 
 <termexample id="ABC">
@@ -583,7 +583,7 @@ RSpec.describe Asciidoctor::Standoc do
               #{BLANK_HDR}
 <sections> 
   <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
-<p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="_">   
+<p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="term-term1">   
   <preferred>Term1</preferred>   
 </term>  
 <definitions id="_" obligation="normative" type="symbols">   
@@ -972,7 +972,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title><p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -982,7 +982,7 @@ RSpec.describe Asciidoctor::Standoc do
         </origin>
        </termsource>
        </term>
-       <term id='_'>
+       <term id='term-term2'>
   <preferred>Term2</preferred>
   <definition>
     <p id='_'>Definition</p>
@@ -1032,7 +1032,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="modified">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -1045,7 +1045,7 @@ RSpec.describe Asciidoctor::Standoc do
          </modification>
        </termsource>
        </term>
-       <term id='_'>
+       <term id='term-term2'>
   <preferred>Term2</preferred>
   <definition>
     <p id='_'>Definition</p>

data/spec/asciidoctor-standoc/cleanup_sections_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative"><title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
 
-       <term id="_">
+       <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
        </term></terms>
@@ -456,7 +456,7 @@ INPUT
                </fn>
              </title>
              <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-             <term id='_'>
+             <term id='term-term1'>
                <preferred>Term1</preferred>
              </term>
            </terms>
@@ -728,7 +728,7 @@ INPUT
             <terms id='_' obligation='normative'>
               <title>Terms and definitions</title>
               <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-              <term id='_'>
+              <term id='term-term1'>
                 <preferred>Term1</preferred>
               </term>
             </terms>
@@ -962,7 +962,7 @@ INPUT
                 Pour les besoins du présent document, les termes et définitions suivants
                 s’appliquent.
               </p>
-              <term id='_'>
+              <term id='term-term1'>
                 <preferred>Term1</preferred>
               </term>
             </terms>
@@ -1193,7 +1193,7 @@ INPUT
             <terms id='_' obligation='normative'>
               <title>术语和定义</title>
               <p id='_'>下列术语和定义适用于本文件。</p>
-              <term id='_'>
+              <term id='term-term1'>
                 <preferred>Term1</preferred>
               </term>
             </terms>
@@ -1424,7 +1424,7 @@ INPUT
             <terms id='_' obligation='normative'>
               <title>Terms and definitions</title>
               <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-              <term id='_'>
+              <term id='term-term1'>
                 <preferred>Term1</preferred>
               </term>
             </terms>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -158,7 +158,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
          <mrow>
   <mi>t</mi>
 </mrow>
@@ -200,11 +200,11 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-tempus">
          <preferred>Tempus</preferred>
          <domain>relativity</domain><definition><p id="_"> Time</p></definition>
        </term>
-       <term id='_'>
+       <term id='term-tempus1'>
   <preferred>Tempus1</preferred>
   <domain>relativity2</domain>
   <definition>
@@ -243,7 +243,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
+         <term id="term-t90"><preferred><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
           <mrow>
    <mi>t</mi>
  </mrow>
@@ -530,7 +530,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -1059,7 +1059,7 @@ RSpec.describe Asciidoctor::Standoc do
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_"><preferred>Term</preferred>
+         <term id="term-term"><preferred>Term</preferred>
 
 
 
@@ -1123,7 +1123,7 @@ RSpec.describe Asciidoctor::Standoc do
           <sections>
         <terms id="_" obligation="normative"><title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-automation1">
           <preferred>Automation1</preferred>
           <termsource status="identical">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
@@ -1133,7 +1133,7 @@ RSpec.describe Asciidoctor::Standoc do
         </origin>
         </termsource>
         </term>
-        <term id="_">
+        <term id="term-automation2">
           <preferred>Automation2</preferred>
           <termsource status="identical">
           <origin bibitemid="IEC60050-102" type="inline" citeas="IEC 60050-102:2007">
@@ -1143,7 +1143,7 @@ RSpec.describe Asciidoctor::Standoc do
         </origin>
         </termsource>
         </term>
-        <term id="_">
+        <term id="term-automation3">
           <preferred>Automation3</preferred>
           <termsource status="identical">
           <origin bibitemid="IEC60050-103" type="inline" citeas="IEC 60050-103:2009">
@@ -1415,6 +1415,14 @@ OUTPUT
       * [[[iso125,ISO 125]]] _Standard 124_
       * [[[iso126,1]]] _Standard 123_
 
+      [bibliography]
+      == Bibliography Redux
+
+      [bibliography]
+      === Clause 1
+      * [[[iso127,ISO 124]]] _Standard 124_
+      * [[[iso128,1]]] _Standard 123_
+
     INPUT
     #{BLANK_HDR}
     <sections><clause id="_" inline-header="false" obligation="normative">
@@ -1462,6 +1470,29 @@ OUTPUT
          </formattedref>
          <docidentifier type="metanorma">[4]</docidentifier>
        </bibitem>
+    </references>
+  </clause>
+  <clause id='_' obligation='informative'>
+    <title>Bibliography Redux</title>
+    <references id='_' normative='false' obligation='informative'>
+      <title>Clause 1</title>
+      <bibitem id='iso127' type='standard'>
+        <title format='text/plain'>Standard 124</title>
+        <docidentifier>ISO 124</docidentifier>
+        <docnumber>124</docnumber>
+        <contributor>
+          <role type='publisher'/>
+          <organization>
+            <name>ISO</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      <bibitem id='iso128'>
+        <formattedref format='application/x-isodoc+xml'>
+          <em>Standard 123</em>
+        </formattedref>
+        <docidentifier type='metanorma'>[6]</docidentifier>
+      </bibitem>
        </references></clause></bibliography>
        </standard-document>
 OUTPUT
@@ -1927,6 +1958,11 @@ Author
   <mi>α</mi>
   <mo>+</mo>
   <mi>AB</mi>
+  <mstyle mathvariant="italic">
+  <mrow>
+  <mi>Α</mi>
+  </mrow>
+  </mstyle>
 </math>
 ++++
 INPUT
@@ -1946,6 +1982,11 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_foo
           <mi>α</mi>
           <mo>+</mo>
           <mi>AB</mi>
+          <mstyle mathvariant='italic'>
+  <mrow>
+    <mi>Α</mi>
+  </mrow>
+</mstyle>
         </math>
       </stem>
     </formula>
@@ -1968,6 +2009,11 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_foo
           <mi>α</mi>
           <mo>+</mo>
           <mi>AB</mi>
+          <mstyle mathvariant='italic'>
+  <mrow>
+    <mi>Α</mi>
+  </mrow>
+</mstyle>
         </math>
       </stem>
     </formula>
@@ -1990,6 +2036,11 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_foo
           <mi>α</mi>
           <mo>+</mo>
           <mi>AB</mi>
+          <mstyle mathvariant='italic'>
+  <mrow>
+    <mi>Α</mi>
+  </mrow>
+</mstyle>
         </math>
       </stem>
     </formula>
@@ -2012,6 +2063,11 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_foo
           <mi mathvariant="normal">α</mi>
           <mo>+</mo>
           <mi>AB</mi>
+          <mstyle mathvariant='italic'>
+  <mrow>
+    <mi>Α</mi>
+  </mrow>
+</mstyle>
         </math>
       </stem>
     </formula>
@@ -2034,6 +2090,11 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_foo
           <mi>α</mi>
           <mo>+</mo>
           <mi>AB</mi>
+          <mstyle mathvariant='italic'>
+  <mrow>
+    <mi>Α</mi>
+  </mrow>
+</mstyle>
         </math>
       </stem>
     </formula>