X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=d560b8d226ccd426fde05f2b1ad9889d9c6a94ee;hb=ea20c95eec3f834ef7d63da4c31bf23bcd80ff28;hp=93717f10e2229c115f444278000a0723311bcff9;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 93717f10e2..d560b8d226 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,11 +1,10 @@
-/*   
+/*
   time-signature.cc -- implement Time_signature
-  
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "time-signature.hh"
 
@@ -20,12 +19,11 @@
 
   this file should go ; The formatting can completely be done with
   markups.
-  
- */
+*/
 
 MAKE_SCHEME_CALLBACK (Time_signature, print, 1);
 SCM
-Time_signature::print (SCM smob) 
+Time_signature::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   SCM st = me->get_property ("style");
@@ -47,7 +45,7 @@ Time_signature::print (SCM smob)
     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);
+    m.translate_axis (Staff_symbol_referencer::staff_space (me) / 2, Y_AXIS);
 
   return m.smobbed_copy ();
 }
@@ -66,8 +64,8 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
   if (style == "C")
     {
       if /* neither C2/2 nor C4/4 */
-	(((n != 2) || (d != 2)) && 
-	 ((n != 4) || (d != 4)))
+	(((n != 2) || (d != 2))
+	 && ((n != 4) || (d != 4)))
 	{
 	  return numbered_time_signature (me, n, d);
 	}
@@ -81,28 +79,28 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
     return out;
 
   /* If there is no such symbol, we default to the numbered style.
-    (Here really with a warning!) */
+     (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);
 }
 
 Stencil
-Time_signature::numbered_time_signature (Grob*me, int num, int den)
+Time_signature::numbered_time_signature (Grob *me, int num, int den)
 {
   SCM chain = me->get_property_alist_chain (Font_interface::text_font_alist_chain (me));
   chain = scm_cons (scm_list_1 (scm_cons (ly_symbol2scm ("font-encoding"),
-					 ly_symbol2scm ("fetaNumber"))),
+					  ly_symbol2scm ("fetaNumber"))),
 		    chain);
-				
+
   SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
-					scm_makfrom0str (to_string (num).to_str0 ()));
+					     scm_makfrom0str (to_string (num).to_str0 ()));
   SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
-					scm_makfrom0str (to_string (den).to_str0 ()));
+					     scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);
   Stencil d = *unsmob_stencil (sd);
-			      
+
   n.align_to (X_AXIS, CENTER);
   d.align_to (X_AXIS, CENTER);
   Stencil m;
@@ -118,33 +116,33 @@ Time_signature::numbered_time_signature (Grob*me, int num, int den)
     }
 
   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{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"
-"\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{single-digit}\n"
-"        All time signatures are typeset with a single\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",
-  "fraction style");
+	       "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{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"
+	       "\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{single-digit}\n"
+	       "        All time signatures are typeset with a single\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",
+	       "fraction style");