This is the merging of the GUI API cleanup branch that was developed in svn+ssh:...

[features.git] / src / support / lstrings.C

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index b4b70f0f0c5f7488abf2e40ad23ada02bca8143a..fe8a86c5a164b6ac86d0d162d1af9d42066b9b58 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -546,6 +546,27 @@ int findToken(char const * const str[], string const & search_token)
 }
 
 
+string const externalLineEnding(string const & str)
+{
+#if defined(__APPLE__)
+       // The MAC clipboard uses \r for lineendings, and we use \n
+       return subst(str, '\n', '\r');
+#elif defined (_WIN32) || (defined (__CYGWIN__) && defined (X_DISPLAY_MISSING))
+       // Windows clipboard uses \r\n for lineendings, and we use \n
+       return subst(str, "\n", "\r\n");
+#else
+       return str;
+#endif
+}
+
+
+string const internalLineEnding(string const & str)
+{
+       string s = subst(str, "\r\n", "\n");
+       return subst(s, '\r', '\n');
+}
+
+
 #ifndef I_AM_NOT_AFRAID_OF_HEADER_LIBRARIES
 #if USE_BOOST_FORMAT