split and hyphenate words that are too long for single line

Author: FoamyGuy

adafruit_display_text/__init__.py

@@ -27,18 +27,46 @@ def measure(s):
         # TODO: split words that are larger than max_width
         wwidth = measure(word)
         print("{} - {}".format(word, wwidth))
-        if firstword:
-            partial.append(word)
-            firstword = False
-            width += wwidth
-        elif width + swidth + wwidth < max_width:
-            partial.append(" ")
-            partial.append(word)
-            width += wwidth + swidth
+        part_width = 0
+        word_parts = []
+        cur_part = ""
+        if wwidth > max_width:
+            if partial:
+                lines.append("".join(partial))
+                partial = []
+            for char in word:
+                #print(measure(cur_part) + measure(char) + measure("-"))
+                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)
+            #print(word_parts)
+            for line in word_parts[:-1]:
+                lines.append(line)
+            partial.append(word_parts[-1])
+            width = measure(word_parts[-1])
+            if firstword:
+                firstword = False
+            print("cur_width after splitword: {}".format(width))
+
         else:
-            lines.append("".join(partial))
-            partial = [indent1, word]
-            width = measure(indent1) + wwidth + swidth
+
+            if firstword:
+                partial.append(word)
+                firstword = False
+                width += wwidth
+            elif width + swidth + wwidth < max_width:
+                partial.append(" ")
+                partial.append(word)
+                width += wwidth + swidth
+            else:
+                lines.append("".join(partial))
+                partial = [indent1, word]
+                width = measure(indent1) + wwidth
+            print("cur_width: {}".format(width))
     if partial:
         lines.append("".join(partial))
     return "\n".join(lines)