release: 1.3.47

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index f10fbb17b919f7d8ffcebda6f668ef09d184dbaa..f0a8b8566f9d8175ae8bd1b423f2a4798ca33873 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,81 +3,52 @@
 
   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 (y_position_i_ * staff_line_leading_f () / 2.0);
-  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()
-{
-  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
-  default_b_ = false;
-  change_b_ = true;
-  octave_dir_ = CENTER;
-  symbol_ = "treble";
-  y_position_i_ = -2;
-}
-
-void
-Clef_item::do_add_processing ()
-{
-  if (!break_status_dir ())    // broken stuff takes care of their own texts
+  SCM glyph = get_elt_property ("glyph");
+  if (gh_string_p (glyph))
     {
-      SCM defvis = gh_eval_str ("(lambda (d) (if (= d 1) '(#f . #f) '(#t . #t)))");
-      G_text_item *g =0;
-      if (octave_dir_)
+      String s = ly_scm2string (glyph);
+       
+      if (break_status_dir() != RIGHT && style != "fullSizeChanges")
        {
-         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);
-       }
-      
-      if (default_b_)
-       {
-         set_elt_property (visibility_lambda_scm_sym,
-                           defvis);
-
-         if (g)
-           g->set_elt_property (visibility_lambda_scm_sym,
-                                defvis);
+         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);
     }
-}
-
-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;
 }