[changed] Fonts for textarea test.

[fixed] Memory allocation in TWL renderer.
[fixed] TWL theme file loading.
[changed] SpriteBatch so renderMesh is public.
[fixed] TWL renderer clipping.

The TWL renderer is officially complete!

diff --git a/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.fnt b/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.fnt
index 62ed066..27c263b 100644 (file)
--- a/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.fnt
+++ b/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.fnt
@@ -1,286 +1,342 @@
-info face="Verdana" size=39 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
-common lineHeight=49 base=40 scaleW=256 scaleH=256 pages=1 packed=0\r
-page id=0 file="test.png"\r
+info face="Verdana" size=60 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
+common lineHeight=72 base=61 scaleW=512 scaleH=512 pages=1 packed=0\r
+page id=0 file="font-heading.png"\r
 chars count=95\r
-char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=40    xadvance=13     page=0  chnl=0 \r
-char id=36   x=0     y=0     width=22     height=39     xoffset=2     yoffset=9    xadvance=24     page=0  chnl=0 \r
-char id=124   x=22     y=0     width=5     height=39     xoffset=7     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=125   x=27     y=0     width=20     height=39     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=123   x=47     y=0     width=20     height=39     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=93   x=67     y=0     width=12     height=39     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=91   x=79     y=0     width=12     height=39     xoffset=4     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=41   x=91     y=0     width=14     height=39     xoffset=2     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=40   x=105     y=0     width=13     height=39     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=106   x=118     y=0     width=15     height=39     xoffset=-2     yoffset=11    xadvance=13     page=0  chnl=0 \r
-char id=81   x=133     y=0     width=29     height=38     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=92   x=162     y=0     width=19     height=37     xoffset=1     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=47   x=181     y=0     width=19     height=37     xoffset=-1     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=64   x=200     y=0     width=34     height=35     xoffset=3     yoffset=11    xadvance=39     page=0  chnl=0 \r
-char id=56   x=0     y=39     width=22     height=32     xoffset=2     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=103   x=22     y=39     width=20     height=32     xoffset=2     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=100   x=42     y=39     width=20     height=32     xoffset=2     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=98   x=62     y=39     width=21     height=32     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=127   x=83     y=39     width=32     height=31     xoffset=4     yoffset=10    xadvance=39     page=0  chnl=0 \r
-char id=38   x=115     y=39     width=30     height=31     xoffset=2     yoffset=11    xadvance=28     page=0  chnl=0 \r
-char id=37   x=145     y=39     width=39     height=31     xoffset=2     yoffset=11    xadvance=41     page=0  chnl=0 \r
-char id=59   x=184     y=39     width=10     height=31     xoffset=4     yoffset=18    xadvance=17     page=0  chnl=0 \r
-char id=48   x=194     y=39     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=57   x=216     y=39     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=54   x=0     y=71     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=53   x=22     y=71     width=21     height=31     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=51   x=43     y=71     width=20     height=31     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=121   x=63     y=71     width=22     height=31     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=113   x=85     y=71     width=20     height=31     xoffset=2     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=112   x=105     y=71     width=21     height=31     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=108   x=126     y=71     width=6     height=31     xoffset=3     yoffset=10    xadvance=10     page=0  chnl=0 \r
-char id=107   x=132     y=71     width=21     height=31     xoffset=3     yoffset=10    xadvance=23     page=0  chnl=0 \r
-char id=104   x=153     y=71     width=20     height=31     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=102   x=173     y=71     width=16     height=31     xoffset=1     yoffset=10    xadvance=13     page=0  chnl=0 \r
-char id=85   x=189     y=71     width=24     height=31     xoffset=3     yoffset=11    xadvance=28     page=0  chnl=0 \r
-char id=83   x=213     y=71     width=24     height=31     xoffset=2     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=79   x=0     y=102     width=28     height=31     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=74   x=28     y=102     width=16     height=31     xoffset=0     yoffset=11    xadvance=17     page=0  chnl=0 \r
-char id=71   x=44     y=102     width=27     height=31     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=67   x=71     y=102     width=25     height=31     xoffset=2     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=35   x=96     y=102     width=27     height=30     xoffset=3     yoffset=11    xadvance=31     page=0  chnl=0 \r
-char id=63   x=123     y=102     width=18     height=30     xoffset=3     yoffset=11    xadvance=21     page=0  chnl=0 \r
-char id=33   x=141     y=102     width=6     height=30     xoffset=5     yoffset=11    xadvance=15     page=0  chnl=0 \r
-char id=55   x=147     y=102     width=22     height=30     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=52   x=169     y=102     width=23     height=30     xoffset=1     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=50   x=192     y=102     width=21     height=30     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=49   x=213     y=102     width=17     height=30     xoffset=5     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=116   x=230     y=102     width=15     height=30     xoffset=1     yoffset=12    xadvance=15     page=0  chnl=0 \r
-char id=105   x=245     y=102     width=6     height=30     xoffset=3     yoffset=11    xadvance=10     page=0  chnl=0 \r
-char id=90   x=0     y=133     width=24     height=30     xoffset=2     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=89   x=24     y=133     width=25     height=30     xoffset=0     yoffset=11    xadvance=23     page=0  chnl=0 \r
-char id=88   x=49     y=133     width=26     height=30     xoffset=1     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=87   x=75     y=133     width=37     height=30     xoffset=1     yoffset=11    xadvance=38     page=0  chnl=0 \r
-char id=86   x=112     y=133     width=28     height=30     xoffset=0     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=84   x=140     y=133     width=26     height=30     xoffset=0     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=82   x=166     y=133     width=26     height=30     xoffset=3     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=80   x=192     y=133     width=21     height=30     xoffset=3     yoffset=11    xadvance=23     page=0  chnl=0 \r
-char id=78   x=213     y=133     width=24     height=30     xoffset=3     yoffset=11    xadvance=29     page=0  chnl=0 \r
-char id=77   x=0     y=163     width=28     height=30     xoffset=3     yoffset=11    xadvance=32     page=0  chnl=0 \r
-char id=76   x=28     y=163     width=20     height=30     xoffset=3     yoffset=11    xadvance=21     page=0  chnl=0 \r
-char id=75   x=48     y=163     width=25     height=30     xoffset=3     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=73   x=73     y=163     width=13     height=30     xoffset=2     yoffset=11    xadvance=16     page=0  chnl=0 \r
-char id=72   x=86     y=163     width=24     height=30     xoffset=3     yoffset=11    xadvance=29     page=0  chnl=0 \r
-char id=70   x=110     y=163     width=20     height=30     xoffset=3     yoffset=11    xadvance=22     page=0  chnl=0 \r
-char id=69   x=130     y=163     width=21     height=30     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=68   x=151     y=163     width=26     height=30     xoffset=3     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=66   x=177     y=163     width=24     height=30     xoffset=3     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=65   x=201     y=163     width=28     height=30     xoffset=0     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=43   x=229     y=163     width=25     height=26     xoffset=4     yoffset=15    xadvance=31     page=0  chnl=0 \r
-char id=62   x=0     y=193     width=24     height=24     xoffset=5     yoffset=16    xadvance=31     page=0  chnl=0 \r
-char id=60   x=24     y=193     width=24     height=24     xoffset=4     yoffset=16    xadvance=31     page=0  chnl=0 \r
-char id=117   x=48     y=193     width=20     height=24     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=115   x=68     y=193     width=18     height=24     xoffset=2     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=111   x=86     y=193     width=21     height=24     xoffset=2     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=101   x=107     y=193     width=21     height=24     xoffset=2     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=99   x=128     y=193     width=19     height=24     xoffset=2     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=97   x=147     y=193     width=21     height=24     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=58   x=168     y=193     width=7     height=23     xoffset=6     yoffset=18    xadvance=17     page=0  chnl=0 \r
-char id=122   x=175     y=193     width=19     height=23     xoffset=1     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=120   x=194     y=193     width=22     height=23     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=119   x=216     y=193     width=31     height=23     xoffset=1     yoffset=18    xadvance=31     page=0  chnl=0 \r
-char id=118   x=0     y=217     width=22     height=23     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=114   x=22     y=217     width=15     height=23     xoffset=3     yoffset=18    xadvance=16     page=0  chnl=0 \r
-char id=110   x=37     y=217     width=20     height=23     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=109   x=57     y=217     width=33     height=23     xoffset=3     yoffset=18    xadvance=37     page=0  chnl=0 \r
-char id=42   x=90     y=217     width=20     height=19     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=94   x=110     y=217     width=27     height=18     xoffset=3     yoffset=11    xadvance=31     page=0  chnl=0 \r
-char id=44   x=137     y=217     width=10     height=15     xoffset=2     yoffset=34    xadvance=14     page=0  chnl=0 \r
-char id=61   x=147     y=217     width=25     height=13     xoffset=4     yoffset=22    xadvance=31     page=0  chnl=0 \r
-char id=39   x=172     y=217     width=6     height=13     xoffset=3     yoffset=10    xadvance=10     page=0  chnl=0 \r
-char id=34   x=178     y=217     width=13     height=13     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=126   x=191     y=217     width=27     height=12     xoffset=3     yoffset=22    xadvance=31     page=0  chnl=0 \r
-char id=96   x=218     y=217     width=10     height=9     xoffset=6     yoffset=8    xadvance=24     page=0  chnl=0 \r
-char id=46   x=228     y=217     width=7     height=7     xoffset=4     yoffset=34    xadvance=14     page=0  chnl=0 \r
-char id=45   x=235     y=217     width=14     height=6     xoffset=2     yoffset=25    xadvance=17     page=0  chnl=0 \r
-char id=95   x=0     y=240     width=27     height=4     xoffset=-1     yoffset=43    xadvance=24     page=0  chnl=0 \r
-kernings count=369\r
+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=61    xadvance=21     page=0  chnl=0 \r
+char id=41   x=0     y=0     width=24     height=60     xoffset=2     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=40   x=24     y=0     width=24     height=60     xoffset=3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=124   x=48     y=0     width=11     height=59     xoffset=9     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=125   x=59     y=0     width=33     height=59     xoffset=4     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=123   x=92     y=0     width=33     height=59     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=93   x=125     y=0     width=21     height=59     xoffset=3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=91   x=146     y=0     width=21     height=59     xoffset=5     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=36   x=167     y=0     width=35     height=58     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=106   x=202     y=0     width=24     height=58     xoffset=-3     yoffset=16    xadvance=21     page=0  chnl=0 \r
+char id=81   x=226     y=0     width=48     height=58     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=92   x=274     y=0     width=32     height=57     xoffset=0     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=47   x=306     y=0     width=31     height=57     xoffset=-3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=64   x=337     y=0     width=56     height=53     xoffset=3     yoffset=15    xadvance=60     page=0  chnl=0 \r
+char id=100   x=393     y=0     width=35     height=49     xoffset=1     yoffset=14    xadvance=37     page=0  chnl=0 \r
+char id=98   x=428     y=0     width=35     height=49     xoffset=3     yoffset=14    xadvance=37     page=0  chnl=0 \r
+char id=38   x=463     y=0     width=48     height=48     xoffset=1     yoffset=15    xadvance=44     page=0  chnl=0 \r
+char id=37   x=0     y=60     width=62     height=48     xoffset=2     yoffset=15    xadvance=65     page=0  chnl=0 \r
+char id=48   x=62     y=60     width=36     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=57   x=98     y=60     width=37     height=48     xoffset=1     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=56   x=135     y=60     width=36     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=54   x=171     y=60     width=37     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=53   x=208     y=60     width=35     height=48     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=51   x=243     y=60     width=34     height=48     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=113   x=277     y=60     width=35     height=48     xoffset=1     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=112   x=312     y=60     width=35     height=48     xoffset=3     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=108   x=347     y=60     width=12     height=48     xoffset=3     yoffset=14    xadvance=16     page=0  chnl=0 \r
+char id=107   x=359     y=60     width=35     height=48     xoffset=4     yoffset=14    xadvance=36     page=0  chnl=0 \r
+char id=104   x=394     y=60     width=34     height=48     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=103   x=428     y=60     width=35     height=48     xoffset=1     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=102   x=463     y=60     width=29     height=48     xoffset=0     yoffset=14    xadvance=21     page=0  chnl=0 \r
+char id=83   x=0     y=108     width=39     height=48     xoffset=2     yoffset=15    xadvance=41     page=0  chnl=0 \r
+char id=79   x=39     y=108     width=47     height=48     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=71   x=86     y=108     width=46     height=48     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=67   x=132     y=108     width=43     height=48     xoffset=1     yoffset=15    xadvance=42     page=0  chnl=0 \r
+char id=127   x=175     y=108     width=51     height=47     xoffset=6     yoffset=15    xadvance=60     page=0  chnl=0 \r
+char id=63   x=226     y=108     width=31     height=47     xoffset=3     yoffset=15    xadvance=33     page=0  chnl=0 \r
+char id=50   x=257     y=108     width=35     height=47     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=121   x=292     y=108     width=37     height=47     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=85   x=329     y=108     width=40     height=47     xoffset=3     yoffset=16    xadvance=44     page=0  chnl=0 \r
+char id=74   x=369     y=108     width=27     height=47     xoffset=-1     yoffset=16    xadvance=27     page=0  chnl=0 \r
+char id=35   x=396     y=108     width=44     height=46     xoffset=4     yoffset=16    xadvance=49     page=0  chnl=0 \r
+char id=59   x=440     y=108     width=18     height=46     xoffset=4     yoffset=27    xadvance=27     page=0  chnl=0 \r
+char id=33   x=458     y=108     width=12     height=46     xoffset=7     yoffset=16    xadvance=24     page=0  chnl=0 \r
+char id=55   x=470     y=108     width=36     height=46     xoffset=3     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=52   x=0     y=156     width=39     height=46     xoffset=0     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=49   x=39     y=156     width=30     height=46     xoffset=6     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=105   x=69     y=156     width=12     height=46     xoffset=3     yoffset=16    xadvance=16     page=0  chnl=0 \r
+char id=90   x=81     y=156     width=40     height=46     xoffset=2     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=89   x=121     y=156     width=43     height=46     xoffset=-2     yoffset=16    xadvance=37     page=0  chnl=0 \r
+char id=88   x=164     y=156     width=42     height=46     xoffset=0     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=87   x=206     y=156     width=58     height=46     xoffset=1     yoffset=16    xadvance=59     page=0  chnl=0 \r
+char id=86   x=264     y=156     width=44     height=46     xoffset=-1     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=84   x=308     y=156     width=44     height=46     xoffset=-2     yoffset=16    xadvance=37     page=0  chnl=0 \r
+char id=82   x=352     y=156     width=41     height=46     xoffset=4     yoffset=16    xadvance=42     page=0  chnl=0 \r
+char id=80   x=393     y=156     width=34     height=46     xoffset=4     yoffset=16    xadvance=36     page=0  chnl=0 \r
+char id=78   x=427     y=156     width=39     height=46     xoffset=4     yoffset=16    xadvance=45     page=0  chnl=0 \r
+char id=77   x=466     y=156     width=45     height=46     xoffset=4     yoffset=16    xadvance=51     page=0  chnl=0 \r
+char id=76   x=0     y=202     width=33     height=46     xoffset=4     yoffset=16    xadvance=33     page=0  chnl=0 \r
+char id=75   x=33     y=202     width=40     height=46     xoffset=4     yoffset=16    xadvance=42     page=0  chnl=0 \r
+char id=73   x=73     y=202     width=24     height=46     xoffset=2     yoffset=16    xadvance=26     page=0  chnl=0 \r
+char id=72   x=97     y=202     width=39     height=46     xoffset=4     yoffset=16    xadvance=45     page=0  chnl=0 \r
+char id=70   x=136     y=202     width=33     height=46     xoffset=4     yoffset=16    xadvance=34     page=0  chnl=0 \r
+char id=69   x=169     y=202     width=35     height=46     xoffset=4     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=68   x=204     y=202     width=42     height=46     xoffset=4     yoffset=16    xadvance=46     page=0  chnl=0 \r
+char id=66   x=246     y=202     width=39     height=46     xoffset=4     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=65   x=285     y=202     width=44     height=46     xoffset=-1     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=116   x=329     y=202     width=28     height=45     xoffset=-1     yoffset=18    xadvance=24     page=0  chnl=0 \r
+char id=43   x=357     y=202     width=43     height=39     xoffset=4     yoffset=23    xadvance=49     page=0  chnl=0 \r
+char id=115   x=400     y=202     width=32     height=37     xoffset=1     yoffset=26    xadvance=31     page=0  chnl=0 \r
+char id=111   x=432     y=202     width=36     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=101   x=468     y=202     width=36     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=99   x=0     y=248     width=32     height=37     xoffset=1     yoffset=26    xadvance=31     page=0  chnl=0 \r
+char id=97   x=32     y=248     width=34     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=117   x=66     y=248     width=34     height=36     xoffset=3     yoffset=27    xadvance=38     page=0  chnl=0 \r
+char id=110   x=100     y=248     width=34     height=36     xoffset=3     yoffset=26    xadvance=38     page=0  chnl=0 \r
+char id=109   x=134     y=248     width=54     height=36     xoffset=4     yoffset=26    xadvance=58     page=0  chnl=0 \r
+char id=62   x=188     y=248     width=40     height=35     xoffset=6     yoffset=25    xadvance=49     page=0  chnl=0 \r
+char id=60   x=228     y=248     width=40     height=35     xoffset=5     yoffset=25    xadvance=49     page=0  chnl=0 \r
+char id=58   x=268     y=248     width=13     height=35     xoffset=8     yoffset=27    xadvance=27     page=0  chnl=0 \r
+char id=122   x=281     y=248     width=33     height=35     xoffset=1     yoffset=27    xadvance=32     page=0  chnl=0 \r
+char id=120   x=314     y=248     width=37     height=35     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=119   x=351     y=248     width=49     height=35     xoffset=1     yoffset=27    xadvance=49     page=0  chnl=0 \r
+char id=118   x=400     y=248     width=37     height=35     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=114   x=437     y=248     width=27     height=35     xoffset=3     yoffset=27    xadvance=26     page=0  chnl=0 \r
+char id=42   x=464     y=248     width=33     height=29     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=94   x=0     y=285     width=43     height=26     xoffset=3     yoffset=16    xadvance=49     page=0  chnl=0 \r
+char id=44   x=43     y=285     width=18     height=21     xoffset=2     yoffset=52    xadvance=22     page=0  chnl=0 \r
+char id=126   x=61     y=285     width=43     height=19     xoffset=3     yoffset=33    xadvance=49     page=0  chnl=0 \r
+char id=61   x=104     y=285     width=41     height=19     xoffset=5     yoffset=32    xadvance=49     page=0  chnl=0 \r
+char id=39   x=145     y=285     width=11     height=19     xoffset=3     yoffset=14    xadvance=16     page=0  chnl=0 \r
+char id=34   x=156     y=285     width=23     height=19     xoffset=3     yoffset=14    xadvance=28     page=0  chnl=0 \r
+char id=96   x=179     y=285     width=17     height=13     xoffset=8     yoffset=11    xadvance=38     page=0  chnl=0 \r
+char id=46   x=196     y=285     width=13     height=10     xoffset=5     yoffset=52    xadvance=22     page=0  chnl=0 \r
+char id=45   x=209     y=285     width=24     height=7     xoffset=2     yoffset=38    xadvance=27     page=0  chnl=0 \r
+char id=95   x=233     y=285     width=44     height=5     xoffset=-2     yoffset=65    xadvance=38     page=0  chnl=0 \r
+kernings count=482\r
 kerning first=81  second=44  amount=-1\r
 kerning first=81  second=46  amount=-1\r
 kerning first=98  second=44  amount=-1\r
