anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 05:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow including of files with different class than the parent file

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1751 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Dekel Tsur 2001-03-13 13:40:08 +00:00
parent e328435798
commit f609922034
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/ChangeLog
View File

@ -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> 2001-03-12 Angus Leeming <a.leeming@ic.ac.uk>
* ExternalTemplate.C (read): the reading of external insets now checks * ExternalTemplate.C (read): the reading of external insets now checks

8
src/insets/insetinclude.C
View File

@ -166,14 +166,14 @@ int InsetInclude::Latex(Buffer const * buffer, ostream & os,
Buffer * tmp = bufferlist.getBuffer(getFileName()); Buffer * tmp = bufferlist.getBuffer(getFileName());
if (tmp->params.textclass != buffer->params.textclass) { if (tmp->params.textclass != buffer->params.textclass) {
lyxerr << "ERROR: Cannot handle include file `" lyxerr << "WARNING: Included file `"
<< MakeDisplayPath(getFileName()) << MakeDisplayPath(getFileName())
<< "' which has textclass `" << "' has textclass `"
<< textclasslist.NameOfClass(tmp->params.textclass) << textclasslist.NameOfClass(tmp->params.textclass)
<< "' instead of `" << "' while parent file has textclass `"
<< textclasslist.NameOfClass(buffer->params.textclass) << textclasslist.NameOfClass(buffer->params.textclass)
<< "'." << endl; << "'." << endl;
return 0; //return 0;
} }
// write it to a file (so far the complete file) // write it to a file (so far the complete file)