* scm/chord-name.scm: remove new-chord-name-brew-molecule ; use

[lilypond.git] / lily / include / lyric-phrasing-engraver.hh

diff --git a/lily/include/lyric-phrasing-engraver.hh b/lily/include/lyric-phrasing-engraver.hh
index 269d5a96587bea16e329e882d28d2b3a3e575ed0..e5c578a2ae06684b68abbd33f154e1312f985b6e 100644 (file)
--- a/lily/include/lyric-phrasing-engraver.hh
+++ b/lily/include/lyric-phrasing-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Glen Prideaux <glenprideaux@iname.com>
+  (c)  2000--2003 Glen Prideaux <glenprideaux@iname.com>
 */
 
 
@@ -14,6 +14,7 @@
 #include "engraver.hh"
 #include "item.hh"
 #include "smobs.hh"
+#include "protected-scm.hh"
 
 class Syllable_group;
 
@@ -63,7 +64,7 @@ class Lyric_phrasing_engraver : public Engraver
 {
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
   virtual void finalize ();  
 private:
@@ -80,22 +81,25 @@ public:
 
 private:
   /** association list of Syllable_group smobs
+
+  fixme: should use property.
+  
   */
   Protected_scm voice_alist_;
-  Grob * any_notehead_l_;
+  Grob * any_notehead_;
 };
 
 
 class Syllable_group
 {
   bool first_in_phrase_b_;
-  Grob * notehead_l_;
-  Link_array<Grob> lyric_list_;
-  Grob * longest_lyric_l_;
-  Grob * shortest_lyric_l_;
-  int alignment_i_;
+  Grob * notehead_;
+  Link_array<Grob> lyrics_;
+  Grob * longest_lyric_;
+  Grob * shortest_lyric_;
+  int alignment_;
   bool melisma_b_;
-  Real group_translation_f_;
+  Real group_translation_;
 public:
   static SCM make_entry ();
   void set_first_in_phrase (bool f);
@@ -104,10 +108,10 @@ public:
   void add_extender (Grob * extender);
   void set_melisma () { melisma_b_ = true; }
   bool get_melisma () { return melisma_b_; }
-  int lyric_count () { return lyric_list_.size (); }
+  int lyric_count () { return lyrics_.size (); }
   void clear ();
   bool is_empty ();
-  bool set_lyric_align (const char *punc, Grob *default_notehead_l);
+  bool set_lyric_align (const char *punc, Grob *default_notehead);
   void adjust_melisma_align ();
   int appropriate_alignment (const char *punc);
   Real amount_to_translate ();
@@ -118,7 +122,7 @@ private:
   DECLARE_SIMPLE_SMOBS (Syllable_group,);
 } ;
 
-Syllable_group * unsmob_voice_entry (SCM);
+DECLARE_UNSMOB(Syllable_group,voice_entry);
 
 
 #endif // LYRIC_PHRASING_ENGRAVER_HH