clean up Fonts and Numbers names

stepmania/Themes/default/Fonts/Common Normal.ini

@@ -0,0 +1,267 @@
+# Up to 192 hand-realigned; over 128 rushed (boring) and untested,
+# characters over 192 probably too wide.
+
+[Char Widths]
+# This is to put a little space around glyphs.  Make sure this is
+# an even number, or it'll throw the glyphs off-center.
+
+AddToAllWidths=2
+Top=5
+Baseline=24
+LineSpacing=28
+0=15
+1=15
+2=15
+3=15
+4=15
+5=15
+6=15
+7=15
+8=15
+9=104
+10=0
+11=15
+12=15
+13=0
+14=15
+15=15
+16=15
+17=15
+18=15
+19=15
+20=15
+21=15
+22=15
+23=15
+24=15
+25=15
+26=15
+27=15
+28=0
+29=0
+30=0
+31=0
+32=4
+33=4
+34=10
+35=15
+36=12
+37=22
+38=18
+39=4
+40=7
+41=7
+42=8
+43=14
+44=6
+45=8
+46=6
+47=8
+48=13
+49=9
+50=13
+51=13
+52=14
+53=13
+54=13
+55=13
+56=13
+57=13
+58=8
+59=8
+60=13
+61=14
+62=13
+63=14
+64=26
+65=19
+66=17
+67=18
+68=17
+69=15
+70=14
+71=18
+72=16
+73=4
+74=13
+75=18
+76=14
+77=19
+78=16
+79=19
+80=15
+81=19
+82=18
+83=16
+84=16
+85=16
+86=17
+87=25
+88=16
+89=18
+90=16
+91=9
+92=8
+93=9
+94=16
+95=15
+96=9
+97=13
+98=14
+99=13
+100=14
+101=13
+102=9
+103=14
+104=13
+105=4
+106=7
+107=12
+108=4
+109=22
+110=13
+111=15
+112=14
+113=14
+114=9
+115=13
+116=9
+117=13
+118=13
+119=21
+120=13
+121=15
+122=12
+123=11
+124=7
+125=11
+126=16
+127=15
+128=15
+129=9
+130=6
+131=15
+132=10
+133=24
+134=14
+135=14
+136=9
+137=28
+138=16
+139=9
+140=25
+141=9
+142=16
+143=9
+144=9
+145=6
+146=6
+147=13
+148=13
+149=9
+150=15
+151=27
+152=9
+153=19
+154=13
+155=9
+156=23
+157=9
+158=12
+159=19
+160=8
+161=6
+162=13
+163=14
+164=14
+165=14
+166=5
+167=13
+168=9
+169=20
+170=10
+171=13
+172=14
+173=8
+174=20
+175=15
+176=8
+177=14
+178=8
+179=8
+180=7
+181=13
+182=14
+183=6
+184=7
+185=7
+186=9
+187=13
+188=22
+189=21
+190=23
+191=14
+192=19
+193=19
+194=19
+195=19
+196=19
+197=19
+198=27
+199=20
+200=18
+201=18
+202=18
+203=18
+204=8
+205=8
+206=8
+207=8
+208=20
+209=20
+210=21
+211=21
+212=21
+213=21
+214=21
+215=16
+216=21
+217=20
+218=20
+219=20
+220=20
+221=18
+222=18
+223=17
+224=15
+225=15
+226=15
+227=15
+228=15
+229=15
+230=24
+231=15
+232=15
+233=15
+234=15
+235=15
+236=8
+237=8
+238=8
+239=8
+240=17
+241=17
+242=17
+243=17
+244=17
+245=17
+246=17
+247=15
+248=17
+249=17
+250=17
+251=17
+252=17
+253=15
+254=17
+255=15

stepmania/Themes/default/Fonts/Common default.ini

@@ -0,0 +1,15 @@
+# Default font.  This font is loaded behind every other font.
+[main]
+0=18
+1=18
+
+# The default font must define the default glyph; it's used to display
+# missing characters.  (It can be overridden by fonts, too, like any
+# other character.)
+map default=0
+map invalid=1
+
+# Load the default 16-pixel glyphs.  They can be overridden by fonts
+# later.
+import=_16px fonts
+

stepmania/Themes/default/Fonts/GroupList label.redir

@@ -1 +1 @@
-normal
+Common normal

stepmania/Themes/default/Fonts/ScreenEz2SelectMusic difficulty.redir

@@ -0,0 +1 @@
+header1

stepmania/Themes/default/Fonts/ScreenOptions explanation.redir

@@ -0,0 +1 @@
+Common normal

stepmania/Themes/default/Fonts/ScreenOptions item.redir

@@ -0,0 +1 @@
+Common normal

stepmania/Themes/default/Fonts/ScreenOptions title.redir

@@ -0,0 +1 @@
+_shared2

stepmania/Themes/default/Fonts/ScreenTitleMenu choices.redir

@@ -0,0 +1 @@
+_shared1

stepmania/Themes/default/Fonts/ScreenTitleMenu help.redir

@@ -0,0 +1 @@
+Common normal

stepmania/Themes/default/Fonts/_shared1.ini

@@ -0,0 +1,261 @@
+[Char Widths]
+AddToAllWidths=3
+Top=6
+Baseline=21
+LineSpacing=24
+0=10
+1=10
+2=10
+3=10
+4=10
+5=10
+6=10
+7=10
+8=10
+9=136
+10=0
+11=10
+12=10
+13=0
+14=10
+15=10
+16=10
+17=10
+18=10
+19=10
+20=10
+21=10
+22=10
+23=10
+24=10
+25=10
+26=10
+27=10
+28=0
+29=0
+30=0
+31=0
+32=14
+33=7
+34=13
+35=19
+36=19
+37=26
+38=19
+39=6
+40=13
+41=13
+42=12
+43=19
+44=6
+45=19
+46=7
+47=19
+48=19
+49=6
+50=19
+51=19
+52=19
+53=19
+54=19
+55=19
+56=19
+57=19
+58=7
+59=7
+60=13
+61=19
+62=13
+63=19
+64=26
+65=19
+66=19
+67=19
+68=19
+69=19
+70=19
+71=19
+72=19
+73=19
+74=19
+75=19
+76=19
+77=26
+78=19
+79=19
+80=19
+81=19
+82=19
+83=19
+84=19
+85=19
+86=19
+87=26
+88=19
+89=19
+90=19
+91=13
+92=19
+93=13
+94=13
+95=19
+96=6
+97=19
+98=19
+99=19
+100=19
+101=19
+102=19
+103=19
+104=19
+105=7
+106=16
+107=19
+108=6
+109=26
+110=19
+111=19
+112=19
+113=19
+114=19
+115=19
+116=19
+117=19
+118=19
+119=26
+120=19
+121=19
+122=19
+123=16
+124=6
+125=16
+126=19
+127=10
+128=10
+129=6
+130=5
+131=10
+132=7
+133=7
+134=10
+135=10
+136=6
+137=17
+138=12
+139=7
+140=17
+141=6
+142=11
+143=6
+144=6
+145=4
+146=4
+147=7
+148=7
+149=9
+150=7
+151=15
+152=6
+153=11
+154=9
+155=7
+156=16
+157=6
+158=9
+159=12
+160=5
+161=5
+162=10
+163=10
+164=10
+165=10
+166=6
+167=10
+168=6
+169=12
+170=7
+171=10
+172=10
+173=6
+174=12
+175=10
+176=6
+177=10
+178=6
+179=6
+180=6
+181=9
+182=9
+183=5
+184=6
+185=6
+186=7
+187=10
+188=13
+189=13
+190=13
+191=10
+192=12
+193=12
+194=12
+195=12
+196=12
+197=12
+198=32
+199=12
+200=12
+201=12
+202=12
+203=12
+204=6
+205=6
+206=6
+207=6
+208=13
+209=12
+210=13
+211=13
+212=13
+213=13
+214=13
+215=10
+216=13
+217=13
+218=13
+219=13
+220=13
+221=12
+222=11
+223=11
+224=10
+225=10
+226=10
+227=10
+228=10
+229=10
+230=32
+231=9
+232=10
+233=10
+234=10
+235=10
+236=4
+237=4
+238=4
+239=4
+240=10
+241=10
+242=10
+243=10
+244=10
+245=10
+246=10
+247=10
+248=10
+249=10
+250=10
+251=10
+252=10
+253=8
+254=10
+255=8

stepmania/Themes/default/Fonts/_shared2.ini

@@ -0,0 +1,276 @@
+# This font is identical to Header2, with a smaller LineSpacing.
+# Once we have a way to specify fonts better (eg. "Header2,LineSpacing=+2"),
+# this can go away.
+
+[Char Widths]
+LineSpacing=22
+Top=9
+Baseline=24
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=5
+0=14
+1=14
+2=14
+3=14
+4=14
+5=14
+6=14
+7=14
+8=14
+9=96
+10=0
+11=14
+12=14
+13=0
+14=14
+15=14
+16=14
+17=14
+18=14
+19=14
+20=14
+21=14
+22=14
+23=14
+24=14
+25=14
+26=14
+27=14
+28=0
+29=0
+30=0
+31=0
+32=7
+33=7
+34=11
+35=15
+36=15
+37=22
+38=20
+39=6
+40=9
+41=9
+42=12
+43=15
+44=7
+45=7
+46=7
+47=6
+48=15
+49=15
+50=15
+51=15
+52=15
+53=15
+54=15
+55=15
+56=15
+57=15
+58=7
+59=7
+60=15
+61=15
+62=15
+63=13
+64=16
+65=17
+66=17
+67=17
+68=17
+69=16
+70=15
+71=18
+72=18
+73=9
+74=15
+75=18
+76=15
+77=21
+78=18
+79=18
+80=16
+81=18
+82=17
+83=16
+84=16
+85=18
+86=17
+87=22
+88=17
+89=17
+90=16
+91=9
+92=6
+93=9
+94=15
+95=11
+96=7
+97=15
+98=15
+99=15
+100=15
+101=15
+102=9
+103=15
+104=15
+105=7
+106=7
+107=15
+108=7
+109=22
+110=15
+111=15
+112=15
+113=15
+114=10
+115=13
+116=10
+117=15
+118=13
+119=21
+120=15
+121=13
+122=12
+123=9
+124=6
+125=9
+126=15
+127=14
+128=14
+129=8
+130=6
+131=15
+132=11
+133=22
+134=15
+135=15
+136=7
+137=32
+138=16
+139=7
+140=22
+141=8
+142=16
+143=8
+144=8
+145=6
+146=6
+147=11
+148=11
+149=11
+150=11
+151=22
+152=7
+153=21
+154=13
+155=7
+156=22
+157=8
+158=12
+159=17
+160=7
+161=7
+162=15
+163=15
+164=15
+165=15
+166=6
+167=15
+168=7
+169=18
+170=9
+171=15
+172=15
+173=7
+174=18
+175=11
+176=9
+177=15
+178=9
+179=9
+180=7
+181=15
+182=19
+183=7
+184=7
+185=9
+186=9
+187=15
+188=22
+189=22
+190=22
+191=13
+192=17
+193=17
+194=17
+195=17
+196=17
+197=17
+198=22
+199=17
+200=16
+201=16
+202=16
+203=16
+204=9
+205=9
+206=9
+207=9
+208=17
+209=18
+210=18
+211=18
+212=18
+213=18
+214=18
+215=15
+216=18
+217=18
+218=18
+219=18
+220=18
+221=17
+222=16
+223=15
+224=15
+225=15
+226=15
+227=15
+228=15
+229=15
+230=22
+231=15
+232=15
+233=15
+234=15
+235=15
+236=7
+237=7
+238=7
+239=7
+240=15
+241=15
+242=15
+243=15
+244=15
+245=15
+246=15
+247=15
+248=15
+249=15
+250=15
+251=15
+252=15
+253=13
+254=15
+255=13
+
+[extras]
+LineSpacing=22
+Top=9
+Baseline=24
+DrawExtraPixelsLeft=2
+DrawExtraPixelsRight=5
+
+0=17
+map flipped-a=0

stepmania/Themes/default/metrics.ini

@@ -457,20 +457,10 @@ DemonstrationSeconds=30
 TickEarlySeconds=0.05
 
 [ScreenEvaluation]
-SongSelectScreen=ScreenSelectMusic
-EndGameScreen=ScreenNameEntry
-Banner1OnCommand=x,320;y,100;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner1OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-Banner2OnCommand=
-Banner2OffCommand=
-Banner3OnCommand=
-Banner3OffCommand=
-Banner4OnCommand=
-Banner4OffCommand=
-Banner5OnCommand=
-Banner5OffCommand=
 BannerWidth=248
 BannerHeight=92
+LargeBannerOnCommand=x,320;y,100;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+LargeBannerOffCommand=sleep,0.8;accelerate,0.3;yoffset,480
 StageOnCommand=x,320;y,66;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
 StageOffCommand=sleep,0.8;accelerate,0.3;yoffset,480
 DifficultyIconP1OnCommand=x,214;y,70;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
@@ -481,6 +471,16 @@ PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;x,200;y,140;zoom,0.5;s
 PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;x,440;y,140;zoom,0.5;shadowlength,2;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
+SmallBanner1OnCommand=x,260;y,80;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+SmallBanner1OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
+SmallBanner2OnCommand=x,290;y,90;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+SmallBanner2OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
+SmallBanner3OnCommand=x,320;y,100;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+SmallBanner3OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
+SmallBanner4OnCommand=x,350;y,110;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+SmallBanner4OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
+SmallBanner5OnCommand=x,380;y,120;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
+SmallBanner5OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
 GradeFrameP1OnCommand=x,94;y,100;xoffset,-320;sleep,0.0;decelerate,0.3;xoffset,320
 GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;xoffset,-320
 GradeFrameP2OnCommand=x,546;y,100;xoffset,320;sleep,0.0;decelerate,0.3;xoffset,-320
@@ -489,6 +489,10 @@ GradeP1OnCommand=x,94;y,100;glowshift;effectperiod,2;xoffset,-320;sleep,0.0;dece
 GradeP1OffCommand=sleep,0.8;accelerate,0.3;xoffset,-320
 GradeP2OnCommand=x,546;y,100;glowshift;effectperiod,2;xoffset,320;sleep,0.0;decelerate,0.3;xoffset,-320
 GradeP2OffCommand=sleep,0.8;accelerate,0.3;xoffset,320
+PercentFrameP1OnCommand=x,94;y,100;xoffset,-320;sleep,0.0;decelerate,0.3;xoffset,320
+PercentFrameP1OffCommand=sleep,0.8;accelerate,0.3;xoffset,-320
+PercentFrameP2OnCommand=x,546;y,100;xoffset,320;sleep,0.0;decelerate,0.3;xoffset,-320
+PercentFrameP2OffCommand=sleep,0.8;accelerate,0.3;xoffset,320
 PercentWholeP1OnCommand=horizalign,right;vertalign,bottom;x,120;y,132;glowshift;effectperiod,2;xoffset,-320;sleep,0.0;decelerate,0.3;xoffset,320
 PercentWholeP1OffCommand=sleep,0.8;accelerate,0.3;xoffset,-320
 PercentWholeP2OnCommand=horizalign,right;vertalign,bottom;x,572;y,132;glowshift;effectperiod,2;xoffset,320;sleep,0.0;decelerate,0.3;xoffset,-320
@@ -594,10 +598,14 @@ BarActual5P1OffCommand=linear,0.7;diffuse,1,1,1,0
 BarActual5P2OnCommand=horizalign,left;x,466;y,302;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
 BarActual5P2OffCommand=linear,0.7;diffuse,1,1,1,0
 BarActualMaxCommand=glowshift;effectperiod,0.5
-SongsSurvivedP1OnCommand=x,96;y,240;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
-SongsSurvivedP1OffCommand=linear,0.7;diffuse,1,1,1,0
-SongsSurvivedP2OnCommand=x,544;y,240;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
-SongsSurvivedP2OffCommand=linear,0.7;diffuse,1,1,1,0
+SurvivedFrameP1OnCommand=x,96;y,256;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
+SurvivedFrameP1OffCommand=linear,0.7;diffuse,1,1,1,0
+SurvivedFrameP2OnCommand=x,544;y,256;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
+SurvivedFrameP2OffCommand=linear,0.7;diffuse,1,1,1,0
+SurvivedNumberP1OnCommand=x,96;y,240;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
+SurvivedNumberP1OffCommand=linear,0.7;diffuse,1,1,1,0
+SurvivedNumberP2OnCommand=x,544;y,240;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
+SurvivedNumberP2OffCommand=linear,0.7;diffuse,1,1,1,0
 ScoreLabelOnCommand=x,320;y,380;yoffset,480;sleep,0.8;decelerate,0.3;yoffset,-480
 ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;yoffset,480
 ScoreNumberP1OnCommand=x,160;y,380;xoffset,-320;sleep,0.8;decelerate,0.3;xoffset,320
@@ -619,135 +627,109 @@ TryExtraStageOffCommand=linear,0.7;diffuse,1,1,1,0
 SpinGrades=1
 
 [ScreenEvaluationStage]
-PercentWholeP1OnCommand=diffuse,1,1,1,0
-PercentWholeP1OffCommand=
-PercentWholeP2OnCommand=diffuse,1,1,1,0
-PercentWholeP2OffCommand=
-PercentRemainderP1OnCommand=diffuse,1,1,1,0
-PercentRemainderP1OffCommand=
-PercentRemainderP2OnCommand=diffuse,1,1,1,0
-PercentRemainderP2OffCommand=
-DancePointsP1OnCommand=diffuse,1,1,1,0
-DancePointsP1OffCommand=
-DancePointsP2OnCommand=diffuse,1,1,1,0
-DancePointsP2OffCommand=
-SongsSurvivedP1OnCommand=diffuse,1,1,1,0
-SongsSurvivedP1OffCommand=
-SongsSurvivedP2OnCommand=diffuse,1,1,1,0
-SongsSurvivedP2OffCommand=
-TimeLabelOnCommand=diffuse,1,1,1,0
-TimeLabelOffCommand=
-TimeNumberP1OnCommand=diffuse,1,1,1,0
-TimeNumberP1OffCommand=
-TimeNumberP2OnCommand=diffuse,1,1,1,0
-TimeNumberP2OffCommand=
+NextScreen=ScreenSelectMusic
+EndScreen=ScreenEvaluationSummary
+ShowBannerArea=1
+ShowGradeArea=1
+ShowPointsArea=0
+ShowBonusArea=1
+ShowSurvivedArea=0
+ShowMarvelous=1
+ShowPerfect=1
+ShowGreat=1
+ShowGood=1
+ShowBoo=1
+ShowMiss=1
+ShowOK=1
+ShowMaxCombo=1
+ShowScoreArea=1
+ShowTimeArea=0
 HelpText=Press START to continue
