metanorma-standoc 1.3.29 → 1.4.0

data/lib/asciidoctor/standoc/inline.rb

@@ -32,12 +32,13 @@ module Asciidoctor
       end
 
       def inline_anchor_xref(node)
-        matched = /^fn(:\s*(?<text>.*))?$/.match node.text
-        f = matched.nil? ? "inline" : "footnote"
-        c = matched.nil? ? node.text : matched[:text]
+        m = /^(?<case>capital%|lowercase%)?(?<fn>fn(:\s*(?<text>.*))?)?$/.match node.text
+        casing = m.nil? ? nil : m[:case]&.sub(/%$/, "")
+        f = (m.nil? || m[:fn].nil?) ? "inline" : "footnote"
+        c = (!m.nil? && (!m[:fn].nil? || !m[:case].nil?)) ? m[:text] : node.text
         t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
         noko do |xml|
-          xml.xref **attr_code(target: t, type: f) do |x|
+          xml.xref **attr_code(target: t, type: f, case: casing) do |x|
             x << c
           end
         end.join
@@ -187,7 +188,11 @@ module Asciidoctor
         return uri if /^data:/.match(uri)
         types = MIME::Types.type_for(@localdir + uri)
         type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
-        bin = File.open(@localdir + uri, 'rb') {|io| io.read}
+        # FIXME: nested uri path error(
+        #   sources/plantuml/plantuml20200524-90467-1iqek5i.png ->
+        #   sources/sources/plantuml/plantuml20200524-90467-1iqek5i.png)
+        path = File.file?(uri) ? uri : @localdir + uri
+        bin = File.open(path, 'rb', &:read)
         data = Base64.strict_encode64(bin)
         "data:#{type};base64,#{data}"
       end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/lib/asciidoctor/standoc/macros.rb

@@ -1,8 +1,11 @@
 require "asciidoctor/extensions"
 require "fileutils"
 require "uuidtools"
-require_relative "./macros_plantuml.rb"
-require_relative "./macros_yaml2text.rb"
+require 'yaml'
+require_relative './macros_plantuml.rb'
+require_relative './datamodel/attributes_table_preprocessor.rb'
+require_relative './datamodel/diagram_preprocessor.rb'
+require_relative './macros_yaml2text.rb'
 
 module Asciidoctor
   module Standoc
@@ -97,23 +100,25 @@ module Asciidoctor
       end
 
       def supply_br(lines)
+        ignore = false
         lines.each_with_index do |l, i|
