X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=ba2a32cf3370d51d1ea33089db0f6b86fd1842fa;hb=f525f992e5dbeb579981153775cc9ee10b78cb3f;hp=35da64f305d9f4bf49eef7b36c0e7293ac849d6c;hpb=24e6b12c1ca73748dd5cbacfe23f9b87b5c95c60;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 35da64f305..ba2a32cf33 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,49 +1,51 @@ /* - 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 "time-signature.hh" -#include "molecule.hh" #include "text-item.hh" -#include "time-signature.hh" -#include "paper-def.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"); + 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)) + Stencil m; + if (st == ly_symbol2scm ("single-digit")) { - 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); - } + 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); @@ -54,7 +56,7 @@ Time_signature::brew_molecule (SCM smob) 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)); @@ -75,11 +77,11 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int 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. @@ -89,25 +91,29 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d) return numbered_time_signature (me, n, d); } -Molecule +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); - 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 { @@ -121,30 +127,28 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den) } 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{neo_mensural} - 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. - - @item @code{mensural} - 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. - - @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.) - @end table - -See also the test-file @file{input/test/time.ly}. -", + "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");