release: 1.3.44

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 08eb9ea4c4f94ecfaec3795179f1d95e6aa96781..af14a41828c35d82ab9509bc4b608b1ec8e6d5fa 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,82 +3,91 @@
 
   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"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "g-text-item.hh"
-#include "p-score.hh"
+#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 ()
 {
-  dim_cache_[Y_AXIS].translate (paper()->internote_f () * y_position_i_);
-  change_b_ = (break_status_dir() != RIGHT);
-}
+  SCM style_sym =get_elt_property ("style");
+  String style;
+  if (gh_string_p (style_sym))
+    style = ly_scm2string (style_sym);
 
-/*
-  FIXME
-*/
-Clef_item::Clef_item()
-{
-  breakable_b_ =true;
-  default_b_ = false;
-  change_b_ = true;
-  octave_dir_ = CENTER;
-  symbol_ = "treble";
-  y_position_i_ = -2;
+  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 (style == "transparent")  // UGH. JUNKME
+    {
+      set_elt_property ("transparent", SCM_BOOL_T);
+      set_extent_callback (0, X_AXIS);
+    }
 }
 
+
 void
 Clef_item::do_add_processing ()
 {
-  if (!break_status_dir_)      // broken stuff takes care of their own texts
+  if (!break_status_dir ())    // broken stuff takes care of their own texts
     {
-      SCM defvis = gh_eval_str ("(lambda (d) (if (= d 1) '(#f . #f) '(#t . #t)))");
-      G_text_item *g =0;
-      if (octave_dir_)
+      Text_item *g =0;
+
+      SCM octave_dir = remove_elt_property ("octave-dir");
+      if (isdir_b (octave_dir))
        {
-         g = new G_text_item;
-         pscore_l_->typeset_element (g);
+         g = new Text_item;
+         Side_position_interface spi (g);
+         spi.set_axis (Y_AXIS);
+         
+         pscore_l_->line_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.
+         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_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);
 
-         Real r = do_height ()[octave_dir_] + g->extent (Y_AXIS)[-octave_dir_];
-         g->dim_cache_[Y_AXIS].set_offset (r);
+         g->set_elt_property ("direction", octave_dir);
+         
+         add_dependency (g);   // just to be sure.
+         SCM my_vis = get_elt_property ("visibility-lambda");
+         if (gh_procedure_p (my_vis))
+           g->set_elt_property ("visibility-lambda", my_vis);
+                       
        }
-      
-      if (default_b_)
-       {
-         set_elt_property (ly_symbol ("visibility_lambda"),
-                           defvis);
 
-         if (g)
-           g->set_elt_property (ly_symbol ("visibility_lambda"),
-                                defvis);
-       }
     }
 }
 
-Molecule*
-Clef_item::do_brew_molecule_p() const
-{
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-
-  Molecule*output = new Molecule (lookup_l ()->clef (t));
-  return output;
-}
-
-