* ly/espanol.ly: added.

* lily/simple-spacer.cc (solve): remove assert.

diff --git a/ChangeLog b/ChangeLog
index c18eb112fa67adf8d84c9f48d2579c8444d592f5..75789d5973014d4d56f73c97f8154164a58f7008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * ly/espanol.ly: added.
+
+       * lily/simple-spacer.cc (solve): remove assert.
+
 2002-06-17  Han-Wen  <hanwen@cs.uu.nl>
 
        * lily/forbid-break-engraver.cc (class

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 579408802d33e14b98a794aec369fabd279fa076..cba08eca96dc9ca848a7c40fed08fe920557e0ef 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -140,12 +140,11 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space)
     {
       measures = gh_scm2int (m);
     }
-  
-
-  SCM limit = me->get_grob_property ("expand-limit");
   if (measures <= 0)
     return Molecule();
+  
 
+  SCM limit = me->get_grob_property ("expand-limit");
   if (measures > gh_scm2int (limit))
     {
       Real padding = 0.15;  

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index fb928d393a25df84f57a72497aba85c2b6bbdacf..64caa5969236643b4e7dd95fbfd8267ffeefe914 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -335,8 +335,9 @@ Simple_spacer::solve (Column_x_positions *positions, bool ragged) const
     {
       Real  l = springs_[i].length ((ragged) ? 0.0 : force_f_);
       positions->config_.push (positions->config_.top () + l);
-
-      assert (l >= 0);
+      /*
+       we have l>= 0 here, up to rounding errors 
+      */
     }
   positions->cols_ = spaced_cols_;
   positions->loose_cols_ = loose_cols_;

diff --git a/ly/espanol.ly b/ly/espanol.ly
index be0bc2207354ce91858bf382de5fd48fda210a3a..17dd8ea8864447aa37dbd991f1e9e6e2bce976b4 100644 (file)
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -1,23 +1,14 @@
 %{
 
- Common Spanish names for notes. "b" means flat (bemol), "s" means
- sharp (sostenido).
- 
+ Common Spanish names for notes. "b" means flat (bemol), "s" means sharp (sostenido).
  Adapted from italiano.ly.
 
  English: a   b   c   d   e   f   g
  Spanish: la  si  do  re  mi  fa  sol
 
- For some strange reason, dutch.ly and german.ly were renamed to
- follow the (ms-dos?) norsk naming convention.
-
- For spanish.ly, it should actually be "espa~nol.ly" with a "n with
- tilde on top" As the n with tilde is possibly not a good character to
- have I would write without the tilde, that is "espanol.ly"
-
 %}
 
-% contributed by Carlos Garc'ia Su'arez <cgscqmp@terra.es>
+% contributed by Carlos García Suárez <cgscqmp@terra.es>
 
 
 % For using "sostingut" notation, which is also correct