From f60992203402cdfe7682dba8166bb09e07e05723 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Tue, 13 Mar 2001 13:40:08 +0000 Subject: [PATCH] Allow including of files with different class than the parent file git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1751 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/ChangeLog | 5 +++++ src/insets/insetinclude.C | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 11d84bbd92..a26eed6f50 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2001-03-13 Dekel Tsur + + * insetinclude.C (Latex): Do not exit when the textclass of the + included file differ from the textclass of the parent file. + 2001-03-12 Angus Leeming * ExternalTemplate.C (read): the reading of external insets now checks diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 47cd6f2e60..556634b91e 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -166,14 +166,14 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os, Buffer * tmp = bufferlist.getBuffer(getFileName()); if (tmp->params.textclass != buffer->params.textclass) { - lyxerr << "ERROR: Cannot handle include file `" + lyxerr << "WARNING: Included file `" << MakeDisplayPath(getFileName()) - << "' which has textclass `" + << "' has textclass `" << textclasslist.NameOfClass(tmp->params.textclass) - << "' instead of `" + << "' while parent file has textclass `" << textclasslist.NameOfClass(buffer->params.textclass) << "'." << endl; - return 0; + //return 0; } // write it to a file (so far the complete file) -- 2.39.2