it hara-kiri.
* input/regression/{many}.ly: improve descriptions trying to figure
+2004-02-16 Heikki Junes <hjunes@cc.hut.fi>
+
+ * lily/align-interface.cc, lily/axis-group-engraver.cc: spell
+ it hara-kiri.
+
+ * input/regression/{many}.ly: improve descriptions trying to figure
+ out what is tested.
+
2004-02-16 Han-Wen Nienhuys <hanwen@xs4all.nl>
* lily/slur.cc (broken_trend_offset): robustness fix.
\version "2.1.22" \header{
- texidoc=" Noteheads can have dots, and rests
-can too. Augmentation dots should never be printed on a staff line,
+ texidoc=" Noteheads can have dots, and rests too.
+ Augmentation dots should never be printed on a staff line,
but rather be shifted vertically. They should go up, but in case of
multiple parts, the down stems have down shifted dots. In case of
chords, all dots should be in a column. The dots go along as rests
\version "2.1.22"
\header {
-texidoc = "Crescendi may start off-notes. In that case, they should not collapse into flat lines."
+texidoc = "Crescendi may start off-notes, however, they should not collapse into flat lines."
}
\score { \notes { \context Voice {
\version "2.1.23"
\header {
-texidoc = " Ez-notation prints names in note heads.
+texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
You also get ledger lines, of course."
}
\version "2.1.22"
\header {
-texidoc = "With the new chord syntax it's possible to associate
+texidoc = "With the new chord syntax, it is possible to associate
fingerings uniquely with notes. This makes horizontal fingering much
easier to process."
\version "2.1.22"
\header{
texidoc = "
+The line-spanners connects to the Y position of the note on the next line.
When put across line breaks, only the part before the line break is
-printed. The line-spanners connects to the Y position of the note on the next line.
+printed.
"
}
\version "2.1.22"
\header { texidoc = "The magnification can be set for any font. Note
-that this doesn't change variable symbols such as beams or slurs. " }
+that this does not change variable symbols such as beams or slurs.
+" }
\score {
\notes \relative c'' \context Voice {
\header {
- texidoc = "Using other fonts can be done by setting font-name for
+ texidoc = "Other fonts can be used by setting font-name for
the appropriate object. This may include Postscript fonts that are
available through (La)TeX.
\header{
-texidoc=" Simple glissando lines between notes are supported.
-The first two glissandi are not consecutive.
+texidoc=" Between notes, there may be simple glissando lines.
+Here, the first two glissandi are not consecutive.
The engraver does no time-keeping, so it involves some trickery to get
<< @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} >> working correctly.
\version "2.1.22"
\header {
- texidoc = "Another nested grace situation."
+ texidoc = "In nested syntax, graces are still properly handled."
}
\paper { raggedright= ##t }
\version "2.1.22"
\header {
-texidoc = "Another combination of grace note nesting."
+texidoc = "Also in the nested syntax here, grace notes appear rightly."
}
\score { \notes \context Voice \relative c'' {
\version "2.1.22"
\header {
- texidoc = "Another nested grace situation."
+ texidoc = "Graces notes may have the same duration as the main note."
}
\score
\version "2.1.22"
\header {
- texidoc = "Partcombiner and grace notes can go together."
+ texidoc = "Grace notes may be put in a @code{partcombine}r."
}
\paper { raggedright= ##t }
\version "2.1.22"
\header{
-texidoc = "Here startGraceMusic should set no-stem-extend to true;
-the two grace beams should be the same here.
+texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to
+true; the two grace beams should be the same here.
"
}
\version "2.1.22"
\header {
- texidoc = "Different grace types explained: the base grace switches to smaller type. The appoggiatura also inserts a slur, and the
+ texidoc = "There are three different kinds of grace types: the base
+grace switches to smaller type, the appoggiatura inserts also a slur, and the
acciaccatura inserts a slur and slashes the stem."
}
\version "2.1.22"
\header {
- texidoc = "Grace notes and unfolded repeats.
-Line breaks may happen before grace notes.
+ texidoc = "When grace notes are entered with unfolded repeats,
+line breaks take place before grace notes.
"
}
\header {
- texidoc = "Graces at combined with volta repeats: a repeat
-starting with a grace, following a repeat directly. The bars should be
-merged into one @code{:||:}."
+ texidoc = "A volta repeat may begin with a grace. Consecutive ending and
+ starting repeat bars are into one @code{:||:}."
}
texidoc="
Grace notes are typeset as an encapsulated piece of music. You can
have beams, notes, chords, stems etc. within a @code{\grace} section.
-Slurs that start within a grace section, but aren't ended are attached
+Slurs that start within a grace section, but are not ended are attached
to the next normal note. Grace notes have zero duration. If there
-are tuplets, the grace notes won't be under the brace. Grace notes
+are tuplets, the grace notes will not be under the brace. Grace notes
can have accidentals, but they are (currently) spaced at a fixed
distance. Grace notes (of course) come before the accidentals of the
main note. Grace notes can also be positioned after the main note.
Grace notes without beams should have a slash, if @code{flagStyle} is
-not set. Main note scripts don't end up on the grace note.
+not set. Main note scripts do not end up on the grace note.
"
}
\header { texidoc =
- " Hara kiri staves kill themselves if they are empty. This
+ " Hara-kiri staves kill themselves if they are empty. This
example really contains three staves, but as they progress, empty ones
are removed: this example has three staves, but some of them
disappear: note how the 2nd line only has the bar number 2. (That the
bar number is printed might be considered a bug, however, the scenario
-of all staves disappearing doesn't happen in practice.)
+of all staves disappearing does not happen in practice.)
Any staff brackets and braces are removed, both in the single staff
and no staff case.
\header{
texidoc="
Staff margins are also markings attached to barlines. They should be
-left of the staff, and be centered vertically wrt the staff. They may
-be on normal staves, but also on compound staves, like the PianoStaff.
+left of the staff, and be centered vertically with respect to the staff.
+They may be on normal staves, but also on compound staves, like the
+PianoStaff.
"
}
\version "2.1.22"
-\header { texidoc = "Key signatures can be set per pitch
-individually. This can be done by setting @code{Staff.keySignature}
-directly."
+\header { texidoc = "By setting @code{Staff.keySignature} directly,
+key signatures can be set invidually per pitch.
+"
}
\score { \notes
\version "2.1.22"
\header{
texidoc="
-Key signatures appear on key changes. They may also
-appear without barlines. The restoration accidentals are not printed at
-the start of the line. If @code{createKeyOnClefChange} is set, they're
-also created on a clef change.
+Key signatures may appear on key changes, even without a barline.
+In the case of a line break, the restoration accidentals are printed at
+end of a line. If @code{createKeyOnClefChange} is set, key signatures
+are created also on a clef change.
"
}
\version "2.1.22"
\header {
-texidoc ="Polyphonic rhythms and rests don't disturb
+texidoc ="Polyphonic rhythms and rests do not disturb
@code{\lyricsto}."
}
either by setting a property melismaBusy, or by setting
automaticMelismas (which will set melismas during slurs and ties). If
you want a different order than first Music, then Lyrics, you must
-precook a chord of staves/lyrics and label those. Of course
+precook a chord of staves/lyrics and label those. Of course,
@code{\rhythm} ignores any other rhythms in the piece. Hyphens and
extenders do not assume anything about lyric lengths, so they continue
to work."
\header {
- texidoc = "Hyphens only print at the beginning of the line, when
+ texidoc = "Hyphens are print at the beginning of the line only when
they go past the first note. "
}
}
\score{
<<
- \context Staff \notes { c' (c') (c') c' }
+ \context Staff \notes { c' (c') c'( c') }
\context Lyrics \lyrics { bla -- alb xxx -- yyy }
>>
}
\version "2.1.22"
\header {
-texidoc = "Lyric phrasing:
-
+texidoc = "
Normally, the lyric is centered on the note head. However, on
melismata, the text is left aligned on the left-side of the note head.
\header{
texidoc="Lyric phrasing
- We find start and end of phrases, and align lyrics of multiple stanzas
- accordingly.
+ The multiple stanzas are aligned according to the start and end of a phrase.
- Also, lyrics at start of melismata should be left aligned.
+ Also, lyrics at the beginning of a melismata should be left aligned.
(is that only lyrics that are followed by `__'? Because
that seems to be the case now -- jcn)
2: x x x______ x
@end example
- Only lyrics that are followed by '__' while there's a melisma,
+ Only lyrics that are followed by '__' while there is a melisma,
are left-aligned, in this case the third x."
}
\header{
texidoc="
Adding a @code{Bar_engraver} to the Lyrics context makes sure that
-lyrics don't collide with barlines.
+lyrics do not collide with barlines.
"
}
\header {
- texidoc = "The note markup function is used to make metronome
- markings. It works for a variety of flag dot and duration settings."
+ texidoc = "The note markup function may be used to make metronome
+ markings. It works for a variety of flag, dot and duration settings."
}
\version "2.1.22"
\version "2.1.22"
-\header {texidoc="Stacking of markup scripts."}
+\header {texidoc="Markup scripts may be stacked."}
\paper { raggedright = ##t}
\score { \notes { c''^\markup { "a" \column < "1" \bold "2" "3" > } } }
\header {
- texidoc = "Users may define their own markup commands using the
+ texidoc = "Own markup commands may be defined by using the
@code{def-markup-command} scheme macro."
{
texidoc = "The @code{Measure_grouping_engraver} adds triangles and
-brackets above beats when you set beatGrouping. "
+brackets above beats when the beats of a time signature are grouped. "
}
\header {
- texidoc = "Here @code{\tempo} directives are printed as metronome markings.
+ texidoc = "Here @code{\\tempo} directives are printed as metronome markings.
The marking is left aligned with the time signature, if there is one.
"
\header {
- texidoc = "By setting texts starting with a mmrest we create
-an extra spacing column. This should not cause problems."
+ texidoc = "By setting texts starting with a mmrest, an extra spacing
+column is created. This should not cause problems."
}
\version "2.1.22"
\header {
texidoc = "
-Texts may be added to the multi measure rests.
+Texts may be added to the multi-measure rests.
"
\header{
texidoc="
-Multiple measure rests do not collide with barlines and clefs. They
+Multi-measure rests do not collide with barlines and clefs. They
are not expanded when you set @code{Score.skipBars}. Although the
multi-measure-rest is a Spanner, minimum distances are set to keep it
colliding from barlines.
\header {
-texidoc = "New markup syntax."
+texidoc = "With the new markup syntax, text may be written in various manenrs."
}
\version "2.1.22"
\version "2.1.22"
\header{
- texidoc=" Text is set with empty horizontal dimensions. The
-boolean property @code{no-spacing-rods} in @code{TextScript} is used
+ texidoc=" By default, text is set with empty horizontal dimensions.
+The boolean property @code{no-spacing-rods} in @code{TextScript} is used
to control the horizontal size of text. " }
\score{
\header {
texidoc = "Note grouping events are used to indicate where
-brackets for analysis start and end.
+analysis brackets start and end.
@cindex bracket
@cindex note groups
texidoc="
Note head shapes are settable. The stem endings should be adjusted
per note head. If you want different note head styles on one stem,
-you must create a special context called
+you must create a special context called.
Harmonic notes have a different shape and different
dimensions.
\header{
texidoc=" The number of stafflines of a staff can be set. Ledger
lines both on note heads and rests are adjusted. Barlines also are
-adjusted. "
+adjusted accordingly. "
}
\score {
\header
{
-texidoc = "Ottava brackets behave properly at line breaks: no vertical
-line, and the horizontal line doesn't stick out."
+texidoc = "Ottava brackets behave properly at line breaks: there is
+no vertical line and the horizontal line does not stick out."
}
\version "2.1.22"
\header {
- texidoc ="The a2 string is only printed on notes, not on rests,
+ texidoc ="The a2 string is printed only on notes (i.e. not on rests),
and only after chords, solo or polyphony."
}
\header {
- texidoc ="The new part combiner:
-
-Detect a2, solo1, solo2 and print texts accordingly.
+ texidoc ="The new part combiner detects a2, solo1 and solo2, and prints i
+texts accordingly.
"
\header {
- texidoc ="The new part combiner.
-Apart for:
+ texidoc ="The new part combiner stays apart from:
@itemize @bullet
-@item different durations (start points)
-@item different articulations (only slur/beam/tie work)
-@item wide pitch ranges
+@item different durations,
+@item different articulations (taking into account only slur/beam/tie), and
+@item wide pitch ranges.
@end itemize
"
}
\header {
- texidoc = "Piano pedal brackets. Brackets should start and end at
+ texidoc = "The brackets of a piano pedal should start and end at
the left side of the note. If a note is shared between two brackets,
- the ends are flared.
+ these ends are flared.
-There are no vertical endings at a line-break. " }
+At a line-break, there are no vertical endings. " }
\score {
\notes \relative c'' {
\version "2.1.22"
\header
{
- texidoc = "Piano pedals: the standard style is with Ped symbols.
-The string can be tuned. This example shows the shorter tilde/P variant
+ texidoc = "The standard piano pedals style comes with Ped symbols.
+The pedal string can be also tuned, for example, to a shorter tilde/P variant
at the end of the melody."
}
\version "2.1.22"
\header {
-texidoc="Slurs play well with phrasing slur."
+texidoc="Ordinary slurs should work well with phrasing slur."
}
\score {
\header {
-texidoc =" The A is atop an invisible barline. The barline
+texidoc =" The A is atop an invisible barline. The barline,
although invisible, is also translated because it is the last one of
the break alignment."
\version "2.1.22"
\header {
- texidoc = "Distances between prefatory items (eg. clef, bar, etc.)
+ texidoc = "Distances between prefatory items (e.g. clef, bar, etc.)
are done using engraving standard distances. These distances
depend on which items are combined."
{
/*
This is not very elegant, in that we need special support for
- hara kiri. Unfortunately, the generic wiring of
+ hara-kiri. Unfortunately, the generic wiring of
force_hara_kiri_callback () (extent and offset callback) is
such that we might get into a loop if we call extent() or
offset() the elements.
}
ENTER_DESCRIPTION(Hara_kiri_engraver,
-/* descr */ "Like Axis_group_engraver, but make a hara kiri spanner, and add "
+/* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
"interesting items (ie. note heads, lyric syllables and normal rests) ",
/* creats*/ "RemoveEmptyVerticalGroup",
/* accepts */ "",
projects / lilypond.git / commitdiff