release: 1.3.56

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 7e399f37c32e3c7dba5287d68a99415d0130cb3c..770694061d82b7744002573d4a77a0a3eac2fbdf 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -3,65 +3,62 @@
 
   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"
+
+Clef_item::Clef_item (SCM s)
+  : Item (s)
+{}
 
 
+/*
+FIXME: should use symbol.
+
+FIXME: this should be schemified.
+*/
 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_){
-       empty_b_ = (break_status_i() != 1);
-       transparent_b_ = (break_status_i() != 1);
+  SCM glyph = get_elt_property ("glyph");
+  
+  if (gh_string_p (glyph))
+    {
+      String s = ly_scm2string (glyph);
+
+      /*
+       FIXME: should use fontsize property to set clef changes.
+       */
+      if (get_elt_property ("non-default") &&
+         break_status_dir() != RIGHT && style != "fullSizeChanges")
+       {
+         s += "_change";
+         set_elt_property ("glyph", ly_str02scm (s.ch_C()));     
+       }
+    }
+  else
+    {
+      suicide ();
+      return;
     }
-}
 
-Clef_item::Clef_item()
-{
-    default_b_ = false;
-    change_b_ = true;
-    read("violin");
+  // ugh. 
+  if (style == "transparent")  // UGH. JUNKME
+    {
+      set_elt_property ("molecule-callback", SCM_BOOL_T);
+      set_extent_callback (0, X_AXIS);
+    }
 }
 
-void
-Clef_item::read(String t)
-{
-    type_= t;
-    if (type_ == "violin")
-       y_off = 2;
-    if (type_ == "alto")
-       y_off = 4;
-    if (type_ == "tenor")
-       y_off = 6;
-    if (type_ == "bass")
-       y_off = 6;
-}
-void
-Clef_item::read(Clef_engraver const &k)
-{
-    read(k.clef_type_str_);
-}
 
-Molecule*
-Clef_item::brew_molecule_p()const
-{
-    String t = type_;
-    if  (change_b_)
-       t += "_change";
-    Symbol s = paper()->lookup_l()->clef(t);
-    Molecule*output = new Molecule(Atom(s));
-    output->translate_y( paper()->internote_f() * y_off);
-    return output;
-}
 
-IMPLEMENT_STATIC_NAME(Clef_item);
-IMPLEMENT_IS_TYPE_B1(Clef_item,Item);