X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature.cc;h=6958de57eac19c70354649a82581aaa4cf634ee4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3382380da9b721ed7fdc7b11b810189c1ecc6c75;hpb=b4139c2fb2ec738a17ee1157edf23e8ea56ed560;p=lilypond.git diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 3382380da9..6958de57ea 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -1,63 +1,61 @@ -/* - 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--2008 Han-Wen Nienhuys +*/ -#include "molecule.hh" -#include "text-item.hh" #include "time-signature.hh" -#include "paper-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, brew_molecule, 1); -/* TODO: make different functions for special and normal timesigs. */ +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)); + string style = ly_scm2string (scm_symbol_to_string (scm_style)); if (style == "numbered") return numbered_time_signature (me, n, d); @@ -68,45 +66,48 @@ 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); - 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::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (num).to_str0 ())); - - Molecule d = - Text_item::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (den).to_str0 ())); + 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->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, 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 { @@ -115,34 +116,34 @@ 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"); +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.\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" + "@end table\n" + "\n" + "See also the test-file @file{input/test/time.ly}.", + + /* properties */ + "fraction " + "style " + );