Adjust built-in font sizes to ensure better vertical alignment

Author: gfwilliams

boards/BANGLEJS2.py

@@ -69,10 +69,10 @@
      'DEFINES += -DESPR_NO_LINE_NUMBERS=1', # we execute mainly from flash, so line numbers can be worked out
      'INCLUDE += -I$(ROOT)/libs/banglejs -I$(ROOT)/libs/misc',
      'WRAPPERSOURCES += libs/banglejs/jswrap_bangle.c',
-     'WRAPPERSOURCES += libs/graphics/jswrap_font_15.c',
-     'WRAPPERSOURCES += libs/graphics/jswrap_font_19.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_14.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_17.c',
      'WRAPPERSOURCES += libs/graphics/jswrap_font_22.c',
-     'WRAPPERSOURCES += libs/graphics/jswrap_font_30.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_28.c',
      'WRAPPERSOURCES += libs/graphics/jswrap_font_6x15.c',
      'WRAPPERSOURCES += libs/graphics/jswrap_font_12x20.c',
      'SOURCES += libs/misc/nmea.c',

libs/graphics/font/README.md

@@ -32,10 +32,10 @@ The vector font is stored in `fontmap_13x19.svg` and is decoded with `build_vect
 These fonts are used by Bangle.js 2. These are turned into Espruino files (embedded `pbf` fonts) with the following commands:
 
 ```
-node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22
-node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_24_bold.pbff --range All --height 19 --shiftUp 8 --nudge --debug --spaceWidth 3 --opbfc 19
-node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_bold.pbff --range All --height 15 --shiftUp 7 --nudge --debug --spaceWidth 3 --opbfc 15
-node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_doubled.pbff --range All --height 30 --spaceWidth 6 --opbfc 30
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22 --test "Hello World"
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_24_bold.pbff --range All --height 17 --shiftUp 10 --nudge --debug --spaceWidth 3 --opbfc 17 --test "Hello World"
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_bold.pbff --range All --height 14 --shiftUp 7 --nudge --debug --spaceWidth 3 --opbfc 14 --test "Hello World"
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_doubled.pbff --range All --height 28 --spaceWidth 6 --opbfc 28 --test "Hello World"
 ```
 
 `renaissance_18_doubled.pbff` was originally created with:

libs/graphics/jswrap_font_15.c libs/graphics/jswrap_font_14.c

@@ -8,12 +8,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * ----------------------------------------------------------------------------
- * Generated by EspruinoWebTools/cli/fontconverter.js /home/gw/workspace/EspruinoCode/fonts/renaissance/files/renaissance_18_bold.pbff --range All --height 15 --shiftUp 7 --nudge --debug --spaceWidth 3 --opbfc 15
+ * Generated by EspruinoWebTools/cli/fontconverter.js renaissance_18_bold.pbff --range All --height 14 --shiftUp 7 --nudge --debug --spaceWidth 3 --opbfc 14 --test Hello World
  *
  * Contains Custom Fonts
  * ----------------------------------------------------------------------------
  */
 
 #include "jsvar.h"
 
-JsVar *jswrap_graphics_setFont15(JsVar *parent, int scale);
+JsVar *jswrap_graphics_setFont14(JsVar *parent, int scale);

libs/graphics/jswrap_font_15.h libs/graphics/jswrap_font_14.h

@@ -8,12 +8,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * ----------------------------------------------------------------------------
- * Generated by EspruinoWebTools/cli/fontconverter.js /home/gw/workspace/EspruinoCode/fonts/renaissance/files/renaissance_24_bold.pbff --range All --height 19 --shiftUp 8 --nudge --debug --spaceWidth 3 --opbfc 19
+ * Generated by EspruinoWebTools/cli/fontconverter.js renaissance_24_bold.pbff --range All --height 17 --shiftUp 10 --nudge --debug --spaceWidth 3 --opbfc 17 --test Hello World
  *
  * Contains Custom Fonts
  * ----------------------------------------------------------------------------
  */
 
 #include "jsvar.h"
 
-JsVar *jswrap_graphics_setFont19(JsVar *parent, int scale);
+JsVar *jswrap_graphics_setFont17(JsVar *parent, int scale);

libs/graphics/jswrap_font_17.c

@@ -10,7 +10,7 @@
 * ----------------------------------------------------------------------------
 * This file is designed to be parsed during the build process
 *
-* Generated by EspruinoWebTools/cli/fontconverter.js /home/gw/workspace/EspruinoCode/fonts/renaissance/files/renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22
+* Generated by EspruinoWebTools/cli/fontconverter.js renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22 --test Hello World
 *
 * Contains Custom Fonts
 * ----------------------------------------------------------------------------

libs/graphics/jswrap_font_19.h libs/graphics/jswrap_font_17.h

@@ -8,7 +8,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * ----------------------------------------------------------------------------
- * Generated by EspruinoWebTools/cli/fontconverter.js /home/gw/workspace/EspruinoCode/fonts/renaissance/files/renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22
+ * Generated by EspruinoWebTools/cli/fontconverter.js renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22 --test Hello World
  *
  * Contains Custom Fonts
  * ----------------------------------------------------------------------------