pandocomatic 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f44c7b8261cd7c59a45102a8fe11a1cbb2202eaed96effff33ced0a4bf50fb8
-  data.tar.gz: 437ad6925e13b168a2980fb883574bd68b6cc14c722d8dfcb44fd39b46a42fcc
+  metadata.gz: 62eb423834e4ee9d18dae3579abbac138fc72ebe470825aa650d196e8d54bf2c
+  data.tar.gz: 29954c2b25756e0bef9e544b15eecd054ed74dc29b69edef36a4c13ae0bc4648
 SHA512:
-  metadata.gz: 4e88c0ae54973b4dbed104edf17936193cfb763ee322ab9afb4bf1596fa7df0d6f7f437e129870f8795ad8855e33b513d432f28185fe071072b287b73a0061db
-  data.tar.gz: 45c9438e591086e856d216eeb696e28f7daf7af6fae56dae259610a651cb78c6fefc7d9826f5e00c57da3950a0db20c7067f6e4ac6e1eb88bcad94f49c79188e
+  metadata.gz: 1aa1b36d0421c54a411fbc32bd3649e64d30c38f241eb06d581384d2ce692d8d67a79e04484ac26dbea7f2d7d11abd6ee9ed27abfe674348911a0f212c2c246b
+  data.tar.gz: bca6dab5766f7208b2e53061f543edc619dbf1e3d097444d1375a71e5dea090c14dfe6a4dff453409cb3cab6e91676d53aae61b7e7a358bcca96aedaec009465

data/lib/pandocomatic/command/convert_file_command.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright 2017-2025, Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2017-2026, Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of pandocomatic.
 #
@@ -165,14 +165,14 @@ module Pandocomatic
              '"--enable pandoc-verbose".'
       end
 
-      template_log = Pandocomatic::LOG.indent(YAML.dump(template.to_h).sub('---', ''), 34)
-
       if @metadata.pandocomatic?
         template.merge! Template.new(INTERNAL_TEMPLATE, @metadata.pandocomatic)
+        template_log = Pandocomatic::LOG.indent(YAML.dump(template.to_h).sub('---', ''), 34)
 
         Pandocomatic::LOG.debug '  #  Selected template mixed with internal template and pandocomatic metadata ' \
                                 "gives final template:#{template_log}"
       else
+        template_log = Pandocomatic::LOG.indent(YAML.dump(template.to_h).sub('---', ''), 34)
         Pandocomatic::LOG.debug "  #  Selected template:#{template_log}"
       end
 

data/lib/pandocomatic/configuration.rb

@@ -2,7 +2,7 @@
 
 # rubocop:disable Metrics
 #--
-# Copyright 2014—2025 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2014—2026 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of pandocomatic.
 #
@@ -486,8 +486,9 @@ module Pandocomatic
           src_format = PANDOCS_EXTENSION_TO_FORMAT_MAPPING[src_extension]
         end
 
-        if !src_format || src_format == 'markdown'
-          # Behave like pandoc: If no source format can be determined, assume markdown
+        if !src_format || src_format.match?(/markdown(((\+|-).+)|$)/)
+          # Behave like pandoc: If no source format can be determined, assume markdown.
+          # If format is markdown, ignore any extensions.
           PandocMetadata.load_file src, ignore_pandocomatic: use_templates?
         else
           PandocMetadata.empty src_format, ignore_pandocomatic: use_templates?

data/lib/pandocomatic/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright 2023—2025 Huub de Beer <Huub@heerdebeer.org>
+# Copyright 2023—2026 Huub de Beer <Huub@heerdebeer.org>
 #
 # This file is part of pandocomatic.
 #
@@ -20,5 +20,5 @@
 #++
 module Pandocomatic
   # Pandocomatic's current version.
-  VERSION = [2, 2, 0].freeze
+  VERSION = [2, 2, 1].freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Huub de Beer