* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index d3f496b6113a04da022acd936dd4e81d64a8c5e8..e66adfc8d4214b6776b28bf66a5cc66de2368757 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -40,15 +40,15 @@ Time_signature::brew_molecule (SCM smob)
       String style (ly_scm2string (scm_symbol_to_string (st)));
       if (style[0]=='1')
        {
-         m = time_signature (me, n, 0);
+         m = numbered_time_signature (me, n, 0);
        }
       else
        {
-         m = special_time_signature (me, style, n, d);
+         m = special_time_signature (me, st, n, d);
        }
     }
   else
-    m = time_signature (me, n,d);
+    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);
@@ -57,55 +57,53 @@ Time_signature::brew_molecule (SCM smob)
 }
 
 Molecule
-Time_signature::special_time_signature (Grob*me, String s, int n, int d)
+Time_signature::special_time_signature (Grob *me, SCM scm_style, 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);
+  String style = ly_scm2string (scm_symbol_to_string (scm_style));
 
-  Font_metric *feta = Font_interface::get_font (me, style_chain);
+  if (style == "numbered")
+    return numbered_time_signature (me, n, d);
 
-  /*
-    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;
+  if ((style == "default") || (style == ""))
+    style = to_string ("C");
 
-  /*
-    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 (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 without warning to the
-    numbered style.
-   */
-  return time_signature (me, n, d);
+    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::time_signature (Grob*me,int num, int den)
+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::text2molecule (me,
-                                        ly_str02scm (to_string (num).to_str0 ()),
+                                        scm_makfrom0str (to_string (num).to_str0 ()),
                                         chain);
   Molecule d = Text_item::text2molecule (me,
-                                        ly_str02scm (to_string (den).to_str0 ()),
+                                        scm_makfrom0str (to_string (den).to_str0 ()),
                                         chain);
   n.align_to (X_AXIS, CENTER);
   d.align_to (X_AXIS, CENTER);
@@ -126,8 +124,6 @@ Time_signature::time_signature (Grob*me,int num, int den)
   return m;
 }
 
-
-
 ADD_INTERFACE (Time_signature,"time-signature-interface",
   "A time signature, in different styles.
   The following values for 'style are are recognized:
@@ -137,21 +133,20 @@ ADD_INTERFACE (Time_signature,"time-signature-interface",
         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}
+      @item @code{neo_mensural}
         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
+        typeset with neo-mensural style mensuration marks.  All other time
+        signatures are written with two digits.
+
+      @item @code{mensural}
+        2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are
+        typeset with mensural 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}.