From 0eccd6515ff0a0c69a93d63feedea8bd58b6d8b9 Mon Sep 17 00:00:00 2001
From: Christopher Haster <geky@geky.net>
Date: Fri, 20 Jan 2023 02:45:47 -0600
Subject: [PATCH] In plot.py/plotmpl.py, allowed escaped commas in certain
 comma-separated fields

---
 scripts/plot.py    | 21 +++++++++++++--------
 scripts/plotmpl.py | 28 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/scripts/plot.py b/scripts/plot.py
index 72c496c0..4a34f415 100755
--- a/scripts/plot.py
+++ b/scripts/plot.py
@@ -1410,6 +1410,7 @@ def main(csv_paths, *,
 if __name__ == "__main__":
     import sys
     import argparse
+    import re
     parser = argparse.ArgumentParser(
         description="Plot CSV files in terminal.",
         allow_abbrev=False)
@@ -1476,8 +1477,10 @@ if __name__ == "__main__":
         help="Characters to use for lines.")
     parser.add_argument(
         '--labels',
-        type=lambda x: [x.strip() for x in x.split(',')],
-        help="Comma-separated legend labels.")
+        type=lambda x: [x.strip().replace('\,',',')
+            for x in re.split(r'(?<!\\),', x)],
+        help="Comma-separated legend labels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '-W', '--width',
         nargs='?',
@@ -1533,16 +1536,18 @@ if __name__ == "__main__":
         help="Add a label to the y-axis.")
     parser.add_argument(
         '--xticklabels',
-        type=lambda x:
-            [x.strip() for x in x.split(',')]
+        type=lambda x: [x.strip().replace('\,',',')
+                for x in re.split(r'(?<!\\),', x)]
             if x.strip() else [],
-        help="Comma separated xticklabels.")
+        help="Comma separated xticklabels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '--yticklabels',
-        type=lambda x:
-            [x.strip() for x in x.split(',')]
+        type=lambda x: [x.strip().replace('\,',',')
+                for x in re.split(r'(?<!\\),', x)]
             if x.strip() else [],
-        help="Comma separated yticklabels.")
+        help="Comma separated yticklabels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '-t', '--title',
         help="Add a title.")
diff --git a/scripts/plotmpl.py b/scripts/plotmpl.py
index dbfb58d2..e909cf26 100755
--- a/scripts/plotmpl.py
+++ b/scripts/plotmpl.py
@@ -1071,6 +1071,7 @@ def main(csv_paths, output, *,
 if __name__ == "__main__":
     import sys
     import argparse
+    import re
     parser = argparse.ArgumentParser(
         description="Plot CSV files with matplotlib.",
         allow_abbrev=False)
@@ -1137,13 +1138,16 @@ if __name__ == "__main__":
         help="Comma-separated hex colors to use.")
     parser.add_argument(
         '--formats',
-        type=lambda x: [x.strip().replace('0',',') for x in x.split(',')],
-        help="Comma-separated matplotlib formats to use. Allows '0' as an "
-            "alternative for ','.")
+        type=lambda x: [x.strip().replace('\,',',')
+            for x in re.split(r'(?<!\\),', x)],
+        help="Comma-separated matplotlib formats to use. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '--labels',
-        type=lambda x: [x.strip() for x in x.split(',')],
-        help="Comma-separated legend labels.")
+        type=lambda x: [x.strip().replace('\,',',')
+            for x in re.split(r'(?<!\\),', x)],
+        help="Comma-separated legend labels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '-W', '--width',
         type=lambda x: int(x, 0),
@@ -1206,16 +1210,18 @@ if __name__ == "__main__":
         help="Add a label to the y-axis.")
     parser.add_argument(
         '--xticklabels',
-        type=lambda x:
-            [x.strip() for x in x.split(',')]
+        type=lambda x: [x.strip().replace('\,',',')
+                for x in re.split(r'(?<!\\),', x)]
             if x.strip() else [],
-        help="Comma separated xticklabels.")
+        help="Comma separated xticklabels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '--yticklabels',
-        type=lambda x:
-            [x.strip() for x in x.split(',')]
+        type=lambda x: [x.strip().replace('\,',',')
+                for x in re.split(r'(?<!\\),', x)]
             if x.strip() else [],
-        help="Comma separated yticklabels.")
+        help="Comma separated yticklabels. Allows '\,' as an "
+            "alternative for a literal ','.")
     parser.add_argument(
         '-t', '--title',
         help="Add a title.")