metanorma 2.2.5 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee757a450ef1caa019c1056ca59afffa9863efc120db0de188a43ccb496b13c
-  data.tar.gz: 775d0d85000f8f1f10cb07941f36212cbcdb5b15b627f661ac79e0f908c433fd
+  metadata.gz: 1b9a1d97703df1ebbf3b6f803afdb93550cd9bb9bda68978a29119d2fa734687
+  data.tar.gz: 1eb0d1a3effe2cc9ca6728eaa65b460cff0ddb3ceb2f43b7610eb249bee3f66a
 SHA512:
-  metadata.gz: 7c2e2dd299f1da646b0044fee1c8b38059bb1d24d1f050fbf934e42d7979a4211ee81bf33d1e74457ccc0565931015192748ba12b0ed707487e4ea2ff9ec7b44
-  data.tar.gz: 4162cd868860658758fbb8c1ed48a95a037bbaabb23dc6c117923647830fea37ecf0abb7561cb47b3021ca20609eeacc4d5a6846dc752492530a9891b20d9495
+  metadata.gz: 5d61028ef6bbcab315a1616e47ecea392f4537f34e7a439d21e95e3e252f36f28d30c6b244979a0b8374dc48c3e2d053289b8afdb4a57dbb5c88703355169509
+  data.tar.gz: e9f9044bfffc22eff4c26a01798252a2fabe49971f227da736bbc9dd561eb273bce8d2f737b6b189f19e35f0cda98894c968cadd6ad534571a937520b5e9cf92

data/lib/metanorma/collection/collection.rb

@@ -1,5 +1,4 @@
-require "relaton"
-require "relaton/cli"
+require "relaton-cli"
 require "metanorma-utils"
 require_relative "util/util"
 require_relative "util/disambig_files"

data/lib/metanorma/collection/log.rb

@@ -0,0 +1,17 @@
+module Metanorma
+  class Collection
+    METANORMA_LOG_MESSAGES = {
+      # rubocop:disable Naming/VariableNumber
+      "METANORMA_1": { category: "Cross-References",
+                       error: "Missing cross-reference: %s",
+                       severity: 2 },
+      "METANORMA_2": { category: "Cross-References",
+                       error: "[metanorma] Cannot find crossreference to document %s in document %s.",
+                       severity: 2 },
+      "METANORMA_3": { category: "Cross-References",
+                       error: "<strong>** Unresolved reference to document %s from eref</strong>",
+                       severity: 2 },
+    }.freeze
+    # rubocop:enable Naming/VariableNumber
+  end
+end

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

@@ -34,16 +34,14 @@ module Metanorma
         ret
       end
 
-=begin        
-      def allowed_extension_keys
-        ret = @format.dup
-        @directives.detect { |d| d.key == "individual-pdf" } or
-          ret.delete(:pdf)
-        @directives.detect { |d| d.key == "individual-doc" } or
-          ret.delete(:doc)
-        ret
-      end
-=end        
+      #       def allowed_extension_keys
+      #         ret = @format.dup
+      #         @directives.detect { |d| d.key == "individual-pdf" } or
+      #           ret.delete(:pdf)
+      #         @directives.detect { |d| d.key == "individual-doc" } or
+      #           ret.delete(:doc)
+      #         ret
+      #       end
 
       def file_compile_formats(filename, identifier, opts)
         f = @files.get(identifier, :outputs)
@@ -150,7 +148,7 @@ module Metanorma
           ids.each do |id, key|
             key and next
             refs[schema][id] = "Missing:#{schema}:#{id}"
-            @log&.add("Cross-References", nil, refs[schema][id])
+            @log&.add("METANORMA_1", nil, params: [refs[schema][id]])
           end
         end
         refs

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

@@ -9,6 +9,7 @@ require_relative "utils"
 require_relative "render_word"
 require_relative "navigation"
 require_relative "svg"
+require_relative "../log"
 
 module Metanorma
   class Collection
@@ -53,6 +54,7 @@ module Metanorma
         @compile_options = options[:compile] || {}
         @compile_options[:install_fonts] = true if options[:install_fonts]
         @log = options[:log]
+        @log&.add_msg(METANORMA_LOG_MESSAGES)
         @bibdata = collection.bibdata
         @documents = collection.documents
         @bibdatas = collection.documents

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

@@ -119,7 +119,7 @@ module Metanorma
       def fail_update_bibitem(docid, identifier)
         error = "[metanorma] Cannot find crossreference to document #{docid} " \
                 "in document #{identifier}."
-        @log&.add("Cross-References", nil, error)
+        @log&.add("METANORMA_2", nil, params: [docid, identifier])
         ::Metanorma::Util.log(error, :warning)
       end
 
