X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.cpp;h=8085b15a8505b23d0f24cf50ccb971bc1215e9d1;hb=f76d6997b710f7fb5180f0cd05415786de5d9417;hp=e96ed7b0968bd3c8948aefa66551421e40d5b966;hpb=be89d37bd42b9d260e47c9cd50c23fcb9886a870;p=lyx.git diff --git a/src/Converter.cpp b/src/Converter.cpp index e96ed7b096..8085b15a85 100644 --- a/src/Converter.cpp +++ b/src/Converter.cpp @@ -32,7 +32,7 @@ #include "support/lstrings.h" #include "support/os.h" #include "support/Package.h" -#include "support/Path.h" +#include "support/PathChanger.h" #include "support/Systemcall.h" using namespace std; @@ -450,7 +450,6 @@ bool Converters::convert(Buffer const * buffer, command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName()))); command = subst(command, token_orig_from, quoteName(onlyFileName(orig_from.absFileName()))); command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string()); - command = libScriptSearch(command); if (!conv.parselog.empty()) command += " 2> " + quoteName(infile2 + ".out"); @@ -494,8 +493,7 @@ bool Converters::convert(Buffer const * buffer, if (!conv.parselog.empty()) { string const logfile = infile2 + ".log"; - string const script = libScriptSearch(conv.parselog); - string const command2 = script + + string const command2 = conv.parselog + " < " + quoteName(infile2 + ".out") + " > " + quoteName(logfile); one.startscript(Systemcall::Wait, @@ -726,7 +724,7 @@ vector const Converters::getReachable(string const & from, bool const only_viewable, bool const clear_visited, set const & excludes) { - set excluded_numbers;; + set excluded_numbers; set::const_iterator sit = excludes.begin(); set::const_iterator const end = excludes.end();