-kerning first=121  second=44  amount=-4\r
-kerning first=121  second=45  amount=-1\r
-kerning first=121  second=46  amount=-4\r
-kerning first=121  second=97  amount=-1\r
+kerning first=98  second=46  amount=-1\r
 kerning first=112  second=44  amount=-1\r
-kerning first=107  second=45  amount=-2\r
-kerning first=102  second=34  amount=1\r
-kerning first=102  second=39  amount=1\r
-kerning first=102  second=41  amount=2\r
+kerning first=112  second=46  amount=-1\r
+kerning first=107  second=45  amount=-3\r
+kerning first=107  second=101  amount=-1\r
+kerning first=107  second=111  amount=-1\r
+kerning first=104  second=118  amount=-1\r
+kerning first=104  second=121  amount=-1\r
+kerning first=102  second=34  amount=2\r
+kerning first=102  second=39  amount=2\r
+kerning first=102  second=41  amount=3\r
 kerning first=102  second=42  amount=1\r
-kerning first=102  second=44  amount=-2\r
+kerning first=102  second=44  amount=-4\r
 kerning first=102  second=45  amount=-1\r
-kerning first=102  second=46  amount=-2\r
-kerning first=102  second=63  amount=2\r
-kerning first=102  second=92  amount=2\r
-kerning first=102  second=93  amount=2\r
-kerning first=102  second=125  amount=2\r
+kerning first=102  second=46  amount=-4\r
+kerning first=102  second=63  amount=3\r
+kerning first=102  second=92  amount=3\r
+kerning first=102  second=93  amount=3\r
+kerning first=102  second=125  amount=3\r
+kerning first=83  second=44  amount=-1\r
+kerning first=83  second=46  amount=-1\r
+kerning first=83  second=65  amount=-1\r
+kerning first=83  second=83  amount=-1\r
 kerning first=83  second=118  amount=-1\r
+kerning first=83  second=119  amount=-1\r
 kerning first=83  second=121  amount=-1\r
 kerning first=79  second=44  amount=-1\r
 kerning first=79  second=46  amount=-1\r
 kerning first=79  second=84  amount=-1\r
+kerning first=79  second=89  amount=-1\r
+kerning first=79  second=90  amount=-1\r
 kerning first=67  second=45  amount=-1\r
-kerning first=116  second=45  amount=-1\r
-kerning first=90  second=45  amount=-1\r
+kerning first=121  second=44  amount=-6\r
+kerning first=121  second=45  amount=-1\r
+kerning first=121  second=46  amount=-6\r
+kerning first=121  second=97  amount=-1\r
+kerning first=121  second=99  amount=-1\r
+kerning first=121  second=101  amount=-1\r
+kerning first=121  second=111  amount=-1\r
+kerning first=85  second=44  amount=-1\r
+kerning first=85  second=46  amount=-1\r
+kerning first=74  second=44  amount=-1\r
+kerning first=74  second=46  amount=-1\r
+kerning first=90  second=45  amount=-2\r
+kerning first=90  second=67  amount=-1\r
+kerning first=90  second=71  amount=-1\r
+kerning first=90  second=79  amount=-1\r
 kerning first=90  second=97  amount=-1\r
-kerning first=90  second=101  amount=-1\r
-kerning first=90  second=111  amount=-1\r
+kerning first=90  second=101  amount=-2\r
+kerning first=90  second=111  amount=-2\r
 kerning first=90  second=119  amount=-1\r
-kerning first=90  second=121  amount=-1\r
-kerning first=89  second=44  amount=-6\r
-kerning first=89  second=45  amount=-3\r
-kerning first=89  second=46  amount=-6\r
-kerning first=89  second=58  amount=-4\r
-kerning first=89  second=59  amount=-4\r
+kerning first=90  second=121  amount=-2\r
+kerning first=89  second=44  amount=-8\r
+kerning first=89  second=45  amount=-4\r
+kerning first=89  second=46  amount=-8\r
+kerning first=89  second=58  amount=-6\r
+kerning first=89  second=59  amount=-6\r
 kerning first=89  second=65  amount=-2\r
-kerning first=89  second=97  amount=-3\r
-kerning first=89  second=100  amount=-2\r
-kerning first=89  second=101  amount=-2\r
-kerning first=89  second=103  amount=-2\r
-kerning first=89  second=109  amount=-2\r
-kerning first=89  second=110  amount=-2\r
-kerning first=89  second=111  amount=-2\r
-kerning first=89  second=112  amount=-2\r
-kerning first=89  second=113  amount=-2\r
-kerning first=89  second=114  amount=-2\r
-kerning first=89  second=115  amount=-2\r
-kerning first=89  second=117  amount=-2\r
-kerning first=89  second=118  amount=-2\r
+kerning first=89  second=79  amount=-1\r
+kerning first=89  second=97  amount=-4\r
+kerning first=89  second=100  amount=-4\r
+kerning first=89  second=101  amount=-4\r
+kerning first=89  second=103  amount=-4\r
+kerning first=89  second=109  amount=-3\r
+kerning first=89  second=110  amount=-3\r
+kerning first=89  second=111  amount=-4\r
+kerning first=89  second=112  amount=-3\r
+kerning first=89  second=113  amount=-4\r
+kerning first=89  second=114  amount=-3\r
+kerning first=89  second=115  amount=-3\r
+kerning first=89  second=117  amount=-3\r
+kerning first=89  second=118  amount=-3\r
 kerning first=88  second=45  amount=-2\r
 kerning first=88  second=97  amount=-1\r
-kerning first=88  second=101  amount=-1\r
-kerning first=88  second=111  amount=-1\r
+kerning first=88  second=101  amount=-2\r
+kerning first=88  second=111  amount=-2\r
 kerning first=88  second=117  amount=-1\r
 kerning first=88  second=121  amount=-2\r
-kerning first=87  second=44  amount=-6\r
+kerning first=87  second=44  amount=-8\r
 kerning first=87  second=45  amount=-1\r
-kerning first=87  second=46  amount=-4\r
+kerning first=87  second=46  amount=-6\r
 kerning first=87  second=58  amount=-2\r
 kerning first=87  second=59  amount=-2\r
 kerning first=87  second=65  amount=-1\r
-kerning first=87  second=97  amount=-2\r
-kerning first=87  second=101  amount=-2\r
-kerning first=87  second=111  amount=-2\r
-kerning first=87  second=114  amount=-1\r
-kerning first=87  second=117  amount=-1\r
-kerning first=87  second=121  amount=-1\r
-kerning first=86  second=44  amount=-6\r
+kerning first=87  second=97  amount=-3\r
+kerning first=87  second=101  amount=-3\r
+kerning first=87  second=111  amount=-3\r
+kerning first=87  second=114  amount=-2\r
+kerning first=87  second=117  amount=-2\r
+kerning first=87  second=121  amount=-2\r
+kerning first=86  second=44  amount=-8\r
 kerning first=86  second=45  amount=-1\r
-kerning first=86  second=46  amount=-6\r
+kerning first=86  second=46  amount=-8\r
 kerning first=86  second=58  amount=-2\r
 kerning first=86  second=59  amount=-2\r
-kerning first=86  second=65  amount=-1\r
-kerning first=86  second=97  amount=-2\r
-kerning first=86  second=101  amount=-2\r
-kerning first=86  second=111  amount=-2\r
-kerning first=86  second=117  amount=-1\r
-kerning first=86  second=121  amount=-1\r
-kerning first=84  second=44  amount=-6\r
-kerning first=84  second=45  amount=-3\r
-kerning first=84  second=46  amount=-6\r
-kerning first=84  second=58  amount=-4\r
-kerning first=84  second=59  amount=-4\r
-kerning first=84  second=63  amount=1\r
-kerning first=84  second=65  amount=-2\r
+kerning first=86  second=65  amount=-2\r
+kerning first=86  second=97  amount=-3\r
+kerning first=86  second=101  amount=-3\r
+kerning first=86  second=111  amount=-3\r
+kerning first=86  second=117  amount=-2\r
+kerning first=86  second=121  amount=-2\r
+kerning first=84  second=44  amount=-8\r
+kerning first=84  second=45  amount=-4\r
+kerning first=84  second=46  amount=-8\r
+kerning first=84  second=58  amount=-6\r
+kerning first=84  second=59  amount=-6\r
+kerning first=84  second=63  amount=2\r
+kerning first=84  second=65  amount=-4\r
 kerning first=84  second=67  amount=-1\r
 kerning first=84  second=71  amount=-1\r
 kerning first=84  second=79  amount=-1\r
-kerning first=84  second=84  amount=-1\r
-kerning first=84  second=97  amount=-5\r
-kerning first=84  second=99  amount=-4\r
-kerning first=84  second=101  amount=-4\r
-kerning first=84  second=103  amount=-4\r
-kerning first=84  second=111  amount=-4\r
-kerning first=84  second=114  amount=-4\r
-kerning first=84  second=115  amount=-3\r
-kerning first=84  second=117  amount=-4\r
-kerning first=84  second=118  amount=-4\r
-kerning first=84  second=119  amount=-4\r
-kerning first=84  second=121  amount=-4\r
-kerning first=84  second=122  amount=-3\r
-kerning first=82  second=45  amount=-2\r
-kerning first=82  second=84  amount=-1\r
+kerning first=84  second=84  amount=-2\r
+kerning first=84  second=97  amount=-7\r
+kerning first=84  second=99  amount=-6\r
+kerning first=84  second=101  amount=-6\r
+kerning first=84  second=103  amount=-6\r
+kerning first=84  second=111  amount=-6\r
+kerning first=84  second=114  amount=-6\r
+kerning first=84  second=115  amount=-5\r
+kerning first=84  second=117  amount=-6\r
+kerning first=84  second=118  amount=-6\r
+kerning first=84  second=119  amount=-6\r
+kerning first=84  second=121  amount=-6\r
+kerning first=84  second=122  amount=-5\r
+kerning first=82  second=45  amount=-3\r
+kerning first=82  second=84  amount=-2\r
+kerning first=82  second=89  amount=-1\r
 kerning first=82  second=97  amount=-1\r
 kerning first=82  second=101  amount=-1\r
 kerning first=82  second=111  amount=-1\r
-kerning first=82  second=121  amount=-1\r
-kerning first=80  second=44  amount=-6\r
-kerning first=80  second=46  amount=-6\r
+kerning first=82  second=117  amount=-1\r
+kerning first=82  second=121  amount=-2\r
+kerning first=80  second=44  amount=-9\r
+kerning first=80  second=46  amount=-9\r
 kerning first=80  second=65  amount=-1\r
+kerning first=80  second=89  amount=1\r
 kerning first=80  second=97  amount=-1\r
 kerning first=80  second=101  amount=-1\r
 kerning first=80  second=111  amount=-1\r
-kerning first=76  second=39  amount=-2\r
-kerning first=76  second=45  amount=-3\r
-kerning first=76  second=74  amount=2\r
-kerning first=76  second=84  amount=-3\r
-kerning first=76  second=86  amount=-2\r
-kerning first=76  second=87  amount=-2\r
-kerning first=76  second=89  amount=-3\r
-kerning first=76  second=118  amount=-2\r
-kerning first=76  second=121  amount=-2\r
-kerning first=75  second=45  amount=-2\r
-kerning first=75  second=97  amount=-1\r
-kerning first=75  second=101  amount=-1\r
-kerning first=75  second=111  amount=-1\r
+kerning first=76  second=39  amount=-4\r
+kerning first=76  second=45  amount=-5\r
+kerning first=76  second=67  amount=-1\r
+kerning first=76  second=71  amount=-1\r
+kerning first=76  second=74  amount=3\r
+kerning first=76  second=79  amount=-1\r
+kerning first=76  second=84  amount=-5\r
+kerning first=76  second=86  amount=-3\r
+kerning first=76  second=87  amount=-3\r
+kerning first=76  second=89  amount=-5\r
+kerning first=76  second=118  amount=-3\r
+kerning first=76  second=121  amount=-3\r
+kerning first=75  second=45  amount=-3\r
+kerning first=75  second=79  amount=-1\r
+kerning first=75  second=97  amount=-2\r
+kerning first=75  second=101  amount=-2\r
+kerning first=75  second=111  amount=-2\r
 kerning first=75  second=117  amount=-1\r
 kerning first=75  second=118  amount=-2\r
-kerning first=75  second=119  amount=-1\r
+kerning first=75  second=119  amount=-2\r
 kerning first=75  second=121  amount=-2\r
 kerning first=73  second=45  amount=-1\r
-kerning first=70  second=44  amount=-6\r
-kerning first=70  second=46  amount=-6\r
-kerning first=70  second=58  amount=-1\r
-kerning first=70  second=59  amount=-1\r
-kerning first=70  second=63  amount=1\r
-kerning first=70  second=65  amount=-2\r
+kerning first=70  second=44  amount=-9\r
+kerning first=70  second=46  amount=-9\r
+kerning first=70  second=58  amount=-2\r
+kerning first=70  second=59  amount=-2\r
+kerning first=70  second=63  amount=2\r
+kerning first=70  second=65  amount=-3\r
 kerning first=70  second=84  amount=1\r
-kerning first=70  second=97  amount=-2\r
+kerning first=70  second=97  amount=-3\r
 kerning first=70  second=101  amount=-1\r
 kerning first=70  second=111  amount=-1\r
 kerning first=68  second=44  amount=-1\r
 kerning first=68  second=46  amount=-1\r
 kerning first=68  second=84  amount=-1\r
-kerning first=66  second=84  amount=-1\r
+kerning first=68  second=87  amount=-1\r
+kerning first=68  second=89  amount=-1\r
+kerning first=68  second=90  amount=-1\r
+kerning first=66  second=44  amount=-1\r
+kerning first=66  second=46  amount=-1\r
+kerning first=66  second=84  amount=-2\r
 kerning first=65  second=45  amount=-1\r
-kerning first=65  second=84  amount=-2\r
-kerning first=65  second=86  amount=-1\r
+kerning first=65  second=84  amount=-4\r
+kerning first=65  second=86  amount=-2\r
 kerning first=65  second=87  amount=-1\r
 kerning first=65  second=89  amount=-2\r
+kerning first=65  second=116  amount=-1\r
 kerning first=65  second=118  amount=-1\r
 kerning first=65  second=119  amount=-1\r
 kerning first=65  second=121  amount=-1\r
+kerning first=116  second=45  amount=-1\r
 kerning first=111  second=44  amount=-1\r
-kerning first=101  second=84  amount=-3\r
-kerning first=99  second=84  amount=-1\r
+kerning first=111  second=46  amount=-1\r
+kerning first=111  second=120  amount=-1\r
+kerning first=101  second=84  amount=-4\r
+kerning first=99  second=45  amount=-1\r
+kerning first=99  second=84  amount=-2\r
+kerning first=110  second=118  amount=-1\r
+kerning first=110  second=121  amount=-1\r
+kerning first=109  second=118  amount=-1\r
+kerning first=109  second=121  amount=-1\r
+kerning first=122  second=45  amount=-1\r
 kerning first=120  second=45  amount=-1\r
-kerning first=119  second=44  amount=-1\r
-kerning first=119  second=46  amount=-1\r
-kerning first=118  second=44  amount=-3\r
+kerning first=120  second=99  amount=-1\r
+kerning first=120  second=101  amount=-1\r
+kerning first=120  second=111  amount=-1\r
+kerning first=119  second=44  amount=-2\r
+kerning first=119  second=45  amount=-1\r
+kerning first=119  second=46  amount=-2\r
+kerning first=119  second=97  amount=-1\r
+kerning first=118  second=44  amount=-5\r
 kerning first=118  second=45  amount=-1\r
-kerning first=118  second=46  amount=-3\r
+kerning first=118  second=46  amount=-5\r
 kerning first=118  second=97  amount=-1\r
-kerning first=114  second=44  amount=-6\r
-kerning first=114  second=46  amount=-6\r
+kerning first=118  second=101  amount=-1\r
+kerning first=118  second=111  amount=-1\r
+kerning first=114  second=44  amount=-8\r
+kerning first=114  second=45  amount=-1\r
+kerning first=114  second=46  amount=-8\r
 kerning first=114  second=97  amount=-1\r
