[gs-cvs] rev 7607 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-01-15 02:59:56 -0800 (Mon, 15 Jan 2007)
New Revision: 7607

Modified:
   trunk/gs/src/gstype1.c
   trunk/gs/src/gxtype1.h
Log:
Provide the CPSI compatibility for Type1 subglyph placement (continued).

DETAILS :

This change is algorithmically equivalent.
It provides a better data naming and documentation.

1. save_asb is renamed into asb.
2. Improved comments for asb_diff, adxy.
3. Used adxy in the overall_x_offset formula in stead save_adxy.
   The letter is a temporary cell for passing seac info across
   the baze glyph.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gstype1.c
===================================================================
--- trunk/gs/src/gstype1.c	2007-01-15 10:56:38 UTC (rev 7606)
+++ trunk/gs/src/gstype1.c	2007-01-15 10:59:56 UTC (rev 7607)
@@ -305,7 +305,7 @@
 		    code = t1_hinter__sbw(h, sbx, sby, wx, wy);
 		} else {
 		    fixed accent_lsb = cs0;
-		    fixed overall_x_offset = pcis->save_lsb.x + pcis->save_adxy.x - pcis->save_asb + accent_lsb - pcis->base_lsb;
+		    fixed overall_x_offset = pcis->save_lsb.x + pcis->adxy.x - pcis->asb + accent_lsb - pcis->base_lsb;
 
                     code = t1_hinter__sbw_seac(h, overall_x_offset, pcis->adxy.y);
 		}

Modified: trunk/gs/src/gxtype1.h
===================================================================
--- trunk/gs/src/gxtype1.h	2007-01-15 10:56:38 UTC (rev 7606)
+++ trunk/gs/src/gxtype1.h	2007-01-15 10:59:56 UTC (rev 7607)
@@ -118,13 +118,17 @@
     gs_fixed_point lsb;		/* left side bearing (char coords) */
     gs_fixed_point width;	/* character width (char coords) */
     int seac_accent;		/* accent character code for seac, or -1 */
-    fixed save_asb;		/* save seac asb */
+    fixed asb;			/* seac asb */
     gs_fixed_point save_lsb;	/* save seac accented lsb */
     gs_fixed_point save_adxy;	/* save seac adx/ady */
-    fixed asb_diff;		/* save_asb - save_lsb.x, */
-				/* needed to adjust Flex endpoint */
-    gs_fixed_point adxy;	/* seac accent displacement, */
-				/* needed to adjust currentpoint */
+    fixed asb_diff;		/* asb - save_lsb.x, */
+				/* needed to adjust Flex endpoint
+				   when processing the accent character;
+				   Zero when processing the base character. */
+    gs_fixed_point adxy;	/* seac accent displacement,
+				   needed to adjust currentpoint
+				   when processing the accent character;
+				   Zero when processing the base character. */
     fixed base_lsb;		/* The lsb of the base character for 'seac'. */
     int flex_path_state_flags;	/* record whether path was open */
 				/* at start of Flex section */