release: 1.1.25

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 0d1a185923be893a1f6285b01b96f221f6f32f7c..a41cb38f27b600b4990c2b2e7ae47e6e435dfff5 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <ctype.h>
@@ -12,136 +12,75 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-grav.hh"
-
+#include "clef-engraver.hh"
+#include "g-text-item.hh"
+#include "p-score.hh"
 
 void
 Clef_item::do_pre_processing()
 {
-  change_b_ = ! (break_status_i() == 1);
+  dim_cache_[Y_AXIS].translate (paper()->internote_f () * y_position_i_);
+  
+  bool b= (break_status_dir() != RIGHT);
+  change_b_ = b;
 
   if (default_b_)
     {
-      set_empty(break_status_i() != 1);
-      transparent_b_ = (break_status_i() != 1);
+      set_empty(b);
+      transparent_b_ = b;
     }
 }
 
+/*
+  FIXME
+*/
 Clef_item::Clef_item()
 {
   breakable_b_ =true;
   default_b_ = false;
   change_b_ = true;
-  read ("violin");
+  octave_dir_ = CENTER;
+  symbol_ = "treble";
+  y_position_i_ = -2;
 }
 
-/*
- * Convert input clef string to 
- * a clef symbol and a line position.
- * This would be better done in the lexer (more efficient)
- * or as a table-lookup.
- */
 void
-Clef_item::read (String t)
+Clef_item::do_add_processing ()
 {
-  symbol_= t;
-  if (t == "violin") 
-    {
-      y_position_i_ = -2;
-    }
-  else if (t == "bass") 
-    {
-      y_position_i_ = 2;
-    }
-  else if (t == "G" || t == "G2" || t == "treble")
-    {
-      symbol_ = "violin";
-      y_position_i_ = -2;
-    }
-  else if (t == "french" || t == "G1") 
-    {
-      symbol_="violin";
-      y_position_i_ = -4;
-    }
-  else if (t == "soprano" || t == "C1") 
-    {
-      symbol_="alto";
-      y_position_i_ = -4;
-    }
-  else if (t == "mezzosoprano" || t == "C2")
-    {
-      symbol_ = "alto";
-      y_position_i_ = -2;
-    }
-  else if (t == "alto") 
-    {
-      symbol_ = "alto";
-      y_position_i_ = 0;
-    }
-  else if (t == "C3")
+  if (!break_status_dir_       // broken stuff takes care of their own texts
+      && octave_dir_)
     {
-      symbol_ = "alto";
-      y_position_i_ = 0;
-  }
-  else if (t == "tenor" || t == "C4") 
-  {
-      symbol_ = "alto";
-      y_position_i_ = 2;
-    }
-  else if (t == "baritone" || t == "C5")
-    {
-      symbol_ = "alto";
-      y_position_i_ = 4;
-    }
-  else if (t == "varbaritone" || t == "F3")
-    {
-      symbol_ = "bass";
-      y_position_i_ = 0;
-    }
-  else if (t == "F" || t == "F4")
-    {
-      symbol_ = "bass";
-      y_position_i_ = 2;
-    }
-  else if (t == "subbass")
-    {
-      symbol_ = "bass";
-      y_position_i_ = 4;
+      G_text_item *g = new G_text_item;
+      pscore_l_->typeset_element (g);
+      
+      g->text_str_ = "8";
+      g->style_str_ = "italic";
+      g->dim_cache_[Y_AXIS].parent_l_ = &dim_cache_[Y_AXIS];
+      g->dim_cache_[X_AXIS].parent_l_ = &dim_cache_[X_AXIS];
+      add_dependency (g);      // just to be sure.
+
+      Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
+      g->dim_cache_[Y_AXIS].set_offset (r);
     }
-  else if (isdigit(t[1]))
-         switch (t[0])
-         { // we've already dealt with plain F, G  or C clef 
-                 // position 0 is line 3.        
-         case 'G':
-         case 'g':
-                 symbol_ = "violin";
-                 y_position_i_ =   2 * (t[1] - '0') - 6;
-                 break;
-         case 'F':
-         case 'f':
-                 symbol_ = "bass";
-                 y_position_i_ = 2 * (t[1] - '0') - 6;
-                 break;
-         }
-}
 
-void
-Clef_item::read (Clef_engraver const &k)
-{
-  read (k.clef_type_str_);
 }
 
+
+
+
+
 Molecule*
-Clef_item::brew_molecule_p() const
+Clef_item::do_brew_molecule_p() const
 {
   String t = symbol_;
   if  (change_b_)
     t += "_change";
-  Atom s = paper()->lookup_l ()->clef (t);
+  //  Atom s = lookup_l ()-> text ("roman", to_str (break_status_dir ()));
+    
+  Atom s = lookup_l ()->clef (t);
   Molecule*output = new Molecule (Atom (s));
-  output->translate_axis (paper()->internote_f () * y_position_i_, Y_AXIS);
   return output;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Clef_item,Item);
+