The branch, master, has been updated. - Log -----------------------------------------------------------------
commit e9879526642085d0a2fc4da3c52642959e9da988 Author: Richard Heck <[email protected]> Date: Mon Mar 4 18:07:48 2013 -0500 Fix stupid mistake that led to bug #8574. diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 9a378b5..e4a5435 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -533,8 +533,28 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const mangledFileName(); } + if (!runparams.nice) + incfile = mangled; + else if (!isValidLaTeXFileName(incfile)) { + frontend::Alert::warning(_("Invalid filename"), + _("The following filename will cause troubles " + "when running the exported file through LaTeX: ") + + from_utf8(incfile)); + } + else if (!isValidDVIFileName(incfile)) { + frontend::Alert::warning(_("Problematic filename for DVI"), + _("The following filename can cause troubles " + "when running the exported file through LaTeX " + "and opening the resulting DVI: ") + + from_utf8(incfile), true); + } + FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath())); + LYXERR(Debug::LATEX, "incfile:" << incfile); + LYXERR(Debug::LATEX, "exportfile:" << exportfile); + LYXERR(Debug::LATEX, "writefile:" << writefile); + string const tex_format = flavor2format(runparams.flavor); switch (type(params())) { @@ -599,25 +619,6 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const // in a comment or doing a dryrun return; - if (!runparams.nice) - incfile = mangled; - else if (!isValidLaTeXFileName(incfile)) { - frontend::Alert::warning(_("Invalid filename"), - _("The following filename will cause troubles " - "when running the exported file through LaTeX: ") + - from_utf8(incfile)); - } - else if (!isValidDVIFileName(incfile)) { - frontend::Alert::warning(_("Problematic filename for DVI"), - _("The following filename can cause troubles " - "when running the exported file through LaTeX " - "and opening the resulting DVI: ") + - from_utf8(incfile), true); - } - LYXERR(Debug::LATEX, "incfile:" << incfile); - LYXERR(Debug::LATEX, "exportfile:" << exportfile); - LYXERR(Debug::LATEX, "writefile:" << writefile); - if (isInputOrInclude(params()) && isLyXFileName(included_file.absFileName())) { // if it's a LyX file and we're inputting or including, ----------------------------------------------------------------------- Summary of changes: src/insets/InsetInclude.cpp | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) hooks/post-receive -- The LyX Source Repository
