RTL language enhancements by Tomers Shalev and I.

3 new tokens:
%ax - the next token should follow the language direction (what that means is defined by the individual tokens)
%aL - align left on LTR language (same as %al), right on RTL languages
%aR - align right on LTR language (same as %ar), left on RTL languages

This commit adds %ax support to the %V and %Cl tokens. 


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24193 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 31 insertions, 31 deletions

diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index 95eac039ab..bce8b9423d 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -9,8 +9,8 @@
 %xl|D|shuffle-128x128x16.bmp|74|110|
 %xl|E|repeat-128x128x16.bmp|97|110|4|
 %xl|F|playmode-128x128x16.bmp|111|110|5|
-%Cl|4|12|s60|s60|
-%pb|pb-128x128x16.bmp|3|87|122|6|
+%ax%Cl|4|12|s60|s60|
+%ax%pb|pb-128x128x16.bmp|3|87|122|6|
 # images all in the default viewport
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
@@ -23,7 +23,7 @@
 
 
 #NowPlaying - with AA
-%Vl|a|70|12|-|50|1|-|-|
+%ax%Vl|a|70|12|-|50|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -40,4 +40,4 @@
 %V|3|70|122|18|1|-|-|
 %s%ac%Sx|Next:|%?It<%It|%Fn>
 
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%aL%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%aR%pr
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 279d3144b0..6657b01587 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -8,8 +8,8 @@
 %xl|D|shuffle-132x80x16.bmp|86|69|
 %xl|E|repeat-132x80x16.bmp|105|67|4|
 %xl|F|playmode-132x80x16.bmp|118|67|5|
-%Cl|3|14|c40|c40|
-%pb|pb-132x80x16.bmp|2|58|127|6|
+%ax%Cl|3|14|c40|c40|
+%ax%pb|pb-132x80x16.bmp|2|58|127|6|
 %?C<%C%Vda|%Vdb>
 
 #Images
@@ -21,7 +21,7 @@
 %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 
 #NowPlaying - aa
-%Vl|a|48|10|-|48|1|-|-|
+%ax%Vl|a|48|10|-|48|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 2437193374..4c74ddaab7 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -10,8 +10,8 @@
 %xl|D|shuffle-160x128x2.bmp|78|97|
 %xl|E|repeat-160x128x2.bmp|102|97|4|
 %xl|F|playmode-160x128x2.bmp|123|98|5|
-%Cl|5|15|s55|s55|
-%pb|pb-138x110x2.bmp|2|75|134|6|
+%ax%Cl|5|15|s55|s55|
+%ax%pb|pb-138x110x2.bmp|2|75|134|6|
 #images
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
@@ -21,7 +21,7 @@
 %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 %?C<%C%Vda|%Vdb>
 
-%Vl|a|65|10|-|60|1|-|-|
+%ax%Vl|a|65|10|-|60|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -36,4 +36,4 @@
 %s%ac%?It<%It|%Fn>
 
 %V|2|82|134|13|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%aL%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%aR%pr
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index d4375930cc..c7bdbc7611 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -9,8 +9,8 @@
 %xl|D|shuffle-160x128x16.bmp|104|116|
 %xl|E|repeat-160x128x16.bmp|125|112|4|
 %xl|F|playmode-160x128x16.bmp|142|114|5|
-%Cl|7|16|c65|c65|
-%pb|pb-160x128x16.bmp|6|86|149|8|
+%ax%Cl|7|16|c65|c65|
+%ax%pb|pb-160x128x16.bmp|6|86|149|8|
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
 %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
@@ -20,7 +20,7 @@
 %?C<%C%Vda|%Vdb>
 
 # NowPlaying - AA
-%Vl|a|77|10|-|75|1|-|-|
+%ax%Vl|a|77|10|-|75|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -38,5 +38,5 @@
 %s%?It<%It|%Fn>
 
 %V|6|96|149|10|1|-|-|
-%al%pc%ac%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%ar%pr
+%aL%pc%ac%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr%aR%pr
 
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 4ccb180036..5b41c24741 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -11,8 +11,8 @@
 %xl|D|shuffle-160x128x2.bmp|107|115|
 %xl|E|repeat-160x128x2.bmp|127|113|4|
 %xl|F|playmode-160x128x2.bmp|145|114|5|
