Add several new fonts

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

graphics/Makefile

@@ -122,6 +122,18 @@ genfontsources:
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
 endif
+ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
+endif
+ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
+endif
 
 gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
 

graphics/nxfonts/Make.defs

@@ -44,6 +44,18 @@ NXFSET_CSRCS	=
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans23x27.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
+ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif27x38b.c
+endif
+ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif29x37.c
+endif
 
 NXFONTS_ASRCS	= $(NXFCONV_ASRCS) $(NXFSET_ASRCS)
 NXFONTS_CSRCS	= nxfonts_getfont.c $(NXFCONV_CSRCS) $(NXFSET_CSRCS)

graphics/nxfonts/Makefile.sources

@@ -76,6 +76,22 @@ ifeq ($(NXFONTS_FONTID),1)
 NXFONTS_PREFIX	:= g_sans23x27_
 GEN_CSRC	= nxfonts_bitmaps_sans23x27.c
 endif
+ifeq ($(NXFONTS_FONTID),2)
+NXFONTS_PREFIX	:= g_sans28x37b_
+GEN_CSRC	= nxfonts_bitmaps_sans28x37b.c
+endif
+ifeq ($(NXFONTS_FONTID),3)
+NXFONTS_PREFIX	:= g_sans40x49b_
+GEN_CSRC	= nxfonts_bitmaps_sans40x49b.c
+endif
+ifeq ($(NXFONTS_FONTID),4)
+NXFONTS_PREFIX	:= g_serif27x38b_
+GEN_CSRC	= nxfonts_bitmaps_serif27x38b.c
+endif
+ifeq ($(NXFONTS_FONTID),5)
+NXFONTS_PREFIX	:= g_serif29x37_
+GEN_CSRC	= nxfonts_bitmaps_serif29x37.c
+endif
 
 DEPENDENCY	:= nxfonts_bitmaps.c
 CPPFLAGS	+= -DNXFONTS_FONTID=$(NXFONTS_FONTID)

graphics/nxfonts/nxfonts_bitmaps.c

@@ -48,6 +48,14 @@
 
 #if NXFONTS_FONTID == 1
 #  include "nxfonts_sans23x27.h"
+#elif NXFONTS_FONTID == 2
+#  include "nxfonts_sans28x37b.h"
+#elif NXFONTS_FONTID == 3
+#  include "nxfonts_sans40x49b.h"
+#elif NXFONTS_FONTID == 4
+#  include "nxfonts_serif27x38b.h"
+#elif NXFONTS_FONTID == 5
+#  include "nxfonts_serif29x37.h"
 #else
 #  error "No font ID specified"
 #endif

graphics/nxfonts/nxfonts_getfont.c

@@ -63,11 +63,35 @@
 #ifdef CONFIG_NXFONT_SANS23X27
 extern const struct nx_fontpackage_s g_sans23x27_package;
 #endif
+#ifdef CONFIG_NXFONT_SANS28X37B
+extern const struct nx_fontpackage_s g_sans28x37b_package;
+#endif
+#ifdef CONFIG_NXFONT_SANS40X49B
+extern const struct nx_fontpackage_s g_sans40x49b_package;
+#endif
+#ifdef CONFIG_NXFONT_SERIF27X38B
+extern const struct nx_fontpackage_s g_serif27x38b_package;
+#endif
+#ifdef CONFIG_NXFONT_SERIF29X37
+extern const struct nx_fontpackage_s g_serif29x37_package;
+#endif
 
 static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 {
 #ifdef CONFIG_NXFONT_SANS23X27
   &g_sans23x27_package,
+#endif
+#ifdef CONFIG_NXFONT_SANS28X37B
+  &g_sans28x37b_package,
+#endif
+#ifdef CONFIG_NXFONT_SANS40X49B
+  &g_sans40x49b_package,
+#endif
+#ifdef CONFIG_NXFONT_SERIF27X38B
+  &g_serif27x38b_package,
+#endif
+#ifdef CONFIG_NXFONT_SERIF29X37
+  &g_serif29x37_package,
 #endif
   NULL
 };