metanorma-standoc 1.6.0 → 1.6.5

data/lib/asciidoctor/standoc/lists.rb

@@ -55,7 +55,7 @@ module Asciidoctor
 
       def ol_attrs(node)
         attr_code(keep_attrs(node).merge(id: Utils::anchor_or_uuid(node),
-                  type: olist_style(node.style)))
+                                         type: olist_style(node.style)))
       end
 
       def olist(node)
@@ -87,7 +87,9 @@ module Asciidoctor
       end
 
       def dl_attrs(node)
-        attr_code(id_attr(node).merge(keep_attrs(node)))
+        attr_code(keep_attrs(node).
+                  merge(id: Utils::anchor_or_uuid(node),
+                        key: node.option?("key") ? "true" : nil))
       end
 
       def dlist(node)

data/lib/asciidoctor/standoc/macros.rb

@@ -3,49 +3,14 @@ require "fileutils"
 require "uuidtools"
 require "yaml"
 require_relative "./macros_plantuml.rb"
+require_relative "./macros_terms.rb"
 require_relative "./datamodel/attributes_table_preprocessor.rb"
 require_relative "./datamodel/diagram_preprocessor.rb"
-require_relative "./yaml2_text_preprocessor.rb"
-require_relative "./json2_text_preprocessor.rb"
+require "metanorma-plugin-datastruct"
+require "metanorma-plugin-lutaml"
 
 module Asciidoctor
   module Standoc
-    class AltTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :alt
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<admitted>#{out}</admitted>}
-      end
-    end
-
-    class DeprecatedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :deprecated
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<deprecates>#{out}</deprecates>}
-      end
-    end
-
-    class DomainTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :domain
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<domain>#{out}</domain>}
-      end
-    end
-
     class InheritInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :inherit
@@ -58,33 +23,24 @@ module Asciidoctor
       end
     end
 
-    class ConceptInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+    class IndexInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
-      named :concept
-      name_positional_attributes "id", "word", "term"
-      # match %r{concept:(?<target>[^\[]*)\[(?<content>|.*?[^\\])\]$}
-      match /\{\{(?<content>|.*?[^\\])\}\}/
-      using_format :short
+      named :index
 
-      # deal with locality attrs and their disruption of positional attrs
       def preprocess_attrs(attrs)
-        attrs.delete("term") if attrs["term"] && !attrs["word"]
-        attrs.delete(3) if attrs[3] == attrs["term"]
-        a = attrs.keys.reject { |k| k.is_a?(String) || [1, 2].include?(k) }
-        attrs["word"] ||= attrs[a[0]] if !a.empty?
-        attrs["term"] ||= attrs[a[1]] if a.length > 1
-        attrs
+        return unless attrs.size > 1 && attrs.size < 5
+        ret = { primary: attrs[1], target: attrs[attrs.size] }
+        ret[:secondary] = attrs[2] if attrs.size > 2
+        ret[:tertiary] = attrs[3] if attrs.size > 3
+        ret
       end
 
