* 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 c7988956552cd6f2107b3344ca2676d8beb1c7c7..5b9ba6c5d923493cfb429d42a4c183e94bdfb8d6 100644 (file)
--- 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 861c9856a48baaa9b80350ed97e4dc095bce49b4..56168b0dee6628d12de4013cfa9fcae7476b757f 100644 (file)
--- 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 ca6a0c9eff4085694a17eb29d97e1589d8f60ad4..38d97394b98fdea7a390cada159e9c15e42524e3 100644 (file)
--- 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 09f978e9b92326e1e0e320389bb99f8729b37739..b5b694a04b052bb3308f91dc5a38fc5bf007564d 100644 (file)
--- 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 4a154d567397e758dee11b315ad58b3b5e0a8fba..020160708ca65b553d42ea06a5cecaeea4babe93 100644 (file)
--- 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 131dd4831c25f6075f8be49282d640ffc543e5ce..e0ff307d61f24ae7ca2ebbfdd3d7e3a6330c8c9d 100644 (file)
--- 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 be08cbef4244cb7f1a5a008712615b622570fa16..18e4c7794bbc8ef8c31f6c108db17c219018e871 100644 (file)
--- 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))
 
 ;;;;;;;;;;;;;;;;