metanorma-standoc 1.6.5 → 1.8.1

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -1,3 +1,5 @@
+require "metanorma-utils"
+
 module Asciidoctor
   module Standoc
     module Cleanup
@@ -82,6 +84,8 @@ module Asciidoctor
 
       def xref_cleanup(xmldoc)
         xmldoc.xpath("//xref").each do |x|
+          /:/.match(x["target"]) and xref_to_internal_eref(x)
+          next unless x.name == "xref"
           if refid? x["target"]
             x.name = "eref"
             xref_to_eref(x)
@@ -91,6 +95,18 @@ module Asciidoctor
         end
       end
 
+      def xref_to_internal_eref(x)
+        a = x["target"].split(":", 3)
+        unless  a.size < 2 || a[0].empty? || a[1].empty?
+          x["target"] = "#{a[0]}_#{a[1]}"
+          a.size > 2 and x.children = %{anchor="#{a[2..-1].join("")}",#{x&.children&.text}}
+          x["type"] = a[0]
+          @internal_eref_namespaces << a[0]
+          x.name = "eref"
+          xref_to_eref(x)
+        end
+      end
+
       def quotesource_cleanup(xmldoc)
         xmldoc.xpath("//quote/source | //terms/source").each do |x|
           xref_to_eref(x)
@@ -125,7 +141,7 @@ module Asciidoctor
       def concept_termbase_cleanup(x)
         text = x&.children&.first&.remove&.text
         termbase, key = x["key"].split(/:/, 2)
-        x.add_child(%(<termref base="#{termbase}" target="#{key}">) + 
+        x.add_child(%(<termref base="#{termbase}" target="#{key}">) +
                     "#{text}</termref>")
       end
 
@@ -139,27 +155,11 @@ module Asciidoctor
         extract_localities(x.first_element_child)
       end
 
-      NAMECHAR = "\u0000-\u0022\u0024\u002c\u002f\u003a-\u0040\\u005b-\u005e"\
-        "\u0060\u007b-\u00b6\u00b8-\u00bf\u00d7\u00f7\u037e\u2000-\u200b"\
-        "\u200e-\u203e\u2041-\u206f\u2190-\u2bff\u2ff0-\u3000".freeze
-      #"\ud800-\uf8ff\ufdd0-\ufdef\ufffe-\uffff".freeze
-      NAMESTARTCHAR = "\\u002d\u002e\u0030-\u0039\u00b7\u0300-\u036f"\
-        "\u203f-\u2040".freeze
-
-      def to_ncname(s)
-        start = s[0]
-        ret1 = %r([#{NAMECHAR}#]).match(start) ? "_" :
-          (%r([#{NAMESTARTCHAR}#]).match(start) ? "_#{start}" : start)
-        ret2 = s[1..-1] || ""
-        ret = (ret1 || "") + ret2.gsub(%r([#{NAMECHAR}#]), "_")
-        ret
-      end
-
       def to_xreftarget(s)
-        return to_ncname(s) unless /^[^#]+#.+$/.match(s)
+        return Metanorma::Utils::to_ncname(s) unless /^[^#]+#.+$/.match(s)
           /^(?<pref>[^#]+)#(?<suff>.+)$/ =~ s
-        pref = pref.gsub(%r([#{NAMECHAR}]), "_")
-        suff = suff.gsub(%r([#{NAMECHAR}]), "_")
+        pref = pref.gsub(%r([#{Metanorma::Utils::NAMECHAR}]), "_")
+        suff = suff.gsub(%r([#{Metanorma::Utils::NAMECHAR}]), "_")
         "#{pref}##{suff}"
       end
 
@@ -173,12 +173,11 @@ module Asciidoctor
 
       def anchor_cleanup1(x)
         x.xpath(IDREF).each do |s|
-          if (ret = to_ncname(s.value)) != (orig = s.value)
+          if (ret = Metanorma::Utils::to_ncname(s.value)) != (orig = s.value)
             s.value = ret
             output = s.parent.dup
             output.children.remove
-            @log.add("Anchors", s.parent, "normalised identifier in #{output} "\
-                     "from #{orig}")
+            @log.add("Anchors", s.parent, "normalised identifier in #{output} from #{orig}")
           end
         end
       end
@@ -189,8 +188,7 @@ module Asciidoctor
             s.value = ret
             output = s.parent.dup
             output.children.remove
-            @log.add("Anchors", s.parent, "normalised identifier in #{output} "\
-                     "from #{orig}")
+            @log.add("Anchors", s.parent, "normalised identifier in #{output} from #{orig}")
           end
         end
       end

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -120,91 +120,6 @@ module Asciidoctor
         end
       end
 
-      def ref_dl_cleanup(xmldoc)
-        xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
-          bib = dl_bib_extract(c) or next
-          validate_ref_dl(bib, c)
-          bibitemxml = RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
-          bibitem = Nokogiri::XML(bibitemxml)
-          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
-          c.replace(bibitem.root)
-        end
-      end
-
-      def validate_ref_dl(bib, c)
-        id = bib["id"]
-        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
-        unless id
-          @log.add("Anchors", c, "The following reference is missing an anchor:\n" + c.to_xml)
-          return
-        end
-        bib["title"] or @log.add("Bibliography", c, "Reference #{id} is missing a title")
-        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} is missing a document identifier (docid)")
-      end
-
-      def extract_from_p(tag, bib, key)
-        return unless bib[tag]
-        "<#{key}>#{bib[tag].at('p').children}</#{key}>"
-      end
-
-      # if the content is a single paragraph, replace it with its children
-      # single links replaced with uri
-      def p_unwrap(p)
-        elems = p.elements
-        if elems.size == 1 && elems[0].name == "p"
-          link_unwrap(elems[0]).children.to_xml.strip
-        else
-          p.to_xml.strip
-        end
-      end
-
-      def link_unwrap(p)
-        elems = p.elements
-        if elems.size == 1 && elems[0].name == "link"
-          p.at("./link").replace(elems[0]["target"].strip)
-        end
-        p
-      end
-
-      def dd_bib_extract(dtd)
-        return nil if dtd.children.empty?
-        dtd.at("./dl") and return dl_bib_extract(dtd)
-        elems = dtd.remove.elements
-        return p_unwrap(dtd) unless elems.size == 1 && %w(ol ul).include?(elems[0].name)
-        ret = []
-        elems[0].xpath("./li").each do |li|
-          ret << p_unwrap(li)
-        end
-        ret
-      end
-
-      def add_to_hash(bib, key, val)
-        Utils::set_nested_value(bib, key.split(/\./), val)
-      end
-
-      # definition list, with at most one level of unordered lists
-      def dl_bib_extract(c, nested = false)
-        dl = c.at("./dl") or return
-        bib = {}
-        key = ""
-        dl.xpath("./dt | ./dd").each do |dtd|
-          dtd.name == "dt" and key = dtd.text.sub(/:+$/, "") or add_to_hash(bib, key, dd_bib_extract(dtd))
-        end
-        c.xpath("./clause").each do |c1|
-          key = c1&.at("./title")&.text&.downcase&.strip
-          next unless %w(contributor relation series).include? key
-          add_to_hash(bib, key, dl_bib_extract(c1, true))
-        end
-        if !nested and c.at("./title")
-          title = c.at("./title").remove.children.to_xml
-          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
-          bib["title"] = [bib["title"]] if bib["title"].is_a? String
-          bib["title"] = [] unless bib["title"]
-          bib["title"] << title if !title.empty?
-        end
-        bib
-      end
-
       def fetch_termbase(termbase, id)
         ""
       end

data/lib/asciidoctor/standoc/cleanup_ref_dl.rb

@@ -0,0 +1,94 @@
+require "set"
+require "relaton_bib"
+
+module Asciidoctor
+  module Standoc
+    module Cleanup
+      def ref_dl_cleanup(xmldoc)
+        xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
+          bib = dl_bib_extract(c) or next
+          validate_ref_dl(bib, c)
+          bibitemxml = RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
+          bibitem = Nokogiri::XML(bibitemxml)
+          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
+          c.replace(bibitem.root)
+        end
+      end
+
+      def validate_ref_dl(bib, c)
+        id = bib["id"]
+        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
+        unless id
+          @log.add("Anchors", c, "The following reference is missing an anchor:\n" + c.to_xml)
+          return
+        end
+        @refids << id
+        bib["title"] or @log.add("Bibliography", c, "Reference #{id} is missing a title")
+        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} is missing a document identifier (docid)")
+      end
+
+      def extract_from_p(tag, bib, key)
+        return unless bib[tag]
+        "<#{key}>#{bib[tag].at('p').children}</#{key}>"
+      end
+
+      # if the content is a single paragraph, replace it with its children
+      # single links replaced with uri
+      def p_unwrap(p)
+        elems = p.elements
+        if elems.size == 1 && elems[0].name == "p"
+          link_unwrap(elems[0]).children.to_xml.strip
+        else
+          p.to_xml.strip
+        end
+      end
+
+      def link_unwrap(p)
+        elems = p.elements
+        if elems.size == 1 && elems[0].name == "link"
+          p.at("./link").replace(elems[0]["target"].strip)
+        end
+        p
+      end
+
+      def dd_bib_extract(dtd)
+        return nil if dtd.children.empty?
+        dtd.at("./dl") and return dl_bib_extract(dtd)
+        elems = dtd.remove.elements
+        return p_unwrap(dtd) unless elems.size == 1 && %w(ol ul).include?(elems[0].name)
+        ret = []
+        elems[0].xpath("./li").each do |li|
+          ret << p_unwrap(li)
+        end
+        ret
+      end
+
+      def add_to_hash(bib, key, val)
+        Metanorma::Utils::set_nested_value(bib, key.split(/\./), val)
+      end
+
+      # definition list, with at most one level of unordered lists
+      def dl_bib_extract(c, nested = false)
+        dl = c.at("./dl") or return
+        bib = {}
+        key = ""
+        dl.xpath("./dt | ./dd").each do |dtd|
+          dtd.name == "dt" and key = dtd.text.sub(/:+$/, "") or add_to_hash(bib, key, dd_bib_extract(dtd))
+        end
+        c.xpath("./clause").each do |c1|
+          key = c1&.at("./title")&.text&.downcase&.strip
+          next unless %w(contributor relation series).include? key
+          add_to_hash(bib, key, dl_bib_extract(c1, true))
+        end
+        if !nested and c.at("./title")
+          title = c.at("./title").remove.children.to_xml
+          bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
+          bib["title"] = [bib["title"]] if bib["title"].is_a? String
+          bib["title"] = [] unless bib["title"]
+          bib["title"] << title if !title.empty?
+        end
+        bib
+      end
+    end
+  end
+end

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -47,10 +47,6 @@ module Asciidoctor
         end
       end
 
-      def termdef_boilerplate_cleanup(xmldoc)
-        xmldoc.xpath("//terms/p | //terms/ul").each(&:remove)
-      end
-
       def termdef_subclause_cleanup(xmldoc)
         xmldoc.xpath("//terms[terms]").each { |t| t.name = "clause" }
       end
@@ -83,7 +79,7 @@ module Asciidoctor
           x.name = "note"
         end
         xmldoc.xpath("//termexample[not(ancestor::term)]").each do |x|
-          x.name = "note"
+          x.name = "example"
         end
       end
 
@@ -96,7 +92,6 @@ module Asciidoctor
         termdefinition_cleanup(xmldoc)
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)
-        termdef_boilerplate_cleanup(xmldoc)
         termdef_subclause_cleanup(xmldoc)
         term_children_cleanup(xmldoc) 
         termdocsource_cleanup(xmldoc)

data/lib/asciidoctor/standoc/converter.rb

@@ -1,6 +1,4 @@
 require "asciidoctor"
-require "fontist"
-require "fontist/manifest/install"
 require "metanorma/util"
 require "metanorma/standoc/version"
 require "asciidoctor/standoc/base"
@@ -16,7 +14,6 @@ require "asciidoctor/standoc/utils"
 require "asciidoctor/standoc/cleanup"
 require "asciidoctor/standoc/reqt"
 require_relative "./macros.rb"
-require_relative "./log.rb"
 
 module Asciidoctor
   module Standoc
@@ -40,7 +37,8 @@ module Asciidoctor
         inline_macro Asciidoctor::Standoc::VariantInlineMacro
         inline_macro Asciidoctor::Standoc::FootnoteBlockInlineMacro
         inline_macro Asciidoctor::Standoc::TermRefInlineMacro
-        inline_macro Asciidoctor::Standoc::IndexInlineMacro
+        inline_macro Asciidoctor::Standoc::IndexXrefInlineMacro
+        inline_macro Asciidoctor::Standoc::IndexRangeInlineMacro
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
@@ -72,8 +70,6 @@ module Asciidoctor
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
-
-        install_fonts(opts)
       end
 
       class << self
@@ -89,51 +85,6 @@ module Asciidoctor
         File.join(@libdir, "../../isodoc/html", file)
       end
 
-      def flavor_name
-        self.class.name.split("::")&.[](-2).downcase
-      end
-
-      def fonts_manifest
-        File.expand_path(File.join(@libdir, "../../metanorma/", flavor_name, "fonts_manifest.yaml"))
-      end
-
-      def install_fonts(options={})
-        if options[:no_install_fonts]
-          Metanorma::Util.log("[fontist] Skip font installation because" \
-            " --no-install-fonts argument passed", :debug)
-          return
-        end
-
-        if fonts_manifest.nil? || !File.exist?(fonts_manifest)
-          Metanorma::Util.log("[fontist] Skip font installation because" \
-            " font manifest file doesn't exists/defined", :debug)
-          return
-        end
-
-        begin
-          Fontist::Manifest::Install.call(
-            fonts_manifest,
-            confirmation: options[:agree_to_terms] ? "yes" : "no"
-          )
-        rescue Fontist::Errors::LicensingError
-          if !options[:agree_to_terms]
-            Metanorma::Util.log("[fontist] --agree-to-terms option missing." \
-              " You must accept font licenses to install fonts.", :debug)
-          elsif options[:continue_without_fonts]
-            Metanorma::Util.log("[fontist] Processing will continue without" \
-              " fonts installed", :debug)
-          else
-            Metanorma::Util.log("[fontist] Aborting without proper fonts" \
-              " installed", :fatal)
-          end
-        rescue Fontist::Errors::NonSupportedFontError
-          flavor = flavor_name || "cli"
-          Metanorma::Util.log("[fontist] '#{font}' font is not supported. " \
-            "Please go to github.com/metanorma/metanorma-#{flavor}/issues" \
-            " to report this issue.", :info)
-        end
-      end
-
       alias_method :embedded, :content
       alias_method :verse, :quote
       alias_method :audio, :skip

data/lib/asciidoctor/standoc/front.rb

@@ -93,7 +93,7 @@ module Asciidoctor
       end
 
       def metadata_script(node, xml)
-        xml.script (node.attr("script") || "Latn")
+        xml.script (node.attr("script") || default_script(node.attr("language")))
       end
 
       def relaton_relations
@@ -186,7 +186,7 @@ module Asciidoctor
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
-            t << (Utils::asciidoc_sub(node.attr("title") ||
+            t << (Metanorma::Utils::asciidoc_sub(node.attr("title") ||
                                       node.attr("title-en")) || node.title)
           end
         end

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -46,8 +46,9 @@ module Asciidoctor
 
       # , " => ," : CSV definition does not deal with space followed by quote
       # at start of field
-      def csv_split(s, delim = ",")
-        CSV.parse_line(s&.gsub(/, "(?!")/, ',"'),
+      def csv_split(s, delim = ";")
+        return if s.nil?
+        CSV.parse_line(s&.gsub(/#{delim} "(?!")/, "#{delim}\""),
                        liberal_parsing: true,
                        col_sep: delim)&.compact&.map { |x| x.strip }
       end
@@ -115,8 +116,11 @@ module Asciidoctor
         node.attr("affiliation#{suffix}") and p.affiliation do |a|
           a.organization do |o|
             o.name node.attr("affiliation#{suffix}")
-            abbr = node.attr("affiliation_abbrev#{suffix}") and
-              o.abbreviation abbr
+            a = node.attr("affiliation_subdiv#{suffix}")
+            abbr = node.attr("affiliation_abbrev#{suffix}") and o.abbreviation abbr
+            csv_split(node.attr("affiliation_subdiv#{suffix}"))&.each do |s|
+              o.subdivision s
+            end
             node.attr("address#{suffix}") and o.address do |ad|
               ad.formattedAddress do |f|
                 f << node.attr("address#{suffix}").gsub(/ \+\n/, "<br/>")

data/lib/asciidoctor/standoc/inline.rb

@@ -165,6 +165,7 @@ module Asciidoctor
             when "domain" then xml.domain { |a| a << node.text }
 
             when "strike" then xml.strike { |s| s << node.text }
+            when "underline" then xml.underline { |s| s << node.text }
             when "smallcap" then xml.smallcap { |s| s << node.text }
             when "keyword" then xml.keyword { |s| s << node.text }
             else
@@ -193,7 +194,7 @@ module Asciidoctor
         type = types.first.to_s
         uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
         attr_code(src: uri, #@datauriimage ? datauri(uri) : uri,
-                  id: Utils::anchor_or_uuid,
+                  id: Metanorma::Utils::anchor_or_uuid,
                   mimetype: type,
                   height: node.attr("height") || "auto",
                   width: node.attr("width") || "auto" ,
@@ -211,11 +212,12 @@ module Asciidoctor
       def inline_indexterm(node)
         noko do |xml|
           node.type == :visible and xml << node.text
-          terms = node.attr("terms") ||
-            [Nokogiri::XML("<a>#{node.text}</a>").xpath("//text()").text]
-          xml.index nil, **attr_code(primary: terms[0],
-                                     secondary: terms.dig(1),
-                                     tertiary: terms.dig(2))
+            terms = (node.attr("terms") || [node.text]).map { |x| xml_encode(x) }
+          xml.index do |i|
+            i.primary { |x| x << terms[0] }
+            a = terms.dig(1) and i.secondary { |x| x << a }
+            a = terms.dig(2) and i.tertiary { |x| x << a }
+          end
         end.join
       end
     end