X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=a1f8a38144fb6f9bd94b05a5476a1c690f907d3e;hb=refs%2Fheads%2Fbugs%2F567849;hp=93717f10e2229c115f444278000a0723311bcff9;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 93717f10e2..a1f8a38144 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,31 +1,42 @@ -/* - time-signature.cc -- implement Time_signature - - source file of the GNU LilyPond music typesetter - - (c) 1996--2005 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1996--2011 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-item.hh" -#include "output-def.hh" +#include "grob.hh" #include "font-interface.hh" -#include "warn.hh" +#include "international.hh" +#include "output-def.hh" #include "staff-symbol-referencer.hh" +#include "text-interface.hh" +#include "warn.hh" /* TODO: 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 +58,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 (); } @@ -55,7 +66,7 @@ Time_signature::print (SCM smob) 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 = ly_scm2string (scm_symbol_to_string (scm_style)); if (style == "numbered") return numbered_time_signature (me, n, d); @@ -66,14 +77,12 @@ 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))) - { - 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); @@ -81,35 +90,35 @@ 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 ("fetaText"))), chain); - - SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain, - 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 sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, + ly_string2scm (to_string (num))); + SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain, + ly_string2scm (to_string (den))); Stencil n = *unsmob_stencil (sn); Stencil d = *unsmob_stencil (sd); - + n.align_to (X_AXIS, CENTER); d.align_to (X_AXIS, CENTER); 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,33 +127,35 @@ 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"); +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 " + );