Added updated font map with more symbols

Author: gfwilliams

libs/graphics/vector_font.c

@@ -16,7 +16,7 @@
 #include "graphics.h"
 
 const uint8_t vfFirstChar = 33;
-const uint8_t vfLastChar = 176;
+const uint8_t vfLastChar = 231;
 #define VF_END_OF_POLY 0xFE
 #define VF_END_OF_CHAR 0xFF
 #define VF_SCALE 12
@@ -48,7 +48,7 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 // 38
 102,88,57,24,6,38,55,70,VF_END_OF_POLY,
 166,164,147,131,116,102,70,84,98,129,145,178,196,198,VF_END_OF_POLY,
-198,184,169,107,105,136,166,VF_END_OF_POLY,
+198,184,169,107,105,136,151,166,VF_END_OF_POLY,
 6,20,51,84,201,203,86,53,38,VF_END_OF_CHAR,
 // 39
 1,3,67,65,VF_END_OF_CHAR,
@@ -58,14 +58,15 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 33,67,100,148,179,209,241,227,197,150,102,53,19,1,VF_END_OF_CHAR,
 // 42
 132,134,6,4,VF_END_OF_POLY,
-36,18,49,67,81,114,100,VF_END_OF_POLY,
-38,24,57,71,89,120,102,VF_END_OF_CHAR,
+120,89,18,49,VF_END_OF_POLY,
+114,81,24,57,VF_END_OF_CHAR,
 // 43
-36,84,81,113,116,164,166,118,121,89,86,38,VF_END_OF_CHAR,
+81,89,121,113,VF_END_OF_POLY,
+38,166,164,36,VF_END_OF_CHAR,
 // 44
 225,227,196,164,162,194,VF_END_OF_CHAR,
 // 45
-81,87,119,113,VF_END_OF_CHAR,
+81,86,118,113,VF_END_OF_CHAR,
 // 46
 161,163,195,193,VF_END_OF_CHAR,
 // 47
@@ -84,8 +85,9 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 18,49,51,36,4,VF_END_OF_POLY,
 178,145,147,164,196,VF_END_OF_CHAR,
 // 52
-6,118,113,145,150,198,200,152,153,121,120,8,VF_END_OF_POLY,
-113,115,8,6,VF_END_OF_CHAR,
+6,198,200,8,VF_END_OF_POLY,
+113,115,8,6,VF_END_OF_POLY,
+113,121,153,145,VF_END_OF_CHAR,
 // 53
 115,113,1,9,41,35,83,100,VF_END_OF_POLY,
 82,68,70,88,121,153,184,198,196,164,166,151,119,102,100,VF_END_OF_POLY,
@@ -128,7 +130,7 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 10,28,62,95,143,174,188,187,156,141,109,76,59,41,VF_END_OF_CHAR,
 // 65
 195,193,5,7,VF_END_OF_POLY,
-7,54,152,201,203,VF_END_OF_POLY,
+7,54,201,203,VF_END_OF_POLY,
 116,147,153,120,VF_END_OF_CHAR,
 // 66
 1,193,195,3,VF_END_OF_POLY,
@@ -152,7 +154,7 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 1,193,195,115,120,88,83,3,VF_END_OF_POLY,
 8,10,202,200,VF_END_OF_CHAR,
 // 73
-2,1,33,34,162,161,193,197,165,164,36,37,5,4,VF_END_OF_CHAR,
+1,33,34,162,161,193,197,165,164,36,37,5,VF_END_OF_CHAR,
 // 74
 199,196,178,145,131,164,147,165,166,VF_END_OF_POLY,
 10,154,185,199,166,152,167,136,8,VF_END_OF_CHAR,
@@ -181,8 +183,7 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 39,38,52,83,115,148,166,167,200,197,179,162,129,65,34,19,5,8,VF_END_OF_CHAR,
 // 82
 1,193,195,3,VF_END_OF_POLY,
