From cac6f54920e228bbb649130f402e137c9d90041b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 17 Jun 2002 11:56:38 +0000 Subject: [PATCH] * ly/espanol.ly: added. * lily/simple-spacer.cc (solve): remove assert. --- ChangeLog | 6 ++++++ lily/multi-measure-rest.cc | 5 ++--- lily/simple-spacer.cc | 5 +++-- ly/espanol.ly | 13 ++----------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index c18eb112fa..75789d5973 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-06-17 Han-Wen Nienhuys + + * ly/espanol.ly: added. + + * lily/simple-spacer.cc (solve): remove assert. + 2002-06-17 Han-Wen * lily/forbid-break-engraver.cc (class diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 579408802d..cba08eca96 100644 --- 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 fb928d393a..64caa59692 100644 --- 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 be0bc22073..17dd8ea886 100644 --- 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 +% contributed by Carlos García Suárez % For using "sostingut" notation, which is also correct -- 2.39.5