-kerning first=39  second=65  amount=-2\r
-kerning first=46  second=44  amount=-2\r
-kerning first=46  second=45  amount=-3\r
+kerning first=39  second=65  amount=-3\r
+kerning first=46  second=44  amount=-4\r
+kerning first=46  second=45  amount=-5\r
 kerning first=45  second=65  amount=-1\r
 kerning first=45  second=73  amount=-1\r
-kerning first=45  second=74  amount=-2\r
-kerning first=45  second=84  amount=-3\r
+kerning first=45  second=74  amount=-3\r
+kerning first=45  second=83  amount=-1\r
+kerning first=45  second=84  amount=-4\r
 kerning first=45  second=86  amount=-1\r
 kerning first=45  second=87  amount=-1\r
 kerning first=45  second=88  amount=-2\r
-kerning first=45  second=89  amount=-3\r
+kerning first=45  second=89  amount=-4\r
 kerning first=45  second=90  amount=-1\r
+kerning first=45  second=97  amount=-1\r
 kerning first=45  second=118  amount=-1\r
+kerning first=45  second=119  amount=-1\r
 kerning first=45  second=120  amount=-1\r
 kerning first=45  second=121  amount=-1\r
 kerning first=45  second=122  amount=-1\r

diff --git a/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.png b/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.png
index f861362..019425a 100644 (file)
Binary files a/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.png and b/extensions/twl/gdx-twl-tests-android/assets/data/font-heading.png differ

diff --git a/extensions/twl/gdx-twl-tests-android/assets/data/font.fnt b/extensions/twl/gdx-twl-tests-android/assets/data/font.fnt
index 1c80719..462e23e 100644 (file)
--- a/extensions/twl/gdx-twl-tests-android/assets/data/font.fnt
+++ b/extensions/twl/gdx-twl-tests-android/assets/data/font.fnt
@@ -1,203 +1,271 @@
-info face="Verdana" size=15 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
-common lineHeight=20 base=16 scaleW=256 scaleH=256 pages=1 packed=0\r
+info face="Verdana" size=30 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
+common lineHeight=38 base=31 scaleW=256 scaleH=256 pages=1 packed=0\r
 page id=0 file="font.png"\r
 chars count=95\r
-char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=16    xadvance=5     page=0  chnl=0 \r
-char id=36   x=0     y=0     width=9     height=17     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=124   x=9     y=0     width=3     height=17     xoffset=3     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=125   x=12     y=0     width=9     height=17     xoffset=2     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=123   x=21     y=0     width=9     height=17     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=93   x=30     y=0     width=6     height=17     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=91   x=36     y=0     width=6     height=17     xoffset=2     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=41   x=42     y=0     width=6     height=17     xoffset=2     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=40   x=48     y=0     width=5     height=17     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=92   x=53     y=0     width=8     height=16     xoffset=0     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=47   x=61     y=0     width=8     height=16     xoffset=0     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=106   x=69     y=0     width=6     height=16     xoffset=0     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=64   x=75     y=0     width=14     height=15     xoffset=1     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=81   x=89     y=0     width=12     height=15     xoffset=1     yoffset=5    xadvance=12     page=0  chnl=0 \r
-char id=108   x=101     y=0     width=3     height=14     xoffset=1     yoffset=3    xadvance=3     page=0  chnl=0 \r
-char id=107   x=104     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=104   x=113     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=100   x=122     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=98   x=131     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=127   x=140     y=0     width=13     height=13     xoffset=2     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=38   x=153     y=0     width=12     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=35   x=165     y=0     width=11     height=13     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=37   x=176     y=0     width=16     height=13     xoffset=1     yoffset=4    xadvance=16     page=0  chnl=0 \r
-char id=59   x=192     y=0     width=4     height=13     xoffset=2     yoffset=7    xadvance=7     page=0  chnl=0 \r
-char id=63   x=196     y=0     width=7     height=13     xoffset=1     yoffset=4    xadvance=8     page=0  chnl=0 \r
-char id=33   x=203     y=0     width=3     height=13     xoffset=2     yoffset=4    xadvance=6     page=0  chnl=0 \r
-char id=57   x=206     y=0     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=55   x=216     y=0     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=54   x=225     y=0     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=53   x=234     y=0     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=52   x=244     y=0     width=11     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=51   x=0     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=49   x=9     y=17     width=7     height=13     xoffset=3     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=121   x=16     y=17     width=10     height=13     xoffset=0     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=113   x=26     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=112   x=35     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=105   x=44     y=17     width=3     height=13     xoffset=1     yoffset=4    xadvance=3     page=0  chnl=0 \r
-char id=103   x=47     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=102   x=56     y=17     width=7     height=13     xoffset=1     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=90   x=63     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=89   x=73     y=17     width=10     height=13     xoffset=0     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=87   x=83     y=17     width=14     height=13     xoffset=1     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=86   x=97     y=17     width=13     height=13     xoffset=-1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=85   x=110     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=84   x=121     y=17     width=11     height=13     xoffset=0     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=83   x=132     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=82   x=142     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=80   x=152     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=78   x=161     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=77   x=172     y=17     width=13     height=13     xoffset=1     yoffset=4    xadvance=13     page=0  chnl=0 \r
-char id=76   x=185     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=8     page=0  chnl=0 \r
-char id=75   x=194     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=74   x=204     y=17     width=8     height=13     xoffset=0     yoffset=4    xadvance=7     page=0  chnl=0 \r
-char id=73   x=212     y=17     width=5     height=13     xoffset=1     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=72   x=217     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=71   x=228     y=17     width=12     height=13     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=70   x=240     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=69   x=0     y=30     width=9     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=68   x=9     y=30     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=66   x=20     y=30     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=65   x=29     y=30     width=13     height=13     xoffset=-1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=48   x=42     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=56   x=52     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=50   x=62     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=116   x=72     y=30     width=7     height=12     xoffset=1     yoffset=5    xadvance=6     page=0  chnl=0 \r
-char id=88   x=79     y=30     width=9     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=79   x=88     y=30     width=12     height=12     xoffset=1     yoffset=5    xadvance=12     page=0  chnl=0 \r
-char id=67   x=100     y=30     width=11     height=12     xoffset=1     yoffset=5    xadvance=11     page=0  chnl=0 \r
-char id=43   x=111     y=30     width=11     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=62   x=122     y=30     width=10     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=60   x=132     y=30     width=10     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=58   x=142     y=30     width=3     height=10     xoffset=3     yoffset=7    xadvance=7     page=0  chnl=0 \r
-char id=122   x=145     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=120   x=154     y=30     width=8     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=119   x=162     y=30     width=12     height=10     xoffset=1     yoffset=7    xadvance=13     page=0  chnl=0 \r
-char id=118   x=174     y=30     width=10     height=10     xoffset=0     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=117   x=184     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=115   x=193     y=30     width=8     height=10     xoffset=1     yoffset=7    xadvance=8     page=0  chnl=0 \r
-char id=114   x=201     y=30     width=7     height=10     xoffset=1     yoffset=7    xadvance=6     page=0  chnl=0 \r
-char id=110   x=208     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=109   x=217     y=30     width=13     height=10     xoffset=2     yoffset=7    xadvance=15     page=0  chnl=0 \r
-char id=101   x=230     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=99   x=239     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=8     page=0  chnl=0 \r
-char id=97   x=0     y=43     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=42   x=9     y=43     width=8     height=9     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=111   x=17     y=43     width=9     height=9     xoffset=1     yoffset=8    xadvance=10     page=0  chnl=0 \r
-char id=126   x=26     y=43     width=11     height=7     xoffset=1     yoffset=8    xadvance=12     page=0  chnl=0 \r
-char id=94   x=37     y=43     width=11     height=7     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=44   x=48     y=43     width=4     height=7     xoffset=1     yoffset=13    xadvance=5     page=0  chnl=0 \r
-char id=61   x=52     y=43     width=11     height=6     xoffset=2     yoffset=8    xadvance=12     page=0  chnl=0 \r
-char id=39   x=63     y=43     width=2     height=6     xoffset=1     yoffset=3    xadvance=4     page=0  chnl=0 \r
-char id=34   x=65     y=43     width=5     height=6     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=46   x=70     y=43     width=3     height=4     xoffset=2     yoffset=13    xadvance=5     page=0  chnl=0 \r
-char id=96   x=73     y=43     width=4     height=4     xoffset=2     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=95   x=77     y=43     width=12     height=3     xoffset=0     yoffset=16    xadvance=10     page=0  chnl=0 \r
-char id=45   x=89     y=43     width=7     height=3     xoffset=1     yoffset=10    xadvance=7     page=0  chnl=0 \r
-kernings count=202\r
+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=31    xadvance=11     page=0  chnl=0 \r
+char id=124   x=0     y=0     width=5     height=31     xoffset=6     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=125   x=5     y=0     width=16     height=31     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=123   x=21     y=0     width=16     height=31     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=93   x=37     y=0     width=10     height=31     xoffset=3     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=91   x=47     y=0     width=10     height=31     xoffset=4     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=41   x=57     y=0     width=11     height=31     xoffset=2     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=40   x=68     y=0     width=10     height=31     xoffset=3     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=36   x=78     y=0     width=17     height=30     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=106   x=95     y=0     width=11     height=30     xoffset=-2     yoffset=8    xadvance=10     page=0  chnl=0 \r
+char id=81   x=106     y=0     width=22     height=30     xoffset=2     yoffset=8    xadvance=24     page=0  chnl=0 \r
+char id=92   x=128     y=0     width=14     height=29     xoffset=1     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=47   x=142     y=0     width=14     height=29     xoffset=0     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=64   x=156     y=0     width=27     height=28     xoffset=3     yoffset=8    xadvance=30     page=0  chnl=0 \r
+char id=127   x=183     y=0     width=25     height=25     xoffset=4     yoffset=7    xadvance=30     page=0  chnl=0 \r
+char id=59   x=208     y=0     width=7     height=25     xoffset=4     yoffset=13    xadvance=14     page=0  chnl=0 \r
+char id=121   x=215     y=0     width=17     height=25     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=113   x=232     y=0     width=16     height=25     xoffset=2     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=112   x=0     y=31     width=16     height=25     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=108   x=16     y=31     width=5     height=25     xoffset=3     yoffset=7    xadvance=9     page=0  chnl=0 \r
+char id=107   x=21     y=31     width=16     height=25     xoffset=3     yoffset=7    xadvance=18     page=0  chnl=0 \r
+char id=104   x=37     y=31     width=15     height=25     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=103   x=52     y=31     width=16     height=25     xoffset=2     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=102   x=68     y=31     width=13     height=25     xoffset=1     yoffset=7    xadvance=11     page=0  chnl=0 \r
+char id=100   x=81     y=31     width=16     height=25     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=98   x=97     y=31     width=16     height=25     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=38   x=113     y=31     width=22     height=24     xoffset=2     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=35   x=135     y=31     width=21     height=24     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=37   x=156     y=31     width=30     height=24     xoffset=2     yoffset=8    xadvance=32     page=0  chnl=0 \r
+char id=63   x=186     y=31     width=14     height=24     xoffset=2     yoffset=8    xadvance=16     page=0  chnl=0 \r
+char id=33   x=200     y=31     width=5     height=24     xoffset=4     yoffset=8    xadvance=12     page=0  chnl=0 \r
+char id=48   x=205     y=31     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=56   x=222     y=31     width=16     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=55   x=238     y=31     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=54   x=0     y=56     width=16     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=53   x=16     y=56     width=16     height=24     xoffset=3     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=52   x=32     y=56     width=18     height=24     xoffset=1     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=51   x=50     y=56     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=50   x=67     y=56     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=49   x=84     y=56     width=14     height=24     xoffset=4     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=116   x=98     y=56     width=12     height=24     xoffset=1     yoffset=8    xadvance=12     page=0  chnl=0 \r
+char id=105   x=110     y=56     width=5     height=24     xoffset=3     yoffset=8    xadvance=9     page=0  chnl=0 \r
+char id=90   x=115     y=56     width=19     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=89   x=134     y=56     width=20     height=24     xoffset=0     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=88   x=154     y=56     width=20     height=24     xoffset=1     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=87   x=174     y=56     width=29     height=24     xoffset=1     yoffset=8    xadvance=30     page=0  chnl=0 \r
+char id=86   x=203     y=56     width=22     height=24     xoffset=0     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=85   x=225     y=56     width=18     height=24     xoffset=3     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=84   x=0     y=80     width=21     height=24     xoffset=0     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=83   x=21     y=80     width=19     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=82   x=40     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=80   x=59     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=79   x=75     y=80     width=22     height=24     xoffset=2     yoffset=8    xadvance=24     page=0  chnl=0 \r
+char id=78   x=97     y=80     width=18     height=24     xoffset=3     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=77   x=115     y=80     width=21     height=24     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=76   x=136     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=17     page=0  chnl=0 \r
+char id=75   x=152     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=74   x=171     y=80     width=12     height=24     xoffset=1     yoffset=8    xadvance=14     page=0  chnl=0 \r
+char id=73   x=183     y=80     width=11     height=24     xoffset=2     yoffset=8    xadvance=13     page=0  chnl=0 \r
+char id=72   x=194     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=71   x=213     y=80     width=21     height=24     xoffset=2     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=70   x=234     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=17     page=0  chnl=0 \r
+char id=69   x=0     y=104     width=16     height=24     xoffset=3     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=68   x=16     y=104     width=20     height=24     xoffset=3     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=67   x=36     y=104     width=20     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=66   x=56     y=104     width=18     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=65   x=74     y=104     width=22     height=24     xoffset=0     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=57   x=96     y=104     width=17     height=23     xoffset=2     yoffset=9    xadvance=19     page=0  chnl=0 \r
+char id=43   x=113     y=104     width=20     height=20     xoffset=3     yoffset=11    xadvance=25     page=0  chnl=0 \r
+char id=58   x=133     y=104     width=6     height=19     xoffset=5     yoffset=13    xadvance=14     page=0  chnl=0 \r
+char id=122   x=139     y=104     width=16     height=19     xoffset=1     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=120   x=155     y=104     width=17     height=19     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=119   x=172     y=104     width=24     height=19     xoffset=1     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=118   x=196     y=104     width=17     height=19     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=117   x=213     y=104     width=15     height=19     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=115   x=228     y=104     width=15     height=19     xoffset=2     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=114   x=243     y=104     width=12     height=19     xoffset=3     yoffset=13    xadvance=13     page=0  chnl=0 \r
+char id=110   x=0     y=128     width=15     height=19     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=109   x=15     y=128     width=27     height=19     xoffset=2     yoffset=13    xadvance=29     page=0  chnl=0 \r
+char id=101   x=42     y=128     width=17     height=19     xoffset=2     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=99   x=59     y=128     width=15     height=19     xoffset=2     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=97   x=74     y=128     width=15     height=19     xoffset=2     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=62   x=89     y=128     width=19     height=18     xoffset=4     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=60   x=108     y=128     width=19     height=18     xoffset=4     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=111   x=127     y=128     width=16     height=18     xoffset=2     yoffset=14    xadvance=18     page=0  chnl=0 \r
+char id=42   x=143     y=128     width=15     height=16     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=94   x=158     y=128     width=20     height=14     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=44   x=178     y=128     width=7     height=12     xoffset=2     yoffset=26    xadvance=11     page=0  chnl=0 \r
+char id=126   x=185     y=128     width=20     height=11     xoffset=3     yoffset=16    xadvance=25     page=0  chnl=0 \r
+char id=61   x=205     y=128     width=19     height=10     xoffset=4     yoffset=16    xadvance=25     page=0  chnl=0 \r
+char id=39   x=224     y=128     width=4     height=10     xoffset=2     yoffset=7    xadvance=8     page=0  chnl=0 \r
+char id=34   x=228     y=128     width=10     height=10     xoffset=2     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=96   x=238     y=128     width=7     height=7     xoffset=5     yoffset=6    xadvance=19     page=0  chnl=0 \r
+char id=46   x=245     y=128     width=6     height=6     xoffset=4     yoffset=26    xadvance=11     page=0  chnl=0 \r
+char id=45   x=0     y=147     width=11     height=5     xoffset=2     yoffset=19    xadvance=14     page=0  chnl=0 \r
+char id=95   x=11     y=147     width=21     height=4     xoffset=0     yoffset=33    xadvance=19     page=0  chnl=0 \r
+kernings count=342\r
+kerning first=121  second=44  amount=-3\r
+kerning first=121  second=45  amount=-1\r
+kerning first=121  second=46  amount=-3\r
+kerning first=121  second=97  amount=-1\r
 kerning first=107  second=45  amount=-1\r
-kerning first=121  second=44  amount=-1\r
-kerning first=121  second=46  amount=-1\r
+kerning first=102  second=34  amount=1\r
+kerning first=102  second=39  amount=1\r
 kerning first=102  second=41  amount=1\r
-kerning first=102  second=44  amount=-1\r
-kerning first=102  second=46  amount=-1\r
-kerning first=102  second=63  amount=1\r
+kerning first=102  second=42  amount=1\r
+kerning first=102  second=44  amount=-2\r
+kerning first=102  second=45  amount=-1\r
+kerning first=102  second=46  amount=-2\r
+kerning first=102  second=63  amount=2\r
 kerning first=102  second=92  amount=1\r
 kerning first=102  second=93  amount=1\r
 kerning first=102  second=125  amount=1\r
