metanorma-standoc 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5e5f1a3e1674d8e9cc0b3cdc0979195595b187e972e498616b30955cbc4512
-  data.tar.gz: 81b45e23e6ece67cd6a6d8d6bd747c439264faca7ee26daf58b6cbdc42dcd93d
+  metadata.gz: a2015e269893b92d91e3b1f7fabe93f706693d7a45da1719daac5b60e04f0011
+  data.tar.gz: 2ac72c8476a05968b34648c05eec685f8339dfbe711780ed7b1b7f646c94aa2e
 SHA512:
-  metadata.gz: 33d2ba8ae3a9b5ed18bf30193c507bcc6da280054dcc5c6c22e0f87288e6d229fb2bbcc62175826918d2b25935f1b6fc84f7d68f64e925a438c1d20fe6845f77
-  data.tar.gz: acab296d523a22e518a64ef1d1109706bfe4e3b164366f237b09a42e804ac371bf3387cd40122ea1f9eb0e42f9fa86796140826fd0013b44417b9d792cc3751a
+  metadata.gz: 1df98678c7d010abdbdc9c4ba754ca1892ce75c5d4aa7bb882642bca4e3b4df725c9b3ae01b208a0b0cfe77dbf23eec2d7742e5a402c574479170f1140ebc71b
+  data.tar.gz: 6340b42bc795cc70c3184a5d3b268c726dec16705f1396a6fc3d298c882eaf0b21d08f8bb0d982db30829518b24a6f09256361218d10b3ff8083ac00c1aadd68

data/lib/metanorma/standoc/cleanup.rb

@@ -53,15 +53,16 @@ module Metanorma
         normref_cleanup(xmldoc)
         biblio_cleanup(xmldoc)
         reference_names(xmldoc)
-        asciimath_cleanup(xmldoc) # feeds: mathml_cleanup, termdef_cleanup, symbols_cleanup
+        asciimath_cleanup(xmldoc) # feeds: mathml_cleanup, termdef_cleanup,
+        # symbols_cleanup
         symbols_cleanup(xmldoc) # feeds: termdef_cleanup
         xref_cleanup(xmldoc) # feeds: concept_cleanup, origin_cleanup
         concept_cleanup(xmldoc) # feeds: related_cleanup, termdef_cleanup
         related_cleanup(xmldoc) # feeds: termdef_cleanup
         origin_cleanup(xmldoc) # feeds: termdef_cleanup
         bookmark_cleanup(xmldoc)
-        termdef_cleanup(xmldoc) # feeds: iev_cleanup, term_index_cleanup
-        RelatonIev::iev_cleanup(xmldoc, @bibdb)
+        termdef_cleanup(xmldoc) # feeds: relaton_iev_cleanup, term_index_cleanup
+        relaton_iev_cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         term_index_cleanup(xmldoc)
         bpart_cleanup(xmldoc)
@@ -88,6 +89,13 @@ module Metanorma
         xmldoc
       end
 
+      def relaton_iev_cleanup(xmldoc)
+        _, err = RelatonIev::iev_cleanup(xmldoc, @bibdb)
+        err.each do |e|
+          @log.add("Bibliography", nil, e, severity: 0)
+        end
+      end
+
       def docidentifier_cleanup(xmldoc); end
 
       TEXT_ELEMS =

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -3,14 +3,16 @@ module Metanorma
     module Cleanup
       def external_terms_boilerplate(sources)
         @i18n.l10n(
-          @i18n.external_terms_boilerplate.gsub("%", sources || "???"),
+          @i18n.external_terms_boilerplate.gsub(/%(?=\p{P}|\p{Z}|$)/,
+                                                sources || "???"),
           @lang, @script, @locale
         )
       end
 
       def internal_external_terms_boilerplate(sources)
         @i18n.l10n(
-          @i18n.internal_external_terms_boilerplate.gsub("%", sources || "??"),
+          @i18n.internal_external_terms_boilerplate.gsub(/%(?=\p{P}|\p{Z}|$)/,
+                                                         sources || "??"),
           @lang, @script
         )
       end
@@ -139,13 +141,40 @@ module Metanorma
         xml.at("//metanorma-extension/semantic-metadata/" \
                "headless[text() = 'true']") and return nil
         file = boilerplate_file(xml)
