metanorma-standoc 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c0e218fd82abc53141b42753ee4cbc14956ee9ccc75f1e8115bf91ac6a0eb6
-  data.tar.gz: 532c96be450bb8f4a234ec5f6cd6c032d71fe89e20ad46e1f48195137b108c94
+  metadata.gz: 77911b09eea6861ff4b3614ba4de12829fd8955161d1aa8b8e917778ed9d3ac4
+  data.tar.gz: 11c749162a35a458a4cfa4c963a68a6e24f535c1fc4e943599966459612078ca
 SHA512:
-  metadata.gz: bab6d097fc885f64299d90ceed88dc475c951ff7c916f176e504aaca63336b69e62bb12c48059004fe757200a448a15fd4c798ffcd2e7f9b7c04444259431799
-  data.tar.gz: 6acb021a5f5348caa7c625db4d54a9a2af9e26e1720318cdd77a54c77bc0c734109c600d96a95d2a5a161bc5eb28f6db2336f06dee75bd896733fef8a600f1bf
+  metadata.gz: 24a4fb2005f50f620eaba63e869c86939066445938c74ea3c6df18c6b7a18f7d42cf1997b0ae50dd4adbe7d6bd03f2b4bec6270fb9f41676d4e94e97626160da
+  data.tar.gz: 5cb4f03fa198dd33054e7e81cbc8de074b8cd05a73cee3de4e68ec7e596db08ae17d46c2b1dd8837e2959789f9cfbf80c5ba00e1cc2709c30b26703a052eef3e

data/lib/metanorma/standoc/base.rb

@@ -40,7 +40,6 @@ module Metanorma
       end
 
       def init_vars
-        @log = Metanorma::Utils::Log.new # for error reporting downstream
         @fn_number ||= 0
         @refids = Set.new
         @anchor_alias = {}
@@ -179,7 +178,8 @@ module Metanorma
       end
 
       def clean_exit
-        @novalid or @log.write("#{@output_dir}#{@filename}.err.html")
+        !@novalid && @local_log and
+          @log.write("#{@output_dir}#{@filename}.err.html")
         @files_to_delete.each { |f| FileUtils.rm f }
       end
 

data/lib/metanorma/standoc/converter.rb

@@ -21,6 +21,7 @@ module Metanorma
     # schema encapsulation of the document for validation
     class Converter
       Asciidoctor::Extensions.register do
+        preprocessor Metanorma::Standoc::ResolveIncludePreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlAttributesTablePreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlDatamodelDescriptionPreprocessor
@@ -100,6 +101,10 @@ module Metanorma
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
         @c = HTMLEntities.new
+        unless opts && @log = opts[:document]&.options&.dig(:log)
+          @log = Metanorma::Utils::Log.new
+          @local_log = true
+        end
       end
 
       class << self

data/lib/metanorma/standoc/macros_embed.rb

@@ -2,14 +2,37 @@ require "pathname"
 
 module Asciidoctor
   class PreprocessorNoIfdefsReader < PreprocessorReader
-    def preprocess_conditional_directive(keyword, target, delimiter, text)
+    private
+
+    def preprocess_conditional_directive(_keyword, _target, _delimiter, _text)
       false # decline to resolve idefs
     end
+
+    def resolve_include_path(expanded_target, attrlist, parsed_attrs)
+      inc_path, target_type, relpath = super
+      if inc_path && !%i(file uri).include?(target_type)
+        # include has been skipped because of error
+        n = peek_line(true)
+        /^Unresolved directive in/.match?(n) and
+          @document.converter.log
+            &.add("Include", nil,
+                  HTMLEntities.new.encode(n, :basic), severity: 0)
+      end
+      [inc_path, target_type, relpath]
+    end
   end
 end
 
 module Metanorma
   module Standoc
+    # resolve all includes before doing any further preprocessing
+    class ResolveIncludePreprocessor < Asciidoctor::Extensions::Preprocessor
+      def process(doc, reader)
+        r = ::Asciidoctor::PreprocessorNoIfdefsReader.new doc, reader.lines
+        ::Asciidoctor::PreprocessorNoIfdefsReader.new doc, r.readlines
+      end
+    end
+
     class EmbedIncludeProcessor < Asciidoctor::Extensions::Preprocessor
       def process(doc, reader)
         reader.eof? and return reader
@@ -44,12 +67,12 @@ module Metanorma
         reader = ::Asciidoctor::PreprocessorReader.new doc
         b = Pathname.new doc.base_dir
         ret.reverse.each do |l|
-          if l[:file]
-            new = Pathname.new(l[:path]).relative_path_from(b).to_s
-            #reader.push_include l[:lines], new, l[:path]
-            reader.unshift_lines l[:lines]
-          else reader.unshift_lines l[:lines]
-          end
+          # if l[:file]
+          # new = Pathname.new(l[:path]).relative_path_from(b).to_s
+          # reader.push_include l[:lines], new, l[:path]
+          reader.unshift_lines l[:lines]
+          # else reader.unshift_lines l[:lines]
+          # end
         end
         reader
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.3".freeze
+    VERSION = "2.8.4".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.4
 platform: ruby
 authors:
 - Ribose Inc.