From f3825d3bd8cd4bdfa637b7278afe86e0a296b879 Mon Sep 17 00:00:00 2001
From: Vhati <tvtronix@yahoo.com>
Date: Sun, 8 Sep 2013 04:02:31 -0400
Subject: [PATCH] Added workaround regexes for sloppyPrint()'s inconsistent
 line endings inside comments

---
 src/main/java/net/vhati/modmanager/core/ModUtilities.java      | 2 ++
 .../net/vhati/modmanager/core/SloppyXMLOutputProcessor.java    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
index 8d7b8e8..b2c369a 100644
--- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java
+++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java
@@ -226,6 +226,7 @@ public class ModUtilities {
 		StringWriter writer = new StringWriter();
 		SloppyXMLOutputProcessor.sloppyPrint( mergedDoc, writer, encoding );
 		String mergedString = writer.toString();
+		mergedString = mergedString.replaceAll( "\r(?!\n)|(?<!\r)\n", "\r\n" );  // sloppyPrint needs normalizing!?
 
 		InputStream result = encodeText( mergedString, encoding, mainDescription+"+"+appendDescription );
 		return result;
@@ -259,6 +260,7 @@ public class ModUtilities {
 		StringWriter writer = new StringWriter();
 		SloppyXMLOutputProcessor.sloppyPrint( doc, writer, encoding );
 		String resultString = writer.toString();
+		resultString = resultString.replaceAll( "\r(?!\n)|(?<!\r)\n", "\r\n" );  // sloppyPrint needs normalizing!?
 
 		InputStream result = encodeText( resultString, encoding, srcDescription+" (cleaned)" );
 		return result;
diff --git a/src/main/java/net/vhati/modmanager/core/SloppyXMLOutputProcessor.java b/src/main/java/net/vhati/modmanager/core/SloppyXMLOutputProcessor.java
index ef85ab1..00f4693 100644
--- a/src/main/java/net/vhati/modmanager/core/SloppyXMLOutputProcessor.java
+++ b/src/main/java/net/vhati/modmanager/core/SloppyXMLOutputProcessor.java
@@ -150,12 +150,13 @@ public class SloppyXMLOutputProcessor extends AbstractXMLOutputProcessor {
 	 * is encoding bytes to match. If encoding is null, the default
 	 * is "UTF-8".
 	 *
-	 * LineEndings will be CR-LF.
+	 * LineEndings will be CR-LF. Except for comments!?
 	 */
 	public static void sloppyPrint( Document doc, Writer writer, String encoding ) throws IOException {
 		Format format = Format.getPrettyFormat();
 		format.setExpandEmptyElements( false );
 		format.setOmitDeclaration( false );
+		format.setIndent( "\t" );
 		format.setLineSeparator( LineSeparator.CRNL );
 
 		if ( encoding != null ) format.setEncoding( encoding );