Attachment 2527 Details for Bug 3119 – Compute line spacing using ascender and descender instead of max height and depth

[patch] Compute line spacing using ascender and descender instead of max height and depth

wrong-font-metrics-6.8.2.patch (text/plain), 5.43 KB, created by Tobias Kunstmann on 2005-04-24 06:37:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kunstmann

Created: 2005-04-24 06:37:24 UTC

Size: 5.43 KB

patch

obsolete

>--- xc/lib/font/FreeType/ftfuncs.c	2005-01-15 15:40:05.439384888 +0100
>+++ xc/lib/font/FreeType/ftfuncs.c	2005-01-15 16:30:06.466159472 +0100
>@@ -3022,9 +3022,9 @@
>     FT_Size_Metrics *smetrics;
>     int xrc=Successful;
>     int charcell;
>     long rawWidth = 0, rawAverageWidth = 0;
>-    int upm, minLsb, maxRsb, ascent, descent, width, averageWidth;
>+    int upm, minLsb, maxRsb, ascent, yMax, descent, yMin, width, averageWidth;
>     double scale, base_width, base_height;
>     Bool orig_is_matrix_unit, font_properties;
>     int face_number, ttcap_spacing;
>     struct TTCapInfo tmp_ttcap;
>@@ -3122,30 +3122,38 @@
> 	    int new_width;
> 	    double ratio,force_c_ratio;
> 	    double width_x=0,width_y=0;
> 	    double force_c_width_x, force_c_rsb_x, force_c_lsb_x;
>-	    double tmp_rsb,tmp_lsb,tmp_asc,tmp_des;
>+	    double tmp_rsb,tmp_lsb,tmp_yMax,tmp_yMin;
> 	    double max_advance_height;
>-	    tmp_asc = face->face->bbox.yMax;
>-	    tmp_des = -(face->face->bbox.yMin);
>-	    if ( tmp_asc < face->face->ascender ) tmp_asc = face->face->ascender;
>-	    if ( tmp_des < -(face->face->descender) ) tmp_des = -(face->face->descender);
>+            tmp_yMax = face->face->bbox.yMax;
>+            tmp_yMin = face->face->bbox.yMin;
>+            if ( tmp_yMax < face->face->ascender ) tmp_yMax = face->face->ascender;
>+            if ( tmp_yMin > face->face->descender ) tmp_yMin = face->face->descender;
>+
> 	    tmp_lsb = face->face->bbox.xMin;
> 	    tmp_rsb = face->face->bbox.xMax;
> 	    if ( tmp_rsb < face->face->max_advance_width ) tmp_rsb = face->face->max_advance_width;
> 	    /* apply scaleBBoxWidth */
> 	    /* we should not ...??? */
> 	    tmp_lsb *= ins_ttcap->scaleBBoxWidth;
> 	    tmp_rsb *= ins_ttcap->scaleBBoxWidth;
>+
> 	    /* transform and rescale */
>-	    compute_new_extents( vals, scale, tmp_lsb, tmp_rsb, tmp_des, tmp_asc,
>+	    compute_new_extents( vals, scale, tmp_lsb, tmp_rsb,
>+                                 -face->face->descender, face->face->ascender,
> 				 &minLsb, &maxRsb, &descent, &ascent );
>+
>+	    compute_new_extents( vals, scale, tmp_lsb, tmp_rsb, -tmp_yMin, tmp_yMax,
>+				 &minLsb, &maxRsb, &yMin, &yMax );
>+	    yMin = -yMin;
>+
> 	    /* */
> 	    /* Consider vertical layouts */
> 	    if( 0 < face->face->max_advance_height )
> 		max_advance_height = face->face->max_advance_height;
> 	    else
>-		max_advance_height = tmp_asc + tmp_des;
>+		max_advance_height = tmp_yMax - tmp_yMin;
> 	    if( vals->pixel_matrix[1] == 0 ){
> 		unit_x = fabs(vals->pixel_matrix[0]);
> 		unit_y = 0;
> 		width_x = face->face->max_advance_width * ins_ttcap->scaleBBoxWidth * unit_x;
>@@ -3219,10 +3227,10 @@
> 		    double ai;
> 		    int ai_lsb,ai_rsb,ai_total;
> 		    if( 0 < ins_ttcap->autoItalic ) ai=ins_ttcap->autoItalic;
> 		    else ai = -ins_ttcap->autoItalic;
>-		    ai_total = (int)( (ascent+descent) * ai + 0.5);
>-		    ai_rsb = (int)((double)ai_total * ascent / ( ascent + descent ) + 0.5 );
>+		    ai_total = (int)( (yMax - yMin) * ai + 0.5);
>+		    ai_rsb = (int)((double)ai_total * yMax / ( yMax - yMin ) + 0.5 );
> 		    ai_lsb = -(ai_total - ai_rsb);
> 		    if( 0 < ins_ttcap->autoItalic ) {
> 			ins_ttcap->lsbShiftOfBitmapAutoItalic = ai_lsb;
> 			ins_ttcap->rsbShiftOfBitmapAutoItalic = ai_rsb;
>@@ -3258,10 +3266,11 @@
> 	else {
> 	    /* These values differ from actual when outline,
> 	       so we must use them ONLY FOR BITMAP. */
> 	    width = (int)floor(smetrics->max_advance * ins_ttcap->scaleBBoxWidth / 64.0 + .5);
>-	    descent = -smetrics->descender / 64;
>-	    ascent = smetrics->ascender / 64;
>+	    yMin = descent = -smetrics->descender / 64;
>+	    yMax = ascent = smetrics->ascender / 64;
>+	    yMin = - yMin;
> 	    /* force constant */
> 	    force_c_width = (int)floor(smetrics->max_advance
> 				       * ins_ttcap->force_c_scale_b_box_width / 64.0 + .5);
> 	    /* Preserve average width for bitmap fonts */
>@@ -3297,10 +3306,10 @@
> 		double ai;
> 		int ai_lsb,ai_rsb,ai_total;
> 		if( 0 < ins_ttcap->autoItalic ) ai=ins_ttcap->autoItalic;
> 		else ai = -ins_ttcap->autoItalic;
>-		ai_total = (int)( (ascent+descent) * ai + 0.5);
>-		ai_rsb = (int)((double)ai_total * ascent / ( ascent + descent ) + 0.5 );
>+		ai_total = (int)( (yMax - yMin) * ai + 0.5);
>+		ai_rsb = (int)((double)ai_total * yMax / ( yMax - yMin ) + 0.5 );
> 		ai_lsb = -(ai_total - ai_rsb);
> 		if( 0 < ins_ttcap->autoItalic ) {
> 		    ins_ttcap->lsbShiftOfBitmapAutoItalic = ai_lsb;
> 		    ins_ttcap->rsbShiftOfBitmapAutoItalic = ai_rsb;
>@@ -3432,8 +3441,9 @@
> 	rawAverageWidth = instance->rawAverageWidth;
> 
>     }
> 
>+
>     /*
>      * SET maxbounds, minbounds ...
>      */
> 
>@@ -3461,10 +3471,10 @@
> 
> 	    info->maxbounds.leftSideBearing = minLsb;
> 	    info->maxbounds.rightSideBearing = maxRsb;
> 	    info->maxbounds.characterWidth = width;
>-	    info->maxbounds.ascent = ascent;
>-	    info->maxbounds.descent = descent;
>+	    info->maxbounds.ascent = yMax;
>+	    info->maxbounds.descent = -yMin;
> 	    info->maxbounds.attributes =
> 		(unsigned short)(short)rawWidth;
> 	    
> 	    info->minbounds = info->maxbounds;
>@@ -3473,14 +3483,19 @@
> 
>     /* set info */
> 
>     if( info ){
>-	/*
>+#if 1
> 	info->fontAscent = ascent;
> 	info->fontDescent = descent;
>-	*/
>+#else
> 	info->fontAscent = info->maxbounds.ascent;
> 	info->fontDescent = info->maxbounds.descent;
>+#endif
>+
>+/*
>+fprintf(stderr, "%d: ascent = %d, descent = %d, maxbounds.ascent = %d, maxbounds.descent = %d\n", __LINE__, ascent, descent, info->maxbounds.ascent, info->maxbounds.descent);
>+*/
> 	/* Glyph metrics are accurate */
> 	info->inkMetrics=1;
> 	    
> 	memcpy((char *)&info->ink_maxbounds,

Actions: View | Splinter Review

Attachments on bug 3119: 2527 | 2533 | 2534

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.