X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftime-signature.cc;h=3382380da9b721ed7fdc7b11b810189c1ecc6c75;hb=955f829883aa125b2b633b1e71f6256da5b773fa;hp=b6190fa95aa0038d53b41398bde9e54645ac9390;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index b6190fa95a..3382380da9 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,40 +3,146 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2003 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 = numbered_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, st, n, d);
 	}
     }
   else
-    return new Molecule(lookup_l ()->time_signature (args_[0], args_[1]));
+    m = numbered_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, SCM scm_style, int n, int d)
+{
+  String style = ly_scm2string (scm_symbol_to_string (scm_style));
+
+  if (style == "numbered")
+    return numbered_time_signature (me, n, d);
 
+  if ((style == "default") || (style == ""))
+    style = to_string ("C");
+
+  if (style == "C")
+    {
+      if /* neither C2/2 nor C4/4 */
+	(((n != 2) || (d != 2)) && 
+	 ((n != 4) || (d != 4)))
+	{
+	  return numbered_time_signature (me, n, d);
+	}
+    }
 
+  String char_name = style + to_string (n) + "/" + to_string (d);
+  me->set_grob_property ("font-family", ly_symbol2scm ("music"));
+  Molecule out = Font_interface::get_default_font (me)
+    ->find_by_name ("timesig-" + char_name);
+  if (!out.empty_b ())
+    return out;
+
+  /* If there is no such symbol, we default to the numbered style.
+    (Here really with a warning!) */
+  me->warning (_f ("time signature symbol `%s' not found; "
+		   "reverting to numbered style", char_name));
+  return numbered_time_signature (me, n, d);
+}
+
+Molecule
+Time_signature::numbered_time_signature (Grob*me,int num, int den)
+{
+  SCM chain = Font_interface::font_alist_chain (me);
+  me->set_grob_property ("font-family", ly_symbol2scm ("number"));
+
+  Molecule n =
+    Text_item::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (num).to_str0 ()));
+			      
+  Molecule d =
+    Text_item::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (den).to_str0 ()));
+  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, 0);
+      m.add_at_edge (Y_AXIS, DOWN, d, 0.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.\n"
+"  The following values for 'style are are recognized:\n"
+"\n"
+"    @table @samp\n"
+"      @item @code{C}\n"
+"        4/4 and 2/2 are typeset as C and struck C, respectively.  All\n"
+"        other time signatures are written with two digits.\n"
+"\n"
+"      @item @code{neo_mensural}\n"
+"        2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are\n"
+"        typeset with neo-mensural style mensuration marks.  All other time\n"
+"        signatures are written with two digits.\n"
+"\n"
+"      @item @code{mensural}\n"
+"        2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are\n"
+"        typeset with mensural style mensuration marks.  All other time\n"
+"        signatures are written with two digits.\n"
+"\n"
+"      @item @code{1xxx}\n"
+"        All time signatures are typeset with a single\n"
+"        digit, e.g. 3/2 is written as 3. (Any symbol starting\n"
+"	with the digit @code{1} will do.)\n"
+"    @end table\n"
+"\n"
+"See also the test-file @file{input/test/time.ly}.\n",
+  "fraction style");