From 84a820d6c7c7db6c69bebf65878155b6fa403334 Mon Sep 17 00:00:00 2001
From: jdgordon <jdgordon@a1c6a512-1295-4272-9138-f99709370657>
Date: Tue, 8 Jun 2010 14:52:03 +0000
Subject: [PATCH] change to %Cd to display albumart (instead of %C to make it
 more consistant with %Vd/%Vl and %xd/%xl)

Also assume ; in skins are for sublines.. this means if you want ; in text you need to manually escape it (%;) far less false positives then


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26693 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/skin_engine/skin_parser.c | 2 +-
 utils/skinupdater/skinupdater.c    | 8 ++++++++
 utils/themeeditor/tag_table.c      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index f423340b2..f5d49f9e2 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -390,7 +390,7 @@ static const struct wps_tag all_tags[] = {
     { WPS_NO_TOKEN,                       "Fl",  0,       parse_font_load },
 #ifdef HAVE_ALBUMART
     { WPS_NO_TOKEN,                       "Cl",  0,    parse_albumart_load },
-    { WPS_TOKEN_ALBUMART_DISPLAY,         "C",   WPS_REFRESH_STATIC,  parse_albumart_display },
+    { WPS_TOKEN_ALBUMART_DISPLAY,         "Cd",   WPS_REFRESH_STATIC,  parse_albumart_display },
 #endif
 
     { WPS_VIEWPORT_ENABLE,                "Vd",  WPS_REFRESH_DYNAMIC,
diff --git a/utils/skinupdater/skinupdater.c b/utils/skinupdater/skinupdater.c
index f724232ff..d2fbc9cf8 100644
--- a/utils/skinupdater/skinupdater.c
+++ b/utils/skinupdater/skinupdater.c
@@ -190,6 +190,10 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
         PUTCH(out, '(');
         len += 1+dump_arg(out, start+1, 2, true);
     }
+    else if (MATCH("C"))
+    {
+        fprintf(out, "%%Cd");
+    }
     else if (MATCH("Cl"))
     {
         int read;
@@ -395,6 +399,10 @@ top:
                 PUTCH(out, *in++);
             }
         }
+        else if (*in == ';')
+        {
+            PUTCH(out, *in++);
+        }
         else 
         {
             if (find_escape_character(*in))
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/tag_table.c
index 91d1b0bde..f579ce9b1 100644
--- a/utils/themeeditor/tag_table.c
+++ b/utils/themeeditor/tag_table.c
@@ -173,7 +173,7 @@ struct tag_info legal_tags[] =
     
     { SKIN_TOKEN_LOAD_FONT,             "Fl" , "IF"},
     { SKIN_TOKEN_ALBUMART_LOAD,         "Cl" , "IIII|ss"},
-    { SKIN_TOKEN_ALBUMART_DISPLAY,      "C" , ""},
+    { SKIN_TOKEN_ALBUMART_DISPLAY,      "Cd" , ""},
     
     { SKIN_TOKEN_VIEWPORT_ENABLE,       "Vd" , "S"},
     { SKIN_TOKEN_UIVIEWPORT_ENABLE,     "VI" , "S"},
-- 
2.11.4.GIT