/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "font-interface.hh"
#include "international.hh"
#include "output-def.hh"
+#include "staff-symbol.hh"
#include "staff-symbol-referencer.hh"
#include "text-interface.hh"
#include "warn.hh"
else
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);
+ /*
+ position the signature centred on the staff line
+ nearest to the middle of the staff
+ */
+ if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me))
+ {
+ std::vector<Real> const linepos = Staff_symbol::line_positions (staff);
+ if (!linepos.empty ())
+ {
+ Interval const span = Staff_symbol::line_span (staff);
+ Real const mid = span.center ();
+ Real pos = linepos.front ();
+ Real dist = fabs (pos - mid);
+ for (std::vector<Real>::const_iterator
+ i = linepos.begin (), e = linepos.end ();
+ ++i != e;)
+ {
+ double const d = fabs (*i - mid);
+ if (d < dist)
+ {
+ pos = *i;
+ dist = d;
+ }
+ }
+
+ m.translate_axis
+ (pos * Staff_symbol_referencer::staff_space (me) / 2, Y_AXIS);
+ }
+ }
return m.smobbed_copy ();
}
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 = robust_symbol2string (scm_style, "default");
if (style == "numbered")
return numbered_time_signature (me, n, 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_property ("font-encoding", ly_symbol2scm ("fetaMusic"));
Stencil out = Font_interface::get_default_font (me)
- ->find_by_name ("timesig." + char_name);
+ ->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));
+ "reverting to numbered style", char_name));
return numbered_time_signature (me, n, d);
}
{
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 ("fetaText"))),
- chain);
+ ly_symbol2scm ("fetaText"))),
+ chain);
SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
- ly_string2scm (to_string (num)));
+ ly_string2scm (to_string (num)));
SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
- ly_string2scm (to_string (den)));
+ ly_string2scm (to_string (den)));
Stencil n = *unsmob_stencil (sn);
Stencil d = *unsmob_stencil (sd);
}
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."
- " The value @code{default} is equivalent to @code{C}.\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"
- "@item numbered\n"
- "All time signatures are typeset with two digits.\n"
- "@end table",
-
- /* properties */
- "fraction "
- "style "
- );
+ "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."
+ " The value @code{default} is equivalent to @code{C}.\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"
+ "@item numbered\n"
+ "All time signatures are typeset with two digits.\n"
+ "@end table",
+
+ /* properties */
+ "fraction "
+ "style "
+ );
projects / lilypond.git / blobdiff