Permalink
Browse files

fix prototype of SFGlyphRenameFixup; disable auto-renaming in more pl…

…aces
  • Loading branch information...
1 parent 18f43a0 commit c263c3193f13da3c77ed4d2c034de6f21776f24b @mskala mskala committed Apr 11, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 fontforge/charinfo.c
  2. +1 −1 fontforge/splinechar.c
  3. +1 −1 fontforge/splinefont.h
View
@@ -1526,7 +1526,7 @@ static void CI_ApplyAll(CharInfo *ci) {
refresh_fvdi = 1;
if ( sc->name==NULL || strcmp( sc->name,cached->name )!=0 ) {
if ( sc->name!=NULL )
- SFGlyphRenameFixup(sf,sc->name,cached->name,true);
+ SFGlyphRenameFixup(sf,sc->name,cached->name,false);
free(sc->name); sc->name = copy(cached->name);
sc->namechanged = true;
GlyphHashFree(sf);
View
@@ -1080,7 +1080,7 @@ return( false );
sc->unicodeenc = unienc;
if ( sc->name==NULL || strcmp(name,sc->name)!=0 ) {
if ( sc->name!=NULL )
- SFGlyphRenameFixup(sf,sc->name,name,true);
+ SFGlyphRenameFixup(sf,sc->name,name,false);
free(sc->name);
sc->name = copy(name);
sc->namechanged = true;
View
@@ -3123,7 +3123,7 @@ extern void OTLookupsCopyInto(SplineFont *into_sf,SplineFont *from_sf,
extern struct opentype_str *ApplyTickedFeatures(SplineFont *sf,uint32 *flist, uint32 script, uint32 lang,
int pixelsize, SplineChar **glyphs);
extern int VerticalKernFeature(SplineFont *sf, OTLookup *otl, int ask);
-extern void SFGlyphRenameFixup(SplineFont *sf, char *old, char *new);
+extern void SFGlyphRenameFixup(SplineFont *sf, char *old, char *new, int rename_related_glyphs);
struct sllk { uint32 script; int cnt, max; OTLookup **lookups; int lcnt, lmax; uint32 *langs; };
extern void SllkFree(struct sllk *sllk,int sllk_cnt);

0 comments on commit c263c31

Please sign in to comment.