Adds a regtest for glissando index.

Also fixes a variable declaration in the glissando engraver.

diff --git a/input/regression/glissando-chord.ly b/input/regression/glissando-chord.ly
index ea8fda3371758fa9779cfd17a346bdae79936227..d44ea7632067f447780ceed5c4ea9a655ef27a78 100644 (file)
--- a/input/regression/glissando-chord.ly
+++ b/input/regression/glissando-chord.ly
@@ -17,9 +17,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 (file)
index 0000000..9b2d99c
--- /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 08f420c128a10483454418e9389dfa201148a4ee..ebd2bb32c78d29c356ca09e29f63ee361f395bfd 100644 (file)
--- 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++)
           {