rubbr 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.4 / 2008-03-07
+
+* Added support for the pdflatex engine.
+
 == 1.0.3 / 2008-02-28
 
 * Rerun latex when labels are updated.

data/lib/rubbr.rb

@@ -2,7 +2,7 @@ require 'optparse'
 $:.unshift File.dirname(__FILE__)
 
 module Rubbr
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   autoload :Options,       'rubbr/options'
   autoload :Cli,           'rubbr/cli'
@@ -32,6 +32,11 @@ module Rubbr
           options[:format] = format
         end
 
+        opts.on('-e', '--engine [ENGINE]', [:pdflatex, :ps, :pdf],
+          'Select processing engine (latex, pdflatex)') do |engine|
+          options[:engine] = engine
+        end
+
         opts.on('-v', '--view', 'View the document') do
           options[:view] = true
         end
@@ -56,20 +61,24 @@ module Rubbr
       if options[:spell]
         spell
       elsif options[:view]
-        view(options[:format])
+        view(options[:format], options[:engine])
       else
-        build(options[:format])
+        build(options[:format], options[:engine])
       end
     end
 
     private
 
-      def build(format)
-        Rubbr::Builder.build(format)
+      def build(format, engine)
+        if engine
+          Rubbr::Builder.build(format, engine)
+        else
+          Rubbr::Builder.build(format)
+        end
       end
 
-      def view(format)
-        build(format)
+      def view(format, engine)
+        build(format, engine)
         Rubbr::Viewer.view(format)
       end
 

data/lib/rubbr/builder.rb

@@ -11,7 +11,7 @@ module Rubbr
   module Builder
 
     # Build to the spesified format.
-    def self.build(format)
+    def self.build(format = :pdf, engine = :latex)
       case format
       when :dvi
         Rubbr::Builder::Tex.build
@@ -19,9 +19,11 @@ module Rubbr
         Rubbr::Builder::Tex.build
         Rubbr::Builder::Dvi.build
       else
-        Rubbr::Builder::Tex.build
-        Rubbr::Builder::Dvi.build
-        Rubbr::Builder::Ps.build
+        Rubbr::Builder::Tex.build(engine)
+        if engine == :latex
+          Rubbr::Builder::Dvi.build
+          Rubbr::Builder::Ps.build
+        end
       end
     end
 

data/lib/rubbr/builder/tex.rb

@@ -2,18 +2,20 @@ module Rubbr
   module Builder
     class Tex < Base
       class << self
-        def build(output_format = 'dvi')
-          @output_format = output_format
+        def build(engine = :latex)
 
           clean_build_dir
 
           base_latex_file = Rubbr.options[:base_latex_file]
           base_bibtex_file = Rubbr.options[:base_bibtex_file]
 
-          if output_format == 'pdf'
-            preprocessor = Rubbr::Runner::PdfLaTeX
-          else
+          case engine
+          when :latex
+            @output_format = :dvi
             preprocessor = Rubbr::Runner::LaTeX
+          when :pdflatex
+            @output_format = :pdf
+            preprocessor = Rubbr::Runner::PdfLaTeX
           end
 
           build_dir do

data/lib/rubbr/runner.rb

@@ -37,6 +37,18 @@ module Rubbr
       end
 
       def run
+        disable_stdinn do
+          messages = /^(Overfull|Underfull|No file|Package \w+ Warning:|LaTeX Warning:)/
+          run = `#@executable #@input_file`
+          @warnings = run.grep(messages).sort
+          lines = run.split("\n")
+          while lines.shift
+            if lines.first =~ /^!/ # LaTeX Error, processing halted
+              3.times { @errors << lines.shift }
+            end
+          end
+          feedback
+        end
       end
 
       def feedback

data/lib/rubbr/runner/latex.rb

@@ -4,21 +4,6 @@ module Rubbr
       def initialize(input_file, silent=false, executable='latex')
         super
       end
-
-      def run
-        disable_stdinn do
-          messages = /^(Overfull|Underfull|No file|Package \w+ Warning:|LaTeX Warning:)/
-          run = `#@executable #@input_file`
-          @warnings = run.grep(messages).sort
-          lines = run.split("\n")
-          while lines.shift
-            if lines.first =~ /^!/ # LaTeX Error, processing halted
-              3.times { @errors << lines.shift }
-            end
-          end
-          feedback
-        end
-      end
     end
   end
 end

data/lib/rubbr/runner/pdflatex.rb

@@ -4,21 +4,6 @@ module Rubbr
       def initialize(input_file, silent=false, executable='pdflatex')
         super
       end
-
-      def run
-        disable_stdinn do
-          messages = /^(Overfull|Underfull|No file|Package \w+ Warning:)/
-          run = `#@executable #@input_file`
-          @warnings = run.grep(messages)
-          lines = run.split("\n")
-          while lines.shift
-            if lines.first =~ /^!/
-              3.times { @errors << lines.shift }
-            end
-          end
-          feedback
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubbr
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Eivind Uggedal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-28 00:00:00 +01:00
+date: 2008-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency