fix warning

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 16e504ad2c742c244d3888a1ab75dd838a39b4c3..6003772cbb4dd071a81f5bc13fe78e456ea74f9b 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -17,15 +17,15 @@
 
 #include "BufferList.h"
 #include "LaTeX.h"
-#include "gettext.h"
 #include "LyXRC.h"
-#include "debug.h"
 #include "DepTable.h"
 
-#include "support/filetools.h"
+#include "support/debug.h"
 #include "support/convert.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/Systemcall.h"
 #include "support/os.h"
 
@@ -36,41 +36,11 @@
 using boost::regex;
 using boost::smatch;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::sscanf;
-#endif
-
-using std::endl;
-using std::getline;
-using std::string;
-using std::ifstream;
-using std::set;
-using std::vector;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::absolutePath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileName;
-using support::findtexfile;
-using support::getcwd;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::rtrim;
-using support::rsplit;
-using support::split;
-using support::subst;
-using support::suffixIs;
-using support::Systemcall;
-using support::unlink;
-using support::trim;
-
 namespace os = support::os;
 
 // TODO: in no particular order
@@ -148,29 +118,29 @@ void LaTeX::deleteFilesOnError() const
        // What files do we have to delete?
 
        // This will at least make latex do all the runs
-       unlink(depfile);
+       depfile.removeFile();
 
        // but the reason for the error might be in a generated file...
 
        // bibtex file
        FileName const bbl(changeExtension(file.absFilename(), ".bbl"));
-       unlink(bbl);
+       bbl.removeFile();
 
        // makeindex file
        FileName const ind(changeExtension(file.absFilename(), ".ind"));
-       unlink(ind);
+       ind.removeFile();
 
        // nomencl file
        FileName const nls(changeExtension(file.absFilename(), ".nls"));
-       unlink(nls);
+       nls.removeFile();
 
        // nomencl file (old version of the package)
        FileName const gls(changeExtension(file.absFilename(), ".gls"));
-       unlink(gls);
+       gls.removeFile();
 
        // Also remove the aux file
        FileName const aux(changeExtension(file.absFilename(), ".aux"));
-       unlink(aux);
+       aux.removeFile();
 }
 
 
@@ -189,7 +159,7 @@ int LaTeX::run(TeXErrors & terr)
        bool rerun = false; // rerun requested
 
        // The class LaTeX does not know the temp path.
-       theBufferList().updateIncludedTeXfiles(getcwd().absFilename(),
+       theBufferList().updateIncludedTeXfiles(FileName::getcwd().absFilename(),
                runparams);
 
        // Never write the depfile if an error was encountered.
@@ -291,7 +261,7 @@ int LaTeX::run(TeXErrors & terr)
        if (head.haschanged(idxfile)) {
                // no checks for now
                LYXERR(Debug::LATEX, "Running MakeIndex.");
-               message(_("Running MakeIndex."));
+               message(_("Running Index Processor."));
                // onlyFilename() is needed for cygwin
                rerun |= runMakeIndex(onlyFilename(idxfile.absFilename()),
                                runparams);
@@ -365,7 +335,7 @@ int LaTeX::run(TeXErrors & terr)
        if (head.haschanged(idxfile)) {
                // no checks for now
                LYXERR(Debug::LATEX, "Running MakeIndex.");
-               message(_("Running MakeIndex."));
+               message(_("Running Index Processor."));
                // onlyFilename() is needed for cygwin
                rerun = runMakeIndex(onlyFilename(changeExtension(
                                file.absFilename(), ".idx")), runparams);
@@ -446,12 +416,14 @@ bool LaTeX::runMakeIndexNomencl(FileName const & file,
 {
        LYXERR(Debug::LATEX, "Running MakeIndex for nomencl.");
        message(_("Running MakeIndex for nomencl."));
+       string tmp = lyxrc.nomencl_command + ' ';
        // onlyFilename() is needed for cygwin
-       string const nomenclstr = " -s nomencl.ist -o "
+       tmp += quoteName(onlyFilename(changeExtension(file.absFilename(), nlo)));
+       tmp += " -o "
                + onlyFilename(changeExtension(file.toFilesystemEncoding(), nls));
-       return runMakeIndex(
-                       onlyFilename(changeExtension(file.absFilename(), nlo)),
-                       runparams, nomenclstr);
+       Systemcall one;
+       one.startscript(Systemcall::Wait, tmp);
+       return true;
 }
 
 
@@ -624,6 +596,12 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                        if (contains(token, "Rerun to get cross-references")) {
                                retval |= RERUN;
                                LYXERR(Debug::LATEX, "We should rerun.");
+                       // package clefval needs 2 latex runs before bibtex
+                       } else if (contains(token, "Value of")
+                                  && contains(token, "on page")
+                                  && contains(token, "undefined")) {
+                               retval |= ERROR_RERUN;
+                               LYXERR(Debug::LATEX, "Force rerun.");
                        } else if (contains(token, "Citation")
                                   && contains(token, "on page")
                                   && contains(token, "undefined")) {
@@ -775,12 +753,12 @@ bool handleFoundFile(string const & ff, DepTable & head)
        // (1) foundfile is an
        //     absolute path and should
        //     be inserted.
-       if (absolutePath(foundfile)) {
+       FileName absname(foundfile);
+       if (absname.isAbsolute()) {
                LYXERR(Debug::DEPEND, "AbsolutePath file: " << foundfile);
                // On initial insert we want to do the update at once
                // since this file cannot be a file generated by
                // the latex run.
-               FileName absname(foundfile);
                if (!insertIfExists(absname, head)) {
                        // check for spaces
                        string strippedfile = foundfile;
@@ -803,7 +781,7 @@ bool handleFoundFile(string const & ff, DepTable & head)
        }
 
        string onlyfile = onlyFilename(foundfile);
-       FileName absname(makeAbsPath(onlyfile));
+       absname = makeAbsPath(onlyfile);
 
        // check for spaces
        while (contains(foundfile, ' ')) {