@@ -206,7 +206,7 @@ module Metanorma
             "from eref</strong>"
           e << msg
           strip_eref(e)
-          @log&.add("Cross-References", e, msg)
+          @log&.add("METANORMA_3", e, params: [docid])
         end
       end
 

data/lib/metanorma/compile/compile.rb

@@ -50,9 +50,7 @@ module Metanorma
       @processor = @registry.find_processor(options[:type].to_sym)
 
       # Step 1: Generate Semantic XML
-      semantic_result = generate_semantic_xml(filename, options)
-      return nil unless semantic_result
-
+      semantic_result = generate_semantic_xml(filename, options) or return nil
       source_file, semantic_xml = semantic_result
 
       # Step 2: Prepare output paths
@@ -62,20 +60,16 @@ module Metanorma
 
       # Step 3: Determine which output formats to generate
       extensions = get_extensions(options)
-      @extensions = extensions  # Capture extensions for later access
-      return nil unless extensions
+      @extensions = extensions # Capture extensions for later access
+      extensions or return nil
 
       # Step 4: Extract information from Semantic XML if requested
       extract_information(semantic_xml, bibdata, options)
 
       # Step 5: Generate output formats from Semantic XML
       generate_outputs(
-        source_file,
-        semantic_xml,
-        bibdata,
-        extensions,
-        output_paths,
-        options,
+        source_file, semantic_xml, bibdata, extensions, output_paths,
+        options
       )
     ensure
       clean_exit(options)
@@ -125,9 +119,7 @@ module Metanorma
                    config.generate_filename(drop)
                  end
       @output_filename = OutputFilename.new(
-        basename,
-        options[:output_dir],
-        @processor,
+        basename, options[:output_dir], @processor
       )
       {
         xml: @output_filename.semantic_xml,
@@ -142,13 +134,10 @@ module Metanorma
     def extract_information(semantic_xml, bibdata, options)
       # Extract Relaton bibliographic data
       export_relaton_from_bibdata(bibdata, options) if options[:relaton]
-
       # Extract other components (sourcecode, images, requirements)
       if options[:extract]
         Extract.extract(
-          semantic_xml,
-          options[:extract],
-          options[:extract_type],
+          semantic_xml, options[:extract], options[:extract_type]
         )
       end
     end
@@ -242,13 +231,29 @@ module Metanorma
     #   e.g., { html: "html", doc: "doc", pdf: "pdf" }
     # @return [Hash] empty hash if extensions haven't been captured yet
     def output_format_mapping
-      return {} unless @extensions && @processor
-      
+      @extensions && @processor or return {}
       @extensions.each_with_object({}) do |ext, mapping|
         if @processor.output_formats[ext]
           mapping[ext] = @processor.output_formats[ext]
         end
       end
     end
+
+    def process_compile_dummy(flavor)
+      file = Tempfile.new(%w(tmp .adoc))
+      file.write <<~OUTPUT
+        Document Title
+        :flavor: #{flavor}
+        :mn-output-extensions: xml, presentation
+
+      OUTPUT
+      file.close
+      compile(file.path, {})
+    end
+
+    def extract_log_messages(flavor)
+      process_compile_dummy(flavor)
+      @log.display_messages
+    end
   end
 end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.2.5".freeze
+  VERSION = "2.2.7".freeze
 end

data/metanorma.gemspec

@@ -26,20 +26,19 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "concurrent-ruby"
-  spec.add_runtime_dependency "fontist", ">= 1.14.3"
+  spec.add_runtime_dependency "fontist", "~> 1.14"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "isodoc", ">= 3.0.0"
   spec.add_runtime_dependency "metanorma-taste", "~> 0.1.0"
   spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
 
-  # get relaton-cli to avoid circular reference with metanorma-standoc
-  # spec.add_dependency "relaton-cli"
-  # spec.add_dependency "metanorma-standoc"
+  # relaton-cli is required by Metanorma::Collection
+  spec.add_dependency "relaton-cli"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml"
-  spec.add_development_dependency "metanorma-iso"
+  spec.add_development_dependency "metanorma-iso", ">= 3.2.0"
   spec.add_development_dependency "mnconvert"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0"
@@ -49,5 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "canon"
+  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -42,16 +42,16 @@ dependencies:
   name: fontist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
+  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: debug
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -294,16 +308,16 @@ dependencies:
   name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -338,6 +352,7 @@ files:
 - lib/metanorma/collection/document/document.rb
 - lib/metanorma/collection/filelookup/filelookup.rb
 - lib/metanorma/collection/filelookup/filelookup_sectionsplit.rb
+- lib/metanorma/collection/log.rb
 - lib/metanorma/collection/manifest/manifest.rb
 - lib/metanorma/collection/multilingual/multilingual.rb
 - lib/metanorma/collection/renderer/fileparse.rb