diff options
| author | akryukov <akryukov> | 2011-01-21 08:04:00 +0000 |
|---|---|---|
| committer | akryukov <akryukov> | 2011-01-21 08:04:00 +0000 |
| commit | 36be29f9a4cf340620c3d57a0809f7fe9bafef3c (patch) | |
| tree | fbed34c62a89f0b67572d929fb2d4cc8bcb94110 | |
| parent | d7c1d554b8625c281711cd65554076e25d6240dd (diff) | |
When modifying OT classes by inserting glyphs from a fontview-based
window, the add_char_to_name_list preference item was not respected.
| -rw-r--r-- | fontforge/fontview.c | 16 | ||||
| -rw-r--r-- | fontforge/stamp.c | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/fontforge/fontview.c b/fontforge/fontview.c index 476f86a2..bd684a60 100644 --- a/fontforge/fontview.c +++ b/fontforge/fontview.c @@ -43,7 +43,7 @@ char *RecentFiles[RECENT_MAX] = { NULL }; int save_to_dir = 0; /* use sfdir rather than sfd */ unichar_t *script_menu_names[SCRIPT_MENU_MAX]; char *script_filenames[SCRIPT_MENU_MAX]; -extern int onlycopydisplayed, copymetadata, copyttfinstr; +extern int onlycopydisplayed, copymetadata, copyttfinstr, add_char_to_name_list; extern struct compressors compressors[]; int home_char='A'; int compact_font_on_open=0; @@ -7934,17 +7934,13 @@ char *GlyphSetFromSelection(SplineFont *sf,int def_layer,char *current) { if ( gs.fv->b.selected[enc] && (gid=gs.fv->b.map->map[enc])!=-1 && (sc = sf->glyphs[gid])!=NULL ) { + char *repr = SCNameUniStr( sc ); if ( ret==NULL ) - len += strlen(sc->name)+7; + len += strlen(repr)+2; else { - strcpy(rpt,sc->name); - rpt += strlen(sc->name); - if ( sc->unicodeenc>32 && sc->unicodeenc!=')' && - (!isalpha(sc->unicodeenc) || sc->unicodeenc>0x7f)) { - *rpt++ = '('; - rpt = utf8_idpb(rpt,sc->unicodeenc); - *rpt++ = ')'; - } + strcpy(rpt,repr); + rpt += strlen( repr ); + free(repr); *rpt++ = ' '; } } diff --git a/fontforge/stamp.c b/fontforge/stamp.c index 662a7e28..0146b12e 100644 --- a/fontforge/stamp.c +++ b/fontforge/stamp.c @@ -1,5 +1,5 @@ #include <time.h> -const time_t source_modtime = 1295541372L; -const char *source_modtime_str = "16:36 GMT 20-Jan-2011"; -const char *source_version_str = "20110120"; +const time_t source_modtime = 1295596852L; +const char *source_modtime_str = "08:00 GMT 21-Jan-2011"; +const char *source_version_str = "20110121"; |