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

Fix crash with included files

Browse Source 
* src/buffer.C
	(Buffer::makeLaTeXFile): Use runparams.encoding to be consistent

	* src/insets/insetinclude.C
	(InsetInclude::latex): Change runparams.encoding to the encoding of
	the child document for makeLateXFile


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17555 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2007-03-25 16:31:16 +00:00
parent 2ccde85cb5
commit e4fd77faf7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.C
View File

@ -872,7 +872,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
OutputParams const & runparams, OutputParams const & runparams,
bool output_preamble, bool output_body) bool output_preamble, bool output_body)
{ {
string const encoding = params().encoding().iconvName(); string const encoding = runparams.encoding->iconvName();
lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: " lyxerr[Debug::LATEX] << "makeLaTeXFile encoding: "
<< encoding << "..." << endl; << encoding << "..." << endl;

4
src/insets/insetinclude.C
View File

@ -426,9 +426,13 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
// argument. Should we set it to string(), or should makeLaTeXFile // argument. Should we set it to string(), or should makeLaTeXFile
// make use of it somehow? (JMarc 20031002) // make use of it somehow? (JMarc 20031002)
#endif #endif
// The included file might be written in a different encoding
Encoding const * const oldEnc = runparams.encoding;
runparams.encoding = &tmp->params().encoding();
tmp->makeLaTeXFile(writefile, tmp->makeLaTeXFile(writefile,
onlyPath(masterFilename(buffer)), onlyPath(masterFilename(buffer)),
runparams, false); runparams, false);
runparams.encoding = oldEnc;
} else { } else {
// Copy the file to the temp dir, so that .aux files etc. // Copy the file to the temp dir, so that .aux files etc.
// are not created in the original dir. Files included by // are not created in the original dir. Files included by