ExternalSupport.cpp: fix #4398 (omit the newline in the LaTeX output behind the Exter...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36654 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index aa6f51cbe919a1222a6157df140ee3dec00af6cd..d21c3d84abc4ac0f3832da2e10258acc45a851a5 100644 (file)
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -381,6 +381,17 @@ 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'));