diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 380853cfc7..e8892dafc1 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -472,13 +472,13 @@ _edje_part_recalc_single(Edje *ed,
 	  {
 	     const char *ptxt;
 	     
-	     if (evas_object_textblock2_style_get(ep->object) != stl->style)
-	       evas_object_textblock2_style_set(ep->object, stl->style);
-	     ptxt = evas_object_textblock2_text_markup_get(ep->object);
+	     if (evas_object_textblock_style_get(ep->object) != stl->style)
+	       evas_object_textblock_style_set(ep->object, stl->style);
+	     ptxt = evas_object_textblock_text_markup_get(ep->object);
 	     if (((!ptxt) && (text)) || 
 		 ((ptxt) && (text) && (strcmp(ptxt, text))) ||
 		 ((ptxt) && (!text)))
-	       evas_object_textblock2_text_markup_set(ep->object, text);
+	       evas_object_textblock_text_markup_set(ep->object, text);
 	     if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
 	       {
 		  int mw = 0, mh = 0;
@@ -487,11 +487,11 @@ _edje_part_recalc_single(Edje *ed,
 		  if (!chosen_desc->text.min_x)
 		    {
 		       evas_object_resize(ep->object, params->w, params->h);
-		       evas_object_textblock2_size_formatted_get(ep->object, &tw, &th);
+		       evas_object_textblock_size_formatted_get(ep->object, &tw, &th);
 		    }
 		  else
-		    evas_object_textblock2_size_native_get(ep->object, &tw, &th);
-		  evas_object_textblock2_style_insets_get(ep->object, &ins_l, &ins_r, &ins_t, &ins_b);
+		    evas_object_textblock_size_native_get(ep->object, &tw, &th);
+		  evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r, &ins_t, &ins_b);
 		  mw = ins_l + tw + ins_r;
 		  mh = ins_t + th + ins_b;
 		  if (chosen_desc->text.min_x)
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 6bcf82fe53..8368e5b70d 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -164,7 +164,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
 		  evas_object_pass_events_set(rp->object, 1);
 	       }
 	     else if (ep->type == EDJE_PART_TYPE_TEXTBLOCK)
-	       rp->object = evas_object_textblock2_add(ed->evas);
+	       rp->object = evas_object_textblock_add(ed->evas);
 	     else
 	       {
 		  printf("EDJE ERROR: wrong part type %i!\n", ep->type);
diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c
index a66795da16..eb0b1d7297 100644
--- a/legacy/edje/src/lib/edje_textblock_styles.c
+++ b/legacy/edje/src/lib/edje_textblock_styles.c
@@ -236,8 +236,8 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf)
 	
 	stl = l->data;
 	if (stl->style) break;
-	stl->style = evas_textblock2_style_new();
-	evas_textblock2_style_set(stl->style, (const char *)buf);
+	stl->style = evas_textblock_style_new();
+	evas_textblock_style_set(stl->style, (const char *)buf);
 	def_done = 0;
 	/* FIXME: i think we have no choice by to parse the style line,
 	 * look for font= tags and IF that font is in the .edj then prepend
@@ -298,7 +298,7 @@ _edje_textblock_style_parse_and_fix(Edje_File *edf)
 	  }
 	if (fontset) free(fontset);
 	if (fontsource) free(fontsource);
-	evas_textblock2_style_set(stl->style, (const char *)buf);
+	evas_textblock_style_set(stl->style, (const char *)buf);
 	free(buf);
      }
 }
@@ -323,7 +323,7 @@ _edje_textblock_style_cleanup(Edje_File *edf)
 	     free(tag);
 	  }
 	if (stl->name) free(stl->name);
-	if (stl->style) evas_textblock2_style_free(stl->style);
+	if (stl->style) evas_textblock_style_free(stl->style);
 	free(stl);
      }
 }
diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index f33a8e4726..eaf13028ff 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -424,39 +424,6 @@ extern "C" {
    EAPI void              evas_font_cache_set               (Evas *e, int size);
    EAPI int               evas_font_cache_get               (Evas *e);
 
-   EAPI Evas_Object           *evas_object_textblock_add                  (Evas *e);
-   EAPI void                   evas_object_textblock_clear                (Evas_Object *obj);
-   EAPI void                   evas_object_textblock_cursor_pos_set       (Evas_Object *obj, int pos);
-   EAPI int                    evas_object_textblock_cursor_pos_get       (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_length_get           (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_cursor_line_get      (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_lines_get            (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_line_start_pos_get   (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_line_end_pos_get     (Evas_Object *obj);
-   EAPI Evas_Bool              evas_object_textblock_line_get             (Evas_Object *obj, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh);
-   EAPI Evas_Bool              evas_object_textblock_char_pos_get         (Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-   EAPI int                    evas_object_textblock_char_coords_get      (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-   EAPI void                   evas_object_textblock_text_insert          (Evas_Object *obj, const char *text);
-   EAPI char                  *evas_object_textblock_text_get             (Evas_Object *obj, int len);
-   EAPI void                   evas_object_textblock_text_del             (Evas_Object *obj, int len);
-   EAPI void                   evas_object_textblock_format_insert        (Evas_Object *obj, const char *format);
-   EAPI int                    evas_object_textblock_format_next_pos_get  (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_format_next_count_get(Evas_Object *obj);
-   EAPI const char            *evas_object_textblock_format_next_get      (Evas_Object *obj, int n);
-   EAPI void                   evas_object_textblock_format_next_del      (Evas_Object *obj, int n);
-   EAPI int                    evas_object_textblock_format_prev_pos_get  (Evas_Object *obj);
-   EAPI int                    evas_object_textblock_format_prev_count_get(Evas_Object *obj);
-   EAPI const char            *evas_object_textblock_format_prev_get      (Evas_Object *obj, int n);
-   EAPI void                   evas_object_textblock_format_prev_del      (Evas_Object *obj, int n);
-   EAPI char                  *evas_object_textblock_format_current_get   (Evas_Object *obj);
-   EAPI void                   evas_object_textblock_format_size_get      (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-   EAPI void                   evas_object_textblock_native_size_get      (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-   EAPI int                    evas_object_textblock_native_lines_get     (Evas_Object *obj);
-
-   
-   
-   
-   /* NEW texblock api - intended to replace the old - not complete yet */
    typedef struct _Evas_Textblock_Style     Evas_Textblock_Style;
    typedef struct _Evas_Textblock_Cursor    Evas_Textblock_Cursor;
    typedef struct _Evas_Textblock_Rectangle Evas_Textblock_Rectangle;
@@ -472,65 +439,65 @@ extern "C" {
 	EVAS_TEXTBLOCK_TEXT_PLAIN
      } Evas_Textblock_Text_Type;
    
-   EAPI Evas_Object                 *evas_object_textblock2_add(Evas *e);
+   EAPI Evas_Object                 *evas_object_textblock_add(Evas *e);
    
-   EAPI Evas_Textblock_Style        *evas_textblock2_style_new(void);
-   EAPI void                         evas_textblock2_style_free(Evas_Textblock_Style *ts);
-   EAPI void                         evas_textblock2_style_set(Evas_Textblock_Style *ts, const char *text);
-   EAPI const char                  *evas_textblock2_style_get(Evas_Textblock_Style *ts);
+   EAPI Evas_Textblock_Style        *evas_textblock_style_new(void);
+   EAPI void                         evas_textblock_style_free(Evas_Textblock_Style *ts);
+   EAPI void                         evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text);
+   EAPI const char                  *evas_textblock_style_get(Evas_Textblock_Style *ts);
    
-   EAPI void                         evas_object_textblock2_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
-   EAPI const Evas_Textblock_Style  *evas_object_textblock2_style_get(Evas_Object *obj);
+   EAPI void                         evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts);
+   EAPI const Evas_Textblock_Style  *evas_object_textblock_style_get(Evas_Object *obj);
    
-   EAPI void                         evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text);
-   EAPI const char                  *evas_object_textblock2_text_markup_get(Evas_Object *obj);
+   EAPI void                         evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text);
+   EAPI const char                  *evas_object_textblock_text_markup_get(Evas_Object *obj);
     
-   EAPI const Evas_Textblock_Cursor *evas_object_textblock2_cursor_get(Evas_Object *obj);
-   EAPI Evas_Textblock_Cursor       *evas_object_textblock2_cursor_new(Evas_Object *obj);
+   EAPI const Evas_Textblock_Cursor *evas_object_textblock_cursor_get(Evas_Object *obj);
+   EAPI Evas_Textblock_Cursor       *evas_object_textblock_cursor_new(Evas_Object *obj);
    
-   EAPI void                         evas_textblock2_cursor_free(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_free(Evas_Textblock_Cursor *cur);
    
-   EAPI void                         evas_textblock2_cursor_node_first(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_node_last(Evas_Textblock_Cursor *cur);
-   EAPI Evas_Bool                    evas_textblock2_cursor_node_next(Evas_Textblock_Cursor *cur);
-   EAPI Evas_Bool                    evas_textblock2_cursor_node_prev(Evas_Textblock_Cursor *cur);
-   EAPI Evas_Bool                    evas_textblock2_cursor_char_next(Evas_Textblock_Cursor *cur);
-   EAPI Evas_Bool                    evas_textblock2_cursor_char_prev(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_char_first(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_char_last(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_line_first(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_line_last(Evas_Textblock_Cursor *cur);
-   EAPI int                          evas_textblock2_cursor_pos_get(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
-   EAPI Evas_Bool                    evas_textblock2_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
-   EAPI int                          evas_textblock2_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
-   EAPI void                         evas_textblock2_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
+   EAPI void                         evas_textblock_cursor_node_first(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur);
+   EAPI Evas_Bool                    evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur);
+   EAPI Evas_Bool                    evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur);
+   EAPI Evas_Bool                    evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur);
+   EAPI Evas_Bool                    evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_char_first(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur);
+   EAPI int                          evas_textblock_cursor_pos_get(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos);
+   EAPI Evas_Bool                    evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line);
+   EAPI int                          evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
+   EAPI void                         evas_textblock_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest);
    
-   EAPI void                         evas_textblock2_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
-   EAPI void                         evas_textblock2_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
+   EAPI void                         evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text);
+   EAPI void                         evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text);
 
-   EAPI void                         evas_textblock2_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
-   EAPI void                         evas_textblock2_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
-   EAPI void                         evas_textblock2_cursor_node_delete(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur);
-   EAPI void                         evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
+   EAPI void                         evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format);
+   EAPI void                         evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format);
+   EAPI void                         evas_textblock_cursor_node_delete(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
+   EAPI void                         evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
    
-   EAPI const char                  *evas_textblock2_cursor_node_text_get(Evas_Textblock_Cursor *cur);
-   EAPI int                          evas_textblock2_cursor_node_text_length_get(Evas_Textblock_Cursor *cur);
-   EAPI const char                  *evas_textblock2_cursor_node_format_get(Evas_Textblock_Cursor *cur);
-   EAPI char                        *evas_textblock2_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
+   EAPI const char                  *evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur);
+   EAPI int                          evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur);
+   EAPI const char                  *evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur);
+   EAPI char                        *evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format);
        
-   EAPI int                          evas_textblock2_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-   EAPI int                          evas_textblock2_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-   EAPI Evas_Bool                    evas_textblock2_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
-   EAPI int                          evas_textblock2_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
-   EAPI Evas_List                   *evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
+   EAPI int                          evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+   EAPI int                          evas_textblock_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+   EAPI Evas_Bool                    evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y);
+   EAPI int                          evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y);
+   EAPI Evas_List                   *evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2);
    
-   EAPI Evas_Bool                    evas_object_textblock2_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-   EAPI void                         evas_object_textblock2_clear(Evas_Object *obj);
-   EAPI void                         evas_object_textblock2_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-   EAPI void                         evas_object_textblock2_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
-   EAPI void                         evas_object_textblock2_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
+   EAPI Evas_Bool                    evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
+   EAPI void                         evas_object_textblock_clear(Evas_Object *obj);
+   EAPI void                         evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+   EAPI void                         evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+   EAPI void                         evas_object_textblock_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
    
    
    EAPI void              evas_object_del                   (Evas_Object *obj);
diff --git a/legacy/evas/src/lib/canvas/Makefile.am b/legacy/evas/src/lib/canvas/Makefile.am
index 2830e4a1c8..966cac530f 100644
--- a/legacy/evas/src/lib/canvas/Makefile.am
+++ b/legacy/evas/src/lib/canvas/Makefile.am
@@ -34,7 +34,6 @@ evas_object_rectangle.c \
 evas_object_smart.c \
 evas_object_text.c \
 evas_object_textblock.c \
-evas_object_textblock_old.c \
 evas_font_dir.c \
 evas_rectangle.c \
 evas_render.c \
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0294762329..691cea1643 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -5,15 +5,6 @@
 #include "evas_common.h"
 #include "evas_private.h"
 
-/* FIXME:
- *
- * this is a rewrite of textblock - for now api calsl are just textblock2
- * instead of textblock
- *
- */
-
-/* LEAK: lines!!!! lines allocated in _layout_line_new() */
-
 /* save typing */
 #define ENFN obj->layer->evas->engine.func
 #define ENDT obj->layer->evas->engine.data.output
@@ -730,7 +721,7 @@ _append_text_run(Evas_Object_Textblock *o, char *s, char *p)
 	     strncpy(ts, s, p - s);
 	     ts[p - s] = 0;
 	     ts = _clean_white(0, 0, ts);
-	     evas_textblock2_cursor_text_append(o->cursor, ts);
+	     evas_textblock_cursor_text_append(o->cursor, ts);
 	     free(ts);
 	  }
      }
@@ -2184,7 +2175,7 @@ _find_layout_line_num(Evas_Object *obj, int line)
  * @todo Find a documentation group to put this under.
  */
 Evas_Object *
-evas_object_textblock2_add(Evas *e)
+evas_object_textblock_add(Evas *e)
 {
    Evas_Object *obj;
 
@@ -2198,7 +2189,7 @@ evas_object_textblock2_add(Evas *e)
 }
 
 Evas_Textblock_Style *
-evas_textblock2_style_new(void)
+evas_textblock_style_new(void)
 {
    Evas_Textblock_Style *ts;
    
@@ -2207,7 +2198,7 @@ evas_textblock2_style_new(void)
 }
 
 void
-evas_textblock2_style_free(Evas_Textblock_Style *ts)
+evas_textblock_style_free(Evas_Textblock_Style *ts)
 {
    if (!ts) return;
    if (ts->objects)
@@ -2220,7 +2211,7 @@ evas_textblock2_style_free(Evas_Textblock_Style *ts)
 }
 
 void
-evas_textblock2_style_set(Evas_Textblock_Style *ts, const char *text)
+evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
 {
    Evas_List *l;
    
@@ -2320,12 +2311,12 @@ evas_textblock2_style_set(Evas_Textblock_Style *ts, const char *text)
 	obj = l->data;
 	o = (Evas_Object_Textblock *)(obj->object_data);
 	if (o->markup_text)
-	  evas_object_textblock2_text_markup_set(obj, o->markup_text);
+	  evas_object_textblock_text_markup_set(obj, o->markup_text);
      }
 }
 
 const char *
-evas_textblock2_style_get(Evas_Textblock_Style *ts)
+evas_textblock_style_get(Evas_Textblock_Style *ts)
 {
    if (!ts) return NULL;
    return ts->style_text;
@@ -2333,7 +2324,7 @@ evas_textblock2_style_get(Evas_Textblock_Style *ts)
 
 /* textblock styles */
 void
-evas_object_textblock2_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
+evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
 {
    TB_HEAD();
    if (ts == o->style) return;
@@ -2345,7 +2336,7 @@ evas_object_textblock2_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
 	old_ts = o->style;
 	old_ts->objects = evas_list_remove(old_ts->objects, obj);
 	if ((old_ts->delete_me) && (!old_ts->objects))
-	  evas_textblock2_style_free(old_ts);
+	  evas_textblock_style_free(old_ts);
      }
    if (ts)
      {
@@ -2357,18 +2348,18 @@ evas_object_textblock2_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
 	o->style = NULL;
      }
    if (o->markup_text)
-     evas_object_textblock2_text_markup_set(obj, o->markup_text);
+     evas_object_textblock_text_markup_set(obj, o->markup_text);
 }
 
 const Evas_Textblock_Style *
-evas_object_textblock2_style_get(Evas_Object *obj)
+evas_object_textblock_style_get(Evas_Object *obj)
 {
    TB_HEAD_RETURN(NULL);
    return o->style;
 }
 
 void
-evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
+evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
 {
    TB_HEAD();
    if ((text != o->markup_text) && (o->markup_text))
@@ -2389,7 +2380,7 @@ evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
 	  }
 	return;
      }
-   evas_textblock2_cursor_node_first(o->cursor);
+   evas_textblock_cursor_node_first(o->cursor);
    if (text)
      {
 	char *s, *p;
@@ -2415,11 +2406,11 @@ evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
 			    ttag[tag_end - tag_start - 1] = 0;
 			    match = _style_match_tag(o->style, ttag);
 			    if (match)
-			      evas_textblock2_cursor_format_append(o->cursor, match);
+			      evas_textblock_cursor_format_append(o->cursor, match);
 			    else
 			      {
 				 if (ttag[0] == '/')
-				   evas_textblock2_cursor_format_append(o->cursor, "-");
+				   evas_textblock_cursor_format_append(o->cursor, "-");
 				 else
 				   {
 				      char *ttag2;
@@ -2429,7 +2420,7 @@ evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
 					{
 					   strcpy(ttag2, "+ ");
 					   strcat(ttag2, ttag);
-					   evas_textblock2_cursor_format_append(o->cursor, ttag2);
+					   evas_textblock_cursor_format_append(o->cursor, ttag2);
 					   free(ttag2);
 					}
 				   }
@@ -2447,7 +2438,7 @@ evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
 			    if (!strncmp(_escapes[i], esc_start, 
 					 esc_end - esc_start + 1))
 			      {
-				 evas_textblock2_cursor_text_append(o->cursor, _escapes[i + 1]);
+				 evas_textblock_cursor_text_append(o->cursor, _escapes[i + 1]);
 				 break;
 			      }
 			 }
@@ -2505,14 +2496,14 @@ evas_object_textblock2_text_markup_set(Evas_Object *obj, const char *text)
      {
 	Evas_List *l;
 	
-	evas_textblock2_cursor_node_first(o->cursor);
+	evas_textblock_cursor_node_first(o->cursor);
 	for (l = o->cursors; l; l = l->next)
-	  evas_textblock2_cursor_node_first(l->data);
+	  evas_textblock_cursor_node_first(l->data);
      }
 }
 
 const char *