-TimerSeconds=20
+TimerSeconds=10
 
 [ScreenEvaluationSummary]
-// small banners
-Banner1OnCommand=x,260;y,80;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner1OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-Banner2OnCommand=x,290;y,90;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner2OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-Banner3OnCommand=x,320;y,100;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner3OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-Banner4OnCommand=x,350;y,110;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner4OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-Banner5OnCommand=x,380;y,120;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480
-Banner5OffCommand=sleep,0.8;accelerate,0.3;yoffset,480
-StageOnCommand=diffuse,1,1,1,0
-StageOffCommand=
-DifficultyIconP1OnCommand=diffuse,1,1,1,0
-DifficultyIconP1OffCommand=
-DifficultyIconP2OnCommand=diffuse,1,1,1,0
-DifficultyIconP2OffCommand=
-PlayerOptionsP1OnCommand=diffuse,1,1,1,0
-PlayerOptionsP1OffCommand=
-PlayerOptionsP2OnCommand=diffuse,1,1,1,0
-PlayerOptionsP2OffCommand=
-PercentWholeP1OnCommand=diffuse,1,1,1,0
-PercentWholeP1OffCommand=
-PercentWholeP2OnCommand=diffuse,1,1,1,0
-PercentWholeP2OffCommand=
-PercentRemainderP1OnCommand=diffuse,1,1,1,0
-PercentRemainderP1OffCommand=
-PercentRemainderP2OnCommand=diffuse,1,1,1,0
-PercentRemainderP2OffCommand=
-DancePointsP1OnCommand=diffuse,1,1,1,0
-DancePointsP1OffCommand=
-DancePointsP2OnCommand=diffuse,1,1,1,0
-DancePointsP2OffCommand=
-SongsSurvivedP1OnCommand=diffuse,1,1,1,0
-SongsSurvivedP1OffCommand=
-SongsSurvivedP2OnCommand=diffuse,1,1,1,0
-SongsSurvivedP2OffCommand=
-TimeLabelOnCommand=diffuse,1,1,1,0
-TimeLabelOffCommand=
-TimeNumberP1OnCommand=diffuse,1,1,1,0
-TimeNumberP1OffCommand=
-TimeNumberP2OnCommand=diffuse,1,1,1,0
-TimeNumberP2OffCommand=
+NextScreen=ScreenNameEntry
+EndScreen=ScreenNameEntry
+ShowBannerArea=1
+ShowGradeArea=1
+ShowPointsArea=0
+ShowBonusArea=1
+ShowSurvivedArea=0
+ShowMarvelous=1
+ShowPerfect=1
+ShowGreat=1
+ShowGood=1
+ShowBoo=1
+ShowMiss=1
+ShowOK=1
+ShowMaxCombo=1
+ShowScoreArea=1
+ShowTimeArea=0
 HelpText=Press START to continue
-TimerSeconds=40
+TimerSeconds=30
 
-[ScreenEvaluationCourse]
-GradeP1OnCommand=diffuse,1,1,1,0
-GradeP1OffCommand=
-GradeP2OnCommand=diffuse,1,1,1,0
-GradeP2OffCommand=
-MaxComboNumberP1OnCommand=diffuse,1,1,1,0
-MaxComboNumberP1OffCommand=
-MaxComboNumberP2OnCommand=diffuse,1,1,1,0
-MaxComboNumberP2OffCommand=
-BarPossible1P1OnCommand=diffuse,1,1,1,0
-BarPossible1P1OffCommand=
-BarPossible1P2OnCommand=diffuse,1,1,1,0
-BarPossible1P2OffCommand=
-BarPossible2P1OnCommand=diffuse,1,1,1,0
-BarPossible2P1OffCommand=
-BarPossible2P2OnCommand=diffuse,1,1,1,0
-BarPossible2P2OffCommand=
-BarPossible3P1OnCommand=diffuse,1,1,1,0
-BarPossible3P1OffCommand=
-BarPossible3P2OnCommand=diffuse,1,1,1,0
-BarPossible3P2OffCommand=
-BarPossible4P1OnCommand=diffuse,1,1,1,0
-BarPossible4P1OffCommand=
-BarPossible4P2OnCommand=diffuse,1,1,1,0
-BarPossible4P2OffCommand=
-BarPossible5P1OnCommand=diffuse,1,1,1,0
-BarPossible5P1OffCommand=
-BarPossible5P2OnCommand=diffuse,1,1,1,0
-BarPossible5P2OffCommand=
-BarActual1P1OnCommand=diffuse,1,1,1,0
-BarActual1P1OffCommand=
-BarActual1P2OnCommand=diffuse,1,1,1,0
-BarActual1P2OffCommand=
-BarActual2P1OnCommand=diffuse,1,1,1,0
-BarActual2P1OffCommand=
-BarActual2P2OnCommand=diffuse,1,1,1,0
-BarActual2P2OffCommand=
-BarActual3P1OnCommand=diffuse,1,1,1,0
-BarActual3P1OffCommand=
-BarActual3P2OnCommand=diffuse,1,1,1,0
-BarActual3P2OffCommand=
-BarActual4P1OnCommand=diffuse,1,1,1,0
-BarActual4P1OffCommand=
-BarActual4P2OnCommand=diffuse,1,1,1,0
-BarActual4P2OffCommand=
-BarActual5P1OnCommand=diffuse,1,1,1,0
-BarActual5P1OffCommand=
-BarActual5P2OnCommand=diffuse,1,1,1,0
-BarActual5P2OffCommand=
-ScoreLabelOnCommand=diffuse,1,1,1,0
-ScoreLabelOffCommand=
-ScoreNumberP1OnCommand=diffuse,1,1,1,0
-ScoreNumberP1OffCommand=
-ScoreNumberP2OnCommand=diffuse,1,1,1,0
-ScoreNumberP2OffCommand=
+[ScreenEvaluationNonstop]
+NextScreen=ScreenNameEntry
+EndScreen=ScreenNameEntry
+ShowBannerArea=1
+ShowGradeArea=1
+ShowPointsArea=0
+ShowBonusArea=0
+ShowSurvivedArea=1
+ShowMarvelous=1
+ShowPerfect=1
+ShowGreat=1
+ShowGood=1
+ShowBoo=1
+ShowMiss=1
+ShowOK=1
+ShowMaxCombo=0
+ShowScoreArea=1
+ShowTimeArea=0
 HelpText=Press START to continue
-TimerSeconds=40
+TimerSeconds=30
+
+[ScreenEvaluationOni]
+NextScreen=ScreenNameEntry
+EndScreen=ScreenNameEntry
+ShowBannerArea=1
+ShowGradeArea=0
+ShowPointsArea=1
+ShowBonusArea=0
+ShowSurvivedArea=1
+ShowMarvelous=1
+ShowPerfect=1
+ShowGreat=1
+ShowGood=1
+ShowBoo=1
+ShowMiss=1
+ShowOK=1
+ShowMaxCombo=0
+ShowScoreArea=0
+ShowTimeArea=1
+HelpText=Press START to continue
+TimerSeconds=30
+
+[ScreenEvaluationEndless]
+NextScreen=ScreenNameEntry
+EndScreen=ScreenNameEntry
+ShowBannerArea=1
+ShowGradeArea=0
+ShowPointsArea=1
+ShowBonusArea=0
+ShowSurvivedArea=1
+ShowMarvelous=1
+ShowPerfect=1
+ShowGreat=1
+ShowGood=1
+ShowBoo=1
+ShowMiss=1
+ShowOK=1
+ShowMaxCombo=0
+ShowScoreArea=0
+ShowTimeArea=1
+HelpText=Press START to continue
+TimerSeconds=30
 
 [ScreenMusicScroll]
 ScrollDelay=0.2
@@ -1127,7 +1109,7 @@ NextScreen=ScreenLogo
 NextScreen=ScreenLogo
 
 [ScreenLogo]
-LogoOnCommand=x,320;y,240;zoomy,0;sleep,0.5;bounceend,0.5;,zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3
+LogoOnCommand=x,320;y,240;zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3
 VersionOnCommand=horizalign,right;x,620;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2
 SongsOnCommand=horizalign,left;x,20;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2
 NextScreen=ScreenDemonstration

stepmania/src/ActiveItemList.cpp

