From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 8 Aug 2006 20:17:29 +0000 (+0000)
Subject: (banterProperties):
X-Git-Tag: cvs/HEAD~171
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=46f5d2825b0d0942056cac3cfff502b6e8e9c838;p=lilypond.git

(banterProperties):
instrumentName update
---

diff --git a/input/manual/chord-names-jazz.ly b/input/manual/chord-names-jazz.ly
index 6307111dcc..55d51c4d4f 100644
--- a/input/manual/chord-names-jazz.ly
+++ b/input/manual/chord-names-jazz.ly
@@ -109,15 +109,15 @@ banterProperties = \sequential {
 \score{
     <<
 	\new ChordNames {
-	    \set shortInstrumentName = #"Ignatzek (default)"
-	    \set instr = #"Def"
+	    \set instrumentName = #"Ignatzek (default)"
+	    \set shortInstrumentName = #"Def"
 	    \chs
 	}
 	
 	\new ChordNames {
 	    \jazzAltProperties
-	    \set shortInstrumentName = #"Alternative"
-	    \set instr = #"Alt"
+	    \set instrumentName = #"Alternative"
+	    \set shortInstrumentName = #"Alt"
 	    \chs
 	}
 
@@ -133,8 +133,8 @@ banterProperties = \sequential {
 	
 	\new ChordNames {
 	    \banterProperties
-	    \set shortInstrumentName = #"Banter"
-	    \set instr = #"Ban"
+	    \set instrumentName = #"Banter"
+	    \set shortInstrumentName = #"Ban"
 	    \chs
 	}
 %}
diff --git a/lily/fall-engraver.cc b/lily/fall-engraver.cc
index 2bc2e6ec13..5df614bb41 100644
--- a/lily/fall-engraver.cc
+++ b/lily/fall-engraver.cc
@@ -1,5 +1,5 @@
 /*
-  fall-engraver.cc -- implement Fall_engraver
+  fall-engraver.cc -- implement Bend_after_engraver
 
   (c) 2006 Han-Wen Nienhuys
 
@@ -13,10 +13,10 @@
 
 #include "translator.icc"
 
-class Fall_engraver : public Engraver
+class Bend_after_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS (Fall_engraver);
+  TRANSLATOR_DECLARATIONS (Bend_after_engraver);
   DECLARE_ACKNOWLEDGER (note_head);
 
 protected:
@@ -34,13 +34,12 @@ private:
 };
 
 void
-Fall_engraver::stop_fall ()
+Bend_after_engraver::stop_fall ()
 {
   bool bar = scm_is_string (get_property ("whichBar"));
   
   
-  fall_->set_bound (RIGHT, unsmob_grob (
-					bar
+  fall_->set_bound (RIGHT, unsmob_grob (bar
 					? get_property ("currentCommandColumn")
 					: get_property ("currentMusicalColumn")));
   fall_ = 0;
@@ -49,7 +48,7 @@ Fall_engraver::stop_fall ()
 }
 
 void
-Fall_engraver::stop_translation_timestep ()
+Bend_after_engraver::stop_translation_timestep ()
 {
   if (fall_ && !fall_->get_bound (LEFT)) 
     {
@@ -59,7 +58,7 @@ Fall_engraver::stop_translation_timestep ()
 }
 
 void
-Fall_engraver::start_translation_timestep ()
+Bend_after_engraver::start_translation_timestep ()
 {
   if (fall_ && now_mom ().main_part_ >= stop_moment_.main_part_)
     {
@@ -68,7 +67,7 @@ Fall_engraver::start_translation_timestep ()
 }
 
 void
-Fall_engraver::acknowledge_note_head (Grob_info info)
+Bend_after_engraver::acknowledge_note_head (Grob_info info)
 {
   if (!fall_event_)
     return;
@@ -82,22 +81,22 @@ Fall_engraver::acknowledge_note_head (Grob_info info)
   stop_moment_ = now_mom () + get_event_length (info.event_cause ());
 }
 
-Fall_engraver::Fall_engraver ()
+Bend_after_engraver::Bend_after_engraver ()
 {
   fall_ = 0;
   note_head_ = 0;
   fall_event_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Fall_engraver, bend_after);
+IMPLEMENT_TRANSLATOR_LISTENER (Bend_after_engraver, bend_after);
 void
-Fall_engraver::listen_bend_after (Stream_event *ev)
+Bend_after_engraver::listen_bend_after (Stream_event *ev)
 {
   fall_event_ = ev;
 }
 
 void
-Fall_engraver::process_music ()
+Bend_after_engraver::process_music ()
 {
   if (fall_event_ && !fall_)
     {
@@ -107,9 +106,9 @@ Fall_engraver::process_music ()
     }
 }
 
-ADD_ACKNOWLEDGER (Fall_engraver, note_head);
+ADD_ACKNOWLEDGER (Bend_after_engraver, note_head);
 
-ADD_TRANSLATOR (Fall_engraver,
+ADD_TRANSLATOR (Bend_after_engraver,
 		/* doc */ "Create fall spanners.",
 		/* create */ "BendAfter",
 		/* accept */ "bend-after-event",
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index a9e4b53d75..02149ef8b4 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -210,7 +210,7 @@ contained staves are not connected vertically."
   \consists "Text_engraver"
   \consists "Dynamic_engraver"
   \consists "Fingering_engraver"
-  \consists "Fall_engraver"
+  \consists "Bend_after_engraver"
 
   \consists "Script_engraver"
   \consists "Script_column_engraver"