metanorma-standoc 1.3.24 → 1.3.29

data/lib/asciidoctor/standoc/ref.rb

@@ -62,6 +62,7 @@ module Asciidoctor
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], yr))
+          t.docnumber m[:code].sub(/^[^\d]*/, "")
           yr and t.date **{ type: "published" } do |d|
             set_date_range(d, yr)
           end
@@ -78,6 +79,7 @@ module Asciidoctor
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], "--"))
+          t.docnumber m[:code].sub(/^[^\d]*/, "")
           t.date **{ type: "published" } do |d|
             d.on "--"
           end
@@ -108,6 +110,7 @@ module Asciidoctor
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], yr) + " (all parts)")
+          t.docnumber m[:code].sub(/^[^\d]*/, "")
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           m.names.include?("fn") && m[:fn] and
@@ -139,6 +142,7 @@ module Asciidoctor
           end
           docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, /^\d+$/.match(m[:code]) ? "[#{m[:code]}]" : m[:code])
+          t.docnumber m[:code].sub(/^[^\d]*/, "") unless /^\d+$|^\(.+\)$/.match(m[:code])
         end
       end
 
@@ -149,7 +153,7 @@ module Asciidoctor
       # TODO: alternative where only title is available
       def refitem(xml, item, node)
         unless m = NON_ISO_REF.match(item)
-          @log.add("Asciidoctor Input", node, "#{MALFORMED_REF}: #{item}")
+          @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
           return
         end
         unless m[:code] && /^\d+$/.match(m[:code])
@@ -206,9 +210,7 @@ module Asciidoctor
 
         def reference(node)
           noko do |xml|
-            node.items.each do |item|
-              reference1(node, item.text, xml)
-            end
+            node.items.each { |item| reference1(node, item.text, xml) }
           end.join
         end
 

data/lib/asciidoctor/standoc/section.rb

@@ -53,7 +53,15 @@ module Asciidoctor
       def section_attributes(node)
         { id: Utils::anchor_or_uuid(node),
           language: node.attributes["language"],
-          script: node.attributes["script"] }
+          script: node.attributes["script"],
+          annex: (
+            ((node.attr("style") == "appendix" || node.role == "appendix") && 
+             node.level == 1) ? true : nil
+          ),
+          preface: (
+            (node.role == "preface" || node.attr("style") == "preface") ?
+            true : nil),
+        }
       end
 
       def section(node)
@@ -75,7 +83,12 @@ 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"
+              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"
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract" 
@@ -118,7 +131,6 @@ module Asciidoctor
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
         attrs[:bibitem] = true if node.option? "bibitem"
-        attrs[:preface] = true if node.role == "preface" || node.attr("style") == "preface"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
         xml.send "clause", **attr_code(attrs) do |xml_section|
@@ -137,11 +149,11 @@ module Asciidoctor
       end
 
       def bibliography_parse(attrs, xml, node)
+        node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
         node.attr("style") == "bibliography" or
-          #warn "Section not marked up as [bibliography]!"
-          @log.add("Asciidoctor Input", node, "Section not marked up as [bibliography]!")
+          @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @biblio = true
-        xml.references **attr_code(attrs) do |xml_section|
+        xml.references **attr_code(attrs.merge(normative: false)) do |xml_section|
           title = node.level == 1 ? "Bibliography" : node.title
           xml_section.title { |t| t << title }
           xml_section << node.content
@@ -180,14 +192,16 @@ module Asciidoctor
 
       # subclause contains subclauses
       def term_def_subclause_parse(attrs, xml, node)
-        node.role == "nonterm" ||
-          sectiontype(node, false) == "terms and definitions" and
+        node.role == "nonterm"  and
           return nonterm_term_def_subclause_parse(attrs, xml, node)
+        st = sectiontype(node, false)
         return symbols_parse(attrs, xml, node) if @definitions
         sub = node.find_by(context: :section) { |s| s.level == node.level + 1 }
         sub.empty? || (return term_def_parse(attrs, xml, node, false))
-        sectiontype(node, false) == "symbols and abbreviated terms" and
+        st == "symbols and abbreviated terms" and
           (return symbols_parse(attrs, xml, node))
+        st == "terms and definitions" and
+          return clause_parse(attrs, xml, node)
         term_def_subclause_parse1(attrs, xml, node)
       end
 
