metanorma-standoc 2.9.9 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ea12bf51408c095b7c95aaa93ae80274cfdea888c7fc2ce268387f27f59404
-  data.tar.gz: 3bbbb4f465143a199a585313fbb118cc2517ca63a47cbfd2ff6d8f27c0310cf9
+  metadata.gz: be2ed59cc5913ed2c104fdd03479643b39183682a8e17d977d2afb6a6617cc1f
+  data.tar.gz: 38fa43ef39ca71510411b98a492d332f71d3ec4d234e4ccb3cbfc987c5d548bb
 SHA512:
-  metadata.gz: dee30eacb6d886527e49813809b03a505c0f75a2bf1582bf9da97253ec45cdf852ba9510805f12043da72e2531242a2c63675cf26a1ee876f868ecac4a17edce
-  data.tar.gz: aaf678d5931ac11dc684a71878a321b2bd311b6ad4e1b631b199b2a92268ce1a3388ac2dd01eebb5b0c75b60bc6286ee505b3ec68a34692af857cd8fc1dd188e
+  metadata.gz: f5db76444b5bc527f3edc10723f26a0fb230e826473b1426f812494128966bf21391922859f35112546d29ab9fd66ee7d71f4d298736d6b67359a4df7d2ebf69
+  data.tar.gz: 7d3fc23fab73965d54475bbc7b0be492b746eb8f351cc4123ee4f8b8870bc4c572634e2f37340649ab2d529ff39054f1faccadc82707204e1c754911e863334a

data/lib/metanorma/standoc/blocks.rb

@@ -212,7 +212,6 @@ module Metanorma
         noko do |xml|
           xml.passthrough **attr_code(formats:
                                       node.attr("format") || "metanorma") do |p|
-            # p << @c.encode(@c.decode(node.content), :basic, :hexadecimal)
             p << @c.encode(node.content, :basic, :hexadecimal)
           end
         end

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -7,6 +7,19 @@ module Metanorma
         bibdata_embed_hdr_cleanup(xmldoc) # feeds bibdata_embed_id_cleanup
         bibdata_embed_id_cleanup(xmldoc)
         biblio_indirect_erefs(xmldoc, @internal_eref_namespaces&.uniq)
+        coverpage_images(xmldoc)
+      end
+
+      def coverpage_images(xmldoc)
+        %w(coverpage-image innercoverpage-image tocside-image
+           backpage-image).each do |n|
+             xmldoc.xpath("//bibdata/ext/#{n}").each do |x|
+               ins = add_misc_container(xmldoc)
+               ins << "<presentation-metadata><name>#{n}</name>" \
+                      "<value>#{x.remove.children.to_xml}</value>" \
+                      "</presentation-metadata>"
+             end
+           end
       end
 
       def bibdata_anchor_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -25,7 +25,7 @@ module Metanorma
       end
 
       def norm_ref_boilerplate_insert_location(ref)
-        while (n = ref.parent) && %w(clause references).include?(n&.name)
+        while (n = ref.parent) && %w(clause references).include?(n.name)
           n.elements.detect do |e|
             !%(title references).include?(e.name) &&
               !e.at("./self::clause[@type = 'boilerplate']") &&
@@ -113,6 +113,7 @@ module Metanorma
       def merge_boilerplate_files(built_in, user_add)
         %w(copyright license legal feedback).each do |w|
           resolve_boilerplate_statement(built_in, user_add, w)
+          resolve_boilerplate_append(built_in, user_add, w)
         end
         to_xml(built_in)
       end
@@ -126,6 +127,26 @@ module Metanorma
         end
       end
 
+      def resolve_boilerplate_append(built_in, user_add, statement)
+        b = user_add.at("./#{statement}-statement-append") or return
+        if a = built_in.at("./#{statement}-statement")
+          resolve_boilerplate_append1(a, b, statement)
+        else
+          b.name = "#{statement}-statement"
+          built_in << b
+        end
+      end
+
+      def resolve_boilerplate_append1(built_in, user_add, statement)
+        if user_add.at("./clause") then built_in << user_add.children
+        else
+          user_add.name = "clause"
+          user_add["id"].nil? || uuid?(user_add["id"]) and
+            user_add["id"] = "_boilerplate-#{statement}-statement-append"
+          built_in << user_add
+        end
+      end
+
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")
         /\.adoc$/.match?(file) and
@@ -139,7 +160,6 @@ module Metanorma
         boilerplate_file_restructure(file)
       end
 
-      # If Asciidoctor, convert top clauses to tags and wrap in <boilerplate>
       def boilerplate_file_restructure(file)
         ret = adoc2xml(file, backend.to_sym)
         boilerplate_xml_cleanup(ret)
@@ -165,7 +185,8 @@ module Metanorma
 
       def boilerplate_top_elements(xml)
         xml.elements.each do |e|
-          (t = e.at("./title") and /-statement$/.match?(t.text)) or next
+          (t = e.at("./title") and
+           /-statement(-append)?$/.match?(t.text)) or next
           e.name = t.remove.text
           e.keys.each { |a| e.delete(a) } # rubocop:disable Style/HashEachMethods
         end

data/lib/metanorma/standoc/front.rb

@@ -1,5 +1,4 @@
 require "date"
-require "nokogiri"
 require "htmlentities"
 require "pathname"
 require_relative "./front_contributor"
