X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=2f96d04f7e0012069b73eb7db115de8f916cbe80;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=58adb32966a6de49a4a4b5bfb0e41cc60da9cd46;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 58adb32966..2f96d04f7e 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,44 +3,112 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "scalar.hh"
+
 #include "molecule.hh"
+#include "text-item.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
 
-Time_signature::Time_signature ()
+MAKE_SCHEME_CALLBACK (Time_signature,brew_molecule,1);
+/*
+  TODO: make different functions for special and normal timesigs.
+ */
+SCM
+Time_signature::brew_molecule (SCM smob) 
 {
-  breakable_b_ = true;
-}
+  Grob * me = unsmob_grob (smob);
+  SCM st = me->get_grob_property ("style");
+  SCM frac = me->get_grob_property ("fraction");
+  int n = 4;
+  int d = 4;
+  if (gh_pair_p (frac))
+    {
+      n = gh_scm2int (ly_car (frac));
+      d = gh_scm2int (ly_cdr (frac));
+    }
 
-Molecule*
-Time_signature::brew_molecule_p () const
-{
-  Atom s;
-  if (time_sig_type_str_.length_i ())
+  
+  if (gh_symbol_p (st))
     {
-      if (time_sig_type_str_[0]=='1')
+      String style (ly_scm2string (scm_symbol_to_string (st)));
+      if (style[0]=='1')
 	{
-	  Array<int> tmparr = args_;
-	  tmparr[1]= 0;
-	  s = lookup_l ()->time_signature (tmparr);
+	  return time_signature (me, n, 0).smobbed_copy ();
 	}
       else
 	{
-	  s = lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_);
+	  return special_time_signature (me, style, n, d).smobbed_copy ();
 	}
     }
   else
-    s = lookup_l ()->time_signature (args_);
-  s.translate_axis (-s.extent ()[Y_AXIS].center (), Y_AXIS);
-  return new Molecule (Atom (s));
+    return time_signature (me, n,d).smobbed_copy ();
+}
+
+Molecule
+Time_signature::special_time_signature (Grob*me, String s, int n, int d)
+{
+  /*
+    Randomly probing the font sucks?
+  */
+  
+  SCM alist_chain = Font_interface::font_alist_chain (me);
+  
+  SCM style_chain =
+    Font_interface::add_style (me, ly_symbol2scm ("timesig-symbol"),
+			       alist_chain);
+
+  Font_metric *feta = Font_interface::get_font (me, style_chain);
+
+  /*
+    First guess: s contains only the signature style, append fraction.
+  */
+  String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
+  
+  Molecule m = feta->find_by_name (symbolname);
+  if (!m.empty_b ()) 
+    return m;
+
+  /*
+    Second guess: s contains the full signature name
+  */
+  m = feta->find_by_name ("timesig-" + s);
+  if (!m.empty_b ()) 
+    return m;
+
+  // Resort to default layout with numbers
+  return time_signature (me, n, d);
 }
 
 
+Molecule
+Time_signature::time_signature (Grob*me,int num, int den)
+{
+  SCM chain = Font_interface::font_alist_chain (me);
 
+  Molecule n = Text_item::text2molecule (me,
+					 ly_str02scm (to_str (num).ch_C ()),
+					 chain);
+  Molecule d = Text_item::text2molecule (me,
+					 ly_str02scm (to_str (den).ch_C ()),
+					 chain);
+  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;
+}