1 files changed, 60 insertions, 5 deletions

diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c
index 44a1c03245..a81bcded34 100644
--- a/lib/skin_parser/skin_parser.c
+++ b/lib/skin_parser/skin_parser.c
@@ -182,12 +182,26 @@ static struct skin_element* skin_parse_viewport(const char** document)
             }
             else if(*cursor == TAGSYM)
             {
-                skip_tag(&cursor);
+                /* A ';' directly after a '%' doesn't count */
+                cursor ++;
+
+                if(*cursor == '\0')
+                    break;
+
+                cursor++;
             }
             else if(*cursor == COMMENTSYM)
             {
                 skip_comment(&cursor);
             }
+            else if(*cursor == ARGLISTOPENSYM)
+            {
+                skip_arglist(&cursor);
+            }
+            else if(*cursor == ENUMLISTOPENSYM)
+            {
+                skip_enumlist(&cursor);
+            }
             else
             {
                 /* Advancing the cursor as normal */
@@ -431,9 +445,20 @@ static struct skin_element* skin_parse_sublines_optional(const char** document,
         {
             skip_comment(&cursor);
         }
+        else if(*cursor == ENUMLISTOPENSYM)
+        {
+            skip_enumlist(&cursor);
+        }
+        else if(*cursor == ARGLISTOPENSYM)
+        {
+            skip_arglist(&cursor);
+        }
         else if(*cursor == TAGSYM)
         {
-            skip_tag(&cursor);
+            cursor++;
+            if(*cursor == '\0' || *cursor == '\n')
+                break;
+            cursor++;
         }
         else if(*cursor == MULTILINESYM)
         {
@@ -570,12 +595,19 @@ static int skin_parse_tag(struct skin_element* element, const char** document)
         /* Skipping over escaped characters */
         if(*cursor == TAGSYM)
         {
-            skip_tag(&cursor);
+            cursor++;
+            if(*cursor == '\0')
+                break;
+            cursor++;
         }
         else if(*cursor == COMMENTSYM)
         {
             skip_comment(&cursor);
         }
+        else if(*cursor == ARGLISTOPENSYM)
+        {
+            skip_arglist(&cursor);
+        }
         else if(*cursor == ARGLISTSEPARATESYM)
         {
             num_args++;
@@ -942,9 +974,18 @@ static int skin_parse_conditional(struct skin_element* element, const char** doc
         {
             skip_comment(&cursor);
         }
+        else if(*cursor == ENUMLISTOPENSYM)
+        {
+            if (*cursor == '\n')
+                cursor++;
+            skip_enumlist(&cursor);
+        }
         else if(*cursor == TAGSYM)
         {
-            skip_tag(&cursor);
+            cursor++;
+            if(*cursor == '\0' || *cursor == '\n')
+                break;
+            cursor++;
         }
         else if(*cursor == ENUMLISTSEPARATESYM)
         {
@@ -1098,7 +1139,21 @@ static struct skin_element* skin_parse_code_as_arg(const char** document)
         }
         else if(*cursor == TAGSYM)
         {
-            skip_tag(&cursor);
+            /* A ';' directly after a '%' doesn't count */
+            cursor ++;
+
+            if(*cursor == '\0')
+                break;
+
+            cursor++;
+        }
+        else if(*cursor == ARGLISTOPENSYM)
+        {
+            skip_arglist(&cursor);
+        }
+        else if(*cursor == ENUMLISTOPENSYM)
+        {
+            skip_enumlist(&cursor);
         }
         else
         {