release: 1.3.73

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 1f6234cd9cdc72a7a4be4b721d75d7f43088cf15..5cc5118cdb7dca1ae28c8a0a77feb4b528f22b76 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,33 +13,82 @@
 #include "paper-def.hh"
 #include "lookup.hh"
 
-Time_signature::Time_signature ()
-{
-  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
-}
+MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule);
 
-Molecule*
-Time_signature::do_brew_molecule_p () const
+SCM
+Time_signature::brew_molecule (SCM smob) 
 {
-  SCM st = get_elt_property (style_scm_sym);
+  Score_element * me = unsmob_element (smob);
+  SCM st = me->get_elt_property ("style");
+  SCM frac = me->get_elt_property ("fraction");
+  int n = 4;
+  int d = 4;
+  if (gh_pair_p (frac))
+    {
+      n = gh_scm2int (gh_car (frac));
+      d = gh_scm2int (gh_cdr (frac));
+    }
+
   
-  if (st != SCM_BOOL_F)
+  if (gh_string_p (st))
     {
-      String style (ly_scm2string (gh_cdr (st)));
+      String style (ly_scm2string (st));
       if (style[0]=='1')
        {
-         Array<int> tmparr = args_;
-         return new Molecule( lookup_l ()->time_signature (args_[0], 0, paper_l ()));
+         return time_signature (me, n, 0).create_scheme();
        }
       else
        {
-         return new Molecule( lookup_l ()-> special_time_signature (style, args_[0], args_[1], paper_l ()));
+         return special_time_signature (me, style, n, d).create_scheme();
        }
     }
   else
-    return new Molecule(lookup_l ()->time_signature (args_[0], args_[1],paper_l ()));
+    return time_signature (me, n,d).create_scheme();
+}
+
+Molecule
+Time_signature::special_time_signature (Score_element*me, String s, int n, int d)
+{
+  // First guess: s contains only the signature style
+  String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
+  
+  Molecule m = me->lookup_l ()->afm_find (symbolname, false);
+  if (!m.empty_b()) 
+    return m;
+
+  // Second guess: s contains the full signature name
+  m = me->lookup_l ()->afm_find ("timesig-"+s, false);
+  if (!m.empty_b ()) 
+    return m;
+
+  // Resort to default layout with numbers
+  return time_signature (me, n,d);
 }
 
 
+Molecule
+Time_signature::time_signature (Score_element*me,int num, int den)
+{
+  String sty = "timesig";
 
+  /*
+    UGH: need to look at fontsize.
+   */
+  Molecule n (me->lookup_l ()->text (sty, to_str (num), me->paper_l ()));
+  Molecule d (me->lookup_l ()->text (sty, to_str (den), me->paper_l ()));
+  n.align_to (X_AXIS, CENTER);
+  d.align_to (X_AXIS, CENTER);
+  Molecule m;
+  if (den)
+    {
+      m.add_at_edge (Y_AXIS, UP, n, 0.0);
+      m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
+    }
+  else
+    {
+      m = n;
+      m.align_to (Y_AXIS, CENTER);
+    }
+  return m;
+}