release: 1.3.12

[lilypond.git] / lily / clef-engraver.cc

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 0e0c79cc84ecd06f0953cf1c2496af2fb1a77049..5de0c8e5495bce25e17f9853bb2e24c14567a73b 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -8,13 +8,18 @@
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
+/*
+  CLEAN ME UP.
+ */
+
 #include <ctype.h>
+#include "staff-symbol-referencer.hh"
 #include "bar.hh"
 #include "clef-engraver.hh"
 #include "clef-item.hh"
 #include "debug.hh"
 #include "command-request.hh"
-#include "time-description.hh"
+#include "timing-translator.hh"
 #include "note-head.hh"
 #include "key-item.hh"
 #include "local-key-item.hh"
@@ -27,33 +32,9 @@ Clef_engraver::Clef_engraver()
   c0_position_i_ = 0;
   clef_position_i_ = 0;
   octave_dir_ = CENTER;
+  create_default_b_ = true;
 }
 
-/*
-  PUT THIS IN GUILE!
- */
-struct Clef_settings {
-  char const *name;
-  char const *cleftype;
-  int position;
-} clef_settings[] = {
-  {"treble", "treble", -2},
-  {"violin", "treble", -2},
-  {"G", "treble", -2},
-  {"G2", "treble", -2},  
-  {"french", "treble",-4 },
-  {"soprano", "alto",-4 },
-  {"mezzosoprano", "alto",-2 },
-  {"alto", "alto",0 },
-  {"tenor", "alto",2 },
-  {"baritone", "alto",4 },
-  {"varbaritone", "bass",0 },
-  {"bass" , "bass",2 },
-  {"F", "bass", 2},
-  {"subbass", "bass",4},
-  {0,0,0}
-};
-
 bool
 Clef_engraver::set_type (String s)
 {
@@ -70,17 +51,25 @@ Clef_engraver::set_type (String s)
   else
     octave_dir_ = CENTER;
 
-  bool found = 0;
-  for (Clef_settings *c = clef_settings; !found && c->name; c++)
+  bool found = false;
+  SCM c = get_property ("supportedClefTypes",0);
+  for (; gh_pair_p(c); c = gh_cdr (c))
     {
-      if (c->name == s)
-       {
-         clef_type_str_ = c->cleftype;
-         clef_position_i_ = c->position;
-         found = 1;
-       }
-      }
+      SCM entry = gh_car (c);
+      SCM name  = gh_car (entry);
 
+      if (ly_scm2string (name) != s)
+       continue;
+      
+      SCM glyph  = gh_cadr (entry);
+      SCM pos  = gh_caddr (entry);
+      
+      clef_type_str_ = ly_scm2string (glyph);
+      clef_position_i_ = gh_scm2int (pos);
+      found = true;
+      break;
+    }
+    
   if (!found)
     {
       switch(toupper (s[0]))
@@ -125,11 +114,11 @@ Clef_engraver::acknowledge_element (Score_element_info info)
   if (dynamic_cast<Bar*>(info.elem_l_)
       && clef_type_str_.length_i())
     {
-      bool def = !clef_p_;
+      bool default_clef = !clef_p_;
       create_clef();
-      if(def)
-       clef_p_->set_elt_property(visibility_lambda_scm_sym,
-                                 gh_eval_str ("postbreak_only_visibility"));
+      if(!default_clef)
+       clef_p_->set_elt_property("visibility-lambda",
+                                 ly_eval_str ("all-visibility"));
     }
 
   /* ugh; should make Clef_referenced baseclass */
@@ -138,8 +127,8 @@ Clef_engraver::acknowledge_element (Score_element_info info)
     {
       if (Note_head * h = dynamic_cast<Note_head*>(it_l))
        {
-         //      h->position_i_ += c0_position_i_;
-         h->position_i_ += c0_position_i_;
+         Staff_symbol_referencer_interface si (h);
+         si.set_position (int (si.position_f ()) + c0_position_i_);
        }
       else if (Local_key_item *i = dynamic_cast<Local_key_item*> (it_l))
        {
@@ -156,14 +145,14 @@ void
 Clef_engraver::do_creation_processing()
 {
   create_default_b_ = true;    // should read property.
-  Scalar def = get_property ("createInitdefaultClef", 0);
-  if (def.to_bool ()) // egcs: Scalar to bool is ambiguous
-    set_type (def);
+  SCM def = get_property ("createInitdefaultClef", 0);
+  if (gh_string_p (def))
+    set_type (ly_scm2string (def));
   
   if (clef_type_str_.length_i ())
     { 
       create_clef();
-      clef_p_->set_elt_property (non_default_scm_sym, SCM_BOOL_T);
+      clef_p_->set_elt_property ("non-default", SCM_BOOL_T);
     }
 }
 
@@ -174,7 +163,7 @@ Clef_engraver::do_try_music (Music * r_l)
     {
       clef_req_l_ = cl;
       if (!set_type (cl->clef_str_))
-       cl->error (_ ("unknown clef type "));
+       cl->error (_ ("unknown clef type"));
 
       return true;
     }
@@ -189,21 +178,21 @@ Clef_engraver::create_clef()
   if (!clef_p_)
     {
       Clef_item *c= new Clef_item;
-      c->set_elt_property (break_priority_scm_sym, gh_int2scm (-2)); // ugh
-      String clefstyle = get_property ("clefStyle", 0);
-      if (clefstyle.length_i ())
-       c->set_elt_property (style_scm_sym,
-                            gh_str02scm (clefstyle.ch_C()));
-      
+      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_));
+
+      Staff_symbol_referencer_interface si(c);
+      si.set_interface ();
+      
       clef_p_ = c;
     }
-  
+  Staff_symbol_referencer_interface si(clef_p_);
   clef_p_->symbol_ = clef_type_str_;
-  clef_p_->y_position_i_ = clef_position_i_;
+  si.set_position (clef_position_i_);
   if (octave_dir_)
     {
-      clef_p_->set_elt_property (octave_dir_scm_sym, gh_int2scm (octave_dir_));
+      clef_p_->set_elt_property ("octave-dir", gh_int2scm (octave_dir_));
     }
 }
 
@@ -217,10 +206,13 @@ Clef_engraver::do_process_requests()
     }
   else if (create_default_b_)
     {
-      String type = get_property ("defaultClef", 0);
-      set_type (type.length_i () ? type : "treble");
+      SCM type = get_property ("defaultClef", 0);
+      if (gh_string_p (type))
+       set_type (ly_scm2string (type));
+      else
+       set_type ( "treble");
       create_clef ();
-      create_default_b_ =0;
+      create_default_b_ = false;
     }
 }
 
@@ -250,3 +242,4 @@ Clef_engraver::do_removal_processing()
 
 
 ADD_THIS_TRANSLATOR(Clef_engraver);
+