Elm: Update the lib to use the new self-closing textblock tags.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66035 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index d3111f7..9a5884c 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -154,9 +154,9 @@ static Eina_Bool pasteimage_append(char *file, Evas_Object *entry);
 /* Optimisation: Turn this into a 256 byte table:
  *     then can lookup in one index, not N checks */
 static const Escape escapes[] = {
-  { "<ps>",  _PARAGRAPH_SEPARATOR },
-  { "<br>",  "\n" },
-  { "<\t>",  "\t" },
+  { "<ps/>",  _PARAGRAPH_SEPARATOR },
+  { "<br/>",  "\n" },
+  { "<\t/>",  "\t" },
   { "&gt;",   ">" },
   { "&lt;",    "<" },
   { "&amp;",   "&" },

diff --git a/src/lib/elm_util.c b/src/lib/elm_util.c
index aea709c..735da34 100644 (file)
--- a/src/lib/elm_util.c
+++ b/src/lib/elm_util.c
@@ -177,9 +177,9 @@ _elm_util_text_to_mkup(const char *text)
         pos2 = evas_string_char_next_get((char *)(text), pos2, &ch);
         if ((ch <= 0) || (pos2 <= 0)) break;
         if (ch == '\n')
-          str = _str_append(str, "<br>", &str_len, &str_alloc);
+          str = _str_append(str, "<br/>", &str_len, &str_alloc);
         else if (ch == '\t')
-          str = _str_append(str, "<\t>", &str_len, &str_alloc);
+          str = _str_append(str, "<\t/>", &str_len, &str_alloc);
         else if (ch == '<')
           str = _str_append(str, "&lt;", &str_len, &str_alloc);
         else if (ch == '>')
@@ -187,7 +187,7 @@ _elm_util_text_to_mkup(const char *text)
         else if (ch == '&')
           str = _str_append(str, "&amp;", &str_len, &str_alloc);
         else if (ch == 0x2029) /* PS */
-          str = _str_append(str, "<ps>", &str_len, &str_alloc);
+          str = _str_append(str, "<ps/>", &str_len, &str_alloc);
         else
           {
              char tstr[16];