Following refactoring of the accidental-placement code, AccidentalPlacement
only supports 'right-padding.
(See also http://code.google.com/p/lilypond/issues/detail?id=730)
@ref{Within-staff objects}.
@item
@ref{Within-staff objects}.
@item
-@code{padding}, @code{left-padding},
-@code{right-padding}, @code{staff-padding}
+@code{padding}, @code{right-padding}, @code{staff-padding}
-@cindex left-padding property
@cindex padding property
@cindex right-padding property
@cindex staff-padding property
@cindex padding property
@cindex right-padding property
@cindex staff-padding property
@code{side-position-interface}.
Instead of @code{padding}, the placement of groups of accidentals
@code{side-position-interface}.
Instead of @code{padding}, the placement of groups of accidentals
-is controlled by @code{left-padding} and @code{right-padding}.
-These properties are to be found in the @code{AccidentalPlacement}
-object which, note, lives in the @strong{staff} context. In the
-type-setting process the note heads are type-set first and then
-the accidentals, if any, are added to the left of the note heads
-using the @code{right-padding} property to determine the separation
-from the note heads. So only the @code{right-padding} property of the
-@code{AccidentalPlacement} object has any effect on the placement
-of the accidentals.
+is controlled by @code{right-padding}. This property is to be found
+in the @code{AccidentalPlacement} object which, note, lives in the
+@strong{Staff} context. In the typesetting process the note heads
+are typeset first and then the accidentals, if any, are added to the
+left of the note heads using the @code{right-padding} property to determine
+the separation from the note heads and between individual accidentals.
+So only the @code{right-padding} property of the @code{AccidentalPlacement}
+object has any effect on the placement of the accidentals.
The @code{staff-padding} property is closely related to the
@code{padding} property: @code{padding} controls the minimum amount of
The @code{staff-padding} property is closely related to the
@code{padding} property: @code{padding} controls the minimum amount of
@lilypond[quote,fragment,relative=1,verbatim]
% This will not work, see below
\override MetronomeMark #'padding = #3
@lilypond[quote,fragment,relative=1,verbatim]
% This will not work, see below
\override MetronomeMark #'padding = #3
c1 |
% This works
\override Score.MetronomeMark #'padding = #3
c1 |
% This works
\override Score.MetronomeMark #'padding = #3
objects outside it are moved.
objects outside it are moved.
-@subheading left-padding and right-padding
+@subheading right-padding
-@cindex left-padding property
@cindex right-padding property
The @code{right-padding} property affects the spacing between the
@cindex right-padding property
The @code{right-padding} property affects the spacing between the
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "accidental-placement.hh"
#include "accidental-placement.hh"
-#include "item.hh"
-#include "rhythmic-head.hh"
#include "accidental-interface.hh"
#include "accidental-interface.hh"
#include "music.hh"
#include "note-collision.hh"
#include "note-column.hh"
#include "pointer-group-interface.hh"
#include "music.hh"
#include "note-collision.hh"
#include "note-column.hh"
#include "pointer-group-interface.hh"
+#include "rhythmic-head.hh"
#include "skyline.hh"
#include "stream-event.hh"
#include "warn.hh"
#include "skyline.hh"
#include "stream-event.hh"
#include "warn.hh"
accidental_pitch (Grob *acc)
{
SCM cause = acc->get_parent (Y_AXIS)->get_property ("cause");
accidental_pitch (Grob *acc)
{
SCM cause = acc->get_parent (Y_AXIS)->get_property ("cause");
*/
void
Accidental_placement::split_accidentals (Grob *accs,
*/
void
Accidental_placement::split_accidentals (Grob *accs,
- vector<Grob*> *break_reminder,
- vector<Grob*> *real_acc)
+ vector<Grob *> *break_reminder,
+ vector<Grob *> *real_acc)
{
for (SCM acs = accs->get_object ("accidental-grobs"); scm_is_pair (acs);
acs = scm_cdr (acs))
{
for (SCM acs = accs->get_object ("accidental-grobs"); scm_is_pair (acs);
acs = scm_cdr (acs))
-vector<Grob*>
-Accidental_placement::get_relevant_accidentals (vector<Grob*> const &elts, Grob *left)
+vector<Grob *>
+Accidental_placement::get_relevant_accidentals (vector<Grob *> const &elts, Grob *left)
- vector<Grob*> br;
- vector<Grob*> ra;
- vector<Grob*> ret;
+ vector<Grob *> br;
+ vector<Grob *> ra;
+ vector<Grob *> ret;
bool right = dynamic_cast<Item *> (left)->break_status_dir () == RIGHT;
for (vsize i = 0; i < elts.size (); i++)
{
split_accidentals (elts[i], &br, &ra);
bool right = dynamic_cast<Item *> (left)->break_status_dir () == RIGHT;
for (vsize i = 0; i < elts.size (); i++)
{
split_accidentals (elts[i], &br, &ra);
ret.insert (ret.end (), ra.begin (), ra.end ());
if (right)
ret.insert (ret.end (), ra.begin (), ra.end ());
if (right)
Skyline right_skyline_;
Interval vertical_extent_;
vector<Box> extents_;
Skyline right_skyline_;
Interval vertical_extent_;
vector<Box> extents_;
};
Real ape_priority (Accidental_placement_entry const *a)
};
Real ape_priority (Accidental_placement_entry const *a)
-stagger_apes (vector<Accidental_placement_entry*> *apes)
+stagger_apes (vector<Accidental_placement_entry *> *apes)
- vector<Accidental_placement_entry*> asc = *apes;
+ vector<Accidental_placement_entry *> asc = *apes;
vector_sort (asc, &ape_less);
vector_sort (asc, &ape_less);
-static vector<Accidental_placement_entry*>
+static vector<Accidental_placement_entry *>
- vector<Accidental_placement_entry*> apes;
+ vector<Accidental_placement_entry *> apes;
for (SCM s = accs; scm_is_pair (s); s = scm_cdr (s))
{
Accidental_placement_entry *ape = new Accidental_placement_entry;
for (SCM s = accs; scm_is_pair (s); s = scm_cdr (s))
{
Accidental_placement_entry *ape = new Accidental_placement_entry;
set_ape_skylines (Accidental_placement_entry *ape,
Grob **common)
{
set_ape_skylines (Accidental_placement_entry *ape,
Grob **common)
{
- vector<Grob*> accs (ape->grobs_);
+ vector<Grob *> accs (ape->grobs_);
vector_sort (accs, &acc_less);
/* We know that each accidental has the same note name and we assume that
vector_sort (accs, &acc_less);
/* We know that each accidental has the same note name and we assume that
ape->right_skyline_ = Skyline (ape->extents_, 0, Y_AXIS, RIGHT);
}
ape->right_skyline_ = Skyline (ape->extents_, 0, Y_AXIS, RIGHT);
}
-static vector<Grob*>
-extract_heads_and_stems (vector<Accidental_placement_entry*> const &apes)
+static vector<Grob *>
+extract_heads_and_stems (vector<Accidental_placement_entry *> const &apes)
- vector<Grob*> note_cols;
- vector<Grob*> ret;
+ vector<Grob *> note_cols;
+ vector<Grob *> ret;
for (vsize i = apes.size (); i--;)
{
for (vsize i = apes.size (); i--;)
{
if (Grob *s = Rhythmic_head::get_stem (ret[i]))
ret.push_back (s);
if (Grob *s = Rhythmic_head::get_stem (ret[i]))
ret.push_back (s);
-
- vector_sort (ret, less<Grob*> ());
+ vector_sort (ret, less<Grob *> ());
uniq (ret);
return ret;
}
uniq (ret);
return ret;
}
-static Grob*
-common_refpoint_of_accidentals (vector<Accidental_placement_entry*> const &apes, Axis a)
+static Grob *
+common_refpoint_of_accidentals (vector<Accidental_placement_entry *> const &apes, Axis a)
-build_heads_skyline (vector<Grob*> const &heads_and_stems,
+build_heads_skyline (vector<Grob *> const &heads_and_stems,
Grob **common)
{
vector<Box> head_extents;
Grob **common)
{
vector<Box> head_extents;
*/
static Interval
position_apes (Grob *me,
*/
static Interval
position_apes (Grob *me,
- vector<Accidental_placement_entry*> const &apes,
+ vector<Accidental_placement_entry *> const &apes,
Skyline const &heads_skyline)
{
Real padding = robust_scm2double (me->get_property ("padding"), 0.2);
Skyline left_skyline = heads_skyline;
left_skyline.raise (-robust_scm2double (me->get_property ("right-padding"), 0));
Skyline const &heads_skyline)
{
Real padding = robust_scm2double (me->get_property ("padding"), 0.2);
Skyline left_skyline = heads_skyline;
left_skyline.raise (-robust_scm2double (me->get_property ("right-padding"), 0));
/*
Add accs entries right-to-left.
*/
/*
Add accs entries right-to-left.
*/
/*
This routine computes placements of accidentals. During
add_accidental (), accidentals are already grouped by note, so that
/*
This routine computes placements of accidentals. During
add_accidental (), accidentals are already grouped by note, so that
TODO: more advanced placement. Typically, the accs should be placed
to form a C shape, like this
TODO: more advanced placement. Typically, the accs should be placed
to form a C shape, like this
-
- ##
- b b
- # #
- b
- b b
+ * ##
+ * b b
+ * # #
+ * b
+ * b b
The naturals should be left of the C as well; they should
be separate accs.
The naturals should be left of the C as well; they should
be separate accs.
return SCM_BOOL_T;
me->set_property ("positioning-done", SCM_BOOL_T);
return SCM_BOOL_T;
me->set_property ("positioning-done", SCM_BOOL_T);
SCM accs = me->get_object ("accidental-grobs");
if (!scm_is_pair (accs))
return SCM_BOOL_T;
SCM accs = me->get_object ("accidental-grobs");
if (!scm_is_pair (accs))
return SCM_BOOL_T;
- vector<Accidental_placement_entry*> apes = build_apes (accs);
+ vector<Accidental_placement_entry *> apes = build_apes (accs);
Grob *common[] = {me, 0};
Grob *common[] = {me, 0};
- vector<Grob*> heads_and_stems = extract_heads_and_stems (apes);
+ vector<Grob *> heads_and_stems = extract_heads_and_stems (apes);
common[Y_AXIS] = common_refpoint_of_accidentals (apes, Y_AXIS);
common[Y_AXIS] = common_refpoint_of_array (heads_and_stems, common[Y_AXIS], Y_AXIS);
common[Y_AXIS] = common_refpoint_of_accidentals (apes, Y_AXIS);
common[Y_AXIS] = common_refpoint_of_array (heads_and_stems, common[Y_AXIS], Y_AXIS);
/* properties */
"accidental-grobs "
"direction "
/* properties */
"accidental-grobs "
"direction "
"padding "
"positioning-done "
"right-padding "
"script-priority "
"padding "
"positioning-done "
"right-padding "
"script-priority "
(left-bound-info ,list? "An alist of properties for determining
attachments of spanners to edges.")
(left-padding ,ly:dimension? "The amount of space that is put
(left-bound-info ,list? "An alist of properties for determining
attachments of spanners to edges.")
(left-padding ,ly:dimension? "The amount of space that is put
-left to an object (e.g., a group of accidentals).")
+left to an object (e.g., a lyric extender).")
(length ,ly:dimension? "User override for the stem length of
unbeamed stems.")
(length-fraction ,number? "Multiplier for lengths. Used for
(length ,ly:dimension? "User override for the stem length of
unbeamed stems.")
(length-fraction ,number? "Multiplier for lengths. Used for
(AccidentalPlacement
. (
(direction . ,LEFT)
(AccidentalPlacement
. (
(direction . ,LEFT)
(positioning-done . ,ly:accidental-placement::calc-positioning-done)
;; this is quite small, but it is very ugly to have
(positioning-done . ,ly:accidental-placement::calc-positioning-done)
;; this is quite small, but it is very ugly to have