-kerning first=89  second=44  amount=-2\r
-kerning first=89  second=45  amount=-1\r
-kerning first=89  second=46  amount=-2\r
-kerning first=89  second=58  amount=-1\r
-kerning first=89  second=59  amount=-1\r
+kerning first=116  second=45  amount=-1\r
+kerning first=90  second=45  amount=-1\r
+kerning first=90  second=97  amount=-1\r
+kerning first=90  second=101  amount=-1\r
+kerning first=90  second=111  amount=-1\r
+kerning first=90  second=119  amount=-1\r
+kerning first=90  second=121  amount=-1\r
+kerning first=89  second=44  amount=-4\r
+kerning first=89  second=45  amount=-2\r
+kerning first=89  second=46  amount=-4\r
+kerning first=89  second=58  amount=-3\r
+kerning first=89  second=59  amount=-3\r
 kerning first=89  second=65  amount=-1\r
-kerning first=89  second=97  amount=-1\r
-kerning first=89  second=100  amount=-1\r
-kerning first=89  second=101  amount=-1\r
-kerning first=89  second=103  amount=-1\r
+kerning first=89  second=97  amount=-2\r
+kerning first=89  second=100  amount=-2\r
+kerning first=89  second=101  amount=-2\r
+kerning first=89  second=103  amount=-2\r
 kerning first=89  second=109  amount=-1\r
 kerning first=89  second=110  amount=-1\r
-kerning first=89  second=111  amount=-1\r
+kerning first=89  second=111  amount=-2\r
 kerning first=89  second=112  amount=-1\r
-kerning first=89  second=113  amount=-1\r
+kerning first=89  second=113  amount=-2\r
 kerning first=89  second=114  amount=-1\r
-kerning first=89  second=115  amount=-1\r
-kerning first=89  second=117  amount=-1\r
+kerning first=89  second=115  amount=-2\r
+kerning first=89  second=117  amount=-2\r
 kerning first=89  second=118  amount=-1\r
-kerning first=87  second=44  amount=-2\r
-kerning first=87  second=46  amount=-2\r
+kerning first=88  second=45  amount=-1\r
+kerning first=88  second=97  amount=-1\r
+kerning first=88  second=101  amount=-1\r
+kerning first=88  second=111  amount=-1\r
+kerning first=88  second=121  amount=-1\r
+kerning first=87  second=44  amount=-4\r
+kerning first=87  second=45  amount=-1\r
+kerning first=87  second=46  amount=-3\r
 kerning first=87  second=58  amount=-1\r
 kerning first=87  second=59  amount=-1\r
+kerning first=87  second=65  amount=-1\r
 kerning first=87  second=97  amount=-1\r
 kerning first=87  second=101  amount=-1\r
 kerning first=87  second=111  amount=-1\r
-kerning first=86  second=44  amount=-2\r
-kerning first=86  second=46  amount=-2\r
+kerning first=87  second=114  amount=-1\r
+kerning first=87  second=117  amount=-1\r
+kerning first=87  second=121  amount=-1\r
+kerning first=86  second=44  amount=-4\r
+kerning first=86  second=45  amount=-1\r
+kerning first=86  second=46  amount=-4\r
 kerning first=86  second=58  amount=-1\r
 kerning first=86  second=59  amount=-1\r
+kerning first=86  second=65  amount=-1\r
 kerning first=86  second=97  amount=-1\r
 kerning first=86  second=101  amount=-1\r
 kerning first=86  second=111  amount=-1\r
-kerning first=84  second=44  amount=-2\r
-kerning first=84  second=45  amount=-1\r
-kerning first=84  second=46  amount=-2\r
-kerning first=84  second=58  amount=-1\r
-kerning first=84  second=59  amount=-1\r
-kerning first=84  second=65  amount=-1\r
+kerning first=86  second=117  amount=-1\r
+kerning first=86  second=121  amount=-1\r
+kerning first=84  second=44  amount=-4\r
+kerning first=84  second=45  amount=-2\r
+kerning first=84  second=46  amount=-4\r
+kerning first=84  second=58  amount=-3\r
+kerning first=84  second=59  amount=-3\r
+kerning first=84  second=63  amount=1\r
+kerning first=84  second=65  amount=-2\r
+kerning first=84  second=67  amount=-1\r
+kerning first=84  second=71  amount=-1\r
+kerning first=84  second=79  amount=-1\r
 kerning first=84  second=84  amount=-1\r
-kerning first=84  second=97  amount=-2\r
-kerning first=84  second=99  amount=-2\r
-kerning first=84  second=101  amount=-2\r
-kerning first=84  second=103  amount=-2\r
-kerning first=84  second=111  amount=-2\r
-kerning first=84  second=114  amount=-1\r
-kerning first=84  second=115  amount=-1\r
-kerning first=84  second=117  amount=-1\r
-kerning first=84  second=118  amount=-1\r
-kerning first=84  second=119  amount=-1\r
-kerning first=84  second=121  amount=-1\r
-kerning first=84  second=122  amount=-1\r
+kerning first=84  second=97  amount=-4\r
+kerning first=84  second=99  amount=-3\r
+kerning first=84  second=101  amount=-3\r
+kerning first=84  second=103  amount=-3\r
+kerning first=84  second=111  amount=-3\r
+kerning first=84  second=114  amount=-3\r
+kerning first=84  second=115  amount=-3\r
+kerning first=84  second=117  amount=-3\r
+kerning first=84  second=118  amount=-3\r
+kerning first=84  second=119  amount=-3\r
+kerning first=84  second=121  amount=-3\r
+kerning first=84  second=122  amount=-2\r
 kerning first=82  second=45  amount=-1\r
-kerning first=80  second=44  amount=-2\r
-kerning first=80  second=46  amount=-2\r
-kerning first=76  second=39  amount=-1\r
-kerning first=76  second=45  amount=-1\r
+kerning first=82  second=84  amount=-1\r
+kerning first=82  second=97  amount=-1\r
+kerning first=82  second=101  amount=-1\r
+kerning first=82  second=111  amount=-1\r
+kerning first=82  second=121  amount=-1\r
+kerning first=80  second=44  amount=-4\r
+kerning first=80  second=46  amount=-4\r
+kerning first=80  second=65  amount=-1\r
+kerning first=80  second=97  amount=-1\r
+kerning first=80  second=101  amount=-1\r
+kerning first=80  second=111  amount=-1\r
+kerning first=79  second=84  amount=-1\r
+kerning first=76  second=39  amount=-2\r
+kerning first=76  second=45  amount=-2\r
 kerning first=76  second=74  amount=1\r
-kerning first=76  second=84  amount=-1\r
-kerning first=76  second=86  amount=-1\r
+kerning first=76  second=84  amount=-2\r
+kerning first=76  second=86  amount=-2\r
 kerning first=76  second=87  amount=-1\r
-kerning first=76  second=89  amount=-1\r
-kerning first=76  second=118  amount=-1\r
-kerning first=76  second=121  amount=-1\r
-kerning first=75  second=45  amount=-1\r
+kerning first=76  second=89  amount=-2\r
+kerning first=76  second=118  amount=-2\r
+kerning first=76  second=121  amount=-2\r
+kerning first=75  second=45  amount=-2\r
+kerning first=75  second=97  amount=-1\r
 kerning first=75  second=101  amount=-1\r
 kerning first=75  second=111  amount=-1\r
+kerning first=75  second=117  amount=-1\r
 kerning first=75  second=118  amount=-1\r
 kerning first=75  second=119  amount=-1\r
 kerning first=75  second=121  amount=-1\r
-kerning first=70  second=44  amount=-2\r
-kerning first=70  second=46  amount=-2\r
+kerning first=70  second=44  amount=-4\r
+kerning first=70  second=46  amount=-4\r
+kerning first=70  second=58  amount=-1\r
+kerning first=70  second=59  amount=-1\r
+kerning first=70  second=63  amount=1\r
 kerning first=70  second=65  amount=-1\r
 kerning first=70  second=97  amount=-1\r
-kerning first=65  second=84  amount=-1\r
+kerning first=70  second=101  amount=-1\r
+kerning first=70  second=111  amount=-1\r
+kerning first=68  second=44  amount=-1\r
+kerning first=68  second=46  amount=-1\r
+kerning first=68  second=84  amount=-1\r
+kerning first=67  second=45  amount=-1\r
+kerning first=66  second=84  amount=-1\r
+kerning first=65  second=45  amount=-1\r
+kerning first=65  second=84  amount=-2\r
+kerning first=65  second=86  amount=-1\r
+kerning first=65  second=87  amount=-1\r
 kerning first=65  second=89  amount=-1\r
-kerning first=88  second=45  amount=-1\r
-kerning first=88  second=121  amount=-1\r
+kerning first=65  second=118  amount=-1\r
+kerning first=65  second=121  amount=-1\r
+kerning first=120  second=45  amount=-1\r
 kerning first=119  second=44  amount=-1\r
 kerning first=119  second=46  amount=-1\r
-kerning first=118  second=44  amount=-1\r
-kerning first=118  second=46  amount=-1\r
-kerning first=114  second=44  amount=-2\r
-kerning first=114  second=46  amount=-2\r
-kerning first=101  second=84  amount=-1\r
+kerning first=118  second=44  amount=-3\r
+kerning first=118  second=45  amount=-1\r
+kerning first=118  second=46  amount=-3\r
+kerning first=118  second=97  amount=-1\r
+kerning first=114  second=44  amount=-4\r
+kerning first=114  second=46  amount=-4\r
+kerning first=114  second=97  amount=-1\r
+kerning first=101  second=84  amount=-2\r
+kerning first=99  second=84  amount=-1\r
 kerning first=39  second=65  amount=-1\r
-kerning first=46  second=44  amount=-1\r
-kerning first=46  second=45  amount=-1\r
+kerning first=46  second=44  amount=-2\r
+kerning first=46  second=45  amount=-2\r
+kerning first=45  second=65  amount=-1\r
 kerning first=45  second=74  amount=-1\r
-kerning first=45  second=84  amount=-1\r
+kerning first=45  second=84  amount=-2\r
+kerning first=45  second=86  amount=-1\r
+kerning first=45  second=87  amount=-1\r
 kerning first=45  second=88  amount=-1\r
-kerning first=45  second=89  amount=-1\r
+kerning first=45  second=89  amount=-2\r
+kerning first=45  second=118  amount=-1\r
+kerning first=45  second=120  amount=-1\r
+kerning first=45  second=121  amount=-1\r
+kerning first=45  second=122  amount=-1\r

diff --git a/extensions/twl/gdx-twl-tests-android/assets/data/font.png b/extensions/twl/gdx-twl-tests-android/assets/data/font.png
index 2b7f95d..ef3e30a 100644 (file)
Binary files a/extensions/twl/gdx-twl-tests-android/assets/data/font.png and b/extensions/twl/gdx-twl-tests-android/assets/data/font.png differ

diff --git a/extensions/twl/gdx-twl-tests/data/font-heading.fnt b/extensions/twl/gdx-twl-tests/data/font-heading.fnt
index 62ed066..27c263b 100644 (file)
--- a/extensions/twl/gdx-twl-tests/data/font-heading.fnt
+++ b/extensions/twl/gdx-twl-tests/data/font-heading.fnt
@@ -1,286 +1,342 @@
-info face="Verdana" size=39 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
-common lineHeight=49 base=40 scaleW=256 scaleH=256 pages=1 packed=0\r
-page id=0 file="test.png"\r
+info face="Verdana" size=60 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
+common lineHeight=72 base=61 scaleW=512 scaleH=512 pages=1 packed=0\r
+page id=0 file="font-heading.png"\r
 chars count=95\r
