diff options
Diffstat (limited to 'lib/sisu/v3/texpdf.rb')
| -rw-r--r-- | lib/sisu/v3/texpdf.rb | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/sisu/v3/texpdf.rb b/lib/sisu/v3/texpdf.rb index ab7995f4..96e51ed9 100644 --- a/lib/sisu/v3/texpdf.rb +++ b/lib/sisu/v3/texpdf.rb @@ -145,8 +145,6 @@ module SiSU_TeX end private class LaTeX_to_pdf - require 'fileutils' - include FileUtils #::Verbose @@n_lpdf||=0 #change def initialize(md,env) @md,@env=md,env @@ -184,15 +182,15 @@ module SiSU_TeX when /legal/; pdf_p=@f.pdf_p_legal; pdf_l=@f.pdf_l_legal else pdf_p=@f.pdf_p_a4; pdf_l=@f.pdf_l_a4 end - mkdir_p(@md.file.output_path.pdf.dir) unless FileTest.directory?(@md.file.output_path.pdf.dir) + FileUtils::mkdir_p(@md.file.output_path.pdf.dir) unless FileTest.directory?(@md.file.output_path.pdf.dir) if FileTest.file?(portrait_pdf) - cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}") - rm(portrait_pdf) + FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}") + FileUtils::rm(portrait_pdf) else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/ end if FileTest.file?(landscape_pdf) - cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}") - rm(landscape_pdf) + FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}") + FileUtils::rm(landscape_pdf) else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/ end SiSU_Screen::Ansi.new(@md.opt.cmd,@@n_lpdf,'processed (SiSU LaTeX to pdf - using pdfetex aka. pdftex or pdflatex)').generic_number if @md.opt.cmd =~/[MVv]/ @@ -241,10 +239,8 @@ module SiSU_TeX if FileTest.directory?(@md.file.output_path.pdf.dir) pwd=Dir.pwd Dir.chdir(@md.file.output_path.pdf.dir) - system(" - rm #{mklnk} - ln -s #{pdf_p} #{mklnk} - ") + FileUtils::rm_f(mklnk) + FileUtils::ln_s(pdf_p, mklnk) Dir.chdir(pwd) end end @@ -256,10 +252,8 @@ module SiSU_TeX end pwd_set=Dir.pwd Dir.chdir(@md.file.output_path.pdf.dir) - system(" - rm #{mklnk} - ln -s #{pdf_l} #{mklnk} - ") + FileUtils::rm_f(mklnk) + FileUtils::ln_s(pdf_l, mklnk) Dir.chdir(pwd_set) end else |