X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fly-examples%2Fgranados.ly;h=25a5bf6979bd32e4214490f17be1b9bee2de1ca0;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=a5c308cc8a37ffc1df27989816991fe6213bdd0b;hpb=2944a83e59f487894a214769392ce27289accb71;p=lilypond.git

diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly
index a5c308cc8a..25a5bf6979 100644
--- a/Documentation/ly-examples/granados.ly
+++ b/Documentation/ly-examples/granados.ly
@@ -1,4 +1,4 @@
-\version "2.15.32"
+\version "2.19.40"
 \include "example-header.ily"
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9,7 +9,7 @@
 
 \paper {
   ragged-right = ##f
-  #(set-paper-size "letter" 'landscape)
+  #(set-paper-size "letterlandscape")
   system-count = 1
 }
 
@@ -26,15 +26,15 @@ appassmolto = \markup { \italic \large "appassionato molto" }
 global = {
   \time 3/4
   \set fontSize = #1
-  \override Beam #'thickness = #0.5
-  \override NoteColumn #'ignore-collision = ##t
+  \override Beam.thickness = #0.5
+  \override NoteColumn.ignore-collision = ##t
 }
 
-upperVoiceOne = \relative c'' {
+upperVoiceOne = \relative {
   \voiceOne
-  \override TupletBracket #'transparent = ##t
-  <aes f'>8\([ \times 4/5{g'32( aes g f g]) }
-    <es aes>8[ \times 4/5{<d bes'>32( c' bes aes bes]) }
+  \hide TupletBracket
+  <aes' f'>8\([ \tuplet 5/4{g'32( aes g f g]) }
+    <es aes>8[ \tuplet 5/4{<d bes'>32( c' bes aes bes]) }
     <es, aes es'>8 <d fis b d>\) | % end m. 1
   %--------------------------------------------------%
   <c g' c>4\( \voiceTwo <bes es bes'\arpeggio>\)
@@ -42,68 +42,69 @@ upperVoiceOne = \relative c'' {
   %--------------------------------------------------%
   \noBreak
   \voiceOne
-  <f aes d f>8\([ \times 4/5{<g g'>32( aes' g f g]) }
+  <f aes d f>8\([ \tuplet 5/4{<g g'>32( aes' g f g]) }
   \set subdivideBeams = ##t
-  \set baseMoment = #(ly:make-moment 1 8)
-  \set beatStructure = #'(2 2 2)
-  <aes, aes'>16 <c f> \times 4/5{ bes'32( c bes aes bes]) }
+  \set baseMoment = #(ly:make-moment 1/8)
+  \set beatStructure = 2,2,2
+  <aes, aes'>16 <c f> \tuplet 5/4{ bes'32( c bes aes bes]) }
   \set subdivideBeams = ##f
   \ottava #1 <es es'>16 <f f'> <d d'> \appoggiatura f8 <es es'>16\)
 }
 
-upperVoiceTwo = \relative c'' {
+upperVoiceTwo = \relative {
   \voiceTwo
-  s8 c8\< <bes, f'>[ <bes aes'> c' <bes, d fis>\!]
+  s8 c''8\< <bes, f'>[ <bes aes'> c' <bes, d fis>\!]
   s32 s32_\appassmolto s8. \voiceOne r8 <bes'' es bes'>-> s4
-  \override Stem #'cross-staff = ##t
-  \override Stem #'length = #28
-  \override Flag #'style = #'no-flag
+  \override Stem.cross-staff = ##t
+  \override Stem.length = #28
+  \override Flag.style = #'no-flag
   s8 \voiceTwo g,8 aes4 s4
 }
 
-middleVoiceOne = \relative c' {
-  \override Stem #'cross-staff = ##t
-  \override Stem #'length = #32
-  \override Flag #'style = #'no-flag
-  d!8\noBeam s8 s8 s8_\crmolto s4  % 1
+middleVoiceOne = \relative {
+  \override Stem.cross-staff = ##t
+  \override Stem.length = #32
+  \override Flag.style = #'no-flag
+  d'!8\noBeam s8 s8 s8_\crmolto s4  % 1
   s4 <g bes\arpeggio>8[ <es' g>] \voiceOne e,8( dis16 e) | % 2
-  \revert Stem #'length
-  \revert Stem #'cross-staff
+  \revert Stem.length
+  \revert Stem.cross-staff
   \showStaffSwitch
   \csh \stemUp f4 s2
   %s2.  % beginning m. 3
 }
 
-middleVoiceTwo = \relative c' {
+middleVoiceTwo = \relative {
   s2. | % 1
-  \override Stem #'cross-staff = ##t
-  \override Stem #'length = #24
-  \override Flag #'style = #'no-flag
-  s2 \voiceTwo e!4 | % 2
+  \override Stem.cross-staff = ##t
+  \override Stem.length = #24
+  \override Flag.style = #'no-flag
+  s2 \voiceTwo e'!4 | % 2
   s4 \voiceTwo <bes c es f>8 <f' aes es'>16 d' <bes, f' aes c>8 <bes' fis'> | % 3
 }
 
-lowerVoiceOne = \relative c, {
-  \override Staff.NoteCollision #'merge-differently-headed = ##t
-  \override Staff.NoteCollision #'merge-differently-dotted = ##t
-  bes8 \csm \stemDown <bes'' c es>8 s2
+lowerVoiceOne = \relative {
+  \override Staff.NoteCollision.merge-differently-headed = ##t
+  \override Staff.NoteCollision.merge-differently-dotted = ##t
+  bes,,8 \csm \stemDown <bes'' c es>8 s2
   \csl \stemUp
   \set subdivideBeams = ##t
-  \set baseMoment = #(ly:make-moment 1 16)
-  \set beatStructure = #'(4 4 4)
+  \set baseMoment = #(ly:make-moment 1/16)
+  \set beatStructure = 4,4,4
   s8 \hideNotes \slurUp \stemDown
     es,,64( bes'' s64 \unHideNotes \stemUp g64[ bes c d c]) s2
   \set subdivideBeams = ##f
   bes,,8 \csm \stemDown <bes'' c es>8 s2
 }
 
-lowerVoiceTwo = \relative c, {
+lowerVoiceTwo = \relative {
   \voiceTwo
-  bes2.
+  bes,,2.
   \csh
-  \once \override Beam #'damping = #+inf.0
+  \once \override Beam.damping = #+inf.0
   <bes'' es g>8 \csl \slurUp
-  %\once\override Slur #'extra-offset = #'(0 . 4)
+  % Fix problem with -dpreview cropping beams
+  \once \override TextScript.padding = #10 <> _\markup { " " }
   es,,64 bes' es g s32.
     c64
     s4 <bes des>
@@ -114,7 +115,7 @@ lowerVoiceTwo = \relative c, {
 \score {
   \new PianoStaff <<
     \set PianoStaff.connectArpeggios = ##t
-%    \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
+%    \override PianoStaff.Arpeggio.stencil = #ly:arpeggio::brew-chord-bracket
     \new Staff = "high" <<
       \global
       \context Voice = "upperVoiceOne" { \upperVoiceOne }
@@ -135,7 +136,7 @@ lowerVoiceTwo = \relative c, {
   \layout {
     \context {
       \Score
-      \override TimeSignature #'stencil = ##f
+      \omit TimeSignature
       \remove "Bar_number_engraver"
     }
   }