From 68beae862f6c85c19ae053ef10d29d084906dca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Fri, 25 Mar 2011 10:11:02 +0000 Subject: [PATCH] * correctly handle childs with pdflatex. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38044 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetInclude.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 34b9e7064b..c5d8c3d000 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -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' "