metanorma 2.1.10 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8d17619f5a369f5df52db09ddae40490b5ceb22cd3932e22b8fa382d3bd078d
-  data.tar.gz: b4ecb80e39e4d282b0d1a6ccb6523aeb519b2431211de5510f4fad81f09db04e
+  metadata.gz: 5d66c44fc8123332b449ee23540a8e0d009aa19b5a34f408bca97375f85223b0
+  data.tar.gz: 0227a49a94646c2bd0197fb5d49eabc237a6eb51350809a3f8436c601f41d41c
 SHA512:
-  metadata.gz: 8b8fd5e20992cd0508fbcdb96ce7e4c0b2fca460a9ae1f8b7231ed2e43a4e15f3536fd30b7b717d1c3a00a8065e0064749eff22726c7100aae26301f606a7b69
-  data.tar.gz: 476bd02101c3f23e99b6c414f839e442351adf137ddc2e922c6ae822ea95e7d6f5c66f98f062bfe51299d9ffb28a00f81dd8fefce5f42ac4ba94c39ac8755c32
+  metadata.gz: 503d2edd8d015e341949ab4de920abb7668bc1b13fb7d97697026fddad1ab11d9f94138257cffdd3b57ac32873d606cbe05689bcf8b9e8f7fb3baa19289a7d76
+  data.tar.gz: 41ba35a1a2ad8d740c9b7e3409f0297665c1746e3e461d2b26e2b203d66b09e26fc6bc9f1afebbe26134806a699ac8aa36350d28548629a08a2ae036aa3aa0e3

data/lib/metanorma/collection/config/converters.rb

@@ -6,16 +6,37 @@ module Metanorma
       module Converters
         def bibdata_from_yaml(model, value)
           value and !value.empty? or return
+          force_primary_docidentifier_yaml(value)
           model.bibdata = Relaton::Cli::YAMLConvertor.convert_single_file(value)
         end
 
+        def force_primary_docidentifier_yaml(value)
+          case value["docid"]
+          when Array
+            value["docid"].empty? ||
+              value["docid"].none? do |x|
+                x["primary"] == "true"
+              end or
+              value["docid"].first["primary"] = "true"
+          when Hash
+            value["docid"]["primary"] ||= "true"
+          end
+        end
+
         def bibdata_to_yaml(model, doc)
           doc["bibdata"] = model.bibdata&.to_hash
         end
 
         def bibdata_from_xml(model, node)
-          node and
-            model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
+          node or return
+          force_primary_docidentifier_xml(node.adapter_node)
+          model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
+        end
+
+        def force_primary_docidentifier_xml(node)
+          node.at("//docidentifier[@primary = 'true']") and return node
+          d = node.at("//docidentifier") or return node
+          d["primary"] = "true"
         end
 
         def bibdata_to_xml(model, parent, doc)

data/lib/metanorma/collection/renderer/svg.rb

@@ -11,14 +11,12 @@ module Metanorma
       end
 
       def svgmap_resolve(docxml, docid, presxml)
-        #require "debug"; binding.b
         ids = @files.get(docid, :ids)
         docxml = svg_unnest(svg_datauri(docxml, docid))
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
         tag = presxml ? "fmt-eref" : "eref"
         docxml.xpath(ns("//svgmap//#{tag}")).each do |e|
-        #require "debug"; binding.b
           svgmap_resolve_eref(e, isodoc, docxml, ids, presxml)
         end
         docxml.xpath(ns("//svgmap/target")).each do |t| # undo Presentation XML: Vectory takes eref not fmt-eref

data/lib/metanorma/collection/util/util.rb

