Skip to content

Commit 8ff3977

Browse files
committed
Minor font tweaks, add changelog
1 parent e3bf223 commit 8ff3977

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

libs/graphics/vector_font.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *acc
435435
unsigned char ch = (unsigned char)sch;
436436
if (ch>=192) {
437437
// 012345 correspond to 0=grave,1=acute,2=circumflex,3=tilde,4=umlaut,5=ring
438-
char *chrMap = "AAAAAAACEEEEIIIIDNOOOOOxOUUUUYIBaaaaaaaceeeeiiiionooooo-ouuuuyIy";
439-
char *accMap = "012345E,01240124-301234 /01241o 012345e,01240124+301234:/01241o4";
438+
char *chrMap = "AAAAAAACEEEEIIIIDNOOOOOxOUUUUYIBaaaaaaaceeeeiiiionooooo-ouuuuyly";
439+
char *accMap = "012345E,01240124-301234 /01241o 012345e,01240124+301234:/01241p4";
440440
if (ch>=192) {
441441
int i = ch-192;
442442
ch = (unsigned char)chrMap[i];
@@ -448,16 +448,20 @@ static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *acc
448448
*accentPtr = &vfAccentPolys[vfAccentPolyIndices[acc-'0']];
449449
if (ch>='a' && ch<='z') { // lowercase
450450
*accentX = -2;
451-
*accentY = -5;
451+
*accentY = -4;
452452
} else {
453-
*accentY = -10;
453+
*accentY = -9;
454454
}
455+
if (ch=='I') *accentX -= 3;
456+
if (ch=='i') *accentX -= 2;
455457
} else if (acc!=' ') {
456458
*accentPtr = vfGetCharPtr(acc, NULL,NULL,NULL);
457459
if (acc=='E') *accentX = 8;
458460
if (acc=='e') *accentX = 4;
459461
if (acc==',') *accentX = 4;
460462
if (acc=='+') *accentY = -4;
463+
if (acc==':') { *accentX = 2;*accentY = -2; }
464+
if (acc=='o') { *accentX = 2;*accentY = -1; }
461465
}
462466

463467
}

scripts/build_vector_font.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *acc
311311
unsigned char ch = (unsigned char)sch;
312312
if (ch>=192) {
313313
// 012345 correspond to 0=grave,1=acute,2=circumflex,3=tilde,4=umlaut,5=ring
314-
char *chrMap = "AAAAAAACEEEEIIIIDNOOOOOxOUUUUYIBaaaaaaaceeeeiiiionooooo-ouuuuyIy";
315-
char *accMap = "012345E,01240124-301234 /01241o 012345e,01240124+301234:/01241o4";
314+
char *chrMap = "AAAAAAACEEEEIIIIDNOOOOOxOUUUUYIBaaaaaaaceeeeiiiionooooo-ouuuuyly";
315+
char *accMap = "012345E,01240124-301234 /01241o 012345e,01240124+301234:/01241p4";
316316
if (ch>=192) {
317317
int i = ch-192;
318318
ch = (unsigned char)chrMap[i];
@@ -324,16 +324,20 @@ static const uint8_t *vfGetCharPtr(char sch, const uint8_t **accentPtr, int *acc
324324
*accentPtr = &vfAccentPolys[vfAccentPolyIndices[acc-'0']];
325325
if (ch>='a' && ch<='z') { // lowercase
326326
*accentX = -2;
327-
*accentY = -5;
327+
*accentY = -4;
328328
} else {
329-
*accentY = -10;
329+
*accentY = -9;
330330
}
331+
if (ch=='I') *accentX -= 3;
332+
if (ch=='i') *accentX -= 2;
331333
} else if (acc!=' ') {
332334
*accentPtr = vfGetCharPtr(acc, NULL,NULL,NULL);
333335
if (acc=='E') *accentX = 8;
334336
if (acc=='e') *accentX = 4;
335337
if (acc==',') *accentX = 4;
336338
if (acc=='+') *accentY = -4;
339+
if (acc==':') { *accentX = 2;*accentY = -2; }
340+
if (acc=='o') { *accentX = 2;*accentY = -1; }
337341
}
338342
339343
}

scripts/fontmap_v0.3.svg

Lines changed: 2 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)