[cairo-commit] cairo-demo/png ChangeLog,1.2,1.3 text.c,1.3,1.4

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/png
In directory pdx:/tmp/cvs-serv24697

Modified Files:
	ChangeLog text.c 
Log Message:

        (box_glyphs):
        (box_text): Track changes in cairo_text_extents_t structure.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	16 Dec 2003 02:34:12 -0000	1.2
--- ChangeLog	16 Dec 2003 03:01:54 -0000	1.3
***************
*** 1,4 ****
--- 1,9 ----
  2003-12-15  Carl Worth  <cworth at isi.edu>
  
+ 	(box_glyphs): 
+ 	(box_text): Track changes in cairo_text_extents_t structure.
+ 
+ 2003-12-15  Carl Worth  <cworth at isi.edu>
+ 
  	* text.c: Add boxes to demonstrate use of cairo_text_extents and
  	cairo_glyph_extents. Add several text examples to demonstrate

Index: text.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/text.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** text.c	16 Dec 2003 02:34:12 -0000	1.3
--- text.c	16 Dec 2003 03:01:54 -0000	1.4
***************
*** 53,60 ****
      line_width = cairo_current_line_width (cr);
      cairo_rectangle (cr,
! 		     x + extents.left_side_bearing - line_width / 2.0,
! 		     y + extents.ascent - line_width / 2.0,
! 		     extents.right_side_bearing - extents.left_side_bearing + line_width,
! 		     -extents.ascent + extents.descent + line_width);
      cairo_stroke (cr);
  
--- 53,60 ----
      line_width = cairo_current_line_width (cr);
      cairo_rectangle (cr,
! 		     x + extents.x_bearing - line_width / 2.0,
! 		     y + extents.y_bearing - line_width / 2.0,
! 		     extents.width  + line_width,
! 		     extents.height + line_width);
      cairo_stroke (cr);
  
***************
*** 74,81 ****
      line_width = cairo_current_line_width (cr);
      cairo_rectangle (cr,
! 		     x + extents.left_side_bearing - line_width / 2.0,
! 		     y + extents.ascent - line_width / 2.0,
! 		     extents.right_side_bearing - extents.left_side_bearing + line_width,
! 		     - extents.ascent + extents.descent + line_width);
      cairo_stroke (cr);
  
--- 74,81 ----
      line_width = cairo_current_line_width (cr);
      cairo_rectangle (cr,
! 		     x + extents.x_bearing - line_width / 2.0,
! 		     y + extents.y_bearing - line_width / 2.0,
! 		     extents.width  + line_width,
! 		     extents.height + line_width);
      cairo_stroke (cr);