(add_score): disallow negative slur

scores.

diff --git a/ChangeLog b/ChangeLog
index 676e50134ff11fc736f61aacc95ef1de233c0ffe..555b64142b7aba4ca5274a33eebd48fc5bffe83c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-21  Han-Wen Nienhuys  <lilydev@localhost.localdomain>
+
+       * lily/slur-configuration.cc (add_score): disallow negative slur
+       scores.
+       
 2006-03-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/framework-ps.scm (dump-stencil-as-EPS): remove debugging code.

diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc
index d846b9d6159a8a429daf9e838746d5455282e18e..cd96fed4e32cd5fc320a6e161b519a609a09576d 100644 (file)
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -174,6 +174,12 @@ Slur_configuration::Slur_configuration ()
 void
 Slur_configuration::add_score (Real s, string desc)
 {
+  if (s < 0)
+    {
+      programming_error ("Negative demerits found for slur. Ignoring");
+      s = 0.0;
+    }
+  
   if (s)
     {
       score_card_ += to_string ("%s=%.2f ", desc.c_str (), s);