-      def process(parent, _target, attr)
-        attr = preprocess_attrs(attr)
-        localities = attr.keys.reject { |k| %w(id word term).include? k }.
-          reject { |k| k.is_a? Numeric }.
-          map { |k| "#{k}=#{attr[k]}" }.join(",")
-        text = [localities, attr["word"]].reject{ |k| k.nil? || k.empty? }.
-          join(",")
-        out = Asciidoctor::Inline.new(parent, :quoted, text).convert
-        %{<concept key="#{attr['id']}" term="#{attr['term']}">#{out}</concept>}
+      def process(_parent, target, attr)
+        args = preprocess_attrs(attr) or return
+        ret = "<index-xref also='#{target == 'also'}'><primary>#{args[:primary]}</primary>"
+        ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
+        ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
+        ret + "<target>#{args[:target]}</target></index-xref>"
       end
     end
 
@@ -135,7 +91,7 @@ module Asciidoctor
         if (attributes.size == 1) && attributes.key?("text")
           rt = attributes["text"]
         elsif (attributes.size == 2) && attributes.key?(1) &&
-            attributes.key?("rpbegin")
+          attributes.key?("rpbegin")
           # for example, html5ruby:楽聖少女[がくせいしょうじょ]
           rt = attributes[1] || ""
         else
@@ -158,7 +114,7 @@ module Asciidoctor
         attrs["name"] = "todo"
         attrs["caption"] = "TODO"
         create_block parent, :admonition, reader.lines, attrs,
-                     content_model: :compound
+          content_model: :compound
       end
     end
 
@@ -171,7 +127,7 @@ module Asciidoctor
           para.set_attr("caption", "TODO")
           para.lines[0].sub!(/^TODO: /, "")
           todo = Block.new parent, :admonition, attributes: para.attributes,
-                                                source: para.lines, content_model: :compound
+            source: para.lines, content_model: :compound
           parent.blocks[parent.blocks.index(para)] = todo
         end
       end
@@ -187,5 +143,31 @@ module Asciidoctor
         %{<autonumber type=#{target}>#{out}</autonumber>}
       end
     end
+
+    class VariantInlineMacro < Extensions::InlineMacroProcessor
+      use_dsl
+      named :lang
+      parse_content_as :text
+
+      def process(parent, target, attrs)
+        /^(?<lang>[^-]*)(-(?<script>.*))?$/ =~ target
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        script ?
+          %{<variant lang=#{lang} script=#{script}>#{out}</variant>} :
+          %{<variant lang=#{lang}>#{out}</variant>}
+      end
+    end
+
+    class FootnoteBlockInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :footnoteblock
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<footnoteblock>#{out}</footnoteblock>}
+      end
+    end
   end
 end

data/lib/asciidoctor/standoc/macros_terms.rb

@@ -0,0 +1,82 @@
+module Asciidoctor
+  module Standoc
+    class AltTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :alt
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<admitted>#{out}</admitted>}
+      end
+    end
+
+    class DeprecatedTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :deprecated
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<deprecates>#{out}</deprecates>}
+      end
+    end
+
+    class DomainTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :domain
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<domain>#{out}</domain>}
+      end
+    end
+
+     # Macro to transform `term[X,Y]` into em, termxref xml
+    class TermRefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :term
+      name_positional_attributes 'name', 'termxref'
+      using_format :short
+
+      def process(_parent, _target, attrs)
+        termref = attrs['termxref'] || attrs['name']
+        "<em>#{attrs['name']}</em> (<termxref>#{termref}</termxref>)"
+      end
+    end
+
+    class ConceptInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :concept
+      name_positional_attributes "id", "word", "term"
+      # match %r{concept:(?<target>[^\[]*)\[(?<content>|.*?[^\\])\]$}
+      match /\{\{(?<content>|.*?[^\\])\}\}/
+      using_format :short
+
+      # deal with locality attrs and their disruption of positional attrs
+      def preprocess_attrs(attrs)
+        attrs.delete("term") if attrs["term"] && !attrs["word"]
+        attrs.delete(3) if attrs[3] == attrs["term"]
+        a = attrs.keys.reject { |k| k.is_a?(String) || [1, 2].include?(k) }
+        attrs["word"] ||= attrs[a[0]] if !a.empty?
+        attrs["term"] ||= attrs[a[1]] if a.length > 1
+        attrs
+      end
+
+      def process(parent, _target, attr)
+        attr = preprocess_attrs(attr)
+        localities = attr.keys.reject { |k| %w(id word term).include? k }.
+          reject { |k| k.is_a? Numeric }.
+          map { |k| "#{k}=#{attr[k]}" }.join(",")
+        text = [localities, attr["word"]].reject{ |k| k.nil? || k.empty? }.
+          join(",")
+        out = Asciidoctor::Inline.new(parent, :quoted, text).convert
+        %{<concept key="#{attr['id']}" term="#{attr['term']}">#{out}</concept>}
+      end
+    end
+  end
+end

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|
@@ -56,7 +56,9 @@ module Asciidoctor
       end
 
       def norm_year(yr)
-        /^\&\#821[12];$/.match(yr) ? "--" : yr
+        /^\&\#821[12];$/.match(yr) and return "--" 
+        /^\d\d\d\d-\d\d\d\d$/.match(yr) and return yr
+        yr&.sub(/(?<=[0-9])-.*$/, "")
       end
 
       def isorefrender1(t, m, yr, allp = "")
@@ -68,7 +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]
+        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)
@@ -81,7 +83,7 @@ module Asciidoctor
 
       def isorefmatches2(xml, m)
         ref = fetch_ref xml, m[:code], nil, no_year: true, note: m[:fn],
-          title: m[:text], usrlbl: m[:usrlbl]
+          title: m[:text], usrlbl: m[:usrlbl], lang: (@lang || :all)
         return use_my_anchor(ref, m[:anchor]) if ref
         isorefmatches2_1(xml, m)
       end
@@ -93,7 +95,7 @@ module Asciidoctor
             d.on "--"
           end
           iso_publisher(t, m[:code])
-          m[:fn].nil? or t.note(**plaintxt.merge(type: "ISO DATE")) do |p|
+          m[:fn].nil? or t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
             p << "#{m[:fn]}"
           end
         end
@@ -102,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
 
@@ -111,7 +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]
+          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
@@ -122,7 +123,7 @@ module Asciidoctor
           conditional_date(t, m, yr == "--")
           iso_publisher(t, m[:code])
           m.names.include?("fn") && m[:fn] and
-            t.note(**plaintxt.merge(type: "ISO DATE")) { |p| p << "#{m[:fn]}" }
+            t.note(**plaintxt.merge(type: "Unpublished-Status")) { |p| p << "#{m[:fn]}" }
           t.extent **{ type: 'part' } do |e|
             e.referenceFrom "all"
           end
@@ -136,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)
@@ -151,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])
@@ -161,9 +160,9 @@ module Asciidoctor
       end
 
       def analyse_ref_repo_path(ret)
