rtex 2.1.0 → 2.1.1

data/README_RAILS.rdoc

@@ -1,14 +1,14 @@
-= RTeX Rails plugin
+= RTeX for Rails
 
 == Installation
 
   sudo gem install rtex
   
-Rails 2.0.X, 2.1 in vendor/plugins:
+Rails 2.0.X, 2.1+ in vendor/plugins (not recommended):
   rtex --install /path/to/rails/app
   
-Or, as a Rails 2.1 gem dependency, just add the following
-to your <tt>config/environment.rb</tt>:
+Or, as a Rails 2.1+ gem dependency, just add the following
+to your config/environment.rb:
   config.gem 'rtex'
   
 == Dependencies
@@ -17,10 +17,10 @@ to your <tt>config/environment.rb</tt>:
   
 == Usage
 
-Create files +pdf.rtex+ extensions (eg, +index.pdf.rtex+) using standard LaTeX markup.
+Create files pdf.rtex extensions (eg, index.pdf.rtex) using standard LaTeX markup.
 
-* Layouts are supported, eg: +application.pdf.rtex+
-* Partials are supported, eg: +_item.pdf.rtex+
+* Layouts are supported, eg: application.pdf.rtex
+* Partials are supported, eg: _item.pdf.rtex
 
 === Example
 
@@ -53,6 +53,6 @@ With the following:
     <%= yield %>
   \end{document}
 
-If you hit +http://the.server.url/items.pdf+, you end up with a nice PDF listing of items.
+If you hit /items.pdf, you end up with a nice PDF listing of items.
 
 Obviously a simplistic example.

data/lib/rtex/framework/rails.rb

@@ -33,6 +33,7 @@ module RTeX
         def render_with_rtex(options=nil, *args, &block)
           result = render_without_rtex(options, *args, &block)
           if result.is_a?(String) && Thread.current[:_rendering_rtex]
+            Thread.current[:_rendering_rtex] = false
             options ||= {}
             ::RTeX::Document.new(result, options.merge(:processed => true)).to_pdf do |filename|
               serve_file = Tempfile.new('rtex-pdf')
@@ -45,6 +46,8 @@ module RTeX
                 :length => File.size(serve_file.path)
               serve_file.close
             end
+          else
+            result
           end
           
         end
@@ -52,8 +55,15 @@ module RTeX
       
       module HelperMethods
         # Similar to h()
-        def latex_escape(s)
-          RTeX::Document.escape(s)
+        def latex_escape(*args)
+          # Since Rails' I18n implementation aliases l() to localize(), LaTeX
+          # escaping should only be done if RTeX is doing the rendering.
+          # Otherwise, control should be be passed to localize().
+          if Thread.current[:_rendering_rtex]
+            RTeX::Document.escape(*args)
+          else
+            localize(*args)
+          end
         end
         alias :l :latex_escape
       end

data/lib/rtex/version.rb

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

data/rtex.gemspec

@@ -2,29 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rtex}
-  s.version = "2.1.0"
+  s.version = "2.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruce Williams, Wiebe Cazemier"]
-  s.date = %q{2009-02-26}
+  s.date = %q{2009-10-22}
   s.default_executable = %q{rtex}
   s.description = %q{LaTeX preprocessor for PDF generation; Rails plugin}
   s.email = %q{bruce@codefluency.com}
   s.executables = ["rtex"]
   s.extra_rdoc_files = ["bin/rtex", "CHANGELOG", "lib/rtex/document.rb", "lib/rtex/escaping.rb", "lib/rtex/framework/merb.rb", "lib/rtex/framework/rails.rb", "lib/rtex/tempdir.rb", "lib/rtex/version.rb", "lib/rtex.rb", "README.rdoc", "README_RAILS.rdoc"]
   s.files = ["bin/rtex", "CHANGELOG", "init.rb", "lib/rtex/document.rb", "lib/rtex/escaping.rb", "lib/rtex/framework/merb.rb", "lib/rtex/framework/rails.rb", "lib/rtex/tempdir.rb", "lib/rtex/version.rb", "lib/rtex.rb", "Manifest", "rails/init.rb", "Rakefile", "README.rdoc", "README_RAILS.rdoc", "test/document_test.rb", "test/filter_test.rb", "test/fixtures/first.tex", "test/fixtures/first.tex.erb", "test/fixtures/fragment.tex.erb", "test/fixtures/text.textile", "test/tempdir_test.rb", "test/test_helper.rb", "vendor/instiki/LICENSE", "vendor/instiki/redcloth_for_tex.rb", "rtex.gemspec"]
-  s.has_rdoc = true
   s.homepage = %q{http://rtex.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtex", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rtex}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{LaTeX preprocessor for PDF generation; Rails plugin}
   s.test_files = ["test/document_test.rb", "test/filter_test.rb", "test/tempdir_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<Shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtex
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Bruce Williams, Wiebe Cazemier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -06:00
+date: 2009-10-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,8 @@ files:
 - rtex.gemspec
 has_rdoc: true
 homepage: http://rtex.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -104,9 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rtex
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: LaTeX preprocessor for PDF generation; Rails plugin
 test_files: 
 - test/document_test.rb