-char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=40    xadvance=13     page=0  chnl=0 \r
-char id=36   x=0     y=0     width=22     height=39     xoffset=2     yoffset=9    xadvance=24     page=0  chnl=0 \r
-char id=124   x=22     y=0     width=5     height=39     xoffset=7     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=125   x=27     y=0     width=20     height=39     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=123   x=47     y=0     width=20     height=39     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=93   x=67     y=0     width=12     height=39     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=91   x=79     y=0     width=12     height=39     xoffset=4     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=41   x=91     y=0     width=14     height=39     xoffset=2     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=40   x=105     y=0     width=13     height=39     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=106   x=118     y=0     width=15     height=39     xoffset=-2     yoffset=11    xadvance=13     page=0  chnl=0 \r
-char id=81   x=133     y=0     width=29     height=38     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=92   x=162     y=0     width=19     height=37     xoffset=1     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=47   x=181     y=0     width=19     height=37     xoffset=-1     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=64   x=200     y=0     width=34     height=35     xoffset=3     yoffset=11    xadvance=39     page=0  chnl=0 \r
-char id=56   x=0     y=39     width=22     height=32     xoffset=2     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=103   x=22     y=39     width=20     height=32     xoffset=2     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=100   x=42     y=39     width=20     height=32     xoffset=2     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=98   x=62     y=39     width=21     height=32     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=127   x=83     y=39     width=32     height=31     xoffset=4     yoffset=10    xadvance=39     page=0  chnl=0 \r
-char id=38   x=115     y=39     width=30     height=31     xoffset=2     yoffset=11    xadvance=28     page=0  chnl=0 \r
-char id=37   x=145     y=39     width=39     height=31     xoffset=2     yoffset=11    xadvance=41     page=0  chnl=0 \r
-char id=59   x=184     y=39     width=10     height=31     xoffset=4     yoffset=18    xadvance=17     page=0  chnl=0 \r
-char id=48   x=194     y=39     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=57   x=216     y=39     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=54   x=0     y=71     width=22     height=31     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=53   x=22     y=71     width=21     height=31     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=51   x=43     y=71     width=20     height=31     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=121   x=63     y=71     width=22     height=31     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=113   x=85     y=71     width=20     height=31     xoffset=2     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=112   x=105     y=71     width=21     height=31     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=108   x=126     y=71     width=6     height=31     xoffset=3     yoffset=10    xadvance=10     page=0  chnl=0 \r
-char id=107   x=132     y=71     width=21     height=31     xoffset=3     yoffset=10    xadvance=23     page=0  chnl=0 \r
-char id=104   x=153     y=71     width=20     height=31     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=102   x=173     y=71     width=16     height=31     xoffset=1     yoffset=10    xadvance=13     page=0  chnl=0 \r
-char id=85   x=189     y=71     width=24     height=31     xoffset=3     yoffset=11    xadvance=28     page=0  chnl=0 \r
-char id=83   x=213     y=71     width=24     height=31     xoffset=2     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=79   x=0     y=102     width=28     height=31     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=74   x=28     y=102     width=16     height=31     xoffset=0     yoffset=11    xadvance=17     page=0  chnl=0 \r
-char id=71   x=44     y=102     width=27     height=31     xoffset=2     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=67   x=71     y=102     width=25     height=31     xoffset=2     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=35   x=96     y=102     width=27     height=30     xoffset=3     yoffset=11    xadvance=31     page=0  chnl=0 \r
-char id=63   x=123     y=102     width=18     height=30     xoffset=3     yoffset=11    xadvance=21     page=0  chnl=0 \r
-char id=33   x=141     y=102     width=6     height=30     xoffset=5     yoffset=11    xadvance=15     page=0  chnl=0 \r
-char id=55   x=147     y=102     width=22     height=30     xoffset=2     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=52   x=169     y=102     width=23     height=30     xoffset=1     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=50   x=192     y=102     width=21     height=30     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=49   x=213     y=102     width=17     height=30     xoffset=5     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=116   x=230     y=102     width=15     height=30     xoffset=1     yoffset=12    xadvance=15     page=0  chnl=0 \r
-char id=105   x=245     y=102     width=6     height=30     xoffset=3     yoffset=11    xadvance=10     page=0  chnl=0 \r
-char id=90   x=0     y=133     width=24     height=30     xoffset=2     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=89   x=24     y=133     width=25     height=30     xoffset=0     yoffset=11    xadvance=23     page=0  chnl=0 \r
-char id=88   x=49     y=133     width=26     height=30     xoffset=1     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=87   x=75     y=133     width=37     height=30     xoffset=1     yoffset=11    xadvance=38     page=0  chnl=0 \r
-char id=86   x=112     y=133     width=28     height=30     xoffset=0     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=84   x=140     y=133     width=26     height=30     xoffset=0     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=82   x=166     y=133     width=26     height=30     xoffset=3     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=80   x=192     y=133     width=21     height=30     xoffset=3     yoffset=11    xadvance=23     page=0  chnl=0 \r
-char id=78   x=213     y=133     width=24     height=30     xoffset=3     yoffset=11    xadvance=29     page=0  chnl=0 \r
-char id=77   x=0     y=163     width=28     height=30     xoffset=3     yoffset=11    xadvance=32     page=0  chnl=0 \r
-char id=76   x=28     y=163     width=20     height=30     xoffset=3     yoffset=11    xadvance=21     page=0  chnl=0 \r
-char id=75   x=48     y=163     width=25     height=30     xoffset=3     yoffset=11    xadvance=27     page=0  chnl=0 \r
-char id=73   x=73     y=163     width=13     height=30     xoffset=2     yoffset=11    xadvance=16     page=0  chnl=0 \r
-char id=72   x=86     y=163     width=24     height=30     xoffset=3     yoffset=11    xadvance=29     page=0  chnl=0 \r
-char id=70   x=110     y=163     width=20     height=30     xoffset=3     yoffset=11    xadvance=22     page=0  chnl=0 \r
-char id=69   x=130     y=163     width=21     height=30     xoffset=3     yoffset=11    xadvance=24     page=0  chnl=0 \r
-char id=68   x=151     y=163     width=26     height=30     xoffset=3     yoffset=11    xadvance=30     page=0  chnl=0 \r
-char id=66   x=177     y=163     width=24     height=30     xoffset=3     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=65   x=201     y=163     width=28     height=30     xoffset=0     yoffset=11    xadvance=26     page=0  chnl=0 \r
-char id=43   x=229     y=163     width=25     height=26     xoffset=4     yoffset=15    xadvance=31     page=0  chnl=0 \r
-char id=62   x=0     y=193     width=24     height=24     xoffset=5     yoffset=16    xadvance=31     page=0  chnl=0 \r
-char id=60   x=24     y=193     width=24     height=24     xoffset=4     yoffset=16    xadvance=31     page=0  chnl=0 \r
-char id=117   x=48     y=193     width=20     height=24     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=115   x=68     y=193     width=18     height=24     xoffset=2     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=111   x=86     y=193     width=21     height=24     xoffset=2     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=101   x=107     y=193     width=21     height=24     xoffset=2     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=99   x=128     y=193     width=19     height=24     xoffset=2     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=97   x=147     y=193     width=21     height=24     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=58   x=168     y=193     width=7     height=23     xoffset=6     yoffset=18    xadvance=17     page=0  chnl=0 \r
-char id=122   x=175     y=193     width=19     height=23     xoffset=1     yoffset=18    xadvance=20     page=0  chnl=0 \r
-char id=120   x=194     y=193     width=22     height=23     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=119   x=216     y=193     width=31     height=23     xoffset=1     yoffset=18    xadvance=31     page=0  chnl=0 \r
-char id=118   x=0     y=217     width=22     height=23     xoffset=1     yoffset=18    xadvance=23     page=0  chnl=0 \r
-char id=114   x=22     y=217     width=15     height=23     xoffset=3     yoffset=18    xadvance=16     page=0  chnl=0 \r
-char id=110   x=37     y=217     width=20     height=23     xoffset=3     yoffset=18    xadvance=24     page=0  chnl=0 \r
-char id=109   x=57     y=217     width=33     height=23     xoffset=3     yoffset=18    xadvance=37     page=0  chnl=0 \r
-char id=42   x=90     y=217     width=20     height=19     xoffset=3     yoffset=10    xadvance=24     page=0  chnl=0 \r
-char id=94   x=110     y=217     width=27     height=18     xoffset=3     yoffset=11    xadvance=31     page=0  chnl=0 \r
-char id=44   x=137     y=217     width=10     height=15     xoffset=2     yoffset=34    xadvance=14     page=0  chnl=0 \r
-char id=61   x=147     y=217     width=25     height=13     xoffset=4     yoffset=22    xadvance=31     page=0  chnl=0 \r
-char id=39   x=172     y=217     width=6     height=13     xoffset=3     yoffset=10    xadvance=10     page=0  chnl=0 \r
-char id=34   x=178     y=217     width=13     height=13     xoffset=3     yoffset=10    xadvance=17     page=0  chnl=0 \r
-char id=126   x=191     y=217     width=27     height=12     xoffset=3     yoffset=22    xadvance=31     page=0  chnl=0 \r
-char id=96   x=218     y=217     width=10     height=9     xoffset=6     yoffset=8    xadvance=24     page=0  chnl=0 \r
-char id=46   x=228     y=217     width=7     height=7     xoffset=4     yoffset=34    xadvance=14     page=0  chnl=0 \r
-char id=45   x=235     y=217     width=14     height=6     xoffset=2     yoffset=25    xadvance=17     page=0  chnl=0 \r
-char id=95   x=0     y=240     width=27     height=4     xoffset=-1     yoffset=43    xadvance=24     page=0  chnl=0 \r
-kernings count=369\r
+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=61    xadvance=21     page=0  chnl=0 \r
+char id=41   x=0     y=0     width=24     height=60     xoffset=2     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=40   x=24     y=0     width=24     height=60     xoffset=3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=124   x=48     y=0     width=11     height=59     xoffset=9     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=125   x=59     y=0     width=33     height=59     xoffset=4     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=123   x=92     y=0     width=33     height=59     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=93   x=125     y=0     width=21     height=59     xoffset=3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=91   x=146     y=0     width=21     height=59     xoffset=5     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=36   x=167     y=0     width=35     height=58     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=106   x=202     y=0     width=24     height=58     xoffset=-3     yoffset=16    xadvance=21     page=0  chnl=0 \r
+char id=81   x=226     y=0     width=48     height=58     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=92   x=274     y=0     width=32     height=57     xoffset=0     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=47   x=306     y=0     width=31     height=57     xoffset=-3     yoffset=14    xadvance=27     page=0  chnl=0 \r
+char id=64   x=337     y=0     width=56     height=53     xoffset=3     yoffset=15    xadvance=60     page=0  chnl=0 \r
+char id=100   x=393     y=0     width=35     height=49     xoffset=1     yoffset=14    xadvance=37     page=0  chnl=0 \r
+char id=98   x=428     y=0     width=35     height=49     xoffset=3     yoffset=14    xadvance=37     page=0  chnl=0 \r
+char id=38   x=463     y=0     width=48     height=48     xoffset=1     yoffset=15    xadvance=44     page=0  chnl=0 \r
+char id=37   x=0     y=60     width=62     height=48     xoffset=2     yoffset=15    xadvance=65     page=0  chnl=0 \r
+char id=48   x=62     y=60     width=36     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=57   x=98     y=60     width=37     height=48     xoffset=1     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=56   x=135     y=60     width=36     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=54   x=171     y=60     width=37     height=48     xoffset=2     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=53   x=208     y=60     width=35     height=48     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=51   x=243     y=60     width=34     height=48     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=113   x=277     y=60     width=35     height=48     xoffset=1     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=112   x=312     y=60     width=35     height=48     xoffset=3     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=108   x=347     y=60     width=12     height=48     xoffset=3     yoffset=14    xadvance=16     page=0  chnl=0 \r
+char id=107   x=359     y=60     width=35     height=48     xoffset=4     yoffset=14    xadvance=36     page=0  chnl=0 \r
+char id=104   x=394     y=60     width=34     height=48     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=103   x=428     y=60     width=35     height=48     xoffset=1     yoffset=26    xadvance=37     page=0  chnl=0 \r
+char id=102   x=463     y=60     width=29     height=48     xoffset=0     yoffset=14    xadvance=21     page=0  chnl=0 \r
+char id=83   x=0     y=108     width=39     height=48     xoffset=2     yoffset=15    xadvance=41     page=0  chnl=0 \r
+char id=79   x=39     y=108     width=47     height=48     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=71   x=86     y=108     width=46     height=48     xoffset=1     yoffset=15    xadvance=47     page=0  chnl=0 \r
+char id=67   x=132     y=108     width=43     height=48     xoffset=1     yoffset=15    xadvance=42     page=0  chnl=0 \r
+char id=127   x=175     y=108     width=51     height=47     xoffset=6     yoffset=15    xadvance=60     page=0  chnl=0 \r
+char id=63   x=226     y=108     width=31     height=47     xoffset=3     yoffset=15    xadvance=33     page=0  chnl=0 \r
+char id=50   x=257     y=108     width=35     height=47     xoffset=3     yoffset=15    xadvance=38     page=0  chnl=0 \r
+char id=121   x=292     y=108     width=37     height=47     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=85   x=329     y=108     width=40     height=47     xoffset=3     yoffset=16    xadvance=44     page=0  chnl=0 \r
+char id=74   x=369     y=108     width=27     height=47     xoffset=-1     yoffset=16    xadvance=27     page=0  chnl=0 \r
+char id=35   x=396     y=108     width=44     height=46     xoffset=4     yoffset=16    xadvance=49     page=0  chnl=0 \r
+char id=59   x=440     y=108     width=18     height=46     xoffset=4     yoffset=27    xadvance=27     page=0  chnl=0 \r
+char id=33   x=458     y=108     width=12     height=46     xoffset=7     yoffset=16    xadvance=24     page=0  chnl=0 \r
+char id=55   x=470     y=108     width=36     height=46     xoffset=3     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=52   x=0     y=156     width=39     height=46     xoffset=0     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=49   x=39     y=156     width=30     height=46     xoffset=6     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=105   x=69     y=156     width=12     height=46     xoffset=3     yoffset=16    xadvance=16     page=0  chnl=0 \r
+char id=90   x=81     y=156     width=40     height=46     xoffset=2     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=89   x=121     y=156     width=43     height=46     xoffset=-2     yoffset=16    xadvance=37     page=0  chnl=0 \r
+char id=88   x=164     y=156     width=42     height=46     xoffset=0     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=87   x=206     y=156     width=58     height=46     xoffset=1     yoffset=16    xadvance=59     page=0  chnl=0 \r
+char id=86   x=264     y=156     width=44     height=46     xoffset=-1     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=84   x=308     y=156     width=44     height=46     xoffset=-2     yoffset=16    xadvance=37     page=0  chnl=0 \r
+char id=82   x=352     y=156     width=41     height=46     xoffset=4     yoffset=16    xadvance=42     page=0  chnl=0 \r
+char id=80   x=393     y=156     width=34     height=46     xoffset=4     yoffset=16    xadvance=36     page=0  chnl=0 \r
+char id=78   x=427     y=156     width=39     height=46     xoffset=4     yoffset=16    xadvance=45     page=0  chnl=0 \r
+char id=77   x=466     y=156     width=45     height=46     xoffset=4     yoffset=16    xadvance=51     page=0  chnl=0 \r
+char id=76   x=0     y=202     width=33     height=46     xoffset=4     yoffset=16    xadvance=33     page=0  chnl=0 \r
+char id=75   x=33     y=202     width=40     height=46     xoffset=4     yoffset=16    xadvance=42     page=0  chnl=0 \r
+char id=73   x=73     y=202     width=24     height=46     xoffset=2     yoffset=16    xadvance=26     page=0  chnl=0 \r
+char id=72   x=97     y=202     width=39     height=46     xoffset=4     yoffset=16    xadvance=45     page=0  chnl=0 \r
+char id=70   x=136     y=202     width=33     height=46     xoffset=4     yoffset=16    xadvance=34     page=0  chnl=0 \r
+char id=69   x=169     y=202     width=35     height=46     xoffset=4     yoffset=16    xadvance=38     page=0  chnl=0 \r
+char id=68   x=204     y=202     width=42     height=46     xoffset=4     yoffset=16    xadvance=46     page=0  chnl=0 \r
+char id=66   x=246     y=202     width=39     height=46     xoffset=4     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=65   x=285     y=202     width=44     height=46     xoffset=-1     yoffset=16    xadvance=41     page=0  chnl=0 \r
+char id=116   x=329     y=202     width=28     height=45     xoffset=-1     yoffset=18    xadvance=24     page=0  chnl=0 \r
+char id=43   x=357     y=202     width=43     height=39     xoffset=4     yoffset=23    xadvance=49     page=0  chnl=0 \r
+char id=115   x=400     y=202     width=32     height=37     xoffset=1     yoffset=26    xadvance=31     page=0  chnl=0 \r
+char id=111   x=432     y=202     width=36     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=101   x=468     y=202     width=36     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=99   x=0     y=248     width=32     height=37     xoffset=1     yoffset=26    xadvance=31     page=0  chnl=0 \r
+char id=97   x=32     y=248     width=34     height=37     xoffset=1     yoffset=26    xadvance=36     page=0  chnl=0 \r
+char id=117   x=66     y=248     width=34     height=36     xoffset=3     yoffset=27    xadvance=38     page=0  chnl=0 \r
+char id=110   x=100     y=248     width=34     height=36     xoffset=3     yoffset=26    xadvance=38     page=0  chnl=0 \r
+char id=109   x=134     y=248     width=54     height=36     xoffset=4     yoffset=26    xadvance=58     page=0  chnl=0 \r
+char id=62   x=188     y=248     width=40     height=35     xoffset=6     yoffset=25    xadvance=49     page=0  chnl=0 \r
+char id=60   x=228     y=248     width=40     height=35     xoffset=5     yoffset=25    xadvance=49     page=0  chnl=0 \r
+char id=58   x=268     y=248     width=13     height=35     xoffset=8     yoffset=27    xadvance=27     page=0  chnl=0 \r
+char id=122   x=281     y=248     width=33     height=35     xoffset=1     yoffset=27    xadvance=32     page=0  chnl=0 \r
+char id=120   x=314     y=248     width=37     height=35     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=119   x=351     y=248     width=49     height=35     xoffset=1     yoffset=27    xadvance=49     page=0  chnl=0 \r
+char id=118   x=400     y=248     width=37     height=35     xoffset=0     yoffset=27    xadvance=36     page=0  chnl=0 \r
+char id=114   x=437     y=248     width=27     height=35     xoffset=3     yoffset=27    xadvance=26     page=0  chnl=0 \r
+char id=42   x=464     y=248     width=33     height=29     xoffset=3     yoffset=14    xadvance=38     page=0  chnl=0 \r
+char id=94   x=0     y=285     width=43     height=26     xoffset=3     yoffset=16    xadvance=49     page=0  chnl=0 \r
+char id=44   x=43     y=285     width=18     height=21     xoffset=2     yoffset=52    xadvance=22     page=0  chnl=0 \r
+char id=126   x=61     y=285     width=43     height=19     xoffset=3     yoffset=33    xadvance=49     page=0  chnl=0 \r
+char id=61   x=104     y=285     width=41     height=19     xoffset=5     yoffset=32    xadvance=49     page=0  chnl=0 \r
+char id=39   x=145     y=285     width=11     height=19     xoffset=3     yoffset=14    xadvance=16     page=0  chnl=0 \r
+char id=34   x=156     y=285     width=23     height=19     xoffset=3     yoffset=14    xadvance=28     page=0  chnl=0 \r
+char id=96   x=179     y=285     width=17     height=13     xoffset=8     yoffset=11    xadvance=38     page=0  chnl=0 \r
+char id=46   x=196     y=285     width=13     height=10     xoffset=5     yoffset=52    xadvance=22     page=0  chnl=0 \r
+char id=45   x=209     y=285     width=24     height=7     xoffset=2     yoffset=38    xadvance=27     page=0  chnl=0 \r
+char id=95   x=233     y=285     width=44     height=5     xoffset=-2     yoffset=65    xadvance=38     page=0  chnl=0 \r
+kernings count=482\r
 kerning first=81  second=44  amount=-1\r
 kerning first=81  second=46  amount=-1\r
 kerning first=98  second=44  amount=-1\r
-kerning first=121  second=44  amount=-4\r
-kerning first=121  second=45  amount=-1\r
-kerning first=121  second=46  amount=-4\r
-kerning first=121  second=97  amount=-1\r
+kerning first=98  second=46  amount=-1\r
 kerning first=112  second=44  amount=-1\r
-kerning first=107  second=45  amount=-2\r
-kerning first=102  second=34  amount=1\r
-kerning first=102  second=39  amount=1\r
-kerning first=102  second=41  amount=2\r
+kerning first=112  second=46  amount=-1\r
+kerning first=107  second=45  amount=-3\r
+kerning first=107  second=101  amount=-1\r
+kerning first=107  second=111  amount=-1\r
+kerning first=104  second=118  amount=-1\r
+kerning first=104  second=121  amount=-1\r
+kerning first=102  second=34  amount=2\r
+kerning first=102  second=39  amount=2\r
+kerning first=102  second=41  amount=3\r
 kerning first=102  second=42  amount=1\r
-kerning first=102  second=44  amount=-2\r
+kerning first=102  second=44  amount=-4\r
 kerning first=102  second=45  amount=-1\r
-kerning first=102  second=46  amount=-2\r
-kerning first=102  second=63  amount=2\r
-kerning first=102  second=92  amount=2\r
-kerning first=102  second=93  amount=2\r
-kerning first=102  second=125  amount=2\r
+kerning first=102  second=46  amount=-4\r
+kerning first=102  second=63  amount=3\r
+kerning first=102  second=92  amount=3\r
+kerning first=102  second=93  amount=3\r
+kerning first=102  second=125  amount=3\r
+kerning first=83  second=44  amount=-1\r
+kerning first=83  second=46  amount=-1\r
+kerning first=83  second=65  amount=-1\r
+kerning first=83  second=83  amount=-1\r
 kerning first=83  second=118  amount=-1\r
+kerning first=83  second=119  amount=-1\r
 kerning first=83  second=121  amount=-1\r
 kerning first=79  second=44  amount=-1\r
 kerning first=79  second=46  amount=-1\r
 kerning first=79  second=84  amount=-1\r
+kerning first=79  second=89  amount=-1\r
+kerning first=79  second=90  amount=-1\r
 kerning first=67  second=45  amount=-1\r
-kerning first=116  second=45  amount=-1\r
-kerning first=90  second=45  amount=-1\r
+kerning first=121  second=44  amount=-6\r
+kerning first=121  second=45  amount=-1\r
+kerning first=121  second=46  amount=-6\r
+kerning first=121  second=97  amount=-1\r
+kerning first=121  second=99  amount=-1\r
+kerning first=121  second=101  amount=-1\r
+kerning first=121  second=111  amount=-1\r
+kerning first=85  second=44  amount=-1\r
+kerning first=85  second=46  amount=-1\r
+kerning first=74  second=44  amount=-1\r
+kerning first=74  second=46  amount=-1\r
+kerning first=90  second=45  amount=-2\r
+kerning first=90  second=67  amount=-1\r
+kerning first=90  second=71  amount=-1\r
+kerning first=90  second=79  amount=-1\r
 kerning first=90  second=97  amount=-1\r
-kerning first=90  second=101  amount=-1\r
-kerning first=90  second=111  amount=-1\r
+kerning first=90  second=101  amount=-2\r
+kerning first=90  second=111  amount=-2\r
 kerning first=90  second=119  amount=-1\r
-kerning first=90  second=121  amount=-1\r
-kerning first=89  second=44  amount=-6\r
-kerning first=89  second=45  amount=-3\r
-kerning first=89  second=46  amount=-6\r
-kerning first=89  second=58  amount=-4\r
-kerning first=89  second=59  amount=-4\r
+kerning first=90  second=121  amount=-2\r
+kerning first=89  second=44  amount=-8\r
+kerning first=89  second=45  amount=-4\r
+kerning first=89  second=46  amount=-8\r
+kerning first=89  second=58  amount=-6\r
+kerning first=89  second=59  amount=-6\r
 kerning first=89  second=65  amount=-2\r
-kerning first=89  second=97  amount=-3\r
-kerning first=89  second=100  amount=-2\r
-kerning first=89  second=101  amount=-2\r
-kerning first=89  second=103  amount=-2\r
-kerning first=89  second=109  amount=-2\r
-kerning first=89  second=110  amount=-2\r
-kerning first=89  second=111  amount=-2\r
-kerning first=89  second=112  amount=-2\r
-kerning first=89  second=113  amount=-2\r
-kerning first=89  second=114  amount=-2\r
-kerning first=89  second=115  amount=-2\r
-kerning first=89  second=117  amount=-2\r
-kerning first=89  second=118  amount=-2\r
+kerning first=89  second=79  amount=-1\r
+kerning first=89  second=97  amount=-4\r
+kerning first=89  second=100  amount=-4\r
+kerning first=89  second=101  amount=-4\r
+kerning first=89  second=103  amount=-4\r
+kerning first=89  second=109  amount=-3\r
+kerning first=89  second=110  amount=-3\r
+kerning first=89  second=111  amount=-4\r
+kerning first=89  second=112  amount=-3\r
+kerning first=89  second=113  amount=-4\r
+kerning first=89  second=114  amount=-3\r
+kerning first=89  second=115  amount=-3\r
+kerning first=89  second=117  amount=-3\r
+kerning first=89  second=118  amount=-3\r
 kerning first=88  second=45  amount=-2\r
 kerning first=88  second=97  amount=-1\r
-kerning first=88  second=101  amount=-1\r
-kerning first=88  second=111  amount=-1\r
+kerning first=88  second=101  amount=-2\r
+kerning first=88  second=111  amount=-2\r
 kerning first=88  second=117  amount=-1\r
 kerning first=88  second=121  amount=-2\r
-kerning first=87  second=44  amount=-6\r
+kerning first=87  second=44  amount=-8\r
 kerning first=87  second=45  amount=-1\r
-kerning first=87  second=46  amount=-4\r
+kerning first=87  second=46  amount=-6\r
 kerning first=87  second=58  amount=-2\r
 kerning first=87  second=59  amount=-2\r
 kerning first=87  second=65  amount=-1\r
-kerning first=87  second=97  amount=-2\r
-kerning first=87  second=101  amount=-2\r
-kerning first=87  second=111  amount=-2\r
-kerning first=87  second=114  amount=-1\r
-kerning first=87  second=117  amount=-1\r
-kerning first=87  second=121  amount=-1\r
-kerning first=86  second=44  amount=-6\r
+kerning first=87  second=97  amount=-3\r
+kerning first=87  second=101  amount=-3\r
+kerning first=87  second=111  amount=-3\r
+kerning first=87  second=114  amount=-2\r
+kerning first=87  second=117  amount=-2\r
+kerning first=87  second=121  amount=-2\r
+kerning first=86  second=44  amount=-8\r
 kerning first=86  second=45  amount=-1\r
-kerning first=86  second=46  amount=-6\r
+kerning first=86  second=46  amount=-8\r
 kerning first=86  second=58  amount=-2\r
 kerning first=86  second=59  amount=-2\r
-kerning first=86  second=65  amount=-1\r
-kerning first=86  second=97  amount=-2\r
-kerning first=86  second=101  amount=-2\r
-kerning first=86  second=111  amount=-2\r
-kerning first=86  second=117  amount=-1\r
-kerning first=86  second=121  amount=-1\r
-kerning first=84  second=44  amount=-6\r
-kerning first=84  second=45  amount=-3\r
-kerning first=84  second=46  amount=-6\r
-kerning first=84  second=58  amount=-4\r
-kerning first=84  second=59  amount=-4\r
-kerning first=84  second=63  amount=1\r
-kerning first=84  second=65  amount=-2\r
+kerning first=86  second=65  amount=-2\r
+kerning first=86  second=97  amount=-3\r
+kerning first=86  second=101  amount=-3\r
+kerning first=86  second=111  amount=-3\r
+kerning first=86  second=117  amount=-2\r
+kerning first=86  second=121  amount=-2\r
+kerning first=84  second=44  amount=-8\r
+kerning first=84  second=45  amount=-4\r
+kerning first=84  second=46  amount=-8\r
+kerning first=84  second=58  amount=-6\r
+kerning first=84  second=59  amount=-6\r
+kerning first=84  second=63  amount=2\r
+kerning first=84  second=65  amount=-4\r
 kerning first=84  second=67  amount=-1\r
 kerning first=84  second=71  amount=-1\r
 kerning first=84  second=79  amount=-1\r
-kerning first=84  second=84  amount=-1\r
-kerning first=84  second=97  amount=-5\r
-kerning first=84  second=99  amount=-4\r
-kerning first=84  second=101  amount=-4\r
-kerning first=84  second=103  amount=-4\r
-kerning first=84  second=111  amount=-4\r
-kerning first=84  second=114  amount=-4\r
-kerning first=84  second=115  amount=-3\r
-kerning first=84  second=117  amount=-4\r
-kerning first=84  second=118  amount=-4\r
-kerning first=84  second=119  amount=-4\r
-kerning first=84  second=121  amount=-4\r
-kerning first=84  second=122  amount=-3\r
-kerning first=82  second=45  amount=-2\r
-kerning first=82  second=84  amount=-1\r
+kerning first=84  second=84  amount=-2\r
+kerning first=84  second=97  amount=-7\r
+kerning first=84  second=99  amount=-6\r
+kerning first=84  second=101  amount=-6\r
+kerning first=84  second=103  amount=-6\r
+kerning first=84  second=111  amount=-6\r
+kerning first=84  second=114  amount=-6\r
+kerning first=84  second=115  amount=-5\r
+kerning first=84  second=117  amount=-6\r
+kerning first=84  second=118  amount=-6\r
+kerning first=84  second=119  amount=-6\r
+kerning first=84  second=121  amount=-6\r
+kerning first=84  second=122  amount=-5\r
+kerning first=82  second=45  amount=-3\r
+kerning first=82  second=84  amount=-2\r
+kerning first=82  second=89  amount=-1\r
 kerning first=82  second=97  amount=-1\r
 kerning first=82  second=101  amount=-1\r
 kerning first=82  second=111  amount=-1\r
-kerning first=82  second=121  amount=-1\r
-kerning first=80  second=44  amount=-6\r
-kerning first=80  second=46  amount=-6\r
+kerning first=82  second=117  amount=-1\r
+kerning first=82  second=121  amount=-2\r
+kerning first=80  second=44  amount=-9\r
+kerning first=80  second=46  amount=-9\r
 kerning first=80  second=65  amount=-1\r
+kerning first=80  second=89  amount=1\r
 kerning first=80  second=97  amount=-1\r
 kerning first=80  second=101  amount=-1\r
 kerning first=80  second=111  amount=-1\r
-kerning first=76  second=39  amount=-2\r
-kerning first=76  second=45  amount=-3\r
-kerning first=76  second=74  amount=2\r
-kerning first=76  second=84  amount=-3\r
-kerning first=76  second=86  amount=-2\r
-kerning first=76  second=87  amount=-2\r
-kerning first=76  second=89  amount=-3\r
-kerning first=76  second=118  amount=-2\r
-kerning first=76  second=121  amount=-2\r
-kerning first=75  second=45  amount=-2\r
-kerning first=75  second=97  amount=-1\r
-kerning first=75  second=101  amount=-1\r
-kerning first=75  second=111  amount=-1\r
+kerning first=76  second=39  amount=-4\r
+kerning first=76  second=45  amount=-5\r
+kerning first=76  second=67  amount=-1\r
+kerning first=76  second=71  amount=-1\r
+kerning first=76  second=74  amount=3\r
+kerning first=76  second=79  amount=-1\r
+kerning first=76  second=84  amount=-5\r
+kerning first=76  second=86  amount=-3\r
+kerning first=76  second=87  amount=-3\r
+kerning first=76  second=89  amount=-5\r
+kerning first=76  second=118  amount=-3\r
+kerning first=76  second=121  amount=-3\r
+kerning first=75  second=45  amount=-3\r
+kerning first=75  second=79  amount=-1\r
+kerning first=75  second=97  amount=-2\r
+kerning first=75  second=101  amount=-2\r
+kerning first=75  second=111  amount=-2\r
 kerning first=75  second=117  amount=-1\r
 kerning first=75  second=118  amount=-2\r
-kerning first=75  second=119  amount=-1\r
+kerning first=75  second=119  amount=-2\r
 kerning first=75  second=121  amount=-2\r
 kerning first=73  second=45  amount=-1\r
-kerning first=70  second=44  amount=-6\r
-kerning first=70  second=46  amount=-6\r
-kerning first=70  second=58  amount=-1\r
-kerning first=70  second=59  amount=-1\r
-kerning first=70  second=63  amount=1\r
-kerning first=70  second=65  amount=-2\r
+kerning first=70  second=44  amount=-9\r
+kerning first=70  second=46  amount=-9\r
+kerning first=70  second=58  amount=-2\r
+kerning first=70  second=59  amount=-2\r
+kerning first=70  second=63  amount=2\r
+kerning first=70  second=65  amount=-3\r
 kerning first=70  second=84  amount=1\r
-kerning first=70  second=97  amount=-2\r
+kerning first=70  second=97  amount=-3\r
 kerning first=70  second=101  amount=-1\r
 kerning first=70  second=111  amount=-1\r
 kerning first=68  second=44  amount=-1\r
 kerning first=68  second=46  amount=-1\r
 kerning first=68  second=84  amount=-1\r
-kerning first=66  second=84  amount=-1\r
+kerning first=68  second=87  amount=-1\r
+kerning first=68  second=89  amount=-1\r
+kerning first=68  second=90  amount=-1\r
+kerning first=66  second=44  amount=-1\r
+kerning first=66  second=46  amount=-1\r
+kerning first=66  second=84  amount=-2\r
 kerning first=65  second=45  amount=-1\r
-kerning first=65  second=84  amount=-2\r
-kerning first=65  second=86  amount=-1\r
+kerning first=65  second=84  amount=-4\r
+kerning first=65  second=86  amount=-2\r
 kerning first=65  second=87  amount=-1\r
 kerning first=65  second=89  amount=-2\r
+kerning first=65  second=116  amount=-1\r
 kerning first=65  second=118  amount=-1\r
 kerning first=65  second=119  amount=-1\r
 kerning first=65  second=121  amount=-1\r
+kerning first=116  second=45  amount=-1\r
 kerning first=111  second=44  amount=-1\r
-kerning first=101  second=84  amount=-3\r
-kerning first=99  second=84  amount=-1\r
+kerning first=111  second=46  amount=-1\r
+kerning first=111  second=120  amount=-1\r
+kerning first=101  second=84  amount=-4\r
+kerning first=99  second=45  amount=-1\r
+kerning first=99  second=84  amount=-2\r
+kerning first=110  second=118  amount=-1\r
+kerning first=110  second=121  amount=-1\r
+kerning first=109  second=118  amount=-1\r
+kerning first=109  second=121  amount=-1\r
+kerning first=122  second=45  amount=-1\r
 kerning first=120  second=45  amount=-1\r
-kerning first=119  second=44  amount=-1\r
-kerning first=119  second=46  amount=-1\r
-kerning first=118  second=44  amount=-3\r
+kerning first=120  second=99  amount=-1\r
+kerning first=120  second=101  amount=-1\r
+kerning first=120  second=111  amount=-1\r
+kerning first=119  second=44  amount=-2\r
+kerning first=119  second=45  amount=-1\r
+kerning first=119  second=46  amount=-2\r
+kerning first=119  second=97  amount=-1\r
+kerning first=118  second=44  amount=-5\r
 kerning first=118  second=45  amount=-1\r
-kerning first=118  second=46  amount=-3\r
+kerning first=118  second=46  amount=-5\r
 kerning first=118  second=97  amount=-1\r
-kerning first=114  second=44  amount=-6\r
-kerning first=114  second=46  amount=-6\r
+kerning first=118  second=101  amount=-1\r
+kerning first=118  second=111  amount=-1\r
+kerning first=114  second=44  amount=-8\r
+kerning first=114  second=45  amount=-1\r
+kerning first=114  second=46  amount=-8\r
 kerning first=114  second=97  amount=-1\r
-kerning first=39  second=65  amount=-2\r
-kerning first=46  second=44  amount=-2\r
-kerning first=46  second=45  amount=-3\r
+kerning first=39  second=65  amount=-3\r
+kerning first=46  second=44  amount=-4\r
+kerning first=46  second=45  amount=-5\r
 kerning first=45  second=65  amount=-1\r
 kerning first=45  second=73  amount=-1\r
-kerning first=45  second=74  amount=-2\r
-kerning first=45  second=84  amount=-3\r
+kerning first=45  second=74  amount=-3\r
+kerning first=45  second=83  amount=-1\r
+kerning first=45  second=84  amount=-4\r
 kerning first=45  second=86  amount=-1\r
 kerning first=45  second=87  amount=-1\r
 kerning first=45  second=88  amount=-2\r
-kerning first=45  second=89  amount=-3\r
+kerning first=45  second=89  amount=-4\r
 kerning first=45  second=90  amount=-1\r
+kerning first=45  second=97  amount=-1\r
 kerning first=45  second=118  amount=-1\r
+kerning first=45  second=119  amount=-1\r
 kerning first=45  second=120  amount=-1\r
 kerning first=45  second=121  amount=-1\r
 kerning first=45  second=122  amount=-1\r

diff --git a/extensions/twl/gdx-twl-tests/data/font-heading.png b/extensions/twl/gdx-twl-tests/data/font-heading.png
index f861362..019425a 100644 (file)
Binary files a/extensions/twl/gdx-twl-tests/data/font-heading.png and b/extensions/twl/gdx-twl-tests/data/font-heading.png differ

diff --git a/extensions/twl/gdx-twl-tests/data/font.fnt b/extensions/twl/gdx-twl-tests/data/font.fnt
index 1c80719..462e23e 100644 (file)
--- a/extensions/twl/gdx-twl-tests/data/font.fnt
+++ b/extensions/twl/gdx-twl-tests/data/font.fnt
@@ -1,203 +1,271 @@
-info face="Verdana" size=15 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
-common lineHeight=20 base=16 scaleW=256 scaleH=256 pages=1 packed=0\r
+info face="Verdana" size=30 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1\r
+common lineHeight=38 base=31 scaleW=256 scaleH=256 pages=1 packed=0\r
 page id=0 file="font.png"\r
 chars count=95\r
