X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fclef-engraver.cc;h=53074e6e274a6197a9b442181e6c5636246b6603;hb=c76d27c59244a331a2873a40e0d7e40ad378d4b8;hp=152d95163e1f0ba6c7c08b149752f95370662309;hpb=48f2b9351f93d0161c675cfb60e95bf919041df2;p=lilypond.git

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 152d95163e..53074e6e27 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,217 +3,194 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
 #include <ctype.h>
+
+#include "context.hh"
+#include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
-#include "bar.hh"
-#include "clef-item.hh"
-#include "debug.hh"
-#include "command-request.hh"
-#include "timing-translator.hh"
-#include "note-head.hh"
-#include "key-item.hh"
-#include "local-key-item.hh"
-#include "array.hh"
 #include "engraver.hh"
 #include "direction.hh"
+#include "side-position-interface.hh"
+#include "item.hh"
 
-/// where is c-0 in the staff?
-class Clef_engraver : public  Engraver {
-  Clef_item * clef_p_;
-  Clef_change_req * clef_req_l_;
-  void create_clef();
-  bool set_type (String);
-protected:
-  virtual void do_process_requests();
-  virtual void do_pre_move_processing();
-  virtual void do_creation_processing();
-  virtual void do_post_move_processing();
-  virtual bool do_try_music (Music*);
-  virtual void acknowledge_element (Score_element_info);
+class Clef_engraver : public  Engraver
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  int c0_position_i_;
-  int clef_position_i_;
-				// junkme.
+  TRANSLATOR_DECLARATIONS (Clef_engraver);
+
   Direction octave_dir_;
-  SCM clef_glyph_;		// no need for protection. Always referenced somewhere else.
-   
-  Clef_engraver();
-};
 
+protected:
+  virtual void stop_translation_timestep ();
+  virtual void process_music ();
+  virtual void acknowledge_grob (Grob_info);
+private:
+  Item * clef_;
+  Item * octavate_;
+
+  SCM prev_glyph_;
+  SCM prev_cpos_;
+  SCM prev_octavation_;
+  void create_clef ();
+  void set_glyph ();
+  void inspect_clef_properties ();
+};
 
-Clef_engraver::Clef_engraver()
+Clef_engraver::Clef_engraver ()
 {
-  clef_glyph_ = SCM_EOL;
-  clef_p_ = 0;
-  clef_req_l_ = 0;
-  c0_position_i_ = 0;
-  clef_position_i_ = 0;
+  clef_ = 0;
   octave_dir_ = CENTER;
+  octavate_ = 0;
+
+  /*
+    will trigger a clef at the start since #f != ' ()
+   */
+  prev_cpos_ = prev_glyph_ = SCM_BOOL_F;
 }
 
-bool
-Clef_engraver::set_type (String s)
+void
+Clef_engraver::set_glyph ()
 {
-  if (s.right_str(2) == "_8") // Down one octave
-    {
-      octave_dir_ = DOWN;
-      s = s.left_str(s.length_i() - 2);
-    }
-  else if (s.right_str(2) == "^8") // Up one octave
-    {
-      octave_dir_ = UP;
-      s = s.left_str(s.length_i() - 2);
-    }
-  else
-    octave_dir_ = CENTER;
+  SCM glyph_sym = ly_symbol2scm ("glyph-name");
+  SCM glyph = get_property ("clefGlyph");
 
-  SCM c = get_property ("supportedClefTypes",0);
-  SCM p = get_property ("clefPitches", 0);
+  SCM basic = ly_symbol2scm ("Clef");
   
-  if (gh_list_p (c))
-    {
-      SCM found = scm_assoc (ly_str02scm (s.ch_C()), c);
-      if (found == SCM_BOOL_F)
-	return false;
-      
-      clef_glyph_  = gh_cadr (found);
-      SCM pos  = gh_caddr (found);
-
-      clef_position_i_ = gh_scm2int (pos);
-
-      found = scm_assoc (clef_glyph_, p);
-      if (found == SCM_BOOL_F)
-	return false;
-
-      c0_position_i_ = clef_position_i_ + gh_scm2int (gh_cdr (found));
-    }
-
-  c0_position_i_ -= (int) octave_dir_ * 7;
-  return true;
+  execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (context (), basic, glyph_sym, glyph);
 }
 
-
 /** 
   Generate a clef at the start of a measure. (when you see a Bar,
   ie. a breakpoint) 
   */
 void
-Clef_engraver::acknowledge_element (Score_element_info info)
+Clef_engraver::acknowledge_grob (Grob_info info)
 {
-  if (dynamic_cast<Bar*>(info.elem_l_)
-      && gh_string_p (clef_glyph_))
-    create_clef();
-
-  /* ugh; should make Clef_referenced baseclass */
-  Item * it_l =dynamic_cast <Item *> (info.elem_l_);
-  if (it_l)
+  Item * item =dynamic_cast <Item *> (info.grob_);
+  if (item)
     {
-      if (dynamic_cast<Note_head*>(it_l)
-	  || dynamic_cast<Local_key_item*> (it_l)
-	  )
-	  
-	{
-	  Staff_symbol_referencer_interface si (it_l);
-	  si.set_position (int (si.position_f ()) + c0_position_i_);
-	}
-      else if (Key_item *k = dynamic_cast<Key_item*>(it_l))
-	{
-	  k-> set_c_position (c0_position_i_);
-	}
+      if (Bar_line::has_interface (info.grob_)
+	  && scm_is_string (get_property ("clefGlyph")))
+	create_clef ();
     } 
 }
 
 void
