Browse Source

Removed LF-CR, because it can still be loaded by ignoring CR.

David Piuva 5 years ago
parent
commit
8f1a5335d0
2 changed files with 2 additions and 6 deletions
  1. 0 5
      Source/DFPSR/base/text.cpp
  2. 2 1
      Source/DFPSR/base/text.h

+ 0 - 5
Source/DFPSR/base/text.cpp

@@ -514,9 +514,6 @@ static void writeCharacterToStream(std::ostream &target, String content) {
 			if (lineEncoding == LineEncoding::CrLf) {
 				encodeCharacterToStream<characterEncoding>(target, U'\r');
 				encodeCharacterToStream<characterEncoding>(target, U'\n');
-			} else if (lineEncoding == LineEncoding::LfCr) {
-				encodeCharacterToStream<characterEncoding>(target, U'\n');
-				encodeCharacterToStream<characterEncoding>(target, U'\r');
 			} else { // Assuming that lineEncoding == LineEncoding::Lf
 				encodeCharacterToStream<characterEncoding>(target, U'\n');
 			}
@@ -534,8 +531,6 @@ static void writeCharacterToStream(std::ostream &target, String content) {
 		WRITE_TEXT_STRING(CHAR_ENCODING, LineEncoding::CrLf); \
 	} else if (lineEncoding == LineEncoding::Lf) { \
 		WRITE_TEXT_STRING(CHAR_ENCODING, LineEncoding::Lf); \
-	} else if (lineEncoding == LineEncoding::LfCr) { \
-		WRITE_TEXT_STRING(CHAR_ENCODING, LineEncoding::LfCr); \
 	}
 void dsr::string_save(const ReadableString& filename, const ReadableString& content, CharacterEncoding characterEncoding, LineEncoding lineEncoding) {
 	// TODO: Load files using Unicode filenames

+ 2 - 1
Source/DFPSR/base/text.h

@@ -47,7 +47,8 @@ enum class CharacterEncoding {
 // A line-feed without a line-feed character is nonsense
 // LineEncoding allow re-adding carriage-return before or after each line-break when saving
 enum class LineEncoding {
-	CrLf, Lf, LfCr
+	CrLf, // Microsoft Windows compatible (Can also be read on other platforms by ignoring carriage return)
+	Lf // Linux and Macintosh compatible (Might not work on non-portable text editors on Microsoft Windows)
 };
 
 class ReadableString {