Was asked to retain the UFO ascender and descender fields.

4 files changed, 28 insertions, 4 deletions

diff --git a/fontforge/sfd.c b/fontforge/sfd.c
index 54feeef2..4c7ecd54 100644
--- a/fontforge/sfd.c
+++ b/fontforge/sfd.c
@@ -1851,6 +1851,10 @@ static int SFD_Dump(FILE *sfd,SplineFont *sf,EncMap *map,EncMap *normal,
 	SFDDumpUTF7Str(sfd,sf->woffMetadata);
 	putc('\n',sfd);
     }
+    if ( sf->ufo_ascent!=0 )
+	fprintf(sfd, "UFOAscent: %g\n", sf->ufo_ascent );
+    if ( sf->ufo_descent!=0 )
+	fprintf(sfd, "UFODescent: %g\n", sf->ufo_descent );
     fprintf(sfd, "LayerCount: %d\n", sf->layer_cnt );
     for ( i=0; i<sf->layer_cnt; ++i ) {
 	fprintf( sfd, "Layer: %d %d ", i, sf->layers[i].order2/*, sf->layers[i].background*/ );
@@ -6522,6 +6526,10 @@ static SplineFont *SFD_GetFont(FILE *sfd,SplineFont *cidmaster,char *tok,
 	    getint(sfd,&sf->woffMinor);
 	} else if ( strmatch(tok,"woffMetadata:")==0 ) {
 	    sf->woffMetadata = SFDReadUTF7Str(sfd);
+	} else if ( strmatch(tok,"UFOAscent:")==0 ) {
+	    getreal(sfd,&sf->ufo_ascent);
+	} else if ( strmatch(tok,"UFODescent:")==0 ) {
+	    getreal(sfd,&sf->ufo_descent);
 	} else if ( strmatch(tok,"sfntRevision:")==0 ) {
 	    gethex(sfd,&sf->sfntRevision);
 	} else if ( strmatch(tok,"Order2:")==0 ) {
diff --git a/fontforge/splinefont.c b/fontforge/splinefont.c
index a19e34e3..250ae459 100644
--- a/fontforge/splinefont.c
+++ b/fontforge/splinefont.c
@@ -535,6 +535,8 @@ int SFScaleToEm(SplineFont *sf, int as, int des) {
     sf->pfminfo.os2_strikeypos = rint( sf->pfminfo.os2_strikeypos * scale);
     sf->upos *= scale;
     sf->uwidth *= scale;
+    sf->ufo_ascent *= scale;
+    sf->ufo_descent *= scale;
 
     if ( sf->private!=NULL )
 	SFScalePrivate(sf,scale);
diff --git a/fontforge/splinefont.h b/fontforge/splinefont.h
index eec401bb..c95f2ee7 100644
--- a/fontforge/splinefont.h
+++ b/fontforge/splinefont.h
@@ -1854,6 +1854,8 @@ typedef struct splinefont {
 #define woffUnset		0x4455
     int woffMinor;
     char *woffMetadata;
+    real ufo_ascent, ufo_descent;	/* I don't know what these mean, they don't seem to correspond to any other ascent/descent pair, but retain them so round-trip ufo input/output leaves them unchanged */
+	    /* ufo_descent is negative */
 } SplineFont;
 
 /* I am going to simplify my life and not encourage intermediate designs */
diff --git a/fontforge/ufo.c b/fontforge/ufo.c
index 18be4bab..4fb4b9b2 100644
--- a/fontforge/ufo.c
+++ b/fontforge/ufo.c
@@ -491,8 +491,18 @@ return( false );
     test = SFCapHeight(sf,layer,true);
     if ( test>0 )
 	PListOutputInteger(plist,"capHeight",(int) rint(test));
-    PListOutputInteger(plist,"ascender",sf->ascent);
-    PListOutputInteger(plist,"descender",-sf->descent);
+    if ( sf->ufo_ascent==0 )
+	PListOutputInteger(plist,"ascender",sf->ascent);
+    else if ( sf->ufo_ascent==floor(sf->ufo_ascent))
+	PListOutputInteger(plist,"ascender",sf->ufo_ascent);
+    else
+	PListOutputReal(plist,"ascender",sf->ufo_ascent);
+    if ( sf->ufo_descent==0 )
+	PListOutputInteger(plist,"descender",-sf->descent);
+    else if ( sf->ufo_descent==floor(sf->ufo_descent))
+	PListOutputInteger(plist,"descender",sf->ufo_descent);
+    else
+	PListOutputReal(plist,"descender",sf->ufo_descent);
     PListOutputReal(plist,"italicAngle",sf->italicangle);
 #ifdef Version_1
     PListOutputString(plist,"fullName",sf->fullname);
@@ -1902,12 +1912,14 @@ return( NULL );
 		if ( *end!='\0' ) em = -1;
 		free(valname);
 	    } else if ( _xmlStrcmp(keyname,(xmlChar *) "ascender")==0 ) {
-		as = strtol((char *) valname,&end,10);
+		as = strtod((char *) valname,&end);
 		if ( *end!='\0' ) as = -1;
+		else sf->ufo_ascent = as;
 		free(valname);
 	    } else if ( _xmlStrcmp(keyname,(xmlChar *) "descender")==0 ) {
-		ds = -strtol((char *) valname,&end,10);
+		ds = -strtod((char *) valname,&end);
 		if ( *end!='\0' ) ds = -1;
+		else sf->ufo_descent = -ds;
 		free(valname);
 	    } else if ( _xmlStrcmp(keyname,(xmlChar *) "italicAngle")==0 ||
 		    _xmlStrcmp(keyname,(xmlChar *) "postscriptSlantAngle")==0 ) {