anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* correctly handle childs with pdflatex.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38044 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2011-03-25 10:11:02 +00:00
parent fff7f3720e
commit 68beae862f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetInclude.cpp
View File

@ -601,7 +601,9 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
tmp->markDepClean(masterBuffer->temppath());
// Don't assume the child's format is latex
string const inc_format = tmp->bufferFormat();
string const inc_format =
(tmp->bufferFormat() == "latex" && tex_format == "pdflatex") ?
"pdflatex" : tmp->bufferFormat();
FileName const tmpwritefile(changeExtension(writefile.absFileName(),
formats.extension(inc_format)));
@ -641,8 +643,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
// Use converters to produce a latex file from the child
ErrorList el;
bool const success =
theConverters().convert(tmp, tmpwritefile, writefile, included_file,
inc_format, tex_format, el);
theConverters().convert(tmp, tmpwritefile, writefile, included_file,
inc_format, tex_format, el);
if (!success) {
docstring msg = bformat(_("Included file `%1$s' "