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

Not sure how that happened.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30193 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-06-19 17:51:17 +00:00
parent 2eaac90ca5
commit 1ef0168dd4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetInclude.cpp
View File

@ -629,7 +629,7 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
// For verbatim and listings, we just include the contents of the file as-is.
// In the case of listings, we wrap it in <pre>.
bool const listing = isListings(params();
bool const listing = isListings(params());
if (listing || isVerbatim(params())) {
if (listing)
os << "<pre>\n";
@ -643,6 +643,9 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
// We don't (yet) know how to Input or Include non-LyX files.
// (If we wanted to get really arcane, we could run some tex2html
// converter on the included file. But that's just masochistic.)
string const parent_filename = buffer().absFileName();
FileName const included_file =
makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
if (!isLyXFilename(included_file.absFilename())) {
frontend::Alert::warning(_("Unsupported Inclusion"),
_("LyX does not know how to include non-LyX files when"
@ -655,9 +658,6 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
// Check we're not trying to include ourselves.
// FIXME RECURSIVE INCLUDE
string const parent_filename = buffer().absFileName();
FileName const included_file =
makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
if (buffer().absFileName() == included_file.absFilename()) {
Alert::error(_("Recursive input"),
bformat(_("Attempted to include file %1$s in itself! "