-        return ret unless m =
-          /^(?<type>repo|path):\((?<key>[^,]+),(?<id>.+)\)$/.match(ret[:id])
-        ret.merge(id: m[:id], type: m[:type], key: m[:key], nofetch: true)
+        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
 
       def analyse_ref_numeric(ret)
@@ -181,19 +180,16 @@ module Asciidoctor
 
       # TODO: alternative where only title is available
       def refitem(xml, item, node)
-        unless m = NON_ISO_REF.match(item)
-          @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
-          return
-        end
-        refitem1(xml, item, m)
+        m = NON_ISO_REF.match(item) and return refitem1(xml, item, m)
+        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
+        nil
       end
 
       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],
-            usrlbl: m[:usrlbl]
+          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
         refitem_render(xml, m, code)
@@ -209,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-]+):
@@ -225,7 +220,7 @@ module Asciidoctor
 
           NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
         \[(?<usrlbl>\([^)]+\))?(?<code>[^\]]+?)
-        ([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*(?<text>.*)$}xm
+        ([:-](?<year>(19|20)[0-9][0-9][0-9-]*))?\]</ref>,?\s*(?<text>.*)$}xm
 
         def reference1_matches(item)
           matched = ISO_REF.match item
@@ -236,20 +231,13 @@ 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)
           end
         end
 
-        def reference(node)
-          noko do |xml|
-            node.items.each { |item| reference1(node, item.text, xml) }
-          end.join
-        end
-
         def mn_code(code)
           code.sub(/^\(/, "[").sub(/\).*$/, "]").sub(/^nofetch\((.+)\)$/, "\\1")
         end

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -9,14 +9,20 @@ module Asciidoctor
         @norm_ref
       end
 
+      def reference(node)
+          noko do |xml|
+            node.items.each { |item| reference1(node, item.text, xml) }
+          end.join
+        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 }
+          #title = node.level == 1 ? "Bibliography" : node.title
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @biblio = false
@@ -38,7 +44,8 @@ module Asciidoctor
           @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.title { |t| t << "Normative References" }
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @norm_ref = false
@@ -58,10 +65,10 @@ module Asciidoctor
       def fetch_ref(xml, code, year, **opts)
         return nil if opts[:no_year]
         code = code.sub(/^\([^)]+\)/, "")
+        #require "byebug"; byebug if opts[:lang] == "fr"
         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.parent.add_child(smart_render_xml(hit, code, opts))
         xml
       rescue RelatonBib::RequestError
         @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
@@ -84,10 +91,11 @@ module Asciidoctor
           "<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
+      def smart_render_xml(x, code, opts)
+        x.respond_to? :to_xml or return nil
+        xstr = x.to_xml(lang: opts[:lang])
         xml = Nokogiri::XML(xstr)
-        emend_biblio(xml, code, title, usrlbl)
+        emend_biblio(xml, code, opts[:title], opts[:usrlbl])
         xml.xpath("//date").each { |d| Utils::endash_date(d) }
         xml.traverse do |n|
           n.text? and n.replace(Utils::smartformat(n.text))