From 6a83eddc4789e408989be809f1d1e6213c2959f2 Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Thu, 4 Oct 2018 14:58:27 -0700
Subject: [PATCH] Ignore carriage returns in map files when mapmerging

---
 tools/mapmerge2/dmm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/mapmerge2/dmm.py b/tools/mapmerge2/dmm.py
index 421ffb4cd12..8bb1dca3537 100644
--- a/tools/mapmerge2/dmm.py
+++ b/tools/mapmerge2/dmm.py
@@ -370,7 +370,7 @@ def _parse(map_raw_text):
             continue
         elif in_comment_line:
             continue
-        elif char == "\t":
+        elif char in "\r\t":
             continue
 
         if char == "/" and not in_quote_block:
@@ -478,6 +478,9 @@ def _parse(map_raw_text):
 
     # grid block
     for char in it:
+        if char == "\r":
+            continue
+
         if in_coord_block:
             if char == ",":
                 if reading_coord == "x":