(Automatic staff changes):

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index f6d2cd81c533a7e01fe911852d3bdd7df75485b6..56f191d887422181d500309c9f3964178d9cde64 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -11,7 +11,7 @@
 #include "stencil.hh"
 #include "text-item.hh"
 #include "time-signature.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
@@ -34,24 +34,20 @@ Time_signature::print (SCM smob)
   SCM frac = me->get_property ("fraction");
   int n = 4;
   int d = 4;
-  if (is_pair (frac))
+  if (ly_c_pair_p (frac))
     {
       n = ly_scm2int (ly_car (frac));
       d = ly_scm2int (ly_cdr (frac));
     }
 
   Stencil m;
-  if (is_symbol (st))
+  if (st == ly_symbol2scm ("single-digit"))
     {
-      String style (ly_scm2string (scm_symbol_to_string (st)));
-      if (style[0]=='1')
-       {
-         m = numbered_time_signature (me, n, 0);
-       }
-      else
-       {
-         m = special_time_signature (me, st, n, d);
-       }
+      m = numbered_time_signature (me, n, 0);
+    }
+  else if (ly_c_symbol_p (st))
+    {
+      m = special_time_signature (me, st, n, d);
     }
   else
     m = numbered_time_signature (me, n,d);
@@ -141,7 +137,7 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        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"
+"      @item @code{neomensural}\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"
@@ -151,10 +147,9 @@ ADD_INTERFACE (Time_signature, "time-signature-interface",
 "        typeset with mensural style mensuration marks.  All other time\n"
 "        signatures are written with two digits.\n"
 "\n"
-"      @item @code{1xxx}\n"
+"      @item @code{single-digit}\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"
+"        digit, e.g. 3/2 is written as 3.\n"
 "    @end table\n"
 "\n"
 "See also the test-file @file{input/test/time.ly}.\n",