Attachment 56 Details for Bug 111 – this patch is the same as above, except that it checks for approximate equality wherever it makes sense

[patch] this patch is the same as above, except that it checks for approximate equality wherever it makes sense

foo.diff (text/plain), 7.19 KB, created by Noah Levitt on 2003-09-04 23:08:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noah Levitt

Created: 2003-09-04 23:08:05 UTC

Size: 7.19 KB

patch

obsolete

>? foo.diff
>Index: doc/fontconfig-devel.sgml
>===================================================================
>RCS file: /local/src/CVS/fontconfig/doc/fontconfig-devel.sgml,v
>retrieving revision 1.7
>diff -u -p -u -r1.7 fontconfig-devel.sgml
>--- doc/fontconfig-devel.sgml	23 Apr 2003 04:09:28 -0000	1.7
>+++ doc/fontconfig-devel.sgml	5 Sep 2003 06:04:36 -0000
>@@ -139,8 +139,8 @@ convenience for the applications renderi
>     aspect         FC_ASPECT            Double  Stretches glyphs horizontally
>                                                 before hinting
>     pixelsize      FC_PIXEL_SIZE        Double  Pixel size
>-    spacing        FC_SPACING           Int     Proportional, monospace or
>-                                                charcell
>+    spacing        FC_SPACING           Int     Proportional, dual-width,
>+                                                monospace or charcell
>     foundry        FC_FOUNDRY           String  Font foundry name
>     antialias      FC_ANTIALIAS         Bool    Whether glyphs can be
>                                                 antialiased
>Index: doc/fontconfig-user.sgml
>===================================================================
>RCS file: /local/src/CVS/fontconfig/doc/fontconfig-user.sgml,v
>retrieving revision 1.7
>diff -u -p -u -r1.7 fontconfig-user.sgml
>--- doc/fontconfig-user.sgml	22 Apr 2003 23:34:50 -0000	1.7
>+++ doc/fontconfig-user.sgml	5 Sep 2003 06:04:36 -0000
>@@ -98,7 +98,7 @@ convenience for the applications renderi
>   size            Double  Point size
>   aspect          Double  Stretches glyphs horizontally before hinting
>   pixelsize       Double  Pixel size
>-  spacing         Int     Proportional, monospace or charcell
>+  spacing         Int     Proportional, dual-width, monospace or charcell
>   foundry         String  Font foundry name
>   antialias       Bool    Whether glyphs can be antialiased
>   hinting         Bool    Whether the rasterizer should use hinting
>@@ -349,6 +349,7 @@ symbolic names for common font values:
>   italic          slant           100
>   oblique         slant           110
>   proportional    spacing         0
>+  dual            spacing         90
>   mono            spacing         100
>   charcell        spacing         110
>   unknown         rgba            0
>Index: fontconfig/fontconfig.h
>===================================================================
>RCS file: /local/src/CVS/fontconfig/fontconfig/fontconfig.h,v
>retrieving revision 1.46
>diff -u -p -u -r1.46 fontconfig.h
>--- fontconfig/fontconfig.h	15 Aug 2003 19:45:20 -0000	1.46
>+++ fontconfig/fontconfig.h	5 Sep 2003 06:04:36 -0000
>@@ -128,6 +128,7 @@ typedef int		FcBool;
> #define FC_WIDTH_ULTRAEXPANDED	    200
> 
> #define FC_PROPORTIONAL		    0
>+#define FC_DUAL			    90
> #define FC_MONO			    100
> #define FC_CHARCELL		    110
> 
>Index: src/fcfreetype.c
>===================================================================
>RCS file: /local/src/CVS/fontconfig/src/fcfreetype.c,v
>retrieving revision 1.40
>diff -u -p -u -r1.40 fcfreetype.c
>--- src/fcfreetype.c	26 Jun 2003 08:19:11 -0000	1.40
>+++ src/fcfreetype.c	5 Sep 2003 06:04:37 -0000
>@@ -1807,6 +1807,8 @@ FcFreeTypeCheckGlyph (FT_Face face, FcCh
>     return FcFalse;
> }
> 
>+#define APPROXIMATELY_EQUAL(x,y) (ABS ((x) - (y)) < MAX (ABS (x), ABS (y)) / 100)
>+
> FcCharSet *
> FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
> {
>@@ -1820,8 +1822,8 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
>     int		    o;
>     int		    i;
>     FT_UInt	    glyph;
>-    FT_Pos	    advance, all_advance = 0;
>-    FcBool	    has_advance = FcFalse, fixed_advance = FcTrue;
>+    FT_Pos	    advance, advance_one = 0, advance_two = 0;
>+    FcBool	    has_advance = FcFalse, fixed_advance = FcTrue, dual_advance = FcFalse;
> 
>     fcs = FcCharSetCreate ();
>     if (!fcs)
>@@ -1851,10 +1853,20 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
> 		    if (!has_advance)
> 		    {
> 			has_advance = FcTrue;
>-			all_advance = advance;
>+			advance_one = advance;
> 		    }
>-		    else if (advance != all_advance)
>-			fixed_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)
> 			goto bail1;
>@@ -1899,10 +1911,20 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
> 			if (!has_advance)
> 			{
> 			    has_advance = FcTrue;
>-			    all_advance = advance;
>+			    advance_one = advance;
> 			}
>-			else if (advance != all_advance)
>-			    fixed_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)
> 			{
> 			    leaf = FcCharSetFindLeafCreate (fcs, ucs4);
>@@ -1956,10 +1978,19 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
> 		    if (!has_advance)
> 		    {
> 			has_advance = FcTrue;
>-			all_advance = advance;
>+			advance_one = advance;
> 		    }
>-		    else if (advance != all_advance)
>-			fixed_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)
> 			goto bail1;
>@@ -1993,6 +2024,8 @@ FcFreeTypeCharSetAndSpacing (FT_Face fac
> #endif
>     if (fixed_advance)
> 	*spacing = FC_MONO;
>+    else if (dual_advance && APPROXIMATELY_EQUAL (2 * MIN (advance_one, advance_two), MAX (advance_one, advance_two)))
>+        *spacing = FC_DUAL;
>     else
> 	*spacing = FC_PROPORTIONAL;
>     return fcs;
>Index: src/fcname.c
>===================================================================
>RCS file: /local/src/CVS/fontconfig/src/fcname.c,v
>retrieving revision 1.19
>diff -u -p -u -r1.19 fcname.c
>--- src/fcname.c	2 May 2003 01:11:09 -0000	1.19
>+++ src/fcname.c	5 Sep 2003 06:04:37 -0000
>@@ -167,6 +167,7 @@ static const FcConstant _FcBaseConstants
>     { (FcChar8 *) "ultraexpanded",  "width",	FC_WIDTH_ULTRAEXPANDED },
>     
>     { (FcChar8 *) "proportional",   "spacing",  FC_PROPORTIONAL, },
>+    { (FcChar8 *) "dual",	    "spacing",  FC_DUAL, },
>     { (FcChar8 *) "mono",	    "spacing",  FC_MONO, },
>     { (FcChar8 *) "charcell",	    "spacing",  FC_CHARCELL, },
>

Actions: View | Splinter Review

Attachments on bug 111: 54 | 55 | 56

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.