mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Revert r36654.
I'm not going to wait more, since we want to freeze trunk. http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg163934.html git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36727 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
6a500079e5
commit
82b712c1fc
@ -381,17 +381,6 @@ int writeExternal(InsetExternalParams const & params,
|
||||
|
||||
str = substituteCommands(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
|
||||
os << from_utf8(str);
|
||||
return int(count(str.begin(), str.end(),'\n'));
|
||||
|
Loading…
Reference in New Issue
Block a user