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 4a54f6e4926031963924f3a011003f50bc13882b..d63ce35b994b8740e7c0e4f18b2fe36d1bde831a 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -44,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;
@@ -274,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
@@ -342,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
@@ -393,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;
@@ -528,7 +525,7 @@ bool LaTeX::runBibTeX(vector<Aux_Info> const & bibtex_info)
                result = true;
 
                string tmp = lyxrc.bibtex_command + " ";
-               tmp += OnlyFilename(ChangeExtension(it->aux_file, string()));
+               tmp += QuoteName(OnlyFilename(ChangeExtension(it->aux_file, string())));
                Systemcall one;
                one.startscript(Systemcall::Wait, tmp);
        }