template.rb in erb_latex-0.3.0

- old
+ new

@@ -95,11 +95,11 @@
                 pdf_file = Pathname.new(dir).join( "output.pdf" )
                 if success && pdf_file.exist?
                     yield pdf_file
                 else
                     errors = @log.scan(/\*\!\s(.*?)\n\s*\n/m).map{|e| e.first.gsub(/\n/,'') }.join("; ")
-                    STDERR.puts @log
+                    STDERR.puts @log, errors if ErbLatex.config.verbose_logs
                     raise LatexError.new( errors.empty? ? "xelatex compile error" : errors, @log )
                 end
             end
         end
 
@@ -112,15 +112,13 @@
         # @return [String] latex with ERB substitutions performed
         # @raise [LatexError] if the xelatex process does not complete successfully
         def compile_latex
             begin
                 context = ErbLatex::Context.new( @partials_path || @view.dirname, @data )
-                content = ERB.new( @view.read, 0, '-' ).result( context.getBinding )
+                content = ErbLatex::File.evaluate(@view, context.getBinding)
                 if layout
-                    ERB.new( layout_file.read, nil, '-' ).result( context.getBinding{
-                        content
-                    })
+                    ErbLatex::File.evaluate(layout_file, context.getBinding{ content })
                 else
                     content
                 end
             rescue RuntimeError,LocalJumpError=>e
                 raise LatexError.new( "ERB compile raised #{e.class} on #{@view}", e.backtrace )
@@ -142,10 +140,10 @@
             @log    = ''
 
             if @packages_path
                 ENV['TEXINPUTS'] = "#{@packages_path}:"
             end
-            Open3.popen2e( ErbLatex.xelatex_binary,
+            Open3.popen2e( ErbLatex.config.xelatex_path,
               "--no-shell-escape", "-shell-restricted",
               "-jobname=output",   "-output-directory=#{dir}",
             ) do |stdin, output, wait_thr|
                 stdin.write latex
                 stdin.close