*** empty log message ***

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 2df4423e79c0b1aeda771849a84a1f332fce29b6..e360f810338d36c95d797b6d220a65d26f0db9b9 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,40 +3,157 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2002 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"
+#include "warn.hh"
+#include "staff-symbol-referencer.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::do_brew_molecule_p () const
-{
-  if (time_sig_type_str_.length_i ())
+  Molecule m;
+  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_;
-         return new Molecule( lookup_l ()->time_signature (args_[0], 0));
+         m = time_signature (me, n, 0);
        }
       else
        {
-         return new Molecule( lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_[0], args_[1]));
+         m = special_time_signature (me, style, n, d);
        }
     }
   else
-    return new Molecule(lookup_l ()->time_signature (args_[0], args_[1]));
+    m = time_signature (me, n,d);
+
+  if (Staff_symbol_referencer::line_count (me) % 2 == 0)
+    m.translate_axis (Staff_symbol_referencer::staff_space (me)/2 , Y_AXIS);
+
+  return m.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_string (n) + "/" + to_string (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,
+                                        scm_makfrom0str (to_string (num).to_str0 ()),
+                                        chain);
+  Molecule d = Text_item::text2molecule (me,
+                                        scm_makfrom0str (to_string (den).to_str0 ()),
+                                        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");