femsci/toilet
femsci/toilet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Crop the final canvas to the effective width.

Browse source 
* Fixed a bug that prevented loading characters after 127.
  * Allow to load fonts that hex-encode their Unicode values.
This commit is contained in:
Sam Hocevar 2006-09-26 21:58:26 +00:00 committed by sam
parent f71113d6a6
commit eb4d081be1
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/figlet.c
View file

@ -68,6 +68,8 @@ cucul_canvas_t *render_figlet(uint32_t const *string, unsigned int length,
x += font->lookup[c * 2 + 1];
}
cucul_set_canvas_boundaries(cv, 0, 0, x, font->height);
free_font(font);
return cv;
@ -134,11 +136,19 @@ static struct figfont *open_font(char const *fontname)
else if(font->glyphs < (127 - 32) + 7)
{
static int const tab[7] = { 196, 214, 220, 228, 246, 252, 223 };
font->lookup[font->glyphs * 2] = tab[font->glyphs = (127 - 32)];
font->lookup[font->glyphs * 2] = tab[font->glyphs + (127 - 32)];
}
else
{
fscanf(f, "%u %*[^\n]", &font->lookup[font->glyphs * 2]);
char number[10];
fscanf(f, "%s %*[^\n]", number);
if(number[1] == 'x')
sscanf(number, "%x", &font->lookup[font->glyphs * 2]);
else
sscanf(number, "%u", &font->lookup[font->glyphs * 2]);
fscanf(f, "%*c");
}
@ -173,8 +183,9 @@ static struct figfont *open_font(char const *fontname)
ch = cucul_getchar(font->image, i, j);
if(ch == font->hardblank)
cucul_putchar(font->image, i, j, ' ');
else if(oldch && ch != oldch)
cucul_putchar(font->image, i, j, ch = ' ');
if(oldch && ch != oldch)
{
if(!font->lookup[j / font->height * 2 + 1])
font->lookup[j / font->height * 2 + 1] = i + 1;