This makes unassociated lyrics behave consistently with
associated lyrics. Until now, "standalone" lyrics
were left-aligned (more precisely: their X-offset was 0);
changing self-alignment-X didn't have any effect on them.
Now it's possible to specify their alignment, like with
associated lyrics.
Also, this changes how issue 104 was resolved (see
0b14e8b2e122d) -
alignment of syllables that are associated to a context without
noteheads is no longer aborted - and solves issue 247.
Later on, these changes should allow using aligned_on_parent for
other grobs (such as DynamicTexts).
Expected changes in output: all lyrics should be centered by default.
when setting dialogue over music; for examples showing this, see
@ref{Dialogue over music}.
-When entered in this way the words are left-aligned to the notes
-by default, but may be center-aligned to the notes of a melody by
-specifying an associated voice, if one exists. For details, see
-@ref{Manual syllable durations}.
-
@end itemize
@seealso
but with pitches replaced by text -- and the duration of each
syllable is entered explicitly after the syllable.
-By default, syllables will be left-aligned to the corresponding
-musical moment. Hyphenated lines may be drawn between syllables
+Hyphenated lines may be drawn between syllables
as usual, but extender lines cannot be drawn when there is no
associated voice.
@lilypond[relative=1,verbatim,quote]
<<
\new Voice = "melody" {
- \time 3/4
- c2 e4 g2 f
+ c'2 a f f e e
}
\new Lyrics \lyricmode {
- play1 the4 game4
+ c4. -- a -- f -- f -- e2. -- e
}
>>
@end lilypond
This technique is useful when writing dialogue over music, see
@ref{Dialogue over music}.
-To center-align syllables on the notes at the corresponding musical
-moments, set @code{associatedVoice} to the name of the Voice context
-containing those notes. When @code{associatedVoice} is set, both
-double hyphens and double underscores can be used to draw
-hyphenated lines and extenders under melismata correctly.
+To change syllable alignment, simply override the @code{self-alignment-X}
+property:
@lilypond[relative=1,verbatim,quote]
<<
\new Voice = "melody" {
\time 3/4
- c2 e4 g f g
+ c2 e4 g2 f
}
\new Lyrics \lyricmode {
- \set associatedVoice = #"melody"
- play2 the4 game2. __
+ \override LyricText.self-alignment-X = #LEFT
+ play1 a4 game4
}
>>
@end lilypond
-@c TODO see also feature request 707 - show how to do this with manual durations
-
@seealso
Notation Reference:
@ref{Dialogue over music}.
\header {
- texidoc ="Lyric syllables without note attachment are not
-centered. Centering may cause unintended effects when the
-paper column is very wide."
+ texidoc ="Lyric syllables without note attachment are
+aligned correctly even if the paper column is very wide."
}
\layout{ ragged-right = ##t }
\new Lyrics \lyricmode {
\skip 8
\skip 8
- x8
+ xx8
x8
}
>>
--- /dev/null
+\version "2.19.9"
+#(set-global-staff-size 30)
+
+\header {
+ texidoc = "Lyrics without an @code{associatedVoice} should align properly.
+If there are notes in the @code{PaperColumn}, they should align to them,
+and when there are no notes, they should align relative to the
+@code{PaperColumn} itself (represented with blue @code{GridLines} here)"
+}
+
+\paper {
+ ragged-right = ##f
+}
+
+\layout {
+ \context {
+ \Voice
+ \consists "Grid_point_engraver"
+ gridInterval = #(ly:make-moment 1/4)
+ \override GridPoint.Y-extent = #'(-1 . 3)
+ }
+ \context {
+ \Staff
+ \consists "Grid_line_span_engraver"
+ \override GridLine.color = #blue
+ }
+}
+
+music = <<
+ \new Staff <<
+ \new Voice { s1*3 } % needed for gridLines
+ \new Voice { d'2 d' <f' g'>1 s1 }
+ >>
+ \new Lyrics { \lyricmode { foo2 bar mmmm1 a2 bom } }
+>>
+
+\markup "default (centered):"
+\music
+
+\markup "right-aligned:"
+{
+ \override Score.LyricText.self-alignment-X = #RIGHT
+ \music
+}
static bool is_extraneous_column_from_ligature (Grob *);
static Real minimum_distance (Grob *l, Grob *r);
static Interval break_align_width (Grob *me, SCM align_sym);
+ static Interval get_interface_extent (Grob *column, SCM interface, Axis a);
};
#endif // PAPER_COLUMN_HH
get_property ("lyricMelismaAlignment"));
}
else
- {
- text_->warning (_ ("Lyric syllable does not have note."
- " Use \\lyricsto or associatedVoice."));
- text_->set_property ("X-offset", scm_from_int (0));
- }
+ text_->warning (_ ("Aligning lyric syllables to notes was requested,"
+ " but there are no notes in the specified context."
+ " Syllable will be attached to a PaperColumn instead."));
}
last_text_ = text_;
return align->extent (p, X_AXIS);
}
+/*
+ Loop through elements of a PaperColumn, find all grobs implementing specified
+ interface and return their combined extent.
+*/
+Interval
+Paper_column::get_interface_extent (Grob *column, SCM interface, Axis a)
+{
+ Interval extent = Interval (0, 0);
+ extract_grob_set (column, "elements", elts);
+
+ for (vsize i = 0; i < elts.size (); i++)
+ if (elts[i]->internal_has_interface (interface))
+ extent.unite (robust_relative_extent (elts[i], elts[i], a));
+
+ return extent;
+}
+
/*
Print a:
- vertical line,
Self_alignment_interface::aligned_on_parent (Grob *me, Axis a)
{
Grob *him = me->get_parent (a);
+ Interval he;
if (Paper_column::has_interface (him))
- return scm_from_double (0.0);
-
- Interval he = him->extent (him, a);
+ /*
+ PaperColumn extents aren't reliable (they depend on size and alignment
+ of PaperColumn's children), so we align on NoteColumn instead.
+ This happens e.g. for lyrics without associatedVoice.
+ */
+ he = Paper_column::get_interface_extent
+ (him, ly_symbol2scm ("note-column-interface"), a);
+ else
+ he = him->extent (him, a);
SCM sym = (a == X_AXIS) ? ly_symbol2scm ("self-alignment-X")
: ly_symbol2scm ("self-alignment-Y");
projects / lilypond.git / commitdiff