-35,38,55,87,102,99,131,134,120,89,57,24,6,3,VF_END_OF_POLY,
-117,200,202,119,VF_END_OF_CHAR,
+35,38,55,87,102,99,131,134,117,200,202,119,135,120,89,57,24,6,3,VF_END_OF_CHAR,
 // 83
 4,18,49,65,98,116,118,135,151,166,164,196,198,184,153,137,104,86,84,67,51,36,38,6,VF_END_OF_POLY,
 147,164,196,178,145,VF_END_OF_POLY,
@@ -240,8 +241,8 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 // 102
 194,98,97,65,66,50,19,5,6,38,37,52,68,70,102,100,196,VF_END_OF_CHAR,
 // 103
-213,212,195,193,226,244,245,231,200,56,54,70,85,102,134,149,166,198,VF_END_OF_POLY,
-85,84,99,131,148,149,167,181,180,162,129,97,66,52,53,71,VF_END_OF_CHAR,
+213,212,194,209,226,244,245,231,200,72,70,86,101,118,150,165,182,198,VF_END_OF_POLY,
+101,100,115,147,164,165,183,197,196,178,145,113,82,68,69,87,VF_END_OF_CHAR,
 // 104
 100,101,118,198,200,120,87,69,68,82,VF_END_OF_POLY,
 83,3,1,193,195,115,100,VF_END_OF_CHAR,
