pandocomatic 0.1.4.16 → 0.1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c02545012823b03faea6b75bd1eefe4f0321f87
-  data.tar.gz: e20c1f0fb820d2372a549bdeae47b8ef97207e9c
+  metadata.gz: 669fe6e3844e2170de209386538ff5909cac12d8
+  data.tar.gz: 6b41c8276434a97794aefaee5d794169c45d7faf
 SHA512:
-  metadata.gz: dffc42a133303448e4e0fb8c2921231b5c59de5b50b2506e1babdc8b4499f11d724e48615f60cd0449206e26bf6dbc69d97933bea6efd195a1c8b16445dc9598
-  data.tar.gz: c7f3608f963daa702eeec4f3203bf8eba373f31aae316fafe9bdee1d3bd4cbccbff00137c6cb2758e24ddfd82512e0feca30143b766dc1bc3ff286dd3cbb9794
+  metadata.gz: 6689d68e033804995c5dd2acd1640eedd58bd2fcf520d18fa57bfebb5c5623d1120fc2bd5dee5d26307744760837f7041baca2e0266118d3071c5e9ad133407d
+  data.tar.gz: 3e1d7b12546a38a39b55e1c6a3c4b0b3045a7a2c048a2b9f9b444fa639c0e8bf48278132bf61626c577bc3761dc2f8479040add8b11318aab508f8afb2df39d5

data/lib/pandocomatic/command/convert_file_command.rb

@@ -102,16 +102,7 @@ module Pandocomatic
                 raise ConfigurationError.new(:no_such_template, nil, @template_name) unless @config.has_template? @template_name
                 template = @config.get_template @template_name
 
-                pandoc_options = (template['pandoc'] || {}).merge(pandoc_options) do |key, oldval, newval| 
-                    # Options that can occur more than once, such as 'filter' or
-                    # 'metadata' are merged, not replaced like options that can occur
-                    # only once, such as 'toc' or 'from'
-                    if oldval.is_a? Array
-                        oldval + newval
-                    else
-                        newval
-                    end
-                end
+                pandoc_options = Configuration.extend_value(pandoc_options, template['pandoc'])
             end
 
             # Run setup scripts
@@ -195,7 +186,7 @@ module Pandocomatic
                 
                 # There is no "pdf" output format; change it to latex but keep the
                 # extension.
-                value = "latex" if option == "to" and value == "pdf"
+                value = determine_output_for_pdf(options) if option == "to" and value == "pdf"
 
                 begin
                     # Pandoc multi-word options can have the multiple words separated by
@@ -265,5 +256,32 @@ module Pandocomatic
                 input
             end
         end
+
+        private
+
+
+        # Pandoc version 2 supports multiple pdf engines. Determine which
+        # to use given the options.
+        #
+        # @param options [Hash] the options to a paru pandoc converter
+        # @return [String] the output format for the pdf engine to use.
+        def determine_output_for_pdf(options)
+            if options.has_key? 'pdf-engine'
+                engine = options['pdf-engine']
+                case engine
+                when 'context'
+                    'context'
+                when 'pdfroff'
+                    'ms'
+                when 'wkhtmltopdf', 'weasyprint', 'prince'
+                    'html'
+                else
+                    'latex'
+                end
+            else
+                # According to pandoc's manual, the default is LaTeX
+                'latex'
+            end
+        end
     end
 end

data/lib/pandocomatic/configuration.rb

@@ -34,7 +34,8 @@ module Pandocomatic
         'markdown_github' => 'md',
         'html5' => 'html',
         'docx' => 'docx',
-        'latex' => 'tex'
+        'latex' => 'tex',
+        'context' => 'tex'
     }
 
     # A Configuration object models a pandocomatic configuration.
@@ -258,7 +259,7 @@ module Pandocomatic
         def update_path(path, src_dir, check_executable = false)
             updated_path = path
             if path.start_with? './' 
-                # refers to a local (to file) dir
+                # refers to a local dir
                 updated_path = File.join src_dir, path
             else
                 if path.start_with? '/'
@@ -278,68 +279,6 @@ module Pandocomatic
             updated_path
         end
 
-        private 
-
-        # Reset the settings for pandocomatic based on a new settings Hash
-        #
-        # @param settings [Hash] the new settings to use to reset the settings in
-        #   this Configuration with.
-        def reset_settings(settings)
-            settings.each do |setting, value|
-                case setting
-                when 'skip'
-                    @settings['skip'] = @settings['skip'].concat(value).uniq
-                when 'data-dir'
-                    next # skip data-dir setting; is set once in initialization
-                else
-                    @settings[setting] = value
-                end
-            end
-        end
-
-        # Deep copy a template
-        #
-        # @param template [Hash]  the template to clone
-        # @return [Hash]
-        def clone_template(template)
-            Marshal.load(Marshal.dump(template))
-        end
-
-        # Merge two templates
-        #
-        # @param base_template [Hash] the base template
-        # @param mixin_template [Hash] the template to mixin into the base template
-        # @return [Hash] the merged templates
-        def merge(base_template, mixin_template)
-            if mixin_template['extends'] and mixin_template['extends'].is_a? String
-                mixin_template['extends'] = [mixin_template['extends']]
-            end
-
-            fields = [
-                'glob', 
-                'metadata',
-                'setup', 
-                'preprocessors', 
-                'pandoc', 
-                'postprocessors', 
-                'cleanup'
-            ]
-            
-            fields.each do |field|
-                parent = base_template[field]
-                current = mixin_template[field]
-                extended_value = extend_value current, parent
-
-                if extended_value.nil?
-                    base_template.delete field
-                else
-                    base_template[field] = extended_value
-                end
-            end
-
-            base_template
-        end
-
         # Extend the current value with the parent value. Depending on the
         # value and type of the current and parent values, the extension
         # differs.
@@ -357,7 +296,7 @@ module Pandocomatic
         # @param current [Object] the current value
         # @param parent [Object] the parent value the current might extend
         # @return [Object] the extended value
-        def extend_value(current, parent)
+        def self.extend_value(current, parent)
             if parent.nil?
                 # If no parent value is specified, the current takes
                 # precedence
@@ -374,7 +313,7 @@ module Pandocomatic
                             # Mixin current and parent values
                             parent.each_pair do |property, value|
                                 if current.has_key? property
-                                    extended_value = extend_value(current[property], value)
+                                    extended_value = Configuration.extend_value(current[property], value)
                                     if extended_value.nil?
                                         current.delete property
                                     else
@@ -426,6 +365,68 @@ module Pandocomatic
             end
         end
 
+        private 
+
+        # Reset the settings for pandocomatic based on a new settings Hash
+        #
+        # @param settings [Hash] the new settings to use to reset the settings in
+        #   this Configuration with.
+        def reset_settings(settings)
+            settings.each do |setting, value|
+                case setting
+                when 'skip'
+                    @settings['skip'] = @settings['skip'].concat(value).uniq
+                when 'data-dir'
+                    next # skip data-dir setting; is set once in initialization
+                else
+                    @settings[setting] = value
+                end
+            end
+        end
+
+        # Deep copy a template
+        #
+        # @param template [Hash]  the template to clone
+        # @return [Hash]
+        def clone_template(template)
+            Marshal.load(Marshal.dump(template))
+        end
+
+        # Merge two templates
+        #
+        # @param base_template [Hash] the base template
+        # @param mixin_template [Hash] the template to mixin into the base template
+        # @return [Hash] the merged templates
+        def merge(base_template, mixin_template)
+            if mixin_template['extends'] and mixin_template['extends'].is_a? String
+                mixin_template['extends'] = [mixin_template['extends']]
+            end
+
+            fields = [
+                'glob', 
+                'metadata',
+                'setup', 
+                'preprocessors', 
+                'pandoc', 
+                'postprocessors', 
+                'cleanup'
+            ]
+            
+            fields.each do |field|
+                parent = base_template[field]
+                current = mixin_template[field]
+                extended_value = Configuration.extend_value current, parent
+
+                if extended_value.nil?
+                    base_template.delete field
+                else
+                    base_template[field] = extended_value
+                end
+            end
+
+            base_template
+        end
+
         # Resolve the templates the templates extends and mixes them in, in
         # order of occurrence.
         #

data/lib/pandocomatic/pandocomatic.rb

@@ -50,7 +50,7 @@ module Pandocomatic
         ERROR_STATUS = 1266 # This is the sum of the ascii values of the characters in 'pandocomatic'
 
         # Pandocomatic's current version
-        VERSION = [0, 1, 4, 16]
+        VERSION = [0, 1, 4, 17]
 
         # Pandocomatic's default configuration file
         CONFIG_FILE = 'pandocomatic.yaml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.4.16
+  version: 0.1.4.17
 platform: ruby
 authors:
 - Huub de Beer
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - pandoc, a universal document converer <http://pandoc.org>
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Automating the use of pandoc