diff options
| author | Mike Solomon <mike@apollinemike.com> | 2011-04-28 10:03:20 -0400 |
|---|---|---|
| committer | Carl Sorensen <c_sorensen@byu.edu> | 2011-05-25 11:55:20 -0600 |
| commit | 46c75064f5caa7466dc239e74c09804df477be66 (patch) | |
| tree | 1f6d2c45b64703e5deedf743a586e1050342a51d | |
| parent | d623a43831b22eb89f75b9b8517a7f38d02cb7d4 (diff) | |
Adds a regtest for glissando index.
Also fixes a variable declaration in the glissando engraver.
| -rw-r--r-- | input/regression/glissando-chord.ly | 5 | ||||
| -rw-r--r-- | input/regression/glissando-index.ly | 14 | ||||
| -rw-r--r-- | lily/glissando-engraver.cc | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/input/regression/glissando-chord.ly b/input/regression/glissando-chord.ly index e140c38d8e..27ae104037 100644 --- a/input/regression/glissando-chord.ly +++ b/input/regression/glissando-chord.ly @@ -15,9 +15,4 @@ c1 \glissando s1 <d f a> \set glissandoMap = #'((2 . 0) (1 . 0) (0 . 0)) <d f a>1 \glissando s1 c - \unset glissandoMap - \once \override Voice . Glissando #'style = - #(lambda (grob) - (if (eq? 1 (ly:grob-property grob 'glissando-index)) 'zigzag 'default)) - <d f a>1 \glissando s1 <f a c> } diff --git a/input/regression/glissando-index.ly b/input/regression/glissando-index.ly new file mode 100644 index 0000000000..9b2d99cd11 --- /dev/null +++ b/input/regression/glissando-index.ly @@ -0,0 +1,14 @@ +% FIXME: this is a fake version number to allow git master +% to compile. See discussion on lilypond-devel. +\version "2.13.61" + +\header { + texidoc = "Individual glissandi within a chord can be tweaked." +} + +\relative c' { + \once \override Voice . Glissando #'style = + #(lambda (grob) + (if (eq? 1 (ly:grob-property grob 'glissando-index)) 'zigzag 'default)) + <d f a>1 \glissando s1 <f a c> +} diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 08f420c128..ebd2bb32c7 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -48,7 +48,6 @@ private: bool stop_glissandi; Stream_event *event_; - SCM map; vector<vsize> note_column_1; vector<vsize> note_column_2; }; @@ -56,7 +55,6 @@ private: Glissando_engraver::Glissando_engraver () { event_ = 0; - map = SCM_EOL; start_glissandi = false; stop_glissandi = false; } @@ -82,7 +80,7 @@ Glissando_engraver::acknowledge_note_column (Grob_info info) if (start_glissandi) { extract_grob_set (g, "note-heads", note_heads); - map = get_property ("glissandoMap"); + SCM map = get_property ("glissandoMap"); if (map == SCM_EOL) for (vsize i = 0; i < note_heads.size (); i++) { |