@@ -91,9 +90,7 @@ module Metanorma
           a == "date" || /^date_\d+$/.match(a) or next
           type, date = node.attr(a).split(/ /, 2)
           type or next
-          xml.date(type:) do |d|
-            d.on date
-          end
+          xml.date(type:) { |d| d.on date }
         end
       end
 
@@ -126,8 +123,7 @@ module Metanorma
 
       def relation_normalise(type)
         type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From")
-          .sub(/-in$/, "In")
-          .sub(/^has-([a-z])/) { "has#{$1.upcase}" }
+          .sub(/-in$/, "In").sub(/^has-([a-z])/) { "has#{$1.upcase}" }
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
@@ -193,6 +189,7 @@ module Metanorma
         metadata_flavor(node, ext)
         metadata_committee(node, ext)
         metadata_ics(node, ext)
+        metadata_coverpage_images(node, ext)
       end
 
       def metadata_doctype(node, xml)
@@ -220,9 +217,9 @@ module Metanorma
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
-            t << (Metanorma::Utils::asciidoc_sub(node.attr("title") ||
-                                                 node.attr("title-en")) ||
-            node.title)
+            title = Metanorma::Utils::asciidoc_sub(node.attr("title") ||
+                                                 node.attr("title-en"))
+            t << (title || node.title)
           end
         end
       end
@@ -234,6 +231,17 @@ module Metanorma
           xml.title v, { language: titlelang, format: "text/plain" }
         end
       end
+
+      def metadata_coverpage_images(node, xml)
+        %w(coverpage-image innercoverpage-image tocside-image
+           backpage-image).each do |n|
+          if a = node.attr(n)
+            xml.send n do |c|
+              a.split(",").each { |x| c.image src: x }
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">

data/lib/metanorma/standoc/ref.rb

@@ -110,10 +110,10 @@ module Metanorma
 
       def refitem_render1(match, code, bib)
         refitem_uri(code, bib)
-        # code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
-        docid(bib, match[:usrlbl]) if match[:usrlbl]
-        docid(bib, code[:usrlabel]) if code[:usrlabel]
-        i = code[:id] and docid(bib, /^\d+$/.match?(i) ? "[#{i}]" : i)
+        match[:usrlbl] and docid(bib, match[:usrlbl])
+        code[:usrlabel] and docid(bib, code[:usrlabel])
+        i = code[:id] and
+          docid(bib, /^\d+$/.match?(i) ? "[#{i}]" : i, code[:type])
         code[:type] == "repo" and
           bib.docidentifier code[:key], type: "repository"
       end

data/lib/metanorma/standoc/ref_utility.rb

@@ -39,11 +39,12 @@ module Metanorma
         ref
       end
 
-      def docid(bib, code)
+      def docid(bib, code, codetype = nil)
         type, code1 = if /^\[\d+\]$|^\([^)]+\).*$/.match?(code)
                         ["metanorma", mn_code(code)]
-                      else
-                        @bibdb&.docid_type(code) || [nil, code]
+                      elsif %w(attachment repo path).include?(codetype)
+                        [nil, code]
+                      else @bibdb&.docid_type(code) || [nil, code]
                       end
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
         bib.docidentifier **attr_code(type:) do |d|
@@ -111,7 +112,7 @@ module Metanorma
         line = CSV.parse_line(m[:keys], liberal_parsing: true) or return ret
         line.size > 1 or return ret
         ret[:id] = line.first
-        ret[m[:type].to_sym] = line[1..-1].map(&:strip)
+        ret[m[:type].to_sym] = line[1..].map(&:strip)
         ret
       end
 

data/lib/metanorma/standoc/section.rb

@@ -24,7 +24,7 @@ module Metanorma
         ret1 = preface_main_filter(sectiontype_streamline(ret), node)
         ret1 == "symbols and abbreviated terms" and return ret1
         !level || node.level == 1 || node.attr("heading") or return nil
-        @seen_headers.include? ret and return nil
+        !node.attr("heading") && @seen_headers.include?(ret) and return nil
         @seen_headers << ret unless ret1.nil?
         @seen_headers_canonical << ret1 unless ret1.nil?
         ret1

data/lib/metanorma/standoc/utils.rb

@@ -112,9 +112,17 @@ module Metanorma
       def adoc2xml(text, flavour)
         Nokogiri::XML(text).root and return text
         f = @flush_caches ? ":flush-caches:\n" : ""
-        c = Asciidoctor.convert("= X\nA\n:semantic-metadata-headless: true\n" \
-                                ":no-isobib:\n#{f}:novalid:\n\n#{text}\n",
-                                backend: flavour, header_footer: true)
+        doc = <<~ADOC
+          = X
+          A
+          :semantic-metadata-headless: true
+          :no-isobib:
+          #{f}:novalid:
+          :!sectids:
+
+          #{text}
+        ADOC
+        c = Asciidoctor.convert(doc, backend: flavour, header_footer: true)
         Nokogiri::XML(c).at("//xmlns:sections")
       end
 
@@ -141,6 +149,11 @@ module Metanorma
         @refids.include? ref
       end
 
+      def uuid?(ref)
+        /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
+          .match?(ref)
+      end
+
       module_function :adoc2xml
 
       class EmptyAttr

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.9.9".freeze
+    VERSION = "2.10.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.11.0"
+  spec.add_dependency "isodoc", "~> 2.12.1"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.9
+  version: 2.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement