Attachment 42982 Details for Bug 52167

[patch] improve-monospace-detection.patch

improve-monospace-detection.patch (text/plain), 3.04 KB, created by Mike Fabian on 2005-07-22 11:23:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fabian

Created: 2005-07-22 11:23:56 UTC

Size: 3.04 KB

patch

obsolete

>diff -ru fontconfig-2.3.2.20050721.orig/src/fcfreetype.c fontconfig-2.3.2.20050721/src/fcfreetype.c
>--- fontconfig-2.3.2.20050721.orig/src/fcfreetype.c	2005-04-21 21:03:53.000000000 +0200
>+++ fontconfig-2.3.2.20050721/src/fcfreetype.c	2005-07-22 12:47:06.000000000 +0200
>@@ -2453,22 +2453,25 @@
> 		if (glyph && 
> 		    FcFreeTypeCheckGlyph (face, ucs4, glyph, blanks, &advance))
> 		{
>-		    if (!has_advance)
>+		    if (advance != 0)
> 		    {
>-			has_advance = FcTrue;
>-			advance_one = advance;
>+		        if (!has_advance)
>+			{
>+			    has_advance = FcTrue;
>+			    advance_one = advance;
>+			}
>+			else if (!APPROXIMATELY_EQUAL (advance, advance_one))
>+			{
>+			    if (fixed_advance)
>+			    {
>+				dual_advance = FcTrue;
>+				fixed_advance = FcFalse;
>+				advance_two = advance;
>+			    }
>+			    else if (!APPROXIMATELY_EQUAL (advance, advance_two))
>+				dual_advance = FcFalse;
>+			}
> 		    }
>-		    else if (!APPROXIMATELY_EQUAL (advance, advance_one))
>-                    {
>-                        if (fixed_advance)
>-                        {
>-                            dual_advance = FcTrue;
>-                            fixed_advance = FcFalse;
>-                            advance_two = advance;
>-                        }
>-                        else if (!APPROXIMATELY_EQUAL (advance, advance_two))
>-                            dual_advance = FcFalse;
>-                    }
> 
> 		    leaf = FcCharSetFindLeafCreate (fcs, ucs4);
> 		    if (!leaf)
>@@ -2511,22 +2514,25 @@
> 		    if (glyph && FcFreeTypeCheckGlyph (face, ucs4, 
> 						       glyph, blanks, &advance))
> 		    {
>-			if (!has_advance)
>+			if (advance != 0)
> 			{
>-			    has_advance = FcTrue;
>-			    advance_one = advance;
>+			    if (!has_advance)
>+			    {
>+				has_advance = FcTrue;
>+				advance_one = advance;
>+			    }
>+			    else if (!APPROXIMATELY_EQUAL (advance, advance_one))
>+			    {
>+				if (fixed_advance)
>+				{
>+				    dual_advance = FcTrue;
>+				    fixed_advance = FcFalse;
>+				    advance_two = advance;
>+				}
>+				else if (!APPROXIMATELY_EQUAL (advance, advance_two))
>+				    dual_advance = FcFalse;
>+			    }
> 			}
>-		        else if (!APPROXIMATELY_EQUAL (advance, advance_one))
>-                        {
>-                            if (fixed_advance)
>-                            {
>-                                dual_advance = FcTrue;
>-                                fixed_advance = FcFalse;
>-                                advance_two = advance;
>-                            }
>-                            else if (!APPROXIMATELY_EQUAL (advance, advance_two))
>-                                dual_advance = FcFalse;
>-                        }
> 
> 			if (!leaf)
> 			{
>@@ -2625,6 +2631,11 @@
> 	    printf ("Bitmap extra char 0x%x\n", ucs4);
>     }
> #endif
>+    if (face->family_name != NULL &&
>+	(!strcmp(face->family_name,"Luxi Mono") ||
>+	 !strcmp(face->family_name,"Nimbus Mono L")))
>+	    fixed_advance = FcTrue;
>+    
>     if (fixed_advance)
> 	*spacing = FC_MONO;
>     else if (dual_advance && APPROXIMATELY_EQUAL (2 * FC_MIN (advance_one, advance_two), FC_MAX (advance_one, advance_two)))

Actions: View | Diff

Attachments on bug 52167: 41873 | 41880 | 41881 | 42982 | 42986