-        @boilerplateauthority and file = File.join(@localdir,
-                                                   @boilerplateauthority)
-        (!file.nil? and File.exist?(file)) or return
-        b = conv.populate_template(boilerplate_read(file), nil)
+        @boilerplateauthority and
+          file2 = File.join(@localdir, @boilerplateauthority)
+        resolve_boilerplate_files(process_boilerplate_file(file, conv),
+                                  process_boilerplate_file(file2, conv))
+      end
+
+      def process_boilerplate_file(filename, conv)
+        (!filename.nil? and File.exist?(filename)) or return
+        b = conv.populate_template(boilerplate_read(filename), nil)
         boilerplate_file_convert(b)
       end
 
+      def resolve_boilerplate_files(built_in, user_add)
+        built_in || user_add or return
+        built_in && user_add or return to_xml(built_in || user_add)
+        merge_boilerplate_files(built_in, user_add)
+      end
+
+      def merge_boilerplate_files(built_in, user_add)
+        %w(copyright license legal feedback).each do |w|
+          resolve_boilerplate_statement(built_in, user_add, w)
+        end
+        to_xml(built_in)
+      end
+
+      def resolve_boilerplate_statement(built_in, user_add, statement)
+        b = user_add.at("./#{statement}-statement") or return
+        if a = built_in.at("./#{statement}-statement")
+          b.text.strip.empty? and a.remove or a.replace(b)
+        else
+          built_in << b
+        end
+      end
+
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")
         /\.adoc$/.match?(file) and
@@ -155,8 +184,8 @@ module Metanorma
 
       # If Asciidoctor, convert top clauses to tags and wrap in <boilerplate>
       def boilerplate_file_convert(file)
-        Nokogiri::XML(file).root and return file
-        to_xml(boilerplate_file_restructure(file))
+        ret = Nokogiri::XML(file).root and return ret
+        boilerplate_file_restructure(file)
       end
 
       # If Asciidoctor, convert top clauses to tags and wrap in <boilerplate>

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -4,18 +4,22 @@ module Metanorma
       # extending localities to cover ISO referencing
       CONN_REGEX_STR = "(?<conn>and|or|from|to)!".freeze
 