@@ -39,8 +39,6 @@ module Metanorma
         def add_suffix_to_attrs(doc, suffix, tag_name, attr_name, isodoc)
           (suffix.nil? || suffix.empty?) and return
           doc.xpath(isodoc.ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
-            #warn "#{tag_name} : #{elem.name}" if attr_name == "bibitemid"
-            #require 'debug'; binding.b if attr_name == "bibitemid" && #!%w(eref fmt-eref link fmt-link).include?(elem.name)
             a = elem.attributes[attr_name].value
             /_#{suffix}$/.match?(a) or
               elem.attributes[attr_name].value = "#{a}_#{suffix}"
@@ -91,6 +89,8 @@ module Metanorma
           isodoc.i18n_init(lang, script, nil) # read in internationalisation
           # TODO locale?
           isodoc.metadata_init(lang, script, nil, isodoc.i18n)
+          isodoc.xref_init(lang, script, nil, isodoc.i18n, {})
+          isodoc.xrefs.klass.meta = isodoc.meta
           isodoc.info(xml, nil)
           isodoc
         end

data/lib/metanorma/compile/compile.rb

@@ -6,6 +6,7 @@ require "htmlentities"
 require "yaml"
 require "fontist"
 require "fontist/manifest/install"
+require "metanorma-taste"
 require_relative "writeable"
 require_relative "validator"
 require_relative "compile_options"
@@ -182,17 +183,11 @@ module Metanorma
       "#{attrs.join("\n")}\n\n#{rest}"
     end
 
-    # TODO: to config
     def process_input_adoc_overrides(attrs, options)
-      case options[:supplied_type]
-      when :icc
-        f = File.join(File.dirname(__FILE__), "assets", "icc-boilerplate.adoc")
-        [":boilerplate-authority: #{f}",
-         ":publisher: International Color Consortium",
-         ":publisher_abbr: ICC"].each { |a| attrs << a }
-        options[":boilerplate-authority:"] = f
-      end
-      attrs
+      @registry.tastes.available_tastes.include?(options[:supplied_type]) or
+        return
+      c = Metanorma::TasteRegister.get(options[:supplied_type])
+      c.process_input_adoc_overrides(attrs, options)
     end
 
     def process_input_adoc_includes(file, filename)

data/lib/metanorma/compile/compile_options.rb

@@ -92,8 +92,7 @@ module Metanorma
 
       def get_isodoc_options(file, options, ext)
         ret = @processor.extract_options(file)
-        dir = options[:filename].sub(%r(/[^/]+$), "/")
-        ret[:i18nyaml] &&= File.join(dir, ret[:i18nyaml])
+        get_isodoc_i18nyaml(options, ret)
         copy_isodoc_options_attrs(options, ret)
         font_manifest_mn2pdf(options, ret, ext)
         ret[:output_formats]&.select! do |k, _|
@@ -103,6 +102,13 @@ module Metanorma
         ret
       end
 
+      def get_isodoc_i18nyaml(options, ret)
+        dir = File.dirname(options[:filename])
+        ret[:i18nyaml] or return
+        (Pathname.new ret[:i18nyaml]).absolute? or
+          ret[:i18nyaml] = File.join(dir, ret[:i18nyaml])
+      end
+
       def copy_isodoc_options_attrs(options, ret)
         ret[:datauriimage] = true if options[:datauriimage]
         ret[:sourcefilename] = options[:filename]

data/lib/metanorma/input/asciidoc.rb

@@ -55,6 +55,7 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
+           pdf-stylesheet pdf-stylesheet-override
            fonts font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
            localize-number iso-word-bg-strip-color modspec-identifier-base)

data/lib/metanorma/registry/registry.rb

@@ -1,6 +1,7 @@
 # Registry of all Metanorma types and entry points
 
 require "singleton"
+require "metanorma-taste"
 
 class Error < StandardError
 end
@@ -9,13 +10,17 @@ module Metanorma
   class Registry
     include Singleton
 
-    attr_reader :processors
+    attr_reader :processors, :tastes
 
     # TODO: make aliases configurable
     def initialize
       @processors = {}
-      @aliases = { csd: :cc, m3d: :m3aawg, mpfd: :mpfa, csand: :csa,
-                   icc: :iso }
+      @tastes = Metanorma::TasteRegister.instance
+      tastealiases = @tastes.available_tastes.each_with_object({}) do |x, m|
+        m[x] = @tastes.taste_info(x)[:base_flavor]
+      end
+      @aliases = { csd: :cc, m3d: :m3aawg, mpfd: :mpfa, csand: :csa }
+        .merge tastealiases
     end
 
     def alias(flavour)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.1.10".freeze
+  VERSION = "2.2.1".freeze
 end

data/metanorma.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "isodoc", ">= 3.0.0"
+  spec.add_runtime_dependency "metanorma-taste"
   spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-taste
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement