awhyte-rtex 2.1.2 → 2.1.3

data/bin/rtex

@@ -41,12 +41,12 @@ opts = OptionParser.new do |opts|
       STDERR.puts "Could not find application at #{path}"
       exit 1
     end
-    plugin_path = File.join(plugins, 'rtex')
-    FileUtils.cp_r(File.dirname(__FILE__) << '/..', plugin_path)
-    %w(Rakefile Manifest.txt bin tasks).each do |prune|
-      FileUtils.rm_rf(File.join(plugin_path, prune)) rescue nil
-    end
-    STDERR.puts "Installed at #{plugin_path}"
+    
+    dest_dir = FileUtils.mkdir_p(File.join(plugins, 'rtex'))
+    plugin_file = File.join(File.dirname(__FILE__), "..", "rails", "init.rb")
+    FileUtils.cp plugin_file, dest_dir
+    
+    STDERR.puts "Installed at #{dest_dir}"
     exit
   end
   

data/lib/rtex/document.rb

@@ -51,6 +51,8 @@ module RTeX
     # [+:tmpdir+] Location of temporary directory (default: +Dir.getwd+)
     # [+:shell_redirect+] Option redirection for shell output, 
     #                     e.g. +"> /dev/null 2>&1"+ (default: +nil+).
+    # [+:command_prefix+] String (or array) of environment variable settings
+    #                     for the +:processor+ and +:preprocessor+ commands.
     #
     def initialize(content, options={})
       @options = self.class.options.merge(options)
@@ -115,10 +117,13 @@ module RTeX
         :processor => 'pdflatex',
         :shell_redirect => nil,
         :tex_inputs => nil,
+        :command_prefix => nil,
         :tempdir => Dir.getwd # Current directory unless otherwise set
       }
     end
     
+    attr_reader :options
+    
   private
     
     # Verify existence of executable in search path
@@ -155,16 +160,20 @@ module RTeX
       File.open(source_file, 'wb') { |f| f.puts input }
     end
     
+    def command(executable)
+      "#{environment_vars}#{executable} --output-directory='#{tempdir}' --interaction=nonstopmode '#{File.basename(source_file)}' #{@options[:shell_redirect]}"
+    end
+    
     # Run LaTeX pre-processing step on the source file
     def preprocess!
-      unless `#{environment_vars}#{preprocessor} --output-directory=#{tempdir} --interaction=nonstopmode '#{File.basename(source_file)}' #{@options[:shell_redirect]}`
+      unless `#{command(preprocessor)}`
         raise GenerationError, "Could not preprocess using #{preprocessor}"      
       end
     end
     
     # Run LaTeX output generation step on the source file
     def process!
-      unless `#{environment_vars}#{tex_inputs} #{processor} --output-directory=#{tempdir} --interaction=nonstopmode '#{File.basename(source_file)}' #{@options[:shell_redirect]}`
+      unless `#{command(processor)}`
         raise GenerationError, "Could not generate PDF using #{processor}"      
       end
     end
@@ -197,6 +206,14 @@ module RTeX
       end
     end
     
+    # Produce a list of environment variables to prefix the process and 
+    # preprocess commands.
+    #
+    def environment_vars
+      list = [tex_inputs, command_prefix].compact
+      list.empty? ? "" : list.join(" ") + " "
+    end
+    
     # Compile list of extra directories to search for LaTeX packages, using
     # the file or array of files held in the :tex_inputs option.
     #
@@ -209,12 +226,24 @@ module RTeX
       end
     end
     
-    # Produce a list of environment variables to prefix the process and 
-    # preprocess commands.
+    # Occasionally it is useful to be able to prefix the LaTeX commands with 
+    # extra environment variables, for example the +rlatex+ program,
     #
-    def environment_vars
-      list = [tex_inputs].compact
-      list.empty? ? "" : list.join(" ") + " "
+    #   LATEXPRG=pdflatex rlatex [FILE...]
+    #
+    # which runs the command +pdflatex+ repeatedly until LaTeX is satisfied all
+    # cross-references etc. are stable.
+    #
+    # To achieve this with RTeX, use 
+    #
+    #   :processor => "rlatex", :command_prefix => "LATEXPRG=pdflatex"
+    #
+    def command_prefix
+      if prefix = @options[:command_prefix]
+        prefix = [prefix].flatten.join(" ")
+      else
+        nil
+      end
     end
     
     def source_file

data/lib/rtex/version.rb

@@ -65,7 +65,7 @@ module RTeX
 
     MAJOR = 2
     MINOR = 1
-    TINY  = 1
+    TINY  = 3
     
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)
@@ -74,4 +74,4 @@ module RTeX
         
   end
   
-end
+end

data/rtex.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rtex}
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruce Williams, Wiebe Cazemier"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: awhyte-rtex
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - Bruce Williams, Wiebe Cazemier