ISO8859-1 Terminus fonts, typos fix, disable all fonts by default

extras/fonts/component.mk

@@ -18,6 +18,19 @@ fonts_CFLAGS = $(CFLAGS) \
 	-DFONTS_BITOCRA_4X7=$(FONTS_BITOCRA_4X7) \
 	-DFONTS_BITOCRA_6X11=$(FONTS_BITOCRA_6X11) \
 	-DFONTS_BITOCRA_7X13=$(FONTS_BITOCRA_7X13) \
+    -DFONTS_TERMINUS_6X12_ISO8859_1=$(FONTS_TERMINUS_6X12_ISO8859_1) \
+    -DFONTS_TERMINUS_8X14_ISO8859_1=$(FONTS_TERMINUS_8X14_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_8X14_ISO8859_1=$(FONTS_TERMINUS_BOLD_8X14_ISO8859_1) \
+    -DFONTS_TERMINUS_10X18_ISO8859_1=$(FONTS_TERMINUS_10X18_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_10X18_ISO8859_1=$(FONTS_TERMINUS_BOLD_10X18_ISO8859_1) \
+    -DFONTS_TERMINUS_11X22_ISO8859_1=$(FONTS_TERMINUS_11X22_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_11X22_ISO8859_1=$(FONTS_TERMINUS_BOLD_11X22_ISO8859_1) \
+    -DFONTS_TERMINUS_12X24_ISO8859_1=$(FONTS_TERMINUS_12X24_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_12X24_ISO8859_1=$(FONTS_TERMINUS_BOLD_12X24_ISO8859_1) \
+    -DFONTS_TERMINUS_14X28_ISO8859_1=$(FONTS_TERMINUS_14X28_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_14X28_ISO8859_1=$(FONTS_TERMINUS_BOLD_14X28_ISO8859_1) \
+    -DFONTS_TERMINUS_16X32_ISO8859_1=$(FONTS_TERMINUS_16X32_ISO8859_1) \
+    -DFONTS_TERMINUS_BOLD_16X32_ISO8859_1=$(FONTS_TERMINUS_BOLD_16X32_ISO8859_1) \
 	-DFONTS_TERMINUS_6X12_KOI8_R=$(FONTS_TERMINUS_6X12_KOI8_R) \
 	-DFONTS_TERMINUS_8X14_KOI8_R=$(FONTS_TERMINUS_8X14_KOI8_R) \
 	-DFONTS_TERMINUS_BOLD_8X14_KOI8_R=$(FONTS_TERMINUS_BOLD_8X14_KOI8_R) \

extras/fonts/config.h

@@ -1,57 +0,0 @@
-#ifndef _EXTRAS_FONTS_CONFIG_H_
-#define _EXTRAS_FONTS_CONFIG_H_
-
-#ifndef FONTS_GLCD_5X7
-#define FONTS_GLCD_5X7 1
-#endif
-
-// FIXME: Proportional fonts drawing is broken
-#ifndef FONTS_ROBOTO_8PT
-#define FONTS_ROBOTO_8PT 0
-#endif
-
-#ifndef FONTS_ROBOTO_10PT
-#define FONTS_ROBOTO_10PT 0
-#endif
-
-#ifndef FONTS_BITOCRA_4X7
-#define FONTS_BITOCRA_4X7 1
-#endif
-
-#ifndef FONTS_BITOCRA_6X11
-#define FONTS_BITOCRA_6X11 1
-#endif
-
-#ifndef FONTS_BITOCRA_7X13
-#define FONTS_BITOCRA_7X13 1
-#endif
-
-#ifndef FONTS_TERMINUS_6X12_KOI8_R
-#define FONTS_TERMINUS_6X12_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_8X14_KOI8_R
-#define FONTS_TERMINUS_8X14_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_BOLD_8X14_KOI8_R
-#define FONTS_TERMINUS_BOLD_8X14_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_14X28_KOI8_R
-#define FONTS_TERMINUS_14X28_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_BOLD_14X28_KOI8_R
-#define FONTS_TERMINUS_BOLD_14X28_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_16X32_KOI8_R
-#define FONTS_TERMINUS_16X32_KOI8_R 1
-#endif
-
-#ifndef FONTS_TERMINUS_BOLD_16X32_KOI8_R
-#define FONTS_TERMINUS_BOLD_16X32_KOI8_R 1
-#endif
-
-#endif /* _EXTRAS_FONTS_CONFIG_H_ */

extras/fonts/defaults.mk

@@ -10,15 +10,30 @@ FONTS_ROBOTO_8PT ?= 0
 FONTS_ROBOTO_10PT ?= 0
 
 # BitOCRA
-FONTS_BITOCRA_4X7 ?= 1
-FONTS_BITOCRA_6X11 ?= 1
-FONTS_BITOCRA_7X13 ?= 1
+FONTS_BITOCRA_4X7 ?= 0
+FONTS_BITOCRA_6X11 ?= 0
+FONTS_BITOCRA_7X13 ?= 0
+
+# Terminus, ISO8859-1 (Latin-1)
+FONTS_TERMINUS_6X12_ISO8859_1 ?= 0
+FONTS_TERMINUS_8X14_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_8X14_ISO8859_1 ?= 0
+FONTS_TERMINUS_10X18_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_10X18_ISO8859_1 ?= 0
+FONTS_TERMINUS_11X22_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_11X22_ISO8859_1 ?= 0
+FONTS_TERMINUS_12X24_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_12X24_ISO8859_1 ?= 0
+FONTS_TERMINUS_14X28_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_14X28_ISO8859_1 ?= 0
+FONTS_TERMINUS_16X32_ISO8859_1 ?= 0
+FONTS_TERMINUS_BOLD_16X32_ISO8859_1 ?= 0
 
 # Terminus, KOI8-R
-FONTS_TERMINUS_6X12_KOI8_R ?= 1
-FONTS_TERMINUS_8X14_KOI8_R ?= 1
-FONTS_TERMINUS_BOLD_8X14_KOI8_R ?= 1
-FONTS_TERMINUS_14X28_KOI8_R ?= 1
-FONTS_TERMINUS_BOLD_14X28_KOI8_R ?= 1
-FONTS_TERMINUS_16X32_KOI8_R ?= 1
-FONTS_TERMINUS_BOLD_16X32_KOI8_R ?= 1
+FONTS_TERMINUS_6X12_KOI8_R ?= 0
+FONTS_TERMINUS_8X14_KOI8_R ?= 0
+FONTS_TERMINUS_BOLD_8X14_KOI8_R ?= 0
+FONTS_TERMINUS_14X28_KOI8_R ?= 0
+FONTS_TERMINUS_BOLD_14X28_KOI8_R ?= 0
+FONTS_TERMINUS_16X32_KOI8_R ?= 0
+FONTS_TERMINUS_BOLD_16X32_KOI8_R ?= 0

extras/fonts/fonts.c

@@ -8,6 +8,10 @@
  */
 #include "fonts.h"
 
+#ifndef FONTS_GLCD_5X7
+#define FONTS_GLCD_5X7 1
+#endif
+
 #if FONTS_GLCD_5X7
     #include "data/font_glcd_5x7.h"
 #endif
@@ -29,6 +33,46 @@
     #include "data/font_bitocra_7x13_iso8859_1.h"
 #endif
 
+#if FONTS_TERMINUS_6X12_ISO8859_1
+    #include "data/font_terminus_6x12_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_8X14_ISO8859_1
+    #include "data/font_terminus_8x14_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_8X14_ISO8859_1
+    #include "data/font_terminus_bold_8x14_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_10X18_ISO8859_1
+    #include "data/font_terminus_10x18_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_10X18_ISO8859_1
+    #include "data/font_terminus_bold_10x18_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_11X22_ISO8859_1
+    #include "data/font_terminus_11x22_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_11X22_ISO8859_1
+    #include "data/font_terminus_bold_11x22_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_12X24_ISO8859_1
+    #include "data/font_terminus_12x24_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_12X24_ISO8859_1
+    #include "data/font_terminus_bold_12x24_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_14X28_ISO8859_1
+    #include "data/font_terminus_14x28_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_14X28_ISO8859_1
+    #include "data/font_terminus_bold_14x28_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_16X32_ISO8859_1
+    #include "data/font_terminus_16x32_iso8859_1.h"
+#endif
+#if FONTS_TERMINUS_BOLD_16X32_ISO8859_1
+    #include "data/font_terminus_bold_16x32_iso8859_1.h"
+#endif
+
 #if FONTS_TERMINUS_6X12_KOI8_R
     #include "data/font_terminus_6x12_koi8_r.h"
 #endif
@@ -90,6 +134,72 @@ const font_info_t *font_builtin_fonts[] =
     [FONT_FACE_BITOCRA_7X13] = NULL,
 #endif
 
+#if FONTS_TERMINUS_6X12_ISO8859_1
+    [FONT_FACE_TERMINUS_6X12_ISO8859_1] = &_fonts_terminus_6x12_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_6X12_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_8X14_ISO8859_1
+    [FONT_FACE_TERMINUS_8X14_ISO8859_1] = &_fonts_terminus_8x14_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_8X14_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_8X14_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_8X14_ISO8859_1] = &_fonts_terminus_bold_8x14_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_8X14_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_10X18_ISO8859_1
+    [FONT_FACE_TERMINUS_10X18_ISO8859_1] = &_fonts_terminus_10x18_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_10X18_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_10X18_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_10X18_ISO8859_1] = &_fonts_terminus_bold_10x18_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_10X18_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_11X22_ISO8859_1
+    [FONT_FACE_TERMINUS_11X22_ISO8859_1] = &_fonts_terminus_11x22_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_11X22_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_11X22_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_11X22_ISO8859_1] = &_fonts_terminus_bold_11x22_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_11X22_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_12X24_ISO8859_1
+    [FONT_FACE_TERMINUS_12X24_ISO8859_1] = &_fonts_terminus_12x24_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_12X24_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_12X24_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_12X24_ISO8859_1] = &_fonts_terminus_bold_12x24_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_12X24_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_14X28_ISO8859_1
+    [FONT_FACE_TERMINUS_14X28_ISO8859_1] = &_fonts_terminus_14x28_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_14X28_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_14X28_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_14X28_ISO8859_1] = &_fonts_terminus_bold_14x28_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_14X28_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_16X32_ISO8859_1
+    [FONT_FACE_TERMINUS_16X32_ISO8859_1] = &_fonts_terminus_16x32_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_16X32_ISO8859_1] = NULL,
+#endif
+#if FONTS_TERMINUS_BOLD_16X32_ISO8859_1
+    [FONT_FACE_TERMINUS_BOLD_16X32_ISO8859_1] = &_fonts_terminus_bold_16x32_iso8859_1_info,
+#else
+    [FONT_FACE_TERMINUS_BOLD_16X32_ISO8859_1] = NULL,
+#endif
+
 #if FONTS_TERMINUS_6X12_KOI8_R
     [FONT_FACE_TERMINUS_6X12_KOI8_R] = &_fonts_terminus_6x12_koi8_r_info,
 #else