+          /^(--+|====+|\|===|\.\.\.\.+|\*\*\*\*+|\+\+\+\++|\`\`\`\`+|____\+)$/.match(l) and
+            ignore = !ignore
           next if l.empty? || l.match(/ \+$/)
+          next if /^\[.*\]$/.match(l)
+          next if ignore
           next if i == lines.size - 1 || i < lines.size - 1 && lines[i+1].empty?
           lines[i] += " +"
         end
         lines
       end
 
-      def prevent_smart_quotes(m)
-        m.gsub(/'/, "&#x27;").gsub(/"/, "&#x22;")
-      end
-
       def process parent, reader, attrs
         attrs['role'] = 'pseudocode'
-        lines = reader.lines.map { |m| prevent_smart_quotes(init_indent(m)) }
-        create_block(parent, :example, supply_br(lines),
+        lines = reader.lines.map { |m| init_indent(m) }
+        ret = create_block(parent, :example, supply_br(lines),
                      attrs, content_model: :compound)
+        ret
       end
     end
 

data/lib/asciidoctor/standoc/macros_yaml2text.rb

@@ -44,8 +44,8 @@ module Asciidoctor
     end
 
     class Yaml2TextPreprocessor < Asciidoctor::Extensions::Preprocessor
-      BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/.freeze
-      BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/.freeze
+      BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/
+      BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/
       # search document for block `yaml2text`
       #   after that take template from block and read file into this template
       #   example:
@@ -107,35 +107,41 @@ module Asciidoctor
 
       def parse_blocks_recursively(lines:,
                                    attributes:,
-                                   context_name:,
-                                   parent_context: nil)
+                                   context_name:)
         lines = lines.to_enum
         result = []
         loop do
           line = lines.next
           if line.match(BLOCK_START_REGEXP)
-            line.gsub!(BLOCK_START_REGEXP, '<% \1.each.with_index do |\2,index| %>')
+            line.gsub!(BLOCK_START_REGEXP,
+                       '<% \1.each&.with_index do |\2,index| %>')
           end
 
-          if line.match(BLOCK_END_REGEXP)
+          if line.strip.match(BLOCK_END_REGEXP)
             line.gsub!(BLOCK_END_REGEXP, '<% end %>')
           end
-          line = line.gsub(/{(.+?[^}]*)}/, '<%= \1 %>').gsub(/[a-z\.]+\#/, 'index')
+          line.gsub!(/{\s*if\s*([^}]+)}/, '<% if \1 %>')
+          line.gsub!(/{\s*?end\s*?}/, '<% end %>')
+          line = line
+                   .gsub(/{(.+?[^}]*)}/, '<%= \1 %>')
+                   .gsub(/[a-z\.]+\#/, 'index')
           result.push(line)
         end
         result = parse_context_block(context_lines: result,
                                      context_items: attributes,
-                                     context_name: context_name,
-                                     parent_context: parent_context)
+                                     context_name: context_name)
         result
       end
 
       def parse_context_block(context_lines:,
                               context_items:,
-                              context_name:,
-                              parent_context: nil)
-        renderer = YamlContextRenderer.new(context_object: context_items, context_name: context_name)
-        renderer.render(context_lines.join('\n')).split('\n')
+                              context_name:)
+        renderer = YamlContextRenderer
+                     .new(
+                       context_object: context_items,
+                       context_name: context_name
+                     )
+        renderer.render(context_lines.join("\n")).split("\n")
       end
     end
   end

data/lib/asciidoctor/standoc/ref.rb

@@ -46,7 +46,15 @@ module Asciidoctor
           ["metanorma", mn_code(code)] :
           @bibdb&.docid_type(code) || [nil, code]
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
-        t.docidentifier code1, **attr_code(type: type)
+        t.docidentifier **attr_code(type: type) do |d|
+          d << code1
+        end
+      end
+
+      def docnumber(t, code)
+        t.docnumber do |d|
+          d << HTMLEntities.new.decode(code).sub(/^[^\d]*/, "")
+        end
       end
 
       def norm_year(yr)
@@ -62,7 +70,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]*/, "")
+          docnumber(t, m[:code])
           yr and t.date **{ type: "published" } do |d|
             set_date_range(d, yr)
           end
@@ -79,7 +87,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]*/, "")
+          docnumber(t, m[:code])
           t.date **{ type: "published" } do |d|
             d.on "--"
           end
@@ -110,7 +118,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]*/, "")
+          docnumber(t, m[:code])
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           m.names.include?("fn") && m[:fn] and
@@ -121,20 +129,6 @@ module Asciidoctor
         end
       end
 
-      def fetch_ref(xml, code, year, **opts)
-        return nil if opts[:no_year]
-        code = code.sub(/^\([^)]+\)/, "")
-        hit = @bibdb&.fetch(code, year, opts)
-        return nil if hit.nil?
-        xml.parent.add_child(smart_render_xml(hit, code, opts[:title],
-                                              opts[:usrlbl]))
-        xml
-      rescue RelatonBib::RequestError
-        @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
-                 "no access to online site")
-        nil
-      end
-
       def refitem_render(xml, m)
         xml.bibitem **attr_code(id: m[:anchor]) do |t|
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
@@ -142,7 +136,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])
+          docnumber(t, m[:code]) unless /^\d+$|^\(.+\)$/.match(m[:code])
         end
       end
 
@@ -214,46 +208,9 @@ module Asciidoctor
           end.join
         end
 
-        def global_ievcache_name
-          "#{Dir.home}/.iev/cache"
-        end
-
-        def local_ievcache_name(cachename)
-          return nil if cachename.nil?
-          cachename += "_iev" unless cachename.empty?
-          cachename = "iev" if cachename.empty?
-          "#{cachename}/cache"
-        end
-
         def mn_code(code)
           code.sub(/^\(/, "[").sub(/\).*$/, "]").sub(/^nofetch\((.+)\)$/, "\\1")
         end
-
-        def emend_biblio(xml, code, title, usrlbl)
-          unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]")
-            @log.add("Bibliography", nil,
-                     "ERROR: No document identifier retrieved for #{code}")
-            xml.root << "<docidentifier>#{code}</docidentifier>"
-          end
-          unless xml.at("/bibitem/title[text()]")
-            @log.add("Bibliography", nil,
-                     "ERROR: No title retrieved for #{code}")
-            xml.root << "<title>#{title || "(MISSING TITLE)"}</title>"
-          end
-          usrlbl and xml.at("/bibitem/docidentifier").next =
-            "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
-        end
-
-        def smart_render_xml(x, code, title, usrlbl)
-          xstr = x.to_xml if x.respond_to? :to_xml
-          xml = Nokogiri::XML(xstr)
-          emend_biblio(xml, code, title, usrlbl)
-          xml.xpath("//date").each { |d| Utils::endash_date(d) }
-          xml.traverse do |n|
-            n.text? and n.replace(Utils::smartformat(n.text))
-          end
-          xml.to_xml.sub(/<\?[^>]+>/, "")
-        end
     end
   end
 end

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -0,0 +1,124 @@
+module Asciidoctor
+  module Standoc
+    module Section
+      def in_biblio?
+        @biblio
+      end
+
+      def in_norm_ref?
+        @norm_ref
+      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]!")
+        @biblio = true
+        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
+        end
+        @biblio = false
+      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.merge(normative: true)) do |xml_section|
+          xml_section.title { |t| t << "Normative References" }
+          xml_section << node.content
+        end
+        @norm_ref = false
+      end
+
+      def global_ievcache_name
+        "#{Dir.home}/.iev/cache"
+      end
+
+      def local_ievcache_name(cachename)
+        return nil if cachename.nil?
+        cachename += "_iev" unless cachename.empty?
+        cachename = "iev" if cachename.empty?
+        "#{cachename}/cache"
+      end
+
+      def fetch_ref(xml, code, year, **opts)
+        return nil if opts[:no_year]
+        code = code.sub(/^\([^)]+\)/, "")
+        hit = @bibdb&.fetch(code, year, opts)
+        return nil if hit.nil?
+        xml.parent.add_child(smart_render_xml(hit, code, opts[:title],
+                                              opts[:usrlbl]))
+        xml
+      rescue RelatonBib::RequestError
+        @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
+                 "no access to online site")
+        nil
+      end
+
+      def emend_biblio(xml, code, title, usrlbl)
+        unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]")
+          @log.add("Bibliography", nil,
+                   "ERROR: No document identifier retrieved for #{code}")
+          xml.root << "<docidentifier>#{code}</docidentifier>"
+        end
+        unless xml.at("/bibitem/title[text()]")
+          @log.add("Bibliography", nil,
+                   "ERROR: No title retrieved for #{code}")
+          xml.root << "<title>#{title || "(MISSING TITLE)"}</title>"
+        end
+        usrlbl and xml.at("/bibitem/docidentifier").next =
+          "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
+      end
+
+      def smart_render_xml(x, code, title, usrlbl)
+        xstr = x.to_xml if x.respond_to? :to_xml
+        xml = Nokogiri::XML(xstr)
+        emend_biblio(xml, code, title, usrlbl)
+        xml.xpath("//date").each { |d| Utils::endash_date(d) }
+        xml.traverse do |n|
+          n.text? and n.replace(Utils::smartformat(n.text))
+        end
+        xml.to_xml.sub(/<\?[^>]+>/, "")
+      end
+
+      def init_bib_caches(node)
+        return if @no_isobib
+        global = !@no_isobib_cache && !node.attr("local-cache-only")
+        local = node.attr("local-cache") || node.attr("local-cache-only")
+        local = nil if @no_isobib_cache
+        @bibdb = Relaton::DbCache.init_bib_caches(
+          local_cache: local,
+          flush_caches: node.attr("flush-caches"),
+          global_cache: global)
+      end
+
+      def init_iev_caches(node)
+        unless (@no_isobib_cache || @no_isobib)
+          node.attr("local-cache-only") or
+            @iev_globalname = global_ievcache_name
+          @iev_localname = local_ievcache_name(node.attr("local-cache") ||
+                                               node.attr("local-cache-only"))
+          if node.attr("flush-caches")
+            FileUtils.rm_f @iev_globalname unless @iev_globalname.nil?
+            FileUtils.rm_f @iev_localname unless @iev_localname.nil?
+          end
+        end
+        #@iev = Iev::Db.new(globalname, localname) unless @no_isobib
+      end
+    end
+  end
+end

data/lib/asciidoctor/standoc/section.rb

@@ -1,5 +1,6 @@
 require "htmlentities"
 require "uri"
+require_relative "ref_sect"
 
 module Asciidoctor
   module Standoc
@@ -8,18 +9,10 @@ module Asciidoctor
       @term_def = false
       @norm_ref = false
 
-      def in_biblio?
-        @biblio
-      end
-
       def in_terms?
         @term_def
       end
 
-      def in_norm_ref?
-        @norm_ref
-      end
-
       def sectiontype(node, level = true)
         ret = node&.attr("heading")&.downcase ||
           node.title.gsub(/<[^>]+>/, "").downcase
@@ -41,9 +34,7 @@ module Asciidoctor
           "terms, definitions and abbreviated terms"
           "terms and definitions"
         when "symbols and abbreviated terms",
-          "symbols",
-          "abbreviated terms",
-          "abbreviations"
+          "symbols", "abbreviated terms", "abbreviations"
           "symbols and abbreviated terms"
         else
           ret
@@ -148,19 +139,6 @@ module Asciidoctor
         end
       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]!")
-        @biblio = true
-        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
-        end
-        @biblio = false
-      end
-
       def nonterm_symbols_parse(attrs, xml, node)
         @definitions = false
         clause_parse(attrs, xml, node)
@@ -236,28 +214,6 @@ 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.merge(normative: true)) do |xml_section|
-          xml_section.title { |t| t << "Normative References" }
-          xml_section << node.content
-        end
-        @norm_ref = false
-      end
-
       def introduction_parse(attrs, xml, node)
         xml.introduction **attr_code(attrs) do |xml_section|
           xml_section.title { |t| t << "Introduction" }