X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=1beda1696c3d919a41cf42fbfede6d7297ccc8c0;hb=60d641c51caa5a53b185d40b6f6825417670887e;hp=4a6f5929343d15419f5b05c43cc75add8dc086ea;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 4a6f592934..1beda1696c 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,104 +1,120 @@ -/* - time-signature.cc -- implement Time_signature - - source file of the GNU LilyPond music typesetter - - (c) 1996--2002 Han-Wen Nienhuys - - */ - - -#include "molecule.hh" -#include "text-item.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1996--2010 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 "paper-def.hh" + +#include "grob.hh" #include "font-interface.hh" +#include "international.hh" +#include "output-def.hh" +#include "staff-symbol-referencer.hh" +#include "text-interface.hh" +#include "warn.hh" -MAKE_SCHEME_CALLBACK (Time_signature,brew_molecule,1); /* - TODO: make different functions for special and normal timesigs. - */ + TODO: + + this file should go ; The formatting can completely be done with + markups. +*/ + +MAKE_SCHEME_CALLBACK (Time_signature, print, 1); SCM -Time_signature::brew_molecule (SCM smob) +Time_signature::print (SCM smob) { - Grob * me = unsmob_grob (smob); - SCM st = me->get_grob_property ("style"); - SCM frac = me->get_grob_property ("fraction"); + Grob *me = unsmob_grob (smob); + SCM st = me->get_property ("style"); + SCM frac = me->get_property ("fraction"); int n = 4; int d = 4; - if (gh_pair_p (frac)) + if (scm_is_pair (frac)) { - n = gh_scm2int (ly_car (frac)); - d = gh_scm2int (ly_cdr (frac)); + n = scm_to_int (scm_car (frac)); + d = scm_to_int (scm_cdr (frac)); } - - if (gh_symbol_p (st)) - { - String style (ly_scm2string (scm_symbol_to_string (st))); - if (style[0]=='1') - { - return time_signature (me, n, 0).smobbed_copy (); - } - else - { - return special_time_signature (me, style, n, d).smobbed_copy (); - } - } + Stencil m; + if (st == ly_symbol2scm ("single-digit")) + m = numbered_time_signature (me, n, 0); + else if (scm_is_symbol (st)) + m = special_time_signature (me, st, n, d); else - return time_signature (me, n,d).smobbed_copy (); + 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 (); } -Molecule -Time_signature::special_time_signature (Grob*me, String s, int n, int d) +Stencil +Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) { - /* - Randomly probing the font sucks? - */ - - SCM alist_chain = Font_interface::font_alist_chain (me); - - SCM style_chain = - Font_interface::add_style (me, ly_symbol2scm ("timesig-symbol"), - alist_chain); - - Font_metric *feta = Font_interface::get_font (me, style_chain); - - /* - First guess: s contains only the signature style, append fraction. - */ - String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d); - - Molecule m = feta->find_by_name (symbolname); - if (!m.empty_b ()) - return m; - - /* - Second guess: s contains the full signature name - */ - m = feta->find_by_name ("timesig-" + s); - if (!m.empty_b ()) - return m; - - // Resort to default layout with numbers - return time_signature (me, n, d); -} + string style = ly_scm2string (scm_symbol_to_string (scm_style)); + if (style == "numbered") + return numbered_time_signature (me, n, d); -Molecule -Time_signature::time_signature (Grob*me,int num, int den) + if ((style == "default") || (style == "")) + 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); + } + + 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); + 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)); + return numbered_time_signature (me, n, d); +} + +Stencil +Time_signature::numbered_time_signature (Grob *me, int num, int den) { - SCM chain = Font_interface::font_alist_chain (me); - - Molecule n = Text_item::text2molecule (me, - ly_str02scm (to_str (num).ch_C ()), - chain); - Molecule d = Text_item::text2molecule (me, - ly_str02scm (to_str (den).ch_C ()), - chain); + 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 ("fetaText"))), + chain); + + 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); - Molecule m; + Stencil m; if (den) { m.add_at_edge (Y_AXIS, UP, n, 0.0); @@ -109,6 +125,37 @@ Time_signature::time_signature (Grob*me,int num, int den) m = n; m.align_to (Y_AXIS, CENTER); } + + m.align_to (X_AXIS, LEFT); + return m; } +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 " + );