release: 1.3.47

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 927d3f2335f15dc7f3c8e3cb024db6aa22a94183..f0a8b8566f9d8175ae8bd1b423f2a4798ca33873 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,69 +3,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
 #include "clef-item.hh"
 #include "string.hh"
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "clef-grav.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 ()
 {
-  change_b_ = ! (break_status_i() == 1);
+  SCM style_sym =get_elt_property ("style");
+  String style;
+  if (gh_string_p (style_sym))
+    style = ly_scm2string (style_sym);
 
-  if (default_b_)
+  SCM glyph = get_elt_property ("glyph");
+  if (gh_string_p (glyph))
     {
-      set_empty(break_status_i() != 1);
-      transparent_b_ = (break_status_i() != 1);
+      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);
     }
 }
 
-Clef_item::Clef_item()
-{
-  breakable_b_ =true;
-  default_b_ = false;
-  change_b_ = true;
-  read ("violin");
-}
-
-void
-Clef_item::read (String t)
-{
-  symbol_= t;
-  if (t == "violin")
-    y_position_i_ = -2;
-  if (t == "alto")
-    y_position_i_ = 0;
-  if (t == "tenor") {
-    symbol_="alto";
-    y_position_i_ = 2;
-  }
-  if (t == "bass")
-    y_position_i_ = 2;
-}
-void
-Clef_item::read (Clef_engraver const &k)
-{
-  read (k.clef_type_str_);
-}
-
-Molecule*
-Clef_item::brew_molecule_p() const
-{
-  String t = symbol_;
-  if  (change_b_)
-    t += "_change";
-  Atom s = paper()->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);