-char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=16    xadvance=5     page=0  chnl=0 \r
-char id=36   x=0     y=0     width=9     height=17     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=124   x=9     y=0     width=3     height=17     xoffset=3     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=125   x=12     y=0     width=9     height=17     xoffset=2     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=123   x=21     y=0     width=9     height=17     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=93   x=30     y=0     width=6     height=17     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=91   x=36     y=0     width=6     height=17     xoffset=2     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=41   x=42     y=0     width=6     height=17     xoffset=2     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=40   x=48     y=0     width=5     height=17     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=92   x=53     y=0     width=8     height=16     xoffset=0     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=47   x=61     y=0     width=8     height=16     xoffset=0     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=106   x=69     y=0     width=6     height=16     xoffset=0     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=64   x=75     y=0     width=14     height=15     xoffset=1     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=81   x=89     y=0     width=12     height=15     xoffset=1     yoffset=5    xadvance=12     page=0  chnl=0 \r
-char id=108   x=101     y=0     width=3     height=14     xoffset=1     yoffset=3    xadvance=3     page=0  chnl=0 \r
-char id=107   x=104     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=104   x=113     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=100   x=122     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=98   x=131     y=0     width=9     height=14     xoffset=1     yoffset=3    xadvance=9     page=0  chnl=0 \r
-char id=127   x=140     y=0     width=13     height=13     xoffset=2     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=38   x=153     y=0     width=12     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=35   x=165     y=0     width=11     height=13     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=37   x=176     y=0     width=16     height=13     xoffset=1     yoffset=4    xadvance=16     page=0  chnl=0 \r
-char id=59   x=192     y=0     width=4     height=13     xoffset=2     yoffset=7    xadvance=7     page=0  chnl=0 \r
-char id=63   x=196     y=0     width=7     height=13     xoffset=1     yoffset=4    xadvance=8     page=0  chnl=0 \r
-char id=33   x=203     y=0     width=3     height=13     xoffset=2     yoffset=4    xadvance=6     page=0  chnl=0 \r
-char id=57   x=206     y=0     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=55   x=216     y=0     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=54   x=225     y=0     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=53   x=234     y=0     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=52   x=244     y=0     width=11     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=51   x=0     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=49   x=9     y=17     width=7     height=13     xoffset=3     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=121   x=16     y=17     width=10     height=13     xoffset=0     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=113   x=26     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=112   x=35     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=105   x=44     y=17     width=3     height=13     xoffset=1     yoffset=4    xadvance=3     page=0  chnl=0 \r
-char id=103   x=47     y=17     width=9     height=13     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=102   x=56     y=17     width=7     height=13     xoffset=1     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=90   x=63     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=89   x=73     y=17     width=10     height=13     xoffset=0     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=87   x=83     y=17     width=14     height=13     xoffset=1     yoffset=4    xadvance=15     page=0  chnl=0 \r
-char id=86   x=97     y=17     width=13     height=13     xoffset=-1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=85   x=110     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=84   x=121     y=17     width=11     height=13     xoffset=0     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=83   x=132     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=82   x=142     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=80   x=152     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=78   x=161     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=77   x=172     y=17     width=13     height=13     xoffset=1     yoffset=4    xadvance=13     page=0  chnl=0 \r
-char id=76   x=185     y=17     width=9     height=13     xoffset=1     yoffset=4    xadvance=8     page=0  chnl=0 \r
-char id=75   x=194     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=74   x=204     y=17     width=8     height=13     xoffset=0     yoffset=4    xadvance=7     page=0  chnl=0 \r
-char id=73   x=212     y=17     width=5     height=13     xoffset=1     yoffset=4    xadvance=5     page=0  chnl=0 \r
-char id=72   x=217     y=17     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=71   x=228     y=17     width=12     height=13     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=70   x=240     y=17     width=10     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=69   x=0     y=30     width=9     height=13     xoffset=1     yoffset=4    xadvance=9     page=0  chnl=0 \r
-char id=68   x=9     y=30     width=11     height=13     xoffset=1     yoffset=4    xadvance=11     page=0  chnl=0 \r
-char id=66   x=20     y=30     width=9     height=13     xoffset=1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=65   x=29     y=30     width=13     height=13     xoffset=-1     yoffset=4    xadvance=10     page=0  chnl=0 \r
-char id=48   x=42     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=56   x=52     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=50   x=62     y=30     width=10     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=116   x=72     y=30     width=7     height=12     xoffset=1     yoffset=5    xadvance=6     page=0  chnl=0 \r
-char id=88   x=79     y=30     width=9     height=12     xoffset=1     yoffset=5    xadvance=10     page=0  chnl=0 \r
-char id=79   x=88     y=30     width=12     height=12     xoffset=1     yoffset=5    xadvance=12     page=0  chnl=0 \r
-char id=67   x=100     y=30     width=11     height=12     xoffset=1     yoffset=5    xadvance=11     page=0  chnl=0 \r
-char id=43   x=111     y=30     width=11     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=62   x=122     y=30     width=10     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=60   x=132     y=30     width=10     height=11     xoffset=2     yoffset=6    xadvance=12     page=0  chnl=0 \r
-char id=58   x=142     y=30     width=3     height=10     xoffset=3     yoffset=7    xadvance=7     page=0  chnl=0 \r
-char id=122   x=145     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=120   x=154     y=30     width=8     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=119   x=162     y=30     width=12     height=10     xoffset=1     yoffset=7    xadvance=13     page=0  chnl=0 \r
-char id=118   x=174     y=30     width=10     height=10     xoffset=0     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=117   x=184     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=115   x=193     y=30     width=8     height=10     xoffset=1     yoffset=7    xadvance=8     page=0  chnl=0 \r
-char id=114   x=201     y=30     width=7     height=10     xoffset=1     yoffset=7    xadvance=6     page=0  chnl=0 \r
-char id=110   x=208     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=109   x=217     y=30     width=13     height=10     xoffset=2     yoffset=7    xadvance=15     page=0  chnl=0 \r
-char id=101   x=230     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=99   x=239     y=30     width=9     height=10     xoffset=1     yoffset=7    xadvance=8     page=0  chnl=0 \r
-char id=97   x=0     y=43     width=9     height=10     xoffset=1     yoffset=7    xadvance=9     page=0  chnl=0 \r
-char id=42   x=9     y=43     width=8     height=9     xoffset=1     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=111   x=17     y=43     width=9     height=9     xoffset=1     yoffset=8    xadvance=10     page=0  chnl=0 \r
-char id=126   x=26     y=43     width=11     height=7     xoffset=1     yoffset=8    xadvance=12     page=0  chnl=0 \r
-char id=94   x=37     y=43     width=11     height=7     xoffset=1     yoffset=4    xadvance=12     page=0  chnl=0 \r
-char id=44   x=48     y=43     width=4     height=7     xoffset=1     yoffset=13    xadvance=5     page=0  chnl=0 \r
-char id=61   x=52     y=43     width=11     height=6     xoffset=2     yoffset=8    xadvance=12     page=0  chnl=0 \r
-char id=39   x=63     y=43     width=2     height=6     xoffset=1     yoffset=3    xadvance=4     page=0  chnl=0 \r
-char id=34   x=65     y=43     width=5     height=6     xoffset=1     yoffset=3    xadvance=7     page=0  chnl=0 \r
-char id=46   x=70     y=43     width=3     height=4     xoffset=2     yoffset=13    xadvance=5     page=0  chnl=0 \r
-char id=96   x=73     y=43     width=4     height=4     xoffset=2     yoffset=3    xadvance=10     page=0  chnl=0 \r
-char id=95   x=77     y=43     width=12     height=3     xoffset=0     yoffset=16    xadvance=10     page=0  chnl=0 \r
-char id=45   x=89     y=43     width=7     height=3     xoffset=1     yoffset=10    xadvance=7     page=0  chnl=0 \r
-kernings count=202\r
+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=31    xadvance=11     page=0  chnl=0 \r
+char id=124   x=0     y=0     width=5     height=31     xoffset=6     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=125   x=5     y=0     width=16     height=31     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=123   x=21     y=0     width=16     height=31     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=93   x=37     y=0     width=10     height=31     xoffset=3     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=91   x=47     y=0     width=10     height=31     xoffset=4     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=41   x=57     y=0     width=11     height=31     xoffset=2     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=40   x=68     y=0     width=10     height=31     xoffset=3     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=36   x=78     y=0     width=17     height=30     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=106   x=95     y=0     width=11     height=30     xoffset=-2     yoffset=8    xadvance=10     page=0  chnl=0 \r
+char id=81   x=106     y=0     width=22     height=30     xoffset=2     yoffset=8    xadvance=24     page=0  chnl=0 \r
+char id=92   x=128     y=0     width=14     height=29     xoffset=1     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=47   x=142     y=0     width=14     height=29     xoffset=0     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=64   x=156     y=0     width=27     height=28     xoffset=3     yoffset=8    xadvance=30     page=0  chnl=0 \r
+char id=127   x=183     y=0     width=25     height=25     xoffset=4     yoffset=7    xadvance=30     page=0  chnl=0 \r
+char id=59   x=208     y=0     width=7     height=25     xoffset=4     yoffset=13    xadvance=14     page=0  chnl=0 \r
+char id=121   x=215     y=0     width=17     height=25     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=113   x=232     y=0     width=16     height=25     xoffset=2     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=112   x=0     y=31     width=16     height=25     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=108   x=16     y=31     width=5     height=25     xoffset=3     yoffset=7    xadvance=9     page=0  chnl=0 \r
+char id=107   x=21     y=31     width=16     height=25     xoffset=3     yoffset=7    xadvance=18     page=0  chnl=0 \r
+char id=104   x=37     y=31     width=15     height=25     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=103   x=52     y=31     width=16     height=25     xoffset=2     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=102   x=68     y=31     width=13     height=25     xoffset=1     yoffset=7    xadvance=11     page=0  chnl=0 \r
+char id=100   x=81     y=31     width=16     height=25     xoffset=2     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=98   x=97     y=31     width=16     height=25     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=38   x=113     y=31     width=22     height=24     xoffset=2     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=35   x=135     y=31     width=21     height=24     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=37   x=156     y=31     width=30     height=24     xoffset=2     yoffset=8    xadvance=32     page=0  chnl=0 \r
+char id=63   x=186     y=31     width=14     height=24     xoffset=2     yoffset=8    xadvance=16     page=0  chnl=0 \r
+char id=33   x=200     y=31     width=5     height=24     xoffset=4     yoffset=8    xadvance=12     page=0  chnl=0 \r
+char id=48   x=205     y=31     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=56   x=222     y=31     width=16     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=55   x=238     y=31     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=54   x=0     y=56     width=16     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=53   x=16     y=56     width=16     height=24     xoffset=3     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=52   x=32     y=56     width=18     height=24     xoffset=1     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=51   x=50     y=56     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=50   x=67     y=56     width=17     height=24     xoffset=2     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=49   x=84     y=56     width=14     height=24     xoffset=4     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=116   x=98     y=56     width=12     height=24     xoffset=1     yoffset=8    xadvance=12     page=0  chnl=0 \r
+char id=105   x=110     y=56     width=5     height=24     xoffset=3     yoffset=8    xadvance=9     page=0  chnl=0 \r
+char id=90   x=115     y=56     width=19     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=89   x=134     y=56     width=20     height=24     xoffset=0     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=88   x=154     y=56     width=20     height=24     xoffset=1     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=87   x=174     y=56     width=29     height=24     xoffset=1     yoffset=8    xadvance=30     page=0  chnl=0 \r
+char id=86   x=203     y=56     width=22     height=24     xoffset=0     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=85   x=225     y=56     width=18     height=24     xoffset=3     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=84   x=0     y=80     width=21     height=24     xoffset=0     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=83   x=21     y=80     width=19     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=82   x=40     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=80   x=59     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=18     page=0  chnl=0 \r
+char id=79   x=75     y=80     width=22     height=24     xoffset=2     yoffset=8    xadvance=24     page=0  chnl=0 \r
+char id=78   x=97     y=80     width=18     height=24     xoffset=3     yoffset=8    xadvance=22     page=0  chnl=0 \r
+char id=77   x=115     y=80     width=21     height=24     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=76   x=136     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=17     page=0  chnl=0 \r
+char id=75   x=152     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=74   x=171     y=80     width=12     height=24     xoffset=1     yoffset=8    xadvance=14     page=0  chnl=0 \r
+char id=73   x=183     y=80     width=11     height=24     xoffset=2     yoffset=8    xadvance=13     page=0  chnl=0 \r
+char id=72   x=194     y=80     width=19     height=24     xoffset=3     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=71   x=213     y=80     width=21     height=24     xoffset=2     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=70   x=234     y=80     width=16     height=24     xoffset=3     yoffset=8    xadvance=17     page=0  chnl=0 \r
+char id=69   x=0     y=104     width=16     height=24     xoffset=3     yoffset=8    xadvance=19     page=0  chnl=0 \r
+char id=68   x=16     y=104     width=20     height=24     xoffset=3     yoffset=8    xadvance=23     page=0  chnl=0 \r
+char id=67   x=36     y=104     width=20     height=24     xoffset=2     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=66   x=56     y=104     width=18     height=24     xoffset=3     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=65   x=74     y=104     width=22     height=24     xoffset=0     yoffset=8    xadvance=21     page=0  chnl=0 \r
+char id=57   x=96     y=104     width=17     height=23     xoffset=2     yoffset=9    xadvance=19     page=0  chnl=0 \r
+char id=43   x=113     y=104     width=20     height=20     xoffset=3     yoffset=11    xadvance=25     page=0  chnl=0 \r
+char id=58   x=133     y=104     width=6     height=19     xoffset=5     yoffset=13    xadvance=14     page=0  chnl=0 \r
+char id=122   x=139     y=104     width=16     height=19     xoffset=1     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=120   x=155     y=104     width=17     height=19     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=119   x=172     y=104     width=24     height=19     xoffset=1     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=118   x=196     y=104     width=17     height=19     xoffset=1     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=117   x=213     y=104     width=15     height=19     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=115   x=228     y=104     width=15     height=19     xoffset=2     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=114   x=243     y=104     width=12     height=19     xoffset=3     yoffset=13    xadvance=13     page=0  chnl=0 \r
+char id=110   x=0     y=128     width=15     height=19     xoffset=3     yoffset=13    xadvance=19     page=0  chnl=0 \r
+char id=109   x=15     y=128     width=27     height=19     xoffset=2     yoffset=13    xadvance=29     page=0  chnl=0 \r
+char id=101   x=42     y=128     width=17     height=19     xoffset=2     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=99   x=59     y=128     width=15     height=19     xoffset=2     yoffset=13    xadvance=16     page=0  chnl=0 \r
+char id=97   x=74     y=128     width=15     height=19     xoffset=2     yoffset=13    xadvance=18     page=0  chnl=0 \r
+char id=62   x=89     y=128     width=19     height=18     xoffset=4     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=60   x=108     y=128     width=19     height=18     xoffset=4     yoffset=13    xadvance=25     page=0  chnl=0 \r
+char id=111   x=127     y=128     width=16     height=18     xoffset=2     yoffset=14    xadvance=18     page=0  chnl=0 \r
+char id=42   x=143     y=128     width=15     height=16     xoffset=3     yoffset=7    xadvance=19     page=0  chnl=0 \r
+char id=94   x=158     y=128     width=20     height=14     xoffset=3     yoffset=8    xadvance=25     page=0  chnl=0 \r
+char id=44   x=178     y=128     width=7     height=12     xoffset=2     yoffset=26    xadvance=11     page=0  chnl=0 \r
+char id=126   x=185     y=128     width=20     height=11     xoffset=3     yoffset=16    xadvance=25     page=0  chnl=0 \r
+char id=61   x=205     y=128     width=19     height=10     xoffset=4     yoffset=16    xadvance=25     page=0  chnl=0 \r
+char id=39   x=224     y=128     width=4     height=10     xoffset=2     yoffset=7    xadvance=8     page=0  chnl=0 \r
+char id=34   x=228     y=128     width=10     height=10     xoffset=2     yoffset=7    xadvance=14     page=0  chnl=0 \r
+char id=96   x=238     y=128     width=7     height=7     xoffset=5     yoffset=6    xadvance=19     page=0  chnl=0 \r
+char id=46   x=245     y=128     width=6     height=6     xoffset=4     yoffset=26    xadvance=11     page=0  chnl=0 \r
+char id=45   x=0     y=147     width=11     height=5     xoffset=2     yoffset=19    xadvance=14     page=0  chnl=0 \r
+char id=95   x=11     y=147     width=21     height=4     xoffset=0     yoffset=33    xadvance=19     page=0  chnl=0 \r
+kernings count=342\r
+kerning first=121  second=44  amount=-3\r
+kerning first=121  second=45  amount=-1\r
+kerning first=121  second=46  amount=-3\r
+kerning first=121  second=97  amount=-1\r
 kerning first=107  second=45  amount=-1\r
-kerning first=121  second=44  amount=-1\r
-kerning first=121  second=46  amount=-1\r
+kerning first=102  second=34  amount=1\r
+kerning first=102  second=39  amount=1\r
 kerning first=102  second=41  amount=1\r
-kerning first=102  second=44  amount=-1\r
-kerning first=102  second=46  amount=-1\r
-kerning first=102  second=63  amount=1\r
+kerning first=102  second=42  amount=1\r
+kerning first=102  second=44  amount=-2\r
+kerning first=102  second=45  amount=-1\r
+kerning first=102  second=46  amount=-2\r
+kerning first=102  second=63  amount=2\r
 kerning first=102  second=92  amount=1\r
 kerning first=102  second=93  amount=1\r
 kerning first=102  second=125  amount=1\r
-kerning first=89  second=44  amount=-2\r
-kerning first=89  second=45  amount=-1\r
-kerning first=89  second=46  amount=-2\r
-kerning first=89  second=58  amount=-1\r
-kerning first=89  second=59  amount=-1\r
+kerning first=116  second=45  amount=-1\r
+kerning first=90  second=45  amount=-1\r
+kerning first=90  second=97  amount=-1\r
+kerning first=90  second=101  amount=-1\r
+kerning first=90  second=111  amount=-1\r
+kerning first=90  second=119  amount=-1\r
+kerning first=90  second=121  amount=-1\r
+kerning first=89  second=44  amount=-4\r
+kerning first=89  second=45  amount=-2\r
+kerning first=89  second=46  amount=-4\r
+kerning first=89  second=58  amount=-3\r
+kerning first=89  second=59  amount=-3\r
 kerning first=89  second=65  amount=-1\r
-kerning first=89  second=97  amount=-1\r
-kerning first=89  second=100  amount=-1\r
-kerning first=89  second=101  amount=-1\r
-kerning first=89  second=103  amount=-1\r
+kerning first=89  second=97  amount=-2\r
+kerning first=89  second=100  amount=-2\r
+kerning first=89  second=101  amount=-2\r
+kerning first=89  second=103  amount=-2\r
 kerning first=89  second=109  amount=-1\r
 kerning first=89  second=110  amount=-1\r
-kerning first=89  second=111  amount=-1\r
+kerning first=89  second=111  amount=-2\r
 kerning first=89  second=112  amount=-1\r
-kerning first=89  second=113  amount=-1\r
+kerning first=89  second=113  amount=-2\r
 kerning first=89  second=114  amount=-1\r
-kerning first=89  second=115  amount=-1\r
-kerning first=89  second=117  amount=-1\r
+kerning first=89  second=115  amount=-2\r
+kerning first=89  second=117  amount=-2\r
 kerning first=89  second=118  amount=-1\r
-kerning first=87  second=44  amount=-2\r
-kerning first=87  second=46  amount=-2\r
+kerning first=88  second=45  amount=-1\r
+kerning first=88  second=97  amount=-1\r
+kerning first=88  second=101  amount=-1\r
+kerning first=88  second=111  amount=-1\r
+kerning first=88  second=121  amount=-1\r
+kerning first=87  second=44  amount=-4\r
+kerning first=87  second=45  amount=-1\r
+kerning first=87  second=46  amount=-3\r
 kerning first=87  second=58  amount=-1\r
 kerning first=87  second=59  amount=-1\r
+kerning first=87  second=65  amount=-1\r
 kerning first=87  second=97  amount=-1\r
 kerning first=87  second=101  amount=-1\r
 kerning first=87  second=111  amount=-1\r
-kerning first=86  second=44  amount=-2\r
-kerning first=86  second=46  amount=-2\r
+kerning first=87  second=114  amount=-1\r
+kerning first=87  second=117  amount=-1\r
+kerning first=87  second=121  amount=-1\r
+kerning first=86  second=44  amount=-4\r
+kerning first=86  second=45  amount=-1\r
+kerning first=86  second=46  amount=-4\r
 kerning first=86  second=58  amount=-1\r
 kerning first=86  second=59  amount=-1\r
+kerning first=86  second=65  amount=-1\r
 kerning first=86  second=97  amount=-1\r
 kerning first=86  second=101  amount=-1\r
 kerning first=86  second=111  amount=-1\r
