X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=892baf6950a0af041792ab26a02ac9795a210929;hb=71cc3b4a5adf79c361d2af39f1a361a36a03f273;hp=09e51cf2b00610cd11a76a66d8f3837d2fbfb725;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 09e51cf2b0..892baf6950 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,44 +3,151 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
 #include "molecule.hh"
+#include "text-item.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-interface.hh"
+#include "warn.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) 
 {
-  set_elt_property ("breakable", SCM_BOOL_T);
-}
+  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::do_brew_molecule_p () const
-{
-  SCM st = get_elt_property ("style");
   
-  if (gh_string_p (st))
+  if (gh_symbol_p (st))
     {
-      String style (ly_scm2string (st));
+      String style (ly_scm2string (scm_symbol_to_string (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).smobbed_copy ();
 	}
       else
 	{
-	  return new Molecule( lookup_l ()-> special_time_signature (style, args_[0], args_[1], paper_l ()));
+	  return special_time_signature (me, style, n, d).smobbed_copy ();
 	}
     }
   else
-    return new Molecule(lookup_l ()->time_signature (args_[0], args_[1],paper_l ()));
+    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);
+  m.align_to (X_AXIS, LEFT);
+  if (!m.empty_b ()) 
+    return m;
+
+  /*
+    If there is no such symbol, we default without warning to the
+    numbered style.
+   */
+  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);
+    }
+
+  m.align_to (X_AXIS, LEFT);
+  
+  return m;
 }
 
 
 
+ADD_INTERFACE (Time_signature,"time-signature-interface",
+  "A time signature, in different styles.
+  The following values for 'style are are recognized:
+
+    @table @samp
+      @item @code{C}
+        4/4 and 2/2 are typeset as C and struck C, respectively.  All
+        other time signatures are written with two digits.
+
+      @item @code{old}
+        2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are
+        typeset with old-style mensuration marks.  All other time
+        signatures are written with two digits.
+
+      @item @code{1xxx}
+        All time signatures are typeset with a single
+        digit, e.g. 3/2 is written as 3. (Any symbol starting
+	with the digit @code{1} will do.)
 
+      @item @code{C}@var{M}@code{/}@var{N}, 
+@code{old}@var{M}@code{/}@var{N} or
+      @code{old6/8alt}
+        Tells LilyPond to use a specific symbol as time signature, 
+	regardless of the actual time signature.
+    @end table
 
+See also the test-file @file{input/test/time.ly}.
+",
+  "fraction style");