X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=b92028b161e018ef3c56f30c110a83b0d08a08cc;hb=508a9588e53be24ee4d4fd0c905152b4929d85ea;hp=e360f810338d36c95d797b6d220a65d26f0db9b9;hpb=baf32731650d510882eeb52d02f4ca0c816c7c29;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index e360f81033..b92028b161 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,14 +1,14 @@ /* - time-signature.cc -- implement Time_signature + time-signature.cc -- implement Time_signature source file of the GNU LilyPond music typesetter - (c) 1996--2002 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys */ -#include "molecule.hh" +#include "stencil.hh" #include "text-item.hh" #include "time-signature.hh" #include "paper-def.hh" @@ -16,16 +16,22 @@ #include "warn.hh" #include "staff-symbol-referencer.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"); + SCM st = me->get_property ("style"); + SCM frac = me->get_property ("fraction"); int n = 4; int d = 4; if (gh_pair_p (frac)) @@ -34,21 +40,21 @@ Time_signature::brew_molecule (SCM smob) d = gh_scm2int (ly_cdr (frac)); } - Molecule m; + Stencil m; if (gh_symbol_p (st)) { String style (ly_scm2string (scm_symbol_to_string (st))); if (style[0]=='1') { - m = time_signature (me, n, 0); + m = numbered_time_signature (me, n, 0); } else { - m = special_time_signature (me, style, n, d); + m = special_time_signature (me, st, n, d); } } else - m = time_signature (me, n,d); + 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); @@ -56,64 +62,64 @@ Time_signature::brew_molecule (SCM smob) 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); + String style = ly_scm2string (scm_symbol_to_string (scm_style)); - Font_metric *feta = Font_interface::get_font (me, style_chain); + if (style == "numbered") + return numbered_time_signature (me, n, d); - /* - First guess: s contains only the signature style, append fraction. - */ - String symbolname = "timesig-" + s + to_string (n) + "/" + to_string (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); - m.align_to (X_AXIS, LEFT); - if (!m.empty_b ()) - return m; - - /* - If there is no such symbol, we default without warning to the - numbered style. - */ - return time_signature (me, n, d); -} + 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-family", ly_symbol2scm ("music")); + 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); +} -Molecule -Time_signature::time_signature (Grob*me,int num, int den) +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, - scm_makfrom0str (to_string (num).to_str0 ()), - chain); - Molecule d = Text_item::text2molecule (me, - scm_makfrom0str (to_string (den).to_str0 ()), - chain); + me->set_property ("font-family", ly_symbol2scm ("number")); + +SCM sn = + Text_item::interpret_markup (me->get_paper ()->self_scm (), chain, + scm_makfrom0str (to_string (num).to_str0 ())); +SCM sd = + Text_item::interpret_markup (me->get_paper ()->self_scm (), chain, + 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); - Molecule m; + Stencil m; if (den) { - m.add_at_edge (Y_AXIS, UP, n, 0.0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0); + m.add_at_edge (Y_AXIS, UP, n, 0.0, 0); + m.add_at_edge (Y_AXIS, DOWN, d, 0.0,0); } else { @@ -126,34 +132,30 @@ Time_signature::time_signature (Grob*me,int num, int den) return m; } - - -ADD_INTERFACE (Time_signature,"time-signature-interface", - "A time signature, in different styles. - The following values for 'style are are recognized: - - @table @samp - @item @code{C} - 4/4 and 2/2 are typeset as C and struck C, respectively. All - other time signatures are written with two digits. - - @item @code{old} - 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are - typeset with old-style mensuration marks. All other time - signatures are written with two digits. - - @item @code{1xxx} - All time signatures are typeset with a single - digit, e.g. 3/2 is written as 3. (Any symbol starting - with the digit @code{1} will do.) - - @item @code{C}@var{M}@code{/}@var{N}, -@code{old}@var{M}@code{/}@var{N} or - @code{old6/8alt} - Tells LilyPond to use a specific symbol as time signature, - regardless of the actual time signature. - @end table - -See also the test-file @file{input/test/time.ly}. -", +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{neo_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 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{1xxx}\n" +" All time signatures are typeset with a single\n" +" digit, e.g. 3/2 is written as 3. (Any symbol starting\n" +" with the digit @code{1} will do.)\n" +" @end table\n" +"\n" +"See also the test-file @file{input/test/time.ly}.\n", "fraction style");