From 8607b61480b8e89b152ffd5fc030a8e58920caa6 Mon Sep 17 00:00:00 2001
From: Gordon Shumway <39967334+oddluck@users.noreply.github.com>
Date: Thu, 25 Jul 2019 15:01:23 -0400
Subject: [PATCH] 1/2 block: more line length optimizations

---
 ASCII/plugin.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/ASCII/plugin.py b/ASCII/plugin.py
index ca3eeec..0a2e3f3 100644
--- a/ASCII/plugin.py
+++ b/ASCII/plugin.py
@@ -980,6 +980,19 @@ class ASCII(callbacks.Plugin):
                         old_color1 = "01"
                         old_color2 = color1
                         old_char = gsval
+                    elif gsval == " " and color1 == old_color1 and old_char == "^^▀" and 'tops' not in optlist:
+                        aimg[k] = aimg[k][:-7]
+                        aimg[k] += "\x03{0},{1}▄ ".format(old_color2, color1)
+                        old_color1 = old_color2
+                        old_color2 = color1
+                        old_char = gsval
+                    elif gsval == " " and color1 == old_color1 and old_char != '█' and 'tops' not in optlist:
+                        aimg[k] += "█"
+                        old_char = '█'
+                    elif gsval == " " and 'tops' not in optlist:
+                        aimg[k] += "\x03{0}█".format(color1)
+                        old_color1 = color1
+                        old_char = '^█'
                     elif gsval != " " and color1 == old_color1 and old_char == '^█' and 'tops' not in optlist:
                         aimg[k] = aimg[k][:-4]
                         aimg[k] += "\x03{0},{1} ▄".format(color2, color1)
@@ -992,13 +1005,12 @@ class ASCII(callbacks.Plugin):
                         old_color1 = color1
                         old_color2 = color2
                         old_char = gsval
-                    elif gsval == " " and color1 == old_color1 and old_char != '█' and 'tops' not in optlist:
-                        aimg[k] += "█"
-                        old_char = '█'
-                    elif gsval == " " and 'tops' not in optlist:
-                        aimg[k] += "\x03{0}█".format(color1)
+                    elif gsval != " " and color1 == old_color2 and color2 == old_color1 and old_char == "^^▀" and 'tops' not in optlist:
+                        aimg[k] = aimg[k][:-7]
+                        aimg[k] += "\x03{0},{1}▄▀".format(color1, color2)
                         old_color1 = color1
-                        old_char = '^█'
+                        old_color2 = color2
+                        old_char = gsval
                     elif gsval != " " and color1 == old_color1 and color2 != old_color2 and old_char == "^^▀" and 'tops' not in optlist:
                         aimg[k] = aimg[k][:-7]
                         aimg[k] += "\x03{0},{1}▄\x03{2}▄".format(old_color2, color1, color2)
@@ -1008,7 +1020,7 @@ class ASCII(callbacks.Plugin):
                     elif gsval != " " and color1 == old_color1 and color2 != old_color2 and old_char == "^▀" and 'tops' not in optlist:
                         aimg[k] = aimg[k][:-4]
                         aimg[k] += "\x03{0},{1}▄\x03{2}▄".format(old_color2, color1, color2)
-                        old_color1 = color2 
+                        old_color1 = color2
                         old_color2 = color1
                         old_char = '▄'
                     elif gsval != " " and color1 == old_color2 and color2 == old_color1 and 'tops' not in optlist:
@@ -1024,7 +1036,7 @@ class ASCII(callbacks.Plugin):
                         if gsval == ' ':
                             old_char = gsval
                         else:
-                             old_char = '^▀'
+                            old_char = '^▀'
                     else:
                         aimg[k] += "\x03{0},{1}{2}".format(color1, color2, gsval)
                         old_color1 = color1
@@ -1032,7 +1044,7 @@ class ASCII(callbacks.Plugin):
                         if gsval == ' ':
                             old_char = gsval
                         else:
-                             old_char = '^^▀'
+                            old_char = '^^▀'
                 aimg[k] = re.sub("\x0301,(\d\d)(\s+)\x03(\d\d)([^,])", "\x03\g<3>,\g<1>\g<2>\g<4>", aimg[k])
                 for i in range(0,98):
                     i = '%02d' % i