change font baseline handling.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchanf/trunk@548 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/css/cssrendering_box.c b/src/css/cssrendering_box.c
index 58b099e..57db513 100644 (file)
--- a/src/css/cssrendering_box.c
+++ b/src/css/cssrendering_box.c
@@ -173,9 +173,8 @@ EXPORT Bool cssrendering_drawtraversal_next(cssrendering_drawtraversal_t *traver
                                        }
 
                                        result->type = CSSRENDERING_DRAWTRAVERSAL_RESULTTYPE_TEXT;
+                                       result->data.text.content_edge = r;
                                        result->data.text.fragment = &(box->l.text);
-                                       result->data.text.blstart.x = r.c.left;
-                                       result->data.text.blstart.y = r.c.top + box->l.baseline;
                                        result->data.text.nodedata = box->base.userdata;
                                        break;
                                }

diff --git a/src/css/cssrendering_box.h b/src/css/cssrendering_box.h
index b0b575b..6aa8fe9 100644 (file)
--- a/src/css/cssrendering_box.h
+++ b/src/css/cssrendering_box.h
@@ -66,7 +66,6 @@ typedef struct cssrendering_basebox_t_ cssrendering_basebox_t;
 struct cssrendering_linebox_t_ {
        cssrendering_basebox_t base;
        cssrendering_textfragment_t text;
-       W baseline;
 };
 typedef struct cssrendering_linebox_t_ cssrendering_linebox_t;
 
@@ -104,8 +103,8 @@ struct cssrendering_drawtraversal_result_ {
        } type;
        union {
                struct {
+                       cssmetric_rectangle_t content_edge;
                        cssrendering_textfragment_t *fragment;
-                       cssmetric_point_t blstart; /* baseline start */
                        VP nodedata;
                } text;
        } data;