with nonTeXFonts, use xelatex to produce the requested .aux file,

since plain old latex will likely choke on the generated .tex file

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38168 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-03-30 22:37:51 +00:00
parent bdc2dc042f
commit 6946111727
2 changed files with 11 additions and 2 deletions

View File

@ -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);
@ -397,9 +401,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

View File

@ -158,6 +158,8 @@ private:
ConverterList converterlist_;
///
std::string latex_command_;
///
std::string xelatex_command_;
/// If \p from = /path/file.ext and \p to = /path2/file2.ext2 then
/// this method moves each /path/file*.ext file to /path2/file2*.ext2
bool move(std::string const & fmt,