-%Cl|2|16|s64|s64|
-%pb|pb-160x128x2.bmp|1|86|158|8|
+%ax%Cl|2|16|s64|s64|
+%ax%pb|pb-160x128x2.bmp|1|86|158|8|
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
 %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
@@ -21,7 +21,7 @@
 %?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
 %?C<%C%Vda|%Vdb>
 
-%Vl|a|70|10|-|75|1|-|-|
+%ax%Vl|a|70|10|-|75|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -38,5 +38,5 @@
 %s%ac%?It<%It|%Fn>
 
 %V|1|96|158|10|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%aL%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%aR%pr
 
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index a400c18c07..8a40eef849 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -10,8 +10,8 @@
 %xl|D|shuffle-176x132x16.bmp|120|117|
 %xl|E|repeat-176x132x16.bmp|139|113|4|
 %xl|F|playmode-176x132x16.bmp|156|115|5|
-%Cl|9|16|s65|s65|
-%pb|pb-176x132x16.bmp|8|86|160|8|
+%ax%Cl|9|16|s65|s65|
+%ax%pb|pb-176x132x16.bmp|8|86|160|8|
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
 %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
@@ -21,7 +21,7 @@
 %?C<%C%Vda|%Vdb>
 
 #NowPlaying
-%Vl|a|81|12|-|74|1|-|-|
+%ax%Vl|a|81|12|-|74|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index c5bd219f98..352386f4dd 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -9,8 +9,8 @@
 %xl|D|shuffle-220x176x16.bmp|155|153|
 %xl|E|repeat-220x176x16.bmp|182|151|4|
 %xl|F|playmode-220x176x16.bmp|200|152|5|
-%Cl|15|32|s75|s75|
-%pb|pb-220x176x16.bmp|11|121|199|8|
+%ax%Cl|15|32|s75|s75|
+%ax%pb|pb-220x176x16.bmp|11|121|199|8|
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
 %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
@@ -21,7 +21,7 @@
 #NowPlaying
 %?C<%Vda%C|%Vdb>
 
-%Vl|a|105|30|-|90|1|-|-|
+%ax%Vl|a|105|30|-|90|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -39,4 +39,4 @@
 
 
 %V|11|130|199|20|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%aL%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%aR%pr
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 7efa3f361a..9ba15b6436 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -9,8 +9,8 @@
 %xl|D|shuffle-320x240x16.bmp|218|211|
 %xl|E|repeat-320x240x16.bmp|261|207|4|
 %xl|F|playmode-320x240x16.bmp|286|207|5|
-%Cl|16|32|s120|s120|
-%pb|pb-320x240x16.bmp|10|162|300|15|
+%ax%Cl|16|32|s120|s120|
+%ax%pb|pb-320x240x16.bmp|10|162|300|15|
 %?mh<%xdAa|%xdAb>
 %?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi|%xdBj>>
 %?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi|%xdCj>
@@ -21,7 +21,7 @@
 %?C<%Vda%C|%Vdb>
 #NowPlaying
 
-%Vl|a|153|30|-|130|1|-|-|
+%ax%Vl|a|153|30|-|130|1|-|-|
 %s%al%?it<%it|%fn>
 %s%al%?ia<%ia|%?d2<%d2|(root)>>
 %s%al%?id<%id|%?d1<%d1|(root)>>
@@ -31,7 +31,7 @@
 %s%al%?It<%It|%Fn>
 %s%al%Ia
 
-%Vl|b|0|30|-|130|1|-|-|
+%ax%Vl|b|0|30|-|130|1|-|-|
 %s%ac%?it<%it|%fn>
 %s%ac%?ia<%ia|%?d2<%d2|(root)>>
 %s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -42,5 +42,5 @@
 %s%ac%Ia
 
 %V|10|180|300|20|1|-|-|
-%al%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%ar%pr
+%aL%pc%ac%?Sr<%pe %Sx|of| %pp|%pp %Sx|of| %pe>%aR%pr