CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/19 22:18:40
Modified files:
. : ChangeLog
lily : main.cc slur-configuration.cc
Log message:
(score_encompass): oops, <? to min()
translation went wrong. Fixes vertically translated slurs.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3637&tr2=1.3638&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.254&tr2=1.255&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-configuration.cc.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3637 lilypond/ChangeLog:1.3638
--- lilypond/ChangeLog:1.3637 Thu May 19 16:46:09 2005
+++ lilypond/ChangeLog Thu May 19 22:18:40 2005
@@ -1,3 +1,8 @@
+2005-05-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/slur-configuration.cc (score_encompass): oops, <? to min()
+ translation went wrong. Fixes vertically translated slurs.
+
2005-05-19 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/basic-notaton.itely: editing.
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.254 lilypond/lily/main.cc:1.255
--- lilypond/lily/main.cc:1.254 Wed May 18 09:56:15 2005
+++ lilypond/lily/main.cc Thu May 19 22:18:40 2005
@@ -311,6 +311,8 @@
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"))
Index: lilypond/lily/slur-configuration.cc
diff -u lilypond/lily/slur-configuration.cc:1.16
lilypond/lily/slur-configuration.cc:1.17
--- lilypond/lily/slur-configuration.cc:1.16 Wed May 4 10:53:08 2005
+++ lilypond/lily/slur-configuration.cc Thu May 19 22:18:40 2005
@@ -277,8 +277,8 @@
// ?
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 ();
}
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
