/*
- 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 <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "molecule.hh"
+#include "stencil.hh"
#include "text-item.hh"
#include "time-signature.hh"
#include "paper-def.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");
d = gh_scm2int (ly_cdr (frac));
}
- Molecule m;
+ Stencil m;
if (gh_symbol_p (st))
{
String style (ly_scm2string (scm_symbol_to_string (st)));
return m.smobbed_copy ();
}
-Molecule
-Time_signature::special_time_signature (Grob *me, SCM style, int n, int d)
+Stencil
+Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
{
- String st = ly_scm2string (scm_symbol_to_string (style));
- SCM scm_n = gh_int2scm (n);
- SCM scm_d = gh_int2scm (d);
- SCM exp = scm_list_n (ly_symbol2scm ("find-timesig-symbol"),
- scm_n, scm_d, ly_quote_scm (style),
- SCM_UNDEFINED);
- SCM scm_pair = scm_primitive_eval (exp);
- SCM scm_font_char = ly_car (scm_pair);
- SCM scm_font_family = ly_cdr (scm_pair);
- String font_char = ly_scm2string (scm_font_char);
- String font_family = ly_scm2string (scm_font_family);
- me->set_grob_property("font-family", ly_symbol2scm (font_family.to_str0 ()));
-
- Molecule m =
- Font_interface::get_default_font (me)->find_by_name ("timesig-" + font_char);
- if (!m.empty_b ())
- return m;
-
- /*
- If there is no such symbol, we default without warning to the
- numbered style.
- */
+ String style = ly_scm2string (scm_symbol_to_string (scm_style));
+
+ if (style == "numbered")
+ return numbered_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_grob_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
+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);
+ me->set_grob_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
{
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");