Merge branch 'translation' into staging

[lilypond.git] / lily / skyline.cc

diff --git a/lily/skyline.cc b/lily/skyline.cc
index d65e48b573e7eeb4a2be65bc23c946e168ca6ec3..0250fc07f4743ba44e7bc1ac8af23ed6057aa435 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2012 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -558,9 +558,9 @@ Skyline::internal_distance (Skyline const &other, Real horizon_padding, Real *to
       dist = max (dist, max (start_dist, end_dist));
 
       if (end_dist == dist)
-       touch = end;
+        touch = end;
       else if (start_dist == dist)
-       touch = start;
+        touch = start;
 
       if (i->end_ <= j->end_)
         i++;
@@ -661,9 +661,9 @@ IMPLEMENT_TYPE_P (Skyline, "ly:skyline?");
 IMPLEMENT_DEFAULT_EQUAL_P (Skyline);
 
 SCM
-Skyline::mark_smob (SCM)
+Skyline::mark_smob (SCM s)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
+  ASSERT_LIVE_IS_ALLOWED (s);
   return SCM_EOL;
 }