Broken WPS with recent SVN changes -- SOLVED

[epithetless]

It seems recent changes to the SVN WPS code have broken my H3XX/iPod Photo/Sansa Fuze "XL Fuzed" theme -- and the "XL" theme from which it was derived. I thought the warning in Jonathan Gordon's "check your %xl lines!" email might have had something to do with it, but I gave the WPS a thorough look and I'm still not able to identify the problem. I'd really appreciate another set of eyes on this. The WPS is as follows:

Code: [Select]

#__________________________________________
#                     
#              - XL Fuzed -
#
#                [v1.1.1]
#
#               based on XL
#        by James Denman AKA Denny
#     (JamesDenman[at]googlemail.com)
#
#  Modified by David Thacker AKA epithetless
#        (epithetless[at]yahoo.com)
#
#       [Last Modified on 8/19/2009]
#__________________________________________
#
# This wps is released under the following license:
# Creative Commons Attribution-Share Alike 3.0 Unported License
# http://creativecommons.org/licenses/by-sa/3.0/
#__________________________________________
#
%wd
#__________________________________________
#background, progress bar & images:
#
%X|bg.bmp|0|0|
%pb|pb.bmp|37|117|173|14|
#
%xl|a|play.bmp|8|108|
%xl|b|pause.bmp|5|110|
%xl|c|lightning_left.bmp|8|0|
%xl|d|lightning_newleft.bmp|8|0|
%xl|e|sfl.bmp|89|133|
%xl|f|rpt.bmp|122|132|
%xl|g|AAT.bmp|0|23|
%xl|h|norepeat.bmp|122|132|
#
#_______________________________________
#Play/Pause:
#
#
%?mp<%xdb|%xda|%xdb|%xda|%xda>
#
#_______________________________________
#Shuffle & Repeat:
#
#
%?ps<%xde%?mm<|%xdf%Vdf|%xdf%Vdf|%xdf%Vdf|%xdf%Vdf>|%?mm<%Vdg|%xdf%Vdf|%xdf%Vdf|%xdf%Vdf|%xdf%Vdf>>
#
#_______________________________________
#Power Icons & Text Display:
#
#
%?bp<%?bc<%xdd%Vdc|%xdd%Vdb>|%xdd%Vda>
#
#_______________________________________
#Album art and song info:
#
%?C<%C%xdh%Vdd|%Vde%xdg>
#
#
%Cl|9|30|50|50|
%xl|h|aabg.bmp|5|26|
#_______________________________________
#Viewports:
#
#
#power:
#
%Vl|a|33|4|100|16|1|CCCCCC|-| 
%bl%%
#
%Vl|b|33|4|100|16|1|CCCCCC|-| 
AC
#
%Vl|c|33|4|100|16|1|CCCCCC|-| 
Charging [%bl%%]
#
#
#Titles with album art:
#
#Artist:
%Vl|d|67|28|141|-|1|E7E7E7|-| 
%s%?ia<%ia|%?iA<%iA|%?d2<%d2 [NO TAG]|[NO TAG]>>>
#
#Album:
%Vl|d|67|48|141|-|1|E7E7E7|-| 
%s%?id<%id|%?d1<%d1 [NO TAG]|[NO TAG]>>%?iy< (%iy)|>
#
#Track:
%Vl|d|67|68|141|-|1|ffffff|-| 
%s%?it<%it [%pt]|%fn [%pt] [NO TAG]>
#
#
#Titles without album art:
#
#Artist:
%Vl|e|30|28|178|-|1|E7E7E7|-| 
%s%?ia<%ia|%?iA<%iA|%?d2<%d2 [NO TAG]|[NO TAG]>>>
#
#Album:
%Vl|e|30|48|178|-|1|E7E7E7|-| 
%s%?id<%id|%?d1<%d1 [NO TAG]|[NO TAG]>>%?iy< (%iy)|>
#
#Track:
%Vl|e|30|68|178|-|1|ffffff|-| 
%s%?it<%it [%pt]|%fn [%pt] [NO TAG]>
#
#Next:
%V|30|92|178|-|1|B0B0B0|-|
%s%?It<%?Ia<%Ia: %It|%It>|%?Fn<%?D1<%D1: %Fn|%Fn>|>>
#
#Shuffle type:
%Vl|f|142|138|20|16|0|BFBFBF|-| 
%?mm<|all||sfl|ab> 
#
#Time:
%V|39|134|44|16|1|CCCCCC|-| 
%pc 
%V|167|134|44|16|1|CCCCCC|-|
%ar-%pr 
#
#Volume:
%V|171|4|-|16|1|CCCCCC|-|
%pv dB
#
#
#Playlist position:
%V|106|159|100|-|1|CCCCCC|-|
%pp of %pe
#
#
#Codec & Bitrate
%Vl|g|88|138|80|16|0|BFBFBF|-|
%fc %fbkbps

Both themes work fine with r22284 (the SVN revision I was using previously), and their WPS' ceased to display somewhere between that revision and r22430.

Any thoughts on how to fix this?

[pixelma]

Code: [Select]

%xl|h|norepeat.bmp|122|132|
..
%?C<%C%xdh%Vdd|%Vde%xdg>
#
#
%Cl|9|30|50|50|
%xl|h|aabg.bmp|5|26|

I can see a potential problem - there are two images preloaded which use the "h" as identifier, and also only one of them is displayed (the WPS parser got stricter especially with handling the %xl and %xd tags). It should be enough to delete the last one, or - if it should be displayed somewhere - to give it another identifier but I haven't seen a second corresponding %xdh.

[JdGordon]

nice work pixelma that is almost certainly the case (just checked the code and there is indeed a check to make sure image id's arnt duplicated)

[epithetless]

Genius. Thank you, pixelma! I totally missed the shared "h" identifiers. The first "h"-identified image wasn't actually doing anything...so I erased its line of code, moved the other %xl|h| line into its place, and voila! No more blank WPS!