metanorma-generic 2.7.0 → 2.7.2

data/lib/metanorma/generic/converter.rb

@@ -2,6 +2,8 @@ require "asciidoctor"
 require "metanorma/standoc/converter"
 require "fileutils"
 require_relative "front"
+require "metanorma"
+require "pathname"
 
 module Metanorma
   module Generic
@@ -20,20 +22,17 @@ module Metanorma
       end
 
       def baselocation(loc)
-        return nil if loc.nil?
-
+        loc.nil? and return nil
         return loc
-        File.expand_path(File.join(File.dirname(
-                                     self.class::_file || __FILE__,
-                                   ), "..", "..", "..", loc))
       end
 
       def docidentifier_cleanup(xmldoc)
+        b = boilerplate_isodoc(xmldoc) or return
         template = configuration.docid_template ||
           "{{ organization_name_short }} {{ docnumeric }}"
         docid = xmldoc.at("//bibdata/docidentifier")
         docid&.text&.empty? or return
-        id = boilerplate_isodoc(xmldoc).populate_template(template, nil)
+        id = b.populate_template(template, nil)
         (id.empty? and docid.remove) or docid.children = id
       end
 
@@ -58,6 +57,10 @@ module Metanorma
       def read_config_file(path_to_config_file)
         Metanorma::Generic.configuration
           .set_default_values_from_yaml_file(path_to_config_file)
+        # reregister Processor to Metanorma with updated values
+        if defined? Metanorma::Registry
+          Metanorma::Registry.instance.register(Metanorma::Generic::Processor)
+        end
       end
 
       def sectiontype_streamline(ret)
@@ -75,7 +78,12 @@ module Metanorma
       end
 
       def document(node)
-        read_config_file(node.attr("customize")) if node.attr("customize")
+        if node.attr("customize")
+          p = node.attr("customize")
+          (Pathname.new p).absolute? or
+            p = File.expand_path(File.join(Metanorma::Utils::localdir(node), p))
+          read_config_file(p)
+        end
         super
       end
 
@@ -158,7 +166,7 @@ module Metanorma
       end
 
       def boilerplate_isodoc(xmldoc)
-        conv = super
+        conv = super or return nil
         Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
           conv.meta.set(a, configuration.send(a))
         end