* lily/include/translator.icc: new file.

[lilypond.git] / lily / phrasing-slur-engraver.cc

diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 749dc7232b262660d7ffe99cc8e9e5042bac742d..333cba4e7b1ca7ba9cf3b1d3d278eadd1dc31855 100644 (file)
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -1,13 +1,12 @@
 /*
   phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "context.hh"
 #include "directional-element-interface.hh"
 #include "engraver.hh"
-#include "event.hh"
 #include "slur.hh"
 #include "note-column.hh"
 #include "spanner.hh"
@@ -22,16 +21,16 @@
 class Phrasing_slur_engraver : public Engraver
 {
   Drul_array<Music *> events_;
-  Music * running_slur_start_;
+  Music *running_slur_start_;
   Link_array<Grob> slurs_;
   Link_array<Grob> end_slurs_;
 
 protected:
-  virtual bool try_music (Music*);
+  virtual bool try_music (Music *);
   virtual void acknowledge_grob (Grob_info);
-  virtual void stop_translation_timestep ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
   virtual void finalize ();
-  virtual void process_music ();
+  PRECOMPUTED_VIRTUAL void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Phrasing_slur_engraver);
@@ -39,7 +38,7 @@ public:
 
 Phrasing_slur_engraver::Phrasing_slur_engraver ()
 {
-  events_[START] =events_[STOP] = 0;
+  events_[START] = events_[STOP] = 0;
 }
 
 bool
@@ -60,7 +59,7 @@ Phrasing_slur_engraver::try_music (Music *m)
        {
          if (slurs_.is_empty ())
            return false;
-         
+
          events_[STOP] = m;
          return true;
        }
@@ -68,27 +67,44 @@ Phrasing_slur_engraver::try_music (Music *m)
   return false;
 }
 
-
 void
 Phrasing_slur_engraver::acknowledge_grob (Grob_info info)
 {
-  Grob *e =info.grob_;
-  if (Note_column::has_interface (info.grob_))
+  Grob *e = info.grob ();
+  if (Note_column::has_interface (info.grob ()))
     {
-      for (int i = slurs_.size (); i--; )
+      for (int i = slurs_.size (); i--;)
        Slur::add_column (slurs_[i], e);
-      for (int i = end_slurs_.size (); i-- ; )
+      for (int i = end_slurs_.size (); i--;)
        Slur::add_column (end_slurs_[i], e);
     }
   else
     {
       /*
-       TODO: maybe take more objects?  
-       */
-      for (int i = slurs_.size (); i--; )
-       Slur::add_extra_encompass (slurs_[i], e);
-      for (int i = end_slurs_.size (); i--; )
-       Slur::add_extra_encompass (end_slurs_[i], e);
+       ugh. cut & paste from slur-engraver.cc
+      */
+      SCM inside = e->get_property ("inside-slur");
+      if (Tie::has_interface (e)
+         || Slur::has_interface (e)
+         || to_boolean (inside))
+       {
+         for (int i = slurs_.size (); i--;)
+           Slur::add_extra_encompass (slurs_[i], e);
+         for (int i = end_slurs_.size (); i--;)
+           Slur::add_extra_encompass (end_slurs_[i], e);
+       }
+      else if (inside == SCM_BOOL_F)
+       {
+         Grob *slur = slurs_.size () ? slurs_[0] : 0;
+         slur = (end_slurs_.size () && !slur)
+           ? end_slurs_[0] : slur;
+
+         if (slur)
+           {
+             e->add_offset_callback (Slur::outside_slur_callback_proc, Y_AXIS);
+             e->set_object ("slur", slur->self_scm ());
+           }
+       }
     }
 }
 
@@ -96,7 +112,7 @@ void
 Phrasing_slur_engraver::finalize ()
 {
   if (slurs_.size ())
-    slurs_[0]->warning (_("unterminated slur"));
+    slurs_[0]->warning (_ ("unterminated phrasing slur"));
 }
 
 void
@@ -107,12 +123,12 @@ Phrasing_slur_engraver::process_music ()
       end_slurs_ = slurs_;
       slurs_.clear ();
     }
-  
+
   if (events_[START] && slurs_.is_empty ())
     {
       Music *ev = events_[START];
 
-      Grob * slur = make_spanner ("Slur", events_[START]->self_scm ());
+      Grob *slur = make_spanner ("PhrasingSlur", events_[START]->self_scm ());
       Direction updown = to_dir (ev->get_property ("direction"));
       if (updown)
        set_grob_direction (slur, updown);
@@ -128,11 +144,12 @@ Phrasing_slur_engraver::stop_translation_timestep ()
   events_[START] = events_[STOP] = 0;
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (Phrasing_slur_engraver,
-/* descr */       "Print phrasing slurs. Similar to @ref{Slur_engraver}",
-/* creats*/       "PhrasingSlur",
-/* accepts */     "phrasing-slur-event",
-/* acks  */       "note-column-interface slur-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Phrasing_slur_engraver,
+               /* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
+               /* creats*/ "PhrasingSlur",
+               /* accepts */ "phrasing-slur-event",
+               /* acks  */ "note-column-interface tie-interface fingering-interface script-interface slur-interface",
+               /* reads */ "",
+               /* write */ "");