X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftime-signature.cc;h=5d98010035e38adbec9c2d09e0f705abb3cef632;hb=1402d6d957bee7d47e0bddf4c57dd89912182b26;hp=dd8e06682e62ec5c9ac7f64b84af874301ed32cd;hpb=b2a8b42e57aefbf1119ef2809950a35b81dc7d43;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index dd8e06682e..5d98010035 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,60 +1,56 @@ -/* - time-signature.cc -- implement Time_signature - +/* + time-signature.cc -- implement Time_signature + source file of the GNU LilyPond music typesetter - - (c) 1996--2003 Han-Wen Nienhuys - - */ + (c) 1996--2005 Han-Wen Nienhuys +*/ -#include "molecule.hh" -#include "text-item.hh" #include "time-signature.hh" -#include "paper-def.hh" + +#include "text-interface.hh" +#include "output-def.hh" #include "font-interface.hh" #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"); + 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)); } - Molecule m; - if (gh_symbol_p (st)) - { - String style (ly_scm2string (scm_symbol_to_string (st))); - if (style[0]=='1') - { - m = numbered_time_signature (me, n, 0); - } - else - { - m = special_time_signature (me, st, n, d); - } - } + 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 - m = numbered_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); + m.translate_axis (Staff_symbol_referencer::staff_space (me) / 2, Y_AXIS); return m.smobbed_copy (); } -Molecule +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)); @@ -68,46 +64,50 @@ 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))) + (((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_grob_property ("font-family", ly_symbol2scm ("music")); - Molecule out = Font_interface::get_default_font (me) - ->find_by_name ("timesig-" + char_name); - if (!out.empty_b ()) + 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!) */ + (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::numbered_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); - me->set_grob_property ("font-family", ly_symbol2scm ("number")); - - 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); + 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); + + 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 ())); + + 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, 0); - m.add_at_edge (Y_AXIS, DOWN, d, 0.0,0); + m.add_at_edge (Y_AXIS, DOWN, d, 0.0, 0); } else { @@ -116,34 +116,33 @@ 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{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"); + "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");