get rid of broken_header.h and some unneeded tests

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index de40f6112dc900db01de63875144c513c96a55f9..d63ce35b994b8740e7c0e4f18b2fe36d1bde831a 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -17,6 +17,7 @@
 #include "LaTeX.h"
 #include "bufferlist.h"
 #include "gettext.h"
+#include "lyxrc.h"
 #include "debug.h"
 #include "DepTable.h"
 #include "support/filetools.h"
@@ -43,6 +44,7 @@ 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;
@@ -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;
 
@@ -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)
 {
@@ -275,7 +275,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 +343,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
@@ -394,18 +394,14 @@ int LaTeX::startscript()
 }
 
 
-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;
@@ -446,10 +442,10 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
 
        ifstream ifs(file.c_str());
        string token;
-       regex reg1("\\\\citation\\{([^}]+)\\}");
-       regex reg2("\\\\bibdata\\{([^}]+)\\}");
-       regex reg3("\\\\bibstyle\\{([^}]+)\\}");
-       regex reg4("\\\\@input\\{([^}]+)\\}");
+       static regex const reg1("\\\\citation\\{([^}]+)\\}");
+       static regex const reg2("\\\\bibdata\\{([^}]+)\\}");
+       static regex const reg3("\\\\bibstyle\\{([^}]+)\\}");
+       static regex const reg4("\\\\@input\\{([^}]+)\\}");
 
        while (getline(ifs, token)) {
                token = rtrim(token, "\r");
@@ -528,8 +524,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);
        }
@@ -676,11 +672,8 @@ namespace {
 
 void handleFoundFile(string const & ff, DepTable & head)
 {
-       static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
-
        // convert from native os path to unix path
        string const foundfile = os::internal_path(trim(ff));
-       string const onlyfile = OnlyFilename(foundfile);
 
        lyxerr[Debug::DEPEND] << "Found file: " << foundfile << endl;
 
@@ -701,18 +694,23 @@ void handleFoundFile(string const & ff, DepTable & head)
                // the latex run.
                if (FileInfo(foundfile).exist())
                        head.insert(foundfile, true);
+
+               return;
        }
 
+       string const onlyfile = OnlyFilename(foundfile);
+
        // (2) foundfile is in the tmpdir
        //     insert it into head
-       else if (FileInfo(onlyfile).exist()) {
-               if (regex_match(foundfile, unwanted)) {
+       if (FileInfo(onlyfile).exist()) {
+               static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
+               if (regex_match(onlyfile, unwanted)) {
                        lyxerr[Debug::DEPEND]
                                << "We don't want "
                                << onlyfile
                                << " in the dep file"
                                << endl;
-               } else if (suffixIs(foundfile, ".tex")) {
+               } else if (suffixIs(onlyfile, ".tex")) {
                        // This is a tex file generated by LyX
                        // and latex is not likely to change this
                        // during its runs.
@@ -720,7 +718,7 @@ void handleFoundFile(string const & ff, DepTable & head)
                                << "Tmpdir TeX file: "
                                << onlyfile
                                << endl;
-                       head.insert(foundfile, true);
+                       head.insert(onlyfile, true);
                } else {
                        lyxerr[Debug::DEPEND]
                                << "In tmpdir file:"
@@ -767,7 +765,8 @@ void LaTeX::deplog(DepTable & head)
                string token;
                getline(ifs, token);
                token = rtrim(token, "\r");
-               if (token.empty()) continue;
+               if (token.empty())
+                       continue;
 
                smatch sub;