From 56c34218bcf7d19a8bc6befa20c7c6d557d10d39 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 19 May 2005 22:18:40 +0000
Subject: [PATCH] (score_encompass): oops, <? to min() translation went wrong.
 Fixes vertically translated slurs.

---
 ChangeLog                  | 5 +++++
 lily/main.cc               | 2 ++
 lily/slur-configuration.cc | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e368a946e..3b114cb8dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/slur-configuration.cc (score_encompass): oops, <? to min()
+	translation went wrong. Fixes vertically translated slurs.
+
 2005-05-19  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/user/basic-notaton.itely: editing.
diff --git a/lily/main.cc b/lily/main.cc
index 50ea991b82..da1a508ab6 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -311,6 +311,8 @@ setup_paths (char const* argv0)
       sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc", false);
       prepend_env_path ("PATH", bindir);
     }
+#else
+  (void) argv0;
 #endif /* ARGV0_RELOCATION */
     
   if (char const *env = getenv ("LILYPONDPREFIX"))
diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc
index 082adf02c0..d1c337eb27 100644
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -277,8 +277,8 @@ Slur_configuration::score_encompass (Slur_score_state const &state)
 
 	  // ?
 	  demerit += -state.parameters_.closeness_factor_
-	    * (state.dir_
-	       * min (y - (ext[state.dir_] + state.dir_ * state.parameters_.free_head_distance_), 0.0))
+	    * min (state.dir_
+		   * (y - (ext[state.dir_] + state.dir_ * state.parameters_.free_head_distance_)), 0.0)
 	    / state.encompass_infos_.size ();
 	}
     }
-- 
2.39.2