From 774da359f5b8f4f256f960d815a71dd38d5c6f3b Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+gitlab@mailbox.org>
Date: Tue, 12 Oct 2021 21:18:02 +0200
Subject: [PATCH] Revert "Remove escaping for quote"

This reverts commit 3d93f7c46973931b7023aff53e36272496076708.
---
 examples/de-with-custom-shift-keycap/sq2lv_layouts.c | 2 +-
 examples/es+fr+us/sq2lv_layouts.c                    | 6 +++---
 examples/us-terminal-with-scancodes/sq2lv_layouts.c  | 2 +-
 examples/us/sq2lv_layouts.c                          | 2 +-
 squeek2lvgl.py                                       | 3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
index 94bf72d..69444b2 100644
--- a/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
+++ b/examples/de-with-custom-shift-keycap/sq2lv_layouts.c
@@ -84,7 +84,7 @@ static const int num_keys_numbers_de = 37;
 static const char * const keycaps_numbers_de[] = { \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \
-    "*/=", ";", """, "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \
+    "*/=", ";", "\"", "'", ":", "=", "<", ">", LV_SYMBOL_BACKSPACE, "\n", \
     "abc", "äÄ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ",", ".", LV_SYMBOL_OK, "" \
 };
 
diff --git a/examples/es+fr+us/sq2lv_layouts.c b/examples/es+fr+us/sq2lv_layouts.c
index 97a49d8..5b4fad4 100644
--- a/examples/es+fr+us/sq2lv_layouts.c
+++ b/examples/es+fr+us/sq2lv_layouts.c
@@ -84,7 +84,7 @@ static const int num_keys_numbers_es = 37;
 static const char * const keycaps_numbers_es[] = { \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \
-    "*/=", ",", """, "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \
+    "*/=", ",", "\"", "'", ":", ";", "!", "=", LV_SYMBOL_BACKSPACE, "\n", \
     "abc", "áÁ", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "?", ".", LV_SYMBOL_OK, "" \
 };
 
@@ -308,7 +308,7 @@ static const int num_keys_numbers_fr = 35;
 static const char * const keycaps_numbers_fr[] = { \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "@", "#", "€", "%", "&", "-", "_", "+", "(", ")", "\n", \
-    "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
+    "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
     "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, "âÂ", LV_SYMBOL_OK, "" \
 };
 
@@ -532,7 +532,7 @@ static const int num_keys_numbers_us = 35;
 static const char * const keycaps_numbers_us[] = { \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \
-    "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
+    "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
     "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \
 };
 
diff --git a/examples/us-terminal-with-scancodes/sq2lv_layouts.c b/examples/us-terminal-with-scancodes/sq2lv_layouts.c
index 4b9f09e..8cb62bc 100644
--- a/examples/us-terminal-with-scancodes/sq2lv_layouts.c
+++ b/examples/us-terminal-with-scancodes/sq2lv_layouts.c
@@ -146,7 +146,7 @@ static const char * const keycaps_numbers_terminal_us[] = { \
     "Ctrl", "Alt", LV_SYMBOL_UP, LV_SYMBOL_DOWN, LV_SYMBOL_LEFT, LV_SYMBOL_RIGHT, "\n", \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "*", "#", "$", "/", "&", "-", "_", "+", "(", ")", "\n", \
-    "τ=\", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
+    "τ=\", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
     "ABC", " ", ".", LV_SYMBOL_OK, "" \
 };
 
diff --git a/examples/us/sq2lv_layouts.c b/examples/us/sq2lv_layouts.c
index b7b5dcc..4f36594 100644
--- a/examples/us/sq2lv_layouts.c
+++ b/examples/us/sq2lv_layouts.c
@@ -84,7 +84,7 @@ static const int num_keys_numbers_us = 35;
 static const char * const keycaps_numbers_us[] = { \
     "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "\n", \
     "@", "#", "$", "%", "&", "-", "_", "+", "(", ")", "\n", \
-    "*/=", ",", """, "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
+    "*/=", ",", "\"", "'", ":", ";", "!", "?", LV_SYMBOL_BACKSPACE, "\n", \
     "ABC", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, ".", LV_SYMBOL_OK, "" \
 };
 
diff --git a/squeek2lvgl.py b/squeek2lvgl.py
index 7735f1a..b9debac 100644
--- a/squeek2lvgl.py
+++ b/squeek2lvgl.py
@@ -328,6 +328,7 @@ def is_key_ignored(key):
 
 keycap_for_key = {
     '\\': '\\\\',
+    '"': '\\"',
     '↑': 'LV_SYMBOL_UP',
     '↓': 'LV_SYMBOL_DOWN',
     '←': 'LV_SYMBOL_LEFT',
@@ -489,7 +490,7 @@ scancodes_for_keycap = {
     '(': ['KEY_LEFTSHIFT', 'KEY_9'],
     ')': ['KEY_LEFTSHIFT', 'KEY_0'],
     ',': ['KEY_COMMA'],
-    '"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'],
+    '\\"': ['KEY_LEFTSHIFT', 'KEY_APOSTROPHE'],
     '\'': ['KEY_APOSTROPHE'],
     ':': ['KEY_LEFTSHIFT', 'KEY_SEMICOLON'],
     ';': ['KEY_SEMICOLON'],