@@ -29,7 +29,7 @@ ActiveItemList::ActiveItemList()
 
 	for( int i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
 	{
-		m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_text[i].SetZoom( TEXT_ZOOM );
 //		m_text[i].SetText( "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" );
 		this->AddChild( &m_text[i] );

stepmania/src/BPMDisplay.cpp

@@ -29,7 +29,7 @@ BPMDisplay::BPMDisplay()
 	m_fTimeLeftInState = 0;
 	m_bExtraStage = GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2();
 
-	m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","BPMDisplay numbers") );
+	m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","BPMDisplay") );
 	m_textBPM.EnableShadow( false );
 	m_textBPM.SetHorizAlign( Actor::align_right );
 	m_textBPM.SetDiffuse( NORMAL_COLOR );
@@ -56,7 +56,7 @@ void BPMDisplay::Update( float fDeltaTime )
 		if( m_fTimeLeftInState < 0 )
 		{
 			// XXX: the numbers font doesn't have "?".
-			m_textBPM.SetText( (RandomFloat(0,1)>0.90) ? "%%%" : ssprintf("%03.0f",RandomFloat(0,600)) ); 
+			m_textBPM.SetText( (RandomFloat(0,1)>0.90) ? "xxx" : ssprintf("%03.0f",RandomFloat(0,600)) ); 
 			m_fTimeLeftInState = 0.2f;		// reset timer
 		}
 	}

stepmania/src/Combo.cpp

@@ -56,7 +56,7 @@ Combo::Combo()
 	m_sprCombo.SetDiffuse( RageColor(1,1,1,0) );	// invisible
 	this->AddChild( &m_sprCombo );
 
-	m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","Combo numbers") );
+	m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","Combo") );
 	m_textComboNumber.EnableShadow( true );
 	m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y );
 	m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );

stepmania/src/CourseEntryDisplay.cpp

@@ -62,13 +62,13 @@ CourseEntryDisplay::CourseEntryDisplay()
 	m_textFoot.EnableShadow( false );
 	this->AddChild( &m_textFoot );
 
-	m_textDifficultyNumber.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textDifficultyNumber.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textDifficultyNumber.SetXY( DIFFICULTY_X, DIFFICULTY_Y );
 	m_textDifficultyNumber.SetZoom( DIFFICULTY_ZOOM );
 	m_textDifficultyNumber.EnableShadow( false );
 	this->AddChild( &m_textDifficultyNumber );
 
-	m_textModifiers.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textModifiers.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textModifiers.SetXY( MODIFIERS_X, MODIFIERS_Y );
 	m_textModifiers.SetZoom( MODIFIERS_ZOOM );
 	m_textModifiers.SetHorizAlign( (Actor::HorizAlign)MODIFIERS_HORIZ_ALIGN );

stepmania/src/EditMenu.cpp

@@ -74,7 +74,7 @@ EditMenu::EditMenu()
 		m_textLabel[i].SetHorizAlign( Actor::align_left );
 		this->AddChild( &m_textLabel[i] );
 
-		m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) );
 		m_textValue[i].SetText( "blah" );
 		m_textValue[i].SetZoom( 0.8f );

stepmania/src/Font.cpp

@@ -775,7 +775,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
 		/* If this is a top-level font (not a subfont), load the default font first. */
 		CStringArray ImportList;
 		if(LoadStack.size() == 1)
-			ImportList.push_back("default font");
+			ImportList.push_back("Common default");
 
 		/* Check to see if we need to import any other fonts.  Do this
 		 * before loading this font, so any characters in this font

stepmania/src/JukeboxMenu.cpp

@@ -52,7 +52,7 @@ JukeboxMenu::JukeboxMenu()
 		m_textLabel[i].SetHorizAlign( Actor::align_left );
 		this->AddChild( &m_textLabel[i] );
 
-		m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) );
 		m_textValue[i].SetText( "blah" );
 		m_textValue[i].SetZoom( 0.8f );

stepmania/src/LifeMeterBattery.cpp

@@ -57,13 +57,13 @@ void LifeMeterBattery::Load( PlayerNumber pn )
 	if( bPlayerEnabled )
 		this->AddChild( &m_sprBattery );
 
-	m_textNumLives.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery life numbers") );
+	m_textNumLives.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery lives") );
 	m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
 	m_textNumLives.EnableShadow( false );
 	if( bPlayerEnabled )
 		this->AddChild( &m_textNumLives );
 
-	m_textPercent.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery percent numbers") );
+	m_textPercent.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery percent") );
 	m_textPercent.EnableShadow( false );
 	m_textPercent.SetZoom( 0.7f );
 	if(PREFSMAN->m_bDancePointsForOni)

stepmania/src/LyricDisplay.cpp

@@ -11,7 +11,7 @@ float g_TweenInTime, g_TweenOutTime;
 
 LyricDisplay::LyricDisplay()
 {
-	m_textLyrics.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textLyrics.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textLyrics.SetDiffuse( RageColor(1,1,1,1) );
 	this->AddChild(&m_textLyrics);
 

stepmania/src/MenuElements.h

@@ -17,7 +17,7 @@
 #include "Sprite.h"
 #include "MenuTimer.h"
 #include "TransitionBGAnimation.h"
-#include "TipDisplay.h"
+#include "HelpDisplay.h"
 #include "BGAnimation.h"
 
 
@@ -51,7 +51,7 @@ public:	// let owner tinker with these objects
 	Sprite				m_sprStyleIcon;
 	MenuTimer			m_MenuTimer;
 	Sprite				m_sprFooter;
-	TipDisplay			m_textHelp;
+	HelpDisplay			m_textHelp;
 
 	TransitionBGAnimation	m_In;
 	TransitionBGAnimation	m_Out;

stepmania/src/MenuTimer.cpp

@@ -27,8 +27,8 @@ MenuTimer::MenuTimer()
 	m_fStallSeconds = 0;
 	m_bPaused = false;
 
-	m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
-	m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
+	m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer") );
+	m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer") );
 
 	m_textDigit1.EnableShadow( false );
 	m_textDigit2.EnableShadow( false );

stepmania/src/NoteField.cpp

@@ -32,7 +32,7 @@ const float ROWS_BETWEEN_HOLD_BITS	= 1 / HOLD_NOTE_BITS_PER_ROW;
 
 NoteField::NoteField()
 {
-	m_textMeasureNumber.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textMeasureNumber.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textMeasureNumber.SetZoom( 1.0f );
 
 	m_rectMarkerBar.EnableShadow( false );

stepmania/src/ScoreDisplayNormal.cpp

@@ -28,7 +28,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
 	LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
 
 	// init the text
-	m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayNormal numbers") );
+	m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayNormal") );
 	m_text.EnableShadow( false );
 
 	m_fScore = 0;

stepmania/src/ScoreDisplayOni.cpp

@@ -24,7 +24,7 @@ ScoreDisplayOni::ScoreDisplayOni()
 	LOG->Trace( "ScoreDisplayOni::ScoreDisplayOni()" );
 
 	// init the text
-	m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayOni numbers") );
+	m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayOni") );
 	m_text.EnableShadow( false );
 	this->AddChild( &m_text );
 }

stepmania/src/ScreenEdit.cpp

@@ -276,7 +276,7 @@ ScreenEdit::ScreenEdit()
 	m_sprHelp.SetHorizAlign( Actor::align_left );
 	m_sprHelp.SetXY( HELP_X, HELP_Y );
 
-	m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textHelp.SetXY( HELP_TEXT_X, HELP_TEXT_Y );
 	m_textHelp.SetHorizAlign( Actor::align_left );
 	m_textHelp.SetVertAlign( Actor::align_top );
@@ -287,7 +287,7 @@ ScreenEdit::ScreenEdit()
 	m_sprInfo.SetHorizAlign( Actor::align_right );
 	m_sprInfo.SetXY( INFO_X, INFO_Y );
 
-	m_textInfo.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textInfo.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textInfo.SetXY( INFO_TEXT_X, INFO_TEXT_Y );
 	m_textInfo.SetHorizAlign( Actor::align_left );
 	m_textInfo.SetVertAlign( Actor::align_top );

stepmania/src/ScreenEditMenu.cpp

@@ -48,7 +48,7 @@ ScreenEditMenu::ScreenEditMenu()
 	this->AddChild( &m_Menu );
 
 
-	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
 	m_textExplanation.SetText( EXPLANATION_TEXT );
 	m_textExplanation.SetZoom( 0.7f );

stepmania/src/ScreenEvaluation.cpp

@@ -278,7 +278,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 					m_DifficultyIcon[p].Command( DIFFICULTY_ICON_ON_COMMAND(p) );
 					this->AddChild( &m_DifficultyIcon[p] );
 					
-					m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+					m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 					CString sPO = GAMESTATE->m_PlayerOptions[p].GetString();
 					sPO.Replace( ", ", "\n" );
 					m_textPlayerOptions[p].Command( PLAYER_OPTIONS_ON_COMMAND(p) );
@@ -359,12 +359,12 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 
 			if( !PREFSMAN->m_bDancePointsForOni )
 			{
-				m_textPercentWhole[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
+				m_textPercentWhole[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
 				m_textPercentWhole[p].EnableShadow( false );
 				m_textPercentWhole[p].Command( PERCENT_WHOLE_ON_COMMAND(p) );
 				this->AddChild( &m_textPercentWhole[p] );
 
-				m_textPercentRemainder[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
+				m_textPercentRemainder[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
 				m_textPercentRemainder[p].EnableShadow( false );
 				m_textPercentRemainder[p].Command( PERCENT_REMAINDER_ON_COMMAND(p) );
 				this->AddChild( &m_textPercentRemainder[p] );
@@ -379,7 +379,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 			}
 			else	// PREFSMAN->m_bDancePointsForOni
 			{
-				m_textDancePoints[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
+				m_textDancePoints[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
 				m_textDancePoints[p].EnableShadow( false );
 				m_textDancePoints[p].SetText( ssprintf("%d", stageStats.iActualDancePoints[p]) );
 				m_textDancePoints[p].Command( DANCE_POINTS_ON_COMMAND(p) );
@@ -441,7 +441,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 			m_sprSurvivedFrame[p].Command( SURVIVED_FRAME_ON_COMMAND(p) );
 			this->AddChild( &m_sprSurvivedFrame[p] );
 
-			m_textSurvivedNumber[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation stage numbers") );
+			m_textSurvivedNumber[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation stage") );
 			m_textSurvivedNumber[p].EnableShadow( false );
 			m_textSurvivedNumber[p].SetText( ssprintf("%02d", stageStats.iSongsPlayed[p]) );
 			m_textSurvivedNumber[p].Command( SURVIVED_NUMBER_ON_COMMAND(p) );
@@ -468,7 +468,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 				if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
 					continue;	// skip
 
-				m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation judge numbers") );
+				m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation judge") );
 				m_textJudgeNumbers[l][p].EnableShadow( false );
 				m_textJudgeNumbers[l][p].SetDiffuse( PlayerToColor(p) );
 				m_textJudgeNumbers[l][p].Command( JUDGE_NUMBER_ON_COMMAND(l,p) );
@@ -512,7 +512,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 			if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
 				continue;	// skip
 
-			m_textScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score numbers") );
+			m_textScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score") );
 			m_textScore[p].EnableShadow( false );
 			m_textScore[p].SetDiffuse( PlayerToColor(p) );
 			m_textScore[p].Command( SCORE_NUMBER_ON_COMMAND(p) );
@@ -539,7 +539,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 			if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
 				continue;	// skip
 
-			m_textTime[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score numbers") );
+			m_textTime[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score") );
 			m_textTime[p].EnableShadow( false );
 			m_textTime[p].SetDiffuse( PlayerToColor(p) );
 			m_textTime[p].Command( TIME_NUMBER_ON_COMMAND(p) );
@@ -569,7 +569,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
 	
 	if( m_bTryExtraStage )
 	{
-		m_sprTryExtraStage.Load( THEME->GetPathTo("Graphics",GAMESTATE->IsExtraStage()?" try extra2":" try extra1") );
+		m_sprTryExtraStage.Load( THEME->GetPathTo("Graphics",GAMESTATE->IsExtraStage()?"ScreenEvaluation try extra2":"ScreenEvaluation try extra1") );
 		m_sprTryExtraStage.Command( TRY_EXTRA_STAGE_ON_COMMAND );
 		this->AddChild( &m_sprTryExtraStage );
 

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -135,7 +135,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
 		m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
 		this->AddChild( &m_PumpDifficultyCircle );
 
-		m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
+		m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","ScreenEz2SelectMusic difficulty") );
 		m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
 		this->AddChild(&m_PumpDifficultyRating);
 

stepmania/src/ScreenEz2SelectMusic.h

@@ -15,7 +15,7 @@
 #include "Sprite.h"
 #include "BitmapText.h"
 #include "MenuElements.h"
-#include "TipDisplay.h"
+#include "HelpDisplay.h"
 #include "MusicBannerWheel.h"
 #include "MenuElements.h"
 #include "DifficultyMeter.h"

stepmania/src/ScreenGameplay.cpp

@@ -277,7 +277,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
-		m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
+		m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathTo("Numbers","ScreenGameplay song num") );
 		m_textCourseSongNumber[p].EnableShadow( false );
 		m_textCourseSongNumber[p].SetXY( SONG_NUMBER_X(p), SONG_NUMBER_Y(p,bExtra) );
 		m_textCourseSongNumber[p].SetText( "" );
@@ -316,13 +316,13 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 	m_sprScoreFrame.SetXY( SCORE_FRAME_X, SCORE_FRAME_Y(bExtra) );
 	this->AddChild( &m_sprScoreFrame );
 
-	m_StageName.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
-	m_StageName.EnableShadow( false );
-	m_StageName.SetXY( STAGENAME_X, STAGENAME_Y );
-	m_StageName.SetZoom( STAGENAME_ZOOM );
-	this->AddChild( &m_StageName );
+	m_textSongTitle.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay song title") );
+	m_textSongTitle.EnableShadow( false );
+	m_textSongTitle.SetXY( STAGENAME_X, STAGENAME_Y );
+	m_textSongTitle.SetZoom( STAGENAME_ZOOM );
+	this->AddChild( &m_textSongTitle );
 
-	m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenGameplay max combo numbers") );
+	m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenGameplay max combo") );
 	m_MaxCombo.SetXY( MAXCOMBO_X, MAXCOMBO_Y );
 	m_MaxCombo.SetZoom( MAXCOMBO_ZOOM );
 	m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iCurCombo[GAMESTATE->m_MasterPlayerNumber]) ); /* TODO: Make this work for both players */
