From 6b7910679bdf50dae397f8522c7c6ed6f093f84e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 14 Jun 2004 21:22:16 +0000 Subject: [PATCH] *** empty log message *** --- .../E.Satie/petite-ouverture-a-danser.ly | 10 +++---- input/mutopia/F.Schubert/morgenlied.ly | 8 +++--- input/mutopia/F.Schubert/standchen.ly | 26 +++++++++---------- .../J.S.Bach/baerenreiter-sarabande.ly | 10 +++---- input/mutopia/J.S.Bach/bwv940.ly | 12 ++++----- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 10 +++---- input/mutopia/R.Schumann/romanze-op28-2.ly | 14 +++++----- input/mutopia/W.A.Mozart/mozart-hrn-3.ly | 8 +++--- .../mutopia/W.A.Mozart/mozart-hrn3-allegro.ly | 4 +-- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 4 +-- .../mutopia/W.A.Mozart/mozart-hrn3-romanze.ly | 4 +-- input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly | 8 +++--- input/template/gregorian-transcription.ly | 8 +++--- input/template/header.ly | 4 +-- input/template/jazz-combo.ly | 22 ++++++++-------- input/template/melody-chords.ly | 6 ++--- input/template/melody-lyrics-chords.ly | 4 +-- input/template/melody-lyrics.ly | 4 +-- input/template/melody.ly | 4 +-- input/template/piano-4-voices.ly | 10 +++---- input/template/piano-dynamics.ly | 10 +++---- input/template/piano-lyrics.ly | 6 ++--- input/template/piano-melody-lyrics.ly | 8 +++--- input/template/piano.ly | 6 ++--- input/template/satb.ly | 12 ++++----- 25 files changed, 111 insertions(+), 111 deletions(-) diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 3f27c76b4d..440503a804 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -7,11 +7,11 @@ copyright = "Public Domain" } -\version "2.3.2" +\version "2.3.4" \include "nederlands.ly" -global = \notes { +global = { \key a \minor \time 2/4 s2*10 @@ -32,7 +32,7 @@ global = \notes { \bar "|." } -i = \context Staff \notes\relative c''{ +i = \context Staff \relative c''{ \context Voice=i \voiceOne @@ -60,7 +60,7 @@ i = \context Staff \notes\relative c''{ } -ii = \context Staff \notes\relative c'{ +ii = \context Staff \relative c'{ \context Voice=ii \voiceTwo @@ -98,7 +98,7 @@ ii = \context Staff \notes\relative c'{ } -lower = \context Staff \notes \relative c{ +lower = \context Staff \relative c{ \context Voice=iii 4 | r | | r | diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 5b6416b1ec..1860063d4f 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.3.2" +\version "2.3.4" manuscriptBreak = { \break } @@ -46,7 +46,7 @@ modernAccidentals = { } -melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { +melody = \relative c'' \repeat volta 2 \context Voice = singer { \time 6/8 \autoBeamOff s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } @@ -102,7 +102,7 @@ secondVerse = \lyrics { zieht mich him -- mel -- wärts, Sehn -- sucht zieht mich him -- mel -- wärts. } -pianoRH = \notes \relative c''' \repeat volta 2 { +pianoRH = \relative c''' \repeat volta 2 { #(set-accidental-style 'modern) g16(_\p fis a g fis g f e d c b a ) | 8( ) r8 r | @@ -123,7 +123,7 @@ pianoRH = \notes \relative c''' \repeat volta 2 { 8 r r 8 r r\fermata | } -pianoLH = \notes \relative c'' \repeat volta 2 { +pianoLH = \relative c'' \repeat volta 2 { #(set-accidental-style 'modern) g16( fis a g fis g f e d c b a) | \clef bass g4.( c,8) r r diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 4b879c1173..774fe7bbdd 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -42,14 +42,14 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.3.2" +\version "2.3.4" dynamicUp = \override DynamicLineSpanner #'direction = #1 dynamicRevert = \revert DynamicLineSpanner #'direction #(set-global-staff-size 16) -vocalVerse = \notes\relative c''{ +vocalVerse = \relative c''{ \dynamicUp \times 2/3 { g8[( as)] g } c4. g8 | \times 2/3 { f8[( g)] f } c'4 f,8 r | @@ -90,7 +90,7 @@ vocalVerse = \notes\relative c''{ c!2. | } -vocalThrough = \notes\relative c{ +vocalThrough = \relative c{ \dynamicUp g''8. g16 b8. b16 d8. d16 | c4 b r | @@ -155,14 +155,14 @@ lyricThrough = \lyrics{ be -- glük -- ke mich! } -trebleIntro = \notes\relative c{ +trebleIntro = \relative c{ r8^"\bf Mäßig"\pp -. -. -. -. -. | r8 -. -. -. -. -. | r8 -. -. -. -. -. | r8 -. -. -. -. -. | } -trebleVerseOne = \notes\relative c{ +trebleVerseOne = \relative c{ %5 r8 | r8 | @@ -210,7 +210,7 @@ trebleVerseOne = \notes\relative c{ 4.-> 8) | } -trebleEentje = \notes \relative c' \context Voice { +trebleEentje = \relative c' \context Voice { \stemBoth 2 r4 | 2\(\mf 8.(-> 16)\) | @@ -225,7 +225,7 @@ trebleEentje = \notes \relative c' \context Voice { 2 r4 | } -trebleThrough = \notes \relative c'{ +trebleThrough = \relative c'{ \stemBoth 2. | %61 @@ -278,7 +278,7 @@ trebleThrough = \notes \relative c'{ 2.\fermata | } -bassIntro = \notes\relative c{ +bassIntro = \relative c{ \dynamicUp %1 2 r4 | @@ -287,7 +287,7 @@ bassIntro = \notes\relative c{ 2 r4 | } -bassVerseOne = \notes\relative c{ +bassVerseOne = \relative c{ % \clef bass \dynamicUp %5 @@ -319,7 +319,7 @@ bassVerseOne = \notes\relative c{ c,8 [ ] | } -bassEentje = \notes\relative c{ +bassEentje = \relative c{ \dynamicUp 8 [ ] | c,8 [ ] | @@ -331,7 +331,7 @@ bassEentje = \notes\relative c{ c,8 [ ] | } -bassThrough = \notes\relative c{ +bassThrough = \relative c{ \dynamicUp %61 8^"cresc." [ -> ] | @@ -365,7 +365,7 @@ bassThrough = \notes\relative c{ 2._\fermata | } -global = \notes{ +global = { \time 3/4 \key es \major \skip 1 * 3/4 * 4 @@ -388,7 +388,7 @@ allLyrics = { \lyricThrough } } -vocals = \context Voice = leise \notes { +vocals = \context Voice = leise { \clef treble % certainly no auto-beaming for vocals \autoBeamOff diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index e767214c60..926ca7aec2 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,8 +1,8 @@ -\version "2.3.2" +\version "2.3.4" % #(ly:set-point-and-click 'line-column) -forcedLastBreak = \notes { \break } +forcedLastBreak = { \break } %% We want this to perfectly match the Baerenreiter spacing. %% If we're not using 6 systems, there's definately a problem. @@ -46,7 +46,7 @@ half way in measure 13 has been forgotten. } -sarabandeA = \context Voice \notes \relative c { +sarabandeA = \context Voice \relative c { \override Staff.NoteCollision #'merge-differently-dotted = ##t @@ -128,7 +128,7 @@ sarabandeA = \context Voice \notes \relative c { } -sarabandeCelloGlobal = \notes{ +sarabandeCelloGlobal = { \time 3/4 \key f \major \clef bass @@ -139,7 +139,7 @@ sarabandeCelloGlobal = \notes{ } } -sarabandeCelloScripts = \notes{ +sarabandeCelloScripts = { } sarabandeCelloStaff = \context Staff << diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index d2ce5b0f5f..3d1a92a43a 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.2" +\version "2.3.4" %{ Header for Petites Preludes. @@ -41,7 +41,7 @@ footer = "Mutopia-2003/08/22-nr" } -one = \notes\relative c{ +one = \relative c{ \skip 1 | \stemUp r4 d''2 cis4 | @@ -62,7 +62,7 @@ one = \notes\relative c{ \bar "|." } -two = \notes\relative c{ +two = \relative c{ r16 d'' c bes a bes f g a8.\mordent bes16 g8.\prall f16 | \stemDown @@ -81,7 +81,7 @@ two = \notes\relative c{ fis1 } -three = \notes\relative c{ +three = \relative c{ \stemUp f2 e | \stemBoth @@ -104,7 +104,7 @@ three = \notes\relative c{ \bar "|." } -four = \notes\relative c{ +four = \relative c{ \stemDown d2 cis | \skip 1*2 | @@ -129,7 +129,7 @@ four = \notes\relative c{ >> } -global = \notes{ +global = { \time 4/4 \key f \major } diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 755094dfa5..4543041380 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -44,12 +44,12 @@ %} -\version "2.3.2" +\version "2.3.4" -dux = \context Voice=two \notes \relative c''{ +dux = \context Voice=two \relative c''{ \voiceTwo \clef violin @@ -111,7 +111,7 @@ dux = \context Voice=two \notes \relative c''{ } -comes = \context Voice=one \notes \relative c'' { +comes = \context Voice=one \relative c'' { \voiceOne \override MultiMeasureRest #'staff-position = #6 R1 | @@ -153,7 +153,7 @@ comes = \context Voice=one \notes \relative c'' { f,16 g as4 g16 f e2 | } -bassdux = \context Voice=three \notes \relative c' { +bassdux = \context Voice=three \relative c' { \clef bass R1 | R | @@ -200,7 +200,7 @@ bassdux = \context Voice=three \notes \relative c' { \book { \score { - \notes \context PianoStaff << + \context PianoStaff << \override Score.TimeSignature #'style = #'C \context Staff = treble << \key c \minor diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index f9db7969a2..4caf07f373 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -5,7 +5,7 @@ #(set-global-staff-size 16) -\version "2.3.2" +\version "2.3.4" \header { title = "Romanzen" @@ -30,12 +30,12 @@ m = { \change Staff = mid \stemUp } forcedBreak = \break -global = \notes { \key fis \major \time 6/8 +global = { \key fis \major \time 6/8 \set Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } -righta = \notes \transpose c cis' { +righta = \transpose c cis' { % \stemUp \slurUp \tieUp \stemUp \override Slur #'attachment = #'(stem . stem) @@ -92,7 +92,7 @@ righta = \notes \transpose c cis' { } -rightb = \notes \transpose c cis' { +rightb = \transpose c cis' { \relative c { \stemDown \slurDown \repeat volta 2 { a4^1( g8^1 b4^1 a8^1 | @@ -150,7 +150,7 @@ rightb = \notes \transpose c cis' { } } -lefta = \notes \transpose c cis { +lefta = \transpose c cis { \stemUp \slurUp \tieUp \repeat volta 2 { f4^1( e8^1 g4^1 f8^1 | @@ -203,7 +203,7 @@ lefta = \notes \transpose c cis { f~ f\fermata | } -leftb = \notes \transpose c cis { +leftb = \transpose c cis { \stemDown \slurDown \tieDown \repeat volta 2 { f16^\p c f, c e c-3 g c-2 f, c f c | @@ -241,7 +241,7 @@ leftb = \notes \transpose c cis { c c8 c c16 r4_\fermata r8 \bar "|." | } -\score { \notes +\score { \context PianoStaff << #(set-accidental-style 'piano-cautionary) \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 9decbe15a3..f179d79adc 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -44,7 +44,7 @@ virtuoso that taught in Geneva. %} -\version "2.2.0" +\version "2.3.4" \include "mozart-hrn3-defs.ly" \include "mozart-hrn3-allegro.ly" @@ -57,7 +57,7 @@ virtuoso that taught in Geneva. \book { \score { - \notes { \transpose c' bes \allegro } + { \transpose c' bes \allegro } \paper{ } \header { piece = "allegro" opus = "" } \midi{ \tempo 4=90 } @@ -66,7 +66,7 @@ virtuoso that taught in Geneva. \score { - \notes { \transpose c' bes \romanze } + { \transpose c' bes \romanze } \header { piece = "romanze" opus = "" } \midi{ \tempo 4 = 70 } \paper{} @@ -75,7 +75,7 @@ virtuoso that taught in Geneva. \score { - \notes { \transpose c' bes \rondo } + { \transpose c' bes \rondo } \header { piece = "rondo" opus = "" } \midi{ \tempo 4 = 100 } \paper { } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index 1105926b2c..a1dbdcfd5c 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -1,8 +1,8 @@ -\version "2.2.0" +\version "2.3.4" \include "mozart-hrn3-defs.ly" allegro = - \notes + \relative c' { \time 4/4 diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index 154a450ed2..d33e8cb951 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -4,9 +4,9 @@ longgrace = \override Stem #'stroke-style = #'() endlonggrace = \revert Stem #'stroke-style ritenuto = \markup { \italic "rit." } -\version "2.3.2" +\version "2.3.4" -cresc = \notes { +cresc = { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) \set crescendoText = \markup { \italic \bold "cresc." } \set crescendoSpanner = #'dashed-line diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index 2e673d299b..3ef82ba3b4 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -1,7 +1,7 @@ -\version "2.2.0" +\version "2.3.4" \include "mozart-hrn3-defs.ly" -romanze = \notes \relative c' { +romanze = \relative c' { \key f \major \time 2/2 \set Score.skipBars = ##t diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index fcb41f772c..263cb0caeb 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -1,8 +1,8 @@ -\version "2.2.0" +\version "2.3.4" % \include "mozart-hrn3-defs.ly" -rondotheme = \notes \relative c' { +rondotheme = \relative c' { c'8[ c c] c[ c c] c4( cis8 d) r g, d'8[ d d] d[ d d] @@ -13,7 +13,7 @@ rondotheme = \notes \relative c' { e4.( d8) r r | } -lipbreaker = \notes \relative c' +lipbreaker = \relative c' { r8 g'[-. g-.] c[( e) g,-.] c[( e) g,-.] c[( e) g,-.] @@ -28,7 +28,7 @@ leftsixteenth = { \set stemLeftBeamCount = 2 bothsixteenth = { \set stemLeftBeamCount = 2 \set stemRightBeamCount = 2 } -rondo = \notes \relative c' +rondo = \relative c' { \partial 8 \time 6/8 diff --git a/input/template/gregorian-transcription.ly b/input/template/gregorian-transcription.ly index e09c682442..9946bd9c7b 100644 --- a/input/template/gregorian-transcription.ly +++ b/input/template/gregorian-transcription.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { @@ -9,15 +9,15 @@ indicating a breath mark." } -barOne = \notes { \once \override Staff.BarLine #'bar-size = #2 +barOne = { \once \override Staff.BarLine #'bar-size = #2 \bar "|" } -barTwo = \notes { \once \override Staff.BarLine #'extra-offset = #'(0 . 2) +barTwo = { \once \override Staff.BarLine #'extra-offset = #'(0 . 2) \once \override Staff.BarLine #'bar-size = #2 \bar "|" } \score { -\notes \relative c' { + \relative c' { \set Score.timing = ##f \override Staff.Stem #'transparent = ##t f4 a2 \barTwo g4 a2 f2 \barOne g4( f) f( diff --git a/input/template/header.ly b/input/template/header.ly index 619afc62cb..39da5fa25a 100644 --- a/input/template/header.ly +++ b/input/template/header.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { dedication = "dedication" title = "Title" @@ -21,7 +21,7 @@ % insert a score otherwise lilypond-book gets confused. \score { - \notes { + { c'4 } } diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index b55aca6468..6cded29a39 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { title = "Song" subtitle = "(tune)" @@ -32,15 +32,15 @@ jzchords = { } %%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%% -global = \notes { +global = { \time 4/4 } -Key = \notes { \key c \major } +Key = { \key c \major } % ############ Horns ############ % ------ Trumpet ------ -trpt = \notes \transpose c d \relative c'' { +trpt = \transpose c d \relative c'' { \Key c1 c c } @@ -87,7 +87,7 @@ barisax = { >> } % ------ Trombone ------ -tbone = \notes \relative c { +tbone = \relative c { \Key c1 c c } @@ -103,7 +103,7 @@ trombone = { } % ############ Rhythm Section ############# % ------ Guitar ------ -gtr = \notes \relative c'' { +gtr = \relative c'' { \Key c1 \sl b4 b b b \nsl c1 } @@ -122,25 +122,25 @@ guitar = { } %% ------ Piano ------ -rhUpper = \notes \relative c'' { +rhUpper = \relative c'' { \voiceOne \Key c1 c c } -rhLower = \notes \relative c' { +rhLower = \relative c' { \voiceTwo \Key e1 e e } -lhUpper = \notes \relative c' { +lhUpper = \relative c' { \voiceOne \Key g1 g g } -lhLower = \notes \relative c { +lhLower = \relative c { \voiceTwo \Key c1 c c @@ -175,7 +175,7 @@ piano = { } % ------ Bass Guitar ------ -bass = \notes \relative c { +bass = \relative c { \Key c1 c c } diff --git a/input/template/melody-chords.ly b/input/template/melody-chords.ly index 6855dd9f08..040588fe5f 100644 --- a/input/template/melody-chords.ly +++ b/input/template/melody-chords.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Lead sheet format: chords with melody." @@ -8,12 +8,12 @@ harmonies = \chords { c4:m f:min7 g:maj c:aug d2:dim b:sus } -melody = \notes \relative c' { +melody = \relative c' { f4 e8[ c] d4 g | a2 ~ a2 } \score { - \notes << + << \context ChordNames { \set chordChanges = ##t \harmonies diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly index 2874b53608..0f723e27b3 100644 --- a/input/template/melody-lyrics-chords.ly +++ b/input/template/melody-lyrics-chords.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Popsong format: chords, melody and lyrics." } -melody = \notes \relative c' +melody = \relative c' { a b c d } diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly index 495e8fc067..4691f1d1af 100644 --- a/input/template/melody-lyrics.ly +++ b/input/template/melody-lyrics.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Melody and lyrics." } -melody = \notes \relative c'' { +melody = \relative c'' { a b c d } diff --git a/input/template/melody.ly b/input/template/melody.ly index 2e278457ca..bbda02ab12 100644 --- a/input/template/melody.ly +++ b/input/template/melody.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Only a melody." } -melody = \notes \relative c' { +melody = \relative c' { a b c d } diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly index 12b1a55459..42f778655f 100644 --- a/input/template/piano-4-voices.ly +++ b/input/template/piano-4-voices.ly @@ -1,25 +1,25 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc ="Polyphonic piano music." } -upperOne = \notes\relative c'' { +upperOne = \relative c'' { \voiceOne a b c d } -upperTwo = \notes\relative c' { +upperTwo = \relative c' { \voiceTwo a2 c } -lowerOne = \notes\relative c { +lowerOne = \relative c { \voiceOne a2 c } -lowerTwo = \notes\relative c { +lowerTwo = \relative c { \voiceTwo a1 } diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index d2aad42957..7ae094ce57 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -1,24 +1,24 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc =" Dynamics on a separate line, neatly centered between staffs. " } -upper = \notes\relative c'' { +upper = \relative c'' { a b c d } -lower = \notes\relative c { +lower = \relative c { a2 c } -dynamics = \notes { +dynamics = { s2\fff\> s4 s\!\pp } -pedal = \notes { +pedal = { s2\sustainDown s2\sustainUp } diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 9d33b25421..61714faf67 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -1,14 +1,14 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc ="Lyrics between two staffs." } -upper = \notes\relative c'' { +upper = \relative c'' { a b c d } -lower = \notes\relative c { +lower = \relative c { a2 c } diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index ff6f683f22..3f2fa70b58 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -1,12 +1,12 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc ="Classical song format: one staff with melody and lyrics, and piano accompaniment." } -melody = \notes \relative c'' { +melody = \relative c'' { a b c d } @@ -14,11 +14,11 @@ text = \lyrics { Aaa Bee Cee Dee } -upper = \notes\relative c'' { +upper = \relative c'' { a b c d } -lower = \notes\relative c { +lower = \relative c { a2 c } diff --git a/input/template/piano.ly b/input/template/piano.ly index e3c5ce89dc..54ccffa848 100644 --- a/input/template/piano.ly +++ b/input/template/piano.ly @@ -1,14 +1,14 @@ -\version "2.2.0" +\version "2.3.4" \header { texidoc = "Simple piano music." } -upper = \notes\relative c'' { +upper = \relative c'' { a b c d } -lower = \notes\relative c { +lower = \relative c { a2 c } diff --git a/input/template/satb.ly b/input/template/satb.ly index 61684f4dae..468c045af8 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.4" \header { texidoc = " @@ -6,19 +6,19 @@ " } -sopMusic = \notes \relative c'' { c4 c c8[( b)] c4 } +sopMusic = \relative c'' { c4 c c8[( b)] c4 } sopWords = \lyrics { hi4 hi hi hi } -altoMusic = \notes \relative c' { e4 f d e } +altoMusic = \relative c' { e4 f d e } altoWords =\lyrics { ha4 ha ha ha } -tenorMusic = \notes \relative c' { g4 a f g } +tenorMusic = \relative c' { g4 a f g } tenorWords = \lyrics { hu4 hu hu hu } -bassMusic = \notes \relative c { c4 c g c } +bassMusic = \relative c { c4 c g c } bassWords = \lyrics { ho4 ho ho ho } -\score { \notes +\score { \context StaffGroup << \context Lyrics = sopranos { s1 } \context Staff = women << -- 2.39.2