@@ -204,6 +218,11 @@ module Asciidoctor
           SYMBOLS_TITLES.include? s.title.downcase
         end
         return "Terms and definitions" if sub.empty?
+        sym = /symbol/i.match(node.title)
+        abbrev = /abbreviat/i.match(node.title)
+        sym && abbrev and return "Terms, definitions, symbols and abbreviated terms"
+        sym and return "Terms, definitions and symbols"
+        abbrev and return "Terms, definitions and abbreviated terms"
         "Terms, definitions, symbols and abbreviated terms"
       end
 
@@ -217,9 +236,22 @@ module Asciidoctor
         end
       end
 
+      def bibitem_parse(attrs, xml, node)
+        norm_ref = @norm_ref
+        biblio = @biblio
+        @biblio = false
+        @norm_ref = false
+        clause_parse(attrs, xml, node)
+        @biblio = biblio
+        @norm_ref = norm_ref
+      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]!")
         @norm_ref = true
-        xml.references **attr_code(attrs) do |xml_section|
+        xml.references **attr_code(attrs.merge(normative: true)) do |xml_section|
           xml_section.title { |t| t << "Normative References" }
           xml_section << node.content
         end

data/lib/asciidoctor/standoc/utils.rb

@@ -20,7 +20,8 @@ module Asciidoctor
         def asciidoc_sub(x)
           return nil if x.nil?
           return "" if x.empty?
-          d = Asciidoctor::Document.new(x.lines.entries, {header_footer: false})
+          d = Asciidoctor::Document.new(x.lines.entries, { header_footer: false,
+                                                           backend: :standoc })
           b = d.parse.blocks.first
           b.apply_subs(b.source)
         end
@@ -66,16 +67,6 @@ module Asciidoctor
           end
         end
 
