From 0eeb762ef648edae9e9abde3d078cf3d814a8f36 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 14 Nov 2002 09:09:07 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 6 + Documentation/user/internals.itely | 31 ++--- Documentation/user/lilypond-book.itely | 8 +- Documentation/user/music-glossary.tely | 106 +++++++++--------- Documentation/user/refman.itely | 49 ++++---- Documentation/user/tutorial.itely | 28 ++--- input/regression/bar-number.ly | 1 + input/regression/bar-scripts.ly | 1 + input/regression/beam-auto-knee.ly | 1 + input/regression/beam-center-slope.ly | 1 + input/regression/beam-concave.ly | 1 + .../regression/beam-cross-staff-auto-knee.ly | 1 + input/regression/beam-cross-staff-slope.ly | 3 +- input/regression/beam-cross-staff.ly | 1 + input/regression/beam-default-lengths.ly | 2 +- input/regression/beam-extreme.ly | 1 + input/regression/beam-french.ly | 1 + input/regression/beam-funky-beamlet.ly | 1 + input/regression/beam-funky.ly | 1 + input/regression/beam-length.ly | 1 + input/regression/beam-manual.ly | 1 + input/regression/beam-multiple-cross-staff.ly | 1 + input/regression/beam-over-barline.ly | 1 + input/regression/beam-position.ly | 1 + input/regression/beam-postfix-notation.ly | 1 + input/regression/beam-quarter.ly | 1 + input/regression/beam-shortened-lengths.ly | 1 + input/regression/beamed-chord.ly | 3 +- input/regression/beaming-ternary-metrum.ly | 1 + input/regression/beaming.ly | 1 + input/regression/beams.ly | 1 + input/regression/between-systems.ly | 1 + input/regression/break.ly | 1 + input/regression/chord-changes.ly | 1 + input/regression/chord-names.ly | 1 + input/regression/chord-scripts.ly | 2 + input/regression/chord-tremolo.ly | 1 + input/regression/cluster.ly | 11 +- input/regression/collision-2.ly | 1 + input/regression/collision-dots.ly | 1 + input/regression/collision-heads.ly | 1 + input/regression/collision-mesh.ly | 13 ++- input/regression/collisions.ly | 5 +- .../regression/completion-heads-polyphony.ly | 1 + input/regression/completion-heads.ly | 2 +- input/regression/finger-chords.ly | 2 + lily/cluster.cc | 2 +- lily/grob.cc | 1 - scm/backend-documentation-lib.scm | 2 +- scm/grob-description.scm | 5 +- scm/grob-property-description.scm | 2 +- 51 files changed, 168 insertions(+), 146 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cee193bd0..3f53fb0ba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-11-14 Han-Wen Nienhuys + + * Documentation/user/*.tely: new chord syntax. + + * input/regression/[bc]*.ly (texidoc): syntax updates. + 2002-11-13 Heikki Junes * lilypond.words: add vocabulary to be used in auto-completion diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index abdc8c94d8..529162814a 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -235,7 +235,7 @@ Second, contexts are created automatically to be able to interpret the music expressions. Consider the following example. @lilypond[verbatim, singleline] -\score { \context Score \notes { c'4 ( d' )e' } } +\score { \context Score \notes { c'4-( d' e'-) } } @end lilypond @noindent @@ -246,27 +246,6 @@ case, a Thread, Voice, and Staff context are created. The rest of the sequential music is also interpreted with the same Thread, Voice, and Staff context, putting the notes on the same staff, in the same voice. -This is a convenient mechanism, but do not expect opening chords to work -without @code{\context}. For every note, a separate staff is -instantiated. - -@cindex explicit context -@cindex starting with chords -@cindex chords, starting with - -@lilypond[verbatim, singleline] -\score { \notes } -@end lilypond - -Of course, if the chord is preceded by a normal note in sequential -music, the chord will be interpreted by the Thread of the preceding -note: - -@lilypond[verbatim,singleline] -\score { \notes { c'4 } } -@end lilypond - - @node Context properties @subsection Context properties @@ -625,9 +604,15 @@ are expressed in two different ways: < { a b c' } { c' d' e' } > } @end lilypond +However, using @code{<} and @code{>} for chords turns up various +syntactical peculiarities. For this reason, a special syntax for +chords was introduced in version 1.7: @code{<< >>}. + -Other compound music expressions include + + +Other compound music expressions include @example \repeat @var{expr} \transpose @var{from} @var{to} @var{expr} diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index cfd0e0c9ce..6d2c5d0d74 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -80,13 +80,13 @@ produces this music: Then the short version: @example -@@lilypond[11pt]@{@} +@@lilypond[11pt]@{<>@} @end example @noindent and its music: -@lilypond[11pt]{} +@lilypond[11pt]{ <> } @command{lilypond-book} knows the default margins and a few paper sizes. One of these commands should be in the beginning of the document: @@ -147,13 +147,13 @@ produces this music: Then the short version: @example -\lilypond[11pt]@{@} +\lilypond[11pt]@{<>@} @end example @noindent and its music: -@lilypond[11pt]{} +@lilypond[11pt]{<>} You can use whatever commands you like in the document preamble, the part of the document before @code{\begin@{document@}}. diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 211f8b0d1f..ffba22d269 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -289,7 +289,7 @@ the duration of the long a. is proportional to that of the main note. \time 4/4 \property Score.TextScript \set #'font-style = #'large - r +<>4_"notation" r { \property Voice.Stem \override #'flag-style = #"" \grace g16 \property Voice.Stem \revert #'flag-style @@ -302,7 +302,7 @@ fis8 e16 fis g8 fis16 g | \cadenzaOn a4 \bar "||" \cadenzaOff } \notes\relative c'' { - r g16 () fis e fis a () g fis g | +<>4_"performance" r g16 () fis e fis a () g fis g | \cadenzaOn a4 \bar "||" \cadenzaOff } @end lilypond @@ -314,8 +314,8 @@ An appoggiatura may have more notes preceding the main note. \time 2/4 \property Score.TextScript \set #'font-style = #'large \grace { bes16 } as8_"notation" as16 bes as8 g | - \grace { [as16 ( bes] } < ) c4 as > - \grace { [as16 ( bes] } < ) c4 as > \bar "||" + \grace { [as16-( bes] } << c as >>4-) + \grace { [as16-( bes] } << c as >>4-) \bar "||" \grace { bes16 } as8_"performance" as16 bes as8 g | < \context Voice = va { \stemUp\tieUp as32 bes c8. as32 bes c8. } \context Voice = vb { \stemDown\tieDown as16 ~ as8. as16 ~ as8. } > @@ -712,12 +712,12 @@ chords are denoted open chords \property Voice.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - s s - s s - s s - s s - s s - s s + <>1 s s + <> s s + <> s s + <> s s + <> s s + <> s s } \context Lyrics \lyrics{ \property Lyrics . LyricText \override #'alignment = #-1 @@ -1521,7 +1521,7 @@ but equal pitch. \property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - gis1 s s as s s s s s s + gis1 s s as s s <> s s <> s s } \context Lyrics \lyrics { \property Lyrics . LyricText \override #'alignment = #-1 @@ -1757,8 +1757,8 @@ variants of the base chords. \property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { - < g1 e c > < a f d > < b g e > - < c a f > < d b g > < e c a > < f d b > } + <>1 << a f d >> << b g e >> + <> << d b g >> << e c a >> << f d b >> } \context Lyrics \lyrics { T Sp Dp S D Tp "D{\\kern-5pt}$\\mid$" } @end lilypond @@ -1907,8 +1907,8 @@ section. @aref{functional harmony}. \time 4/4 \clef treble \context Voice - \partial 4 < c4 g e > | - < c a f > < b g d > < c2 g e > + \partial 4 << c g e >>4 | + << c a f >> << b g d >> << c2 g e >> } \property Score.LyricText \set #'font-style = #'large \addlyrics @@ -1942,13 +1942,13 @@ Consonances: \property Score.barNonAuto = ##t \property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { - s - s - s - s - s - s - s s + <>_"unisone " s + <>_"third " s + <>_"fourth " s + <>_"fifth " s + <>_"sixth " s + <>_"octave " s + <>_"decime" s s } @end lilypond @@ -1958,9 +1958,9 @@ Dissonances: \property Score.barNonAuto = ##t \property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { - s s - s s - s s + <>_"second " s s + <>_"seventh " s s + <>_"ninth" s s } @end lilypond @@ -2001,14 +2001,14 @@ of such two forms an octave. \property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { - < g1 g > s - < g^"minor" as > s - < g^"major" a! > s - < g^"augm" ais > s - < gis^"dimin" bes > s - < g!^"minor" bes > s - < g^"major" b! > s - < g^"augm" bis > s + << g g >>1 s + << g as >>^"minor" s + << g a! >> s + << g ais >>^"augm" s + << gis bes >>^"dimin" s + << g! bes >>^"minor" s + << g b! >>^"major" s + << g bis >>^"augm" s } \context Lyrics \lyrics { "unisone " "second " "second " "second " @@ -2022,14 +2022,14 @@ of such two forms an octave. \property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - < g1^"perfect" c > s - < g^"augm" cis > s - < g^"perfect" d' > s - < g^"dim" des' > s - < gis^"dimin" es' > s - < g!^"minor" es' > s - < g^"major" e'! > s - < g^"augm" eis' > s + << g c >>^"perfect" s + << g cis >>^"augm" s + << gd' >>^"perfect" s + << g des' >> ^"dim" s + << gis es' >>^"dimin" s + << g! es' >>^"minor" s + << g e'! >>^"major" s + << g eis' >>^"augm" s } \context Lyrics \lyrics { "fourth " "fourth " "fifth " "fifth " @@ -2043,14 +2043,14 @@ of such two forms an octave. \property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - < gis1^"dimin" f'! > s - < g!^"minor" f'! > s - < g^"major" fis' > s - < g g' > s - < g^"minor" as' > s - < g^"major" a'! > s - < g^"minor" bes' > s - < g^"major" b'! > s + << gis f'! >>1^"dimin" s + << g! f'! >>^"minor" s + << g fis' >>^"major" s + << g g' >> s + << g as' >>^"minor" s + << g a'! >>^"major" s + << g bes' >>^"minor" s + << g b'! >>^"major" s } \context Lyrics \lyrics { "seventh " "seventh " "seventh " "octave " @@ -2074,9 +2074,9 @@ The difference between an interval and an octave. \property Score.barNonAuto = ##t \property Score.TextScript \set #'font-style = #'large \context Staff \notes\relative c'' { - < g1_"second " a > s s < g'_"seventh " a, > s s \bar "||" - < g,_"third " b > s s < g'_"sixth " b, > s s \bar "||" - < g,_"fourth " c > s s < g'_"fifth " c, > s s \bar "||" + << g a >>1_"second s s << g' a, >>_"seventh " s s \bar "||" + << g, b >>_"third " s s << g' b, >>_"sixth " s s \bar "||" + << g, c >>_"fourth " s s << g' c, >>_"fifth " s s \bar "||" } @end lilypond @@ -3695,7 +3695,7 @@ with figures designating the chief @aref{interval}s and es4 d c bes | bes } \context Voice = rhb { \stemDown - < bes8 g > as < as f > g < g es > f < d f > es | < g4 es > } + << bes g >>8 as << as f >> g << g es >> f << d f >> es | << g es >>4 } > } \addlyrics diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 7153f98b75..afa7f51015 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -322,7 +322,7 @@ Durations can also be produced through GUILE extension mechanism. Dot placement for chords is not perfect. In some cases, dots overlap: @lilypond[] - \context Voice { } + <>4. @end lilypond @@ -339,7 +339,7 @@ slurs, which indicate articulation, or phrasing slurs, which indicate musical phrasing. A tie is entered using the tilde symbol `@code{~}'. @lilypond[fragment,verbatim,center] - e' ~ e' ~ + e' ~ e' <> ~ <> @end lilypond When a tie is applied to a chord, all note heads (whose pitches match) are @@ -351,7 +351,7 @@ If you want less ties created for a chord, you can set for every tied chord. @lilypond[fragment,verbatim,center] \property Voice.sparseTies = ##t - ~ + <> ~ <> @end lilypond In its meaning a tie is just a way of extending a note duration, similar @@ -599,9 +599,9 @@ preceding note. @lilypond[fragment,verbatim,center] \relative c' { - c - - + c <> + <> + <> } @end lilypond @cindex @code{\notes} @@ -1635,7 +1635,7 @@ input file: @lilypond[singleline,fragment,verbatim] \property Staff.autoAccidentals = #'( Staff (any-octave . 0) ) -cis'4 r2 | cis'4 r2 | r | r | +cis'4 <> r2 | cis'4 <> r2 | <> r | <> r | @end lilypond The only solution is to manually insert the problematic @@ -2916,11 +2916,11 @@ f'4 g'4 a'4 \sostenutoUp @cindex @code{\arpeggio} You can specify an arpeggio sign on a chord by attaching an -@code{\arpeggio} to a note of the chord. +@code{\arpeggio} to a chord. @lilypond[fragment,relative,verbatim] - \context Voice + <>-\arpeggio @end lilypond When an arpeggio crosses staves in piano music, you attach an arpeggio @@ -2930,8 +2930,8 @@ to the chords in both staves, and set @lilypond[fragment,relative,verbatim] \context PianoStaff < \property PianoStaff.connectArpeggios = ##t - \context Voice = one { } - \context Voice = other { \clef bass } + \context Voice = one { <>-\arpeggio } + \context Voice = other { \clef bass <>-\arpeggio} > @end lilypond @@ -2945,9 +2945,9 @@ arpeggio, you should set the arpeggio object property @lilypond[fragment,relative,verbatim] \context Voice { \property Voice.Arpeggio \set #'arpeggio-direction = #1 - + <>-\arpeggio \property Voice.Arpeggio \set #'arpeggio-direction = #-1 - + <>-\arpeggio } @end lilypond @@ -2962,8 +2962,8 @@ arpeggiate the chord. To draw these brackets, set the \property PianoStaff.connectArpeggios = ##t \property PianoStaff.Arpeggio \override #'molecule-callback = \arpeggioBracket - \context Voice = one { } - \context Voice = other { \clef bass } + \context Voice = one { <>-\arpeggio } + \context Voice = other { \clef bass <>-\arpeggio } > @end lilypond @@ -3095,7 +3095,6 @@ middle C, in string order: thus the notes are e, a, d & g) \notes { a,4 c' a e' e c' a e' } - > @end lilypond @@ -3154,9 +3153,9 @@ twoWays = \notes \transpose c c' { \chords { c1 f:sus4 bes/f } - - - + <> + <> + <> } \score { @@ -3302,7 +3301,7 @@ directly using simultaneous music. @lilypond[verbatim,singleline] scheme = \notes { - \chords {a1 b c} + \chords {a1 b c} <> <> } \score { \notes< @@ -3339,9 +3338,9 @@ are entered as a list of pitches: @lilypond[verbatim,center,singleline] scheme = \notes { - - - + <>1 + <> + <> } \score { @@ -4441,7 +4440,7 @@ property. \context Staff \outputproperty #(make-type-checker 'note-head-interface) #'extra-offset = #'(0.5 . 0.75) - } + <>8 } @end lilypond @cindex @code{extra-offset} @@ -4874,7 +4873,7 @@ kneed stems. \score { \context PianoStaff \notes \transpose c c'' < \context Staff = up { s1 } - \context Staff = down { [c8 c \translator Staff=up c + \context Staff = down { [c8 c \translator Staff=up <> c \translator Staff=down c c c] } > \paper { linewidth = -1 } diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index cf84115ce1..a90fada776 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -818,13 +818,6 @@ r4 <>4 <>8 @end quotation @separate -@ignore -@c te diepzinnig? -@c hmm, te losjes, iig -In general, @code{ < @var{stuff} > } is used when @var{stuff} all -happens at the same time, like in chords, or (like in the two-staff -example above) in a bunch of stacked staves. -@end ignore You can combine beams and ties with chords. Beam and tie markings must be placed outside the chord markers: @@ -834,11 +827,12 @@ r4 <>8-[ <>-]-~ <> @end lilypond @end quotation +@ignore When you want to combine chords with slurs and dynamics, technical detail crops up: you have type these commands next to the notes, which means that they have to be inside the @code{< >}. Don't get confused by the chord @code{< >} and the dynamic @code{\< \>}! - +@end ignore @quotation @example @@ -1726,16 +1720,14 @@ precisely one @code{Voice} context, so we give it a unique name @separate @example - +<>4-\arpeggio @end example -The delimiters @code{<} and @code{>} are shorthands for -@code{\simultaneous @{} and @code{@}}. The expression enclosed in -@code{<} and @code{>} is a chord. +The delimiters @code{<<} and @code{>>} enclose the pitches of a chord. +@code{\arpeggio} typesets an arpeggio sign (a wavy vertical line) +before the chord. @cindex arpeggio -@code{\arpeggio} typesets an arpeggio sign (a wavy vertical line) before -the chord. @separate @example @@ -1777,7 +1769,7 @@ these notes are indeed processed by precisely one context with @code{\context}. @separate @example -\voiceOne s4 g8. b,16 c8 r +\voiceOne s4 g8. b,16 c8 r <>8. <>16 @end example The oboes should have stems up to keep them from interfering with @@ -1785,7 +1777,7 @@ the staff-jumping bass figure. To do that, we use @code{\voiceOne}. @separate @example -\grace < d4 )f> +\grace <>-( <>4-) <>2 @end example @cindex @code{\grace} @cindex ornaments @@ -1806,7 +1798,7 @@ of music is multiplied by the fraction. Triplets make notes occupy 2/3 of their notated duration, so in this case the fraction is 2/3. @separate @example -@{ @} +@{ <>8 <> <> @} @end example The piece of music to be `tripletted' is sequential music containing three chords. @@ -1847,7 +1839,7 @@ This ends the two-part section. @separate @example \stemBoth -\grace <)b8. d8.-\trill> | +\grace <>8-( <>8.-\trill <>16 | @end example @cindex trill @cindex stemBoth diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 45f25dec58..bc336b6fd4 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -23,3 +23,4 @@ start counting after the anacrusis." } } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 7d72f24972..4c37d843d6 100644 --- a/input/regression/bar-scripts.ly +++ b/input/regression/bar-scripts.ly @@ -53,3 +53,4 @@ stscore = \score { \onestaff \paper { \score{\notes c''} \score {\scscore} +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index fc72a3d009..48cde2cc15 100644 --- a/input/regression/beam-auto-knee.ly +++ b/input/regression/beam-auto-knee.ly @@ -15,3 +15,4 @@ threshold. linewidth = 40*\staffspace } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index ab963774fc..87cd5ef6b4 100644 --- a/input/regression/beam-center-slope.ly +++ b/input/regression/beam-center-slope.ly @@ -36,3 +36,4 @@ linewidth = 0.0 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 899e9f19cd..0388fdfcf7 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -81,3 +81,4 @@ beams this way." %% Local variables: %% LilyPond-indent-level:2 %% End: +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly index 0d8b3176fe..1371224a52 100644 --- a/input/regression/beam-cross-staff-auto-knee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -23,3 +23,4 @@ with explicit staff switches)." linewidth = -1.0 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index bb558a3afb..2d8a9244bd 100644 --- a/input/regression/beam-cross-staff-slope.ly +++ b/input/regression/beam-cross-staff-slope.ly @@ -11,7 +11,7 @@ don't cause extreme slopes" { \stemDown f16( \> d \! b \translator Staff = down \stemUp - \clef treble g ~ < g8 )e> + \clef treble g ~ << g e>>8-) [e \translator Staff = up \stemDown @@ -31,3 +31,4 @@ don't cause extreme slopes" \paper { linewidth = -1. } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly index 50fbfd53df..a83749664c 100644 --- a/input/regression/beam-cross-staff.ly +++ b/input/regression/beam-cross-staff.ly @@ -31,3 +31,4 @@ behave well, wherever the switching point is. } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index 8935525c4d..5dcd524a8f 100644 --- a/input/regression/beam-default-lengths.ly +++ b/input/regression/beam-default-lengths.ly @@ -14,4 +14,4 @@ f4 [f8 f] [f16 f] [f32 f] [f64 f] [f128 f] } \paper{ linewidth = -1.0 } -} \ No newline at end of file +} %% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index e390791604..b845a9fbd2 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -45,3 +45,4 @@ extreme = \notes\relative c'' { linewidth = -1 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index e12a30958a..8b10c283fc 100644 --- a/input/regression/beam-french.ly +++ b/input/regression/beam-french.ly @@ -13,3 +13,4 @@ [c8 c16 e16 g8] }} +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly index b1cf401aab..d85869fb30 100644 --- a/input/regression/beam-funky-beamlet.ly +++ b/input/regression/beam-funky-beamlet.ly @@ -18,3 +18,4 @@ should be pointing to the note head. \paper { linewidth = -1 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly index 7835847863..b3c8f9c62b 100644 --- a/input/regression/beam-funky.ly +++ b/input/regression/beam-funky.ly @@ -30,3 +30,4 @@ \paper { linewidth = -1. } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 6d644d27be..c60c784d0a 100644 --- a/input/regression/beam-length.ly +++ b/input/regression/beam-length.ly @@ -12,3 +12,4 @@ beams should look the same c c } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-manual.ly b/input/regression/beam-manual.ly index c8c8ca2468..7f6d7524d3 100644 --- a/input/regression/beam-manual.ly +++ b/input/regression/beam-manual.ly @@ -21,3 +21,4 @@ linewidth = -1 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index ac33facd96..e521e9b142 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -27,3 +27,4 @@ to the last beam. > } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly index e9db66d2e9..db0b1d6120 100644 --- a/input/regression/beam-over-barline.ly +++ b/input/regression/beam-over-barline.ly @@ -5,3 +5,4 @@ texidoc = "explicit beams may cross barlines. " \score { \notes \context Voice { c2. [c8 c8 c8 c8] } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index eca2ccf9bb..a6e24772ec 100644 --- a/input/regression/beam-position.ly +++ b/input/regression/beam-position.ly @@ -26,3 +26,4 @@ Override with @code{noStemExtend}. } \midi { } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 79aec2c28e..73395468d5 100644 --- a/input/regression/beam-postfix-notation.ly +++ b/input/regression/beam-postfix-notation.ly @@ -12,3 +12,4 @@ texidoc = "Beams and ties may be entered in postfix notation, separating the c8-[-~ c-] } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 5f5873f3e2..18bcd7c781 100644 --- a/input/regression/beam-quarter.ly +++ b/input/regression/beam-quarter.ly @@ -9,3 +9,4 @@ } \paper { linewidth = -1.0 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 01088abf39..7b041f7038 100644 --- a/input/regression/beam-shortened-lengths.ly +++ b/input/regression/beam-shortened-lengths.ly @@ -15,3 +15,4 @@ } \paper{ linewidth = -1.0 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly index f742e88a9d..77e9b18b49 100644 --- a/input/regression/beamed-chord.ly +++ b/input/regression/beamed-chord.ly @@ -12,6 +12,7 @@ texidoc = "Hairy case for beam, chord, and automatic knees." %\stemUp \clef alto \time 3/4 - r8 ) bes' d g, c, c,> r | + r8 <>-( ) bes' d <>-> r | } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index f4aa21fa84..402623666d 100644 --- a/input/regression/beaming-ternary-metrum.ly +++ b/input/regression/beaming-ternary-metrum.ly @@ -10,3 +10,4 @@ texidoc = "automatic beaming also works in ternary time sigs." } \paper { linewidth = -1. } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly index 0fd15d381c..b066e478f7 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -28,3 +28,4 @@ hidden just as with breakable bar lines. }} +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 8bf90d6b7e..fe2c270729 100644 --- a/input/regression/beams.ly +++ b/input/regression/beams.ly @@ -11,3 +11,4 @@ [c8 c16 e16 g8] }} +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/between-systems.ly b/input/regression/between-systems.ly index 45d0d74c5c..4b842fa841 100644 --- a/input/regression/between-systems.ly +++ b/input/regression/between-systems.ly @@ -19,3 +19,4 @@ The same mechanism can be used to force pagebreaks. c1 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/break.ly b/input/regression/break.ly index 116fe8242e..7e474dbe36 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -17,3 +17,4 @@ Breaks can be encouraged and discouraged using @code{\\break} and indent = 0.0 linewidth = 4.0\cm} } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly index 89701abd41..9fddd84702 100644 --- a/input/regression/chord-changes.ly +++ b/input/regression/chord-changes.ly @@ -25,3 +25,4 @@ settings = { linewidth = 40 * \staffspace } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-names.ly b/input/regression/chord-names.ly index 610dd49161..a7bb79257f 100644 --- a/input/regression/chord-names.ly +++ b/input/regression/chord-names.ly @@ -36,3 +36,4 @@ chord = \notes\transpose c c'\chords{ } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 8e7e803a35..ea400c81c0 100644 --- a/input/regression/chord-scripts.ly +++ b/input/regression/chord-scripts.ly @@ -18,3 +18,5 @@ texidoc = "Scripts can also be attached to chord elements." } } +%% new-chords-done %% +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 6ce983e12e..b44efe3225 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -33,3 +33,4 @@ stems. } \midi { } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index 12809fbc2c..45a0883678 100644 --- a/input/regression/cluster.ly +++ b/input/regression/cluster.ly @@ -9,8 +9,8 @@ voiceI = % same as voiceII, but with ordinary notes \notes \relative c' { \stemUp c4 f4 - a4 | \break - < g8 a8 > < e8 a8 > a4 c1 < d4 b4 > e4 | + a4 <>4 | \break + << g a >>8 << e a >>8 a4 c1 << d b >>4 e4 | c4 a4 f4 g4 a4 } } @@ -26,10 +26,10 @@ voiceII = % same as voiceI, but with cluster notation \property Voice.Cluster \set #'shape = #'ramp c4 f4 \startCluster - a4 | \break + a4 <>4 | \break %%% do not try something like: < { g8 e8 } a4 > - %%% instead, do the following: < g8 a8 > < e8 a8 > - < g8 a8 > < e8 a8 > a4 c1 < d4 b4 > e4 | + %%% instead, do the following: << g a >>8 << e a >>8 + << g a >>8 << e a >>8 a4 c1 << d b >>4 e4 | c4 \stopCluster a4 f4 g4 a4 } } @@ -45,3 +45,4 @@ voiceII = % same as voiceI, but with cluster notation linewidth = 15.0 \cm } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly index 41a55978f0..e97ea89dba 100644 --- a/input/regression/collision-2.ly +++ b/input/regression/collision-2.ly @@ -10,3 +10,4 @@ > } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 9e48f667c6..0d216c6fb0 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -21,3 +21,4 @@ } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 9918b72e7b..2f3ca605a0 100644 --- a/input/regression/collision-heads.ly +++ b/input/regression/collision-heads.ly @@ -28,3 +28,4 @@ if the black note heads are from 8th or shorter notes. } > } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly index 9b6743b38b..ffc34d49d5 100644 --- a/input/regression/collision-mesh.ly +++ b/input/regression/collision-mesh.ly @@ -9,9 +9,9 @@ are resolved." \time 3/4 % Here's what I was trying to do: < \context Voice = VI {\stemDown - - - + <>4 + <>4. + <>4 d'4 d'4. } @@ -19,9 +19,9 @@ are resolved." \context Voice=VII {\stemUp d'4 d'4. - - - + <>4 + <>4 + <>4. } > } @@ -31,3 +31,4 @@ are resolved." +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index 3dd98f152e..a6546f7665 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -23,8 +23,8 @@ twovoicechords = \context Staff \notes < \stemUp e4 d c b a g f } \context Voice = ii \relative c' { - \stemDown - + \stemDown <>4 <>4 <>4 <>4 <> + <> <> } > @@ -75,3 +75,4 @@ hairyChord = \context Staff \notes\relative c' < % \midi { \tempo 4:80 } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index ceed2507b8..7edbdf7b6f 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -21,3 +21,4 @@ Completion heads are not fooled by polyphony with a different rhythm. } } } +%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index 461f02f2e0..8df69faee2 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -21,4 +21,4 @@ notes that cross bar lines are split into tied notes. \consists "Completion_heads_engraver" } } -} \ No newline at end of file +}%% new-chords-done %% \ No newline at end of file diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index 97bcbe1146..56bec36584 100644 --- a/input/regression/finger-chords.ly +++ b/input/regression/finger-chords.ly @@ -24,3 +24,5 @@ easier to process." } } + +%% new-chords-done %% diff --git a/lily/cluster.cc b/lily/cluster.cc index 96040f5e92..f487cfb265 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -194,4 +194,4 @@ Cluster::brew_molecule (SCM smob) ADD_INTERFACE (Cluster,"cluster-interface", "A graphically drawn musical cluster.", - "shape padding"); + "shape padding segments"); diff --git a/lily/grob.cc b/lily/grob.cc index 8c059f6274..9aeb95f651 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -257,7 +257,6 @@ Grob::get_uncached_molecule ()const SCM mol = SCM_EOL; if (gh_procedure_p (proc)) mol = gh_apply (proc, scm_list_n (this->self_scm (), SCM_UNDEFINED)); - Molecule *m = unsmob_molecule (mol); diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm index 0d7a13f259..20a24dcc15 100644 --- a/scm/backend-documentation-lib.scm +++ b/scm/backend-documentation-lib.scm @@ -152,7 +152,7 @@ node." (define (check-dangling-properties prop) (if (not (object-property prop 'iface-marked)) - (error "\ngrob-property-description.scm: Can't find property:" prop))) + (error "\ngrob-property-description.scm: Can't find interface for property:" prop))) (map check-dangling-properties all-backend-properties) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 9aad6e3c75..cf9c8d503a 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -546,11 +546,12 @@ (Y-offset-callbacks . (,Side_position_interface::out_of_staff ,Side_position_interface::aligned_side)) (molecule-callback . ,Measure_grouping::brew_molecule) - (meta . ((interfaces . (spanner-interface measure-grouping-interface)))) (staff-padding . 3) (padding . 2) (direction . 1) (thickness . 1) (height . 2.0) + (staff-padding . 3) + (meta . ((interfaces . (spanner-interface side-position-interface measure-grouping-interface)))) )) (MultiMeasureRest . ( @@ -575,7 +576,7 @@ (direction . 1) (padding . 2) (font-family . number) - (meta . ((interfaces . (side-position-interface font-interface spanner-interface)))) + (meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface)))) )) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index abef417f2d..e2d176375f 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -384,7 +384,7 @@ reference point. TODO: revise typing.") (grob-property-description 'self-alignment-Y number? "like self-alignment-X but for Y axis.") -(grob-property-description 'segments list? "DOCME. ") +(grob-property-description 'segments list? "DOCME. ") (grob-property-description 'shape symbol? "shape of cluster segments. Valid values include 'leftsided-stairs', 'rightsided-stairs', 'centered-stairs', and 'ramp'.") (grob-property-description 'shorten number? "the amount of space that a stem should be shortened (DOCME!)") (grob-property-description 'shorten-pair number-pair? "the length on each side to shorten a text-spanner, for example a pedal bracket") -- 2.39.2