* Replace all use of 'slashify_path' with 'internal_path'.

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 419cdcacd021b597f3150cde2c3d029f0dd38295..8609c3ed53dc20f92c5167fc0305b71f8574d928 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
@@ -383,22 +384,19 @@ 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;
-        string tmp = lyxrc.index_command + " ";
+       string tmp = lyxrc.index_command + " ";
+       tmp = subst(tmp, "$$lang", runparams.document_language);
        tmp += QuoteName(f);
        Systemcall one;
        one.startscript(Systemcall::Wait, tmp);