Add GTK bibitem dialog

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 4230c72c00274e007ee8f99052daaf6ae4cb8902..84b7748ef0f37d5f8d5a218b075f57469bb722ff 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -17,16 +17,17 @@
 #include "LaTeX.h"
 #include "bufferlist.h"
 #include "gettext.h"
+#include "lyxrc.h"
 #include "debug.h"
 #include "DepTable.h"
 #include "support/filetools.h"
-#include "support/FileInfo.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 #include "support/os.h"
 
+#include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
 
 #include <fstream>
@@ -35,7 +36,6 @@ using lyx::support::AbsolutePath;
 using lyx::support::bformat;
 using lyx::support::ChangeExtension;
 using lyx::support::contains;
-using lyx::support::FileInfo;
 using lyx::support::findtexfile;
 using lyx::support::getcwd;
 using lyx::support::OnlyFilename;
@@ -43,12 +43,14 @@ using lyx::support::prefixIs;
 using lyx::support::QuoteName;
 using lyx::support::rtrim;
 using lyx::support::split;
+using lyx::support::subst;
 using lyx::support::suffixIs;
 using lyx::support::Systemcall;
 using lyx::support::unlink;
 using lyx::support::trim;
 
 namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
 
 using boost::regex;
 using boost::smatch;
@@ -70,13 +72,11 @@ using std::vector;
 //   BufferList::updateIncludedTeXfiles, this should either
 //   be done before calling LaTeX::funcs or in a completely
 //   different way.
-// - the bibtex command options should be supported.
 // - the makeindex style files should be taken care of with
 //   the dependency mechanism.
 // - makeindex commandline options should be supported
 // - somewhere support viewing of bibtex and makeindex log files.
 // - we should perhaps also scan the bibtex log file
-// - we should perhaps also scan the bibtex log file
 
 extern BufferList bufferlist;
 
@@ -84,7 +84,7 @@ namespace {
 
 string runMessage(unsigned int count)
 {
-       return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
+       return bformat(_("Waiting for LaTeX run number %1$d"), count);
 }
 
 } // anon namespace
@@ -120,7 +120,7 @@ bool operator!=(Aux_Info const & a, Aux_Info const & o)
  * CLASS LaTeX
  */
 
-LaTeX::LaTeX(string const & latex, LatexRunParams const & rp,
+LaTeX::LaTeX(string const & latex, OutputParams const & rp,
             string const & f, string const & p)
        : cmd(latex), file(f), path(p), runparams(rp)
 {
@@ -197,8 +197,7 @@ int LaTeX::run(TeXErrors & terr)
        //             remake the dependency file.
        //
 
-       FileInfo fi(depfile);
-       bool had_depfile = fi.exist();
+       bool had_depfile = fs::exists(depfile);
        bool run_bibtex = false;
        string aux_file = OnlyFilename(ChangeExtension(file, "aux"));
 
@@ -214,7 +213,7 @@ int LaTeX::run(TeXErrors & terr)
                // Can't just check if anything has changed because it might have aborted
                // on error last time... in which cas we need to re-run latex
                // and collect the error messages (even if they are the same).
-               if (!FileInfo(output_file).exist()) {
+               if (!fs::exists(output_file)) {
                        lyxerr[Debug::DEPEND]
                                << "re-running LaTeX because output file doesn't exist." << endl;
                } else if (!head.sumchange()) {
@@ -275,7 +274,7 @@ int LaTeX::run(TeXErrors & terr)
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
                message(_("Running MakeIndex."));
-               rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
+               rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams);
        }
 
        // run bibtex
@@ -343,7 +342,7 @@ int LaTeX::run(TeXErrors & terr)
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
                message(_("Running MakeIndex."));
-               rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
+               rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams);
        }
 
        // 2
@@ -384,28 +383,20 @@ int LaTeX::run(TeXErrors & terr)
 
 int LaTeX::startscript()
 {
-#ifndef __EMX__
-       string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";
-#else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null"
-       string tmp = cmd + ' ' + file + " > nul";
-#endif
+       string tmp = cmd + ' ' + QuoteName(file) + " > " + os::nulldev();
        Systemcall one;
        return one.startscript(Systemcall::Wait, tmp);
 }
 
 
-bool LaTeX::runMakeIndex(string const & f)
+bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams)
 {
        lyxerr[Debug::LATEX] << "idx file has been made,"
                " running makeindex on file "
                             <<  f << endl;
-
-       // It should be possible to set the switches for makeindex
-       // sorting style and such. It would also be very convenient
-       // to be able to make style files from within LyX. This has
-       // to come for a later time.
-       string tmp = "makeindex -c -q ";
-       tmp += f;
+       string tmp = lyxrc.index_command + " ";
+       tmp = subst(tmp, "$$lang", runparams.document_language);
+       tmp += QuoteName(f);
        Systemcall one;
        one.startscript(Systemcall::Wait, tmp);
        return true;
@@ -420,10 +411,10 @@ LaTeX::scanAuxFiles(string const & file)
        result.push_back(scanAuxFile(file));
 
        for (int i = 1; i < 1000; ++i) {
-               string file2 = ChangeExtension(file, "") + '.' + tostr(i)
+               string const file2 = ChangeExtension(file, "")
+                       + '.' + convert<string>(i)
                        + ".aux";
-               FileInfo fi(file2);
-               if (!fi.exist())
+               if (!fs::exists(file2))
                        break;
                result.push_back(scanAuxFile(file2));
        }
@@ -528,8 +519,8 @@ bool LaTeX::runBibTeX(vector<Aux_Info> const & bibtex_info)
                        continue;
                result = true;
 
-               string tmp = "bibtex ";
-               tmp += OnlyFilename(ChangeExtension(it->aux_file, string()));
+               string tmp = lyxrc.bibtex_command + " ";
+               tmp += QuoteName(OnlyFilename(ChangeExtension(it->aux_file, string())));
                Systemcall one;
                one.startscript(Systemcall::Wait, tmp);
        }
@@ -554,7 +545,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                if (token.empty())
                        continue;
 
-               if (prefixIs(token, "LaTeX Warning:")) {
+               if (prefixIs(token, "LaTeX Warning:") ||
+                   prefixIs(token, "! pdfTeX warning")) {
                        // Here shall we handle different
                        // types of warnings
                        retval |= LATEX_WARNING;
@@ -696,7 +688,7 @@ void handleFoundFile(string const & ff, DepTable & head)
                // On initial insert we want to do the update at once
                // since this file can not be a file generated by
                // the latex run.
-               if (FileInfo(foundfile).exist())
+               if (fs::exists(foundfile))
                        head.insert(foundfile, true);
 
                return;
@@ -706,7 +698,7 @@ void handleFoundFile(string const & ff, DepTable & head)
 
        // (2) foundfile is in the tmpdir
        //     insert it into head
-       if (FileInfo(onlyfile).exist()) {
+       if (fs::exists(onlyfile)) {
                static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
                if (regex_match(onlyfile, unwanted)) {
                        lyxerr[Debug::DEPEND]