diff options
-rw-r--r-- | apps/gui/wps_parser.c | 3 | ||||
-rw-r--r-- | wps/iAmp.160x128x1.wps | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 8e726f1b9d..c0a1202eb8 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -570,6 +570,7 @@ static int parse_token(const char *wps_bufptr, struct wps_data *wps_data) | |||
570 | case '|': | 570 | case '|': |
571 | case '>': | 571 | case '>': |
572 | case ';': | 572 | case ';': |
573 | case '#': | ||
573 | /* escaped characters */ | 574 | /* escaped characters */ |
574 | token->type = WPS_TOKEN_CHARACTER; | 575 | token->type = WPS_TOKEN_CHARACTER; |
575 | token->value.c = *wps_bufptr; | 576 | token->value.c = *wps_bufptr; |
@@ -728,7 +729,7 @@ condlistend: /* close a conditional. sometimes we want to close them even when | |||
728 | *current_string++ = *(wps_bufptr - 1); | 729 | *current_string++ = *(wps_bufptr - 1); |
729 | 730 | ||
730 | /* continue until we hit something that ends the string */ | 731 | /* continue until we hit something that ends the string */ |
731 | while(wps_bufptr && | 732 | while(wps_bufptr && *wps_bufptr != '#' && |
732 | *wps_bufptr != '%' && *wps_bufptr != ';' && | 733 | *wps_bufptr != '%' && *wps_bufptr != ';' && |
733 | *wps_bufptr != '<' && *wps_bufptr != '>' && | 734 | *wps_bufptr != '<' && *wps_bufptr != '>' && |
734 | *wps_bufptr != '|' && *wps_bufptr != '\n') | 735 | *wps_bufptr != '|' && *wps_bufptr != '\n') |
diff --git a/wps/iAmp.160x128x1.wps b/wps/iAmp.160x128x1.wps index 1312ab377b..a795407531 100644 --- a/wps/iAmp.160x128x1.wps +++ b/wps/iAmp.160x128x1.wps | |||
@@ -4,7 +4,7 @@ | |||
4 | %ac%s%?it<%it|%fn> | 4 | %ac%s%?it<%it|%fn> |
5 | %s%ac%?ia<%ia|%?d1<%d1|Unknown Artist>> | 5 | %s%ac%?ia<%ia|%?d1<%d1|Unknown Artist>> |
6 | 6 | ||
7 | %ac%s%?id<%?in<Track #%in From The LP|From The Album>%t8|%t0>;%?ic<%acComposed by:%t6|%t0>;%ac%sTrack Info:%t6 | 7 | %ac%s%?id<%?in<Track %#%in From The LP|From The Album>%t8|%t0>;%?ic<%acComposed by:%t6|%t0>;%ac%sTrack Info:%t6 |
8 | %ac%s%?id<"%id"%?iy< (%iy)>%t8|%t0>;%?ic<%ac%s%ic%t6|%t0>;%s%ac%fb kbps%?fv< VBR>, %ff Hz%t6 | 8 | %ac%s%?id<"%id"%?iy< (%iy)>%t8|%t0>;%?ic<%ac%s%ic%t6|%t0>;%s%ac%fb kbps%?fv< VBR>, %ff Hz%t6 |
9 | 9 | ||
10 | %pb | 10 | %pb |