wine/fontforge
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/fontforge.git synced 2025-10-14 02:47:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid outputting trailing spaces in sfd files.

Browse Source
This commit is contained in:
Alexandre Julliard
2009-02-20 19:17:13 +01:00
parent 65974286fe
commit 37fa1cd216
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fontforge/sfd.c
View File

@@ -191,7 +191,6 @@ static void SFDDumpUTF7Str(FILE *sfd, const char *_str) {
utf7_encode(sfd,prev);
}
putc('"',sfd);
putc(' ',sfd);
}
@@ -701,7 +700,7 @@ static void SFDDumpAnchorPoints(FILE *sfd,SplineChar *sc) {
for ( ap = sc->anchor; ap!=NULL; ap=ap->next ) {
fprintf( sfd, "AnchorPoint: " );
SFDDumpUTF7Str(sfd,ap->anchor->name);
fprintf( sfd, "%g %g %s %d",
fprintf( sfd, " %g %g %s %d",
(double) ap->me.x, (double) ap->me.y,
ap->type==at_centry ? "entry" :
ap->type==at_cexit ? "exit" :
@@ -1382,7 +1381,10 @@ static void SFDDumpChar(FILE *sfd,SplineChar *sc,EncMap *map,int *newgids) {
"LCarets2:", NULL };
fprintf( sfd, "%s ", keywords[pst->type] );
if ( pst->subtable!=NULL )
{
SFDDumpUTF7Str(sfd,pst->subtable->subtable_name );
putc(' ',sfd);
}
if ( pst->type==pst_position ) {
fprintf( sfd, "dx=%d dy=%d dh=%d dv=%d",
pst->u.pos.xoff, pst->u.pos.yoff,
@@ -1408,9 +1410,9 @@ static void SFDDumpChar(FILE *sfd,SplineChar *sc,EncMap *map,int *newgids) {
putc('\n',sfd);
} else if ( pst->type==pst_lcaret ) {
int i;
fprintf( sfd, "%d ", pst->u.lcaret.cnt );
fprintf( sfd, "%d", pst->u.lcaret.cnt );
for ( i=0; i<pst->u.lcaret.cnt; ++i )
fprintf( sfd, "%d ", pst->u.lcaret.carets[i] );
fprintf( sfd, " %d", pst->u.lcaret.carets[i] );
fprintf( sfd, "\n" );
} else
fprintf( sfd, "%s\n", pst->u.lig.components );
@@ -1515,8 +1517,12 @@ static int SFDDumpBitmapFont(FILE *sfd,BDFFont *bdf,EncMap *encm,int *newgids,
int err = false;
ff_progress_next_stage();
fprintf( sfd, "BitmapFont: %d %d %d %d %d %s\n", bdf->pixelsize, bdf->glyphcnt,
bdf->ascent, bdf->descent, BDFDepth(bdf), bdf->foundry?bdf->foundry:"" );
if (bdf->foundry)
fprintf( sfd, "BitmapFont: %d %d %d %d %d %s\n", bdf->pixelsize, bdf->glyphcnt,
bdf->ascent, bdf->descent, BDFDepth(bdf), bdf->foundry );
else
fprintf( sfd, "BitmapFont: %d %d %d %d %d\n", bdf->pixelsize, bdf->glyphcnt,
bdf->ascent, bdf->descent, BDFDepth(bdf) );
if ( bdf->prop_cnt>0 ) {
fprintf( sfd, "BDFStartProperties: %d\n", bdf->prop_cnt );
for ( i=0; i<bdf->prop_cnt; ++i ) {
@@ -1574,10 +1580,13 @@ static void SFDDumpPrivate(FILE *sfd,struct psdict *private) {
static void SFDDumpLangName(FILE *sfd, struct ttflangname *ln) {
int i, end;
fprintf( sfd, "LangName: %d ", ln->lang );
fprintf( sfd, "LangName: %d", ln->lang );
for ( end = ttf_namemax; end>0 && ln->names[end-1]==NULL; --end );
for ( i=0; i<end; ++i )
{
putc(' ',sfd);
SFDDumpUTF7Str(sfd,ln->names[i]);
}
putc('\n',sfd);
}
@@ -1914,10 +1923,10 @@ static int SFD_Dump(FILE *sfd,SplineFont *sf,EncMap *map,EncMap *normal,
for ( i=1; i<sf->mark_class_cnt; ++i ) { /* Class 0 is unused */
SFDDumpUTF7Str(sfd, sf->mark_class_names[i]);
if ( sf->mark_classes[i]!=NULL )
fprintf( sfd, "%d %s\n", (int) strlen(sf->mark_classes[i]),
fprintf( sfd, " %d %s\n", (int) strlen(sf->mark_classes[i]),
sf->mark_classes[i] );
else
fprintf( sfd, "0 \n" );
fprintf( sfd, " 0 \n" );
}
}
fprintf( sfd, "DEI: 91125\n" );
@@ -2169,8 +2178,9 @@ static int SFD_Dump(FILE *sfd,SplineFont *sf,EncMap *map,EncMap *normal,
}
if ( sf->anchor!=NULL ) {
AnchorClass *an;
fprintf(sfd, "AnchorClass2: ");
fprintf(sfd, "AnchorClass2:");
for ( an=sf->anchor; an!=NULL; an=an->next ) {
putc(' ',sfd);
SFDDumpUTF7Str(sfd,an->name);
putc(' ',sfd);
SFDDumpUTF7Str(sfd,an->subtable->subtable_name );