-kerning first=84  second=44  amount=-2\r
-kerning first=84  second=45  amount=-1\r
-kerning first=84  second=46  amount=-2\r
-kerning first=84  second=58  amount=-1\r
-kerning first=84  second=59  amount=-1\r
-kerning first=84  second=65  amount=-1\r
+kerning first=86  second=117  amount=-1\r
+kerning first=86  second=121  amount=-1\r
+kerning first=84  second=44  amount=-4\r
+kerning first=84  second=45  amount=-2\r
+kerning first=84  second=46  amount=-4\r
+kerning first=84  second=58  amount=-3\r
+kerning first=84  second=59  amount=-3\r
+kerning first=84  second=63  amount=1\r
+kerning first=84  second=65  amount=-2\r
+kerning first=84  second=67  amount=-1\r
+kerning first=84  second=71  amount=-1\r
+kerning first=84  second=79  amount=-1\r
 kerning first=84  second=84  amount=-1\r
-kerning first=84  second=97  amount=-2\r
-kerning first=84  second=99  amount=-2\r
-kerning first=84  second=101  amount=-2\r
-kerning first=84  second=103  amount=-2\r
-kerning first=84  second=111  amount=-2\r
-kerning first=84  second=114  amount=-1\r
-kerning first=84  second=115  amount=-1\r
-kerning first=84  second=117  amount=-1\r
-kerning first=84  second=118  amount=-1\r
-kerning first=84  second=119  amount=-1\r
-kerning first=84  second=121  amount=-1\r
-kerning first=84  second=122  amount=-1\r
+kerning first=84  second=97  amount=-4\r
+kerning first=84  second=99  amount=-3\r
+kerning first=84  second=101  amount=-3\r
+kerning first=84  second=103  amount=-3\r
+kerning first=84  second=111  amount=-3\r
+kerning first=84  second=114  amount=-3\r
+kerning first=84  second=115  amount=-3\r
+kerning first=84  second=117  amount=-3\r
+kerning first=84  second=118  amount=-3\r
+kerning first=84  second=119  amount=-3\r
+kerning first=84  second=121  amount=-3\r
+kerning first=84  second=122  amount=-2\r
 kerning first=82  second=45  amount=-1\r
-kerning first=80  second=44  amount=-2\r
-kerning first=80  second=46  amount=-2\r
-kerning first=76  second=39  amount=-1\r
-kerning first=76  second=45  amount=-1\r
+kerning first=82  second=84  amount=-1\r
+kerning first=82  second=97  amount=-1\r
+kerning first=82  second=101  amount=-1\r
+kerning first=82  second=111  amount=-1\r
+kerning first=82  second=121  amount=-1\r
+kerning first=80  second=44  amount=-4\r
+kerning first=80  second=46  amount=-4\r
+kerning first=80  second=65  amount=-1\r
+kerning first=80  second=97  amount=-1\r
+kerning first=80  second=101  amount=-1\r
+kerning first=80  second=111  amount=-1\r
+kerning first=79  second=84  amount=-1\r
+kerning first=76  second=39  amount=-2\r
+kerning first=76  second=45  amount=-2\r
 kerning first=76  second=74  amount=1\r
-kerning first=76  second=84  amount=-1\r
-kerning first=76  second=86  amount=-1\r
+kerning first=76  second=84  amount=-2\r
+kerning first=76  second=86  amount=-2\r
 kerning first=76  second=87  amount=-1\r
-kerning first=76  second=89  amount=-1\r
-kerning first=76  second=118  amount=-1\r
-kerning first=76  second=121  amount=-1\r
-kerning first=75  second=45  amount=-1\r
+kerning first=76  second=89  amount=-2\r
+kerning first=76  second=118  amount=-2\r
+kerning first=76  second=121  amount=-2\r
+kerning first=75  second=45  amount=-2\r
+kerning first=75  second=97  amount=-1\r
 kerning first=75  second=101  amount=-1\r
 kerning first=75  second=111  amount=-1\r
+kerning first=75  second=117  amount=-1\r
 kerning first=75  second=118  amount=-1\r
 kerning first=75  second=119  amount=-1\r
 kerning first=75  second=121  amount=-1\r
-kerning first=70  second=44  amount=-2\r
-kerning first=70  second=46  amount=-2\r
+kerning first=70  second=44  amount=-4\r
+kerning first=70  second=46  amount=-4\r
+kerning first=70  second=58  amount=-1\r
+kerning first=70  second=59  amount=-1\r
+kerning first=70  second=63  amount=1\r
 kerning first=70  second=65  amount=-1\r
 kerning first=70  second=97  amount=-1\r
-kerning first=65  second=84  amount=-1\r
+kerning first=70  second=101  amount=-1\r
+kerning first=70  second=111  amount=-1\r
+kerning first=68  second=44  amount=-1\r
+kerning first=68  second=46  amount=-1\r
+kerning first=68  second=84  amount=-1\r
+kerning first=67  second=45  amount=-1\r
+kerning first=66  second=84  amount=-1\r
+kerning first=65  second=45  amount=-1\r
+kerning first=65  second=84  amount=-2\r
+kerning first=65  second=86  amount=-1\r
+kerning first=65  second=87  amount=-1\r
 kerning first=65  second=89  amount=-1\r
-kerning first=88  second=45  amount=-1\r
-kerning first=88  second=121  amount=-1\r
+kerning first=65  second=118  amount=-1\r
+kerning first=65  second=121  amount=-1\r
+kerning first=120  second=45  amount=-1\r
 kerning first=119  second=44  amount=-1\r
 kerning first=119  second=46  amount=-1\r
-kerning first=118  second=44  amount=-1\r
-kerning first=118  second=46  amount=-1\r
-kerning first=114  second=44  amount=-2\r
-kerning first=114  second=46  amount=-2\r
-kerning first=101  second=84  amount=-1\r
+kerning first=118  second=44  amount=-3\r
+kerning first=118  second=45  amount=-1\r
+kerning first=118  second=46  amount=-3\r
+kerning first=118  second=97  amount=-1\r
+kerning first=114  second=44  amount=-4\r
+kerning first=114  second=46  amount=-4\r
+kerning first=114  second=97  amount=-1\r
+kerning first=101  second=84  amount=-2\r
+kerning first=99  second=84  amount=-1\r
 kerning first=39  second=65  amount=-1\r
-kerning first=46  second=44  amount=-1\r
-kerning first=46  second=45  amount=-1\r
+kerning first=46  second=44  amount=-2\r
+kerning first=46  second=45  amount=-2\r
+kerning first=45  second=65  amount=-1\r
 kerning first=45  second=74  amount=-1\r
-kerning first=45  second=84  amount=-1\r
+kerning first=45  second=84  amount=-2\r
+kerning first=45  second=86  amount=-1\r
+kerning first=45  second=87  amount=-1\r
 kerning first=45  second=88  amount=-1\r
-kerning first=45  second=89  amount=-1\r
+kerning first=45  second=89  amount=-2\r
+kerning first=45  second=118  amount=-1\r
+kerning first=45  second=120  amount=-1\r
+kerning first=45  second=121  amount=-1\r
+kerning first=45  second=122  amount=-1\r

diff --git a/extensions/twl/gdx-twl-tests/data/font.png b/extensions/twl/gdx-twl-tests/data/font.png
index 2b7f95d..ef3e30a 100644 (file)
Binary files a/extensions/twl/gdx-twl-tests/data/font.png and b/extensions/twl/gdx-twl-tests/data/font.png differ

diff --git a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java
index 68ad624..8523f90 100644 (file)
--- a/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java
+++ b/extensions/twl/gdx-twl-tests/src/com/badlogic/gdx/twl/tests/TextAreaTest.java
@@ -28,7 +28,7 @@ public class TextAreaTest implements RenderListener {
                final HTMLTextAreaModel htmlText = new HTMLTextAreaModel();\r
                TextArea textArea = new TextArea(htmlText);\r
                htmlText\r
-                       .setHtml("<div style='font-family:heading;text-align:center'>TWL TextAreaTest</div><a href='badlogic'><img src='badlogic' id='badlogic' style='float:right; margin:10px'/></a>Lorem ipsum dolor sit amet, douchebagus joglus. Sed fermentum gravida turpis, sit amet gravida justo laoreet non. Donec ultrices suscipit metus a mollis. Mollis varius egestas quisque feugiat pellentesque mi, quis scelerisque velit bibendum eget. Nulla orci in enim nisl mattis varius dignissim fringilla.<br/><br/><img src='twllogo' style='float:left; margin:10px'/>Curabitur purus leo, ultricies ut cursus eget, adipiscing in quam. Duis non velit vel mauris vulputate fringilla et quis.<br/><br/><div>Suspendisse lobortis iaculis tellus id fermentum. Integer fermentum varius pretium. Nullam libero magna, mattis vel placerat ac, dignissim sed lacus. Mauris varius libero id neque auctor a auctor odio fringilla.</div><br/><div>Mauris orci arcu, porta eget porttitor luctus, malesuada nec metus. Nunc fermentum viverra leo eu pretium. Curabitur vitae nibh massa, imperdiet egestas lectus. Nulla odio quam, lobortis eget fermentum non, faucibus ac mi. Morbi et libero nulla. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam sit amet rhoncus nulla. Morbi consectetur ante convallis ante tristique et porta ligula hendrerit. Donec rhoncus ornare augue, sit amet lacinia nulla auctor venenatis.</div><br/><div>Etiam semper egestas porta. Proin luctus porta faucibus. Curabitur sagittis, lorem nec imperdiet ullamcorper, sem risus consequat purus, non faucibus turpis lorem ut arcu. Nunc tempus lobortis enim vitae facilisis. Morbi posuere quam nec sem aliquam eleifend.</div>");\r
+                       .setHtml("<div style='font-family:heading;text-align:center'>TWL TextAreaTest</div><a href='badlogic'><img src='badlogic' id='badlogic' style='float:right; margin:10px'/></a>Lorem ipsum dolor sit amet, douchebagus joglus. Sed fermentum gravida turpis, sit amet gravida justo laoreet non. Donec ultrices suscipit metus a mollis. Mollis varius egestas quisque feugiat pellentesque mi, quis scelerisque velit bibendum eget. Nulla orci in enim nisl mattis varius dignissim fringilla.<br/><br/><img src='twllogo' style='float:left; margin:10px'/>Curabitur purus leo, ultricies ut cursus eget, adipiscing in quam. Duis non velit vel mauris vulputate fringilla et quis.<br/><br/>Suspendisse lobortis iaculis tellus id fermentum. Integer fermentum varius pretium. Nullam libero magna, mattis vel placerat ac, dignissim sed lacus. Mauris varius libero id neque auctor a auctor odio fringilla.<br/><br/><div>Mauris orci arcu, porta eget porttitor luctus, malesuada nec metus. Nunc fermentum viverra leo eu pretium. Curabitur vitae nibh massa, imperdiet egestas lectus. Nulla odio quam, lobortis eget fermentum non, faucibus ac mi. Morbi et libero nulla. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aliquam sit amet rhoncus nulla. Morbi consectetur ante convallis ante tristique et porta ligula hendrerit. Donec rhoncus ornare augue, sit amet lacinia nulla auctor venenatis.</div><br/><div>Etiam semper egestas porta. Proin luctus porta faucibus. Curabitur sagittis, lorem nec imperdiet ullamcorper, sem risus consequat purus, non faucibus turpis lorem ut arcu. Nunc tempus lobortis enim vitae facilisis. Morbi posuere quam nec sem aliquam eleifend.</div>");\r
                ScrollPane scrollPane = new ScrollPane(textArea);\r
                scrollPane.setFixed(ScrollPane.Fixed.HORIZONTAL);\r
                FPSCounter fpsCounter = new FPSCounter(4, 2);\r

diff --git a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/GdxFont.java b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/GdxFont.java
index c5298b0..6f4f0de 100644 (file)
--- a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/GdxFont.java
+++ b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/GdxFont.java
@@ -44,6 +44,8 @@ import de.matthiasmann.twl.utils.StateExpression;
  * @author Matthias Mann
  */
 class GdxFont implements Font {
+       static private final HAlignment[] gdxAlignment = HAlignment.values();
+
        final TwlRenderer renderer;
        final BitmapFont bitmapFont;
        private final FontState[] fontStates;
@@ -82,7 +84,7 @@ class GdxFont implements Font {
                x += fontState.offsetX;
                y += fontState.offsetY + yOffset;
                com.badlogic.gdx.graphics.Color color = renderer.getColor(fontState.color);
-               return bitmapFont.drawMultiLineText(renderer.spriteBatch, str, x, y, color, width, HAlignment.values()[align.ordinal()]);
+               return bitmapFont.drawMultiLineText(renderer.spriteBatch, str, x, y, color, width, gdxAlignment[align.ordinal()]);
        }
 
        public FontCache cacheText (FontCache cache, CharSequence str) {
@@ -100,7 +102,7 @@ class GdxFont implements Font {
                if (cache == null) cache = new GdxFontCache();
                BitmapFontCache bitmapCache = ((GdxFontCache)cache).bitmapCache;
                bitmapFont.cacheMultiLineText(bitmapCache, str, 0, yOffset, com.badlogic.gdx.graphics.Color.WHITE, width,
-                       HAlignment.values()[align.ordinal()]);
+                       gdxAlignment[align.ordinal()]);
                return cache;
        }
 

diff --git a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/TwlRenderer.java b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/TwlRenderer.java
index 469bb1b..9ee71fa 100644 (file)
--- a/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/TwlRenderer.java
+++ b/extensions/twl/gdx-twl/src/com/badlogic/gdx/twl/renderer/TwlRenderer.java
@@ -23,7 +23,6 @@
 package com.badlogic.gdx.twl.renderer;\r
 \r
 import java.io.File;\r
-import java.io.FileNotFoundException;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.net.URL;\r
@@ -32,14 +31,13 @@ import java.net.URLStreamHandler;
 import java.util.Collection;\r
 import java.util.Map;\r
 \r
+import com.badlogic.gdx.Files.FileType;\r
 import com.badlogic.gdx.Gdx;\r
 import com.badlogic.gdx.GdxRuntimeException;\r
-import com.badlogic.gdx.Files.FileType;\r
 import com.badlogic.gdx.files.FileHandle;\r
 import com.badlogic.gdx.graphics.BitmapFont;\r
 import com.badlogic.gdx.graphics.Color;\r
 import com.badlogic.gdx.graphics.GL10;\r
-import com.badlogic.gdx.graphics.GLCommon;\r
 import com.badlogic.gdx.graphics.SpriteBatch;\r
 import com.badlogic.gdx.math.Matrix4;\r
 \r
@@ -67,6 +65,7 @@ public class TwlRenderer implements Renderer {
        private final TintStack tintStateRoot = new TintStack();\r
        private TintStack tintStack = tintStateRoot;\r
        private final Color tempColor = new Color(1, 1, 1, 1);\r
+       private boolean rendering;\r
        final SpriteBatch spriteBatch = new SpriteBatch();\r
 \r
        public TwlRenderer () {\r
@@ -99,9 +98,11 @@ public class TwlRenderer implements Renderer {
        public void startRenderering () {\r
                tintStack = tintStateRoot;\r
                spriteBatch.begin();\r
+               rendering = true;\r
        }\r
 \r
        public void endRendering () {\r
+               rendering = false;\r
                spriteBatch.end();\r
                if (hasScissor) {\r
                        Gdx.gl.glDisable(GL10.GL_SCISSOR_TEST);\r
@@ -110,6 +111,7 @@ public class TwlRenderer implements Renderer {
        }\r
 \r
        public void setClipRect (Rect rect) {\r
+               if (rendering) spriteBatch.renderMesh();\r
                if (rect == null) {\r
                        Gdx.gl.glDisable(GL10.GL_SCISSOR_TEST);\r
                        hasScissor = false;\r
@@ -206,21 +208,23 @@ public class TwlRenderer implements Renderer {
                TwlRenderer renderer = new TwlRenderer();\r
                GUI gui = new GUI(root, renderer, null);\r
                File file = new File(themeFile);\r
-               final String themeRoot = file.getParent() + "/";\r
-               String themeFileName = file.getName();\r
+               final File themeRoot = file.getParentFile();\r
+               final String themeFileName = file.getName();\r
                try {\r
                        URL themeURL = new URL("gdx-twl", "local", 80, themeFileName, new URLStreamHandler() {\r
-                               protected URLConnection openConnection (final URL url) throws IOException {\r
-                                       final FileHandle fileHandle = Gdx.files.getFileHandle(themeRoot + url.getPath(), fileType);\r
+                               protected URLConnection openConnection (URL url) throws IOException {\r
+                                       final String path = new File(themeRoot, url.getPath()).getPath();\r
+                                       final FileHandle fileHandle = Gdx.files.getFileHandle(path, fileType);\r
                                        return new URLConnection(url) {\r
-                                               public void connect () throws IOException {\r
+                                               public void connect () {\r
                                                }\r
 \r
-                                               public Object getContent () throws IOException {\r
+                                               public Object getContent () {\r
                                                        return fileHandle;\r
                                                }\r
 \r
-                                               public InputStream getInputStream () throws IOException {\r
+                                               public InputStream getInputStream () {\r
+                                                       if (!path.endsWith(".xml")) return null; // Only theme files are loaded through the URL.\r
                                                        return fileHandle.getInputStream();\r
                                                }\r
                                        };\r

diff --git a/gdx/src/com/badlogic/gdx/graphics/SpriteBatch.java b/gdx/src/com/badlogic/gdx/graphics/SpriteBatch.java
index 92eac8a..2a1397e 100644 (file)
--- a/gdx/src/com/badlogic/gdx/graphics/SpriteBatch.java
+++ b/gdx/src/com/badlogic/gdx/graphics/SpriteBatch.java
@@ -635,7 +635,7 @@ public class SpriteBatch {
                idx += length;\r
        }\r
 \r
-       protected void renderMesh () {\r
+       public void renderMesh () {\r
                if (idx == 0) return;\r
 \r
                renderCalls++;\r