@@ -355,7 +355,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 		m_pScoreDisplay[p]->SetZoom( SCORE_ZOOM );
 		this->AddChild( m_pScoreDisplay[p] );
 		
-		m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_textPlayerOptions[p].EnableShadow( false );
 		m_textPlayerOptions[p].SetXY( PLAYER_OPTIONS_X(p), PLAYER_OPTIONS_Y(p,bExtra) );
 		m_textPlayerOptions[p].SetZoom( 0.5f );
@@ -363,7 +363,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 		this->AddChild( &m_textPlayerOptions[p] );
 	}
 
-	m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textSongOptions.EnableShadow( false );
 	m_textSongOptions.SetXY( SONG_OPTIONS_X, SONG_OPTIONS_Y(bExtra) );
 	m_textSongOptions.SetZoom( 0.5f );
@@ -387,7 +387,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 		this->AddChild(&m_LyricDisplay);
 	
 
-	m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","header2") );
+	m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay autoplay") );
 	m_textAutoPlay.SetXY( AUTOPLAY_X, AUTOPLAY_Y );
 	if( !bDemonstration )	// only load if we're not in demonstration of jukebox
 		this->AddChild( &m_textAutoPlay );
@@ -429,7 +429,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 		this->AddChild( &m_In );
 
 
-		m_textDebug.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textDebug.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_textDebug.SetXY( DEBUG_X, DEBUG_Y );
 		m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
 		this->AddChild( &m_textDebug );
