Revert previous commit, which committed too much.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 1563242f147095c13216f64f1aafa206192b54a1..ff1d7093bf53d58554d88fdf79bc8ecad49ae883 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -194,6 +194,10 @@ void Converters::add(string const & from, string const & to,
        if (converter.latex
            && (latex_command_.empty() || converter.latex_flavor == "latex"))
                latex_command_ = subst(command, token_from, "");
+       // Similarly, set xelatex_command to xelatex.
+       if (converter.latex
+           && (xelatex_command_.empty() || converter.latex_flavor == "xelatex"))
+               xelatex_command_ = subst(command, token_from, "");
 
        if (it == converterlist_.end()) {
                converterlist_.push_back(converter);
@@ -303,7 +307,8 @@ bool Converters::convert(Buffer const * buffer,
                        LYXERR(Debug::FILES, "No converter defined! "
                                   "I use convertDefault.py:\n\t" << command);
                        Systemcall one;
-                       one.startscript(Systemcall::Wait, command);
+                       one.startscript(Systemcall::Wait, command, buffer ?
+                                       buffer->filePath() : string());
                        if (to_file.isReadableFile()) {
                                if (conversionflags & try_cache)
                                        ConverterCache::get().add(orig_from,
@@ -333,7 +338,7 @@ bool Converters::convert(Buffer const * buffer,
        runparams.flavor = getFlavor(edgepath);
 
        if (buffer) {
-               runparams.use_japanese = buffer->bufferFormat() == "platex";
+               runparams.use_japanese = buffer->params().bufferFormat() == "platex";
                runparams.use_indices = buffer->params().use_indices;
                runparams.bibtex_command = (buffer->params().bibtex_command == "default") ?
                        string() : buffer->params().bibtex_command;
@@ -397,9 +402,12 @@ bool Converters::convert(Buffer const * buffer,
                } else {
                        if (conv.need_aux && !run_latex
                            && !latex_command_.empty()) {
-                               LYXERR(Debug::FILES, "Running " << latex_command_
+                               string const command = (buffer && buffer->params().useNonTeXFonts) ?
+                                       xelatex_command_ : latex_command_;
+                               LYXERR(Debug::FILES, "Running " << command
                                        << " to update aux file");
-                               runLaTeX(*buffer, latex_command_, runparams, errorList);
+                               if (!runLaTeX(*buffer, command, runparams, errorList))
+                                       return false;
                        }
 
                        // FIXME UNICODE
@@ -412,8 +420,8 @@ bool Converters::convert(Buffer const * buffer,
                        command = subst(command, token_from, quoteName(infile2));
                        command = subst(command, token_base, quoteName(from_base));
                        command = subst(command, token_to, quoteName(outfile2));
-                       command = subst(command, token_path, quoteName(infile.onlyPath().absFileName()));
-                       command = subst(command, token_orig_path, quoteName(orig_from.onlyPath().absFileName()));
+                       command = subst(command, token_path, quoteName(onlyPath(infile.absFileName())));
+                       command = subst(command, token_orig_path, quoteName(onlyPath(orig_from.absFileName())));
                        command = subst(command, token_encoding, buffer ? buffer->params().encoding().iconvName() : string());
                        command = libScriptSearch(command);
 
@@ -436,12 +444,15 @@ bool Converters::convert(Buffer const * buffer,
                        int res;
                        if (dummy) {
                                res = one.startscript(Systemcall::DontWait,
-                                       to_filesystem8bit(from_utf8(command)));
+                                       to_filesystem8bit(from_utf8(command)),
+                                       buffer ? buffer->filePath() : string());
                                // We're not waiting for the result, so we can't do anything
                                // else here.
                        } else {
                                res = one.startscript(Systemcall::Wait,
-                                               to_filesystem8bit(from_utf8(command)));
+                                               to_filesystem8bit(from_utf8(command)),
+                                               buffer ? buffer->filePath()
+                                                      : string());
                                if (!real_outfile.empty()) {
                                        Mover const & mover = getMover(conv.to);
                                        if (!mover.rename(outfile, real_outfile))
@@ -461,7 +472,8 @@ bool Converters::convert(Buffer const * buffer,
                                                " < " + quoteName(infile2 + ".out") +
                                                " > " + quoteName(logfile);
                                        one.startscript(Systemcall::Wait,
-                                               to_filesystem8bit(from_utf8(command2)));
+                                               to_filesystem8bit(from_utf8(command2)),
+                                               buffer->filePath());
                                        if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
                                                return false;
                                }
@@ -605,7 +617,8 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
 
        // do the LaTeX run(s)
        string const name = buffer.latexName();
-       LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
+       LaTeX latex(command, runparams, FileName(makeAbsPath(name)),
+                   buffer.filePath());
        TeXErrors terr;
        ShowMessage show(buffer);
        latex.message.connect(show);
@@ -684,12 +697,20 @@ Converters::getReachableTo(string const & target, bool const clear_visited)
 
 vector<Format const *> const
 Converters::getReachable(string const & from, bool const only_viewable,
-                        bool const clear_visited)
+                        bool const clear_visited, set<string> const & excludes)
 {
+       set<int> excluded_numbers;;
+
+       set<string>::const_iterator sit = excludes.begin();
+       set<string>::const_iterator const end = excludes.end();
+       for (; sit != end; ++sit)
+               excluded_numbers.insert(formats.getNumber(*sit));
+
        vector<int> const & reachables =
                G_.getReachable(formats.getNumber(from),
                                only_viewable,
-                               clear_visited);
+                               clear_visited,
+                               excluded_numbers);
 
        return intToFormat(reachables);
 }
@@ -713,8 +734,9 @@ vector<Format const *> Converters::importableFormats()
 {
        vector<string> l = loaders();
        vector<Format const *> result = getReachableTo(l[0], true);
-       for (vector<string>::const_iterator it = l.begin() + 1;
-            it != l.end(); ++it) {
+       vector<string>::const_iterator it = l.begin() + 1;
+       vector<string>::const_iterator en = l.end();
+       for (; it != en; ++it) {
                vector<Format const *> r = getReachableTo(*it, false);
                result.insert(result.end(), r.begin(), r.end());
        }
@@ -726,8 +748,9 @@ vector<Format const *> Converters::exportableFormats(bool only_viewable)
 {
        vector<string> s = savers();
        vector<Format const *> result = getReachable(s[0], only_viewable, true);
-       for (vector<string>::const_iterator it = s.begin() + 1;
-            it != s.end(); ++it) {
+       vector<string>::const_iterator it = s.begin() + 1;
+       vector<string>::const_iterator en = s.end();
+       for (; it != en; ++it) {
                vector<Format const *> r =
                        getReachable(*it, only_viewable, false);
                result.insert(result.end(), r.begin(), r.end());