Re: Bugfix accidental-engraver

[Han-Wen Nienhuys]

Rune Zedeler escreveu:

> --- ../lilypond-2.11.2/lily/accidental-engraver.cc    2006-12-18 
> 05:05:05.000000000 +0100
> +++ lily/accidental-engraver.cc       2006-12-18 05:03:21.000000000 +0100
> @@ -122,8 +122,7 @@
>  
>    /* Huh. Don't understand what this is good for. --hwn.  */
>  

also, maybe you can document the bit going below, and remove the above.

Thanks!

> -  SCM val;
> -  while (trans && trans->where_defined (ly_symbol2scm ("localKeySignature"), 
> &val))
> +  while (trans)
>      {
>        trans->set_property ("localKeySignature", ly_deep_copy (last_keysig_));
>        trans = trans->get_parent_context ();
> @@ -193,11 +192,14 @@
>      {
>        SCM entry = scm_car (s);
>        if (scm_is_pair (scm_car (entry))
> -       && scm_cdar (entry) == scm_from_int (n))
> +       && scm_cdar (entry) == scm_from_int (n)) {
>       from_other_octaves = scm_cdr (entry);
> +     break;
> +      }
>      }
>  
> -  if (from_same_octave != SCM_BOOL_F
> +  if (!ignore_octave
> +      && from_same_octave != SCM_BOOL_F
>        && recent_enough (bar_number, from_same_octave, laziness))
>      previous_alteration = from_same_octave;
>    else if (ignore_octave
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> lilypond-devel mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/lilypond-devel


-- 

Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen

LilyPond Software Design
 -- Code for Music Notation
http://www.lilypond-design.com