Index: apps/menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/menu.c,v
retrieving revision 1.41
diff -r1.41 menu.c
128c128
< #if LCD_PROPFONTS
---
> #ifdef HAVE_LCD_BITMAP
178c178
< #if LCD_PROPFONTS
---
> #ifdef HAVE_LCD_BITMAP
Index: firmware/font.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/font.c,v
retrieving revision 1.2
diff -r1.2 font.c
8c8
<  * $Id: font.c,v 1.2 2002/09/13 06:37:49 bagder Exp $
---
>  * $Id: font.c,v 1.1 2002/09/12 13:33:59 bagder Exp $
85a86,87
>     if (font >= MAXFONTS)
>         font = 0;
118,121c120,123
< 	/* check input range*/
< 	if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
< 		ch = pf->defaultchar;
< 	ch -= pf->firstchar;
---
>         /* check input range*/
>         if (ch < pf->firstchar || ch >= pf->firstchar+pf->size)
>             ch = pf->defaultchar;
>         ch -= pf->firstchar;
123,124c125,126
< 	/* get proportional width and glyph bits*/
< 	width += pf->width? pf->width[ch]: pf->maxwidth;
---
>         /* get proportional width and glyph bits*/
>         width += pf->width? pf->width[ch]: pf->maxwidth;
153c155,159
<         if(x + width > LCD_WIDTH)
---
>         if (x + width > LCD_WIDTH)
>             break;
> 
>         /* no partial-height drawing for now...*/
>         if (y + pf->height > LCD_HEIGHT)
227,228c233,234
< 	/* calc src input bit*/
< 	srcmap = 1 << (sizeof(MWIMAGEBITS)*8-1);
---
>         /* calc src input bit*/
>         srcmap = 1 << (sizeof(MWIMAGEBITS)*8-1);
230c236
< 	/* calc dst output bit*/
---
>         /* calc dst output bit*/
237c243
< 	/* for each input column...*/
---
>         /* for each input column...*/
240c246
< 	    /* calc input bitmask*/
---
>             /* calc input bitmask*/
247,249c253,255
< 	    /* if set in input, set in rotated output*/
< 	    if (bit & src[i]) {
< 		/* input column j becomes output row*/
---
>             /* if set in input, set in rotated output*/
>             if (bit & src[i]) {
>                 /* input column j becomes output row*/
262c268
<  * vim: et sw=4 ts=4 sts=4 tw=78
---
>  * vim: et sw=4 ts=8 sts=4 tw=78
Index: firmware/font.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/font.h,v
retrieving revision 1.2
diff -r1.2 font.h
49c49
<  * format		      len	description
---
>  * format                     len	description
56a57
>  * USHORT pad                   2       unused, pad to 32-bit boundary
63a65
>  * [MWIMAGEBITS padded to 32-bit boundary]
69c71
< #define VERSION		"RB10"
---
> #define VERSION		"RB11"
124a127
>  * vim: et sw=4 ts=8 sts=4 tw=78
Index: firmware/loadfont.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/loadfont.c,v
retrieving revision 1.1
diff -r1.1 loadfont.c
42,44c42,43
< typedef unsigned char CFILE;
< static CFILE *fileptr;
< static CFILE *eofptr;
---
> static unsigned char *fileptr;
> static unsigned char *eofptr;
104c103
<     unsigned short maxwidth, height, ascent;
---
>     unsigned short maxwidth, height, ascent, pad;
106c105
<     unsigned long nbits, noffset, nwidth;
---
>     unsigned long i, nbits, noffset, nwidth;
117a117
> freeptr = (unsigned char *)(((int)mbuf + 3) & ~3);
120d119
<     freeptr += filesize;
121a121,122
>     //freeptr += filesize;
>     //freeptr = (unsigned char *)(freeptr + 3) & ~3;  /* pad freeptr*/
153a155,156
>     if (!READSHORT(&pad))
>         return NULL;
180c183,187
<     fileptr += nbits*sizeof(MWIMAGEBITS);
---
>     for (i=0; i<nbits; ++i)
>         if (!READSHORT(&pf->bits[i]))
>             return NULL;
>     /* pad to longword boundary*/
>     fileptr = (unsigned char *)(((int)fileptr + 3) & ~3);
184c191,193
<         fileptr += noffset*sizeof(unsigned long);
---
>         for (i=0; i<noffset; ++i)
>             if (!READLONG(&pf->offset[i]))
>                 return NULL;
189c198
<         fileptr += noffset*sizeof(unsigned char);
---
>         fileptr += nwidth*sizeof(unsigned char);
200a210
>  * vim: et sw=4 ts=8 sts=4 tw=78
Index: firmware/system.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/system.c,v
retrieving revision 1.15
diff -r1.15 system.c
22c22,23
< #include <lcd.h>
---
> #include "lcd.h"
> #include "font.h"
327a329
>     lcd_setfont(FONT_SYSFIXED);
Index: tools/bdf2c
===================================================================
RCS file: /cvsroot/rockbox/tools/bdf2c,v
retrieving revision 1.2
diff -r1.2 bdf2c
7a8
> # modified 09/13/02 correct output when no DEFAULT_CHAR, allow numeric font name
82c83
< print "static MWIMAGEBITS ${font}_bits[] = {\n";
---
> print "static MWIMAGEBITS _${font}_bits[] = {\n";
164a166,167
> $default_char = $firstchar if !defined $default_char;
> 
166c169
< print "static unsigned long ${font}_offset[] = {\n";
---
> print "static unsigned long _${font}_offset[] = {\n";
180c183
<     $width = $width[$default_char], $char = $default_char if !defined $encoding_tab[$i];
---
>     $width = $width[$default_char] if !defined $encoding_tab[$i];
186c189
< 	print "static unsigned char ${font}_width[] = {\n";
---
> 	print "static unsigned char _${font}_width[] = {\n";
207,208c210,211
< print "  ${font}_bits,\n";
< print "  ${font}_offset,\n";
---
> print "  _${font}_bits,\n";
> print "  _${font}_offset,\n";
210c213
< 	print "  ${font}_width,\n";
---
> 	print "  _${font}_width,\n";
213c216
< print "  sizeof(${font}_bits)/sizeof(MWIMAGEBITS),\n";
---
> print "  sizeof(_${font}_bits)/sizeof(MWIMAGEBITS),\n";
Index: tools/writerbf.c
===================================================================
RCS file: /cvsroot/rockbox/tools/writerbf.c,v
retrieving revision 1.3
diff -r1.3 writerbf.c
82a83
> 	WRITESHORT(ofp, 0);
94a96,98
>         if (ftell(ofp) & 2)
> 		WRITESHORT(ofp, 0);		/* pad to 32-bit boundary*/
> 
97a102
>