release: 1.3.44

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 168a1e45e9b58d7ab1b378a2fc1273cb53f73b29..af14a41828c35d82ab9509bc4b608b1ec8e6d5fa 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,10 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <ctype.h>
+
 #include "clef-item.hh"
 #include "string.hh"
 #include "molecule.hh"
@@ -15,35 +15,42 @@
 #include "text-item.hh"
 #include "paper-score.hh"
 #include "dimension-cache.hh"
+#include "side-position-interface.hh"
+#include "warn.hh"
+#include "line-of-score.hh"
 
 void
-Clef_item::do_pre_processing()
+Clef_item::before_line_breaking ()
 {
-  translate_axis (y_position_i_ * staff_line_leading_f () / 2.0, Y_AXIS);
   SCM style_sym =get_elt_property ("style");
   String style;
-  if (style_sym != SCM_UNDEFINED)
+  if (gh_string_p (style_sym))
     style = ly_scm2string (style_sym);
+
+  SCM glyph = get_elt_property ("glyph");
+  if (gh_string_p (glyph))
+    {
+      String s = ly_scm2string (glyph);
+       
+      if (break_status_dir() != RIGHT && style != "fullSizeChanges")
+       {
+         s += "_change";
+       }
+      s = "clefs-" +  s;
+      set_elt_property ("glyph", ly_str02scm (s.ch_C()));
+    }
+  else
+    {
+      set_elt_property ("transparent", SCM_BOOL_T);
+    }
   
-  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
-    symbol_ += "_change";
-  if (style == "transparent")
+  if (style == "transparent")  // UGH. JUNKME
     {
       set_elt_property ("transparent", SCM_BOOL_T);
-      set_empty (true, X_AXIS);
+      set_extent_callback (0, X_AXIS);
     }
 }
 
-/*
-  FIXME
-*/
-Clef_item::Clef_item()
-{
-  set_elt_property ("breakable", SCM_BOOL_T);
-
-  symbol_ = "treble";
-  y_position_i_ = -2;
-}
 
 void
 Clef_item::do_add_processing ()
@@ -53,24 +60,29 @@ Clef_item::do_add_processing ()
       Text_item *g =0;
 
       SCM octave_dir = remove_elt_property ("octave-dir");
-      if (octave_dir != SCM_UNDEFINED)
+      if (isdir_b (octave_dir))
        {
-         Direction d = Direction (gh_scm2int (octave_dir));
          g = new Text_item;
-         pscore_l_->typeset_element (g);
+         Side_position_interface spi (g);
+         spi.set_axis (Y_AXIS);
+         
+         pscore_l_->line_l_->typeset_element (g);
       
-         g->text_str_ = "8";
+         spi.add_support (this);
+         g->set_elt_property ("text", ly_str02scm ( "8"));
          g->set_elt_property ("style", gh_str02scm ("italic"));
          g->set_parent (this, Y_AXIS);
-         g->set_parent (this, X_AXIS);   
-
+         g->set_parent (this, X_AXIS);
+         
+         g->set_elt_property ("self-alignment-X", gh_int2scm (0));
+         g->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
+         g->add_offset_callback (Side_position_interface::centered_on_parent, X_AXIS);
+
+         g->set_elt_property ("direction", octave_dir);
+         
          add_dependency (g);   // just to be sure.
-
-         Real r = do_height ()[d] - g->extent (Y_AXIS)[-d];
-         g->dim_cache_[Y_AXIS]->set_offset (r);
-
          SCM my_vis = get_elt_property ("visibility-lambda");
-         if (my_vis != SCM_UNDEFINED)
+         if (gh_procedure_p (my_vis))
            g->set_elt_property ("visibility-lambda", my_vis);
                        
        }
@@ -78,13 +90,4 @@ Clef_item::do_add_processing ()
     }
 }
 
-Molecule*
-Clef_item::do_brew_molecule_p() const
-{
-  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
-  return output;
-}
-
-
-