rake4latex 0.1.2 → 0.1.3

data/bin/call_rake4latex.rb

@@ -55,7 +55,7 @@ opts.on('-e', "--enforce", "Enforce an initial TeX-run") { |v|
 }
 
 opts.on('-f', "--format FORMAT", "Set the format for TeX-run (pdflatex, xelatex, lualatex)") { |v|
-  Rake4LaTeX.set_latexrunner_default(:program, v.to_sym)
+  Rake4LaTeX::DEFAULT_SETTINGS[:program] = v.to_sym
 }
 
 #
@@ -67,7 +67,7 @@ opts.on('--dep', "--dependecies", "Build dependecies (rakefile recommended)") {
 }
 opts.on("-i", "--ignore", "--ignore-error", "Allow LaTeX errors") { |v|
   puts "Allow LaTeX errors"  if PARSE_MESSAGES
-  Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
+    Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
 }
 opts.on("-s", "--statistic", "Show the statistic after TeX-run") { |v|
   puts "Show the statistic after TeX-run"  if PARSE_MESSAGES
@@ -113,26 +113,26 @@ LaTeXRunner-options
 #
 opts.on("--maxrun MAXRUN", "Maximum MAXRUN TeX calls") { |v|
   puts "Set maximum TeX-Runs #{v.inspect}"  if PARSE_MESSAGES
-  Rake4LaTeX.set_latexrunner_default(:maxruns, v.to_i)
-  #~ LaTeXRunner::DEFAULT_SETTINGS[:maxruns] = 
+    Rake4LaTeX::DEFAULT_SETTINGS[:maxruns] = v.to_i
 }
 
 opts.on("-l", "--loglevel LEVEL", "Log Level for the logger (1=debug, 2=info(default), 3=warn 4=error)") { |v|
   puts "Set loglevel to #{v.inspect}"  if PARSE_MESSAGES
-  Rake4LaTeX.set_latexrunner_default(:loglevel, v.to_i)
+  Rake4LaTeX::DEFAULT_SETTINGS[:loglevel] = v.to_i
 }
 
 opts.on("-v", "--version", "Version") { |v|
   puts "Rake4LaTeX-Caller Version #{Rake4LaTeX::VERSION}" 
 }
 
+task :default #empty dummy task
+
 #Parsen der Parameter mit Exception bei ung�ltigen Parametern
 begin
 	opts.parse!
   ARGV.each{|arg|
     target = arg.ext('pdf')
     puts "Define target #{target}"
-    Rake4LaTeX.set4clean(arg)
     TASK_BEFORE_TeX.each{|task|
     case task
       when :enforce
@@ -172,6 +172,9 @@ app = Rake.application
 app[:default].invoke
 
 if $0 == __FILE__
-  puts "Finished, please enter any key"
-  STDIN.getc
+  if STDIN.tty?
+    puts "Finished, please enter any key"
+    STDOUT.flush
+    STDIN.getc 
+  end
 end

data/lib/rake4latex/analyse_texfile.rb

@@ -180,23 +180,23 @@ BUILD_RAKEFILE_OPTIONS = [
     :gloss, #Add gloss.sty-dependecies
     :splitindex
 ]
-#
-#Build a rakefile
-#
-#Options:
-#* :pdf - add rule to create a pdf
-#* :dvi - add rule to create a dvi
-#* :dependecies - Analyse dependecies and add them
-#* :bib: Add bibliography-dependecies (1)
-#* :gloss: Add gloss.sty-dependecies
-#* :splitindex
-#* :all - all options,
-#
-#Remarks:
-#
-#(1) The bibTeX-files are searched via kpsewhich.
-#local files get a "./" in froint of hte name.
-#
+=begin rdoc
+Build a rakefile
+
+Options:
+* :pdf - add rule to create a pdf
+* :dvi - add rule to create a dvi
+* :dependecies - Analyse dependecies and add them
+* :bib: Add bibliography-dependecies (1)
+* :gloss: Add gloss.sty-dependecies
+* :splitindex
+* :all - all options,
+
+Remarks:
+
+(1) The bibTeX-files are searched via kpsewhich.
+local files get a "./" in front of the name.
+=end
 def self.build_rakefile( filename, *options )
   
   options.concat(BUILD_RAKEFILE_OPTIONS) if options.delete(:all )
@@ -222,6 +222,9 @@ Options: #{options.inspect}
 =end
 require 'rake4latex'
 
+#Change default
+#~ Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
+
 #Needed for some actions without a previous TeX-call
 task :basefile => '#{tex_name}'
 
@@ -328,7 +331,6 @@ Make the rakefile self-executable
 =end
 if $0 == __FILE__
   app = Rake.application
-  #~ Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
   app[:default].invoke  #start default tasks
 end
 Template

data/lib/rake4latex/base.rb

@@ -13,6 +13,7 @@ case RUBY_VERSION
     require 'yaml'
   else; raise "Undefined ruby version #{RUBY_VERSION}"
 end
+  
 require 'log4r' #1.0.5
 
 module Rake
@@ -28,7 +29,7 @@ end
 
 
 module Rake4LaTeX
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   #With this creation we define the constants Log4r::DEBUG...
   Logger = Log4r::Logger.new("LaTeXRunner")
@@ -258,6 +259,7 @@ This method is called by task 'basename' (Basefile#initialize)
       cleanlist.add("#{@basename}.{rai,rao}") #rail/rail.sty
       cleanlist.add("#{@basename}.{tdo}") #tdo: todonotes.sty
       cleanlist.add("#{@basename}.{vrb}") #vrb: beamer.sty (verbatim)
+      cleanlist.add("#{@basename}.{lox}") #lox: fixme.sty 
 
       clobberlist = FileList.new("#{@basename}.{dvi,pdf,ps}")
       #The * is needed.else the filename is added always. With '*' it is checked for existence

data/lib/rake4latex/glossaries.rb

@@ -57,7 +57,7 @@ and Rake4LaTeX::LaTeXRunner#glossaries_format .
 desc "Build glossary with glossaries.sty"
 tex_postrule_check '.gls' do |args|
   gls = {}
-  File.read(args[:task].name.ext('aux')).each{|auxline|
+  File.read(args[:task].name.ext('aux')).each_line{|auxline|
     case auxline
       when /\\@newglossary\{(.*)\}\{(.*)\}\{(.*)\}\{(.*)\}/
         args[:logger].debug("Found Glossary #{$1}-#{$2}-#{$3}-#{$4}")

data/lib/rake4latex/rake4latex.yaml

@@ -58,7 +58,8 @@ ps2pdf:
   parameters:
   - value_key: :filename
 rail: 
-  cmd: C:/usr/texmf/tex/Latex/rail/rail.exe
+  # anywhere in path
+  cmd: rail.exe
   comment: 
   - name: -t
     value_key: :railfile

data/lib/rake4latex/rules.rb

@@ -194,6 +194,7 @@ tex_postrule '.rao' => '.rai' do |task|
   stdout, stderr = catch_screen_output{ 
     puts `#{cmd}`
   }
+
   error = false
   if $? != 0
     task.texrunner.logger.fatal("There where Rail errors.")

data/lib/rake4latex/splitindex.rb

@@ -21,14 +21,18 @@ class Splitindex
     File.readlines(@basename).each{|idx_line|
       case idx_line
         when /\indexentry\[(.+?)\]\{(.+?)\}\{(.+?)\}/
-          @targets[$1]  ||= [] << "\\indexentry{#{$2}}{#{$3}}"
+          (@targets[$1]  ||= []) << "\\indexentry{#{$2}}{#{$3}}"
         when /\indexentry\{(.+?)\}\{(.+?)\}/
-          @targets['idx']  ||= [] << "\\indexentry{#{$1}}{#{$2}}"
+          (@targets['idx']  ||= []) << "\\indexentry{#{$1}}{#{$2}}"
       end
     } #File.readlines(@basename)
 
     @indices = ( @targets.keys << 'idx' ).uniq!
   end
+  #List of all indices
+  attr_reader :indices
+  #List of all targets and there content  
+  attr_reader :targets
   #
   #Flag if it is no splitindex, but a  "normal" index for makeindex.
   def makeindex?() 
@@ -39,6 +43,7 @@ class Splitindex
   #* add the help files to CLEAN
   #* call makeindex for each file
   def execute()
+    
     @logger.error("Splitindex#execute for normal index") if makeindex? and @logger.info?
     @logger.info("Build splitindex-files for #{@targets.keys.inspect}") if @logger.info?
     @targets.each{|target, content|
@@ -51,7 +56,7 @@ class Splitindex
       CLEAN << idxname.ext('ind')
       CLEAN << idxname.ext('ilg')
       call_makeindex( idxname )
-    }
+    } #@targets.each
   end
   #
   #Call makeindex for the given idx-file

data/readme.html

@@ -1,17 +1,17 @@
 <!--
 
-	Build by	c:/program files/ruby19/lib/ruby/gems/1.9.1/gems/docgenerator-1.2.0/lib/docgenerator/document.rb
-	Dir:		C:/usr/Script/rake4latex
-	Creator:	rakefile_rake4latex.rb
+	Build by	c:/program files/ruby19/lib/ruby/gems/1.9.1/gems/docgenerator-2.0.0/lib/docgenerator/document.rb
+	Dir:		C:/usr/script/rake4latex
+	Creator:	Docgenerator 2.0.0 - http://rubygems.org/gems/docgenerator
 	Target:		readme.html
-	2010/09/14 17:46:52
+	2011/08/19 22:08:43
 	
 	Generation-Info-End
 -->
 <!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head >
-<title>Rake4LaTeX V0.1.2</title>
+<title>Rake4LaTeX V0.1.3</title>
 </head>
 <body ><h1 >rake4latex: TeX-Build-Tool</h1>
 <h2 >Introduction</h2>
@@ -48,11 +48,22 @@ You can generate a rakefile template with:
 </p>
 <pre>
   require 'rake4latex'
-  puts Rake4LaTeX.build_rakefile( [basename] )
+  puts Rake4LaTeX.build_rakefile( basename, :pdf, :dependecies )
 </pre>
 <p >
 The method will print a rakefile definition.  
 </p>
+<p >
+Supported options:  
+</p>
+<ul >
+<li > :pdf     add rule to create a pdf  </li>
+<li > :dvi     add rule to create a dvi  </li>
+<li > :dependecies Analyse dependecies and add them  </li>
+<li > :bib     Add bibliography-dependecies (1)  </li>
+<li > :gloss Add gloss.sty-dependecies  </li>
+<li > :splitindex  </li>
+</ul>
 <h3 >call_rake4latex.rb</h3>
 <p >
 When you think, your project is too small to create a rakefile, then try call_rake4latex.rb.  
@@ -407,7 +418,7 @@ There are additional packages requiring additonal runs.
 <li > Add tasks log_archive, :log_overview  </li>
 </ul>
 <p >
-0.1.2  
+0.1.2 2010-09-15  
 </p>
 <ul >
 <li > Minor changes in testcases  </li>
@@ -419,5 +430,12 @@ There are additional packages requiring additonal runs.
 <li > Replaced Rake4LaTeX.set_latexrunner_default with Rake4LaTeX::Basefile#[]=  </li>
 <li > Minor corrections for Ruby 1.9  </li>
 </ul>
+<p >
+0.1.3 2011-08  
+</p>
+<ul >
+<li > clean: add fixme.sty (lox)   </li>
+<li > correction splitindex and unittest_splitindex.rb</li>
+</ul>
 </body>
 </html>

data/readme.txt

@@ -32,10 +32,18 @@ A not-so minimal rakefile looks like this:
 
 You can generate a rakefile template with:  
   require 'rake4latex'
-  puts Rake4LaTeX.build_rakefile( [basename] )
+  puts Rake4LaTeX.build_rakefile( basename, :pdf, :dependecies )
 
 The method will print a rakefile definition.  
 
+Supported options:  
+-  :pdf     add rule to create a pdf  
+-  :dvi     add rule to create a dvi  
+-  :dependecies Analyse dependecies and add them  
+-  :bib     Add bibliography-dependecies (1)  
+-  :gloss Add gloss.sty-dependecies  
+-  :splitindex  
+
 call_rake4latex.rb
         ------------------------------
 
@@ -322,7 +330,7 @@ Version History
 -  Better log analyse and statistic  
 -  Add tasks log_archive, :log_overview  
 
-0.1.2  
+0.1.2 2010-09-15  
 -  Minor changes in testcases  
 -  rename task :log_overview to :log_overview_file  
 -  task :log_overview shows log overview.  
@@ -332,3 +340,7 @@ Version History
 -  Replaced Rake4LaTeX.set_latexrunner_default with Rake4LaTeX::Basefile#[]=  
 -  Minor corrections for Ruby 1.9  
 
+0.1.3 2011-08  
+-  clean: add fixme.sty (lox)   
+-  correction splitindex and unittest_splitindex.rb
+

data/test/_expected/bibtex_test_build_rakefile.txt

@@ -8,6 +8,9 @@ Options: [:dvi, :pdf, :bib]
 =end
 require 'rake4latex'
 
+#Change default
+#~ Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
+
 #Needed for some actions without a previous TeX-call
 task :basefile => 'testdocument.tex'
 
@@ -47,6 +50,5 @@ Make the rakefile self-executable
 =end
 if $0 == __FILE__
   app = Rake.application
-  #~ Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
   app[:default].invoke  #start default tasks
 end

data/test/_expected/error_test_overview.txt

@@ -4,9 +4,9 @@ Log-overview for testdocument.tex
 --- 
 testdocument.log: 
   :latex_errors: 
-  - Undefined control sequence. [log#256]
+  - Undefined control sequence. [log#282]
   :output: 
-  - Output written on testdocument.pdf (1 pages) [log#279]
+  - Output written on testdocument.pdf (1 pages) [log#311]
 
 ========
    Detailed analyse of testdocument.log
@@ -15,7 +15,7 @@ testdocument.log:
 ##The following list may contain wrong line assignments
 ###########
 --- 
-:latex_errors: 
-- Undefined control sequence. (./testdocument.tex) [log#56] - []
 :output: 
-- Output written on testdocument.pdf (1 pages) [page0] [log#17] - []
+- Output written on testdocument.pdf (1 pages) [page0] [log#18] - []
+:latex_errors: 
+- Undefined control sequence. (./testdocument.tex) [log#62] - []

data/test/_expected/gloss_test_build_rakefile.txt

@@ -8,6 +8,9 @@ Options: [:dvi, :pdf, :gloss]
 =end
 require 'rake4latex'
 
+#Change default
+#~ Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
+
 #Needed for some actions without a previous TeX-call
 task :basefile => 'testdocument.tex'
 
@@ -54,6 +57,5 @@ Make the rakefile self-executable
 =end
 if $0 == __FILE__
   app = Rake.application
-  #~ Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
   app[:default].invoke  #start default tasks
 end

data/test/_expected/includes_test_build_rakefile.txt

@@ -8,6 +8,9 @@ Options: [:dvi, :pdf, :dependecies]
 =end
 require 'rake4latex'
 
+#Change default
+#~ Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
+
 #Needed for some actions without a previous TeX-call
 task :basefile => 'testdocument.tex'
 
@@ -53,6 +56,5 @@ Make the rakefile self-executable
 =end
 if $0 == __FILE__
   app = Rake.application
-  #~ Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
   app[:default].invoke  #start default tasks
 end

data/test/_expected/splitindex_test_build_rakefile.txt

@@ -8,6 +8,9 @@ Options: [:pdf, :splitindex]
 =end
 require 'rake4latex'
 
+#Change default
+#~ Rake4LaTeX::DEFAULT_SETTINGS[:texerrors_allowed] = true
+
 #Needed for some actions without a previous TeX-call
 task :basefile => 'testdocument.tex'
 
@@ -54,6 +57,5 @@ Make the rakefile self-executable
 =end
 if $0 == __FILE__
   app = Rake.application
-  #~ Rake4LaTeX.set_latexrunner_default(:texerrors_allowed, true)
   app[:default].invoke  #start default tasks
 end

data/test/_expected/varioref_test_ignore_error.txt

@@ -8,4 +8,4 @@
 FATAL testdocument: There where pdflatex errors. See testdocument.log for details
  INFO testdocument: TeX-run stopped after 2 runs
 Statistic for testdocument:
-  Document    : 2 pages, 1 error, 1 warning (testdocument.log)
+  Document    : 2 pages, 1 error (testdocument.log)

data/test/_expected/z_complex_test_overview.txt

@@ -3,11 +3,32 @@ Log-overview for testdocument.tex
   Document    : 9 pages, 4 warnings (testdocument.log)
   Bibliography: Used testdocument.bib, 3 warnings (testdocument.blg)
   Index       : 1 entry (testdocument-ani.ilg)
-  Index       : 1 entry (testdocument-fru.ilg)
-  Index       : 1 entry (testdocument-idx.ilg)
   Index       : 1 entry (testdocument-veg.ilg)
   Index       : 1 entry (testdocument-xxx.ilg)
+  Index       : 2 entries (testdocument-fru.ilg)
+  Index       : 3 entries (testdocument-idx.ilg)
 --- 
+testdocument.log: 
+  :package_warnings: 
+    minitoc(hints): 
+    - W0030 [log#373]
+    - W0023 [log#378]
+    - W0039 [log#383]
+    - W0023 [log#388]
+    - W0024 [log#449]
+  :latex_warnings: 
+  - No \author given. [log#397]
+  - Citation `irgendwas' on page 5 undefined on input line 57. [log#428]
+  - There were undefined references. [log#463]
+  :output: 
+  - Output written on testdocument.pdf (9 pages) [log#481]
+testdocument.blg: 
+  :source_information: 
+  - Database file testdocument.bib used
+  :warnings: 
+  - string name "dtk" is undefined
+  - Databaseentry irgendwas missing
+  - empty journal in dtk00.4:lickert:blindtext
 testdocument-ani.ilg: 
   :source_information: 
   - "Input file: testdocument-ani.idx."
@@ -16,12 +37,12 @@ testdocument-ani.ilg:
 testdocument-fru.ilg: 
   :source_information: 
   - "Input file: testdocument-fru.idx."
-  - "Entries accepted: 1"
+  - "Entries accepted: 2"
   - "Entries rejected: 0"
 testdocument-idx.ilg: 
   :source_information: 
   - "Input file: testdocument-idx.idx."
-  - "Entries accepted: 1"
+  - "Entries accepted: 3"
   - "Entries rejected: 0"
 testdocument-veg.ilg: 
   :source_information: 
@@ -33,27 +54,6 @@ testdocument-xxx.ilg:
   - "Input file: testdocument-xxx.idx."
   - "Entries accepted: 1"
   - "Entries rejected: 0"
-testdocument.blg: 
-  :source_information: 
-  - Database file testdocument.bib used
-  :warnings: 
-  - string name "dtk" is undefined
-  - Databaseentry irgendwas missing
-  - empty journal in dtk00.4:lickert:blindtext
-testdocument.log: 
-  :latex_warnings: 
-  - No \author given. [log#371]
-  - Citation `irgendwas' on page 5 undefined on input line 57. [log#418]
-  - There were undefined references. [log#447]
-  :output: 
-  - Output written on testdocument.pdf (9 pages) [log#465]
-  :package_warnings: 
-    minitoc(hints): 
-    - W0030 [log#347]
-    - W0023 [log#352]
-    - W0039 [log#357]
-    - W0023 [log#362]
-    - W0024 [log#441]
 
 ========
    Detailed analyse of testdocument.log
@@ -62,16 +62,16 @@ testdocument.log:
 ##The following list may contain wrong line assignments
 ###########
 --- 
-:latex_warnings: 
-- "No \\author given. (./testdocument.tex) [log#114] - "
-- "Citation `irgendwas' on page 5 undefined on input line 57. (./testdocument.tex) [log#145] - "
-- "There were undefined references. (./testdocument.tex) [log#166] - "
 :output: 
-- "Output written on testdocument.pdf (9 pages) [page0] [log#22] - "
+- Output written on testdocument.pdf (9 pages) [page0] [log#23] - []
 :package_warnings: 
   minitoc(hints): 
-  - "W0030 (./testdocument.tex) [log#90] - "
-  - "W0023 (./testdocument.tex) [log#95] - "
-  - "W0039 (./testdocument.tex) [log#100] - "
-  - "W0023 (./testdocument.tex) [log#105] - "
-  - "W0024 (./testdocument.tex) [log#160] - "
+  - W0030 (./testdocument.tex) [log#96] - []
+  - W0023 (./testdocument.tex) [log#101] - []
+  - W0039 (./testdocument.tex) [log#106] - []
+  - W0023 (./testdocument.tex) [log#111] - []
+  - W0024 (./testdocument.tex) [log#163] - []
+:latex_warnings: 
+- No \author given. (./testdocument.tex) [log#120] - []
+- Citation `irgendwas' on page 5 undefined on input line 57. (./testdocument.tex) [log#150] - []
+- There were undefined references. (./testdocument.tex) [log#177] - []