-=begin
-        def warning(node, msg, text)
-          return if @novalid
-          warntext = "asciidoctor: WARNING"\
-            "(#{current_location(node)}): #{msg}"
-          warntext += ": #{text}" if text
-          warn warntext
-        end
-=end
-
         def flatten_rawtext_lines(node, result)
           node.lines.each do |x|
             if node.respond_to?(:context) && (node.context == :literal ||

data/lib/asciidoctor/standoc/validate.rb

@@ -25,7 +25,6 @@ module Asciidoctor
           @iev = init_iev or return
           iev = @iev.fetch(locality, xmldoc&.at("//language")&.text || "en") or next
           pref.include?(iev.downcase) or
-            #warn %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}")
           @log.add("Bibliography", t, %(Term "#{pref[0]}" does not match IEV #{locality} "#{iev}"))
         end
       end
@@ -38,14 +37,20 @@ module Asciidoctor
 
       def repeat_id_validate(doc)
         ids = {}
+        crash = false
         doc.xpath("//*[@id]").each do |x|
           if ids[x["id"]]
-          @log.add("Anchors", x, "Anchor #{x['id']} has already been used at line #{ids[x['id']]}")
+            @log.add("Anchors", x, "Anchor #{x['id']} has already been used at line #{ids[x['id']]}")
+            crash = true
           else
             ids[x["id"]] = x.line
           end
         end
+        if crash
+          clean_exit
+          abort("Cannot deal with multiple instances of same ID")
         end
+      end
 
       def schema_validate(doc, schema)
         Tempfile.open(["tmp", ".xml"], :encoding => 'UTF-8') do |f|
@@ -58,6 +63,7 @@ module Asciidoctor
               @log.add("Syntax", "XML Line #{"%06d" % error[:line]}:#{error[:column]}", error[:message])
             end
           rescue Jing::Error => e
+            clean_exit
             abort "Jing failed with error: #{e}"
           ensure
             f.close!

data/lib/asciidoctor/standoc/validate_section.rb

@@ -14,8 +14,7 @@ module Asciidoctor
           callouts = x.elements.select { |e| e.name == "callout" }
           annotations = x.elements.select { |e| e.name == "annotation" }
           if callouts.size != annotations.size
-            #warn "#{x['id']}: mismatch of callouts and annotations"
-        @log.add("Asciidoctor Input", x, "mismatch of callouts and annotations")
+        @log.add("AsciiDoc Input", x, "mismatch of callouts and annotations")
           end
         end
       end
@@ -23,7 +22,6 @@ module Asciidoctor
       def style_warning(node, msg, text = nil)
         w = msg
         w += ": #{text}" if text
-        #warn w
         @log.add("Style Warning", node, w)
       end
 

data/lib/metanorma/standoc/latexml_requirement.rb

@@ -11,31 +11,33 @@ module Metanorma
         version = version_output&.match(%r{\d+(.\d+)*})
 
         if version.to_s.empty?
-          @error_message = "LaTeXML not installed (or don't works properly)."\
-              " You must upgrade/install LaTeXML to #{@recommended_version} version"
+          @error_message = "LaTeXML is not available. (Or is PATH not setup properly?)"\
+            " You must upgrade/install LaTeXML to a version higher than `#{@recommended_version}`"
 
         elsif Gem::Version.new(version) < Gem::Version.new(@minimal_version)
-          @error_message = "Minimal supported LaTeXML version is #{@minimal_version} "\
-              "found #{version}, recommended version is #{@recommended_version}"
+          @error_message = "Minimal supported LaTeXML version is `#{@minimal_version}` "\
+              "Version `#{version}` found; recommended version is `#{@recommended_version}`"
 
         elsif Gem::Version.new(version) < Gem::Version.new(@recommended_version)
           version = "unknown" if version.to_s.empty?
-          header_msg = "latexmlmath version #{version} below #{@recommended_version}!"
+          header_msg = "latexmlmath version `#{version}` below `#{@recommended_version}`!"
           suggestion = if Gem.win_platform?
                          "cmd encoding is set to UTF-8 with `chcp 65001`"
                        else
                          "terminal encoding is set to UTF-8 with `export LANG=en_US.UTF-8`"
                        end
 
-          @error_message = "WARNING #{header_msg} Please sure that #{suggestion} command"
+          @error_message = "WARNING #{header_msg} Please sure that #{suggestion} command."
 
-          @cmd = "latexmlmath --preload=amsmath -- -"
+          @cmd = 'latexmlmath --strict --preload=amsmath -- -'
+          @cmd2 = 'latexmlmath --strict -- -'
         else
-          @cmd = "latexmlmath --preload=amsmath --inputencoding=UTF-8 -- -"
+          @cmd = 'latexmlmath --strict --preload=amsmath --inputencoding=UTF-8 -- -'
+          @cmd2 = 'latexmlmath --strict --inputencoding=UTF-8 -- -'
         end
       rescue
-        @error_message = "LaTeXML not installed (or don't works properly)."\
-            " You must upgrade/install LaTeXML to #{@recommended_version} version"
+        @error_message = "LaTeXML is not available. (Or is PATH not setup properly?)"\
+            " You must upgrade/install LaTeXML to a version higher than `#{@recommended_version}`"
       end
 
       def satisfied(abort = false)
@@ -53,8 +55,8 @@ module Metanorma
       def cmd
         abort @error_message unless @error_message.nil?
 
-        @cmd
+        [@cmd, @cmd2]
       end
     end
   end
-end
+end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-   VERSION = "1.3.24".freeze
+   VERSION = "1.3.29".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.0.20"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 0.11.0"
-  spec.add_dependency "relaton-iev", "~> 0.1.0"
+  spec.add_dependency "relaton", "~> 1.0.0"
+  spec.add_dependency "relaton-iev", "~> 1.0.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -53,6 +53,8 @@ RSpec.describe Asciidoctor::Standoc do
       :issued-date: 1007-01-01
       :circulated-date: 1008-01-01
       :unchanged-date: 1009-01-01
+      :vote-started-date: 1011-01-01
+      :vote-ended-date: 1012-01-01
       :date: Fred 1010-01-01
       :date_2: Jack 1010-01-01
       :draft: 3.4
@@ -141,6 +143,12 @@ RSpec.describe Asciidoctor::Standoc do
 <date type="unchanged">
   <on>1009-01-01</on>
 </date>
+ <date type='vote-started'>
+   <on>1011-01-01</on>
+ </date>
+ <date type='vote-ended'>
+   <on>1012-01-01</on>
+ </date>
 <date type="Fred">
   <on>1010-01-01</on>
 </date>

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -6,13 +6,14 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       
+      [format="rfc,html"]
       ++++
       <abc>X &gt; Y</abc>
       ++++
     INPUT
         #{BLANK_HDR}
        <sections>
-       <abc>X &gt; Y</abc>
+       <passthrough formats='rfc,html'>&lt;abc&gt;X &gt; Y&lt;/abc&gt;</passthrough>
        </sections>
        </standard-document>
     OUTPUT
@@ -75,7 +76,7 @@ RSpec.describe Asciidoctor::Standoc do
        </formula>
               <formula id="_" subsequence="A">
          <stem type="MathML">
-       <math xmlns="http://www.w3.org/1998/Math/MathML" alttext="M=\\begin{bmatrix}-\\sin\\lambda_{0}&amp;\\cos\\lambda_{0}&amp;0\\\\&#10;-\\sin\\varphi_{0}\\cos\\lambda_{0}&amp;-\\sin\\varphi_{0}\\sin\\lambda_{0}&amp;\\cos\\varphi_{0%&#10;}\\\\&#10;\\cos\\varphi_{0}\\cos\\lambda_{0}&amp;\\cos\\varphi_{0}\\sin\\lambda_{0}&amp;\\sin\\varphi_{0}%&#10;\\end{bmatrix}" display="block">
+       <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
          <mrow>
            <mi>M</mi>
            <mo>=</mo>
@@ -309,6 +310,11 @@ RSpec.describe Asciidoctor::Standoc do
       === Term1
 
       NOTE: This is a note
+
+      [NOTE,keep-separate=true]
+      ====
+      XYZ
+      ====
       INPUT
               #{BLANK_HDR}
        <sections>
@@ -320,6 +326,9 @@ RSpec.describe Asciidoctor::Standoc do
          <termnote id="_">
          <p id="_">This is a note</p>
        </termnote>
+        <termnote id='_'>
+   <p id='_'>XYZ</p>
+ </termnote>
        </term>
        </terms>
        </sections>
@@ -394,6 +403,11 @@ RSpec.describe Asciidoctor::Standoc do
 
       [[ABC]]
       NOTE: This is a note
+
+      [NOTE,keep-separate=true]
+      ====
+      XYZ
+      ====
       INPUT
               #{BLANK_HDR}
               <preface><foreword id="_" obligation="informative">
@@ -407,6 +421,9 @@ RSpec.describe Asciidoctor::Standoc do
          <note id="ABC">
          <p id="_">This is a note</p>
        </note>
+         <note id='_'>
+    <p id='_'>XYZ</p>
+  </note>
        </clause></sections>
 
        </standard-document>
@@ -924,6 +941,19 @@ RSpec.describe Asciidoctor::Standoc do
 
       [.source]
       <<ISO2191,section=1>>
+
+      === Term2
+
+      Definition
+
+      [.source]
+      {{IEV:xyz}}
+
+      [.source]
+      {{IEV:xyz,t1}}
+
+      [.source]
+      {{IEV:xyz,t1,t2}}
       INPUT
       #{BLANK_HDR}
        <sections>
@@ -940,6 +970,27 @@ RSpec.describe Asciidoctor::Standoc do
         </origin>
        </termsource>
        </term>
+       <term id='_'>
+  <preferred>Term2</preferred>
+  <definition>
+    <p id='_'>Definition</p>
+  </definition>
+  <termsource status='identical'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'/>
+    </origin>
+  </termsource>
+  <termsource status='identical'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'>t1</termref>
+    </origin>
+  </termsource>
+  <termsource status='identical'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'>t1</termref>
+    </origin>
+  </termsource>
+</term>
        </terms>
        </sections>
        </standard-document>
@@ -955,6 +1006,13 @@ RSpec.describe Asciidoctor::Standoc do
 
       [.source]
       <<ISO2191,section=1>>, with adjustments
+
+      === Term2
+
+      Definition
+
+      [.source]
+      {{IEV:xyz}}, with adjustments
       INPUT
       #{BLANK_HDR}
             <sections>
@@ -975,6 +1033,20 @@ RSpec.describe Asciidoctor::Standoc do
          </modification>
        </termsource>
        </term>
+       <term id='_'>
+  <preferred>Term2</preferred>
+  <definition>
+    <p id='_'>Definition</p>
+  </definition>
+  <termsource status='modified'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'/>
+    </origin>
+    <modification>
+      <p id='_'>with adjustments</p>
+    </modification>
+  </termsource>
+</term>
        </terms>
        </sections>
        </standard-document>