E SVN: tasn IN trunk/evas: . src/lib/canvas

[Enlightenment S. <no-...@en...>]

Log:
Evas textblock: Added "lang" to markup to set the language.

Author:       tasn
Date:         2011-08-01 01:21:15 -0700 (Mon, 01 Aug 2011)
New Revision: 61942
Trac:         http://trac.enlightenment.org/e/changeset/61942

Modified:
  trunk/evas/ChangeLog trunk/evas/src/lib/canvas/evas_object_textblock.c 

Modified: trunk/evas/ChangeLog
===================================================================
--- trunk/evas/ChangeLog	2011-08-01 08:21:12 UTC (rev 61941)
+++ trunk/evas/ChangeLog	2011-08-01 08:21:15 UTC (rev 61942)
@@ -449,3 +449,7 @@
 	* Textblock: Added font_width.
 	  This allows overriding the font width set using:
 	  font=':style=Condensed'
+
+2011-08-01  Tom Hacohen (TAsn)
+
+	* Textblock: Added lang to markup to set the lang of the text.

Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c
===================================================================
--- trunk/evas/src/lib/canvas/evas_object_textblock.c	2011-08-01 08:21:12 UTC (rev 61941)
+++ trunk/evas/src/lib/canvas/evas_object_textblock.c	2011-08-01 08:21:15 UTC (rev 61942)
@@ -990,6 +990,7 @@
 static const char *font_weightstr = NULL;
 static const char *font_stylestr = NULL;
 static const char *font_widthstr = NULL;
+static const char *langstr = NULL;
 static const char *colorstr = NULL;
 static const char *underline_colorstr = NULL;
 static const char *underline2_colorstr = NULL;
@@ -1034,6 +1035,7 @@
         font_weightstr = eina_stringshare_add("font_weight");
         font_stylestr = eina_stringshare_add("font_style");
         font_widthstr = eina_stringshare_add("font_width");
+        langstr = eina_stringshare_add("lang");
         colorstr = eina_stringshare_add("color");
         underline_colorstr = eina_stringshare_add("underline_color");
         underline2_colorstr = eina_stringshare_add("underline2_color");
@@ -1081,6 +1083,7 @@
    eina_stringshare_del(font_weightstr);
    eina_stringshare_del(font_stylestr);
    eina_stringshare_del(font_widthstr);
+   eina_stringshare_del(langstr);
    eina_stringshare_del(colorstr);
    eina_stringshare_del(underline_colorstr);
    eina_stringshare_del(underline2_colorstr);
@@ -1154,7 +1157,7 @@
 
    /* If we are changing the font, create the fdesc. */
    if ((cmd == font_weightstr) || (cmd == font_widthstr) ||
-         (cmd == font_stylestr) ||
+         (cmd == font_stylestr) || (cmd == langstr) ||
          (cmd == fontstr) || (cmd == font_fallbacksstr))
      {
         if (!fmt->font.fdesc)
@@ -1212,6 +1215,10 @@
         fmt->font.fdesc->width = evas_font_style_find(tmp_param,
               tmp_param + strlen(tmp_param), EVAS_FONT_STYLE_WIDTH);
      }
+   else if (cmd == langstr)
+     {
+        eina_stringshare_replace(&(fmt->font.fdesc->lang), tmp_param);
+     }
    else if (cmd == colorstr)
      _format_color_parse(tmp_param,
            &(fmt->color.normal.r), &(fmt->color.normal.g),