+      LOCALITIES = "section|clause|part|paragraph|chapter|page|line|" \
+        "table|annex|figure|example|note|formula|list|time|anchor|" \
+        "locality:[^ \\t\\n\\r:,;=]+".freeze
+
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
         ^((#{CONN_REGEX_STR})?
-            (?<locality>section|clause|part|paragraph|chapter|page|line|
-                      table|annex|figure|example|note|formula|list|time|anchor|
-                      locality:[^ \\t\\n\\r:,;=]+)(\\s+|=)
+            (?<locality>#{LOCALITIES})(\\s+|=)
                (?<ref>[^"][^ \\t\\n,:;-]*|"[^"]+")
                  (-(?<to>[^"][^ \\t\\n,:;-]*|"[^"]"))?|
           (?<locality2>whole|title|locality:[^ \\t\\n\\r:,;=]+))(?<punct>[,:;]?)\\s*
          (?<text>.*)$
       REGEXP
-      LOCALITY_RE = Regexp.new(LOCALITY_REGEX_STR.gsub(/\s/, ""),
-                               Regexp::IGNORECASE | Regexp::MULTILINE)
+
+      def to_regex(str)
+        Regexp.new(str.gsub(/\s/, ""), Regexp::IGNORECASE | Regexp::MULTILINE)
+      end
 
       LOCALITY_REGEX_VALUE_ONLY_STR = <<~REGEXP.freeze
         ^(?<conn0>(#{CONN_REGEX_STR}))
@@ -23,8 +27,6 @@ module Metanorma
           (?<value>[^=,;:\\t\\n\\r]+)
           (?<punct>[,;\\t\\n\\r]|$)
       REGEXP
-      LOCALITY_VAL_ONLY_RE = Regexp.new(LOCALITY_REGEX_VALUE_ONLY_STR
-        .gsub(/\s/, ""), Regexp::IGNORECASE | Regexp::MULTILINE)
 
       def tq(text)
         text.sub(/^"/, "").sub(/"$/, "")
@@ -40,9 +42,28 @@ module Metanorma
         tail and elem << tail
       end
 
+      LOCALITY_REGEX_STR_TRIPLEDASH = <<~REGEXP.freeze
+        ^(?<locality>(#{CONN_REGEX_STR})?
+            (#{LOCALITIES})(\\s+|=))
+               (?<ref>[^"][^ \\t\\n,:;-]*
+                 -[^ \\t\\n,:;"-]+
+                 -[^ \\t\\n,:;"]+)
+          (?<text>[,:;]?\\s*
+         .*)$
+      REGEXP
+
+      # treat n-n-n locality as "n-n-n", do not parse as a range
+      def locality_normalise(text)
+        re = to_regex(LOCALITY_REGEX_STR_TRIPLEDASH)
+        m = re.match(text) and
+          text = %(#{m[:locality]}"#{m[:ref]}"#{m[:text]})
+        text
+      end
+
       def extract_localities1(elem, text)
-        b = elem.add_child("<localityStack/>").first if LOCALITY_RE.match text
-        while (m = LOCALITY_RE.match text)
+        re = to_regex(LOCALITY_REGEX_STR)
+        b = elem.add_child("<localityStack/>").first if re.match text
+        while (m = re.match locality_normalise(text))
           add_locality(b, m)
           text = extract_localities_update_text(m)
           b = elem.add_child("<localityStack/>").first if m[:punct] == ";"
@@ -54,7 +75,8 @@ module Metanorma
       # clause=3;and!5 => clause=3;and!clause=5
       def extract_localities_update_text(match)
         ret = match[:text]
-        if LOCALITY_VAL_ONLY_RE.match?(ret) && match[:punct] == ";"
+        re = to_regex(LOCALITY_REGEX_VALUE_ONLY_STR)
+        if re.match?(ret) && match[:punct] == ";"
           ret.sub!(%r{^(#{CONN_REGEX_STR})}o, "\\1#{match[:locality]}=")
         end
         ret

data/lib/metanorma/standoc/front.rb

@@ -11,7 +11,6 @@ module Metanorma
       def metadata_id(node, xml)
         id = node.attr("docidentifier") || metadata_id_build(node)
         xml.docidentifier id
-        xml.docnumber node.attr("docnumber")
       end
 
       def metadata_id_build(node)
@@ -25,6 +24,11 @@ module Metanorma
       def metadata_other_id(node, xml)
         a = node.attr("isbn") and xml.docidentifier a, type: "ISBN"
         a = node.attr("isbn10") and xml.docidentifier a, type: "ISBN10"
+        csv_split(node.attr("docidentifier-additional"), ",")&.each do |n|
+          t, v = n.split(":", 2)
+          xml.docidentifier v, type: t
+        end
+        xml.docnumber node.attr("docnumber")
       end
 
       def metadata_version(node, xml)
@@ -44,8 +48,7 @@ module Metanorma
       end
 
       def metadata_committee(node, xml)
-        return unless node.attr("technical-committee")
-
+        node.attr("technical-committee") or return
         xml.editorialgroup do |a|
           committee_component("technical-committee", node, a)
         end
@@ -64,12 +67,9 @@ module Metanorma
 
       def metadata_source(node, xml)
         node.attr("uri") && xml.uri(node.attr("uri"))
-        node.attr("xml-uri") && xml.uri(node.attr("xml-uri"), type: "xml")
-        node.attr("html-uri") && xml.uri(node.attr("html-uri"), type: "html")
-        node.attr("pdf-uri") && xml.uri(node.attr("pdf-uri"), type: "pdf")
-        node.attr("doc-uri") && xml.uri(node.attr("doc-uri"), type: "doc")
-        node.attr("relaton-uri") && xml.uri(node.attr("relaton-uri"),
-                                            type: "relaton")
+        %w(xml html pdf doc relaton).each do |t|
+          node.attr("#{t}-uri") && xml.uri(node.attr("#{t}-uri"), type: t)
+        end
       end
 
       def metadata_date1(node, xml, type)
@@ -88,8 +88,7 @@ module Metanorma
       def metadata_date(node, xml)
         datetypes.each { |t| metadata_date1(node, xml, t) }
         node.attributes.each_key do |a|
-          next unless a == "date" || /^date_\d+$/.match(a)
-
+          a == "date" || /^date_\d+$/.match(a) or next
           type, date = node.attr(a).split(/ /, 2)
           type or next
           xml.date type: type do |d|

data/lib/metanorma/standoc/macros_inline.rb

@@ -17,16 +17,23 @@ module Metanorma
       named :index
 
       def preprocess_attrs(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)
-        args = preprocess_attrs(attr) or return
+      def validate(parent, target, attrs)
+        attrs.size > 1 && attrs.size < 5 and return true
+        e = "invalid index \"#{target}\" cross-reference: wrong number of " \
+            "attributes in `index:#{target}[#{attrs.values.join(',')}]`"
+        parent.converter.log.add("Index", parent, e, severity: 0)
+        false
+      end
+
+      def process(parent, target, attr)
+        validate(parent, target, attr) or return
+        args = preprocess_attrs(attr)
         ret = "<index-xref also='#{target == 'also'}'>" \
               "<primary>#{args[:primary]}</primary>"
         ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]

data/lib/metanorma/standoc/ref.rb

@@ -17,6 +17,7 @@ module Metanorma
 
       def isorefrender1(bib, match, code, year, allp = "")
         bib.title(**plaintxt) { |i| i << ref_normalise(match[:text]) }
+        #refitem_render_formattedref(bib, match[:text])
         docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, code[:usrlabel]) if code && code[:usrlabel]
         docid(bib, id_and_year(match[:code], year) + allp)
@@ -28,7 +29,7 @@ module Metanorma
         yr = norm_year(match[:year])
         { code: match[:code], year: yr, match: match,
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel],
-          analyse_code: code, lang: (@lang || :all) }
+          analyse_code: code, lang: @lang || :all }
       end
 
       def isorefmatchesout(item, xml)
@@ -47,7 +48,7 @@ module Metanorma
 
       def isorefmatches2code(match, _item)
         code = analyse_ref_code(match[:code])
-        { code: match[:code], no_year: true, lang: (@lang || :all),
+        { code: match[:code], no_year: true, lang: @lang || :all,
           note: match[:fn], year: nil, match: match, analyse_code: code,
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel] }
       end
@@ -79,7 +80,7 @@ module Metanorma
         yr = norm_year(match[:year])
         hasyr = !yr.nil? && yr != "--"
         { code: match[:code], match: match, yr: yr, hasyr: hasyr,
-          year: hasyr ? yr : nil, lang: (@lang || :all),
+          year: hasyr ? yr : nil, lang: @lang || :all,
           all_parts: true, no_year: yr == "--",
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel] }
       end
@@ -125,11 +126,10 @@ module Metanorma
 
       def refitem_render(xml, match, code)
         xml.bibitem **attr_code(
-          id: match[:anchor], suppress_identifier: code[:dropid], hidden: code[:hidden],
+          id: match[:anchor], suppress_identifier: code[:dropid],
+          hidden: code[:hidden]
         ) do |t|
-          t.formattedref format: "application/x-isodoc+xml" do |i|
-            i << ref_normalise_no_format(match[:text])
-          end
+          refitem_render_formattedref(t, match[:text])
           yr_match = refitem1yr(code[:id])
           refitem_render1(match, code, t)
           /^\d+$|^\(.+\)$/.match?(code[:id]) or
@@ -138,11 +138,19 @@ module Metanorma
         end
       end
 
+      def refitem_render_formattedref(bibitem, title)
+        (title.nil? || title.empty?) and title = @i18n.no_information_available
+        bibitem.formattedref format: "application/x-isodoc+xml" do |i|
+          i << ref_normalise_no_format(title)
+        end
+      end
+
       # TODO: alternative where only title is available
       def refitemcode(item, node)
         m = NON_ISO_REF.match(item) and return refitem1code(item, m).compact
         m = NON_ISO_REF1.match(item) and return refitem1code(item, m).compact
-        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}", severity: 1)
+        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}",
+                 severity: 1)
         {}
       end
 
@@ -154,7 +162,7 @@ module Metanorma
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
           year: (m = refitem1yr(code[:id])) ? m[:year] : nil,
           title: match[:text], match: match, hidden: code[:hidden],
-          usrlbl: match[:usrlbl] || code[:usrlabel], lang: (@lang || :all) }
+          usrlbl: match[:usrlbl] || code[:usrlabel], lang: @lang || :all }
       end
 
       def refitem1yr(code)

data/lib/metanorma/standoc/ref_sect.rb

@@ -71,13 +71,14 @@ module Metanorma
       # supply title if missing;
       # add title with spans in it as formattedref, to emend bibitem with later
       def emend_biblio_title(xml, code, title)
+        fmt = /<span class=|<fn/.match?(title)
         unless xml.at("/bibitem/title[text()]")
           @log.add("Bibliography", nil,
                    "ERROR: No title retrieved for #{code}")
+          !fmt and
           xml.root << "<title>#{title || '(MISSING TITLE)'}</title>"
         end
-        /<span class=/.match?(title) and
-          xml.root << "<formattedref>#{title}</formattedref>"
+        fmt and xml.root << "<formattedref>#{title}</formattedref>"
       end
 
       def emend_biblio_usrlbl(xml, usrlbl)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.1".freeze
+    VERSION = "2.8.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.8.0"
+  spec.add_dependency "isodoc", "~> 2.8.3"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"
@@ -42,9 +42,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "pngcheck"
   spec.add_dependency "relaton-cli", "~> 1.18.0"
-  spec.add_dependency "relaton-iev", "~> 1.1.5"
+  spec.add_dependency "relaton-iev", "~> 1.2.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
-  spec.add_dependency "vectory", "~> 0.6"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: unicode2latex
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: vectory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement