(score_encompass): oops, <? to min()

translation went wrong. Fixes vertically translated slurs.

diff --git a/ChangeLog b/ChangeLog
index 1e368a946e6817b3dfc9d3beeddd7386c67da946..3b114cb8dd4e31b6249c488f2fde641a700486a5 100644 (file)
--- 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 50ea991b82cfa233b393a4aa56c4ce7167eb9246..da1a508ab676602eca5415426eea4257de092620 100644 (file)
--- 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 082adf02c0cb2b474e425dc55cd213dc17e7a6fa..d1c337eb271548451ade1d91d8e485a40f9a8ef3 100644 (file)
--- 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 ();
        }
     }