Font cleanup step 3 - The Big Shuffle: Renamed all fonts to a consistent naming scheme that allows easy selection of alternatives based on size, as discussed on IRC. Adjusted themes in SVN and Makefile for the sysfont. ** Attention **: Clean up your /.rockbox/fonts folder before installing the new release, and then install a new font pack as well. Adjust font names in your custom .cfg files. A reference table can be found in fonts/README.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18388 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-09-02 22:31:11 +00:00
parent e278b4fddb
commit f2c7a69403
63 changed files with 185 additions and 56 deletions

View file

@ -42,10 +42,10 @@ clean:
$(OBJDIR)/thread.o: thread.c export/thread.h $(OBJDIR)/thread.o: thread.c export/thread.h
$(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ $(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 $@ $< $(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,CONVBDF)$(TOOLSDIR)/convbdf -l 255 -c -o $(OBJDIR)/sysfont.c $<
$(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@

129
fonts/README Executable file
View file

@ -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.

View file

@ -27,7 +27,7 @@ RWPS: rockbox_default.rwps
# Name of the creator of the WPS # Name of the creator of the WPS
Author: xameius Author: xameius
# preferred font # preferred font
Font: nimbus-12.fnt Font: 12-Nimbus.fnt
# whether the WPS is designed to have the statusbar present or not # whether the WPS is designed to have the statusbar present or not
Statusbar: on Statusbar: on
# whether a menu backdrop should be set # whether a menu backdrop should be set
@ -45,7 +45,7 @@ selector type: bar (inverse)
Name: rockbox_default.wps Name: rockbox_default.wps
RWPS: rockbox_default.rwps RWPS: rockbox_default.rwps
Author: Rockbox team Author: Rockbox team
Font: rockbox_default.fnt Font: 08-Schumacher-Clean.fnt
Statusbar: on Statusbar: on
Foreground Color: 000000 Foreground Color: 000000
Background Color: B6C6E5 Background Color: B6C6E5
@ -59,7 +59,7 @@ selector type: bar (inverse)
Name: boxes.wps Name: boxes.wps
rwps: boxes.rwps rwps: boxes.rwps
Author: Christi Scarborough (after Magnus Westerlund) Author: Christi Scarborough (after Magnus Westerlund)
Font: rockbox_default.fnt Font: 08-Schumacher-Clean.fnt
Statusbar: on Statusbar: on
# themes with colour screen versions need to set the colours too # themes with colour screen versions need to set the colours too
Foreground Color: 000000 Foreground Color: 000000
@ -74,7 +74,7 @@ selector type: bar (inverse)
Name: engineeer2.wps Name: engineeer2.wps
RWPS: engineeer2.rwps RWPS: engineeer2.rwps
Author: Magnus Westerlund Author: Magnus Westerlund
Font: nedore-8.fnt Font: 08-Nedore.fnt
Statusbar: on Statusbar: on
backdrop: backdrop:
iconset: iconset:
@ -86,7 +86,7 @@ selector type: bar (inverse)
Name: iAmp.wps Name: iAmp.wps
RWPS: iAmp.rwps RWPS: iAmp.rwps
Author: Raymond Hoh Author: Raymond Hoh
Font: nimbus-12.fnt Font: 12-Nimbus.fnt
backdrop: backdrop:
iconset: iconset:
viewers iconset: viewers iconset:
@ -98,7 +98,7 @@ Statusbar: on
Name: zezayer.wps Name: zezayer.wps
RWPS: zezayer.rwps RWPS: zezayer.rwps
Author: Jake Owen Author: Jake Owen
Font: nedore-8.fnt Font: 08-Nedore.fnt
Statusbar: on Statusbar: on
backdrop: backdrop:
iconset: iconset:
@ -109,35 +109,35 @@ selector type: bar (inverse)
<rwps> <rwps>
Name: zezayer.rwps Name: zezayer.rwps
Author: Dominik Riebeling Author: Dominik Riebeling
Font: nedore-8.fnt Font: 08-Nedore.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
<rwps> <rwps>
Name: rockbox_default.rwps Name: rockbox_default.rwps
Author: Rockbox team Author: Rockbox team
Font: rockbox_default.fnt Font: 08-Schumacher-Clean.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
<rwps> <rwps>
Name: iAmp.rwps Name: iAmp.rwps
Author: Raymond Hoh Author: Raymond Hoh
Font: nimbus-12.fnt Font: 12-Nimbus.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
<rwps> <rwps>
Name: boxes.rwps Name: boxes.rwps
Author: Christi Scarborough Author: Christi Scarborough
Font: rockbox_default.fnt Font: 08-Schumacher-Clean.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
<rwps> <rwps>
Name: engineeer2.rwps Name: engineeer2.rwps
Author: Magnus Westerlund Author: Magnus Westerlund
Font: nedore-8.fnt Font: 08-Nedore.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
@ -145,7 +145,7 @@ Statusbar: on
Name: marquee.wps Name: marquee.wps
RWPS: marquee.rwps RWPS: marquee.rwps
Author: Mike Sobel Author: Mike Sobel
Font: nimbus-13.fnt Font: 13-Nimbus.fnt
Statusbar: on Statusbar: on
backdrop: backdrop:
iconset: iconset:
@ -156,7 +156,7 @@ selector type: bar (inverse)
<rwps> <rwps>
Name: marquee.rwps Name: marquee.rwps
Author: Mike Sobel Author: Mike Sobel
Font: nimbus-13.fnt Font: 13-Nimbus.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
@ -164,7 +164,7 @@ Statusbar: on
Name: DancePuffDuo.wps Name: DancePuffDuo.wps
RWPS: DancePuffDuo.rwps RWPS: DancePuffDuo.rwps
Author: Chris Oxtoby Author: Chris Oxtoby
Font: nimbus-13.fnt Font: 13-Nimbus.fnt
Statusbar: on Statusbar: on
Foreground Color: 000000 Foreground Color: 000000
Background Color: B6C6E5 Background Color: B6C6E5
@ -177,7 +177,7 @@ selector type: bar (inverse)
<rwps> <rwps>
Name: DancePuffDuo.rwps Name: DancePuffDuo.rwps
Author: Chris Oxtoby Author: Chris Oxtoby
Font: nimbus-13.fnt Font: 13-Nimbus.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
@ -185,17 +185,17 @@ Statusbar: on
Name: iCatcher.wps Name: iCatcher.wps
RWPS: iCatcher.rwps RWPS: iCatcher.rwps
Author: Ioannis Koutoulakis Author: Ioannis Koutoulakis
Font.112x64x1: rockfont-8.fnt Font.112x64x1: 08-Rockfont.fnt
Font.128x128x16: nedore-9.fnt Font.128x128x16: 09-Nedore.fnt
Font.132x80x16: nedore-9.fnt Font.132x80x16: 09-Nedore.fnt
Font.138x110x2: nedore-8.fnt Font.138x110x2: 08-Nedore.fnt
Font.160x128x2: nedore-9.fnt Font.160x128x2: 09-Nedore.fnt
Font.160x128x16: nedore-9.fnt Font.160x128x16: 09-Nedore.fnt
Font.176x132x16: nedore-9.fnt Font.176x132x16: 09-Nedore.fnt
Font.176x220x16: nimbus-12.fnt Font.176x220x16: 12-Nimbus.fnt
Font.220x176x16: nimbus-14.fnt Font.220x176x16: 14-Nimbus.fnt
Font.240x320x16: nimbus-19.fnt Font.240x320x16: 19-Nimbus.fnt
Font.320x240x16: nimbus-19.fnt Font.320x240x16: 19-Nimbus.fnt
Foreground Color: 000000 Foreground Color: 000000
Background Color: FFFFFF Background Color: FFFFFF
Statusbar: on Statusbar: on
@ -208,8 +208,8 @@ selector type: bar (inverse)
<rwps> <rwps>
Name: iCatcher.rwps Name: iCatcher.rwps
Author: Ioannis Koutoulakis Author: Ioannis Koutoulakis
Font.160x128x2: nedore-9.fnt Font.160x128x2: 09-Nedore.fnt
Font.220x176x16: nimbus-14.fnt Font.220x176x16: 14-Nimbus.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
@ -217,7 +217,7 @@ Statusbar: on
Name: UniCatcher.wps Name: UniCatcher.wps
RWPS: UniCatcher.rwps RWPS: UniCatcher.rwps
Author: Ioannis Koutoulakis Author: Ioannis Koutoulakis
Font: unifont.fnt Font: 16-GNU-Unifont.fnt
Foreground Color: 000000 Foreground Color: 000000
Background Color: FFFFFF Background Color: FFFFFF
Statusbar: on Statusbar: on
@ -230,7 +230,7 @@ selector type: bar (inverse)
<rwps> <rwps>
Name: UniCatcher.rwps Name: UniCatcher.rwps
Author: Ioannis Koutoulakis Author: Ioannis Koutoulakis
Font: unifont.fnt Font: 16-GNU-Unifont.fnt
Statusbar: on Statusbar: on
</rwps> </rwps>
@ -238,17 +238,17 @@ Statusbar: on
Name: Rockboxed.wps Name: Rockboxed.wps
RWPS: rockbox_default.rwps RWPS: rockbox_default.rwps
Author: Roan Horning Author: Roan Horning
Font.112x64x1: rockbox_default.fnt Font.112x64x1: 08-Schumacher-Clean.fnt
Font.128x128x16: nimbus-12.fnt Font.128x128x16: 12-Nimbus.fnt
Font.132x80x16: nimbus-10.fnt Font.132x80x16: 10-Nimbus.fnt
Font.138x110x2: nimbus-12.fnt Font.138x110x2: 12-Nimbus.fnt
Font.160x128x16: nimbus-12.fnt Font.160x128x16: 12-Nimbus.fnt
Font.160x128x2: nimbus-12.fnt Font.160x128x2: 12-Nimbus.fnt
Font.176x132x16: nimbus-12.fnt Font.176x132x16: 12-Nimbus.fnt
Font.176x220x16: nimbus-12.fnt Font.176x220x16: 12-Nimbus.fnt
Font.220x176x16: nimbus-14.fnt Font.220x176x16: 14-Nimbus.fnt
Font.240x320x16: nimbus-19.fnt Font.240x320x16: 19-Nimbus.fnt
Font.320x240x16: nimbus-19.fnt Font.320x240x16: 19-Nimbus.fnt
Foreground Color: 000000 Foreground Color: 000000
Background Color: FFC000 Background Color: FFC000
Statusbar: on 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. 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): # Preferred font (including .fnt extension - leave blank for player):
Font.320x240x16: helvR12.fnt Font.320x240x16: 15-Adobe-Helvetica.fnt
Font.240x320x16: helvR12.fnt Font.240x320x16: 15-Adobe-Helvetica.fnt
Font.220x176x16: helvR10.fnt Font.220x176x16: 12-Adobe-Helvetica.fnt
Font.176x220x16: helvR10.fnt Font.176x220x16: 12-Adobe-Helvetica.fnt
Font.176x132x16: helvR10.fnt Font.176x132x16: 12-Adobe-Helvetica.fnt
Font.160x128x16: helvR10.fnt Font.160x128x16: 12-Adobe-Helvetica.fnt
Font.160x128x2: helvR10.fnt Font.160x128x2: 12-Adobe-Helvetica.fnt
Font.160x128x1: helvR10.fnt Font.160x128x1: 12-Adobe-Helvetica.fnt
Font.138x110x2: helvR10.fnt Font.138x110x2: 12-Adobe-Helvetica.fnt
Font.128x128x16: helvR10.fnt Font.128x128x16: 12-Adobe-Helvetica.fnt
Font.132x80x16: Sazanami-Mincho-Regular-11.fnt Font.132x80x16: 11-Sazanami-Mincho.fnt
Font.112x64x1: rockfont-8.fnt Font.112x64x1: 08-Rockfont.fnt
#misc settings that should be ignored on grayscale targets #misc settings that should be ignored on grayscale targets
foreground color: CCCCCC foreground color: CCCCCC
@ -346,6 +346,6 @@ Statusbar: on
<rwps> <rwps>
Name: cabbiev2.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. 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 Statusbar: on
</rwps> </rwps>