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

ExternalSupport.cpp: fix #4398 (omit the newline in the LaTeX output behind the ExternalInset inset if the inset type is a date)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36654 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-12-02 04:05:35 +00:00
parent ab8516bbb9
commit 0838992dcd
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/ExternalSupport.cpp
View File

@ -381,6 +381,17 @@ int writeExternal(InsetExternalParams const & params,
str = substituteCommands(params, str, format); str = substituteCommands(params, str, format);
str = substituteOptions(params, str, format); str = substituteOptions(params, str, format);
// If the template is a date, we must remove the newline at the end to
// avoid LaTeX errors like the one described in bug #4398
if (params.templatename() == "Date") {
// depending on the OS we have either \r\n or only \n
size_t pos = str.rfind('\r');
if (pos != string::npos)
str.erase(pos);
pos = str.rfind('\n');
if (pos != string::npos)
str.erase(pos);
}
// FIXME UNICODE // FIXME UNICODE
os << from_utf8(str); os << from_utf8(str);
return int(count(str.begin(), str.end(),'\n')); return int(count(str.begin(), str.end(),'\n'));