-/*
- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
-#include "molecule.hh"
-#include "text-item.hh"
#include "time-signature.hh"
-#include "paper-def.hh"
+
+#include "grob.hh"
#include "font-interface.hh"
+#include "international.hh"
+#include "output-def.hh"
+#include "staff-symbol-referencer.hh"
+#include "text-interface.hh"
#include "warn.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));
}
-
- if (gh_symbol_p (st))
- {
- String style (ly_scm2string (scm_symbol_to_string (st)));
- if (style[0]=='1')
- {
- return time_signature (me, n, 0).smobbed_copy ();
- }
- else
- {
- return special_time_signature (me, style, n, d).smobbed_copy ();
- }
- }
+ 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
- return time_signature (me, n,d).smobbed_copy ();
+ 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);
+
+ 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);
-
- Font_metric *feta = Font_interface::get_font (me, style_chain);
-
- /*
- First guess: s contains only the signature style, append fraction.
- */
- String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (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;
+ string style = ly_scm2string (scm_symbol_to_string (scm_style));
- String message =
- "unknown time signature `" + s +
- "'; resorting to default layout with numbers";
- warning (_ (message.ch_C ()));
+ if (style == "numbered")
+ return numbered_time_signature (me, n, d);
- // Resort to default layout with numbers
- 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-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!) */
+ 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,
- ly_str02scm (to_str (num).ch_C ()),
- chain);
- Molecule d = Text_item::text2molecule (me,
- ly_str02scm (to_str (den).ch_C ()),
- 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->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);
}
m.align_to (X_AXIS, LEFT);
-
+
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}.
-",
- "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 "
+ );
projects / lilypond.git / blobdiff