+2004-02-13 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * input/GNUmakefile (SUBDIRS): remove ascii-art
+
2004-02-13 Jan Nieuwenhuizen <janneke@gnu.org>
* input/: Convert ly files that still had \property. Fixes make
depth = ..
-SUBDIRS=test regression tutorial no-notation ascii-art template mutopia
+SUBDIRS=test regression tutorial no-notation template mutopia
examples= les-nereides puer-fragment
+++ /dev/null
-depth = ../..
-
-LOCALSTEPMAKE_TEMPLATES=ly mutopia
-include $(depth)/make/stepmake.make
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-\include "paper-as5.ly"
-
-\score {
- \notes\relative c'' {
- \time 3/8
- a8 a a
- \time 5/8
- a a a a a
- %a16 a a a a a a a a a
- }
- \paper {
- raggedright = ##t
- \translator {
- \StaffContext
- StaffSymbol \override #'print-function = #(lambda (x) '())
- }
- }
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-
-\version "2.1.22"
-
-\score {
- \context Voice \notes\relative c {
- \time 4/4
- g''1 a2 b4. c8
- \repeat "volta" 2 { a4 b c d } \alternative { { c c c c } { d2 d4 [d8 d] } }
-
- }
- \paper { }
- \midi { }
-}
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-
-% test for ascii-art output
-
-\include "paper-as9.ly"
-
-\score {
- \notes\relative c'{
- \time 4/4
- c8( e g )b
- d( d d )d
- \bar "|."
- }
- \paper {
- linewidth=65.0\char
- \translator { \StaffContext barSize = #9 }
- %\translator { \VoiceContext beamHeight = #0 }
- \translator { \VoiceContext beamHeight = ##f }
- }
-
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-\include "paper-as5.ly"
-
-\score {
- \notes\relative c'' {
- \time 4/4
- g1 a b c
- g2 a b c
- g4 a b c
- }
- \paper {
- \translator {
- \StaffContext
- BarLine \override #'bar-size = #5
- }
- }
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-\include "paper-as9.ly"
-
-\score {
- \notes\relative c'' {
- \time 4/4
- g1 a b c
- g2 a b c
- g4 a b c
- }
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-\include "paper-as5.ly"
-
-\score{
- <<
- \context Staff \notes\relative c'{
- c d e f
- \repeat "volta" 2 { g a b c }
- \alternative { { c b a g } { f e d c } }
- }
- \context Lyrics \lyrics {
- De eer- ste << { maat } { moet } >>
- \repeat fold 2 { }
- \alternative {
- { en dan twee keer }
- { een koe- plet _ }
- }
- en dan nog dit er ach- ter aan
- }
- >>
-}
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-
-\include "paper-as5.ly"
-
-\score {
- \context StaffGroup <<
- \context Staff=upper \notes\relative c{
- \key f \major
- \time 3/4
- r8^"Moderato" %\pp
- <<g'-. c-.>> <<c-. es-.>> <<g-. c-.>> <<c-. es-.>> <<g-. c-.>> |
- r8 <<as-. c-.>> <<c-. es-.>>
- }
- \context Staff=lower \notes\relative c{
- \key f \major
- \time 3/4
- \clef "bass"
- <<c,2 c'>> r4
- <<as2 as'>> r4
- }
- >>
- \paper {
- indent=4.0\char
- linewidth=78.0\char
- \translator { \StaffContext Bar \override #'bar-size = #5 }
- \translator {
- \VoiceContext
- % horizontal beams
- Beam \override #'height = #0
- autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1)
- TextScript \set #'no-spacing-rods = ##t
- }
- }
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-% FIXME: broken system-start-delimiter.cc:staff_brace lookup
-
-\include "paper-as9.ly"
-
-\score {
- \context GrandStaff <<
- \context Staff=upper \notes\relative c{
- \key f \major
- \time 3/4
- r8^"Moderato" %\pp
- <<g'-. c-.>> <<c-. es-.>> <<g-. c-.>> <<c-. es-.>> <<g-. c-.>> |
- r8 <<as-. c-.>> <<c-. es-.>>
- }
- \context Staff=lower \notes\relative c{
- \key f \major
- \time 3/4
- \clef "bass"
- <<c,2 c'>> r4
- <<as2 as'>> r4
- }
- >>
- \paper {
- indent=4.0\char
- linewidth=78.0\char
- \translator {
- \VoiceContext
- % horizontal beams
- Beam \override #'height = #0
- autoBeamSettings \override #'(begin * * * *) = #(ly:make-moment 0 1)
- TextScript \set #'no-spacing-rods = ##t
- }
- }
-}
-
+++ /dev/null
-#(ly:set-option 'old-relative)
-\version "2.1.22"
-% ASCII Art output
-%
-% Process as:
-%
-% lilypond -fas foo.ly
-% as2text foo.as
-
-
-\header{
-filename = "twinkle.ly"
-title = "Twinkle Twinkle Little Star"
-composer = "Traditional"
-enteredby = "hwn and jcn"
-copyright = "public domain"
-}
-
-
-
-\include "paper-as5.ly"
-
-melody = \notes \relative c'' {
- \time 2/4
- c4 c | g' g | a a | g g |
-%{
- f f | e e | d d8.( e16 | )c2 |
-
- g'4 g | f f | e e | d d |
- g g | f f | e( e8. f16 | e4 )d |
-
- c c | g' g | a a | g g |
- f f | e e | d d8.( e16 | )c2 |
-%}
-}
-
-accompany = \notes \relative c {
- \clef "bass"
- \time 2/4
- c4 c' | e c | f c | e c |
-%{
- d b | c a | f g | c,2 |
-
- e'4 g, | d' g, | c g | b g |
- e' g, | d' g, | c c8.( d16 | c4 )b |
-
- c, c' | e c | f c | e c |
- d b | c a | f g | c,2
-%}
-}
-
-
-text = \lyrics{
- Twin -- kle, twin -- kle, lit -- tle star, " "
-%{
- How I won -- der what you " " are.
- Up a -- bove the world so high, " "
- Like a dia -- mond in the " " sky. " "
- Twin -- kle, twin -- kle, lit -- tle star, " "
- How I won -- der what you " " are!
-%}
-}
-
-\score{
- \context GrandStaff <<
- \addlyrics
- \context Staff=upper \melody
- \context Lyrics=between \text
- \context Staff=lower \accompany
- >>
- \paper{
- \translator { \GrandStaffContext \accepts "Lyrics" }
- indent=4.0\char
- linewidth=78.0\char
- }
-}
-
copyright = "Public Domain"
}
-\version "2.1.7"
+\version "2.1.22"
\include "nederlands.ly"
}
modernAccidentals = {
- \set Staff.extraNatural = ##f
- \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0))
- \set Staff.autoCautionaries = #'()
+ \set Staff.extraNatural = ##f
+ \set Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0))
+ \set Staff.autoCautionaries = #'()
}
}
+<<<<<<< morgenlied.ly
+ignoreMelisma = \set ignoreMelismata = ##t
+ignoreMelismaOff = \unset ignoreMelismata
+=======
ignoreMelisma = \set ignoreMelismata = ##t
ignoreMelismaOff = \unset ignoreMelismata
+>>>>>>> 1.20
firstVerse = \lyrics {
+<<<<<<< morgenlied.ly
+ \set stanza = "1."
+=======
\set stanza = "1."
+>>>>>>> 1.20
Sü -- ßes Licht! Aus
\ignoreMelisma
}
secondVerse = \lyrics {
+<<<<<<< morgenlied.ly
+ \set stanza = "2."
+=======
\set stanza = "2."
+>>>>>>> 1.20
Ach, der Lie -- be sanf
-- tes We -- hen schwellt mir |
das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich |
g16(_\p fis a g fis g f e d c b a ) |
<g e>8( <es fis a> <d f b> <c e c'>) r8 r |
r8 c'( e,) f r a |
+<<<<<<< morgenlied.ly
+ \once \override DynamicLineSpanner #'padding =#3
+=======
\once \override DynamicLineSpanner #'padding =#3
+>>>>>>> 1.20
r8_\> << { s8 s8-\! } << { fis( g)
} \\ { c,4 } >> >> r8 <e c g> <e c g> |
<d c a>4. r8 \clef bass <d b f> <d b f> |
fis r4 <g b>8( |
<f c'>4.)
+<<<<<<< morgenlied.ly
+ \once \override Slur #'height-limit = #1.0
+=======
\once \override Slur #'height-limit = #1.0
+>>>>>>> 1.20
<g c>4.( | <a c>4.) <g b,> |
c,4 r8 g4 r8 |
\lyricsto "singer" \new Lyrics \firstVerse
\lyricsto "singer" \new Lyrics \secondVerse
\new PianoStaff <<
+<<<<<<< morgenlied.ly
+ \set PianoStaff.instrument = \markup {
+=======
\set PianoStaff.instrument = \markup {
+>>>>>>> 1.20
\bold
\bigger\bigger\bigger\bigger \huge "2. " }
\new Staff \pianoRH
\version "2.1.22"
-dynamicUp = \override DynamicLineSpanner #'direction = #1
+dynamicUp = \override DynamicLineSpanner #'direction = #1
dynamicRevert = \revert DynamicLineSpanner #'direction
#(set-global-staff-size 16)
g8. b16 es4. d8 |
c8. g16 es4. c8 |
\grace {
+<<<<<<< standchen.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.31
as'32[( bes ]
\revert Stem #'stroke-style }
\times 2/3 { as8[)( g)] as } c4. as8 |
g2. |
\grace {
+<<<<<<< standchen.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.31
f32[( g ]
\revert Stem #'stroke-style }
\times 2/3 { f8[)( e)] f } as4. f8 |
g8. b16 es4. d8 |
c8. g16 e4. c8 |
\grace {
+<<<<<<< standchen.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.31
a'32[( b ]
\revert Stem #'stroke-style }
\times 2/3 { a!8[)( gis)] a } c4. a8 |
R2. |
R2. |
\grace {
+<<<<<<< standchen.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.31
a32[( b ]
\revert Stem #'stroke-style }
\times 2/3 { a!8[)( gis)] a } c4. a8 |
r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
%20
r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |
+<<<<<<< standchen.ly
+ \override Slur #'attachment = #'(stem . stem)
+=======
\override Slur #'attachment = #'(stem . stem)
+>>>>>>> 1.31
\grace {
+<<<<<<< standchen.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.31
as'32[( bes ]
\revert Stem #'stroke-style }
<a a'>4.-> <f f'>8)
<e e'>2. |
<es! es'! >2. |
+<<<<<<< standchen.ly
+ \override TextScript #'font-shape = #'italic
+=======
\override TextScript #'font-shape = #'italic
+>>>>>>> 1.31
<d d'>2._"decresc."
\revert TextScript #'font-shape
<f g>4. <b, g'>8(-. <d g>-. <f g>)-. |
%80
+<<<<<<< standchen.ly
+ \override TextScript #'font-shape = #'italic
+=======
\override TextScript #'font-shape = #'italic
+>>>>>>> 1.31
<e g>2._"dim."
\revert TextScript #'font-shape
R1 * 3/4 * 6
}
+<<<<<<< standchen.ly
+trebleStaff = \context Staff = treble<<
+ \set Staff.midiInstrument = "acoustic grand"
+=======
trebleStaff = \context Staff = treble<<
\set Staff.midiInstrument = "acoustic grand"
+>>>>>>> 1.31
\global
{\clef treble
+<<<<<<< standchen.ly
+ \override autoBeamSettings #'(begin * * * *) = #(ly:make-moment 0 1)
+=======
\override autoBeamSettings #'(begin * * * *) = #(ly:make-moment 0 1)
+>>>>>>> 1.31
\trebleIntro
\trebleVerseOne
\trebleEentje
\trebleThrough }
>>
+<<<<<<< standchen.ly
+bassStaff = \context Staff = bass<<
+ \set Staff.midiInstrument = "acoustic grand"
+=======
bassStaff = \context Staff = bass<<
\set Staff.midiInstrument = "acoustic grand"
+>>>>>>> 1.31
\global
\clef bass
{\bassIntro
\score{
<<
\new Staff <<
+<<<<<<< standchen.ly
+ \set Staff.midiInstrument = "synth voice"
+=======
\set Staff.midiInstrument = "synth voice"
+>>>>>>> 1.31
%% insert \transpose if necessary, depending on voice range.
\global
\vocals
}
-sarabandeA = \context Voice \notes \relative c {
- \override Staff.NoteCollision #'merge-differently-dotted = ##t
+sarabandeA = \context Voice \notes \relative c {
+ \override Staff.NoteCollision #'merge-differently-dotted = ##t
<< { d8. e16 e4.\trill d16 e } \\
d'[ cis] |
%% d4 d,,2 |
d4
+<<<<<<< baerenreiter-sarabande.ly
+ \override NoteHead #'after-line-breaking-callback
+ = #(lambda (smob) (assert-system-count smob 6))
+=======
\override NoteHead
#'after-line-breaking-callback
= #(lambda (smob) (assert-system-count smob 6))
+>>>>>>> 1.30
d,,2 |
}
\stemDown \tieDown
e4 ~ e16 f e d cis a b cis d e f d |
- \override TextScript #'font-style = #'finger
+ \override TextScript #'font-style = #'finger
bes2 a ~ |
a a |
d, cis' |
\skip 1*2 |
\skip 4*3
\change Staff=upper \stemUp
- \override NoteColumn #'horizontal-shift = #1
+ \override NoteColumn #'horizontal-shift = #1
c''4 |
%5
a gis ~ gis16 gis fis e
\skip 4*1
\change Staff=lower \stemDown
+<<<<<<< bwv940.ly
+ \override NoteColumn #'horizontal-shift = #0
+=======
\override NoteColumn #'horizontal-shift = #0
+>>>>>>> 1.7
\stemUp\tieUp
b2 a |
g a4. gis16 a |
comes = \context Voice=one \notes \relative c'' {
\voiceOne
- \override MultiMeasureRest #'staff-position = #6
+ \override MultiMeasureRest #'staff-position = #6
R1 |
R1 |
r8 g'16 fis g8 c, es g16 fis g8 a |
\score {
\notes \context PianoStaff <<
+<<<<<<< wtk1-fugue2.ly
+ \override Score.TimeSignature #'style = #'C
+=======
\override Score.TimeSignature #'style = #'C
+>>>>>>> 1.15
\context Staff = treble <<
\key c \minor
\dux
forcedBreak = \break
global = \notes { \key fis \major \time 6/8
- \set Score.beatLength = #(ly:make-moment 3 8)
+ \set Score.beatLength = #(ly:make-moment 3 8)
\repeat volta 2 { s2.*8 } s2.*26 \bar "|."
}
righta = \notes \transpose c cis' {
% \stemUp \slurUp \tieUp
\stemUp
+<<<<<<< romanze-op28-2.ly
+ \override Slur #'attachment = #'(stem . stem)
+=======
\override Slur #'attachment = #'(stem . stem)
+>>>>>>> 1.32
\repeat volta 2 {
+<<<<<<< romanze-op28-2.ly
+ \override TextScript #'extra-offset = #'(-8.0 . 2.5)
+=======
\override TextScript #'extra-offset = #'(-8.0 . 2.5)
+>>>>>>> 1.32
\m a,16[^\p( \u c^\markup {
\large "Einfach ("
\note #"8" #1
c_3 g,_2 es, g, h,_4 g, d, g, c g,8 f,16 |
c g, es, g, es c_3 as, c^2 d^3 c h, c |
e des b,\< des g e_3 ces_4 d_2 f^3 d cis d |
+<<<<<<< romanze-op28-2.ly
+ \override PhrasingSlur #'extra-offset = #'(0 . 3)
+ \override PhrasingSlur #'beautiful = #42
+=======
\override PhrasingSlur #'extra-offset = #'(0 . 3)
\override PhrasingSlur #'beautiful = #42
+>>>>>>> 1.32
g\( fes des fes b g_3 es_1\! ges_2 a^3 ges f_1 ges_2 |
r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,[_1 as,] |
g,8 b,16[ g, e, cis,] d,\)_4 \< f, h, d_3 f_2 r16\! }
f,8.. f32^1 g8^2 a4.) |
a4^1( c8^1_\accent~[c b)] g16^1([ b^2] |
c4)^1 es8^1~es d^1 f^1~ |
+<<<<<<< romanze-op28-2.ly
+ \override PianoStaff.Arpeggio #'direction = #1
+=======
\override PianoStaff.Arpeggio #'direction = #1
+>>>>>>> 1.32
f f8.. f32^1( as4.)^\fermata\arpeggio ~ |
\revert PianoStaff.Arpeggio #'direction
\stemUp \tieUp as r4 r8 |
}
s2. s
\u s4. \grace {
+<<<<<<< romanze-op28-2.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.32
f8(
\revert Stem #'stroke-style }
f4) e8 |
c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ |
ces' b des'-4 c'4)-5( <es'-4 es''>8 |
\stemDown \tieDown des'4.)_5~des'~ |
+<<<<<<< romanze-op28-2.ly
+ \override NoteColumn #'horizontal-shift = #-1 des' s
+=======
\override NoteColumn #'horizontal-shift = #-1 des' s
+>>>>>>> 1.32
}
>>
\change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp
s2.*2
s8 r16 h\( c' d' es' as g8\arpeggio fis(
ges)\) f16-2( a-1 c'-3 f')-1 \grace {
+<<<<<<< romanze-op28-2.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.32
\stemDown \slurUp b,[( f] \stemUp
\revert Stem #'stroke-style }
e')-1( d' c' b-1 a-2\prall g
\score { \notes
\context PianoStaff <<
\pianoCautionaries
+<<<<<<< romanze-op28-2.ly
+ \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t
+ \set PianoStaff.connectArpeggios = ##t
+ \override PianoStaff.Arpeggio #'print-function = \arpeggioBracket
+
+ \override PianoStaff.InstrumentName #'font-size = #6
+ \override PianoStaff.InstrumentName #'font-shape = #'italic
+ \override PianoStaff.InstrumentName #'font-magnification = #3
+=======
\override PianoStaff.NoteCollision #'merge-differently-dotted = ##t
\set PianoStaff.connectArpeggios = ##t
\override PianoStaff.Arpeggio #'print-function = \arpeggioBracket
\override PianoStaff.InstrumentName #'font-size = #6
\override PianoStaff.InstrumentName #'font-shape = #'italic
\override PianoStaff.InstrumentName #'font-magnification = #3
+>>>>>>> 1.32
\set PianoStaff.instrument = "2. "
\context Staff = up {
+<<<<<<< romanze-op28-2.ly
+ \override Staff.DynamicLineSpanner #'direction = #-1
+=======
\override Staff.DynamicLineSpanner #'direction = #-1
+>>>>>>> 1.32
\clef G <<\global \context Voice=upv \righta >>
}
\context Staff = mid {
+<<<<<<< romanze-op28-2.ly
+ \override Staff.InstrumentName #'font-size = #0
+ \override Staff.InstrumentName #'font-shape = #'upright
+ \override Staff.InstrumentName #'font-magnification = #1
+ \override Staff.InstrumentName #'extra-offset = #'(0 . 6)
+ % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}"
+ \set Staff.instrument = \markup { \column < Rechte Hand > }
+=======
\override Staff.InstrumentName #'font-size = #0
\override Staff.InstrumentName #'font-shape = #'upright
\override Staff.InstrumentName #'font-magnification = #1
\override Staff.InstrumentName #'extra-offset = #'(0 . 6)
% \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}"
\set Staff.instrument = \markup { \column < Rechte Hand > }
+>>>>>>> 1.32
\clef F <<\global \context Voice=midv \rightb>>
}
\context Staff = down {
+<<<<<<< romanze-op28-2.ly
+ \override Staff.DynamicLineSpanner #'direction = #1
+=======
\override Staff.DynamicLineSpanner #'direction = #1
+>>>>>>> 1.32
\clef F
<< \global \context Voice=lva \lefta \context Voice=lvb \leftb >>
}
%}
-\version "2.1.7"
+\version "2.1.22"
\include "mozart-hrn3-defs.ly"
\include "mozart-hrn3-allegro.ly"
c4.( d16[ e] f4 e)
a,( d g, c)
d-. d-. \grace {
- \override Stem #'stroke-style = #"grace"
+ \override Stem #'stroke-style = #"grace"
e16(
\revert Stem #'stroke-style }
d8.[) c16 d8. e16]
b[( a)] a4 r8 a[ a a]
a4( cis e g)
\grace {
- \override Stem #'stroke-style = #"grace"
+ \override Stem #'stroke-style = #"grace"
\longgrace g16( \endlonggrace
\revert Stem #'stroke-style }
<< a1(\trill
{ s2 \grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
g16[ a]
\revert Stem #'stroke-style }
} >>
a, ( d g, c)
d d
\grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
e8(
\revert Stem #'stroke-style }
c[( b)] b4 r2
c2 (bes a) a8[(b c cis)]
d2( ~ d8[ e16 d] \grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
\longgrace d16( \endlonggrace
\revert Stem #'stroke-style }
c8[) b16 c)]
\grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
\longgrace c16 \endlonggrace
\revert Stem #'stroke-style }
b8[( a16 g)] g4 r2 |
f4. ( d8) f8[ ( d) f d]
c[ (e] g2) \grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
\longgrace f16( \endlonggrace
\revert Stem #'stroke-style }
e8[)( d16 c)]
<< d1\trill (
{ s2 \grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
c16[ d]
\revert Stem #'stroke-style }
} >>
<< d1(\trill
{ s2 \grace {
+<<<<<<< mozart-hrn3-allegro.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.16
c16[ d]
\revert Stem #'stroke-style }
} >>
% #(ly:set-point-and-click 'line-column)
-longgrace = \override Stem #'stroke-style = #'()
+longgrace = \override Stem #'stroke-style = #'()
endlonggrace = \revert Stem #'stroke-style
ritenuto = \markup { \italic "rit." }
cresc = \notes {
#(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START))))
- \set crescendoText = \markup { \italic \bold "cresc." }
- \set crescendoSpanner = #'dashed-line
+ \set crescendoText = \markup { \italic \bold "cresc." }
+ \set crescendoSpanner = #'dashed-line
}
%%
romanze = \notes \relative c' {
\key f \major
\time 2/2
- \set Score.skipBars = ##t
+ \set Score.skipBars = ##t
c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } }
f8) a,4 a
c[ ( e) g g] g[( f e d)]
c4(
\grace {
+<<<<<<< mozart-hrn3-romanze.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.15
\longgrace e16 \endlonggrace
\revert Stem #'stroke-style }
\mark "C"
%% this is a trick to get the sfp-s to align.
+<<<<<<< mozart-hrn3-romanze.ly
+ \override Hairpin #'transparent = ##t
+=======
\override Hairpin #'transparent = ##t
+>>>>>>> 1.15
des1\sfp \>
g,1\sfp\! \>
c\sfp \! \>
c[ c c] c[ c c]
}
-rightsixteenth = { \set stemLeftBeamCount = 1
- \set stemRightBeamCount = 2 }
-leftsixteenth = { \set stemLeftBeamCount = 2
- \set stemRightBeamCount = 1 }
-bothsixteenth = { \set stemLeftBeamCount = 2
- \set stemRightBeamCount = 2 }
+rightsixteenth = { \set stemLeftBeamCount = 1
+ \set stemRightBeamCount = 2 }
+leftsixteenth = { \set stemLeftBeamCount = 2
+ \set stemRightBeamCount = 1 }
+bothsixteenth = { \set stemLeftBeamCount = 2
+ \set stemRightBeamCount = 2 }
rondo = \notes \relative c'
{
R2.*7
\mark "A"
c4.\p \grace {
+<<<<<<< mozart-hrn3-rondo.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.15
e16(
\revert Stem #'stroke-style }
d8[) c d]
c4 r8 r4 r8
e4. \grace {
+<<<<<<< mozart-hrn3-rondo.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.15
g16(
\revert Stem #'stroke-style }
f8[) e f]
<< d2.(\trill
{ s2 \grace {
+<<<<<<< mozart-hrn3-rondo.ly
+ \override Stem #'stroke-style = #"grace"
+=======
\override Stem #'stroke-style = #"grace"
+>>>>>>> 1.15
c16[ d]
\revert Stem #'stroke-style }
} >>
}
-
\score{
\context Staff \notes\relative c'{
-
c4 d e f g
\sustainDown b c
c, d16[ c c c] e[ e \sustainUp \sustainDown e e ] f4 \sustainUp
\override Staff.SustainPedal #'padding = #-2
c, \sustainDown d e \sustainUp \sustainDown f
\sustainUp g b c
-
-
-
}
}