-evas_object_textblock2_text_markup_get(Evas_Object *obj)
+evas_object_textblock_text_markup_get(Evas_Object *obj)
 {
    TB_HEAD_RETURN(NULL);
    if (!o->markup_text)
@@ -2521,13 +2512,13 @@ evas_object_textblock2_text_markup_get(Evas_Object *obj)
 	int slen = 0;
 	int salloc = 0;
 	
-	cur = evas_object_textblock2_cursor_new(obj);
-	evas_textblock2_cursor_node_first(cur);
+	cur = evas_object_textblock_cursor_new(obj);
+	evas_textblock_cursor_node_first(cur);
 	do
 	  {
 	     char *s, *p, *ps;
 	     
-	     s = (char *)evas_textblock2_cursor_node_text_get(cur);
+	     s = (char *)evas_textblock_cursor_node_text_get(cur);
 	     if (s)
 	       {
 		  p = s;
@@ -2578,7 +2569,7 @@ evas_object_textblock2_text_markup_get(Evas_Object *obj)
 	       }
 	     else
 	       {
-		  s = (char *)evas_textblock2_cursor_node_format_get(cur);
+		  s = (char *)evas_textblock_cursor_node_format_get(cur);
 		  if (s)
 		    {
 		       char *stag;
@@ -2602,22 +2593,22 @@ evas_object_textblock2_text_markup_get(Evas_Object *obj)
 	       }
 	     
 	  }
-	while (evas_textblock2_cursor_node_next(cur));
-	evas_textblock2_cursor_free(cur);
+	while (evas_textblock_cursor_node_next(cur));
+	evas_textblock_cursor_free(cur);
      }
    return o->markup_text;
 }
 
 /* cursors */
 const Evas_Textblock_Cursor *
-evas_object_textblock2_cursor_get(Evas_Object *obj)
+evas_object_textblock_cursor_get(Evas_Object *obj)
 {
    TB_HEAD_RETURN(NULL);
    return o->cursor;
 }
 
 Evas_Textblock_Cursor *
-evas_object_textblock2_cursor_new(Evas_Object *obj)
+evas_object_textblock_cursor_new(Evas_Object *obj)
 {
    Evas_Textblock_Cursor *cur;
    
@@ -2631,7 +2622,7 @@ evas_object_textblock2_cursor_new(Evas_Object *obj)
 }
 
 void
