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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 11d84bbd92588887db1b4e12bd08c712456467b3..a26eed6f5051484e0e75152df19b4e667a23d644 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-13  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * 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  <a.leeming@ic.ac.uk>
 
        * ExternalTemplate.C (read): the reading of external insets now checks

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 47cd6f2e60dab686a3ec605b6a5eccc37544d370..556634b91eb848bb9d0554727ddce604b79691c0 100644 (file)
--- 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)