Add more fonts

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

graphics/Makefile

@@ -119,22 +119,69 @@ gen32bppsources:
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
 
 genfontsources:
-ifeq ($(CONFIG_NXFONT_SANS23X27),y)
+
+# SANS
+
+ifeq ($(CONFIG_NXFONT_SANS22X29),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
 endif
-ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
+
+
+ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
 endif
-ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
+
+
+ifeq ($(CONFIG_NXFONT_SANS28X37),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
 endif
-ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+
+# SANS-BOLD
+
+ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
 endif
-ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
+
+ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
 	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
 endif
 
+ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+# SERIF
+
+ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+
+ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+
+ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+# SERIF-BOLD
+
+ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+
+ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
+
+ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
+endif
+
 gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
 
 $(AOBJS): %$(OBJEXT): %.S

graphics/README.txt

@@ -262,21 +262,43 @@ CONFIG_NXTK_AUTORAISE
 CONFIG_NXFONTS_CHARBITS
   The number of bits in the character set.  Current options are only 7 and 8.
   The default is 7.
-CONFIG_NXFONT_SANS23X27:
-  This option enables support for a small, 23x27 san serif font
-  (font ID FONTID_SANS23X27 == 1)
-CONFIG_NXFONT_SANS28X37B:
+
+CONFIG_NXFONT_SANS22X29
+  This option enables support for a small, 22x29 san serif font
+  (font ID FONTID_SANS22X29 == 1).
+CONFIG_NXFONT_SANS23X27
+  This option enables support for a tiny, 23x27 san serif font
+  (font ID FONTID_SANS23X27 == 2).
+CONFIG_NXFONT_SANS28X37
+  This option enables support for a medium, 28x37 san serif font
+  (font ID FONTID_SANS28X37 == 3).
+CONFIG_NXFONT_SANS22X29B
+  This option enables support for a small, 22x29 san serif bold font
+  (font ID FONTID_SANS22X29B == 4).
+CONFIG_NXFONT_SANS28X37B
   This option enables support for a medium, 28x37 san serif bold font
-  (font ID FONTID_SANS28X37B == 2)
-CONFIG_NXFONT_SANS40X49B:
+  (font ID FONTID_SANS28X37B == 5).
+CONFIG_NXFONT_SANS40X49B
   This option enables support for a large, 40x49 san serif bold font
-  (font ID FONTID_SANS40X49B == 3)
-CONFIG_NXFONT_SERIF27X38B:
-  This option enables support for a medium, 27x38 bold font (with serifs)
-  (font ID FONTID_SERIF27X38B == 4)
-CONFIG_NXFONT_SERIF29X37:
+  (font ID FONTID_SANS40X49B == 6).
+CONFIG_NXFONT_SERIF22X29
+  This option enables support for a small, 22x29 font (with serifs)
+  (font ID FONTID_SERIF22X29 == 7).
+CONFIG_NXFONT_SERIF29X37
   This option enables support for a medium, 29x37 font (with serifs)
-  (font ID FONTID_SERIF29X37 == 5)
+  (font ID FONTID_SERIF29X37 == 8).
+CONFIG_NXFONT_SERIF38X48
+  This option enables support for a large, 38x48 font (with serifs)
+  (font ID FONTID_SERIF38X48 == 9).
+CONFIG_NXFONT_SERIF22X28B
+  This option enables support for a small, 27x38 bold font (with serifs)
+  (font ID FONTID_SERIF22X28B == 10).
+CONFIG_NXFONT_SERIF27X38B
+  This option enables support for a medium, 27x38 bold font (with serifs)
+  (font ID FONTID_SERIF27X38B == 11).
+CONFIG_NXFONT_SERIF38X49B
+  This option enables support for a large, 38x49 bold font (with serifs)
+  (font ID FONTID_SERIF38X49B == 12).
 
 NX Multi-user only options:
 

graphics/nxfonts/Make.defs

@@ -41,21 +41,64 @@ NXFCONV_CSRCS	= nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
 
 NXFSET_ASRCS	=
 NXFSET_CSRCS	=
+
+# SANS
+
+ifeq ($(CONFIG_NXFONT_SANS22X29),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans22x29.c
+endif
+
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_sans23x27.c
 endif
+
+ifeq ($(CONFIG_NXFONT_SANS28X37),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_sans28x37.c
+endif
+
+# SANS-BOLD
+
+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
-ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
-NXFSET_CSRCS	+= nxfonts_bitmaps_serif27x38b.c
+
+# SERIF
+
+ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x29.c
 endif
+
 ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
 NXFSET_CSRCS	+= nxfonts_bitmaps_serif29x37.c
 endif
 
+ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif38x48.c
+endif
+
+# SERIF-BOLD
+
+ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif22x28b.c
+endif
+
+ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif27x38b.c
+endif
+
+ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
+NXFSET_CSRCS	+= nxfonts_bitmaps_serif38x49b.c
+endif
+
 NXFONTS_ASRCS	= $(NXFCONV_ASRCS) $(NXFSET_ASRCS)
 NXFONTS_CSRCS	= nxfonts_getfont.c $(NXFCONV_CSRCS) $(NXFSET_CSRCS)

graphics/nxfonts/Makefile.sources

@@ -72,25 +72,73 @@ CPPFLAGS	+= -DNXFONTS_SUFFIX=$(NXFONTS_SUFFIX)
 endif
 
 ifdef NXFONTS_FONTID
+
+# SANS
+
 ifeq ($(NXFONTS_FONTID),1)
+NXFONTS_PREFIX	:= g_sans22x29_
+GEN_CSRC	= nxfonts_bitmaps_sans22x29.c
+endif
+
+ifeq ($(NXFONTS_FONTID),2)
 NXFONTS_PREFIX	:= g_sans23x27_
 GEN_CSRC	= nxfonts_bitmaps_sans23x27.c
 endif
-ifeq ($(NXFONTS_FONTID),2)
+
+ifeq ($(NXFONTS_FONTID),3)
+NXFONTS_PREFIX	:= g_sans28x37_
+GEN_CSRC	= nxfonts_bitmaps_sans28x37.c
+endif
+
+# SANS-BOLD
+
+ifeq ($(NXFONTS_FONTID),4)
+NXFONTS_PREFIX	:= g_sans22x29b_
+GEN_CSRC	= nxfonts_bitmaps_sans22x29b.c
+endif
+
+ifeq ($(NXFONTS_FONTID),5)
 NXFONTS_PREFIX	:= g_sans28x37b_
 GEN_CSRC	= nxfonts_bitmaps_sans28x37b.c
 endif
-ifeq ($(NXFONTS_FONTID),3)
+
+ifeq ($(NXFONTS_FONTID),6)
 NXFONTS_PREFIX	:= g_sans40x49b_
 GEN_CSRC	= nxfonts_bitmaps_sans40x49b.c
 endif
-ifeq ($(NXFONTS_FONTID),4)
+
+# SERIF
+
+ifeq ($(NXFONTS_FONTID),7)
+NXFONTS_PREFIX	:= g_serif22x29_
+GEN_CSRC	= nxfonts_bitmaps_serif22x29.c
+endif
+
+ifeq ($(NXFONTS_FONTID),8)
+NXFONTS_PREFIX	:= g_serif29x37_
+GEN_CSRC	= nxfonts_bitmaps_serif29x37.c
+endif
+
+ifeq ($(NXFONTS_FONTID),9)
+NXFONTS_PREFIX	:= g_serif38x48_
+GEN_CSRC	= nxfonts_bitmaps_serif38x48.c
+endif
+
+# SERIF-BOLD
+
+ifeq ($(NXFONTS_FONTID),10)
+NXFONTS_PREFIX	:= g_serif22x28b_
+GEN_CSRC	= nxfonts_bitmaps_serif22x28b.c
+endif
+
+ifeq ($(NXFONTS_FONTID),11)
 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
+
+ifeq ($(NXFONTS_FONTID),12)
+NXFONTS_PREFIX	:= g_serif38x49b_
+GEN_CSRC	= nxfonts_bitmaps_serif38x49b.c
 endif
 
 DEPENDENCY	:= nxfonts_bitmaps.c

graphics/nxfonts/nxfonts_bitmaps.c

@@ -47,15 +47,29 @@
 /* Pick the fontset */
 
 #if NXFONTS_FONTID == 1
-#  include "nxfonts_sans23x27.h"
+#  include "nxfonts_sans22x29.h"
 #elif NXFONTS_FONTID == 2
-#  include "nxfonts_sans28x37b.h"
+#  include "nxfonts_sans23x27.h"
 #elif NXFONTS_FONTID == 3
-#  include "nxfonts_sans40x49b.h"
+#  include "nxfonts_sans28x37.h"
 #elif NXFONTS_FONTID == 4
-#  include "nxfonts_serif27x38b.h"
+#  include "nxfonts_sans22x29b.h"
 #elif NXFONTS_FONTID == 5
+#  include "nxfonts_sans28x37b.h"
+#elif NXFONTS_FONTID == 6
+#  include "nxfonts_sans40x49b.h"
+#elif NXFONTS_FONTID == 7
+#  include "nxfonts_serif22x29.h"
+#elif NXFONTS_FONTID == 8
 #  include "nxfonts_serif29x37.h"
+#elif NXFONTS_FONTID == 9
+#  include "nxfonts_serif38x48.h"
+#elif NXFONTS_FONTID == 10
+#  include "nxfonts_serif22x28b.h"
+#elif NXFONTS_FONTID == 11
+#  include "nxfonts_serif27x38b.h"
+#elif NXFONTS_FONTID == 12
+#  include "nxfonts_serif38x49b.h"
 #else
 #  error "No font ID specified"
 #endif

graphics/nxfonts/nxfonts_getfont.c

@@ -60,39 +60,121 @@
  * Private Data
  ****************************************************************************/
 
+/* SANS */
+
+#ifdef CONFIG_NXFONT_SANS22X29
+extern const struct nx_fontpackage_s g_sans22x29_package;
+#endif
+
 #ifdef CONFIG_NXFONT_SANS23X27
 extern const struct nx_fontpackage_s g_sans23x27_package;
 #endif
+
+#ifdef CONFIG_NXFONT_SANS28X37
+extern const struct nx_fontpackage_s g_sans28x37_package;
+#endif
+
+/* SANS-BOLD */
+
+#ifdef CONFIG_NXFONT_SANS22X29B
+extern const struct nx_fontpackage_s g_sans22x29b_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;
+
+/* SERIF */
+
+#ifdef CONFIG_NXFONT_SERIF22X29
+extern const struct nx_fontpackage_s g_serif22x29_package;
 #endif
+
 #ifdef CONFIG_NXFONT_SERIF29X37
 extern const struct nx_fontpackage_s g_serif29x37_package;
 #endif
 
+#ifdef CONFIG_NXFONT_SERIF38X48
+extern const struct nx_fontpackage_s g_serif38x48_package;
+#endif
+
+/* SERIF-BOLD */
+
+#ifdef CONFIG_NXFONT_SERIF22X28B
+extern const struct nx_fontpackage_s g_serif22x28b_package;
+#endif
+
+#ifdef CONFIG_NXFONT_SERIF27X38B
+extern const struct nx_fontpackage_s g_serif27x38b_package;
+#endif
+
+#ifdef CONFIG_NXFONT_SERIF38X49
+extern const struct nx_fontpackage_s g_serif38x49b_package;
+#endif
+
 static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 {
+
+/* SANS */
+
+#ifdef CONFIG_NXFONT_SANS22X29
+  &g_sans22x29_package,
+#endif
+
 #ifdef CONFIG_NXFONT_SANS23X27
   &g_sans23x27_package,
 #endif
+
+#ifdef CONFIG_NXFONT_SANS28X37
+  &g_sans28x37_package,
+#endif
+
+/* SANS-BOLD */
+
+#ifdef CONFIG_NXFONT_SANS22X29B
+  &g_sans22x29b_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,
+
+/* SERIF */
+
+#ifdef CONFIG_NXFONT_SERIF22X29
+  &g_serif22x29_package,
 #endif
+
 #ifdef CONFIG_NXFONT_SERIF29X37
   &g_serif29x37_package,
 #endif
+
+#ifdef CONFIG_NXFONT_SERIF38X48
+  &g_serif38x48_package,
+#endif
+
+/* SERIF-BOLD */
+
+#ifdef CONFIG_NXFONT_SERIF22X28B
+  &g_serif22x28b_package,
+#endif
+
+#ifdef CONFIG_NXFONT_SERIF27X38B
+  &g_serif27x38b_package,
+#endif
+
+#ifdef CONFIG_NXFONT_SERIF38X49B
+  &g_serif38x49b_package,
+#endif
+
   NULL
 };