@@ -311,9 +312,9 @@ static const uint8_t vfPolys[] IN_FLASH_MEMORY = {
 // 127
 VF_END_OF_CHAR,
 // 128
-39,38,52,68,70,86,84,116,118,134,132,148,166,167,200,197,179,162,130,128,112,114,82,80,64,66,34,19,5,8,VF_END_OF_POLY,
-167,200,186,171,153,VF_END_OF_POLY,
-39,8,26,43,57,VF_END_OF_CHAR,
+6,20,35,66,82,81,97,98,114,113,129,130,163,180,198,201,168,167,149,132,137,121,116,100,105,89,84,53,39,40,9,VF_END_OF_POLY,
+168,201,187,154,VF_END_OF_POLY,
+40,9,27,58,VF_END_OF_CHAR,
 // 129
 VF_END_OF_CHAR,
 // 130
@@ -379,38 +380,197 @@ VF_END_OF_CHAR,
 // 160
 VF_END_OF_CHAR,
 // 161
-VF_END_OF_CHAR,
+65,67,35,33,VF_END_OF_POLY,
+225,227,99,97,VF_END_OF_CHAR,
 // 162
-VF_END_OF_CHAR,
+53,71,104,102,85,VF_END_OF_POLY,
+180,162,129,97,66,52,84,99,131,148,VF_END_OF_POLY,
+149,134,136,167,181,VF_END_OF_POLY,
+36,37,197,196,VF_END_OF_CHAR,
 // 163
-VF_END_OF_CHAR,
+38,55,41,24,6,VF_END_OF_POLY,
+130,50,19,5,6,38,37,52,132,163,169,201,193,161,VF_END_OF_POLY,
+81,87,119,113,VF_END_OF_CHAR,
 // 164
-VF_END_OF_CHAR,
+97,66,49,34,51,37,70,68,83,115,132,134,165,147,162,145,130,VF_END_OF_POLY,
+105,72,57,40,55,37,70,87,119,134,165,151,168,153,136,VF_END_OF_CHAR,
 // 165
-VF_END_OF_CHAR,
+11,119,199,197,117,9,VF_END_OF_POLY,
+1,117,119,3,VF_END_OF_POLY,
+98,106,122,114,VF_END_OF_POLY,
+130,138,154,146,VF_END_OF_CHAR,
 // 166
-VF_END_OF_CHAR,
+145,147,243,241,VF_END_OF_POLY,
+1,3,99,97,VF_END_OF_CHAR,
 // 167
 VF_END_OF_CHAR,
 // 168
-VF_END_OF_CHAR,
+33,1,3,35,VF_END_OF_POLY,
+37,5,7,39,VF_END_OF_CHAR,
 // 169
-VF_END_OF_CHAR,
+25,21,35,66,130,163,181,185,201,197,179,162,129,65,34,19,5,9,VF_END_OF_POLY,
+25,43,76,140,171,185,201,187,172,141,77,44,27,9,VF_END_OF_POLY,
+168,166,148,115,83,52,38,40,72,70,85,117,134,136,VF_END_OF_POLY,
+40,58,91,89,72,VF_END_OF_POLY,
+136,121,123,154,168,VF_END_OF_CHAR,
 // 170
 VF_END_OF_CHAR,
 // 171
-VF_END_OF_CHAR,
+68,113,164,149,115,85,VF_END_OF_POLY,
+71,116,167,152,118,88,VF_END_OF_CHAR,
 // 172
-VF_END_OF_CHAR,
+81,113,119,167,169,89,VF_END_OF_CHAR,
 // 173
 VF_END_OF_CHAR,
 // 174
-VF_END_OF_CHAR,
+25,21,35,66,130,163,181,185,201,197,179,162,129,65,34,19,5,9,VF_END_OF_POLY,
+25,43,76,140,171,185,201,187,172,141,77,44,27,9,VF_END_OF_POLY,
+36,164,166,38,VF_END_OF_POLY,
+70,72,104,102,134,136,119,168,170,121,106,74,40,38,VF_END_OF_CHAR,
 // 175
-VF_END_OF_CHAR,
+1,9,41,33,VF_END_OF_CHAR,
 // 176
-3,5,22,54,69,67,51,53,21,19,VF_END_OF_POLY,
-67,50,18,3,VF_END_OF_CHAR,
+2,4,21,53,68,66,50,52,20,18,VF_END_OF_POLY,
+66,49,17,2,VF_END_OF_CHAR,
+// 177
+20,68,65,97,100,148,150,102,105,73,70,22,VF_END_OF_POLY,
+161,169,201,193,VF_END_OF_CHAR,
+// 178
+VF_END_OF_CHAR,
+// 179
+VF_END_OF_CHAR,
+// 180
+5,3,49,51,VF_END_OF_CHAR,
+// 181
+165,164,178,196,197,183,VF_END_OF_POLY,
+182,198,200,72,70,150,165,VF_END_OF_POLY,
+179,243,241,65,67,147,164,VF_END_OF_CHAR,
+// 182
+VF_END_OF_CHAR,
+// 183
+113,115,147,145,VF_END_OF_CHAR,
+// 184
+194,195,212,228,243,241,225,226,211,227,210,VF_END_OF_CHAR,
+// 185
+VF_END_OF_CHAR,
+// 186
+VF_END_OF_CHAR,
+// 187
+69,120,165,148,118,84,VF_END_OF_POLY,
+66,117,162,145,115,81,VF_END_OF_CHAR,
+// 188
+9,11,196,194,VF_END_OF_POLY,
+67,66,82,85,69,68,4,3,VF_END_OF_POLY,
+18,3,19,34,VF_END_OF_POLY,
+167,183,187,171,168,122,121,VF_END_OF_POLY,
+121,201,202,122,VF_END_OF_CHAR,
+// 189
+9,11,196,194,VF_END_OF_POLY,
+203,187,185,155,139,122,120,136,138,154,184,200,VF_END_OF_POLY,
+67,66,82,85,69,68,4,3,VF_END_OF_POLY,
+18,3,19,34,VF_END_OF_CHAR,
+// 190
+9,11,196,194,VF_END_OF_POLY,
+167,183,187,171,168,122,121,VF_END_OF_POLY,
+121,201,202,122,VF_END_OF_POLY,
+2,18,20,36,35,51,52,68,66,82,84,69,53,36,52,37,21,4,VF_END_OF_CHAR,
+// 191
+216,185,183,198,230,VF_END_OF_POLY,
+230,198,196,179,163,148,149,134,102,100,116,130,161,177,210,228,VF_END_OF_POLY,
+70,68,36,38,VF_END_OF_CHAR,
+// 192
+VF_END_OF_CHAR,
+// 193
+VF_END_OF_CHAR,
+// 194
+VF_END_OF_CHAR,
+// 195
+VF_END_OF_CHAR,
+// 196
+VF_END_OF_CHAR,
+// 197
+VF_END_OF_CHAR,
+// 198
+195,193,6,8,VF_END_OF_POLY,
+7,119,116,147,151,199,205,173,169,121,124,92,89,41,45,13,VF_END_OF_CHAR,
+// 199
+4,18,33,64,128,161,178,196,197,213,230,214,229,228,244,246,231,215,198,199,166,165,147,114,82,51,37,38,7,VF_END_OF_POLY,
+166,199,185,170,152,VF_END_OF_POLY,
+38,7,25,42,56,VF_END_OF_CHAR,
+// 200
+VF_END_OF_CHAR,
+// 201
+VF_END_OF_CHAR,
+// 202
+VF_END_OF_CHAR,
+// 203
+VF_END_OF_CHAR,
+// 204
+VF_END_OF_CHAR,
+// 205
+VF_END_OF_CHAR,
+// 206
+VF_END_OF_CHAR,
+// 207
+VF_END_OF_CHAR,
+// 208
+36,38,56,89,121,152,166,164,196,199,185,170,139,75,42,25,7,4,VF_END_OF_POLY,
+4,2,194,196,VF_END_OF_POLY,
+81,86,118,113,VF_END_OF_CHAR,
+// 209
+VF_END_OF_CHAR,
+// 210
+VF_END_OF_CHAR,
+// 211
+VF_END_OF_CHAR,
+// 212
+VF_END_OF_CHAR,
+// 213
+VF_END_OF_CHAR,
+// 214
+VF_END_OF_CHAR,
+// 215
+49,34,153,168,VF_END_OF_POLY,
+40,57,162,145,VF_END_OF_CHAR,
+// 216
+39,38,52,83,115,148,166,167,200,197,179,162,129,65,34,19,5,8,VF_END_OF_POLY,
+39,57,90,122,153,167,200,186,171,140,76,43,26,8,VF_END_OF_POLY,
+193,10,12,195,VF_END_OF_CHAR,
+// 217
+VF_END_OF_CHAR,
+// 218
+VF_END_OF_CHAR,
+// 219
+VF_END_OF_CHAR,
+// 220
+VF_END_OF_CHAR,
+// 221
+VF_END_OF_CHAR,
+// 222
+1,3,195,193,VF_END_OF_POLY,
+163,166,152,121,89,56,38,35,67,70,87,119,134,131,VF_END_OF_CHAR,
+// 223
+36,37,54,70,85,101,118,135,151,166,164,196,198,184,169,137,120,103,87,72,56,23,5,4,VF_END_OF_POLY,
+18,49,193,195,51,36,4,VF_END_OF_CHAR,
+// 224
+VF_END_OF_CHAR,
+// 225
+VF_END_OF_CHAR,
+// 226
+VF_END_OF_CHAR,
+// 227
+VF_END_OF_CHAR,
+// 228
+VF_END_OF_CHAR,
+// 229
+VF_END_OF_CHAR,
+// 230
+73,105,106,123,115,145,161,195,197,165,164,147,163,148,157,125,92,74,VF_END_OF_POLY,
+68,82,99,101,118,150,165,197,183,201,202,188,171,169,152,120,105,73,87,69,VF_END_OF_CHAR,
+// 231
+69,87,120,118,101,VF_END_OF_POLY,
+68,82,113,145,178,196,212,229,213,228,227,243,245,230,214,197,165,164,147,115,100,101,69,VF_END_OF_POLY,
+165,150,152,183,197,VF_END_OF_CHAR,
 };
 
 static const uint8_t vfAccentPolys[] IN_FLASH_MEMORY = {
@@ -428,43 +588,45 @@ static const uint8_t vfAccentPolys[] IN_FLASH_MEMORY = {
 // 245
 69,71,88,120,135,133,117,119,87,85,VF_END_OF_POLY,
 133,116,84,69,VF_END_OF_CHAR,
+// 246
+65,67,195,193,VF_END_OF_CHAR,
 
 };
-static const uint8_t vfAccentPolyIndices[] = {0,5,10,17,26,36};
+static const uint8_t vfAccentPolyIndices[] = {0,5,10,17,26,36,52};
 
 static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *accentX, int *accentY) {
   unsigned char ch = (unsigned char)sch;
   if (ch>=192) {
-    // 012345 correspond to 0=grave,1=acute,2=circumflex,3=tilde,4=umlaut,5=ring
-    char *chrMap = "AAAAAAACEEEEIIIIDNOOOOOxOUUUUYIBaaaaaaaceeeeiiiionooooo-ouuuuyly";
-    char *accMap = "012345E,01240124-301234 /01241o 012345e,01240124+301234:/01241p4";
+    // 012345 correspond to 0=grave,1=acute,2=circumflex,3=tilde,4=umlaut,5=ring,6=i without dot
+    char *chrMap = "AAAAAA  EEEEIIII NOOOOO  UUUUY  aaaaaa  eeeeiiiionooooo  uuuuy y";
+    char *accMap = "012345  01240124 301234  01241  012345  01240124+301234  01241 4";
     if (ch>=192) {
       int i = ch-192;
-      ch = (unsigned char)chrMap[i];
-      if (accentPtr) {
-        char acc = accMap[i];
-        *accentX = 0;
-        *accentY = 0;
-        if (acc>='0' && acc<='5') {
-          *accentPtr = &vfAccentPolys[vfAccentPolyIndices[acc-'0']];
-          if (ch>='a' && ch<='z') { // lowercase
-            *accentX = -2;
-            *accentY = -4;
-          } else { // uppercase
-            *accentY = -8;
+      unsigned char chReplacement = (unsigned char)chrMap[i];
+      if (chReplacement!=' ') {
+        ch = chReplacement;
+        if (accentPtr) {
+          char acc = accMap[i];
+          *accentX = 0;
+          *accentY = 0;
+          if (acc>='0' && acc<='5') {
+            *accentPtr = &vfAccentPolys[vfAccentPolyIndices[acc-'0']];
+            if (ch>='a' && ch<='z') { // lowercase
+              *accentX = -2;
+              *accentY = -4;
+            } else { // uppercase
+              *accentY = -8;
+            }
+            if (ch=='I') *accentX -= 3;
+            if (ch=='i') {
+              *accentX -= 2;
+              return &vfAccentPolys[vfAccentPolyIndices[6]]; // use i without .
+            }
+          } else if (acc!=' ') {
+            *accentPtr = vfGetCharPtr(acc, NULL,NULL,NULL);
+            if (acc=='+') *accentY = -4;
           }
-          if (ch=='I') *accentX -= 3;
-          if (ch=='i') *accentX -= 2;
-        } else if (acc!=' ') {
-          *accentPtr = vfGetCharPtr(acc, NULL,NULL,NULL);
-          if (acc=='E') *accentX = 8;
-          if (acc=='e') *accentX = 4;
-          if (acc==',') *accentX = 4;
-          if (acc=='+') *accentY = -4;
-          if (acc==':') { *accentX = 2;*accentY = -2; }
-          if (acc=='o') { *accentX = 2;*accentY = -1; }
         }
-
       }
     }
   }
@@ -485,7 +647,7 @@ static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *acc
 unsigned int vfDrawCharPtr(JsGraphics *gfx, int x1, int y1, int size, const uint8_t *charPtr) {
   x1 = x1<<4;
   y1 = y1<<4;
-  short poly[60];
+  short poly[62];
   int polyLen = 0;
   int w = 0;
   while (*charPtr!=VF_END_OF_CHAR) {