From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 24 Mar 2004 10:32:59 +0000 (+0000)
Subject: * lily/beam-performer.cc (process_music): idem.
X-Git-Tag: release/2.1.35~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=df79e4cb4644f934f18694b4bcb7e57690ee3163;p=lilypond.git

* lily/beam-performer.cc (process_music): idem.

* lily/slur-performer.cc (process_music): stop melisma for stop event.
---

diff --git a/ChangeLog b/ChangeLog
index c798895655..5b9ba6c5d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/beam-performer.cc (process_music): idem.
+
+	* lily/slur-performer.cc (process_music): stop melisma for stop event.
+	
 	* tex/titledefs.tex: remove scshape for piece.
 
 	* lily/line-spanner.cc (line_stencil): font-encoding = music, not
diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 861c9856a4..56168b0dee 100644
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1012,6 +1012,7 @@ collisions, and slurs, and ties and beams can be attached to it.
 
 @cindex transparent objects
 @cindex removing objects
+@cindex hiding objects
 @cindex invisible objects
 The following example demonstrates how to connect different voices
 using ties. Normally, ties only connect two notes in the same
diff --git a/input/template/piano.ly b/input/template/piano.ly
index ca6a0c9eff..38d97394b9 100644
--- a/input/template/piano.ly
+++ b/input/template/piano.ly
@@ -14,7 +14,7 @@ lower = \notes\relative c {
 
 \score {
   \context PianoStaff <<
-    %\time 4/4
+    \set PianoStaff.instrument = "Piano  " % set instrument name.
     \context Staff = upper \upper
     \context Staff = lower <<
       \clef bass
diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 09f978e9b9..b5b694a04b 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -34,6 +34,7 @@ Beam_performer::process_music ()
   if (now_stop_ev_)
     {
       beam_ = false;
+      set_melisma (false);
     }
 
   if (start_ev_)
@@ -55,11 +56,6 @@ Beam_performer::set_melisma (bool ml)
 void
 Beam_performer::start_translation_timestep ()
 {
-  if (beam_)
-    {
-      set_melisma (true);
-    }
-  
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 4a154d5673..020160708c 100644
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -38,6 +38,7 @@ Slur_performer::process_music ()
   if (now_stop_ev_)
     {
       slur_ = false;
+      set_melisma (false);
     }
 
   if (start_ev_)
@@ -57,11 +58,6 @@ Slur_performer::set_melisma (bool ml)
 void
 Slur_performer::start_translation_timestep ()
 {
-  if (slur_)
-    {
-      set_melisma (true);
-    }
-  
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 131dd4831c..e0ff307d61 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -695,7 +695,7 @@
 	(before-line-breaking-callback . ,Paper_column::before_line_breaking)
 	(X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;	        (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
+;ppp	        (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
 	(meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
 	))
 
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index be08cbef42..18e4c7794b 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -241,6 +241,9 @@ i.e.  this is not an override"
 (define-public (make-skip-music dur)
   (make-music 'SkipMusic
 	      'duration dur))
+(define-public (make-grace-music music)
+  (make-music 'GraceMusic
+	      'element music))
 
 ;;;;;;;;;;;;;;;;