fix newlines getting removed by wrap_text_to_pixels

Author: FoamyGuy

adafruit_display_text/__init__.py

@@ -40,41 +40,52 @@ def measure(string):
     width = measure(indent0)
     swidth = measure(" ")
     firstword = True
-    for word in string.split():
-        wwidth = measure(word)
-        word_parts = []
-        cur_part = ""
-        if wwidth > max_width:
-            if partial:
-                lines.append("".join(partial))
-                partial = []
-            for char in word:
-                if measure(cur_part) + measure(char) + measure("-") > max_width:
-                    word_parts.append(cur_part + "-")
-                    cur_part = char
-                else:
-                    cur_part += char
-            if cur_part:
-                word_parts.append(cur_part)
-            for line in word_parts[:-1]:
-                lines.append(line)
-            partial.append(word_parts[-1])
-            width = measure(word_parts[-1])
-            if firstword:
-                firstword = False
-        else:
-            if firstword:
-                partial.append(word)
-                firstword = False
-                width += wwidth
-            elif width + swidth + wwidth < max_width:
-                partial.append(" ")
-                partial.append(word)
-                width += wwidth + swidth
+    for line_in_input in string.split("\n"):
+
+        print("line: {}".format(line_in_input))
+        for index, word in enumerate(line_in_input.split(" ")):
+            print("word: {}".format(word))
+            wwidth = measure(word)
+            word_parts = []
+            cur_part = ""
+
+            if wwidth > max_width:
+                if partial:
+                    lines.append("".join(partial))
+                    partial = []
+                for char in word:
+                    if measure(cur_part) + measure(char) + measure("-") > max_width:
+                        word_parts.append(cur_part + "-")
+                        cur_part = char
+                    else:
+                        cur_part += char
+                if cur_part:
+                    word_parts.append(cur_part)
+                for line in word_parts[:-1]:
+                    lines.append(line)
+                partial.append(word_parts[-1])
+                width = measure(word_parts[-1])
+                if firstword:
+                    firstword = False
             else:
-                lines.append("".join(partial))
-                partial = [indent1, word]
-                width = measure(indent1) + wwidth
+                if firstword:
+                    partial.append(word)
+                    firstword = False
+                    width += wwidth
+                elif width + swidth + wwidth < max_width:
+                    if index > 0:
+                        partial.append(" ")
+                    partial.append(word)
+                    width += wwidth + swidth
+                else:
+                    lines.append("".join(partial))
+                    partial = [indent1, word]
+                    width = measure(indent1) + wwidth
+
+        lines.append("".join(partial))
+        partial = [indent1]
+        width = measure(indent1)
+
     if partial:
         lines.append("".join(partial))
     return lines