@@ -441,7 +441,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 
 		if( GAMESTATE->IsExtraStage() )	// only load if we're going to use it
 		{
-			m_textSurviveTime.LoadFromFont( THEME->GetPathTo("Fonts","survive time") );
+			m_textSurviveTime.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay survive time") );
 			m_textSurviveTime.EnableShadow( false );
 			m_textSurviveTime.SetXY( SURVIVE_TIME_X, SURVIVE_TIME_Y );
 			m_textSurviveTime.SetText( "" );
@@ -579,7 +579,7 @@ void ScreenGameplay::LoadNextSong()
 	m_Background.BeginTweening( 2 );
 	m_Background.SetTweenDiffuse( RageColor(1,1,1,1) );
 
-	m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
+	m_textSongTitle.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
 
 	/* XXX: set it to the current BPM, not the range */
 	float fMinBPM, fMaxBPM;
@@ -1471,7 +1471,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 				if( GAMESTATE->IsPlayerEnabled(p) )
 					fMaxSurviveSeconds = max( fMaxSurviveSeconds, GAMESTATE->m_CurStageStats.fAliveSeconds[p] );
 			ASSERT( fMaxSurviveSeconds > 0 );
-			m_textSurviveTime.SetText( "TIME  " + SecondsToTime(fMaxSurviveSeconds) );
+			m_textSurviveTime.SetText( SecondsToTime(fMaxSurviveSeconds) );
 			m_textSurviveTime.BeginTweening( 0.3f );	// sleep
 			m_textSurviveTime.BeginTweening( 0.3f );	// fade in
 			m_textSurviveTime.SetTweenDiffuse( RageColor(1,1,1,1) );

stepmania/src/ScreenGameplay.h

@@ -129,8 +129,8 @@ protected:
 	TransitionBGAnimation	m_In;
 	TransitionBGAnimation	m_Back;
 
-	BitmapText			m_textSurviveTime;	// only shown in extra stage
-	BitmapText			m_StageName;
+	BitmapText			m_textSurviveTime;	// used in extra stage
+	BitmapText			m_textSongTitle;
 
 	Player				m_Player[NUM_PLAYERS];
 

stepmania/src/ScreenJukeboxMenu.cpp

@@ -47,7 +47,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu()
 	this->AddChild( &m_Menu );
 
 
-	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
 	m_textExplanation.SetText( EXPLANATION_TEXT );
 	m_textExplanation.SetZoom( 0.7f );

stepmania/src/ScreenLogo.cpp

@@ -28,13 +28,13 @@ ScreenLogo::ScreenLogo() : ScreenAttract("ScreenLogo")
 	m_sprLogo.Command( LOGO_ON_COMMAND );
 	this->AddChild( &m_sprLogo );
 
-	m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textVersion.Command( VERSION_ON_COMMAND );
 	m_textVersion.SetText( "CVS" );
 	this->AddChild( &m_textVersion );
 
 
-	m_textSongs.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSongs.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textSongs.Command( SONGS_ON_COMMAND );
 	m_textSongs.SetText( ssprintf("%d songs in %d groups, %d courses", SONGMAN->GetNumSongs(), SONGMAN->GetNumGroups(), SONGMAN->GetNumCourses()) );
 	this->AddChild( &m_textSongs );

stepmania/src/ScreenManager.cpp

@@ -65,7 +65,7 @@ public:
 
 ScreenSystemLayer::ScreenSystemLayer()
 {
-	m_textSystemMessage.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSystemMessage.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textSystemMessage.SetHorizAlign( Actor::align_left );
 	m_textSystemMessage.SetVertAlign( Actor::align_top );
 	m_textSystemMessage.SetXY( 4.0f, 4.0f );
@@ -74,7 +74,7 @@ ScreenSystemLayer::ScreenSystemLayer()
 	m_textSystemMessage.SetDiffuse( RageColor(1,1,1,0) );
 	this->AddChild(&m_textSystemMessage);
 
-	m_textStats.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textStats.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textStats.SetXY( STATS_X, STATS_Y );
 	m_textStats.SetHorizAlign( Actor::align_right );
 	m_textStats.SetVertAlign( Actor::align_top );
@@ -82,7 +82,7 @@ ScreenSystemLayer::ScreenSystemLayer()
 	m_textStats.SetShadowLength( 2 );
 	this->AddChild(&m_textStats);
 
-	m_textSysTime.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSysTime.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textSysTime.SetXY( 4.0f, 40.0f );
 	m_textSysTime.SetHorizAlign( Actor::align_left );
 	m_textSysTime.SetVertAlign( Actor::align_top );
@@ -93,7 +93,7 @@ ScreenSystemLayer::ScreenSystemLayer()
 
 	for( int p=0; p<NUM_PLAYERS; p++ )
 	{
-		m_textCreditInfo[p].LoadFromFont( THEME->GetPathTo("Fonts","credits") );
+		m_textCreditInfo[p].LoadFromFont( THEME->GetPathTo("Fonts","ScreenManager credits") );
 		m_textCreditInfo[p].SetXY( CREDITS_X(p), CREDITS_Y(p) );
 		m_textCreditInfo[p].SetZoom( CREDITS_ZOOM );
 		m_textCreditInfo[p].SetDiffuse( CREDITS_COLOR );
@@ -120,7 +120,7 @@ ScreenSystemLayer::ScreenSystemLayer()
 		/* This is somewhat big.  Let's put it on the right side, where it'll
 		 * obscure the 2P side during gameplay; there's nowhere to put it that
 		 * doesn't obscure something, and it's just a diagnostic. */
-		m_Skips[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_Skips[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_Skips[i].SetXY( SKIP_LEFT, SKIP_TOP + SKIP_Y_DIST*i );
 		m_Skips[i].SetHorizAlign( Actor::align_left );
 		m_Skips[i].SetVertAlign( Actor::align_top );

stepmania/src/ScreenMapControllers.cpp

@@ -70,7 +70,7 @@ ScreenMapControllers::ScreenMapControllers()
 		{			
 			for( int s=0; s<NUM_GAME_TO_DEVICE_SLOTS; s++ ) 
 			{
-				m_textMappedTo[p][b][s].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+				m_textMappedTo[p][b][s].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 				m_textMappedTo[p][b][s].SetXY( BUTTON_COLUMN_X[p*NUM_GAME_TO_DEVICE_SLOTS+s], LINE_START_Y + b*LINE_GAP_Y );
 				m_textMappedTo[p][b][s].SetZoom( 0.5f );
 				m_textMappedTo[p][b][s].SetShadowLength( 2 );
@@ -79,7 +79,7 @@ ScreenMapControllers::ScreenMapControllers()
 		}
 	}	
 
-	m_textError.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textError.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textError.SetText( "" );
 	m_textError.SetXY( CENTER_X, CENTER_Y );
 	m_textError.SetDiffuse( RageColor(0,1,0,0) );

stepmania/src/ScreenMiniMenu.cpp

@@ -57,7 +57,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
 	
 	float fHeightOfAll = (m_Def.rows.size()-1)*SPACING_Y;
 
-	m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textTitle.SetText( m_Def.title );
 	m_textTitle.SetXY( CENTER_X, CENTER_Y - fHeightOfAll/2 - 30 );
 	m_textTitle.SetZoom( 0.8f );
@@ -75,7 +75,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
 
 		float fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, CENTER_Y-fHeightOfAll/2, CENTER_Y+fHeightOfAll/2 );
 
-		m_textLabel[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textLabel[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		m_textLabel[i].SetText( line.name );
 		m_textLabel[i].SetY( fY );
 		m_textLabel[i].SetZoom( ZOOM_NOT_SELECTED );
@@ -84,7 +84,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
 		this->AddChild( &m_textLabel[i] );
 
 		CString sText = line.choices.empty() ? "" : line.choices[line.defaultChoice];
-		m_textAnswer[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		m_textAnswer[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
  		m_textAnswer[i].SetText( sText );
 		m_textAnswer[i].SetY( fY );
 		m_textAnswer[i].SetZoom( ZOOM_NOT_SELECTED );

stepmania/src/ScreenNameEntry.cpp

@@ -172,14 +172,14 @@ ScreenNameEntry::ScreenNameEntry()
 
 			float ColX = pStyleDef->m_iCenterX[p] + pStyleDef->m_ColumnInfo[p][t].fXOffset;
 
-			m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+			m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ScreenNameEntry letters") );
 			m_textSelectedChars[p][t].SetX( ColX );
 			m_textSelectedChars[p][t].SetY( GRAY_ARROWS_Y );
 			m_textSelectedChars[p][t].SetDiffuse( g_SelectedCharsColor );
 			m_textSelectedChars[p][t].SetZoom( CHARS_ZOOM_LARGE );
 			this->AddChild( &m_textSelectedChars[p][t] );		// draw these manually
 			
-			m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+			m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ScreenNameEntry letters") );
 			m_textScrollingChars[p][t].SetX( ColX );
 			m_textScrollingChars[p][t].SetY( GRAY_ARROWS_Y );
 			m_textScrollingChars[p][t].SetDiffuse( g_ScrollingCharsColor );

stepmania/src/ScreenOptions.cpp

@@ -131,7 +131,7 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRow[], int iNumOptionLin
 	m_framePage.AddChild( &m_textOptions[i][0] );
 
 	// add explanation here so it appears on top
-	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","option explanation") );
+	m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions explanation") );
 	m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
 	m_textExplanation.SetZoom( EXPLANATION_ZOOM );
 	m_textExplanation.SetShadowLength( 2 );
@@ -177,7 +177,7 @@ void ScreenOptions::InitOptionsText()
 
 		BitmapText &title = m_textOptionLineTitles[i];
 
-		title.LoadFromFont( THEME->GetPathTo("Fonts","option title") );
+		title.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions title") );
 		CString sText = optline.name;
 
 		title.SetText( sText );
@@ -199,7 +199,7 @@ void ScreenOptions::InitOptionsText()
 		{
 			BitmapText &option = m_textOptions[i][j];
 
-			option.LoadFromFont( THEME->GetPathTo("Fonts","option item") );
+			option.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions item") );
 			option.SetText( optline.choices[j] );
 			option.SetZoom( ITEMS_ZOOM );
 			option.EnableShadow( false );
@@ -213,7 +213,7 @@ void ScreenOptions::InitOptionsText()
 	}
 
 	BitmapText &option = m_textOptions[i][0];
-	option.LoadFromFont( THEME->GetPathTo("Fonts","option item") );
+	option.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions item") );
 	option.SetText( "EXIT" );
 	option.SetZoom( ITEMS_ZOOM );
 	option.SetShadowLength( 2 );

stepmania/src/ScreenPlayerOptions.cpp

@@ -60,16 +60,6 @@ ScreenPlayerOptions::ScreenPlayerOptions() :
 		true, false );
 
 	SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
-
-	m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","ScreenPlayerOptions options") );
-	m_sprOptionsMessage.StopAnimating();
-	m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
-	m_sprOptionsMessage.SetZoom( 1 );
-	m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
-	//this->AddChild( &m_sprOptionsMessage );	// we have to draw this manually over the top of transitions
-
-	m_bAcceptedChoices = false;
-	m_bGoToOptions = false;
 }
 
 
@@ -197,7 +187,7 @@ void ScreenPlayerOptions::GoToNextState()
 {
 	if( GAMESTATE->m_bEditing )
 		SCREENMAN->PopTopScreen();
-	else if( m_bGoToOptions )
+	else if( PREFSMAN->m_bShowSongOptions )
 		SCREENMAN->SetNewScreen( "ScreenSongOptions" );
 	else
 		SCREENMAN->SetNewScreen( "ScreenStage" );
@@ -207,60 +197,20 @@ void ScreenPlayerOptions::GoToNextState()
 void ScreenPlayerOptions::Update( float fDelta )
 {
 	ScreenOptions::Update( fDelta );
-	m_sprOptionsMessage.Update( fDelta );
 }
 
 void ScreenPlayerOptions::DrawPrimitives()
 {
 	ScreenOptions::DrawPrimitives();
-	m_sprOptionsMessage.Draw();
 }
 
 
 void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
-	if( !GAMESTATE->m_bEditing  &&
-		!m_Menu.m_In.IsTransitioning()  &&
-		MenuI.IsValid()  &&
-		MenuI.button == MENU_BUTTON_START  &&
-		type != IET_RELEASE  &&
-		PREFSMAN->m_bShowSongOptions )
-	{
-		if( m_bAcceptedChoices  &&  !m_bGoToOptions )
-		{
-			m_bGoToOptions = true;
-			m_sprOptionsMessage.SetState( 1 );
-			SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","Common start") );
-		}
-	}
-
 	ScreenOptions::Input( DeviceI, type, GameI, MenuI, StyleI );
 }
 
 void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
 {
-	switch( SM )
-	{
-	case SM_BeginFadingOut:	// when the user accepts the page of options
-		{
-			m_bAcceptedChoices = true;
-
-			if( !GAMESTATE->m_bEditing )
-			{
-				float fShowSeconds = m_Menu.m_Out.GetLengthSeconds();
-
-				// show "hold START for options"
-				m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
-				m_sprOptionsMessage.BeginTweening( 0.15f );	// fade in
-				m_sprOptionsMessage.SetTweenZoomY( 1 );
-				m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,1) );
-				m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f );	// sleep
-				m_sprOptionsMessage.BeginTweening( 0.15f );	// fade out
-				m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,0) );
-				m_sprOptionsMessage.SetTweenZoomY( 0 );
-			}
-		}
-		break;
-	}
 	ScreenOptions::HandleScreenMessage( SM );
 }

stepmania/src/ScreenPlayerOptions.h

@@ -31,10 +31,6 @@ private:
 
 	void GoToNextState();
 	void GoToPrevState();
-
-	bool		m_bAcceptedChoices;
-	bool		m_bGoToOptions;
-	Sprite		m_sprOptionsMessage;
 };
 
 