-Clef_engraver::do_creation_processing()
+Clef_engraver::create_clef ()
 {
-  SCM def = get_property ("defaultClef", 0);
-  if (gh_string_p (def))
+  if (!clef_)
     {
-      set_type (ly_scm2string (def));
-      create_clef ();
-      clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
-    }
-}
+      Item *c = make_item ("Clef", SCM_EOL);
+      
 
-bool
-Clef_engraver::do_try_music (Music * r_l)
-{
-  if (Clef_change_req *cl = dynamic_cast <Clef_change_req *> (r_l))
-    {
-      clef_req_l_ = cl;
-      if (!set_type (cl->clef_str_))
-	cl->error (_ ("unknown clef type"));
+      clef_ = c;
+      SCM cpos = get_property ("clefPosition");
 
-      return true;
-    }
-  else
-    return false;
+      if (scm_is_number (cpos))
+	clef_->set_property ("staff-position", cpos);
 
+      SCM oct =  get_property ("clefOctavation");
+      if (scm_is_number (oct) && scm_to_int (oct))
+	{
+	  Item * g = make_item ("OctavateEight", SCM_EOL);
+
+	  int abs_oct = scm_to_int (oct) ;
+	  int dir = sign (abs_oct);
+	  abs_oct = abs (abs_oct)  + 1;
+
+	  SCM txt = scm_number_to_string (scm_int2num (abs_oct),
+					  scm_from_int (10));
+
+	  g->set_property ("text",
+			   scm_list_n (ly_scheme_function ("vcenter-markup"),
+				       txt,  SCM_UNDEFINED));
+	  Side_position_interface::add_support (g,clef_);      
+
+	  g->set_parent (clef_, Y_AXIS);
+	  g->set_parent (clef_, X_AXIS);
+	  g->set_property ("direction", scm_int2num (dir));
+	  octavate_ = g;
+	  
+	}
+    }
+}
+void
+Clef_engraver::process_music ()
+{
+  inspect_clef_properties ();
 }
 
 void
-Clef_engraver::create_clef()
+Clef_engraver::inspect_clef_properties ()
 {
-  if (!clef_p_)
+  SCM glyph = get_property ("clefGlyph");
+  SCM clefpos = get_property ("clefPosition");
+  SCM octavation = get_property ("clefOctavation");
+  SCM force_clef = get_property ("forceClef");
+  
+  if (clefpos == SCM_EOL
+      || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
+      || scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
+      || scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F
+      || to_boolean (force_clef))
     {
-      Clef_item *c= new Clef_item;
-      c->set_elt_property ("breakable", SCM_BOOL_T);
-      c->set_elt_property ("break-aligned", SCM_BOOL_T);
-      announce_element (Score_element_info (c, clef_req_l_));
+      set_glyph ();
+      create_clef ();
 
-      Staff_symbol_referencer_interface si(c);
-      si.set_interface ();
-      
-      clef_p_ = c;
+      clef_->set_property ("non-default", SCM_BOOL_T);
+
+      prev_cpos_ = clefpos;
+      prev_glyph_ = glyph;
+      prev_octavation_ = octavation;
     }
-  Staff_symbol_referencer_interface si(clef_p_);
-  clef_p_->set_elt_property ("glyph", clef_glyph_);
-  si.set_position (clef_position_i_);
-  if (octave_dir_)
+
+  if (to_boolean (force_clef))
     {
-      clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_));
+      Context * w = context ()->where_defined (ly_symbol2scm ("forceClef"));
+      w->set_property ("forceClef", SCM_EOL);
     }
 }
 
 
 void
-Clef_engraver::do_process_requests()
+Clef_engraver::stop_translation_timestep ()
 {
-  if (clef_req_l_)
+  if (clef_)
     {
-      create_clef();
-      clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
-    }
-}
+      SCM vis = 0; 
+      if (to_boolean (clef_->get_property ("non-default")))
+	{
+	  vis = get_property ("explicitClefVisibility");
+	}
 
-void
-Clef_engraver::do_pre_move_processing()
-{
-  if (clef_p_)
-    {
-      if(to_boolean (clef_p_->remove_elt_property("non-default")))
-	 clef_p_->set_elt_property("visibility-lambda",
-				   ly_eval_str ("all-visibility"));
+      if (vis)
+	{
+	  clef_->set_property ("break-visibility", vis);
+	  if (octavate_)
+	    {
+	      octavate_->set_property ("break-visibility", vis);
+
+	    }
+	}
       
-      typeset_element (clef_p_);
-      clef_p_ =0;
-    }
-}
+      clef_ =0;
 
-void
-Clef_engraver::do_post_move_processing()
-{
-  clef_req_l_ = 0;
+      octavate_ = 0;
+    }
 }
 
 
 
-
-ADD_THIS_TRANSLATOR(Clef_engraver);
-
+ENTER_DESCRIPTION (Clef_engraver,
+/* descr */       "Determine and set reference point for pitches",
+/* creats*/       "Clef OctavateEight",
+/* accepts */     "",
+/* acks  */      "bar-line-interface",
+/* reads */       "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
+/* write */       "");