summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--firmware/Makefile4
-rw-r--r--fonts/05-Tiny.bdf (renamed from fonts/Tiny-Prop-5.bdf)0
-rw-r--r--fonts/06-Tiny.bdf (renamed from fonts/Tiny-Prop-6.bdf)0
-rw-r--r--fonts/07-Fixed.bdf (renamed from fonts/5x7.bdf)0
-rw-r--r--fonts/08-Atadore.bdf (renamed from fonts/atadore.bdf)0
-rw-r--r--fonts/08-Fixed.bdf (renamed from fonts/5x8.bdf)0
-rw-r--r--fonts/08-Namil.bdf (renamed from fonts/namil-8.bdf)0
-rw-r--r--fonts/08-Nedore.bdf (renamed from fonts/nedore-8.bdf)0
-rw-r--r--fonts/08-Rockbox-Propfont.bdf (renamed from fonts/proportional.bdf)0
-rw-r--r--fonts/08-Rockfont.bdf (renamed from fonts/rockfont-8.bdf)0
-rw-r--r--fonts/08-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-8.bdf)0
-rw-r--r--fonts/08-Schumacher-Clean.bdf (renamed from fonts/rockbox_default.bdf)0
-rw-r--r--fonts/09-Fixed.bdf (renamed from fonts/6x9.bdf)0
-rw-r--r--fonts/09-Nedore.bdf (renamed from fonts/nedore-9.bdf)0
-rw-r--r--fonts/09-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-9.bdf)0
-rw-r--r--fonts/10-Artwiz-Snap.bdf (renamed from fonts/snap.bdf)0
-rw-r--r--fonts/10-Fixed.bdf (renamed from fonts/6x10.bdf)0
-rwxr-xr-xfonts/10-Nimbus.bdf (renamed from fonts/nimbus-10.bdf)0
-rw-r--r--fonts/10-ProFont.bdf (renamed from fonts/ProFont_r400-10.bdf)0
-rw-r--r--fonts/10-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-10.bdf)0
-rw-r--r--fonts/11-Nimbus.bdf (renamed from fonts/nimbus-11.bdf)0
-rw-r--r--fonts/11-ProFont.bdf (renamed from fonts/ProFont_r400-11.bdf)0
-rw-r--r--fonts/11-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-11.bdf)0
-rw-r--r--fonts/12-Adobe-Helvetica.bdf (renamed from fonts/helvR10.bdf)0
-rw-r--r--fonts/12-Fixed-SemiCond.bdf (renamed from fonts/6x12.bdf)0
-rw-r--r--fonts/12-Nimbus.bdf (renamed from fonts/nimbus-12.bdf)0
-rw-r--r--fonts/12-ProFont.bdf (renamed from fonts/ProFont_r400-12.bdf)0
-rw-r--r--fonts/12-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-12.bdf)0
-rw-r--r--fonts/12-Terminus.bdf (renamed from fonts/ter-u12n.bdf)0
-rw-r--r--fonts/13-Fixed-Bold.bdf (renamed from fonts/8x13B.bdf)0
-rw-r--r--fonts/13-Fixed-SemiCond-Bold.bdf (renamed from fonts/6x13B.bdf)0
-rw-r--r--fonts/13-Fixed-SemiCond.bdf (renamed from fonts/6x13.bdf)0
-rw-r--r--fonts/13-Fixed.bdf (renamed from fonts/6+12x13.bdf)0
-rw-r--r--fonts/13-Nimbus.bdf (renamed from fonts/nimbus-13.bdf)0
-rw-r--r--fonts/13-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-13.bdf)0
-rw-r--r--fonts/14-Nimbus.bdf (renamed from fonts/nimbus-14.bdf)0
-rw-r--r--fonts/14-Rockbox-Mix.bdf (renamed from fonts/mix12.bdf)0
-rw-r--r--fonts/14-Sazanami-Mincho.bdf (renamed from fonts/Sazanami-Mincho-Regular-14.bdf)0
-rw-r--r--fonts/14-Terminus-Bold.bdf (renamed from fonts/ter-u14b.bdf)0
-rw-r--r--fonts/14-Terminus.bdf (renamed from fonts/ter-u14n.bdf)0
-rw-r--r--fonts/15-Adobe-Helvetica.bdf (renamed from fonts/helvR12.bdf)0
-rw-r--r--fonts/15-ProFont.bdf (renamed from fonts/ProFont_r400-15.bdf)0
-rw-r--r--fonts/16-Adobe-Helvetica.bdf (renamed from fonts/helvR14.bdf)0
-rw-r--r--fonts/16-GNU-Unifont.bdf (renamed from fonts/unifont.bdf)0
-rw-r--r--fonts/16-Jackash.bdf (renamed from fonts/jackash-16.bdf)0
-rw-r--r--fonts/16-Terminus-Bold.bdf (renamed from fonts/ter-u16b.bdf)0
-rw-r--r--fonts/16-Terminus.bdf (renamed from fonts/ter-u16n.bdf)0
-rw-r--r--fonts/17-ProFont.bdf (renamed from fonts/ProFont_r400-17.bdf)0
-rw-r--r--fonts/18-Fixed-Bold.bdf (renamed from fonts/9+18x18B.bdf)0
-rw-r--r--fonts/18-Fixed.bdf (renamed from fonts/9+18x18.bdf)0
-rw-r--r--fonts/19-Nimbus.bdf (renamed from fonts/nimbus-19.bdf)0
-rw-r--r--fonts/20-Terminus-Bold.bdf (renamed from fonts/ter-u20b.bdf)0
-rw-r--r--fonts/20-Terminus.bdf (renamed from fonts/ter-u20n.bdf)0
-rw-r--r--fonts/22-ProFont.bdf (renamed from fonts/ProFont_r400-22.bdf)0
-rw-r--r--fonts/24-Terminus-Bold.bdf (renamed from fonts/ter-u24b.bdf)0
-rw-r--r--fonts/24-Terminus.bdf (renamed from fonts/ter-u24n.bdf)0
-rw-r--r--fonts/28-Terminus-Bold.bdf (renamed from fonts/ter-u28b.bdf)0
-rw-r--r--fonts/28-Terminus.bdf (renamed from fonts/ter-u28n.bdf)0
-rw-r--r--fonts/29-ProFont.bdf (renamed from fonts/ProFont_r400-29.bdf)0
-rw-r--r--fonts/32-Terminus-Bold.bdf (renamed from fonts/ter-u32b.bdf)0
-rw-r--r--fonts/32-Terminus.bdf (renamed from fonts/ter-u32n.bdf)0
-rwxr-xr-xfonts/README129
-rw-r--r--wps/WPSLIST108
63 files changed, 185 insertions, 56 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index e9fe32dba5..072d7d54e0 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -42,10 +42,10 @@ clean:
$(OBJDIR)/thread.o: thread.c export/thread.h
$(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@
-$(BUILDDIR)/sysfont.h: ../fonts/rockbox_default.bdf
+$(BUILDDIR)/sysfont.h: ../fonts/08-Schumacher-Clean.bdf
$(call PRINTS,Create sysfont.h)$(TOOLSDIR)/convbdf -l 255 -h -o $@ $<
-$(OBJDIR)/sysfont.o: ../fonts/rockbox_default.bdf
+$(OBJDIR)/sysfont.o: ../fonts/08-Schumacher-Clean.bdf
$(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -l 255 -c -o $(OBJDIR)/sysfont.c $<
$(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@
diff --git a/fonts/Tiny-Prop-5.bdf b/fonts/05-Tiny.bdf
index f248d1e559..f248d1e559 100644
--- a/fonts/Tiny-Prop-5.bdf
+++ b/fonts/05-Tiny.bdf
diff --git a/fonts/Tiny-Prop-6.bdf b/fonts/06-Tiny.bdf
index 085c4cc747..085c4cc747 100644
--- a/fonts/Tiny-Prop-6.bdf
+++ b/fonts/06-Tiny.bdf
diff --git a/fonts/5x7.bdf b/fonts/07-Fixed.bdf
index 4fcb9bd31a..4fcb9bd31a 100644
--- a/fonts/5x7.bdf
+++ b/fonts/07-Fixed.bdf
diff --git a/fonts/atadore.bdf b/fonts/08-Atadore.bdf
index 551a3ced03..551a3ced03 100644
--- a/fonts/atadore.bdf
+++ b/fonts/08-Atadore.bdf
diff --git a/fonts/5x8.bdf b/fonts/08-Fixed.bdf
index a0a32fa7d4..a0a32fa7d4 100644
--- a/fonts/5x8.bdf
+++ b/fonts/08-Fixed.bdf
diff --git a/fonts/namil-8.bdf b/fonts/08-Namil.bdf
index 65af304bbd..65af304bbd 100644
--- a/fonts/namil-8.bdf
+++ b/fonts/08-Namil.bdf
diff --git a/fonts/nedore-8.bdf b/fonts/08-Nedore.bdf
index cd09ec935d..cd09ec935d 100644
--- a/fonts/nedore-8.bdf
+++ b/fonts/08-Nedore.bdf
diff --git a/fonts/proportional.bdf b/fonts/08-Rockbox-Propfont.bdf
index d999144c7a..d999144c7a 100644
--- a/fonts/proportional.bdf
+++ b/fonts/08-Rockbox-Propfont.bdf
diff --git a/fonts/rockfont-8.bdf b/fonts/08-Rockfont.bdf
index 5264b4e1a9..5264b4e1a9 100644
--- a/fonts/rockfont-8.bdf
+++ b/fonts/08-Rockfont.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-8.bdf b/fonts/08-Sazanami-Mincho.bdf
index add5999338..add5999338 100644
--- a/fonts/Sazanami-Mincho-Regular-8.bdf
+++ b/fonts/08-Sazanami-Mincho.bdf
diff --git a/fonts/rockbox_default.bdf b/fonts/08-Schumacher-Clean.bdf
index a7e7f9a6e1..a7e7f9a6e1 100644
--- a/fonts/rockbox_default.bdf
+++ b/fonts/08-Schumacher-Clean.bdf
diff --git a/fonts/6x9.bdf b/fonts/09-Fixed.bdf
index 6a19bb1107..6a19bb1107 100644
--- a/fonts/6x9.bdf
+++ b/fonts/09-Fixed.bdf
diff --git a/fonts/nedore-9.bdf b/fonts/09-Nedore.bdf
index d32e91da4f..d32e91da4f 100644
--- a/fonts/nedore-9.bdf
+++ b/fonts/09-Nedore.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-9.bdf b/fonts/09-Sazanami-Mincho.bdf
index 7ef345b5e6..7ef345b5e6 100644
--- a/fonts/Sazanami-Mincho-Regular-9.bdf
+++ b/fonts/09-Sazanami-Mincho.bdf
diff --git a/fonts/snap.bdf b/fonts/10-Artwiz-Snap.bdf
index dfbe8d8907..dfbe8d8907 100644
--- a/fonts/snap.bdf
+++ b/fonts/10-Artwiz-Snap.bdf
diff --git a/fonts/6x10.bdf b/fonts/10-Fixed.bdf
index 79c4cafcee..79c4cafcee 100644
--- a/fonts/6x10.bdf
+++ b/fonts/10-Fixed.bdf
diff --git a/fonts/nimbus-10.bdf b/fonts/10-Nimbus.bdf
index d573e9d826..d573e9d826 100755
--- a/fonts/nimbus-10.bdf
+++ b/fonts/10-Nimbus.bdf
diff --git a/fonts/ProFont_r400-10.bdf b/fonts/10-ProFont.bdf
index 33ae2a5b4d..33ae2a5b4d 100644
--- a/fonts/ProFont_r400-10.bdf
+++ b/fonts/10-ProFont.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-10.bdf b/fonts/10-Sazanami-Mincho.bdf
index 3f7ba52ee2..3f7ba52ee2 100644
--- a/fonts/Sazanami-Mincho-Regular-10.bdf
+++ b/fonts/10-Sazanami-Mincho.bdf
diff --git a/fonts/nimbus-11.bdf b/fonts/11-Nimbus.bdf
index 3f04481034..3f04481034 100644
--- a/fonts/nimbus-11.bdf
+++ b/fonts/11-Nimbus.bdf
diff --git a/fonts/ProFont_r400-11.bdf b/fonts/11-ProFont.bdf
index 6074e0ed48..6074e0ed48 100644
--- a/fonts/ProFont_r400-11.bdf
+++ b/fonts/11-ProFont.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-11.bdf b/fonts/11-Sazanami-Mincho.bdf
index 42e8559fea..42e8559fea 100644
--- a/fonts/Sazanami-Mincho-Regular-11.bdf
+++ b/fonts/11-Sazanami-Mincho.bdf
diff --git a/fonts/helvR10.bdf b/fonts/12-Adobe-Helvetica.bdf
index b80de661c9..b80de661c9 100644
--- a/fonts/helvR10.bdf
+++ b/fonts/12-Adobe-Helvetica.bdf
diff --git a/fonts/6x12.bdf b/fonts/12-Fixed-SemiCond.bdf
index dfe16eae4a..dfe16eae4a 100644
--- a/fonts/6x12.bdf
+++ b/fonts/12-Fixed-SemiCond.bdf
diff --git a/fonts/nimbus-12.bdf b/fonts/12-Nimbus.bdf
index 52733ae356..52733ae356 100644
--- a/fonts/nimbus-12.bdf
+++ b/fonts/12-Nimbus.bdf
diff --git a/fonts/ProFont_r400-12.bdf b/fonts/12-ProFont.bdf
index 402c652cf9..402c652cf9 100644
--- a/fonts/ProFont_r400-12.bdf
+++ b/fonts/12-ProFont.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-12.bdf b/fonts/12-Sazanami-Mincho.bdf
index 2108b698be..2108b698be 100644
--- a/fonts/Sazanami-Mincho-Regular-12.bdf
+++ b/fonts/12-Sazanami-Mincho.bdf
diff --git a/fonts/ter-u12n.bdf b/fonts/12-Terminus.bdf
index 86518f7f79..86518f7f79 100644
--- a/fonts/ter-u12n.bdf
+++ b/fonts/12-Terminus.bdf
diff --git a/fonts/8x13B.bdf b/fonts/13-Fixed-Bold.bdf
index 652abe3cd3..652abe3cd3 100644
--- a/fonts/8x13B.bdf
+++ b/fonts/13-Fixed-Bold.bdf
diff --git a/fonts/6x13B.bdf b/fonts/13-Fixed-SemiCond-Bold.bdf
index 10c6c3767f..10c6c3767f 100644
--- a/fonts/6x13B.bdf
+++ b/fonts/13-Fixed-SemiCond-Bold.bdf
diff --git a/fonts/6x13.bdf b/fonts/13-Fixed-SemiCond.bdf
index ded393e305..ded393e305 100644
--- a/fonts/6x13.bdf
+++ b/fonts/13-Fixed-SemiCond.bdf
diff --git a/fonts/6+12x13.bdf b/fonts/13-Fixed.bdf
index 94833452aa..94833452aa 100644
--- a/fonts/6+12x13.bdf
+++ b/fonts/13-Fixed.bdf
diff --git a/fonts/nimbus-13.bdf b/fonts/13-Nimbus.bdf
index ffb8b78d53..ffb8b78d53 100644
--- a/fonts/nimbus-13.bdf
+++ b/fonts/13-Nimbus.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-13.bdf b/fonts/13-Sazanami-Mincho.bdf
index d572d8b801..d572d8b801 100644
--- a/fonts/Sazanami-Mincho-Regular-13.bdf
+++ b/fonts/13-Sazanami-Mincho.bdf
diff --git a/fonts/nimbus-14.bdf b/fonts/14-Nimbus.bdf
index 6cc655b13a..6cc655b13a 100644
--- a/fonts/nimbus-14.bdf
+++ b/fonts/14-Nimbus.bdf
diff --git a/fonts/mix12.bdf b/fonts/14-Rockbox-Mix.bdf
index c7569a21c1..c7569a21c1 100644
--- a/fonts/mix12.bdf
+++ b/fonts/14-Rockbox-Mix.bdf
diff --git a/fonts/Sazanami-Mincho-Regular-14.bdf b/fonts/14-Sazanami-Mincho.bdf
index ed08e883c2..ed08e883c2 100644
--- a/fonts/Sazanami-Mincho-Regular-14.bdf
+++ b/fonts/14-Sazanami-Mincho.bdf
diff --git a/fonts/ter-u14b.bdf b/fonts/14-Terminus-Bold.bdf
index 8a2b071f8d..8a2b071f8d 100644
--- a/fonts/ter-u14b.bdf
+++ b/fonts/14-Terminus-Bold.bdf
diff --git a/fonts/ter-u14n.bdf b/fonts/14-Terminus.bdf
index e3199f18f5..e3199f18f5 100644
--- a/fonts/ter-u14n.bdf
+++ b/fonts/14-Terminus.bdf
diff --git a/fonts/helvR12.bdf b/fonts/15-Adobe-Helvetica.bdf
index 6a90ed9282..6a90ed9282 100644
--- a/fonts/helvR12.bdf
+++ b/fonts/15-Adobe-Helvetica.bdf
diff --git a/fonts/ProFont_r400-15.bdf b/fonts/15-ProFont.bdf
index 9385f492e3..9385f492e3 100644
--- a/fonts/ProFont_r400-15.bdf
+++ b/fonts/15-ProFont.bdf
diff --git a/fonts/helvR14.bdf b/fonts/16-Adobe-Helvetica.bdf
index a142195e01..a142195e01 100644
--- a/fonts/helvR14.bdf
+++ b/fonts/16-Adobe-Helvetica.bdf
diff --git a/fonts/unifont.bdf b/fonts/16-GNU-Unifont.bdf
index 81862fea66..81862fea66 100644
--- a/fonts/unifont.bdf
+++ b/fonts/16-GNU-Unifont.bdf
diff --git a/fonts/jackash-16.bdf b/fonts/16-Jackash.bdf
index 0379d64d2c..0379d64d2c 100644
--- a/fonts/jackash-16.bdf
+++ b/fonts/16-Jackash.bdf
diff --git a/fonts/ter-u16b.bdf b/fonts/16-Terminus-Bold.bdf
index 967baf13a8..967baf13a8 100644
--- a/fonts/ter-u16b.bdf
+++ b/fonts/16-Terminus-Bold.bdf
diff --git a/fonts/ter-u16n.bdf b/fonts/16-Terminus.bdf
index 68ed11bfe9..68ed11bfe9 100644
--- a/fonts/ter-u16n.bdf
+++ b/fonts/16-Terminus.bdf
diff --git a/fonts/ProFont_r400-17.bdf b/fonts/17-ProFont.bdf
index b28dd455f6..b28dd455f6 100644
--- a/fonts/ProFont_r400-17.bdf
+++ b/fonts/17-ProFont.bdf
diff --git a/fonts/9+18x18B.bdf b/fonts/18-Fixed-Bold.bdf
index 85a662e4d3..85a662e4d3 100644
--- a/fonts/9+18x18B.bdf
+++ b/fonts/18-Fixed-Bold.bdf
diff --git a/fonts/9+18x18.bdf b/fonts/18-Fixed.bdf
index dee121c036..dee121c036 100644
--- a/fonts/9+18x18.bdf
+++ b/fonts/18-Fixed.bdf
diff --git a/fonts/nimbus-19.bdf b/fonts/19-Nimbus.bdf
index 47ad4402f3..47ad4402f3 100644
--- a/fonts/nimbus-19.bdf
+++ b/fonts/19-Nimbus.bdf
diff --git a/fonts/ter-u20b.bdf b/fonts/20-Terminus-Bold.bdf
index 01c2ffd75b..01c2ffd75b 100644
--- a/fonts/ter-u20b.bdf
+++ b/fonts/20-Terminus-Bold.bdf
diff --git a/fonts/ter-u20n.bdf b/fonts/20-Terminus.bdf
index e73d906cb5..e73d906cb5 100644
--- a/fonts/ter-u20n.bdf
+++ b/fonts/20-Terminus.bdf
diff --git a/fonts/ProFont_r400-22.bdf b/fonts/22-ProFont.bdf
index 537f8698a0..537f8698a0 100644
--- a/fonts/ProFont_r400-22.bdf
+++ b/fonts/22-ProFont.bdf
diff --git a/fonts/ter-u24b.bdf b/fonts/24-Terminus-Bold.bdf
index 39606a9ea7..39606a9ea7 100644
--- a/fonts/ter-u24b.bdf
+++ b/fonts/24-Terminus-Bold.bdf
diff --git a/fonts/ter-u24n.bdf b/fonts/24-Terminus.bdf
index 8378d5572a..8378d5572a 100644
--- a/fonts/ter-u24n.bdf
+++ b/fonts/24-Terminus.bdf
diff --git a/fonts/ter-u28b.bdf b/fonts/28-Terminus-Bold.bdf
index 08762063ab..08762063ab 100644
--- a/fonts/ter-u28b.bdf
+++ b/fonts/28-Terminus-Bold.bdf
diff --git a/fonts/ter-u28n.bdf b/fonts/28-Terminus.bdf
index 4af94e7444..4af94e7444 100644
--- a/fonts/ter-u28n.bdf
+++ b/fonts/28-Terminus.bdf
diff --git a/fonts/ProFont_r400-29.bdf b/fonts/29-ProFont.bdf
index d260775f9a..d260775f9a 100644
--- a/fonts/ProFont_r400-29.bdf
+++ b/fonts/29-ProFont.bdf
diff --git a/fonts/ter-u32b.bdf b/fonts/32-Terminus-Bold.bdf
index 7cfcae0dde..7cfcae0dde 100644
--- a/fonts/ter-u32b.bdf
+++ b/fonts/32-Terminus-Bold.bdf
diff --git a/fonts/ter-u32n.bdf b/fonts/32-Terminus.bdf
index 37dd8aae28..37dd8aae28 100644
--- a/fonts/ter-u32n.bdf
+++ b/fonts/32-Terminus.bdf
diff --git a/fonts/README b/fonts/README
new file mode 100755
index 0000000000..2c81c60d38
--- /dev/null
+++ b/fonts/README
@@ -0,0 +1,129 @@
+ __________ __ ___.
+ Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ \/ \/ \/ \/ \/
+
+ Rockbox Font Collection
+
+Fonts put here need to follow a few rules:
+
+1. All fonts must be in standard unicode encoding (ISO10646-1). ISO8859-1
+ would also work, but should be avoided for consistency, and converted to
+ unicode (it's a trivial change of declaration, the actual code positions
+ stay the same).
+ Other encodings will break text output in rockbox for any non-ASCII text
+ and are hence not allowed.
+
+2. All fonts need to adhere to the following naming convention for easy
+ browsing in rockbox:
+
+ NN-Family-Variant.bdf
+
+ NN is the height _in pixels_ when converted to .fnt with convbdf, zero
+ padded for proper sorting in the file browser.
+
+ "Family" is the font family (might consist of more than one part, e.g.
+ "Adobe-Helvetica")
+
+ "Variant" covers the weight and variant (might also consist of more than
+ one part e.g. "Cond-BoldItalic"). This part should be left out if it is
+ Regular/Normal/Medium. Do not abbreviate variant names unless they're
+ overly long (keep in mind that the rockbox target displays vary a lot in
+ size).
+
+3. Fonts must have a suitable license for redistribution.
+
+4. Fonts should be carefully selected, judging quality over quantity. A font
+ that only covers ASCII isn't worth much. Rockbox supports a lot of
+ languages.
+
+
+Reference table for theme authors
+
+Old Name New Name Remarks
+-------------------------------------------------------------------------------
+00-Starmap_r400-8 - removed, use another 8px font
+5x7 07-Fixed
+5x8 08-Fixed
+6+12x13 13-Fixed
+6x9 09-Fixed
+6x10 10-Fixed
+6x12 12-Fixed-SemiCond
+6x13 13-Fixed-SemiCond
+6x13B 13-Fixed-SemiCond-Bold
+8x13B 13-Fixed-Bold
+9+18x18 18-Fixed
+9+18x18B 18-Fixed-Bold
+alt8x8 - removed, use another 8px font
+atadore 08-Atadore
+atari-small - removed, use another 8px font
+clR6x8-8859-2 08-Schumacher-Clean *
+courB08 - removed, use another 10px font
+courB14 - removed, use another 18px font
+Hebrew-Bold - removed, use another 8px font
+Hebrew-Large - removed, use another 8px font
+Hebrew-Medium - removed, use another 8px font
+Hebrew-Small - removed, use another 8px font
+helvR10 12-Adobe-Helvetica
+helvR12 15-Adobe-Helvetica
+helvR14 16-Adobe-Helvetica
+jackash-16 16-Jackash
+mix12 14-Rockbox-Mix
+namil-8 08-Namil
+nedore-8 08-Nedore
+nedore-9 09-Nedore
+nimbus-10 10-Nimbus
+nimbus-11 11-Nimbus
+nimbus-12 12-Nimbus
+nimbus-13 13-Nimbus
+nimbus-14 14-Nimbus
+nimbus-19 19-Nimbus
+ProFont_r400-10 10-ProFont
+ProFont_r400-11 11-ProFont
+ProFont_r400-12 12-ProFont
+ProFont_r400-15 15-ProFont
+ProFont_r400-17 17-ProFont
+ProFont_r400-22 22-ProFont
+ProFont_r400-29 29-ProFont
+proportional 08-Rockbox-Propfont
+rockbox_default 08-Schumacher-Clean *
+rockfont-8 08-Rockfont
+Sazanami-Mincho-Regular-8 08-Sazanami-Mincho
+Sazanami-Mincho-Regular-9 09-Sazanami-Mincho
+Sazanami-Mincho-Regular-10 10-Sazanami-Mincho
+Sazanami-Mincho-Regular-11 11-Sazanami-Mincho
+Sazanami-Mincho-Regular-12 12-Sazanami-Mincho
+Sazanami-Mincho-Regular-13 13-Sazanami-Mincho
+Sazanami-Mincho-Regular-14 14-Sazanami-Mincho
+snap 10-Artwiz-Snap
+ter-u12n 12-Terminus
+ter-u14b 14-Terminus-Bold
+ter-u14n 14-Terminus
+ter-u14v - removed, use 14-Terminus-Bold
+ter-u16b 16-Terminus-Bold
+ter-u16n 16-Terminus
+ter-u16v - removed, use 16-Terminus-Bold
+ter-u20b 20-Terminus-Bold
+ter-u20n 20-Terminus
+ter-u24b 24-Terminus-Bold
+ter-u24n 24-Terminus
+ter-u28b 28-Terminus-Bold
+ter-u28n 28-Terminus
+ter-u32b 32-Terminus-Bold
+ter-u32n 32-Terminus
+timR08 - removed, use another 11px font
+Tiny-Prop-5 05-Tiny
+Tiny-Prop-6 06-Tiny
+unifont 16-GNU-Unifont
+uwe_prop - removed, use 08-Rockbox-Propfont
+win_crox0c - removed, use another 10px font
+win_crox1c - removed, use another 13px font
+win_crox2c - removed, use another 16px font
+win_crox3c - removed, use another 20px font
+win_crox4h - removed, use another 24px font
+win_crox5t - removed, use another 27px font
+
+* this is not a mistake. Those were 2 encoding variants of the same font,
+ which are now combined.
diff --git a/wps/WPSLIST b/wps/WPSLIST
index b898f52541..b3090fcbda 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -27,7 +27,7 @@ RWPS: rockbox_default.rwps
# Name of the creator of the WPS
Author: xameius
# preferred font
-Font: nimbus-12.fnt
+Font: 12-Nimbus.fnt
# whether the WPS is designed to have the statusbar present or not
Statusbar: on
# whether a menu backdrop should be set
@@ -45,7 +45,7 @@ selector type: bar (inverse)
Name: rockbox_default.wps
RWPS: rockbox_default.rwps
Author: Rockbox team
-Font: rockbox_default.fnt
+Font: 08-Schumacher-Clean.fnt
Statusbar: on
Foreground Color: 000000
Background Color: B6C6E5
@@ -59,7 +59,7 @@ selector type: bar (inverse)
Name: boxes.wps
rwps: boxes.rwps
Author: Christi Scarborough (after Magnus Westerlund)
-Font: rockbox_default.fnt
+Font: 08-Schumacher-Clean.fnt
Statusbar: on
# themes with colour screen versions need to set the colours too
Foreground Color: 000000
@@ -74,7 +74,7 @@ selector type: bar (inverse)
Name: engineeer2.wps
RWPS: engineeer2.rwps
Author: Magnus Westerlund
-Font: nedore-8.fnt
+Font: 08-Nedore.fnt
Statusbar: on
backdrop:
iconset:
@@ -86,7 +86,7 @@ selector type: bar (inverse)
Name: iAmp.wps
RWPS: iAmp.rwps
Author: Raymond Hoh
-Font: nimbus-12.fnt
+Font: 12-Nimbus.fnt
backdrop:
iconset:
viewers iconset:
@@ -98,7 +98,7 @@ Statusbar: on
Name: zezayer.wps
RWPS: zezayer.rwps
Author: Jake Owen
-Font: nedore-8.fnt
+Font: 08-Nedore.fnt
Statusbar: on
backdrop:
iconset:
@@ -109,35 +109,35 @@ selector type: bar (inverse)
<rwps>
Name: zezayer.rwps
Author: Dominik Riebeling
-Font: nedore-8.fnt
+Font: 08-Nedore.fnt
Statusbar: on
</rwps>
<rwps>
Name: rockbox_default.rwps
Author: Rockbox team
-Font: rockbox_default.fnt
+Font: 08-Schumacher-Clean.fnt
Statusbar: on
</rwps>
<rwps>
Name: iAmp.rwps
Author: Raymond Hoh
-Font: nimbus-12.fnt
+Font: 12-Nimbus.fnt
Statusbar: on
</rwps>
<rwps>
Name: boxes.rwps
Author: Christi Scarborough
-Font: rockbox_default.fnt
+Font: 08-Schumacher-Clean.fnt
Statusbar: on
</rwps>
<rwps>
Name: engineeer2.rwps
Author: Magnus Westerlund
-Font: nedore-8.fnt
+Font: 08-Nedore.fnt
Statusbar: on
</rwps>
@@ -145,7 +145,7 @@ Statusbar: on
Name: marquee.wps
RWPS: marquee.rwps
Author: Mike Sobel
-Font: nimbus-13.fnt
+Font: 13-Nimbus.fnt
Statusbar: on
backdrop:
iconset:
@@ -156,7 +156,7 @@ selector type: bar (inverse)
<rwps>
Name: marquee.rwps
Author: Mike Sobel
-Font: nimbus-13.fnt
+Font: 13-Nimbus.fnt
Statusbar: on
</rwps>
@@ -164,7 +164,7 @@ Statusbar: on
Name: DancePuffDuo.wps
RWPS: DancePuffDuo.rwps
Author: Chris Oxtoby
-Font: nimbus-13.fnt
+Font: 13-Nimbus.fnt
Statusbar: on
Foreground Color: 000000
Background Color: B6C6E5
@@ -177,7 +177,7 @@ selector type: bar (inverse)
<rwps>
Name: DancePuffDuo.rwps
Author: Chris Oxtoby
-Font: nimbus-13.fnt
+Font: 13-Nimbus.fnt
Statusbar: on
</rwps>
@@ -185,17 +185,17 @@ Statusbar: on
Name: iCatcher.wps
RWPS: iCatcher.rwps
Author: Ioannis Koutoulakis
-Font.112x64x1: rockfont-8.fnt
-Font.128x128x16: nedore-9.fnt
-Font.132x80x16: nedore-9.fnt
-Font.138x110x2: nedore-8.fnt
-Font.160x128x2: nedore-9.fnt
-Font.160x128x16: nedore-9.fnt
-Font.176x132x16: nedore-9.fnt
-Font.176x220x16: nimbus-12.fnt
-Font.220x176x16: nimbus-14.fnt
-Font.240x320x16: nimbus-19.fnt
-Font.320x240x16: nimbus-19.fnt
+Font.112x64x1: 08-Rockfont.fnt
+Font.128x128x16: 09-Nedore.fnt
+Font.132x80x16: 09-Nedore.fnt
+Font.138x110x2: 08-Nedore.fnt
+Font.160x128x2: 09-Nedore.fnt
+Font.160x128x16: 09-Nedore.fnt
+Font.176x132x16: 09-Nedore.fnt
+Font.176x220x16: 12-Nimbus.fnt
+Font.220x176x16: 14-Nimbus.fnt
+Font.240x320x16: 19-Nimbus.fnt
+Font.320x240x16: 19-Nimbus.fnt
Foreground Color: 000000
Background Color: FFFFFF
Statusbar: on
@@ -208,8 +208,8 @@ selector type: bar (inverse)
<rwps>
Name: iCatcher.rwps
Author: Ioannis Koutoulakis
-Font.160x128x2: nedore-9.fnt
-Font.220x176x16: nimbus-14.fnt
+Font.160x128x2: 09-Nedore.fnt
+Font.220x176x16: 14-Nimbus.fnt
Statusbar: on
</rwps>
@@ -217,7 +217,7 @@ Statusbar: on
Name: UniCatcher.wps
RWPS: UniCatcher.rwps
Author: Ioannis Koutoulakis
-Font: unifont.fnt
+Font: 16-GNU-Unifont.fnt
Foreground Color: 000000
Background Color: FFFFFF
Statusbar: on
@@ -230,7 +230,7 @@ selector type: bar (inverse)
<rwps>
Name: UniCatcher.rwps
Author: Ioannis Koutoulakis
-Font: unifont.fnt
+Font: 16-GNU-Unifont.fnt
Statusbar: on
</rwps>
@@ -238,17 +238,17 @@ Statusbar: on
Name: Rockboxed.wps
RWPS: rockbox_default.rwps
Author: Roan Horning
-Font.112x64x1: rockbox_default.fnt
-Font.128x128x16: nimbus-12.fnt
-Font.132x80x16: nimbus-10.fnt
-Font.138x110x2: nimbus-12.fnt
-Font.160x128x16: nimbus-12.fnt
-Font.160x128x2: nimbus-12.fnt
-Font.176x132x16: nimbus-12.fnt
-Font.176x220x16: nimbus-12.fnt
-Font.220x176x16: nimbus-14.fnt
-Font.240x320x16: nimbus-19.fnt
-Font.320x240x16: nimbus-19.fnt
+Font.112x64x1: 08-Schumacher-Clean.fnt
+Font.128x128x16: 12-Nimbus.fnt
+Font.132x80x16: 10-Nimbus.fnt
+Font.138x110x2: 12-Nimbus.fnt
+Font.160x128x16: 12-Nimbus.fnt
+Font.160x128x2: 12-Nimbus.fnt
+Font.176x132x16: 12-Nimbus.fnt
+Font.176x220x16: 12-Nimbus.fnt
+Font.220x176x16: 14-Nimbus.fnt
+Font.240x320x16: 19-Nimbus.fnt
+Font.320x240x16: 19-Nimbus.fnt
Foreground Color: 000000
Background Color: FFC000
Statusbar: on
@@ -270,18 +270,18 @@ RWPS: cabbiev2.rwps
Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
# Preferred font (including .fnt extension - leave blank for player):
-Font.320x240x16: helvR12.fnt
-Font.240x320x16: helvR12.fnt
-Font.220x176x16: helvR10.fnt
-Font.176x220x16: helvR10.fnt
-Font.176x132x16: helvR10.fnt
-Font.160x128x16: helvR10.fnt
-Font.160x128x2: helvR10.fnt
-Font.160x128x1: helvR10.fnt
-Font.138x110x2: helvR10.fnt
-Font.128x128x16: helvR10.fnt
-Font.132x80x16: Sazanami-Mincho-Regular-11.fnt
-Font.112x64x1: rockfont-8.fnt
+Font.320x240x16: 15-Adobe-Helvetica.fnt
+Font.240x320x16: 15-Adobe-Helvetica.fnt
+Font.220x176x16: 12-Adobe-Helvetica.fnt
+Font.176x220x16: 12-Adobe-Helvetica.fnt
+Font.176x132x16: 12-Adobe-Helvetica.fnt
+Font.160x128x16: 12-Adobe-Helvetica.fnt
+Font.160x128x2: 12-Adobe-Helvetica.fnt
+Font.160x128x1: 12-Adobe-Helvetica.fnt
+Font.138x110x2: 12-Adobe-Helvetica.fnt
+Font.128x128x16: 12-Adobe-Helvetica.fnt
+Font.132x80x16: 11-Sazanami-Mincho.fnt
+Font.112x64x1: 08-Rockfont.fnt
#misc settings that should be ignored on grayscale targets
foreground color: CCCCCC
@@ -346,6 +346,6 @@ Statusbar: on
<rwps>
Name: cabbiev2.rwps
Author: Johannes Voggenthaler, Apoo Maha, Marc Guay, Alex Vanderpol, Jerry Lange, Keith Perri, Mark Fawcus, and Marianne Arnold with support from Rockbox developers and forums. Based on Cabbie by Yohann Misquitta.
-Font: helvR10.fnt
+Font: 12-Adobe-Helvetica.fnt
Statusbar: on
</rwps>