release: 1.3.56

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index a2d300f516a8b37018a3bdf5e3a4e6553354301f..770694061d82b7744002573d4a77a0a3eac2fbdf 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,81 +3,61 @@
 
   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"
 
-void
-Clef_item::do_pre_processing()
-{
-  dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0);
-  SCM style_sym =get_elt_property (style_scm_sym);
-  String style;
-  if (style_sym != SCM_BOOL_F)
-    style = ly_scm2string (SCM_CDR(style_sym));
-  
-  if (break_status_dir() != RIGHT && style != "fullSizeChanges")
-    symbol_ += "_change";
-  if (style == "transparent")
-    set_elt_property (transparent_scm_sym, SCM_BOOL_T);
-}
+Clef_item::Clef_item (SCM s)
+  : Item (s)
+{}
 
-/*
-  FIXME
-*/
-Clef_item::Clef_item()
-{
-  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
 
-  symbol_ = "treble";
-  y_position_i_ = -2;
-}
+/*
+FIXME: should use symbol.
 
+FIXME: this should be schemified.
+*/
 void
-Clef_item::do_add_processing ()
+Clef_item::before_line_breaking ()
 {
-  if (!break_status_dir ())    // broken stuff takes care of their own texts
+  SCM style_sym =get_elt_property ("style");
+  String style;
+  if (gh_string_p (style_sym))
+    style = ly_scm2string (style_sym);
+
+  SCM glyph = get_elt_property ("glyph");
+  
+  if (gh_string_p (glyph))
     {
-      G_text_item *g =0;
+      String s = ly_scm2string (glyph);
 
-      SCM octave_dir = remove_elt_property (octave_dir_scm_sym);
-      if (octave_dir != SCM_BOOL_F)
+      /*
+       FIXME: should use fontsize property to set clef changes.
+       */
+      if (get_elt_property ("non-default") &&
+         break_status_dir() != RIGHT && style != "fullSizeChanges")
        {
-         Direction d = Direction (gh_scm2int (SCM_CDR(octave_dir)));
-         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 ()[d] + g->extent (Y_AXIS)[-d];
-         g->dim_cache_[Y_AXIS].set_offset (r);
-
-         SCM my_vis = get_elt_property (visibility_lambda_scm_sym);
-         if (my_vis != SCM_BOOL_F)
-           g->set_elt_property (visibility_lambda_scm_sym, SCM_CDR (my_vis));
-                       
+         s += "_change";
+         set_elt_property ("glyph", ly_str02scm (s.ch_C()));     
        }
-
     }
-}
+  else
+    {
+      suicide ();
+      return;
+    }
 
-Molecule*
-Clef_item::do_brew_molecule_p() const
-{
-  Molecule*output = new Molecule (lookup_l ()->clef (symbol_));
-  return output;
+  // ugh. 
+  if (style == "transparent")  // UGH. JUNKME
+    {
+      set_elt_property ("molecule-callback", SCM_BOOL_T);
+      set_extent_callback (0, X_AXIS);
+    }
 }