From eca1754dbf0310961631b6221e40b11ef4b23d7b Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 3 Apr 2011 23:43:22 -0400
Subject: [PATCH] [metricClean] Make DiffMerge happy.

Anyone know of a diff tool that will let me specify points
to diff instead of relying on automatic tools?
---
 Themes/default/metrics.ini | 74 +++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 46 deletions(-)

diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index ecfbe23c26..ddba187e95 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -398,11 +398,9 @@ CapitalizeDifficultyNames=false
 NumShownItems=5
 ItemsSpacingY=24
 MoveCommand=decelerate,0.3
-#
+
 FrameX=
-FrameY=0
-FrameOnCommand=
-FrameOffCommand=
+
 FrameSetCommand=%function(self,param) \
 	if param.CustomDifficulty then \
 		self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \
@@ -519,7 +517,6 @@ end;
 TextureCoordScaleX=1
 NumPills=1
 
-
 [TextBanner]
 TitleOnCommand=horizalign,left;shadowlength,1;
 SubtitleOnCommand=horizalign,left;shadowlength,1;
@@ -1174,14 +1171,11 @@ StepsTypeOnCommand=zoom,0.45
 DisqualifyP1X=SCREEN_CENTER_X-176
 DisqualifyP1Y=SCREEN_BOTTOM-98
 DisqualifyP1OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_1
-DisqualifyP1OffCommand=
 DisqualifyP2X=SCREEN_CENTER_X+176
 DisqualifyP2Y=SCREEN_BOTTOM-98
 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2
-DisqualifyP2OffCommand=
 
 ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT
-# PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0;
 CursorOnCommand=
 
 LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat'
@@ -1212,31 +1206,23 @@ SeparateExitRowY=SCREEN_BOTTOM-40
 [ScreenOptionsServiceExtendedChild]
 
 [ScreenMiniMenu]
-HeaderX=SCREEN_CENTER_X
 HeaderY=SCREEN_TOP
 HeaderOnCommand=draworder,100;visible,false
-HeaderOffCommand=
-
 LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffusealpha,0.375
 LineHighlightChangeCommand=
 LineHighlightChangeToExitCommand=
 
 [OptionRowMiniMenu]
 Fallback="OptionRow"
-
 TitleX=SCREEN_CENTER_X-320+48
 TitleOnCommand=horizalign,left;shadowlength,0;uppercase,true;zoom,0.6375;strokecolor,Color("Black");
-#~ TitleGainFocusCommand=
-#~ TitleLoseFocusCommand=
-
-ColorSelected=color("1,1,1,1")
-ColorNotSelected=color("0.9,0.9,0.9,1")
-ColorDisabled=color("0.5,0.5,0.5,1")
-
-ItemOnCommand=zoom,0.6375
 ItemsLongRowP1X=SCREEN_CENTER_X-240
 ItemsLongRowP2X=SCREEN_CENTER_X+240
 ItemsLongRowSharedX=SCREEN_CENTER_X+200
+ItemOnCommand=zoom,0.6375
+
+ColorSelected=color("1,1,1,1")
+ColorNotSelected=color("0.9,0.9,0.9,1")
 
 [ScreenMiniMenuContext]
 PageOnCommand=visible,false
@@ -1252,7 +1238,6 @@ ItemsLongRowP2X=SCREEN_CENTER_X
 ItemsLongRowSharedX=SCREEN_CENTER_X
 
 [OptionRowMiniMenuContext]
-Fallback="OptionRowMiniMenu"
 
 [ScreenMapControllers]
 
@@ -1306,25 +1291,6 @@ LineGameplayFooter="lua,UserPrefGameplayFooter()"
 
 [ScreenPlayerOptions]
 LineNames=GetDefaultOptionLines()
-#~ LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17"
-Line1="lua,SpeedMods()"
-#~ Line1="list,Speed"
-Line2="list,Accel"
-Line3="list,Effect"
-Line4="list,Appearance"
-Line5="list,Turn"
-Line6="list,Insert"
-LineR="list,Remove"
-Line7="list,Scroll"
-Line8="list,NoteSkins"
-Line9="list,Holds"
-Line10="list,Mines"
-Line11="list,Attacks"
-Line12="list,PlayerAutoPlay"
-Line13="list,Hide"
-Line14="list,Persp"
-Line15="list,ScoreDisplay"
-Line16="list,Steps"
 Line17="lua,OptionRowProTiming()"
 Line18="list,Characters"
 
@@ -1336,12 +1302,26 @@ Line18="list,Characters"
 
 [ScreenAttract]
 
+#
+#
+#
+#
+
 [ScreenRanking]
+#
+
+#
+
+#
+
+#
+
+#
+
 # 05 # B
 
 # 05 # C
 [ScreenGameplay]
-ShowLifeMeterForDisabledPlayers=false
 #
 SongMeterDisplayX=SCREEN_CENTER_X
 SongMeterDisplayY=SCREEN_TOP+50
@@ -1495,6 +1475,12 @@ SongOptionsY=SCREEN_BOTTOM-32
 SongOptionsOnCommand=draworder,101;zoom,0.5
 SongOptionsOffCommand=
 #
+LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160
+LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140
+# This is used if one player is in reverse and the other isn't.
+LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160;
+LyricDisplayDefaultColor=Color("White")
+#
 OniGameOverP1X=
 OniGameOverP1Y=
 OniGameOverP1OnCommand=
@@ -1519,11 +1505,7 @@ ActiveAttackListP2Y=
 ActiveAttackListP2OnCommand=visible,false
 ActiveAttackListP2OffCommand=
 #
-LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+160
-LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-140
-# This is used if one player is in reverse and the other isn't.
-LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-160;
-LyricDisplayDefaultColor=Color("White")
+
 
 [ScreenGameplayShared]