X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=1beda1696c3d919a41cf42fbfede6d7297ccc8c0;hb=ace881437adc0146a62cffa3255ac1ca169bd054;hp=26860c688fcac9d6c1267c089f9136bc7fb1a468;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 26860c688f..1beda1696c 100644
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,13 +1,25 @@
 /*
-  time-signature.cc -- implement Time_signature
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "time-signature.hh"
 
+#include "grob.hh"
 #include "font-interface.hh"
 #include "international.hh"
 #include "output-def.hh"
@@ -89,13 +101,13 @@ 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 ("fetaText"))),
 		    chain);
 
   SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
-					     scm_makfrom0str (to_string (num).c_str ()));
+					     ly_string2scm (to_string (num)));
   SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
-					     scm_makfrom0str (to_string (den).c_str ()));
+					     ly_string2scm (to_string (den)));
 
   Stencil n = *unsmob_stencil (sn);
   Stencil d = *unsmob_stencil (sd);
@@ -105,8 +117,8 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
   Stencil 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);
+      m.add_at_edge (Y_AXIS, UP, n, 0.0);
+      m.add_at_edge (Y_AXIS, DOWN, d, 0.0);
     }
   else
     {
@@ -119,29 +131,31 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
   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"
+ADD_INTERFACE (Time_signature,
+	       "A time signature, in different styles.  The following values"
+	       " for @code{style} are are recognized:\n"
 	       "\n"
-	       "See also the test-file @file{input/test/time.ly}.\n",
-	       "fraction style");
+	       "@table @code\n"
+	       "@item C\n"
+	       "4/4 and 2/2 are typeset as C and struck C, respectively."
+	       "  All other time signatures are written with two digits."
+	       "  The value @code{default} is equivalent to @code{C}.\n"
+	       "@item neomensural\n"
+	       "2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8, and 9/8 are"
+	       " typeset with neo-mensural style mensuration marks.  All"
+	       " other time signatures are written with two digits.\n"
+	       "@item mensural\n"
+	       "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.\n"
+	       "@item single-digit\n"
+	       "All time signatures are typeset with a single digit, e.g.,"
+	       " 3/2 is written as 3.\n"
+	       "@item numbered\n"
+	       "All time signatures are typeset with two digits.\n"
+	       "@end table",
+
+	       /* properties */
+	       "fraction "
+	       "style "
+	       );