X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=89f20278bfbe35290e836e61a851e2af1313c772;hb=8848da24e00c75d7de626b2ecc409fb45e87ce4a;hp=a0f26e6c859201fe8431434b7776808f24161b73;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index a0f26e6c85..89f20278bf 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,18 +1,29 @@ /* - 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--2012 Han-Wen Nienhuys - (c) 1996--2006 Han-Wen Nienhuys + 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 . */ #include "time-signature.hh" -#include "text-interface.hh" -#include "output-def.hh" +#include "grob.hh" #include "font-interface.hh" -#include "warn.hh" -#include "staff-symbol-referencer.hh" +#include "international.hh" +#include "output-def.hh" +#include "text-interface.hh" /* TODO: @@ -44,42 +55,39 @@ Time_signature::print (SCM smob) else 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 (); } Stencil Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) { - String style = ly_scm2string (scm_symbol_to_string (scm_style)); + string style = robust_symbol2string (scm_style, "default"); if (style == "numbered") return numbered_time_signature (me, n, d); if ((style == "default") || (style == "")) - style = to_string ("C"); + 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); + (((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); + string char_name = style + ::to_string (n) + ::to_string (d); me->set_property ("font-encoding", ly_symbol2scm ("fetaMusic")); Stencil out = Font_interface::get_default_font (me) - ->find_by_name ("timesig." + char_name); + ->find_by_name ("timesig." + char_name); if (!out.is_empty ()) 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)); + "reverting to numbered style", char_name)); return numbered_time_signature (me, n, d); } @@ -88,13 +96,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"))), - chain); + ly_symbol2scm ("fetaText"))), + chain); SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, - scm_makfrom0str (to_string (num).to_str0 ())); + ly_string2scm (::to_string (num))); SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, - scm_makfrom0str (to_string (den).to_str0 ())); + ly_string2scm (::to_string (den))); Stencil n = *unsmob_stencil (sn); Stencil d = *unsmob_stencil (sd); @@ -104,8 +112,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 { @@ -118,29 +126,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" - "\n" - "See also the test-file @file{input/test/time.ly}.\n", - "fraction style"); +ADD_INTERFACE (Time_signature, + "A time signature, in different styles. The following values" + " for @code{style} are are recognized:\n" + "\n" + "@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 " + );