release: 1.3.47

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

diff --git a/lily/clef-item.cc b/lily/clef-item.cc
index 528623eed6820867c59101dfcede25efb8900145..f0a8b8566f9d8175ae8bd1b423f2a4798ca33873 100644 (file)
--- a/lily/clef-item.cc
+++ b/lily/clef-item.cc
@@ -1,54 +1,55 @@
 /*
   clef-item.cc -- implement Clef_item
 
-  source file of the LilyPond music typesetter
+  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-reg.hh"
-
-
-
-Clef_item::Clef_item()
-{
-    change = true;
-    read("violin");
-}
+#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::read(String t)
+Clef_item::before_line_breaking ()
 {
-    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_register const &k)
-{
-    read(k.clef_type_str_);
+  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))
+    {
+      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);
+    }
 }
 
-Molecule*
-Clef_item::brew_molecule_p()const
-{
-    String t = type;
-    if  (change)
-       t += "_change";
-    Symbol s = paper()->lookup_p_->clef(t);
-    Molecule*output = new Molecule(Atom(s));
-    output->translate(Offset(0, paper()->internote() * y_off));
-    return output;
-}
+