stepmania/src/ScreenPrompt.cpp

@@ -43,7 +43,7 @@ ScreenPrompt::ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool b
 	m_Fade.CloseWipingRight();
 	this->AddChild( &m_Fade );
 
-	m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textQuestion.SetText( sText );
 	m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
 	this->AddChild( &m_textQuestion );

stepmania/src/ScreenRanking.cpp

@@ -47,12 +47,12 @@ const ScreenMessage SM_HidePage			=	(ScreenMessage)(SM_User+68);
 
 ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
 {
-	m_textCategory.LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
+	m_textCategory.LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking title") );
 	m_textCategory.EnableShadow( false );
 	m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
 	this->AddChild( &m_textCategory );
 
-	m_textType.LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
+	m_textType.LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking title") );
 	m_textType.EnableShadow( false );
 	m_textType.SetXY( TYPE_X, TYPE_Y );
 	this->AddChild( &m_textType );
@@ -66,28 +66,28 @@ ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
 		m_sprBullets[i].SetState(i);
 		this->AddChild( &m_sprBullets[i] );
 
-		m_textNames[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+		m_textNames[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
 		m_textNames[i].EnableShadow( false );
 		m_textNames[i].SetXY( NAMES_START_X+LINE_SPACING_X*i, NAMES_START_Y+LINE_SPACING_Y*i );
 		m_textNames[i].SetZoom( TEXT_ZOOM );
 		m_textNames[i].SetHorizAlign( Actor::align_left );
 		this->AddChild( &m_textNames[i] );
 
-		m_textScores[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+		m_textScores[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
 		m_textScores[i].EnableShadow( false );
 		m_textScores[i].SetXY( SCORES_START_X+LINE_SPACING_X*i, SCORES_START_Y+LINE_SPACING_Y*i );
 		m_textScores[i].SetZoom( TEXT_ZOOM );
 		m_textScores[i].SetHorizAlign( Actor::align_right );
 		this->AddChild( &m_textScores[i] );
 
-		m_textPoints[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+		m_textPoints[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
 		m_textPoints[i].EnableShadow( false );
 		m_textPoints[i].SetXY( POINTS_START_X+LINE_SPACING_X*i, POINTS_START_Y+LINE_SPACING_Y*i );
 		m_textPoints[i].SetZoom( TEXT_ZOOM );
 		m_textPoints[i].SetHorizAlign( Actor::align_right );
 		this->AddChild( &m_textPoints[i] );
 		
-		m_textTime[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
+		m_textTime[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
 		m_textTime[i].EnableShadow( false );
 		m_textTime[i].SetXY( TIME_START_X+LINE_SPACING_X*i, TIME_START_Y+LINE_SPACING_Y*i );
 		m_textTime[i].SetZoom( TEXT_ZOOM );

stepmania/src/ScreenSelectCourse.cpp

@@ -83,14 +83,14 @@ ScreenSelectCourse::ScreenSelectCourse()
 	m_sprBannerFrame.SetXY( BANNER_FRAME_X, BANNER_FRAME_Y );
 	this->AddChild( &m_sprBannerFrame );
 
-	m_textNumSongs.LoadFromFont( THEME->GetPathTo("Fonts","ScreenSelectCourse num songs") );
-	m_textNumSongs.SetXY( STAGES_X, STAGES_Y );
+	m_textNumSongs.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectCourse num songs") );
 	m_textNumSongs.EnableShadow( false );
+	m_textNumSongs.SetXY( STAGES_X, STAGES_Y );
 	this->AddChild( &m_textNumSongs );
 
-	m_textTime.LoadFromFont( THEME->GetPathTo("Fonts","ScreenSelectCourse total time") );
-	m_textTime.SetXY( TIME_X, TIME_Y );
+	m_textTime.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectCourse total time") );
 	m_textTime.EnableShadow( false );
+	m_textTime.SetXY( TIME_X, TIME_Y );
 	this->AddChild( &m_textTime );
 
 	m_CourseContentsFrame.SetXY( CONTENTS_X, CONTENTS_Y );

stepmania/src/ScreenSelectGroup.cpp

@@ -133,7 +133,7 @@ ScreenSelectGroup::ScreenSelectGroup()
 	m_sprFrame.Load( THEME->GetPathTo("Graphics","ScreenSelectGroup frame") );
 	this->AddChild( &m_sprFrame );
 
-	m_textNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectGroup numbers") );
+	m_textNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectGroup num songs") );
 	this->AddChild( &m_textNumber );
 	
 	m_sprContents.Load( THEME->GetPathTo("Graphics","ScreenSelectGroup contents") );

stepmania/src/ScreenSelectMusic.cpp

@@ -117,7 +117,7 @@ ScreenSelectMusic::ScreenSelectMusic()
 
 	this->AddChild( &m_GrooveRadar );
 
-	m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	this->AddChild( &m_textSongOptions );
 
 	this->AddChild( &m_MusicWheel );
@@ -154,7 +154,7 @@ ScreenSelectMusic::ScreenSelectMusic()
 		m_sprHighScoreFrame[p].SetState( p );
 		this->AddChild( &m_sprHighScoreFrame[p] );
 
-		m_textHighScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectMusic score numbers") );
+		m_textHighScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectMusic score") );
 		m_textHighScore[p].EnableShadow( false );
 		m_textHighScore[p].SetDiffuse( PlayerToColor(p) );
 		this->AddChild( &m_textHighScore[p] );

stepmania/src/ScreenSelectStyle.cpp

@@ -52,7 +52,7 @@ ScreenSelectStyle::ScreenSelectStyle() : ScreenSelect( "ScreenSelectStyle" )
 		CString sIconPath = THEME->GetPathTo("Graphics",sIconElementName);
 		if( sIconPath.empty() )	// element doesn't exist
 		{
-			m_textIcon[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+			m_textIcon[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 			m_textIcon[i].SetText( mc.name );
 			m_textIcon[i].SetZoom(0.5f);
 			this->AddChild( &m_textIcon[i] );

stepmania/src/ScreenTestSound.cpp

@@ -27,7 +27,7 @@ ScreenTestSound::ScreenTestSound()
 	this->AddChild(&HEEEEEEEEELP);
 
 	HEEEEEEEEELP.SetXY(450, 400);
-	HEEEEEEEEELP.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	HEEEEEEEEELP.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	HEEEEEEEEELP.SetZoom(.5);
 	HEEEEEEEEELP.SetText(
 		"p  Play\n"
@@ -39,7 +39,7 @@ ScreenTestSound::ScreenTestSound()
 	for(i = 0; i < nsounds; ++i)
 	{
 		this->AddChild(&s[i].txt);
-		s[i].txt.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+		s[i].txt.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 		s[i].txt.SetZoom(.5);
 	}
 

stepmania/src/ScreenTextEntry.cpp

@@ -52,7 +52,7 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti
 	m_Fade.CloseWipingRight();
 	this->AddChild( &m_Fade );
 
-	m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textQuestion.SetText( sQuestion );
 	m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
 	this->AddChild( &m_textQuestion );

stepmania/src/ScreenTitleMenu.cpp

@@ -76,7 +76,7 @@ ScreenTitleMenu::ScreenTitleMenu()
 		ASSERT(0);
 	}
 	
-	m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","help") );
+	m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","ScreenTitleMenu help") );
 	CString sHelpText;
 	switch( PREFSMAN->m_CoinMode )
 	{
@@ -99,7 +99,7 @@ ScreenTitleMenu::ScreenTitleMenu()
 		int i;
 		for( i=0; i<NUM_CHOICES; i++ )
 		{
-			m_textChoice[i].LoadFromFont( THEME->GetPathTo("Fonts","titlemenu") );
+			m_textChoice[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenTitleMenu choices") );
 			m_textChoice[i].SetText( ChoiceToString((Choice)i) );
 			m_textChoice[i].SetXY( CHOICES_X, CHOICES_START_Y + i*CHOICES_SPACING_Y );
 			m_textChoice[i].SetShadowLength( CHOICES_SHADOW_LENGTH );

stepmania/src/StepMania.dsp

@@ -60,7 +60,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                        	cl                                                                                         /Zl                                                                                         /nologo                                                                                         /c                                                                                         verstub.cpp                                                                                         /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                         	cl                                                                                          /Zl                                                                                          /nologo                                                                                          /c                                                                                          verstub.cpp                                                                                          /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                        	cl                                                                                         /Zl                                                                                         /nologo                                                                                         /c                                                                                         verstub.cpp                                                                                         /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                         	cl                                                                                          /Zl                                                                                          /nologo                                                                                          /c                                                                                          verstub.cpp                                                                                          /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -1068,6 +1068,14 @@ SOURCE=.\GroupList.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\HelpDisplay.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\HelpDisplay.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\JukeboxMenu.cpp
 # End Source File
 # Begin Source File
@@ -1196,14 +1204,6 @@ SOURCE=.\TextBanner.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\TipDisplay.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\TipDisplay.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\WheelNotifyIcon.cpp
 # End Source File
 # Begin Source File

stepmania/src/StepMania.vcproj

@@ -1065,6 +1065,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath="GroupList.h">
 			</File>
+			<File
+				RelativePath="HelpDisplay.cpp">
+			</File>
+			<File
+				RelativePath="HelpDisplay.h">
+			</File>
 			<File
 				RelativePath="JukeboxMenu.cpp">
 			</File>
@@ -1167,12 +1173,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 			<File
 				RelativePath=".\TextBanner.h">
 			</File>
-			<File
-				RelativePath=".\TipDisplay.cpp">
-			</File>
-			<File
-				RelativePath=".\TipDisplay.h">
-			</File>
 			<File
 				RelativePath="WheelNotifyIcon.cpp">
 			</File>

stepmania/src/TextBanner.cpp

@@ -67,9 +67,9 @@ TextBanner::TextBanner()
 	g_fThreeLinesSubTitleY = THREE_LINES_SUB_TITLE_Y;
 	g_fThreeLinesArtistY = THREE_LINES_ARTIST_Y;
 	
-	m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
-	m_textSubTitle.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
-	m_textArtist.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
+	m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
+	m_textSubTitle.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
+	m_textArtist.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
 
 	m_textTitle.SetX( -g_fWidth/2 );
 	m_textSubTitle.SetX( -g_fWidth/2 );

stepmania/src/TransitionOniFade.cpp

@@ -31,7 +31,7 @@ TransitionOniFade::TransitionOniFade()
 
 	m_quadStrip.StretchTo( RectI(SCREEN_LEFT, int(CENTER_Y-30), SCREEN_RIGHT, int(CENTER_Y+30)) );
 	
-	m_textSongInfo.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
+	m_textSongInfo.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
 	m_textSongInfo.EnableShadow( false );
 	m_textSongInfo.SetZoom( 0.5f );
 	m_textSongInfo.SetXY( CENTER_X, CENTER_Y );

stepmania/src/smpackage/onvertThemeDlg.cpp

@@ -211,20 +211,40 @@ bool FilesAreIdentical( CString sPath1, CString sPath2 )
 	FILE* fp1 = fopen( sPath1, "r" );
 	FILE* fp2 = fopen( sPath2, "r" );
 
+	bool bReturn;
+
 	if( GetFileSizeInBytes(sPath1) != GetFileSizeInBytes(sPath2) )
-		return false;
+	{
+		bReturn = false;
+		goto clean_up;
+	}
 
 	char buffer1[1024], buffer2[1024];
 	ZERO( buffer1 );
 	ZERO( buffer2 );
 	while( !feof(fp1) )
 	{
-		fread( buffer1, 1, sizeof(buffer1), fp1 );
-		fread( buffer2, 1, sizeof(buffer2), fp2 );
-		if( memcmp( buffer1, buffer2, sizeof(buffer1) ) != 0 )
-			return false;
+		int size1 = fread( buffer1, 1, sizeof(buffer1), fp1 );
+		int size2 = fread( buffer2, 1, sizeof(buffer2), fp2 );
+		if( size1 != size2 )
+		{
+			bReturn = false;
+			goto clean_up;
+		}
+		if( memcmp( buffer1, buffer2, sizeof(size1) ) != 0 )
+		{
+			bReturn = false;
+			goto clean_up;
+		}
 	}
-	return true;
+
+	bReturn = true;
+	goto clean_up;
+
+clean_up:
+	fclose( fp1 );
+	fclose( fp2 );
+	return bReturn;
 }
 
 CString StripExtension( CString sPath )
@@ -298,7 +318,8 @@ void ConvertThemeDlg::OnButtonAnalyze()
 
 			if( sThemeElement.CompareNoCase(sBaseElement)==0 )	// file names match
 			{
-				if( FilesAreIdentical( asThemeFilePaths[i], asBaseFilePaths[j] ) )
+				bFoundMatch = true;
+ 				if( FilesAreIdentical( asThemeFilePaths[i], asBaseFilePaths[j] ) )
 					asRedundant.Add( asThemeFilePaths[i] );
 				break;	// skip to next file in asThemeFilePaths
 			}
@@ -320,8 +341,8 @@ void ConvertThemeDlg::OnButtonAnalyze()
 		fprintf( fp, asRedundant[i] + "\n" );
 	fprintf( fp, "\n" );
 	fprintf( fp, "The following elements are possibly MISNAMED.\n"
-		"    (These files do not have a corresponding element in\n"
-		"    the base theme.  This likely means that there is an error in the file name.)\n" );
+		"    (These files do not have a corresponding element in the base theme.\n"
+		"    This likely means that there is an error in the file name.)\n" );
 	for( i=0; i<asWarning.GetSize(); i++ )
 		fprintf( fp, asWarning[i] + "\n" );
 	fclose( fp );

stepmania/src/smpackage/smpackage.clw

@@ -16,7 +16,7 @@ Resource1=IDR_MAINFRAME
 Resource2=IDD_EXPORTER
 Class3=CSMPackageInstallDlg
 Class4=CSmpackageExportDlg
-Resource3=IDD_CONVERT_THEME
+Resource3=IDD_MENU
 Class5=EnterName
 Resource4=IDD_DIALOG_NAME
 Class6=EditInsallations
@@ -24,7 +24,7 @@ Resource5=IDD_INSTALL
 Class7=MainMenuDlg
 Resource6=IDD_EDIT_INSTALLATIONS
 Class8=ConvertThemeDlg
-Resource7=IDD_MENU
+Resource7=IDD_CONVERT_THEME
 Class9=EditMetricsDlg
 Resource8=IDD_EDIT_METRICS
 

stepmania/src/smpackage/smpackage.rc

@@ -183,7 +183,7 @@ BEGIN
     CONTROL         144,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
     LISTBOX         IDC_LIST_THEMES,7,44,88,186,LBS_SORT | 
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Convert from 3.0 to 4.0",IDC_BUTTON_CONVERT,170,51,95,
+    PUSHBUTTON      "Convert from 3.0 to 4.0",IDC_BUTTON_CONVERT,164,51,95,
                     15,WS_DISABLED
     LTEXT           "This will convert the element names in a SM 3.0 theme to the SM 4.0 theme names.  A converted theme will no longer be compatible with StepMania 3.0, so make a backup.  This tool does not convert theme metrics.",
                     IDC_STATIC,110,71,210,33