-evas_textblock2_cursor_free(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
 
@@ -2643,7 +2634,7 @@ evas_textblock2_cursor_free(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_node_first(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_first(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    
@@ -2654,7 +2645,7 @@ evas_textblock2_cursor_node_first(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_node_last(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    
@@ -2664,7 +2655,7 @@ evas_textblock2_cursor_node_last(Evas_Textblock_Cursor *cur)
      {
 	cur->node = (Evas_Object_Textblock_Node *)(((Evas_Object_List *)(o->nodes))->last);
 	cur->pos = 0;
-	evas_textblock2_cursor_char_last(cur);
+	evas_textblock_cursor_char_last(cur);
      }
    else
      {
@@ -2674,7 +2665,7 @@ evas_textblock2_cursor_node_last(Evas_Textblock_Cursor *cur)
 }
 
 Evas_Bool
-evas_textblock2_cursor_node_next(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    
@@ -2691,7 +2682,7 @@ evas_textblock2_cursor_node_next(Evas_Textblock_Cursor *cur)
 }
 
 Evas_Bool
-evas_textblock2_cursor_node_prev(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    
@@ -2701,14 +2692,14 @@ evas_textblock2_cursor_node_prev(Evas_Textblock_Cursor *cur)
    if (((Evas_Object_List *)(cur->node))->prev)
      {
 	cur->node = (Evas_Object_Textblock_Node *)(((Evas_Object_List *)(cur->node))->prev);
-	evas_textblock2_cursor_char_last(cur);
+	evas_textblock_cursor_char_last(cur);
 	return 1;
      }
    return 0;
 }
 
 Evas_Bool
-evas_textblock2_cursor_char_next(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    int index, tindex, ch;
@@ -2727,7 +2718,7 @@ evas_textblock2_cursor_char_next(Evas_Textblock_Cursor *cur)
 }
 
 Evas_Bool
-evas_textblock2_cursor_char_prev(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    int index, ch;
@@ -2744,14 +2735,14 @@ evas_textblock2_cursor_char_prev(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_char_first(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_char_first(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return;
    cur->pos = 0;
 }
 
 void
-evas_textblock2_cursor_char_last(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur)
 {
    int index;
    
@@ -2768,7 +2759,7 @@ evas_textblock2_cursor_char_last(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_line_first(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Line *ln = NULL;
@@ -2804,7 +2795,7 @@ evas_textblock2_cursor_line_first(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_line_last(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Line *ln = NULL;
@@ -2850,14 +2841,14 @@ evas_textblock2_cursor_line_last(Evas_Textblock_Cursor *cur)
 }
 
 int
-evas_textblock2_cursor_pos_get(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_pos_get(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return -1;
    return cur->pos;
 }
 
 void
-evas_textblock2_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
+evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
 {
    if (!cur) return;
    if (!cur->node) return;
@@ -2868,7 +2859,7 @@ evas_textblock2_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
 }
 
 Evas_Bool
-evas_textblock2_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
+evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Line *ln;
@@ -2902,7 +2893,7 @@ evas_textblock2_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
 }
 
 int
-evas_textblock2_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
+evas_textblock_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_List *l1, *l2;
    
@@ -2930,7 +2921,7 @@ evas_textblock2_cursor_compare(Evas_Textblock_Cursor *cur1, Evas_Textblock_Curso
 }
 
 void
-evas_textblock2_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest)
+evas_textblock_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest)
 {
    if (!cur) return;
    if (!cur_dest) return;
@@ -2942,7 +2933,7 @@ evas_textblock2_cursor_copy(Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *c
 
 /* text controls */
 void
-evas_textblock2_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text)
+evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n;
@@ -3000,7 +2991,7 @@ evas_textblock2_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text)
 }
 
 void
-evas_textblock2_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text)
+evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n;
@@ -3056,7 +3047,7 @@ evas_textblock2_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text
 }
 
 void
-evas_textblock2_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format)
+evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n, *nc, *n2;
@@ -3116,7 +3107,7 @@ evas_textblock2_cursor_format_append(Evas_Textblock_Cursor *cur, const char *for
 }
 
 void
-evas_textblock2_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format)
+evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n, *nc, *n2;
@@ -3171,7 +3162,7 @@ evas_textblock2_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *fo
 }
 
 void
-evas_textblock2_cursor_node_delete(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_delete(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n, *n2;
@@ -3190,7 +3181,7 @@ evas_textblock2_cursor_node_delete(Evas_Textblock_Cursor *cur)
 	n2 = (Evas_Object_Textblock_Node *)(((Evas_Object_List *)n)->prev);
 	cur->node = n2;
 	cur->pos = 0;
-	evas_textblock2_cursor_char_last(cur);
+	evas_textblock_cursor_char_last(cur);
      }
 
      {
@@ -3228,7 +3219,7 @@ evas_textblock2_cursor_node_delete(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n, *n2;
@@ -3239,7 +3230,7 @@ evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur)
    n = cur->node;
    if (n->type == NODE_FORMAT)
      {
-	evas_textblock2_cursor_node_delete(cur);
+	evas_textblock_cursor_node_delete(cur);
 	return;
      }
    index = cur->pos;
@@ -3249,7 +3240,7 @@ evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur)
    n->text = _strbuf_remove(n->text, cur->pos, index, &(n->len), &(n->alloc));
    if (!n->text)
      {
-	evas_textblock2_cursor_node_delete(cur);
+	evas_textblock_cursor_node_delete(cur);
 	return;
      }
    if (cur->pos == n->len)
@@ -3263,7 +3254,7 @@ evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur)
 	else
 	  {
 	     cur->pos = 0;
-	     evas_textblock2_cursor_char_last(cur);
+	     evas_textblock_cursor_char_last(cur);
 	  }
      }
    
@@ -3298,7 +3289,7 @@ evas_textblock2_cursor_char_delete(Evas_Textblock_Cursor *cur)
 }
 
 void
-evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
+evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n1, *n2, *n, *tn;
@@ -3310,7 +3301,7 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
    if (!cur2) return;
    if (cur1->obj != cur2->obj) return;
    o = (Evas_Object_Textblock *)(cur1->obj->object_data);
-   if (evas_textblock2_cursor_compare(cur1, cur2) > 0)
+   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
 	Evas_Textblock_Cursor *tc;
 	
@@ -3327,15 +3318,15 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
      {
 	if (cur1->pos == cur2->pos)
 	  {
-	     evas_textblock2_cursor_char_delete(cur1);
-	     evas_textblock2_cursor_copy(cur1, cur2);
+	     evas_textblock_cursor_char_delete(cur1);
+	     evas_textblock_cursor_copy(cur1, cur2);
 	     return;
 	  }
 	n1->text = _strbuf_remove(n1->text, cur1->pos, index, &(n1->len), &(n1->alloc));
 	if (!n1->text)
 	  {
-	     evas_textblock2_cursor_node_delete(cur1);
-	     evas_textblock2_cursor_copy(cur1, cur2);
+	     evas_textblock_cursor_node_delete(cur1);
+	     evas_textblock_cursor_copy(cur1, cur2);
 	     return;
 	  }
 	if (cur1->pos >= n1->len)
@@ -3349,10 +3340,10 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
 	     else
 	       {
 		  cur1->pos = 0;
-		  evas_textblock2_cursor_char_last(cur1);
+		  evas_textblock_cursor_char_last(cur1);
 	       }
 	  }
-	evas_textblock2_cursor_copy(cur1, cur2);
+	evas_textblock_cursor_copy(cur1, cur2);
      }
    else
      {
@@ -3393,7 +3384,7 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
 	if (n1->type == NODE_TEXT)
 	  {
 	     if (!n1->text)
-	       evas_textblock2_cursor_node_delete(cur1);
+	       evas_textblock_cursor_node_delete(cur1);
 	  }
 	else
 	  {
@@ -3449,7 +3440,7 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
 	  {
 	     n2->text = _strbuf_remove(n2->text, 0, index, &(n2->len), &(n2->alloc));
 	     if (!n2->text)
-	       evas_textblock2_cursor_node_delete(cur2);
+	       evas_textblock_cursor_node_delete(cur2);
 	  }
 	else
 	  {
@@ -3489,13 +3480,13 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
 
 	if ((cur1 != o->cursor) && (cur2 != o->cursor))
 	  {
-	     evas_textblock2_cursor_copy(cur1, o->cursor);
+	     evas_textblock_cursor_copy(cur1, o->cursor);
 	  }
 	for (l = o->cursors; l; l = l->next)
 	  {
 	     if ((l->data != cur1) && (l->data != cur2))
 	       {
-		  evas_textblock2_cursor_copy(cur1, l->data);
+		  evas_textblock_cursor_copy(cur1, l->data);
 	       }
 	  }
      }
@@ -3507,7 +3498,7 @@ evas_textblock2_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_
 }
 
 const char *
-evas_textblock2_cursor_node_text_get(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_text_get(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return NULL;
    if (!cur->node) return NULL;
@@ -3519,7 +3510,7 @@ evas_textblock2_cursor_node_text_get(Evas_Textblock_Cursor *cur)
 }
 
 int
-evas_textblock2_cursor_node_text_length_get(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_text_length_get(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return 0;
    if (!cur->node) return 0;
@@ -3531,7 +3522,7 @@ evas_textblock2_cursor_node_text_length_get(Evas_Textblock_Cursor *cur)
 }
 
 const char *
-evas_textblock2_cursor_node_format_get(Evas_Textblock_Cursor *cur)
+evas_textblock_cursor_node_format_get(Evas_Textblock_Cursor *cur)
 {
    if (!cur) return NULL;
    if (!cur->node) return NULL;
@@ -3543,7 +3534,7 @@ evas_textblock2_cursor_node_format_get(Evas_Textblock_Cursor *cur)
 }
 
 char *
-evas_textblock2_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
+evas_textblock_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Node *n1, *n2, *n;
@@ -3555,7 +3546,7 @@ evas_textblock2_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textbloc
    if (!cur2) return NULL;
    if (cur1->obj != cur2->obj) return NULL;
    o = (Evas_Object_Textblock *)(cur1->obj->object_data);
-   if (evas_textblock2_cursor_compare(cur1, cur2) > 0)
+   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
 	Evas_Textblock_Cursor *tc;
 	
@@ -3614,7 +3605,7 @@ evas_textblock2_cursor_range_text_get(Evas_Textblock_Cursor *cur1, Evas_Textbloc
 }
 
 int
-evas_textblock2_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+evas_textblock_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Line *ln = NULL;
@@ -3668,7 +3659,7 @@ evas_textblock2_cursor_char_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord
 }
 
 int
-evas_textblock2_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+evas_textblock_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Evas_Object_Textblock *o;
    Evas_Object_Textblock_Line *ln = NULL;
@@ -3697,7 +3688,7 @@ evas_textblock2_cursor_line_geometry_get(Evas_Textblock_Cursor *cur, Evas_Coord
 }
 
 Evas_Bool
-evas_textblock2_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
+evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
 {
    Evas_Object_Textblock *o;
    Evas_Object_List *l, *ll;
@@ -3768,7 +3759,7 @@ evas_textblock2_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x,
 }
 
 int
-evas_textblock2_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
+evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
 {
    Evas_Object_Textblock *o;
    Evas_Object_List *l;
@@ -3785,7 +3776,7 @@ evas_textblock2_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
 	if (ln->y > y) break;
 	if ((ln->y <= y) && ((ln->y + ln->h) > y))
 	  {
-	     evas_textblock2_cursor_line_set(cur, ln->line_no);
+	     evas_textblock_cursor_line_set(cur, ln->line_no);
 	     return ln->line_no;
 	  }
      }
@@ -3793,7 +3784,7 @@ evas_textblock2_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
 }
 
 Evas_List *
-evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
+evas_textblock_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
 {
    Evas_Object_Textblock *o;
    Evas_List *rects = NULL;
@@ -3805,7 +3796,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
    if (!cur2) return NULL;
    if (cur1->obj != cur2->obj) return NULL;
    o = (Evas_Object_Textblock *)(cur1->obj->object_data);
-   if (evas_textblock2_cursor_compare(cur1, cur2) > 0)
+   if (evas_textblock_cursor_compare(cur1, cur2) > 0)
      {
 	Evas_Textblock_Cursor *tc;
 	
@@ -3813,11 +3804,11 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 	cur1 = cur2;
 	cur2 = tc;
      }
-   line = evas_textblock2_cursor_char_geometry_get(cur1, &cx, &cy, &cw, &ch);
+   line = evas_textblock_cursor_char_geometry_get(cur1, &cx, &cy, &cw, &ch);
    if (line < 0) return NULL;
-   line = evas_textblock2_cursor_line_geometry_get(cur1, &lx, &ly, &lw, &lh);
+   line = evas_textblock_cursor_line_geometry_get(cur1, &lx, &ly, &lw, &lh);
    if (line < 0) return NULL;
-   line2 = evas_textblock2_cursor_line_geometry_get(cur2, NULL, NULL, NULL, NULL);
+   line2 = evas_textblock_cursor_line_geometry_get(cur2, NULL, NULL, NULL, NULL);
    if (line2 < 0) return NULL;
    if (line == line2)
      {
@@ -3826,7 +3817,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 	tr->x = cx;
 	tr->y = ly;
 	tr->h = lh;
-	line = evas_textblock2_cursor_char_geometry_get(cur2, &cx, &cy, &cw, &ch);
+	line = evas_textblock_cursor_char_geometry_get(cur2, &cx, &cy, &cw, &ch);
 	if (line < 0)
 	  {
 	     while (rects)
@@ -3848,7 +3839,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 	tr->w = lx + lw - cx;
 	for (i = line +1; i < line2; i++)
 	  {
-	     evas_object_textblock2_line_number_geometry_get(cur1->obj, i, &lx, &ly, &lw, &lh);
+	     evas_object_textblock_line_number_geometry_get(cur1->obj, i, &lx, &ly, &lw, &lh);
 	     tr = calloc(1, sizeof(Evas_Textblock_Rectangle));
 	     rects = evas_list_append(rects, tr);
 	     tr->x = lx;
@@ -3856,7 +3847,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 	     tr->h = lh;
 	     tr->w = lw;
 	  }
-	line = evas_textblock2_cursor_char_geometry_get(cur2, &cx, &cy, &cw, &ch);
+	line = evas_textblock_cursor_char_geometry_get(cur2, &cx, &cy, &cw, &ch);
 	if (line < 0)
 	  {
 	     while (rects)
@@ -3866,7 +3857,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 	       }
 	     return NULL;
 	  }
-	line = evas_textblock2_cursor_line_geometry_get(cur2, &lx, &ly, &lw, &lh);
+	line = evas_textblock_cursor_line_geometry_get(cur2, &lx, &ly, &lw, &lh);
 	if (line < 0)
 	  {
 	     while (rects)
@@ -3888,7 +3879,7 @@ evas_textblock2_cursor_range_geometry_get(Evas_Textblock_Cursor *cur1, Evas_Text
 
 /* general controls */
 Evas_Bool
-evas_object_textblock2_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
+evas_object_textblock_line_number_geometry_get(Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
 {
    Evas_Object_Textblock_Line *ln;
    
@@ -3903,7 +3894,7 @@ evas_object_textblock2_line_number_geometry_get(Evas_Object *obj, int line, Evas
 }
 
 void
-evas_object_textblock2_clear(Evas_Object *obj)
+evas_object_textblock_clear(Evas_Object *obj)
 {
    Evas_List *l;
    
@@ -3937,7 +3928,7 @@ evas_object_textblock2_clear(Evas_Object *obj)
 }
 
 void
-evas_object_textblock2_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+evas_object_textblock_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
    TB_HEAD();
    if (!o->formatted.valid) _relayout(obj);
@@ -3946,7 +3937,7 @@ evas_object_textblock2_size_formatted_get(Evas_Object *obj, Evas_Coord *w, Evas_
 }
 
 void
-evas_object_textblock2_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+evas_object_textblock_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
    TB_HEAD();
    if (!o->native.valid)
@@ -3962,7 +3953,7 @@ evas_object_textblock2_size_native_get(Evas_Object *obj, Evas_Coord *w, Evas_Coo
 }
 
 void
-evas_object_textblock2_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
+evas_object_textblock_style_insets_get(Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
 {
    TB_HEAD();
    if (!o->formatted.valid) _relayout(obj);
@@ -4017,8 +4008,8 @@ evas_object_textblock_free(Evas_Object *obj)
 {
    Evas_Object_Textblock *o;
 
-   evas_object_textblock2_clear(obj);
-   evas_object_textblock2_style_set(obj, NULL);
+   evas_object_textblock_clear(obj);
+   evas_object_textblock_style_set(obj, NULL);
    o = (Evas_Object_Textblock *)(obj->object_data);
    free(o->cursor);
    while (o->cursors)
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock_old.c b/legacy/evas/src/lib/canvas/evas_object_textblock_old.c
deleted file mode 100644
index 91f64cc359..0000000000
--- a/legacy/evas/src/lib/canvas/evas_object_textblock_old.c
+++ /dev/null
@@ -1,3738 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
-#include "evas_common.h"
-#include "evas_private.h"
-
-/* FIXME:
- *
- * things to add:
- *
- * * anchors (for inline objects other than text - images etc.) - variable size ones too
- * * if a word (or char) doesnt fit at all do something sensible
- *
- * tough ones:
- * * overflow objects (overflow from this textblock can go into another)
- * * directly accessible text spans (so you can track where that span is, how big it is after many inserts/deletes) and modify its formatting etc.
- * * on change figure out what node the change is in and figure out what line (nodes) it affects and only modify those nodes on that line or maybe others until changes dont happen further down
- * * obstacle objects to wrap around
- * * kerning control
- * * fully justified text (space chars evenly to fit the line)
- * * if a word spans 2 layout nodes with no whitespace, it should not be splittable.
- *
- * really tough ones:
- * * fix core text code to properly handle unicode codeponts - handle ALL unicode domains properly.
- * * right to left text
- * * top down (japanese/chinese) text layout
- *
- * insanely tough ones:
- * * for ultra-huge documents determine paging sections of the text in/out and being able to provide callbacks form the user api that can provide the text
- *
- */
-
-/* save typing */
-#define ENFN obj->layer->evas->engine.func
-#define ENDT obj->layer->evas->engine.data.output
-
-#define STYLE_PLAIN 0
-#define STYLE_SHADOW 1
-#define STYLE_OUTLINE 2
-#define STYLE_GLOW 3
-#define STYLE_OUTLINE_SHADOW 4
-#define STYLE_FAR_SHADOW 5
-#define STYLE_OUTLINE_SOFT_SHADOW 6
-#define STYLE_SOFT_SHADOW 7
-#define STYLE_FAR_SOFT_SHADOW 8
-
-#define CMD_NONE 0
-#define CMD_TABSTOP_REL 1
-#define CMD_TABSTOP_ABS 2
-#define CMD_TABSTOP_REL_ADD 3
-#define CMD_TABSTOP_ABS_ADD 4
-#define CMD_RIGHTTABSTOP_REL 5
-#define CMD_RIGHTTABSTOP_ABS 6
-#define CMD_RIGHTTABSTOP_REL_ADD 7
-#define CMD_RIGHTTABSTOP_ABS_ADD 8
-
-/* private magic number for textblock objects */
-static const char o_type[] = "textblock";
-
-/* private struct for textblock object internal data */
-typedef struct _Evas_Object_Textblock      Evas_Object_Textblock;
-typedef struct _Layout                     Layout;
-typedef struct _Layout_Command             Layout_Command;
-typedef struct _Command                    Command;
-typedef struct _Node                       Node;
-typedef struct _Layout_Node                Layout_Node;
-
-/* the current state of the formatting */
-struct _Layout
-{
-   struct {
-      char             *name;
-      char             *source;
-      Evas_Font_Size    size;
-      void             *font;
-   } font;
-   struct {
-      unsigned char     r, g, b, a;
-   } color,
-     underline_color,
-     double_underline_color,
-     outline_color,
-     shadow_color,
-     glow_color,
-     outer_glow_color,
-     backing_color,
-     strikethrough_color
-     ;
-   struct {
-      int               inset, x, y,
-	                ascent, descent,
-	                mascent, mdescent,
-	                advance;
-   } line;
-   double               align, valign;
-   struct {
-      int               l, r;
-      double            lf, rf;
-   } margin;
-   unsigned char        style;
-
-   unsigned char        word_wrap : 1;
-   unsigned char        underline : 1;
-   unsigned char        second_underline : 1;
-   unsigned char        strikethrough : 1;
-   unsigned char        backing : 1;
-};
-
-struct _Layout_Command
-{
-   Evas_Object_List *commands;
-};
-
-struct _Command
-{
-   Evas_Object_List _list_data;
-   int              cmd;
-   int              i1, i2;
-   double           f1, f2;
-};
-
-/* a node of formatting data */
-struct _Node
-{
-   Evas_Object_List _list_data;
-
-   char *format; /* format data */
-   char *text; /* text data until the next node */
-   int   text_len; /* length of the text */
-};
-
-/* a node of formatting data */
-struct _Layout_Node
-{
-   Evas_Object_List _list_data;
-
-   /* the current state */
-   Layout        layout;
-   char         *text; /* text data until the next node */
-   int           text_pos, text_len;
-   int           w, h;
-   Node         *source_node;
-   int           source_pos;
-   int           line;
-   unsigned char line_start : 1;
-   unsigned char line_end : 1;
-   unsigned char spacer : 1;
-};
-
-struct _Evas_Object_Textblock
-{
-   DATA32                 magic;
-   struct {
-      int                 dummy;
-   } cur, prev;
-   char                   changed : 1;
-
-   int                    pos, len, lines;
-   Node                  *nodes;
-   Layout_Node           *layout_nodes;
-   Evas_Coord             last_w, last_h;
-   struct {
-      unsigned char       dirty : 1;
-      Evas_Coord          w, h;
-   } format;
-   struct {
-      unsigned char       dirty : 1;
-      Evas_Coord          w, h;
-      int                 lines;
-   } native;
-   Evas_List             *font_hold;
-   void                  *engine_data;
-};
-
-static void
-evas_object_textblock_layout_init(Layout *layout)
-{
-   layout->font.name = NULL;
-   layout->font.source = NULL;
-   layout->font.size = 0;
-   layout->font.font = NULL;
-   layout->color.r = 255;
-   layout->color.g = 255;
-   layout->color.b = 255;
-   layout->color.a = 255;
-   layout->underline_color = layout->color;
-   layout->double_underline_color = layout->color;
-   layout->outline_color = layout->color;
-   layout->shadow_color = layout->color;
-   layout->glow_color = layout->color;
-   layout->outer_glow_color = layout->color;
-   layout->backing_color = layout->color;
-   layout->strikethrough_color = layout->color;
-   layout->line.inset = 0;
-   layout->line.x = 0;
-   layout->line.y = 0;
-   layout->line.ascent = 0;
-   layout->line.descent = 0;
-   layout->line.mascent = 0;
-   layout->line.mdescent = 0;
-   layout->line.advance = 0;
-   layout->align = 0.0;
-   layout->valign = -1.0;
-   layout->margin.l = 0;
-   layout->margin.lf = -1.0;
-   layout->margin.r = 0;
-   layout->margin.rf = -1.0;
-   layout->style = STYLE_PLAIN;
-   layout->word_wrap = 0;
-   layout->underline = 0;
-   layout->second_underline = 0;
-   layout->strikethrough = 0;
-   layout->backing = 0;
-}
-
-static char *
-evas_object_textblock_format_merge(char *ofmt, char *fmt)
-{
-   if ((!ofmt) && (!fmt))
-     return strdup("");
-   else if (!ofmt)
-     return strdup(fmt);
-   else if (!fmt)
-     return strdup(ofmt);
-   else
-     {
-	char *ret;
-
-	ret = malloc((strlen(ofmt) + strlen(fmt) + 2) * sizeof(char));
-	strcpy(ret, ofmt);
-	strcat(ret, " ");
-	strcat(ret, fmt);
-	return ret;
-     }
-}
-
-static void
-evas_object_textblock_command_init(Layout_Command *command)
-{
-   command->commands = NULL;
-}
-
-static void
-evas_object_textblock_command_clear(Layout_Command *command)
-{
-   while (command->commands)
-     {
-	Command *cmd;
-
-	cmd = (Command *)command->commands;
-	command->commands = evas_object_list_remove(command->commands, cmd);
-	free(cmd);
-     }
-}
-
-static int
-evas_object_textblock_hex_string_get(char ch)
-{
-   if ((ch >= '0') && (ch <= '9')) return (ch - '0');
-   else if ((ch >= 'A') && (ch <= 'F')) return (ch - 'A' + 10);
-   else if ((ch >= 'a') && (ch <= 'f')) return (ch - 'a' + 10);
-   return 0;
-}
-
-static void
-evas_object_textblock_layout_format_apply(Layout *layout, Layout_Command *command, char *key, char *data)
-{
-   if (!strcmp(key, "font"))
-     {
-	if (layout->font.name) free(layout->font.name);
-	layout->font.name = strdup(data);
-     }
-   else if (!strcmp(key, "source"))
-     {
-	if (layout->font.source)
-	  {
-	     free(layout->font.source);
-	     layout->font.source = NULL;
-	  }
-	if (!((data[0] == 0) ||
-	      (!strcmp(data, "0")) ||
-	      (!strcmp(data, "NULL")) ||
-	      (!strcmp(data, "null")) ||
-	      (!strcmp(data, "(null)"))))
-	  layout->font.source = strdup(data);
-     }
-   else if (!strcmp(key, "size"))
-     {
-	layout->font.size = atoi(data);
-     }
-   else if (!strcmp(key, "align"))
-     {
-	if (!strcmp(data, "left")) layout->align = 0.0;
-	else if (!strcmp(data, "middle")) layout->align = 0.5;
-	else if (!strcmp(data, "center")) layout->align = 0.5;
-	else if (!strcmp(data, "right")) layout->align = 1.0;
-	else
-	  {
-	     layout->align = atof(data);
-	     if (layout->align < 0.0) layout->align = 0.0;
-	     else if (layout->align > 1.0) layout->align = 1.0;
-	  }
-     }
-   else if (!strcmp(key, "valign"))
-     {
-	if (!strcmp(data, "top")) layout->valign = 0.0;
-	else if (!strcmp(data, "middle")) layout->valign = 0.5;
-	else if (!strcmp(data, "center")) layout->valign = 0.5;
-	else if (!strcmp(data, "bottom")) layout->valign = 1.0;
-	else if (!strcmp(data, "baseline")) layout->valign = -1.0;
-	else if (!strcmp(data, "base")) layout->valign = -1.0;
-	else
-	  {
-	     layout->valign = atof(data);
-	     if (layout->valign < 0.0) layout->valign = 0.0;
-	     else if (layout->valign > 1.0) layout->valign = 1.0;
-	  }
-     }
-   else if ((!strcmp(key, "color")) ||
-	    (!strcmp(key, "underline_color")) ||
-	    (!strcmp(key, "double_underline_color")) ||
-	    (!strcmp(key, "outline_color")) ||
-	    (!strcmp(key, "shadow_color")) ||
-	    (!strcmp(key, "glow_color")) ||
-	    (!strcmp(key, "outer_glow_color")) ||
-	    (!strcmp(key, "backing_color")) ||
-	    (!strcmp(key, "strikethrough_color")))
-     {
-	/* #RRGGBB[AA] or #RGB[A] */
-	if (data[0] == '#')
-	  {
-	     int r, g, b, a;
-
-	     r = g = b = a = 0;
-
-	     if (strlen(data) == 7) /* #RRGGBB */
-	       {
-		  r = (evas_object_textblock_hex_string_get(data[1]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[2]));
-		  g = (evas_object_textblock_hex_string_get(data[3]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[4]));
-		  b = (evas_object_textblock_hex_string_get(data[5]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[6]));
-		  a = 0xff;
-	       }
-	     else if (strlen(data) == 9) /* #RRGGBBAA */
-	       {
-		  r = (evas_object_textblock_hex_string_get(data[1]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[2]));
-		  g = (evas_object_textblock_hex_string_get(data[3]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[4]));
-		  b = (evas_object_textblock_hex_string_get(data[5]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[6]));
-		  a = (evas_object_textblock_hex_string_get(data[7]) << 4) |
-		    (evas_object_textblock_hex_string_get(data[8]));
-	       }
-	     else if (strlen(data) == 4) /* #RGB */
-	       {
-		  r = evas_object_textblock_hex_string_get(data[1]);
-		  r = (r << 4) | r;
-		  g = evas_object_textblock_hex_string_get(data[2]);
-		  g = (g << 4) | g;
-		  b = evas_object_textblock_hex_string_get(data[3]);
-		  b = (b << 4) | b;
-		  a = 0xff;
-	       }
-	     else if (strlen(data) == 5) /* #RGBA */
-	       {
-		  r = evas_object_textblock_hex_string_get(data[1]);
-		  r = (r << 4) | r;
-		  g = evas_object_textblock_hex_string_get(data[2]);
-		  g = (g << 4) | g;
-		  b = evas_object_textblock_hex_string_get(data[3]);
-		  b = (b << 4) | b;
-		  a = evas_object_textblock_hex_string_get(data[4]);
-		  a = (a << 4) | a;
-	       }
-	     if (!strcmp(key, "color"))
-	       {
-		  layout->color.r = r;
-		  layout->color.g = g;
-		  layout->color.b = b;
-		  layout->color.a = a;
-	       }
-	     else if (!strcmp(key, "underline_color"))
-	       {
-		  layout->underline_color.r = r;
-		  layout->underline_color.g = g;
-		  layout->underline_color.b = b;
-		  layout->underline_color.a = a;
-	       }
-	     else if (!strcmp(key, "double_underline_color"))
-	       {
-		  layout->double_underline_color.r = r;
-		  layout->double_underline_color.g = g;
-		  layout->double_underline_color.b = b;
-		  layout->double_underline_color.a = a;
-	       }
-	     else if (!strcmp(key, "outline_color"))
-	       {
-		  layout->outline_color.r = r;
-		  layout->outline_color.g = g;
-		  layout->outline_color.b = b;
-		  layout->outline_color.a = a;
-	       }
-	     else if (!strcmp(key, "shadow_color"))
-	       {
-		  layout->shadow_color.r = r;
-		  layout->shadow_color.g = g;
-		  layout->shadow_color.b = b;
-		  layout->shadow_color.a = a;
-	       }
-	     else if (!strcmp(key, "glow_color"))
-	       {
-		  layout->glow_color.r = r;
-		  layout->glow_color.g = g;
-		  layout->glow_color.b = b;
-		  layout->glow_color.a = a;
-	       }
-	     else if (!strcmp(key, "outer_glow_color"))
-	       {
-		  layout->outer_glow_color.r = r;
-		  layout->outer_glow_color.g = g;
-		  layout->outer_glow_color.b = b;
-		  layout->outer_glow_color.a = a;
-	       }
-	     else if (!strcmp(key, "backing_color"))
-	       {
-		  layout->backing_color.r = r;
-		  layout->backing_color.g = g;
-		  layout->backing_color.b = b;
-		  layout->backing_color.a = a;
-	       }
-	     else if (!strcmp(key, "strikethrough_color"))
-	       {
-		  layout->strikethrough_color.r = r;
-		  layout->strikethrough_color.g = g;
-		  layout->strikethrough_color.b = b;
-		  layout->strikethrough_color.a = a;
-	       }
-	  }
-     }
-   else if (!strcmp(key, "wrap"))
-     {
-	if (!strcmp(data, "word")) layout->word_wrap = 1;
-	else layout->word_wrap = 0;
-     }
-   else if (!strcmp(key, "underline"))
-     {
-	if (!strcmp(data, "off"))
-	  {
-	     layout->underline = 0;
-	     layout->second_underline = 0;
-	  }
-	else if ((!strcmp(data, "on")) ||
-		 (!strcmp(data, "single")))
-	  {
-	     layout->underline = 1;
-	     layout->second_underline = 0;
-	  }
-	else if (!strcmp(data, "double"))
-	  {
-	     layout->underline = 1;
-	     layout->second_underline = 1;
-	  }
-     }
-   else if (!strcmp(key, "strikethrough"))
-     {
-	if (!strcmp(data, "off"))
-	  layout->strikethrough = 0;
-	else if (!strcmp(data, "on"))
-	  layout->strikethrough = 1;
-     }
-   else if (!strcmp(key, "backing"))
-     {
-	if (!strcmp(data, "off"))
-	  layout->backing = 0;
-	else if (!strcmp(data, "on"))
-	  layout->backing = 1;
-     }
-   else if (!strcmp(key, "style"))
-     {
-	if (!strcmp(data, "off")) layout->style = STYLE_PLAIN;
-	else if (!strcmp(data, "none")) layout->style = STYLE_PLAIN;
-	else if (!strcmp(data, "plain")) layout->style = STYLE_PLAIN;
-	else if (!strcmp(data, "shadow")) layout->style = STYLE_SHADOW;
-	else if (!strcmp(data, "outline")) layout->style = STYLE_OUTLINE;
-	else if (!strcmp(data, "outline_shadow")) layout->style = STYLE_OUTLINE_SHADOW;
-	else if (!strcmp(data, "outline_soft_shadow")) layout->style = STYLE_OUTLINE_SOFT_SHADOW;
-	else if (!strcmp(data, "glow")) layout->style = STYLE_GLOW;
-	else if (!strcmp(data, "far_shadow")) layout->style = STYLE_FAR_SHADOW;
-	else if (!strcmp(data, "soft_shadow")) layout->style = STYLE_SOFT_SHADOW;
-	else if (!strcmp(data, "far_soft_shadow")) layout->style = STYLE_FAR_SOFT_SHADOW;
-	else layout->style = STYLE_PLAIN;
-     }
-   /* FIXME: finish off left and right margins */
-   else if (!strcmp(key, "left_margin"))
-     {
-	if (!strcmp(data, "off"))
-	  {
-	     layout->margin.l = 0;
-	     layout->margin.lf = -1.0;
-	  }
-	else
-	  {
-	     int len;
-
-	     len = strlen(data);
-	     if (len > 0)
-	       {
-		  char lastchar, *num = NULL;
-
-		  lastchar = data[len - 1];
-		  num = strdup(data);
-		  if (lastchar == '%')
-		    {
-		       len = strlen(num);
-		       if (len > 0) num[len - 1] = 0;
-		       layout->margin.lf = atof(num) / 100.0;
-		       if (layout->margin.lf > 1.0) layout->margin.lf = -1.0;
-		       if (layout->margin.lf < 0.0) layout->margin.lf = -1.0;
-		       layout->margin.l = 0;
-		    }
-		  else
-		    {
-		       layout->margin.l = atoi(num);
-		       if (layout->margin.l < 0) layout->margin.l = 0;
-		       layout->margin.lf = -1.0;
-		    }
-		  free(num);
-	       }
-	  }
-     }
-   else if (!strcmp(key, "right_margin"))
-     {
-	if (!strcmp(data, "off"))
-	  {
-	     layout->margin.l = 0;
-	     layout->margin.lf = -1.0;
-	  }
-	else
-	  {
-	     int len;
-
-	     len = strlen(data);
-	     if (len > 0)
-	       {
-		  char lastchar, *num = NULL;
-
-		  lastchar = data[len - 1];
-		  num = strdup(data);
-		  if (lastchar == '%')
-		    {
-		       len = strlen(num);
-		       if (len > 0) num[len - 1] = 0;
-		       layout->margin.lf = atof(num) / 100.0;
-		       if (layout->margin.rf > 1.0) layout->margin.rf = -1.0;
-		       if (layout->margin.rf < 0.0) layout->margin.rf = -1.0;
-		       layout->margin.r = 0;
-		    }
-		  else
-		    {
-		       layout->margin.r = atoi(num);
-		       if (layout->margin.r < 0) layout->margin.r = 0;
-		       layout->margin.rf = -1.0;
-		    }
-		  free(num);
-	       }
-	  }
-     }
-   else if (!strcmp(key, "left_tab_stop"))
-     {
-	int len;
-
-	len = strlen(data);
-	if (len > 0)
-	  {
-	     char firstchar, lastchar, *num = NULL;
-	     Command *cmd;
-
-	     firstchar = data[0];
-	     lastchar = data[len - 1];
-	     /* possible formats:
-	      * 88    - jump to x pos 88 from the left
-	      * 47%   - jump to x pos 47% of width from the left
-	      * +91   - add 91 to x pos
-	      * -12   - sub 12 from x pos
-	      * +16%  - add 16% of width to x pos
-	      * -25%  - sub 25% of width from x pos
-	      */
-	     if ((firstchar != '+') && (firstchar != '-'))
-	       num = strdup(data);
-	     else
-	       num = strdup(data + 1);
-	     if (lastchar == '%')
-	       {
-		  len = strlen(num);
-		  if (len > 0) num[len - 1] = 0;
-	       }
-	     cmd = calloc(1, sizeof(Command));
-	     if (firstchar == '+')
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_TABSTOP_REL_ADD;
-		       cmd->f1 = atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_TABSTOP_ABS_ADD;
-		       cmd->i1 = atoi(num);
-		    }
-	       }
-	     else if (firstchar == '-')
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_TABSTOP_REL_ADD;
-		       cmd->f1 = -atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_TABSTOP_ABS_ADD;
-		       cmd->i1 = -atoi(num);
-		    }
-	       }
-	     else
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_TABSTOP_REL;
-		       cmd->f1 = atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_TABSTOP_ABS;
-		       cmd->i1 = atoi(num);
-		    }
-	       }
-	     free(num);
-	     command->commands = evas_object_list_append(command->commands, cmd);
-	  }
-     }
-   else if (!strcmp(key, "right_tab_stop"))
-     {
-	int len;
-
-	len = strlen(data);
-	if (len > 0)
-	  {
-	     char firstchar, lastchar, *num = NULL;
-	     Command *cmd;
-
-	     firstchar = data[0];
-	     lastchar = data[len - 1];
-	     /* possible formats:
-	      * 88    - jump to x pos 88 from the left
-	      * 47%   - jump to x pos 47% of width from the left
-	      * +91   - add 91 to x pos
-	      * -12   - sub 12 from x pos
-	      * +16%  - add 16% of width to x pos
-	      * -25%  - sub 25% of width from x pos
-	      */
-	     if ((firstchar != '+') && (firstchar != '-'))
-	       num = strdup(data);
-	     else
-	       num = strdup(data + 1);
-	     if (lastchar == '%')
-	       {
-		  len = strlen(num);
-		  if (len > 0) num[len - 1] = 0;
-	       }
-	     cmd = calloc(1, sizeof(Command));
-	     if (firstchar == '+')
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_REL_ADD;
-		       cmd->f1 = atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_ABS_ADD;
-		       cmd->i1 = atoi(num);
-		    }
-	       }
-	     else if (firstchar == '-')
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_REL_ADD;
-		       cmd->f1 = -atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_ABS_ADD;
-		       cmd->i1 = -atoi(num);
-		    }
-	       }
-	     else
-	       {
-		  if (lastchar == '%')
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_REL;
-		       cmd->f1 = atof(num);
-		    }
-		  else
-		    {
-		       cmd->cmd = CMD_RIGHTTABSTOP_ABS;
-		       cmd->i1 = atoi(num);
-		    }
-	       }
-	     free(num);
-	     command->commands = evas_object_list_append(command->commands, cmd);
-	  }
-     }
-}
-
-static Evas_List *
-evas_object_textblock_format_parse(const char *format)
-{
-   const char *p, *k1 = NULL, *k2 = NULL, *d1 = NULL, *d2 = NULL;
-   int inquote = 0, inescape = 0;
-   Evas_List *params = NULL;
-
-   if (!format) return NULL;
-   p = format - 1;
-   do
-     {
-	p++;
-	/* we dont have the start of a key yet */
-	if (!k1)
-	  {
-	     if (isalnum(*p)) k1 = p;
-	  }
-	else if (!k2)
-	  {
-	     if (*p == '=') k2 = p;
-	  }
-	else if (!d1)
-	  {
-	     if (*p == '\'') inquote = 1;
-	     else d1 = p;
-	  }
-	else if (!d2)
-	  {
-	     if (inquote)
-	       {
-		  if (!inescape)
-		    {
-		       if (*p == '\\') inescape = 1;
-		       else if (*p == '\'') d2 = p;
-		    }
-		  else
-		    inescape = 0;
-	       }
-	     else
-	       {
-		  if ((isblank(*p)) || (*p == 0)) d2 = p;
-	       }
-	     if (d2)
-	       {
-		  char *key, *data;
-
-		  key = malloc(k2 - k1 + 1);
-		  data = malloc(d2 - d1 + 1);
-		  strncpy(key, k1, k2 - k1);
-		  key[k2 - k1] = 0;
-		  if (inquote)
-		    {
-		       const char *p2;
-		       char *dst;
-
-		       inescape = 0;
-		       p2 = d1;
-		       dst = data;
-		       while (p2 != d2)
-			 {
-			    inescape = 0;
-			    *dst = *p2;
-			    if (*p2 == '\\') inescape = 1;
-			    p2++;
-			    if (inescape && *p2 == '\'')
-			      {
-				 *dst = *p2;
-				 p2++;
-			      }
-			    dst++;
-			 }
-		       *dst = 0;
-		    }
-		  else
-		    {
-		       strncpy(data, d1, d2 - d1);
-		       data[d2 - d1] = 0;
-		    }
-		  k1 = k2 = d1 = d2 = NULL;
-		  inquote = 0;
-		  inescape = 0;
-		  params = evas_list_append(params, key);
-		  params = evas_list_append(params, data);
-	       }
-	  }
-     }
-   while (*p);
-   return params;
-}
-
-static void
-evas_object_textblock_layout_format_modify(Layout *layout, Layout_Command *command, const char *format)
-{
-   Evas_List *params;
-
-   params = evas_object_textblock_format_parse(format);
-   while (params)
-     {
-	char *key;
-	char *data;
-
-	key = params->data;
-	params = evas_list_remove_list(params, params);
-	data = params->data;
-	params = evas_list_remove_list(params, params);
-	evas_object_textblock_layout_format_apply(layout, command, key, data);
-	free(key);
-	free(data);
-     }
-}
-
-static void
-evas_object_textblock_layout_copy(Layout *layout, Layout *layout_dst)
-{
-   *layout_dst = *layout;
-   if (layout->font.name) layout_dst->font.name = strdup(layout->font.name);
-   if (layout->font.source) layout_dst->font.source = strdup(layout->font.source);
-}
-
-static void
-evas_object_textblock_layout_clear(Evas_Object *obj, Layout *layout)
-{
-   if (layout->font.name) free(layout->font.name);
-   if (layout->font.source) free(layout->font.source);
-   if (layout->font.font) evas_font_free(obj->layer->evas, layout->font.font);
-   memset(layout, 0, sizeof(Layout));
-}
-
-static void
-evas_object_textblock_layout_fonts_hold(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_List *l;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode;
-
-	lnode = (Layout_Node *)l;
-	if (lnode->layout.font.font)
-	  {
-	     o->font_hold = evas_list_append(o->font_hold,
-					     lnode->layout.font.font);
-	     lnode->layout.font.font = NULL;
-	  }
-     }
-}
-
-static void
-evas_object_textblock_layout_fonts_hold_clean(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-
-   while (o->font_hold)
-     {
-	evas_font_free(obj->layer->evas, o->font_hold->data);
-	o->font_hold = evas_list_remove_list(o->font_hold, o->font_hold);
-     }
-}
-
-static void
-evas_object_textblock_layout_nodes_free(Evas_Object *obj, Layout_Node *lnodes)
-{
-   while (lnodes)
-     {
-	Layout_Node *lnode;
-
-	lnode = (Layout_Node *)lnodes;
-	lnodes = evas_object_list_remove(lnodes, lnode);
-	evas_object_textblock_layout_clear(obj, &lnode->layout);
-	if (lnode->text) free(lnode->text);
-	free(lnode);
-     }
-}
-
-static void
-evas_object_textblock_layout_clean(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   evas_object_textblock_layout_nodes_free(obj, o->layout_nodes);
-   o->layout_nodes = NULL;
-}
-
-static void
-evas_object_textblock_contents_clean(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   while (o->nodes)
-     {
-	Node *node;
-
-	node = (Node *)o->nodes;
-	o->nodes = evas_object_list_remove(o->nodes, node);
-	if (node->format) free(node->format);
-	if (node->text) free(node->text);
-	free(node);
-     }
-}
-
-static int
-evas_object_textblock_char_is_white(int c)
-{
-   /*
-    * unicode list of whitespace chars
-    *
-    * 0009..000D <control-0009>..<control-000D>
-    * 0020 SPACE
-    * 0085 <control-0085>
-    * 00A0 NO-BREAK SPACE
-    * 1680 OGHAM SPACE MARK
-    * 180E MONGOLIAN VOWEL SEPARATOR
-    * 2000..200A EN QUAD..HAIR SPACE
-    * 2028 LINE SEPARATOR
-    * 2029 PARAGRAPH SEPARATOR
-    * 202F NARROW NO-BREAK SPACE
-    * 205F MEDIUM MATHEMATICAL SPACE
-    * 3000 IDEOGRAPHIC SPACE
-    */
-   if (
-       (c == 0x20) ||
-       ((c >= 0x9) && (c <= 0xd)) ||
-       (c == 0x85) ||
-       (c == 0xa0) ||
-       (c == 0x1680) ||
-       (c == 0x180e) ||
-       ((c >= 0x2000) && (c <= 0x200a)) ||
-       (c == 0x2028) ||
-       (c == 0x2029) ||
-       (c == 0x202f) ||
-       (c == 0x205f) ||
-       (c == 0x3000)
-       )
-     return 1;
-   return 0;
-}
-
-static Layout_Node *
-evas_object_textblock_layout_internal(Evas_Object *obj, int w, int h, int *format_w, int *format_h, int *line_count)
-{
-   Evas_Object_Textblock *o;
-   Layout layout;
-   Layout_Command command;
-   Node *node = NULL;
-   Layout_Node *lnode = NULL;
-   Evas_Object_List *l, *ll, *layout_nodes = NULL;
-   Layout_Node *line_start = NULL;
-   int text_pos = 0, fw = 0, fh = 0, last_mdescent = 0, line = 0, last_line = 0;
-   int last_line_underline = 0, last_line_double_underline = 0;
-   int pad_l = 0, pad_r = 0, pad_t = 0, pad_b = 0;
-   int marginl = 0, marginr = 0;
-   int ww, hh;
-   int just_wrapped = 0;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   ww = w;
-   hh = h;
-   evas_object_textblock_layout_init(&layout);
-   evas_object_textblock_command_init(&command);
-   for (l = (Evas_Object_List *)o->nodes; l; l = l->next)
-     {
-	node = (Node *)l;
-	if (node->format)
-	  {
-	     evas_object_textblock_layout_format_modify(&layout, &command, node->format);
-	     evas_object_textblock_command_clear(&command);
-	     if (layout.style == STYLE_SHADOW)
-	       {
-		  if (pad_r < 1) pad_r = 1;
-		  if (pad_b < 1) pad_b = 1;
-	       }
-	     else if (layout.style == STYLE_OUTLINE)
-	       {
-		  if (pad_l < 1) pad_l = 1;
-		  if (pad_r < 1) pad_r = 1;
-		  if (pad_t < 1) pad_t = 1;
-		  if (pad_b < 1) pad_b = 1;
-	       }
-	     else if (layout.style == STYLE_GLOW)
-	       {
-		  if (pad_l < 2) pad_l = 2;
-		  if (pad_r < 2) pad_r = 2;
-		  if (pad_t < 2) pad_t = 2;
-		  if (pad_b < 2) pad_b = 2;
-	       }
-	     else if (layout.style == STYLE_OUTLINE_SHADOW)
-	       {
-		  if (pad_l < 1) pad_l = 1;
-		  if (pad_r < 2) pad_r = 2;
-		  if (pad_t < 1) pad_t = 1;
-		  if (pad_b < 2) pad_b = 2;
-	       }
-	     else if (layout.style == STYLE_FAR_SHADOW)
-	       {
-		  if (pad_r < 2) pad_r = 2;
-		  if (pad_b < 2) pad_b = 2;
-	       }
-	     else if (layout.style == STYLE_OUTLINE_SOFT_SHADOW)
-	       {
-		  if (pad_l < 1) pad_l = 1;
-		  if (pad_r < 4) pad_r = 4;
-		  if (pad_t < 1) pad_t = 1;
-		  if (pad_b < 4) pad_b = 4;
-	       }
-	     else if (layout.style == STYLE_SOFT_SHADOW)
-	       {
-		  if (pad_l < 1) pad_l = 1;
-		  if (pad_r < 3) pad_r = 3;
-		  if (pad_t < 1) pad_t = 1;
-		  if (pad_b < 3) pad_b = 3;
-	       }
-	     else if (layout.style == STYLE_FAR_SOFT_SHADOW)
-	       {
-		  if (pad_r < 4) pad_r = 4;
-		  if (pad_b < 4) pad_b = 4;
-	       }
-	  }
-     }
-   ww -= pad_r;
-   hh -= pad_b;
-   evas_object_textblock_layout_clear(obj, &layout);
-   evas_object_textblock_layout_init(&layout);
-   layout.line.y = pad_t;
-   layout.line.x = pad_l;
-   /* format width is object width */
-//   printf("RE-LAYOUT %ix%i!\n", w, h);
-   for (l = (Evas_Object_List *)o->nodes; l; l = l->next)
-     {
-	/* FIXME: we cant do this - we need to be able to qury text
-	 * overflow amounts */
-	/*
-	if (layout.line.y >= h) goto breakout;
-	 */
-	lnode = NULL;
-	node = (Node *)l;
-//	printf("NODE: FMT:\"%s\" TXT:\"%s\"\n", node->format, node->text);
-	if (node->format)
-	  {
-	     /* first handle newline, tab etc. etc */
-	     if (node->format[0] == '\n')
-	       {
-		  newline:
-		  if (layout_nodes)
-		    lnode = (Layout_Node *)((Evas_Object_List *)layout_nodes)->last;
-		  if (lnode)
-		    lnode->line_end = 1;
-		  layout.line.x = pad_l;
-		  if (layout.line.mascent + layout.line.mdescent <= 0)
-		    {
-		       int ascent = 0, descent = 0;
-
-		       if (layout.font.name)
-			 layout.font.font = evas_font_load(obj->layer->evas, layout.font.name, layout.font.source, layout.font.size);
-		       if (layout.font.font) ascent = ENFN->font_max_ascent_get(ENDT, layout.font.font);
-		       if (layout.font.font) descent = ENFN->font_max_descent_get(ENDT, layout.font.font);
-		       layout.line.ascent = ascent;
-		       layout.line.descent = descent;
-		       if (layout.line.mascent < layout.line.ascent)
-			 layout.line.mascent = layout.line.ascent;
-		       if (layout.line.mdescent < layout.line.descent)
-			 layout.line.mdescent = layout.line.descent;
-		       if (layout.font.font)
-			 evas_font_free(obj->layer->evas, layout.font.font);
-		       layout.font.font = NULL;
-		    }
-		  if ((layout.line.y + layout.line.mascent + layout.line.mdescent) > hh)
-		    {
-		       /* FIXME: this node would overflow to the next textblock */
-		    }
-		  last_line_underline = 0;
-		  last_line_double_underline = 0;
-		  line++;
-		  layout.line.y += layout.line.mascent + layout.line.mdescent;
-		  layout.line.mascent = 0;
-		  layout.line.mdescent = 0;
-		  fh = layout.line.y;
-		  last_mdescent = 3;
-		  line_start = NULL;
-	       }
-	     else if (node->format[0] == '\t')
-	       {
-		  int hadvance = 0, inset = 0;
-
-		  lnode = calloc(1, sizeof(Layout_Node));
-		  lnode->source_node = node;
-		  lnode->line = line;
-		  lnode->text_pos = text_pos;
-		  last_line = line;
-		  evas_object_textblock_layout_copy(&layout, &(lnode->layout));
-		  layout.font.font = NULL;
-		  if (layout.font.name)
-		    layout.font.font = evas_font_load(obj->layer->evas, layout.font.name, layout.font.source, layout.font.size);
-		  if ((layout.line.x == pad_l) || (!line_start))
-		    {
-		       if (layout.font.font) inset = ENFN->font_inset_get(ENDT, layout.font.font, "        ");
-		       layout.line.inset = inset;
-		       layout.line.x = marginl + pad_l - inset + (layout.line.x - pad_l);
-		       lnode->layout.line.x += marginl;
-		       layout.line.mascent = 0;
-		       layout.line.mdescent = 0;
-		       line_start = lnode;
-		       lnode->line_start = 1;
-		    }
-		    {
-		       int ascent = 0, descent = 0;
-		       if (layout.font.font) ascent = ENFN->font_max_ascent_get(ENDT, layout.font.font);
-		       if (layout.font.font) descent = ENFN->font_max_descent_get(ENDT, layout.font.font);
-		       layout.line.ascent = lnode->layout.line.ascent = ascent;
-		       layout.line.descent = lnode->layout.line.descent = descent;
-		       if (layout.line.mascent < layout.line.ascent)
-			 layout.line.mascent = layout.line.ascent;
-		       if (layout.line.mdescent < layout.line.descent)
-			 layout.line.mdescent = layout.line.descent;
-		    }
-		  if (layout.font.font) hadvance = ENFN->font_h_advance_get(ENDT, layout.font.font, "        ");
-		  lnode->w = hadvance;
-		  lnode->h = layout.line.ascent + layout.line.descent;
-		  lnode->spacer = 1;
-		  layout_nodes = evas_object_list_append(layout_nodes, lnode);
-		  if ((layout.line.x + hadvance) > fw)
-		    fw = layout.line.x + hadvance;
-		  layout.line.x += hadvance;
-		  lnode->layout.line.advance = hadvance;
-		  if (w > 0)
-		    {
-		       if (layout.line.x >= (ww - marginr)) goto newline;
-		    }
-	       }
-	     else
-	       {
-		  evas_object_textblock_layout_format_modify(&layout, &command, node->format);
-		  if (layout.margin.lf < 0.0)
-		    marginl = layout.margin.l;
-		  else
-		    marginl = (ww - pad_l) * layout.margin.lf;
-		  if (layout.margin.rf < 0.0)
-		    marginr = layout.margin.r;
-		  else
-		    marginr = (ww - pad_l) * layout.margin.rf;
-		  if (command.commands)
-		    {
-		       Evas_Object_List *l2;
-
-		       for (l2 = command.commands; l2; l2 = l2->next)
-			 {
-			    Command *cmd;
-
-			    cmd = (Command *)l2;
-			    switch (cmd->cmd)
-			      {
-			       case CMD_TABSTOP_REL:
-				 layout.line.x = (pad_l + marginl) + (cmd->f1 * ((ww - marginr) - (pad_l + marginl)) / 100.0);
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_TABSTOP_ABS:
-				 layout.line.x = pad_l + cmd->i1;
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_TABSTOP_REL_ADD:
-				 layout.line.x += (cmd->f1 * ((ww - marginr) - (pad_l + marginl)) / 100.0);
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_TABSTOP_ABS_ADD:
-				 layout.line.x += cmd->i1;
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_RIGHTTABSTOP_REL:
-				 layout.line.x = w - pad_r + (cmd->f1 * ((ww - marginr) - (pad_l + marginl)) / 100.0);
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_RIGHTTABSTOP_ABS:
-				 layout.line.x = w - pad_r - cmd->i1;
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_RIGHTTABSTOP_REL_ADD:
-				 layout.line.x -= (cmd->f1 * ((ww - marginr) - (pad_l + marginl)) / 100.0);
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       case CMD_RIGHTTABSTOP_ABS_ADD:
-				 layout.line.x -= cmd->i1;
-				 if (layout.line.x < (pad_l + marginl))
-				   layout.line.x = (pad_l + marginl);
-				 if (w > 0)
-				   {
-				      if (layout.line.x >= (ww - marginr)) goto newline;
-				   }
-				 break;
-			       default:
-				 break;
-			      }
-			 }
-		    }
-		  evas_object_textblock_command_clear(&command);
-		  if (layout.underline) last_line_underline = 1;
-		  if (layout.second_underline) last_line_double_underline = 1;
-	       }
-	  }
-	else if (node->text)
-	  {
-	     int inset = 0, hadvance = 0;
-	     int ascent = 0, descent = 0, tw = 0, th = 0;
-	     int chrpos = -1, nchrpos = -1, cx, cy, cw, ch;
-	     void *font = NULL;
-	     char *text;
-	     int adj;
-	     int srcpos = 0;
-
-	     text = strdup(node->text);
-	     new_node:
-	     if (just_wrapped)
-	       {
-		  int pos, chr;
-
-		  pos = 0;
-		  chr = evas_common_font_utf8_get_next(text, &pos);
-		  if (evas_object_textblock_char_is_white(chr))
-		    strcpy(text, text + pos);
-	       }
-	     just_wrapped = 0;
-	     /* FIXME: we cant do this - we need to be able to qury text
-	      * overflow amounts */
-	     /*
-	     if (layout.line.y >= hh)
-	       {
-		  free(text);
-		  goto breakout;
-	       }
-	      */
-	     lnode = calloc(1, sizeof(Layout_Node));
-	     lnode->source_node = node;
-	     lnode->source_pos = srcpos;
-	     lnode->line = line;
-	     last_line = line;
-	     evas_object_textblock_layout_copy(&layout, &(lnode->layout));
-	     if (lnode->layout.font.name)
-	       font = evas_font_load(obj->layer->evas, lnode->layout.font.name, lnode->layout.font.source, lnode->layout.font.size);
-	     /* if this is at the start of the line... */
-	     if ((layout.line.x == pad_l) || (!line_start))
-	       {
-		  if (font) inset = ENFN->font_inset_get(ENDT, font, text);
-		  layout.line.inset = inset;
-		  layout.line.x = marginl + pad_l - inset + (layout.line.x - pad_l);
-		  lnode->layout.line.x += marginl;
-		  layout.line.mascent = 0;
-		  layout.line.mdescent = 0;
-		  line_start = lnode;
-		  lnode->line_start = 1;
-	       }
-	     lnode->layout.font.font = font;
-	     if (font) ascent = ENFN->font_max_ascent_get(ENDT, font);
-	     if (font) descent = ENFN->font_max_descent_get(ENDT, font);
-	     lnode->layout.line.ascent = ascent;
-	     lnode->layout.line.descent = descent;
-	     layout.line.ascent = ascent;
-	     layout.line.descent = descent;
-	     if (layout.line.mascent < ascent) layout.line.mascent = ascent;
-	     if (layout.line.mdescent < descent) layout.line.mdescent = descent;
-	     if (w > 0)
-	       {
-		  if (font) chrpos = ENFN->font_char_at_coords_get(ENDT, font, text,
-								   (ww - marginr) - layout.line.x, 0,
-								   &cx, &cy, &cw, &ch);
-	       }
-	     else
-	       chrpos = -1;
-	     /* if the text fits... just add */
-	     if (chrpos < 0)
-	       {
-		  int more_text_on_line = 0;
-		  if (font) ENFN->font_string_size_get(ENDT, font, text, &tw, &th);
-		  lnode->w = tw;
-		  lnode->h = th;
-		  lnode->text = text;
-		  lnode->text_len = strlen(lnode->text);
-		  lnode->text_pos = text_pos;
-		  text_pos += lnode->text_len;
-		  if (font) hadvance = ENFN->font_h_advance_get(ENDT, font, text);
-		  layout_nodes = evas_object_list_append(layout_nodes, lnode);
-		  /* and advance */
-		  /* fix up max ascent/descent for the line */
-		  adj = (double)((ww - marginr) -
-				 (lnode->layout.line.x -
-				  (pad_l + marginl) + tw +
-				  layout.line.inset)) * layout.align;
-		  if ((layout.line.x + hadvance) > fw)
-		    fw = layout.line.x + hadvance;
-		  else if ((layout.line.x + tw) > fw)
-		    fw = layout.line.x + tw;
-		  layout.line.x += hadvance;
-		  lnode->layout.line.advance = hadvance;
-		  for (ll = l->next; ll; ll = ll->next)
-		    {
-		       Node *node2;
-
-		       node2 = (Node *)ll;
-		       if (node2->text)
-			 {
-			    more_text_on_line = 1;
-			    break;
-			 }
-		       else if ((node2->format) && (node2->format[0] == '\n'))
-			 {
-			    more_text_on_line = 0;
-			    break;
-			 }
-		    }
-		  if (!more_text_on_line)
-		    {
-		       for (ll = (Evas_Object_List *)lnode; ll; ll = ll->prev)
-			 {
-			    Layout_Node *lnode2;
-
-			    lnode2 = (Layout_Node *)ll;
-			    lnode2->layout.line.x += adj;
-			    lnode2->layout.line.mascent = layout.line.mascent;
-			    lnode2->layout.line.mdescent = layout.line.mdescent;
-			    if (ll == (Evas_Object_List *)line_start) break;
-			 }
-		       lnode->line_end = 1;
-		       fh = layout.line.y + layout.line.mascent + layout.line.mdescent;
-		       if ((lnode->layout.line.x + lnode->layout.line.advance) > fw)
-			 fw = lnode->layout.line.x + lnode->layout.line.advance;
-		       else if ((lnode->layout.line.x + lnode->w) > fw)
-			 fw = lnode->layout.line.x + lnode->w;
-		    }
-	       }
-	     /* text doesnt fit */
-	     else
-	       {
-		  nchrpos = chrpos;
-		  /* handle word wrap */
-		  if (layout.word_wrap)
-		    {
-		       int ppos, pos, chr;
-
-		       if (chrpos == 0)
-			 {
-			    pos = chrpos;
-			    nchrpos = pos;
-			 }
-		       else
-			 {
-			    pos = chrpos;
-			    chr = evas_common_font_utf8_get_prev(text, &pos);
-			    ppos = pos = chrpos;
-			    while ((!evas_object_textblock_char_is_white(chr))
-				   &&
-				   (pos >= 0) &&
-				   (chr > 0))
-			      {
-				 ppos = pos;
-				 chr = evas_common_font_utf8_get_prev(text, &pos);
-			      }
-			    if ((ppos == 0) &&
-				(!evas_object_textblock_char_is_white(chr)))
-			      {
-				 chrpos = 0;
-				 nchrpos = 0;
-			      }
-			    else
-			      {
-				 if (ppos == 0)
-				   {
-				      nchrpos = 0;
-				      chrpos--;
-				   }
-				 else
-				   {
-				      chr = evas_common_font_utf8_get_next(text, &ppos);
-				      if (ppos < 0) ppos = 0;
-				      chrpos = ppos;
-				      while
-					((evas_object_textblock_char_is_white(chr))
-					 &&
-					 (pos >= 0) &&
-					 (chr > 0))
-					{
-					   ppos = pos;
-					   chr = evas_common_font_utf8_get_prev(text, &pos);
-					}
-				      chr = evas_common_font_utf8_get_next(text, &ppos);
-				      if (ppos < 0) ppos = 0;
-				      nchrpos = ppos;
-				   }
-			      }
-			 }
-		    }
-		  just_wrapped = 1;
-		  /* if the first char in the line can't fit!!! */
-		  if ((chrpos == 0) && (lnode == line_start))
-		    {
-		       /* the first char can't fit. put it in there anyway */
-		       /* FIXME */
-		       free(text);
-		       if (lnode->text) free(lnode->text);
-		       evas_object_textblock_layout_clear(obj, &(lnode->layout));
-		       free(lnode);
-		    }
-		  /* its not the first char on the line... but its the */
-		  /* first char of a node, so defer this node until the next */
-		  /* loop */
-		  else if (chrpos == 0)
-		    {
-		       if (lnode->text) free(lnode->text);
-		       evas_object_textblock_layout_clear(obj, &(lnode->layout));
-		       free(lnode);
-		       lnode = NULL;
-		       if (layout_nodes)
-			 lnode = (Layout_Node *)((Evas_Object_List *)layout_nodes)->last;
-		       if (lnode)
-			 {
-			    adj = (double)((ww - marginr) -
-					   (layout.line.x -
-					    (pad_l + marginl) + tw +
-					    layout.line.inset)) * layout.align;
-			    for (ll = (Evas_Object_List *)lnode; ll; ll = ll->prev)
-			      {
-				 Layout_Node *lnode2;
-
-				 lnode2 = (Layout_Node *)ll;
-				 lnode2->layout.line.x += adj;
-				 lnode2->layout.line.mascent = layout.line.mascent;
-				 lnode2->layout.line.mdescent = layout.line.mdescent;
-				 if (ll == (Evas_Object_List *)line_start) break;
-			      }
-			    lnode->line_end = 1;
-			    layout.line.inset = 0;
-			    layout.line.x = pad_l;
-			    if ((layout.line.y + layout.line.mascent + layout.line.mdescent) > hh)
-			      {
-				 /* FIXME: this node would overflow to the next textblock */
-			      }
-			    if ((lnode->layout.line.x + lnode->layout.line.advance) > fw)
-			      fw = lnode->layout.line.x + lnode->layout.line.advance;
-			    else if ((lnode->layout.line.x + lnode->w) > fw)
-			      fw = lnode->layout.line.x + lnode->w;
-			    last_line_underline = 0;
-			    last_line_double_underline = 0;
-			    line++;
-			    layout.line.y += layout.line.mascent + layout.line.mdescent;
-			    layout.line.mascent = 0;
-			    layout.line.mdescent = 0;
-			    fh = layout.line.y;
-			    line_start = NULL;
-			    goto new_node;
-			 }
-		    }
-		  else
-		    {
-		       char *text1, *text2;
-
-		       /* byte chrpos is over... so cut there */
-		       text1 = malloc(nchrpos + 1);
-		       strncpy(text1, text, nchrpos);
-		       text1[nchrpos] = 0;
-		       text2 = strdup(text + chrpos);
-		       lnode->text = text1;
-		       lnode->text_len = strlen(lnode->text);
-		       lnode->text_pos = text_pos;
-		       text_pos += chrpos;
-		       free(text);
-		       srcpos += chrpos;
-		       text = text1;
-		       if (font) ENFN->font_string_size_get(ENDT, font, text, &tw, &th);
-		       if (font) hadvance = ENFN->font_h_advance_get(ENDT, font, text);
-		       lnode->w = tw;
-		       lnode->h = th;
-		       lnode->layout.line.advance = hadvance;
-		       layout_nodes = evas_object_list_append(layout_nodes, lnode);
-		       adj = (double)((ww - marginr) -
-				      (lnode->layout.line.x -
-				       (pad_l + marginl) + tw +
-				       layout.line.inset)) * layout.align;
-		       for (ll = (Evas_Object_List *)lnode; ll; ll = ll->prev)
-			 {
-			    Layout_Node *lnode2;
-
-			    lnode2 = (Layout_Node *)ll;
-			    lnode2->layout.line.x += adj;
-			    lnode2->layout.line.mascent = layout.line.mascent;
-			    lnode2->layout.line.mdescent = layout.line.mdescent;
-			    if (ll == (Evas_Object_List *)line_start) break;
-			 }
-		       lnode->line_end = 1;
-		       layout.line.inset = 0;
-		       layout.line.x = pad_l;
-		       if ((layout.line.y + layout.line.mascent + layout.line.mdescent) > hh)
-			 {
-			    /* FIXME: this node would overflow to the next textblock */
-			 }
-		       if ((lnode->layout.line.x + lnode->layout.line.advance) > fw)
-			 fw = lnode->layout.line.x + lnode->layout.line.advance;
-		       else if ((lnode->layout.line.x + lnode->w) > fw)
-			 fw = lnode->layout.line.x + lnode->w;
-		       last_line_underline = 0;
-		       last_line_double_underline = 0;
-		       line++;
-		       layout.line.y += layout.line.mascent + layout.line.mdescent;
-		       fh = layout.line.y;
-		       line_start = NULL;
-		       text = text2;
-		       /* still more text to go */
-		       if ((layout.line.mascent + layout.line.mdescent) > 0)
-			 {
-			    layout.line.mascent = 0;
-			    layout.line.mdescent = 0;
-			    goto new_node;
-			 }
-		       else
-			 free(text);
-		       layout.line.mascent = 0;
-		       layout.line.mdescent = 0;
-		    }
-	       }
-	  }
-     }
-   /*breakout:*/
-   if (!layout_nodes)
-     {
-        void *font = NULL;
-	int ascent = 0, descent = 0;
-
-	lnode = calloc(1, sizeof(Layout_Node));
-	lnode->source_node = node;
-	lnode->line = line;
-	lnode->text_pos = text_pos;
-	last_line = line;
-	evas_object_textblock_layout_copy(&layout, &(lnode->layout));
-	if (layout.font.name)
-	  layout.font.font = evas_font_load(obj->layer->evas, layout.font.name, layout.font.source, layout.font.size);
-	if (layout.font.font) ascent = ENFN->font_max_ascent_get(ENDT, layout.font.font);
-	if (layout.font.font) descent = ENFN->font_max_descent_get(ENDT, layout.font.font);
-	fh = layout.line.y + ascent + descent;
-	layout_nodes = evas_object_list_append(layout_nodes, lnode);
-     }
-   evas_object_textblock_layout_clear(obj, &layout);
-   *line_count = last_line + 1;
-   fw += pad_r;
-   if (w > 0) *format_w = w;
-   else *format_w = fw;
-   if (last_line_double_underline)
-     {
-	if (last_mdescent < 3) fh += 3 - last_mdescent;
-     }
-   else if (last_line_underline)
-     {
-	if (last_mdescent < 1) fh += 1 - last_mdescent;
-     }
-   fh += pad_b;
-   *format_h = fh;
-   return (Layout_Node *)layout_nodes;
-}
-
-static void
-evas_object_textblock_layout(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   int w, h, fw = 0, fh = 0, lines = 0;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   w = obj->cur.geometry.w;
-   h = obj->cur.geometry.h;
-   o->last_w = w;
-   o->last_h = h;
-   o->layout_nodes = evas_object_textblock_layout_internal(obj, w, h, &fw, &fh, &lines);
-   o->format.w = fw;
-   o->format.h = fh;
-   o->lines = lines;
-   o->format.dirty = 0;
-}
-
-static void
-evas_object_textblock_format_calc(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   evas_object_textblock_layout_fonts_hold(obj);
-   evas_object_textblock_layout_clean(obj);
-   evas_object_textblock_layout(obj);
-   evas_object_textblock_layout_fonts_hold_clean(obj);
-}
-
-static void
-evas_object_textblock_native_calc(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   int fw = 0, fh = 0, lines = 0;
-   Layout_Node *lnodes;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   lnodes =  evas_object_textblock_layout_internal(obj, 0, 0, &fw, &fh, &lines);
-   evas_object_textblock_layout_nodes_free(obj, lnodes);
-   o->native.w = fw;
-   o->native.h = fh;
-   o->native.lines = lines;
-   o->native.dirty = 0;
-}
-
-static Node *
-evas_object_textblock_node_pos_get(Evas_Object *obj, int pos, int *pstart)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_List *l;
-   int p, ps = 0;
-   Node *node = NULL;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   ps = p = 0;
-   for (l = (Evas_Object_List *)o->nodes; l; l = l->next)
-     {
-	node = (Node *)l;
-	if (node->text)
-	  {
-	     ps = p;
-	     p += node->text_len;
-	     if (p > pos) break;
-	  }
-     }
-   *pstart = ps;
-   if (node && !node->text) node = NULL;
-   return node;
-}
-
-static Layout_Node *
-evas_object_textblock_layout_node_pos_get(Evas_Object *obj, int pos, int *pstart)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_List *l;
-   int p = 0;
-   Layout_Node *lnode = NULL;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   p = 0;
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	lnode = (Layout_Node *)l;
-	if (lnode->text)
-	  {
-	     p = lnode->text_pos + lnode->text_len;
-	     if (p > pos)
-	       {
-		  p = lnode->text_pos;
-		  break;
-	       }
-	  }
-     }
-   *pstart = p;
-   if (lnode && !lnode->text) lnode = NULL;
-   return lnode;
-}
-
-static Layout_Node *
-evas_object_textblock_layout_node_line_get(Evas_Object *obj, int line)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_List *l;
-   int p, ps;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   ps = p = 0;
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode;
-
-	lnode = (Layout_Node *)l;
-	if (lnode->text)
-	  {
-	     ps = p;
-	     p += lnode->text_len;
-	     if (lnode->line == line) return lnode;
-	  }
-     }
-   return NULL;
-}
-
-/* private methods for textblock objects */
-static void evas_object_textblock_init(Evas_Object *obj);
-static void *evas_object_textblock_new(void);
-static void evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
-static void evas_object_textblock_free(Evas_Object *obj);
-static void evas_object_textblock_render_pre(Evas_Object *obj);
-static void evas_object_textblock_render_post(Evas_Object *obj);
-
-static int evas_object_textblock_is_opaque(Evas_Object *obj);
-static int evas_object_textblock_was_opaque(Evas_Object *obj);
-
-static void evas_object_textblock_coords_recalc(Evas_Object *obj);
-
-static Evas_Object_Func object_func =
-{
-   /* methods (compulsory) */
-   evas_object_textblock_free,
-     evas_object_textblock_render,
-     evas_object_textblock_render_pre,
-     evas_object_textblock_render_post,
-   /* these are optional. NULL = nothing */
-     NULL,
-     NULL,
-     NULL,
-     NULL,
-     evas_object_textblock_is_opaque,
-     evas_object_textblock_was_opaque,
-     NULL,
-     NULL,
-     evas_object_textblock_coords_recalc
-};
-
-/* the actual api call to add a textblock */
-
-/**
- * Adds a textblock to the given evas.
- * @param   e The given evas.
- * @return  The new textblock object.
- * @todo Find a documentation group to put this under.
- */
-Evas_Object *
-evas_object_textblock_add(Evas *e)
-{
-   Evas_Object *obj;
-
-   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
-   return NULL;
-   MAGIC_CHECK_END();
-   obj = evas_object_new();
-   evas_object_textblock_init(obj);
-   evas_object_inject(obj, e);
-   return obj;
-}
-
-void
-evas_object_textblock_clear(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   evas_object_textblock_contents_clean(obj);
-   evas_object_textblock_layout_clean(obj);
-   o->len = 0;
-   o->pos = 0;
-   o->lines = 0;
-   o->changed = 1;
-   o->native.dirty = 1;
-   o->format.dirty = 1;
-   evas_object_change(obj);
-}
-
-void
-evas_object_textblock_cursor_pos_set(Evas_Object *obj, int pos)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   if (pos < 0) pos = 0;
-   else if (pos > o->len) pos = o->len;
-   o->pos = pos;
-}
-
-void
-evas_object_textblock_cursor_pos_next(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	int chr;
-	int npos;
-
-	npos = o->pos - ps;
-	chr = evas_common_font_utf8_get_next(node->text, &npos);
-	if ((!chr) || (npos >= node->text_len))
-	  {
-	     npos = ps + node->text_len;
-	     if (node)
-	       o->pos = npos;
-	  }
-	else
-	  o->pos = npos + ps;
-     }
-}
-
-void
-evas_object_textblock_cursor_pos_prev(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   if (o->pos == o->len)
-     {
-	if (o->nodes)
-	  {
-	     node = (Node *)(((Evas_Object_List *)o->nodes)->last);
-	     while ((node) && (!node->text))
-	       node = (Node *)(((Evas_Object_List *)node)->prev);
-	     if (node)
-	       {
-		  int npos;
-
-		  npos = evas_common_font_utf8_get_last(node->text, node->text_len);
-		  o->pos = o->pos - node->text_len + npos;
-	       }
-	  }
-	return;
-     }
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	int chr;
-	int npos;
-
-	npos = o->pos - ps;
-	if (o->pos > ps)
-	  {
-	     chr = evas_common_font_utf8_get_prev(node->text, &npos);
-	     o->pos = npos + ps;
-	  }
-	else
-	  {
-	     node = (Node *)(((Evas_Object_List *)node)->prev);
-	     while ((node) && (!node->text))
-	       node = (Node *)(((Evas_Object_List *)node)->prev);
-	     if (node)
-	       {
-		  npos = evas_common_font_utf8_get_last(node->text, node->text_len);
-		  o->pos = o->pos - node->text_len + npos;
-	       }
-	  }
-     }
-}
-
-int
-evas_object_textblock_cursor_pos_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->pos;
-}
-
-int
-evas_object_textblock_length_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->len;
-}
-
-int
-evas_object_textblock_cursor_line_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_pos_get(obj, o->pos, &ps);
-   if (lnode) return lnode->line;
-   return 0;
-}
-
-int
-evas_object_textblock_lines_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   return o->lines;
-}
-
-int
-evas_object_textblock_line_start_pos_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_pos_get(obj, o->pos, &ps);
-   if (lnode)
-     {
-	Evas_Object_List *l;
-
-	for (l = (Evas_Object_List *)lnode; l; l = l->prev)
-	  {
-	     lnode = (Layout_Node *)l;
-	     if ((lnode->text) && (lnode->line_start))
-	       return lnode->text_pos;
-	  }
-     }
-   return EVAS_TEXT_INVALID;
-}
-
-int
-evas_object_textblock_line_end_pos_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_pos_get(obj, o->pos, &ps);
-   if (lnode)
-     {
-	Evas_Object_List *l;
-
-	for (l = (Evas_Object_List *)lnode; l; l = l->next)
-	  {
-	     lnode = (Layout_Node *)l;
-	     if ((lnode->text) && (lnode->line_end))
-	       {
-		  int index;
-
-		  index = evas_common_font_utf8_get_last(lnode->text, lnode->text_len);
-		  return lnode->text_pos + index;
-	       }
-	  }
-     }
-   return EVAS_TEXT_INVALID;
-}
-
-Evas_Bool
-evas_object_textblock_line_get(Evas_Object *obj, int line, Evas_Coord *lx, Evas_Coord *ly, Evas_Coord *lw, Evas_Coord *lh)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_line_get(obj, line);
-   if (lnode)
-     {
-	Evas_Object_List *l;
-	Layout_Node *lnode_start = NULL, *lnode_end = NULL;
-
-	for (l = (Evas_Object_List *)lnode; l; l = l->prev)
-	  {
-	     lnode_start = (Layout_Node *)l;
-	     if (lnode_start->line_start)
-	       break;
-	  }
-	for (l = (Evas_Object_List *)lnode; l; l = l->next)
-	  {
-	     lnode_end = (Layout_Node *)l;
-	     if (lnode_end->line_end)
-	       break;
-	  }
-	if ((lnode_start) && (lnode_end))
-	  {
-	     if (lx) *lx = lnode_start->layout.line.x;
-	     if (ly) *ly = lnode_start->layout.line.y;
-	     if (lnode_end->layout.line.advance > lnode_end->w)
-	       {
-		  if (lw) *lw = lnode_end->layout.line.x - lnode_start->layout.line.x + lnode_end->layout.line.advance;
-	       }
-	     else
-	       {
-		  if (lw) *lw = lnode_end->layout.line.x - lnode_start->layout.line.x + lnode_end->w;
-	       }
-	     if (lh) *lh = lnode_start->layout.line.mascent + lnode_start->layout.line.mdescent;
-	     return 1;
-	  }
-     }
-   return 0;
-}
-
-Evas_Bool
-evas_object_textblock_char_pos_get(Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_pos_get(obj, pos, &ps);
-   if (lnode)
-     {
-	int ret, x = 0, y = 0, w = 0, h = 0;
-
-	if (lnode->layout.font.font)
-	  {
-	     ret = ENFN->font_char_coords_get(ENDT, lnode->layout.font.font,
-					      lnode->text,
-					      pos - lnode->text_pos,
-					      &x, &y, &w, &h);
-	     y = lnode->layout.line.y;
-	     x += lnode->layout.line.x;
-	     h = lnode->layout.line.mascent + lnode->layout.line.mdescent;
-	     if (cx) *cx = x;
-	     if (cy) *cy = y;
-	     if (cw) *cw = w;
-	     if (ch) *ch = h;
-	     return ret;
-	  }
-     }
-   return 0;
-}
-
-int
-evas_object_textblock_char_coords_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   Evas_Object_List *l;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	lnode = (Layout_Node *)l;
-
-	if ((x >= lnode->layout.line.x) &&
-	    (x < (lnode->layout.line.x + lnode->layout.line.advance)) &&
-	    (y >= lnode->layout.line.y) &&
-	    (y < (lnode->layout.line.y + lnode->layout.line.mascent + lnode->layout.line.mdescent)))
-	  {
-	     int ret, rx = 0, ry = 0, rw = 0, rh = 0;
-
-	     if (lnode->spacer)
-	       {
-		  ry = lnode->layout.line.y;
-		  rx += lnode->layout.line.x;
-		  rh = lnode->layout.line.mascent + lnode->layout.line.mdescent;
-		  rw = lnode->w;
-		  if (cx) *cx = rx;
-		  if (cy) *cy = ry;
-		  if (cw) *cw = rw;
-		  if (ch) *ch = rh;
-		  return EVAS_TEXT_SPECIAL;
-	       }
-	     else if ((lnode->layout.font.font) && (lnode->text))
-	       {
-		  ret = ENFN->font_char_at_coords_get(ENDT, lnode->layout.font.font,
-						      lnode->text,
-						      x - lnode->layout.line.x,
-						      0,
-						      &rx, &ry, &rw, &rh);
-		  if (ret < 0)
-		    {
-		       if ((x - lnode->layout.line.x) <
-			   (lnode->layout.line.advance / 2))
-			 {
-			    ret = ENFN->font_char_coords_get(ENDT, lnode->layout.font.font,
-							     lnode->text,
-							     0,
-							     &rx, &ry, &rw, &rh);
-			    ret = 0;
-			 }
-		       else
-			 {
-			    int pos;
-
-			    pos = evas_common_font_utf8_get_last(lnode->text, lnode->text_len);
-			    ret = ENFN->font_char_coords_get(ENDT, lnode->layout.font.font,
-							     lnode->text,
-							     pos,
-							     &rx, &ry, &rw, &rh);
-			    ret = pos;
-			 }
-		    }
-		  ry = lnode->layout.line.y;
-		  rx += lnode->layout.line.x;
-		  rh = lnode->layout.line.mascent + lnode->layout.line.mdescent;
-		  if (cx) *cx = rx;
-		  if (cy) *cy = ry;
-		  if (cw) *cw = rw;
-		  if (ch) *ch = rh;
-		  return ret + lnode->text_pos;
-	       }
-	     return EVAS_TEXT_INVALID;
-	  }
-     }
-   return EVAS_TEXT_INVALID;
-}
-
-void
-evas_object_textblock_text_insert(Evas_Object *obj, const char *text)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   if (!text) return;
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   /* at the end - just append */
-   if (!node)
-     {
-	if (!o->nodes)
-	  {
-	     node = calloc(1, sizeof(Node));
-	     node->text = strdup(text);
-	     node->text_len = strlen(node->text);
-	     o->pos = node->text_len;
-	     o->len = node->text_len;
-	     o->nodes = evas_object_list_append(o->nodes, node);
-	  }
-	else
-	  {
-	     int len;
-	     char *ntext;
-
-	     node = (Node *)(((Evas_Object_List *)(o->nodes))->last);
-	     if (node->text)
-	       {
-		  len = strlen(text);
-		  ntext = malloc(node->text_len + len + 1);
-		  if (node->text) strcpy(ntext, node->text);
-		  strcpy(ntext + node->text_len, text);
-		  if (node->text) free(node->text);
-		  node->text = ntext;
-		  node->text_len += len;
-		  o->pos += len;
-		  o->len += len;
-	       }
-	     else
-	       {
-		  node = calloc(1, sizeof(Node));
-		  node->text = strdup(text);
-		  node->text_len = strlen(node->text);
-		  o->pos += node->text_len;
-		  o->len += node->text_len;
-		  o->nodes = evas_object_list_append(o->nodes, node);
-	       }
-	  }
-     }
-   else
-     {
-	int len;
-	char *ntext;
-
-	len = strlen(text);
-	ntext = malloc(node->text_len + len + 1);
-	if (node->text) strncpy(ntext, node->text, o->pos - ps);
-	strcpy(ntext + o->pos - ps, text);
-	if (node->text) strcpy(ntext + o->pos - ps + len, node->text + o->pos - ps);
-	if (node->text) free(node->text);
-	node->text = ntext;
-	node->text_len += len;
-	o->pos += len;
-	o->len += len;
-     }
-   o->native.dirty = 1;
-   o->format.dirty = 1;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-/**
- * Gets length bytes from the textblock from the current cursor position
- * @param   obj The given textblock.
- * @param   len The number of characters to get from the textblock.
- * @return  Returns NULL on failure, or as many of len characters as were
- * available. The returned memory must be free'd by the caller.
- */
-char *
-evas_object_textblock_text_get(Evas_Object *obj, int len)
-{
-   Evas_Object_Textblock *o;
-   char *ret = NULL;
-   int my_len = len;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return NULL;
-   MAGIC_CHECK_END();
-
-   if (len <= 0) return NULL;
-   if (o->pos > o->len) return NULL;
-   if (len > (o->len - o->pos)) my_len = o->len - o->pos;
-
-   /* CHECK */
-   ret = malloc(sizeof(char) * (my_len + 1));
-   if (ret)
-     {
-	Node *node;
-	int ps = 0;
-
-	node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-	if (node)
-	  {
-	     if ((node->text_len - (o->pos - ps)) >= my_len)
-	       memcpy(ret, node->text + (o->pos - ps), my_len);
-	     else
-	       {
-		  int remaining = my_len - (node->text_len - (o->pos - ps));
-		  int count = (node->text_len - (o->pos - ps));
-
-		  memcpy(ret, node->text + (o->pos - ps), node->text_len - (o->pos - ps));
-
-		  while (remaining > 0)
-		    {
-		       node = evas_object_textblock_node_pos_get(obj, o->pos + count, &ps);
-		       if (node)
-			 {
-			    int amt = 0;
-
-			    if (node->text_len >= remaining)
-			      amt = remaining;
-			    else
-			      amt = node->text_len;
-
-			    memcpy(ret + count, node->text, amt);
-			    remaining -= amt;
-			    count += amt;
-			 }
-		       else
-			 {
-			    /* we ran out of nodes ... */
-			    break;
-			 }
-		    }
-	       }
-	  }
-        ret[my_len] = 0;
-     }
-   return ret;
-}
-
-/**
- * Removes length bytes from the textblock from the current cursor position.
- * @param   obj The given textblock.
- * @param   len The number of bytes to remove
- * @return  Returns no value.
- */
-void
-evas_object_textblock_text_del(Evas_Object *obj, int len)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int my_len, ps = 0;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-
-   if (len <= 0) return;
-   if (o->pos >= o->len) return;
-
-   /* deleting everything */
-   if ((o->pos == 0) && (len >= o->len))
-     {
-	evas_object_textblock_clear(obj);
-	return;
-     }
-
-   /* make sure we have enough to remove */
-   my_len = len;
-   if ((o->len - o->pos) < len) my_len = o->len - o->pos;
-
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	int remaining;
-	char *tmp;
-
-	remaining = my_len;
-	if (remaining <= (node->text_len - (o->pos - ps)))
-	  {
-	     tmp = node->text;
-	     node->text = malloc(sizeof(char) * (node->text_len - my_len + 1));
-
-	     /* any begining text */
-	     if ((o->pos - ps) > 0)
-	       strncpy(node->text, tmp, o->pos - ps);
-	     node->text[o->pos - ps] = 0;
-
-	     /* any ending text */
-	     if (((o->pos - ps) + remaining) < node->text_len)
-	       strcpy(node->text + (o->pos - ps),
-		      tmp + remaining + (o->pos - ps));
-
-	     free(tmp);
-	     node->text_len -= remaining;
-	     o->len -= remaining;
-
-	     /* is the node now empty? */
-	     if (node->text_len <= 0)
-	       {
-		  o->nodes = evas_object_list_remove(o->nodes, node);
-		  if (node->format) free(node->format);
-		  if (node->text) free(node->text);
-		  free(node);
-	       }
-	  }
-	else
-	  {
-	     Evas_List *freenodes = NULL, *formatnodes = NULL;
-	     Node *node_start = NULL, *node_end = NULL, *format_start = NULL;
-	     Evas_Object_List *l;
-
-	     node_start = node_end = node;
-	     tmp = node->text;
-	     node->text = malloc(sizeof(char) * (o->pos - ps + 1));
-
-	     /* save the start part */
-	     strncpy(node->text, tmp, o->pos - ps);
-	     node->text[o->pos - ps] = 0;
-
-	     o->len -= node->text_len - (o->pos - ps);
-	     remaining -= node->text_len - (o->pos - ps);
-	     node->text_len = o->pos - ps;
-	     free(tmp);
-	     ps += node->text_len;
-
-             if (node->text_len <= 0)
-	       node->text = NULL;
-
-	     while (remaining > 0)
-	       {
-		  /* find next text node */
-		  node = (Node *)(((Evas_Object_List *)node)->next);
-		  while ((node) && (!node->text))
-		    node = (Node *)(((Evas_Object_List *)node)->next);
-		  if (!node) break;
-
-		  if (remaining < node->text_len)
-		    {
-		       tmp = node->text;
-
-		       node->text = malloc(sizeof(char) * (node->text_len - remaining + 1));
-		       strcpy(node->text, tmp + remaining);
-		       node->text_len -= remaining;
-		       free(tmp);
-
-		       o->len -= remaining;
-		       remaining -= remaining;
-		       node_end = node;
-		    }
-		  else
-		    {
-		       node_end = node;
-		       o->len -= node->text_len;
-		       free(node->text);
-		       node->text = NULL;
-		       node->text_len = 0;
-		    }
-	       }
-	     /* we need to remove all nodes between node_start (and including
-	      * node_start is its text is NULL) and end_node (including
-	      * node_end if its text is NULL)
-	      */
-	     for (l = (Evas_Object_List *)node_start; l; l = l->next)
-	       {
-		  node = (Node *)l;
-		  /* if its a format node add it to our list of format nodes */
-		  if (node->format)
-		    {
-		       if (!formatnodes)
-			 format_start = node;
-		       formatnodes = evas_list_append(formatnodes, node);
-		    }
-		  /* if the node is empty text add it to our list of nodes
-		   * to free
-		   */
-		  else if (!node->text)
-		    freenodes = evas_list_append(freenodes, node);
-		  if (node == node_end) break;
-	       }
-             while (freenodes)
-	       {
-		  node = freenodes->data;
-		  freenodes = evas_list_remove_list(freenodes, freenodes);
-		  o->nodes = evas_object_list_remove(o->nodes, node);
-		  if (node->format) free(node->format);
-		  free(node);
-	       }
-	     /* remove formatnodes for now... dont do anything... */
-             while (formatnodes)
-	       formatnodes = evas_list_remove_list(formatnodes, formatnodes);
-	     /* FIXME: merge format nodes... */
-	  }
-     }
-   o->native.dirty = 1;
-   o->format.dirty = 1;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-void
-evas_object_textblock_format_insert(Evas_Object *obj, const char *format)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps;
-   char *nformat;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   /* at the end - just append */
-   if (!node)
-     {
-	nformat = evas_object_textblock_format_merge(NULL, (char *)format);
-	if (nformat)
-	  {
-	     node = calloc(1, sizeof(Node));
-	     node->format = nformat;
-	     o->nodes = evas_object_list_append(o->nodes, node);
-	  }
-     }
-   else
-     {
-	nformat = evas_object_textblock_format_merge(NULL, (char *)format);
-	if (nformat)
-	  {
-	     char *ntext1 = NULL, *ntext2 = NULL;
-	     int len2;
-	     Node *node_rel;
-
-	     len2 = node->text_len - (o->pos - ps);
-	     if (o->pos - ps > 0)
-	       {
-		  ntext1 = malloc(o->pos - ps + 1);
-		  strncpy(ntext1, node->text, o->pos - ps);
-		  ntext1[o->pos - ps] = 0;
-	       }
-	     if (len2 > 0)
-	       {
-		  ntext2 = malloc(len2 + 1);
-		  strcpy(ntext2, node->text + o->pos - ps);
-	       }
-	     if (ntext1)
-	       {
-		  free(node->text);
-		  node->text = ntext1;
-		  node->text_len = o->pos - ps;
-
-		  node_rel = node;
-		  node = calloc(1, sizeof(Node));
-		  node->format = nformat;
-		  o->nodes = evas_object_list_append_relative(o->nodes, node, node_rel);
-	       }
-	     else
-	       {
-		  free(node->text);
-		  node->text = NULL;
-		  node->text_len = 0;
-		  node->format = nformat;
-	       }
-	     if (ntext2)
-	       {
-		  node_rel = node;
-		  node = calloc(1, sizeof(Node));
-		  node->text = ntext2;
-		  node->text_len = len2;
-		  o->nodes = evas_object_list_append_relative(o->nodes, node, node_rel);
-	       }
-	  }
-     }
-   o->native.dirty = 1;
-   o->format.dirty = 1;
-   o->changed = 1;
-   evas_object_change(obj);
-}
-
-int
-evas_object_textblock_format_next_pos_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, pos;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   pos = ps;
-   if (node)
-     {
-	pos += node->text_len;
-	node = (Node *)(((Evas_Object_List *)node)->next);
-	while ((node) && (node->text))
-	  {
-	     pos += node->text_len;
-	     node = (Node *)(((Evas_Object_List *)node)->next);
-	  }
-	return pos;
-     }
-   return EVAS_TEXT_INVALID;
-}
-
-int
-evas_object_textblock_format_next_count_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->next);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->next);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->next);
-	  }
-	return num;
-     }
-   return 0;
-}
-
-const char *
-evas_object_textblock_format_next_get(Evas_Object *obj, int n)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return NULL;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->next);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->next);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     if (num == n) return node->format;
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->next);
-	  }
-     }
-   return NULL;
-}
-
-void
-evas_object_textblock_format_next_del(Evas_Object *obj, int n)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->next);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->next);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     if (num == n)
-	       {
-		  o->nodes = evas_object_list_remove(o->nodes, node);
-		  if (node->format) free(node->format);
-		  free(node);
-		  o->native.dirty = 1;
-		  o->format.dirty = 1;
-		  o->changed = 1;
-		  evas_object_change(obj);
-		  return;
-	       }
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->next);
-	  }
-     }
-}
-
-int
-evas_object_textblock_format_prev_pos_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, pos;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return EVAS_TEXT_INVALID;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   pos = ps;
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->prev);
-	while ((node) && (node->text))
-	  {
-	     pos -= node->text_len;
-	     node = (Node *)(((Evas_Object_List *)node)->prev);
-	  }
-	return pos;
-     }
-   return EVAS_TEXT_INVALID;
-}
-
-int
-evas_object_textblock_format_prev_count_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->prev);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->prev);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->prev);
-	  }
-	return num;
-     }
-   return 0;
-}
-
-const char *
-evas_object_textblock_format_prev_get(Evas_Object *obj, int n)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return NULL;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->prev);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->prev);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     if (num == n) return node->format;
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->prev);
-	  }
-     }
-   return NULL;
-}
-
-void
-evas_object_textblock_format_prev_del(Evas_Object *obj, int n)
-{
-   Evas_Object_Textblock *o;
-   Node *node;
-   int ps, num;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   node = evas_object_textblock_node_pos_get(obj, o->pos, &ps);
-   if (node)
-     {
-	node = (Node *)(((Evas_Object_List *)node)->prev);
-	while ((node) && (node->text))
-	  node = (Node *)(((Evas_Object_List *)node)->prev);
-	num = 0;
-	while ((node) && (!node->text))
-	  {
-	     if (num == n)
-	       {
-		  o->nodes = evas_object_list_remove(o->nodes, node);
-		  if (node->format) free(node->format);
-		  free(node);
-		  o->native.dirty = 1;
-		  o->format.dirty = 1;
-		  o->changed = 1;
-		  evas_object_change(obj);
-		  return;
-	       }
-	     num++;
-	     node = (Node *)(((Evas_Object_List *)node)->prev);
-	  }
-     }
-}
-
-char *
-evas_object_textblock_format_current_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-   Layout_Node *lnode;
-   int ps;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return NULL;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return NULL;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   lnode = evas_object_textblock_layout_node_pos_get(obj, o->pos, &ps);
-   if (lnode)
-     {
-	char tbuf[512];
-	char *buf;
-	int sz;
-
-	sz = 0;
-	/* save typing below */
-#define CHECK_COL(str, col) \
-	if (lnode->layout.col.a > 0) \
-	  { \
-	     snprintf(tbuf, sizeof(tbuf), "#%02x%02x%02x%02x", lnode->layout.col.r, lnode->layout.col.g, lnode->layout.col.b, lnode->layout.col.a); \
-	     sz += strlen(str"=") + strlen(tbuf) + 1; \
-	  }
-	/* FIXME: we dont handle any strings with a space in them */
-	if (lnode->layout.font.name) sz += strlen("font=") + strlen(lnode->layout.font.name) + 1;
-	if (lnode->layout.font.source) sz += strlen("source=") + strlen(lnode->layout.font.source) + 1;
-	if (lnode->layout.font.size > 0)
-	  {
-	     snprintf(tbuf, sizeof(tbuf), "%i", (int)lnode->layout.font.size);
-	     sz += strlen("size=") + strlen(tbuf) + 1;
-	  }
-	CHECK_COL("color", color);
-	CHECK_COL("underline_color", underline_color);
-	CHECK_COL("double_underline_color", double_underline_color);
-	CHECK_COL("outline_color", outline_color);
-	CHECK_COL("shadow_color", shadow_color);
-	CHECK_COL("glow_color", glow_color);
-	CHECK_COL("outer_glow_color", outer_glow_color);
-	CHECK_COL("backing_color", backing_color);
-	CHECK_COL("strikethrough_color", strikethrough_color);
-	if (lnode->layout.align != 0.0)
-	  {
-	     if (lnode->layout.align == 0.5) strcpy(tbuf, "center");
-	     else if (lnode->layout.align == 1.0) strcpy(tbuf, "right");
-	     else snprintf(tbuf, sizeof(tbuf), "%3.3f", (double)lnode->layout.align);
-	     sz += strlen("align=") + strlen(tbuf) + 1;
-	  }
-	if (lnode->layout.valign != -1.0)
-	  {
-	     if (lnode->layout.valign == 0.5) strcpy(tbuf, "center");
-	     else if (lnode->layout.valign == 1.0) strcpy(tbuf, "bottom");
-	     else snprintf(tbuf, sizeof(tbuf), "%3.3f", (double)lnode->layout.valign);
-	     sz += strlen("valign=") + strlen(tbuf) + 1;
-	  }
-	if (lnode->layout.word_wrap) sz += strlen("wrap=word") + 1;
-	if (lnode->layout.second_underline) sz += strlen("underline=double") + 1;
-	else if (lnode->layout.underline) sz += strlen("underline=on") + 1;
-	if (lnode->layout.strikethrough) sz += strlen("strikethrough=on") + 1;
-	if (lnode->layout.backing) sz += strlen("backing=on") + 1;
-
-#define PRINT_COL(str, col) \
-	if (lnode->layout.col.a > 0) \
-	  { \
-             if (buf[0] != 0) strcat(buf, " "); \
-	     strcat(buf, str"="); \
-	     snprintf(tbuf, sizeof(tbuf), "#%02x%02x%02x%02x", lnode->layout.col.r, lnode->layout.col.g, lnode->layout.col.b, lnode->layout.col.a); \
-	     strcat(buf, tbuf); \
-	  }
-
-	buf = malloc(sz);
-	if (buf)
-	  {
-	     buf[0] = 0;
-	     if (lnode->layout.font.name)
-	       {
-		  strcat(buf, "font=");
-		  strcat(buf, lnode->layout.font.name);
-	       }
-	     if (lnode->layout.font.source)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "source=");
-		  strcat(buf, lnode->layout.font.source);
-	       }
-	     if (lnode->layout.font.size > 0)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "size=");
-		  snprintf(tbuf, sizeof(tbuf), "%i", (int)lnode->layout.font.size);
-		  strcat(buf, tbuf);
-	       }
-	     PRINT_COL("color", color);
-	     PRINT_COL("underline_color", underline_color);
-	     PRINT_COL("double_underline_color", double_underline_color);
-	     PRINT_COL("outline_color", outline_color);
-	     PRINT_COL("shadow_color", shadow_color);
-	     PRINT_COL("glow_color", glow_color);
-	     PRINT_COL("outer_glow_color", outer_glow_color);
-	     PRINT_COL("backing_color", backing_color);
-	     PRINT_COL("strikethrough_color", strikethrough_color);
-	     if (lnode->layout.align != 0.0)
-	       {
-		  if (lnode->layout.align == 0.5) strcpy(tbuf, "center");
-		  else if (lnode->layout.align == 1.0) strcpy(tbuf, "right");
-		  else snprintf(tbuf, sizeof(tbuf), "%3.3f", (double)lnode->layout.align);
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "align=");
-		  strcat(buf, tbuf);
-	       }
-	     if (lnode->layout.valign != -1.0)
-	       {
-		  if (lnode->layout.valign == 0.5) strcpy(tbuf, "center");
-		  else if (lnode->layout.valign == 1.0) strcpy(tbuf, "bottom");
-		  else snprintf(tbuf, sizeof(tbuf), "%3.3f", (double)lnode->layout.valign);
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "valign=");
-		  strcat(buf, tbuf);
-	       }
-	     if (lnode->layout.word_wrap)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "wrap=word");
-	       }
-	     if (lnode->layout.second_underline)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "underline=double");
-	       }
-	     else if (lnode->layout.underline)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "underline=on");
-	       }
-	     if (lnode->layout.strikethrough)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "strikethrough=on");
-	       }
-	     if (lnode->layout.backing)
-	       {
-		  if (buf[0] != 0) strcat(buf, " ");
-		  strcat(buf, "backing=on");
-	       }
-	     return buf;
-	  }
-     }
-   /* so what do we do eh? do we return 1 string with all "stateful" format
-    * data in it (font, size, color, underline etc.) space delimited... or
-    * what? i am tempted to opt for this solution right now - caller must
-    * free the string when done with free()
-    *
-    * so to do this. find the layout node at the current pos, check the
-    * layout params, and snprintf all that are not a default value (that u can
-    * set via format parameters), then return a strdup of the buffer. if the
-    * buffer is too small - resize and snprintf again.
-    */
-   return NULL;
-}
-
-void
-evas_object_textblock_format_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (o->format.dirty)
-     evas_object_textblock_format_calc(obj);
-   if (w) *w = o->format.w;
-   if (h) *h = o->format.h;
-}
-
-void
-evas_object_textblock_native_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   if (w) *w = 0;
-   if (h) *h = 0;
-   return;
-   MAGIC_CHECK_END();
-   if (o->native.dirty)
-     evas_object_textblock_native_calc(obj);
-   if (w) *w = o->native.w;
-   if (h) *h = o->native.h;
-}
-
-int
-evas_object_textblock_native_lines_get(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
-   return 0;
-   MAGIC_CHECK_END();
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return 0;
-   MAGIC_CHECK_END();
-   if (o->native.dirty)
-     evas_object_textblock_native_calc(obj);
-   return o->native.lines;
-}
-
-/* all nice and private */
-static void
-evas_object_textblock_init(Evas_Object *obj)
-{
-   /* alloc image ob, setup methods and default values */
-   obj->object_data = evas_object_textblock_new();
-   /* set up default settings for this kind of object */
-   obj->cur.color.r = 255;
-   obj->cur.color.g = 255;
-   obj->cur.color.b = 255;
-   obj->cur.color.a = 255;
-   obj->cur.geometry.x = 0.0;
-   obj->cur.geometry.y = 0.0;
-   obj->cur.geometry.w = 0.0;
-   obj->cur.geometry.h = 0.0;
-   obj->cur.layer = 0;
-   /* set up object-specific settings */
-   obj->prev = obj->cur;
-   /* set up methods (compulsory) */
-   obj->func = &object_func;
-   obj->type = o_type;
-}
-
-static void *
-evas_object_textblock_new(void)
-{
-   Evas_Object_Textblock *o;
-
-   /* alloc obj private data */
-   o = calloc(1, sizeof(Evas_Object_Textblock));
-   o->magic = MAGIC_OBJ_TEXTBLOCK;
-   return o;
-}
-
-static void
-evas_object_textblock_free(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   /* frees private object data. very simple here */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
-   return;
-   MAGIC_CHECK_END();
-   /* free obj */
-   evas_object_textblock_layout_clean(obj);
-   evas_object_textblock_contents_clean(obj);
-   o->magic = 0;
-   free(o);
-}
-
-static void
-evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y)
-{
-   Evas_Object_Textblock *o;
-   Evas_Object_List *l;
-   int pbackx = 0;
-   int i, j;
-   const char vals[5][5] =
-     {
-	  {0, 1, 2, 1, 0},
-	  {1, 3, 4, 3, 1},
-	  {2, 4, 5, 4, 2},
-	  {1, 3, 4, 3, 1},
-	  {0, 1, 2, 1, 0}
-     };
-
-   /* render object to surface with context, and offxet by x,y */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   obj->layer->evas->engine.func->context_multiplier_unset(output,
-							   context);
-   if (o->changed)
-     {
-	if (o->format.dirty)
-	  evas_object_textblock_format_calc(obj);
-	o->changed = 0;
-     }
-#if 0 /* using for some debugging. will go soon */
-    obj->layer->evas->engine.func->context_color_set(output,
-                                                     context,
-                                                     230, 160, 30, 100);
-    obj->layer->evas->engine.func->rectangle_draw(output,
-                                                  context,
-                                                  surface,
-                                                  obj->cur.cache.geometry.x + x,
-                                                  obj->cur.cache.geometry.y + y,
-                                                  obj->cur.cache.geometry.w,
-                                                  obj->cur.cache.geometry.h);
-#endif
-   /* 1ST PASS: BACKING */
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode, *nlnode;
-
-	lnode = (Layout_Node *)l;
-	nlnode = (Layout_Node *)(l->next);
-	if (lnode->line_start) pbackx = 0;
-	if ((lnode->layout.font.font) && (lnode->text))
-	  {
-	     int lin = 0;
-	     int inset = 0;
-
-	     if (lnode->layout.backing) lin++;
-	     if (lin > 0)
-	       inset = ENFN->font_inset_get(ENDT,
-					    lnode->layout.font.font,
-					    lnode->text);
-	     if (lnode->layout.backing)
-	       {
-		  int bx;
-
-		  ENFN->context_color_set(output,
-					  context,
-					  (obj->cur.cache.clip.r * lnode->layout.backing_color.r) / 255,
-					  (obj->cur.cache.clip.g * lnode->layout.backing_color.g) / 255,
-					  (obj->cur.cache.clip.b * lnode->layout.backing_color.b) / 255,
-					  (obj->cur.cache.clip.a * lnode->layout.backing_color.a) / 255);
-		  bx = lnode->layout.line.x + inset;
-		  if (pbackx > 0) bx = pbackx;
-		  pbackx = bx + lnode->layout.line.advance;
-		  if (((nlnode) && ((nlnode->line_start) ||
-				    (!nlnode->layout.backing))) ||
-		      (!nlnode))
-		    ENFN->rectangle_draw(output,
-					 context,
-					 surface,
-					 obj->cur.cache.geometry.x +
-					 bx + x,
-					 obj->cur.cache.geometry.y +
-					 lnode->layout.line.y + y,
-					 lnode->w,
-					 lnode->layout.line.mascent + lnode->layout.line.mdescent);
-		  else
-		    ENFN->rectangle_draw(output,
-					 context,
-					 surface,
-					 obj->cur.cache.geometry.x +
-					 bx + x,
-					 obj->cur.cache.geometry.y +
-					 lnode->layout.line.y + y,
-					 lnode->layout.line.advance,
-					 lnode->layout.line.mascent + lnode->layout.line.mdescent);
-	       }
-	     else
-	       pbackx = 0;
-	  }
-     }
-#define DRW_ELEMENTS(ox, oy) { \
-   if (lnode->layout.valign < 0.0) \
-     ENFN->font_draw(output, context, surface, lnode->layout.font.font, \
-		     obj->cur.cache.geometry.x + (ox) + lnode->layout.line.x + x, \
-		     obj->cur.cache.geometry.y + (oy) + lnode->layout.line.y + y + lnode->layout.line.mascent, \
-		     lnode->w, lnode->h, lnode->w, lnode->h, lnode->text); \
-   else \
-     ENFN->font_draw(output, context, surface, lnode->layout.font.font, \
-		     obj->cur.cache.geometry.x + (ox) + lnode->layout.line.x + x, \
-		     obj->cur.cache.geometry.y + (oy) + lnode->layout.line.y + y + ((double)((lnode->layout.line.mascent + lnode->layout.line.mdescent) - (lnode->layout.line.ascent + lnode->layout.line.descent) - 1) * lnode->layout.valign) + lnode->layout.line.ascent, \
-                     lnode->w, lnode->h, lnode->w, lnode->h, lnode->text); \
-   if (lnode->layout.underline) \
-     ENFN->rectangle_draw(output, context, surface, \
-			  obj->cur.cache.geometry.x + (ox) + lnode->layout.line.x + x + inset, \
-			  obj->cur.cache.geometry.y + (oy) + lnode->layout.line.y + y + lnode->layout.line.mascent + 1, \
-			  lnode->w, 1); \
-   if (lnode->layout.second_underline) \
-     ENFN->rectangle_draw(output, context, surface, \
-			  obj->cur.cache.geometry.x + (ox) + lnode->layout.line.x + x + inset, \
-			  obj->cur.cache.geometry.y + (oy) + lnode->layout.line.y + y + lnode->layout.line.mascent + 3, \
-			  lnode->w, 1); \
-   if (lnode->layout.strikethrough) \
-     ENFN->rectangle_draw(output, context, surface, \
-			  obj->cur.cache.geometry.x + (ox) + lnode->layout.line.x + x + inset, \
-			  obj->cur.cache.geometry.y + (oy) + lnode->layout.line.y + y + lnode->layout.line.mascent - ((lnode->layout.line.ascent - lnode->layout.line.descent) / 2), \
-			  lnode->w, 1); \
-   }
-#define SET_COL(rr, gg, bb, aa) { \
-   ENFN->context_color_set(output, context, \
-                           (obj->cur.cache.clip.r * (rr)) / 255, \
-			   (obj->cur.cache.clip.g * (gg)) / 255, \
-			   (obj->cur.cache.clip.b * (bb)) / 255, \
-			   (obj->cur.cache.clip.a * (aa)) / 255); \
-   }
-
-   /* 2ND PASS: SHADOWS */
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode, *nlnode;
-
-	lnode = (Layout_Node *)l;
-	nlnode = (Layout_Node *)(l->next);
-	if ((lnode->layout.font.font) && (lnode->text))
-	  {
-	     int lin = 0;
-	     int inset = 0;
-
-	     if (lnode->layout.underline) lin++;
-	     if (lnode->layout.second_underline) lin++;
-	     if (lnode->layout.strikethrough) lin++;
-	     if (lnode->layout.backing) lin++;
-	     if ((lnode->layout.style == STYLE_SHADOW) ||
-		 (lnode->layout.style == STYLE_OUTLINE_SHADOW) ||
-		 (lnode->layout.style == STYLE_FAR_SHADOW) ||
-		 (lnode->layout.style == STYLE_OUTLINE_SOFT_SHADOW) ||
-		 (lnode->layout.style == STYLE_SOFT_SHADOW) ||
-		 (lnode->layout.style == STYLE_FAR_SOFT_SHADOW))
-	       {
-		  if (lin > 0) inset = ENFN->font_inset_get(ENDT, lnode->layout.font.font, lnode->text);
-		  if (lnode->layout.style == STYLE_SHADOW)
-		    {
-		       SET_COL(lnode->layout.shadow_color.r,
-			       lnode->layout.shadow_color.g,
-			       lnode->layout.shadow_color.b,
-			       lnode->layout.shadow_color.a);
-		       DRW_ELEMENTS(1, 1);
-		    }
-		  else if ((lnode->layout.style == STYLE_OUTLINE_SHADOW) ||
-			   (lnode->layout.style == STYLE_FAR_SHADOW))
-		    {
-		       SET_COL(lnode->layout.shadow_color.r,
-			       lnode->layout.shadow_color.g,
-			       lnode->layout.shadow_color.b,
-			       lnode->layout.shadow_color.a);
-		       DRW_ELEMENTS(2, 2);
-		    }
-		  else if ((lnode->layout.style == STYLE_OUTLINE_SOFT_SHADOW) ||
-			   (lnode->layout.style == STYLE_FAR_SOFT_SHADOW))
-		    {
-		       for (j = 0; j < 5; j++)
-			 {
-			    for (i = 0; i < 5; i++)
-			      {
-				 if (vals[i][j] != 0)
-				   {
-				      SET_COL(lnode->layout.shadow_color.r,
-					      lnode->layout.shadow_color.g,
-					      lnode->layout.shadow_color.b,
-					      (lnode->layout.shadow_color.a * vals[i][j] * 50) / 255);
-				      DRW_ELEMENTS(i - 0, j - 0);
-				   }
-			      }
-			 }
-		    }
-		  else if (lnode->layout.style == STYLE_SOFT_SHADOW)
-		    {
-		       for (j = 0; j < 5; j++)
-			 {
-			    for (i = 0; i < 5; i++)
-			      {
-				 if (vals[i][j] != 0)
-				   {
-				      SET_COL(lnode->layout.shadow_color.r,
-					      lnode->layout.shadow_color.g,
-					      lnode->layout.shadow_color.b,
-					      (lnode->layout.shadow_color.a * vals[i][j] * 50) / 255);
-				      DRW_ELEMENTS(i - 1, j - 1);
-				   }
-			      }
-			 }
-		    }
-	       }
-	  }
-     }
-   /* 3RD PASS: GLOWS */
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode, *nlnode;
-
-	lnode = (Layout_Node *)l;
-	nlnode = (Layout_Node *)(l->next);
-	if ((lnode->layout.font.font) && (lnode->text))
-	  {
-	     int lin = 0;
-	     int inset = 0;
-
-	     if (lnode->layout.underline) lin++;
-	     if (lnode->layout.second_underline) lin++;
-	     if (lnode->layout.strikethrough) lin++;
-	     if (lnode->layout.backing) lin++;
-	     if (lnode->layout.style == STYLE_GLOW)
-	       {
-		  if (lin > 0) inset = ENFN->font_inset_get(ENDT, lnode->layout.font.font, lnode->text);
-		  for (j = 0; j < 5; j++)
-		    {
-		       for (i = 0; i < 5; i++)
-			 {
-			    if (vals[i][j] > 0)
-			      {
-				 if (vals[i][j] == 1)
-				   {
-				      SET_COL(lnode->layout.outer_glow_color.r,
-					      lnode->layout.outer_glow_color.g,
-					      lnode->layout.outer_glow_color.b,
-					      lnode->layout.outer_glow_color.a / 2);
-				   }
-				 else
-				   {
-				      SET_COL(lnode->layout.outer_glow_color.r,
-					      lnode->layout.outer_glow_color.g,
-					      lnode->layout.outer_glow_color.b,
-					      lnode->layout.outer_glow_color.a);
-				   }
-				 DRW_ELEMENTS(i - 2, j - 2);
-			      }
-			 }
-		    }
-		  for (j = 0; j < 5; j++)
-		    {
-		       for (i = 0; i < 5; i++)
-			 {
-			    if (vals[i][j] > 2)
-			      {
-				 if (vals[i][j] == 3)
-				   {
-				      SET_COL(lnode->layout.glow_color.r,
-					      lnode->layout.glow_color.g,
-					      lnode->layout.glow_color.b,
-					      lnode->layout.glow_color.a / 2);
-				   }
-				 else
-				   {
-				      SET_COL(lnode->layout.glow_color.r,
-					      lnode->layout.glow_color.g,
-					      lnode->layout.glow_color.b,
-					      lnode->layout.glow_color.a);
-				   }
-				 DRW_ELEMENTS(i - 2, j - 2);
-			      }
-			 }
-		    }
-	       }
-	  }
-     }
-   /* 4TH PASS: OUTLINES */
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode, *nlnode;
-
-	lnode = (Layout_Node *)l;
-	nlnode = (Layout_Node *)(l->next);
-	if ((lnode->layout.font.font) && (lnode->text))
-	  {
-	     int lin = 0;
-	     int inset = 0;
-
-	     if (lnode->layout.underline) lin++;
-	     if (lnode->layout.second_underline) lin++;
-	     if (lnode->layout.strikethrough) lin++;
-	     if (lnode->layout.backing) lin++;
-	     if ((lnode->layout.style == STYLE_OUTLINE) ||
-		 (lnode->layout.style == STYLE_OUTLINE_SHADOW) ||
-		 (lnode->layout.style == STYLE_OUTLINE_SOFT_SHADOW))
-	       {
-		  if (lin > 0) inset = ENFN->font_inset_get(ENDT, lnode->layout.font.font, lnode->text);
-		  SET_COL(lnode->layout.outline_color.r,
-			  lnode->layout.outline_color.g,
-			  lnode->layout.outline_color.b,
-			  lnode->layout.outline_color.a);
-		  DRW_ELEMENTS(0, -1);
-		  DRW_ELEMENTS(0, 1);
-		  DRW_ELEMENTS(-1, 0);
-		  DRW_ELEMENTS(1, 0);
-	       }
-	  }
-     }
-   /* 5TH PASS: TEXT */
-   for (l = (Evas_Object_List *)o->layout_nodes; l; l = l->next)
-     {
-	Layout_Node *lnode, *nlnode;
-
-	lnode = (Layout_Node *)l;
-	nlnode = (Layout_Node *)(l->next);
-	if ((lnode->layout.font.font) && (lnode->text))
-	  {
-	     int lin = 0;
-	     int inset = 0;
-
-	     if (lnode->layout.underline) lin++;
-	     if (lnode->layout.second_underline) lin++;
-	     if (lnode->layout.strikethrough) lin++;
-	     if (lnode->layout.backing) lin++;
-	     if (lin > 0)
-	       inset = ENFN->font_inset_get(ENDT,
-					    lnode->layout.font.font,
-					    lnode->text);
-	     ENFN->context_color_set(output,
-				     context,
-				     (obj->cur.cache.clip.r * lnode->layout.color.r) / 255,
-				     (obj->cur.cache.clip.g * lnode->layout.color.g) / 255,
-				     (obj->cur.cache.clip.b * lnode->layout.color.b) / 255,
-				     (obj->cur.cache.clip.a * lnode->layout.color.a) / 255);
-	     if (lnode->layout.valign < 0.0)
-	       ENFN->font_draw(output,
-			       context,
-			       surface,
-			       lnode->layout.font.font,
-			       obj->cur.cache.geometry.x +
-			       lnode->layout.line.x + x,
-			       obj->cur.cache.geometry.y +
-			       lnode->layout.line.y + y +
-			       lnode->layout.line.mascent,
-			       lnode->w,
-			       lnode->h,
-			       lnode->w,
-			       lnode->h,
-			       lnode->text);
-	     else
-	       ENFN->font_draw(output,
-			       context,
-			       surface,
-			       lnode->layout.font.font,
-			       obj->cur.cache.geometry.x +
-			       lnode->layout.line.x + x,
-			       obj->cur.cache.geometry.y +
-			       lnode->layout.line.y + y +
-			       ((double)((lnode->layout.line.mascent +
-					  lnode->layout.line.mdescent) -
-					 (lnode->layout.line.ascent +
-					  lnode->layout.line.descent) - 1) *
-					 lnode->layout.valign) +
-			       lnode->layout.line.ascent,
-			       lnode->w,
-			       lnode->h,
-			       lnode->w,
-			       lnode->h,
-			       lnode->text);
-	     if (lnode->layout.underline)
-	       {
-		  ENFN->context_color_set(output,
-					  context,
-					  (obj->cur.cache.clip.r * lnode->layout.underline_color.r) / 255,
-					  (obj->cur.cache.clip.g * lnode->layout.underline_color.g) / 255,
-					  (obj->cur.cache.clip.b * lnode->layout.underline_color.b) / 255,
-					  (obj->cur.cache.clip.a * lnode->layout.underline_color.a) / 255);
-		  ENFN->rectangle_draw(output,
-				       context,
-				       surface,
-				       obj->cur.cache.geometry.x +
-				       lnode->layout.line.x + x + inset,
-				       obj->cur.cache.geometry.y +
-				       lnode->layout.line.y + y +
-				       lnode->layout.line.mascent + 1,
-				       lnode->w,
-				       1);
-	       }
-	     if (lnode->layout.second_underline)
-	       {
-		  ENFN->context_color_set(output,
-					  context,
-					  (obj->cur.cache.clip.r * lnode->layout.double_underline_color.r) / 255,
-					  (obj->cur.cache.clip.g * lnode->layout.double_underline_color.g) / 255,
-					  (obj->cur.cache.clip.b * lnode->layout.double_underline_color.b) / 255,
-					  (obj->cur.cache.clip.a * lnode->layout.double_underline_color.a) / 255);
-		  ENFN->rectangle_draw(output,
-				       context,
-				       surface,
-				       obj->cur.cache.geometry.x +
-				       lnode->layout.line.x + x + inset,
-				       obj->cur.cache.geometry.y +
-				       lnode->layout.line.y + y +
-				       lnode->layout.line.mascent + 3,
-				       lnode->w,
-				       1);
-	       }
-	     if (lnode->layout.strikethrough)
-	       {
-		  ENFN->context_color_set(output,
-					  context,
-					  (obj->cur.cache.clip.r * lnode->layout.strikethrough_color.r) / 255,
-					  (obj->cur.cache.clip.g * lnode->layout.strikethrough_color.g) / 255,
-					  (obj->cur.cache.clip.b * lnode->layout.strikethrough_color.b) / 255,
-					  (obj->cur.cache.clip.a * lnode->layout.strikethrough_color.a) / 255);
-		  ENFN->rectangle_draw(output,
-				       context,
-				       surface,
-				       obj->cur.cache.geometry.x +
-				       lnode->layout.line.x + x + inset,
-				       obj->cur.cache.geometry.y +
-				       lnode->layout.line.y + y +
-				       lnode->layout.line.mascent - ((lnode->layout.line.ascent - lnode->layout.line.descent) / 2),
-				       lnode->w,
-				       1);
-	       }
-	  }
-     }
-/*
-   if (o->engine_data)
-     {
-
-     }
- */
-}
-
-static void
-evas_object_textblock_render_pre(Evas_Object *obj)
-{
-   Evas_List *updates = NULL;
-   Evas_Object_Textblock *o;
-   int is_v, was_v;
-
-   /* dont pre-render the obj twice! */
-   if (obj->pre_render_done) return;
-   obj->pre_render_done = 1;
-   /* pre-render phase. this does anything an object needs to do just before */
-   /* rendering. this could mean loading the image data, retrieving it from */
-   /* elsewhere, decoding video etc. */
-   /* then when this is done the object needs to figure if it changed and */
-   /* if so what and where and add the appropriate redraw textblocks */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   /* if someone is clipping this obj - go calculate the clipper */
-   if (obj->cur.clipper)
-     {
-	if (obj->cur.cache.clip.dirty)
-	  evas_object_clip_recalc(obj->cur.clipper);
-	obj->cur.clipper->func->render_pre(obj->cur.clipper);
-     }
-   /* now figure what changed and add draw rects */
-   /* if it just became visible or invisible */
-   is_v = evas_object_is_visible(obj);
-   was_v = evas_object_was_visible(obj);
-   if (is_v != was_v)
-     {
-	updates = evas_object_render_pre_visible_change(updates, obj, is_v, was_v);
-	goto done;
-     }
-   /* it's not visible - we accounted for it appearing or not so just abort */
-   if (!is_v) goto done;
-   /* clipper changed this is in addition to anything else for obj */
-   updates = evas_object_render_pre_clipper_change(updates, obj);
-   /* if we restacked (layer or just within a layer) and don't clip anyone */
-   if (obj->restack)
-     {
-	updates = evas_object_render_pre_prev_cur_add(updates, obj);
-	goto done;
-     }
-   /* if it changed color */
-   if ((obj->cur.color.r != obj->prev.color.r) ||
-       (obj->cur.color.g != obj->prev.color.g) ||
-       (obj->cur.color.b != obj->prev.color.b) ||
-       (obj->cur.color.a != obj->prev.color.a))
-     {
-	updates = evas_object_render_pre_prev_cur_add(updates, obj);
-	goto done;
-     }
-   if (o->changed)
-     {
-/*
-	Evas_Rectangle *r;
-
-	r = malloc(sizeof(Evas_Rectangle));
-	r->x = 0; r->y = 0;
-	r->w = obj->cur.geometry.w;
-	r->h = obj->cur.geometry.h;
-	updates = evas_list_append(updates, r);
-*/
-	updates = evas_object_render_pre_prev_cur_add(updates, obj);
-	evas_object_textblock_layout_fonts_hold(obj);
-	evas_object_textblock_layout_clean(obj);
-	evas_object_textblock_layout(obj);
-	evas_object_textblock_layout_fonts_hold_clean(obj);
-	o->changed = 0;
-     }
-   done:
-   evas_object_render_pre_effect_updates(updates, obj, is_v, was_v);
-}
-
-static void
-evas_object_textblock_render_post(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   /* this moves the current data to the previous state parts of the object */
-   /* in whatever way is safest for the object. also if we don't need object */
-   /* data anymore we can free it if the object deems this is a good idea */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   /* remove those pesky changes */
-   while (obj->clip.changes)
-     {
-	Evas_Rectangle *r;
-
-	r = (Evas_Rectangle *)obj->clip.changes->data;
-	obj->clip.changes = evas_list_remove(obj->clip.changes, r);
-	free(r);
-     }
-   /* move cur to prev safely for object data */
-   obj->prev = obj->cur;
-   o->prev = o->cur;
-/*   o->changed = 0; */
-}
-
-static int
-evas_object_textblock_is_opaque(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   /* this returns 1 if the internal object data implies that the object is */
-   /* currently fulyl opque over the entire gradient it occupies */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   return 0;
-}
-
-static int
-evas_object_textblock_was_opaque(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   /* this returns 1 if the internal object data implies that the object was */
-   /* currently fulyl opque over the entire gradient it occupies */
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   return 0;
-}
-
-static void
-evas_object_textblock_coords_recalc(Evas_Object *obj)
-{
-   Evas_Object_Textblock *o;
-
-   o = (Evas_Object_Textblock *)(obj->object_data);
-   if ((obj->cur.geometry.w != o->last_w) ||
-       (obj->cur.geometry.h != o->last_h))
-     {
-	o->format.dirty = 1;
-	o->changed = 1;
-     }
-}