Add two new small, bold, sans-serif fonts

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4130 42af7a65-404d-4744-a932-0658087f49c3

graphics/Makefile

@@ -131,6 +131,12 @@ endif
 ifeq ($(CONFIG_NXFONT_SANS39X48),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
 endif
+ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=16 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=17 EXTRADEFINES=$(EXTRADEFINES)
+endif
 ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
 endif
@@ -158,6 +164,12 @@ endif
 ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES)
 endif
+ifeq ($(CONFIG_NXFONT_SANS17X22),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=14 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS20X26),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES)
+endif
 
 gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
 

graphics/README.txt

@@ -263,6 +263,12 @@ CONFIG_NXFONTS_CHARBITS
   The number of bits in the character set.  Current options are only 7 and 8.
   The default is 7.
 
+CONFIG_NXFONT_SANS17X22
+  This option enables support for a tiny, 17x22 san serif font
+  (font ID FONTID_SANS17X22 == 14).
+CONFIG_NXFONT_SANS20X26
+  This option enables support for a tiny, 20x26 san serif font
+  (font ID FONTID_SANS20X26 == 15).
 CONFIG_NXFONT_SANS23X27
   This option enables support for a tiny, 23x27 san serif font
   (font ID FONTID_SANS23X27 == 1).
@@ -275,6 +281,12 @@ CONFIG_NXFONT_SANS28X37
 CONFIG_NXFONT_SANS39X48
   This option enables support for a large, 39x48 san serif font
   (font ID FONTID_SANS39X48 == 4).
+CONFIG_NXFONT_SANS17X23B
+  This option enables support for a tiny, 17x23 san serif bold font
+  (font ID FONTID_SANS17X23B == 16).
+CONFIG_NXFONT_SANS20X27B
+  This option enables support for a tiny, 20x27 san serif bold font
+  (font ID FONTID_SANS20X27B == 17).
 CONFIG_NXFONT_SANS22X29B
   This option enables support for a small, 22x29 san serif bold font
   (font ID FONTID_SANS22X29B == 5).

graphics/nxfonts/Make.defs

@@ -42,7 +42,15 @@ NXFCONV_CSRCS	= nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
 NXFSET_ASRCS	=
 NXFSET_CSRCS	=
 
-# SANS
+# Sans serif fonts
+
+ifeq ($(CONFIG_NXFONT_SANS17X22),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans17x22.c
+endif
+
+ifeq ($(CONFIG_NXFONT_SANS20X26),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans20x26.c
+endif
 
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans23x27.c
@@ -60,23 +68,29 @@ ifeq ($(CONFIG_NXFONT_SANS39X48),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans39x48.c
 endif
 
-# SANS-BOLD
+# Sans serif bold fonts
+
+ifeq ($(CONFIG_NXFONT_SANS17X23B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans17x23b.c
+endif
+
+ifeq ($(CONFIG_NXFONT_SANS20X27B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans20x27b.c
+endif
 
 ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans22x29b.c
 endif
 
-
 ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans28x37b.c
 endif
 
-
 ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans40x49b.c
 endif
 
-# SERIF
+# Serif fonts
 
 ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x29.c
@@ -90,7 +104,7 @@ ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_serif38x48.c
 endif
 
-# SERIF-BOLD
+# Serif bold fonts
 
 ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x28b.c

graphics/nxfonts/Makefile.sources

@@ -75,6 +75,16 @@ ifdef NXFONTS_FONTID
 
 # SANS
 
+ifeq ($(NXFONTS_FONTID),14)
+NXFONTS_PREFIX	:= g_sans17x22_
+GEN_CSRC	= nxfonts_bitmaps_sans17x22.c
+endif
+
+ifeq ($(NXFONTS_FONTID),15)
+NXFONTS_PREFIX	:= g_sans20x26_
+GEN_CSRC	= nxfonts_bitmaps_sans20x26.c
+endif
+
 ifeq ($(NXFONTS_FONTID),1)
 NXFONTS_PREFIX	:= g_sans23x27_
 GEN_CSRC	= nxfonts_bitmaps_sans23x27.c
@@ -97,6 +107,16 @@ endif
 
 # SANS-BOLD
 
+ifeq ($(NXFONTS_FONTID),16)
+NXFONTS_PREFIX	:= g_sans17x23b_
+GEN_CSRC	= nxfonts_bitmaps_sans17x23b.c
+endif
+
+ifeq ($(NXFONTS_FONTID),17)
+NXFONTS_PREFIX	:= g_sans20x27b_
+GEN_CSRC	= nxfonts_bitmaps_sans20x27b.c
+endif
+
 ifeq ($(NXFONTS_FONTID),5)
 NXFONTS_PREFIX	:= g_sans22x29b_
 GEN_CSRC	= nxfonts_bitmaps_sans22x29b.c

graphics/nxfonts/nxfonts_bitmaps.c

@@ -72,6 +72,14 @@
 #  include "nxfonts_serif27x38b.h"
 #elif NXFONTS_FONTID == 13
 #  include "nxfonts_serif38x49b.h"
+#elif NXFONTS_FONTID == 14
+#  include "nxfonts_sans17x22.h"
+#elif NXFONTS_FONTID == 15
+#  include "nxfonts_sans20x26.h"
+#elif NXFONTS_FONTID == 16
+#  include "nxfonts_sans17x23b.h"
+#elif NXFONTS_FONTID == 17
+#  include "nxfonts_sans20x27b.h"
 #else
 #  error "No font ID specified"
 #endif

graphics/nxfonts/nxfonts_getfont.c

@@ -62,6 +62,14 @@
 
 /* SANS */
 
+#ifdef CONFIG_NXFONT_SANS17X22
+extern const struct nx_fontpackage_s g_sans17x22_package;
+#endif
+
+#ifdef CONFIG_NXFONT_SANS20X26
+extern const struct nx_fontpackage_s g_sans20x26_package;
+#endif
+
 #ifdef CONFIG_NXFONT_SANS23X27
 extern const struct nx_fontpackage_s g_sans23x27_package;
 #endif
@@ -80,6 +88,14 @@ extern const struct nx_fontpackage_s g_sans39x48_package;
 
 /* SANS-BOLD */
 
+#ifdef CONFIG_NXFONT_SANS17X23B
+extern const struct nx_fontpackage_s g_sans17x23b_package;
+#endif
+
+#ifdef CONFIG_NXFONT_SANS20X27B
+extern const struct nx_fontpackage_s g_sans20x27b_package;
+#endif
+
 #ifdef CONFIG_NXFONT_SANS22X29B
 extern const struct nx_fontpackage_s g_sans22x29b_package;
 #endif
@@ -125,6 +141,14 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 
 /* SANS */
 
+#ifdef CONFIG_NXFONT_SANS17X22
+  &g_sans17x22_package,
+#endif
+
+#ifdef CONFIG_NXFONT_SANS20X26
+  &g_sans20x26_package,
+#endif
+
 #ifdef CONFIG_NXFONT_SANS23X27
   &g_sans23x27_package,
 #endif
@@ -143,6 +167,14 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 
 /* SANS-BOLD */
 
+#ifdef CONFIG_NXFONT_SANS17X23B
+  &g_sans17x23b_package,
+#endif
+
+#ifdef CONFIG_NXFONT_SANS20X27B
+  &g_sans20x27b_package,
+#endif
+
 #ifdef CONFIG_NXFONT_SANS22X29B
   &g_sans22x29b_package,
 #endif