summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c')
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c61
1 files changed, 12 insertions, 49 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c
index 6bed24e9a54..db051b7fe54 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/mm.c
@@ -64,57 +64,20 @@ return(axismap->designs[axismap->points-1]);
static char *_MMMakeFontname(MMSet *mm,real *normalized,char **fullname) {
char *pt, *pt2, *hyphen=NULL;
char *ret = NULL;
- int i,j;
-
- if ( mm->apple ) {
- for ( i=0; i<mm->named_instance_count; ++i ) {
- for ( j=0; j<mm->axis_count; ++j ) {
- if (( normalized[j] == -1 &&
- RealApprox(mm->named_instances[i].coords[j],mm->axismaps[j].min) ) ||
- ( normalized[j] == 0 &&
- RealApprox(mm->named_instances[i].coords[j],mm->axismaps[j].def) ) ||
- ( normalized[j] == 1 &&
- RealApprox(mm->named_instances[i].coords[j],mm->axismaps[j].max) ))
- /* A match so far */;
- else
- break;
- }
- if ( j==mm->axis_count )
- break;
- }
- if ( i!=mm->named_instance_count ) {
- char *styles = PickNameFromMacName(mm->named_instances[i].names);
- if ( styles==NULL )
- styles = FindEnglishNameInMacName(mm->named_instances[i].names);
- if ( styles!=NULL ) {
- ret = galloc(strlen(mm->normal->familyname)+ strlen(styles)+3 );
- strcpy(ret,mm->normal->familyname);
- hyphen = ret+strlen(ret);
- strcpy(hyphen," ");
- strcpy(hyphen+1,styles);
- free(styles);
- }
- }
- }
+ int i;
- if ( ret==NULL ) {
- pt = ret = galloc(strlen(mm->normal->familyname)+ mm->axis_count*15 + 1);
- strcpy(pt,mm->normal->familyname);
- pt += strlen(pt);
- *pt++ = '_';
- for ( i=0; i<mm->axis_count; ++i ) {
- if ( !mm->apple )
- sprintf( pt, " %d%s", (int) rint(MMAxisUnmap(mm,i,normalized[i])),
- MMAxisAbrev(mm->axes[i]));
- else
- sprintf( pt, " %.1f%s", MMAxisUnmap(mm,i,normalized[i]),
- MMAxisAbrev(mm->axes[i]));
- pt += strlen(pt);
- }
- if ( pt>ret && pt[-1]==' ' )
- --pt;
- *pt = '\0';
+ pt = ret = galloc(strlen(mm->normal->familyname)+ mm->axis_count*15 + 1);
+ strcpy(pt,mm->normal->familyname);
+ pt += strlen(pt);
+ *pt++ = '_';
+ for ( i=0; i<mm->axis_count; ++i ) {
+ sprintf( pt, " %d%s", (int) rint(MMAxisUnmap(mm,i,normalized[i])),
+ MMAxisAbrev(mm->axes[i]));
+ pt += strlen(pt);
}
+ if ( pt>ret && pt[-1]==' ' )
+ --pt;
+ *pt = '\0';
*fullname = ret;