extras/fonts/fonts.h

@@ -11,7 +11,6 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "config.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,11 +19,28 @@ extern "C" {
 typedef enum
 {
     FONT_FACE_GLCD5x7 = 0,
+
     FONT_FACE_ROBOTO_8PT,
     FONT_FACE_ROBOTO_10PT,
+
     FONT_FACE_BITOCRA_4X7,
     FONT_FACE_BITOCRA_6X11,
     FONT_FACE_BITOCRA_7X13,
+
+    FONT_FACE_TERMINUS_6X12_ISO8859_1,
+    FONT_FACE_TERMINUS_8X14_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_8X14_ISO8859_1,
+    FONT_FACE_TERMINUS_10X18_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_10X18_ISO8859_1,
+    FONT_FACE_TERMINUS_11X22_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_11X22_ISO8859_1,
+    FONT_FACE_TERMINUS_12X24_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_12X24_ISO8859_1,
+    FONT_FACE_TERMINUS_14X28_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_14X28_ISO8859_1,
+    FONT_FACE_TERMINUS_16X32_ISO8859_1,
+    FONT_FACE_TERMINUS_BOLD_16X32_ISO8859_1,
+
     FONT_FACE_TERMINUS_6X12_KOI8_R,
     FONT_FACE_TERMINUS_8X14_KOI8_R,
     FONT_FACE_TERMINUS_BOLD_8X14_KOI8_R,