From a55d22a06ff9a65096fb156117be34154dc5e5e5 Mon Sep 17 00:00:00 2001
From: Valentin Villenave <valentin@villenave.net>
Date: Sun, 13 Dec 2015 20:09:30 +0100
Subject: [PATCH] Syntax update, and minor improvements

---
 scores/sonate/carillon.ly   | 75 +++++++++++++++++++++++----------------------
 scores/sonate/mesures.ly    | 13 ++++----
 scores/sonate/scherzo.ly    | 27 ++++++++--------
 scores/sonate/score.ly      |  3 +-
 scores/sonate/variations.ly | 75 +++++++++++++++++++++++++++++----------------
 5 files changed, 111 insertions(+), 82 deletions(-)

diff --git a/scores/sonate/carillon.ly b/scores/sonate/carillon.ly
index af78622..0026aa3 100644
--- a/scores/sonate/carillon.ly
+++ b/scores/sonate/carillon.ly
@@ -11,16 +11,16 @@ TroisPianoMd =
   \t {
 
   %%% 0x7 %%%
-  <mi' sold si>4->-- _\dyn "molto_f_(con Ped.)" \stemUp <mi sold si>8
-  red^( <do mi sold> red) |
-  <mi sold si>^-^( mi, <mi' sold si> 
+  <mi' sold si>4->-- _\dyn "molto_f" \stemUp <mi sold si>8
+  red^( <do? mi sold> red) |
+  <mi sold si>^-^( mi, <mi' sold si>
   \tupletsOff
   do <si red sol> do) |
   <mi sold si>^-^( \mg mi,, \md <mi'' sold si>
   la, <sib re fad> la) |
   \longHairpin
   <mi' sold si>^(\< \mg fad, \md <la dod fa>
-  \mg do, \md <dod red fad> \mg sib,) | \md
+  \mg do,? \md <dod red fad> \mg sib,) | \md
   \stemNeutral \tupletsOn
   <mi'' sold si>4->--\! \stemUp <mi sold si>8
   red^( <dod mi sold> red) \tupletsOff |
@@ -29,7 +29,7 @@ TroisPianoMd =
   <mi sold si>^-^( \mg mi,, \md <re'' fad si>
   fa, <sib re fad> fa) |
   <mi' sold si>^( \mg do, \md <red' sol si>
-  \mg do, \md <sol' si red> \mg sib,,) | \md
+  \mg do, \md <sol'? si red> \mg sib,,) | \md
   \stemNeutral \tupletsOn
   <mi'' sold si>4->-- \stemUp <mi sold si>8
   red^( <do mi sold> red) \tupletsOff |
@@ -52,11 +52,12 @@ TroisPianoMd =
   r_\< <sol sib>^. do^. \tupletUp dod^. \stemUp fa4^-_\! |
   }
   \stemNeutral \tupletsOff \tupletNeutral
-  \ottava #1 \acciaccatura {\stemDown fad16[ sol sold]}
+  \ottava #1
+  \acciaccatura {\stemDown fad16[ sol sold]}
   \t {
-  \stemNeutral la8->-. \dyn "sfp_staccato leggiero"
-  fad-. mib-. \ottava #0 do-. la-. fad-. |
-  mib-. do-. la-. fad-. mib-. do-.
+  \stemNeutral la8->-.\dyn "sfp"
+  fad-._"staccato leggiero" mib-. \ottava #0 do-. la-. fad-. |
+  mib-. do?-. la-. fad-. mib-. do-.
   \clef bass la-.\dyn "(senza cresc.)"
   fad-. mib-. do-. la-. fad-. |
 
@@ -78,7 +79,7 @@ TroisPianoMd =
   <re'''' do'>(_\dyn "ff_sempre" <fad sold> <re do'>)
   \ottava #0 \stemUp <lab,, solb'>( <do re> <lab solb'>) |
   \clef bass \mg s <lab,, do> s <la si>^> s <la si>
-  s <la si> s \stemNeutral 
+  s <la si> s \stemNeutral
   \md <la'' si>_"(loco)"^>^.^\sf \mg si,,, \md <la'' si>
   \clef treble \stemUp
   s <la' mib' fa si>\< s <mib'' la si fa'>^>^.\! s s | \stemNeutral
@@ -86,8 +87,8 @@ TroisPianoMd =
   mi''^"loco"_\dyn "fpp_staccato molto" mib \tupletsOn r si re |
   r <sol sib> <fad la> r <reb fa> <sol la> |
   \clef treble r <re' fad> <dod fa> r <la dod> <do fa> |
-  r <sol' si> <fad lad> r <fa la> <do' mi> |
-  r <si re>( <fa' la>) r <mi sol>( <si' re>) | \tupletsOff
+  r <sol'? si> <fad lad> r <fa la> <do' mi> |
+  r <si re>( <fa' la>) r <mi? sol>( <si' re>) | \tupletsOff
   \ottava #1 r <la do>( <mi' sol>) r <la, si>( <fad' la>) |
   }
   s4 \t {s8 r4} | \ottava #0
@@ -95,7 +96,7 @@ TroisPianoMd =
   %%% 2x7 %%%
   \t {
   \tupletsOn
-  <sib, reb fa>->-- _\dyn "molto_f_(con Ped.)" \stemUp <sib reb fa>8
+  <sib, reb fa>->-- _\dyn "molto_f" \stemUp <sib reb fa>8
   \tupletsOff la^( <fad sib re> la) |
   <sib reb fa>^-^( \mg fa, \md <la' dod fa> fad <fa la dod> fad) |
   <sib reb fa>^-^( \mg fa, \md <sib' reb mi> re, <fad la do> sol) |
@@ -111,8 +112,8 @@ TroisPianoMd =
   <sib' reb fa>^-^( \mg fa, \md <si' re sol>^-) mi, <reb' mib fa> la |
   \ottava #1
   <mi' fad sold>\< \mg fa, \md <fadd' sold la> re <sold la sib> red |
-  \stemNeutral <mi red'>^>^-^(\dyn "mf_étincelant"
-  \mg \stemUp la, \md \stemNeutral <mi' red'>^.)
+  \stemNeutral <mi red'>^>^-^(\mf
+  \mg \stemUp la,\dyn "étincelant" \md \stemNeutral <mi' red'>^.)
   \mg \stemUp fad, \md \stemNeutral \longHairpin <mib' do'>^.\< re'^. |
   <mi, red'>^>^- \! \mg \stemUp fa, \md \stemNeutral re''^.
   <mi, red'>^>^-^( \mg \stemUp dod, \md \stemNeutral <mi' red'>^.) |
@@ -170,8 +171,8 @@ TroisPianoMd =
   sold la) fa( fad sol sold la) mib( mi fa fad sol |
   lab) la,( si dod red fa sol la) |
   \tupletsOn
-  \t {si8 do_\dyn "ppp_grazioso" sol}
-  la16 mi^\dyn "(legatissimo)" fad dod |
+  \t {si8_\pp do_\dyn "grazioso" sol}
+  la16 mi^"(legatissimo)" fad dod |
   re lab sib mib, la sold dod si |
   \t {mi8 re sol fad si fa} si,16 do fa sib |
   la re, do fa \t {mi8 sib lab mib' reb sol,
@@ -198,10 +199,10 @@ TroisPianoMd =
   <do, fa sol si>2(\ppp\laissezVibrer s4 do' |
   <do, fa sol si>2.)\laissezVibrer
   R2. R2 s |
-  sold8( re) \t {do( fa mib sold) la,( re do fa mib} |
+  sold8( re) \t {do?( fa mib sold) la,( re do? fa mib} |
   sold16) la,( re do mib mi fa fad fa fad sol sold) |
   la,-- la'(_\dyncresc "poco cresc."
-  sib) sold( la sib) fad( sol sold la si do) |
+  sib) sold( la sib) fad( sol sold la si do?) |
   sold(_\! re' red mi fa fad) sold,( la |
   lad si do) re,_\dim \t {red8( mi fa)_\!} |
   <sol, do re fad>2--
@@ -215,14 +216,14 @@ TroisPianoMd =
 
   %%% 6x7 %%%
   \t {
-  <mi'' sold si>4->--\dyn "molto_f"
+  <mi'' sold si>4->-\dyn "molto_f"
   \stemUp <mi sold si>8 \mg fad,^( \md <la dod fa> \mg fad) |
   \stemNeutral \md
   <mi' sold si>4->-- \stemUp <mi sold si>8 red^( <do mi sold> red) |
   \tupletsOff <do mi sol>^( sold <sol si red>
   mi <red sol si> \mg do) \md \stemNeutral
   \tupletsOn <mi' sold si>4->-- \stemUp <fa sold si>8
-  \tupletsOff sold,^( <dod mi sol> do)
+  \tupletsOff \mg sold,^( \md <dod mi sol> do)
   <si re fa>^( mi, <sold si re> \mg \stemUp dod,
   \md \stemNeutral <re fa sold> \mg \stemUp mib,) \md \stemNeutral |
   <mi' sol sib>^.^( \mg \stemUp la,^. \md \stemNeutral <sold' si re>^.
@@ -278,8 +279,8 @@ TroisPianoMd =
   s la,,, s <do sold'>^> s <do sold'>^>
   s si' s <re, fad>^> s <mib fa>^> |
   \md \clef treble \stemNeutral s
-  <re''' fad sold dod>^.\dyn "mp_secco"
-  \mg \stemUp red \md \stemNeutral <re dod'>^.
+  <re''' fad sold dod>^.\mp
+  \mg \stemUp red\dyn "secco" \md \stemNeutral <re dod'>^.
   \mg \stemUp sol, \md \stemNeutral <do sib'>^( |
   \stemDown do') <re, fad sold dod>^>^.
   \mg \stemUp fa \md \stemNeutral <re dod'>^.
@@ -310,8 +311,8 @@ TroisPianoMd =
 
   %%% 8x7 %%%
   \stemUp \ottava #1 \t {
-  <mib' lab sib re>8^>^-^(_\dyn "ff_con Ped."_\<
-  re <mib lab sib re> dod^>^- <mi fad la dod> dod
+  <mib' lab sib re>8^>^-^(_\ff _\<
+  re <mib lab sib re>_"(con Ped.)" dod^>^- <mi fad la dod> dod
   \stemNeutral \tupletsOn <do fa sol si>4^>^-)_\!
   \stemUp <do fa sol si>8
   \tupletsOff si <do fa sol si> \ottava #0 si, |
@@ -362,8 +363,8 @@ TroisPianoMd =
   \pl {s4 <mi fa>2--~ <mi fa>4}
   {\oneVoice <mi fa si>^~^( \voiceOne si'4.. do16
   si4^-)} \tupletsOn \slurDashed
-  \graceNotes \lightBeams \t {fad8-.(
-  \dyn "ppp_presto leggiero"\< sib-. re-.}
+  \graceNotes \lightBeams
+  \t {fad8-.(\ppp ^"presto leggiero"\< sib-. re-.}
   \pl \graceNotes \lightBeams { \tupletsOff
     \t {sol,_. si_. mib_.}
     \t {fa_. sib_. mib_.}
@@ -387,7 +388,8 @@ TroisPianoMg =
   \set tupletSpannerDuration = #(ly:make-moment 1 4)
 
   %%% 0x7 %%%
-  r32 <mi,, mi'>4...*7/15->-- \laissezVibrer \md \stemDown
+  r32 <mi,, mi'>4...*7/15->-- \laissezVibrer
+  <>_"(con Ped.)" \md \stemDown
   \t {
   <sol''' si red>8 s <sol si red> |
   \tupletsOff
@@ -408,7 +410,7 @@ TroisPianoMg =
   \t {
   <sol'' si red>8 s <sol si red> |
   s mi_-_\laissezVibrer s <sol sib dod> s <sol sib dod> |
-  s <dod, sol' sib> s <re fa lab> s <mi sol> |
+  s <dod, sol' sib> s <re fa lab> s <mi sol?> |
   s sib_-_\laissezVibrer s <mib la> s <mib la> |
   s <sol, fad'>_-\laissezVibrer s do s <do fad> |
   \mg s <mi, red'>_-\laissezVibrer s \md <dod' la' si> s4 |
@@ -422,12 +424,12 @@ TroisPianoMg =
   \mg \clef treble sold | \stemNeutral
 
   mi'->-. dod-. sib-. sol-. mi-. dod-. |
-  sib-. fa-. dod-. \clef bass sold-. fa-. re-. |
+  sib-. fa?-. dod-. \clef bass sold-. fa-. re-. |
   si-. sold-. fa-. re-. si-. sold-. |
 
   %%% 1x7 %%%
   \stemDown \ottava #-1
-  <fa mib'>^>\ff fa <fa mib'>^> la <fa mib'>^> la |
+  <fa? mib'>^>\ff fa <fa mib'>^> la <fa mib'>^> la |
   <fa mib'>^> fa <fa mib'>^> la <fa mib'>^> la |
   <fa mib'>^> s s \tupletsOn
   <mi' sol>^( <fad sold>) s \tupletsOff |
@@ -438,11 +440,11 @@ TroisPianoMg =
   \tupletsOn <sol' si>^( <lab do>) s \tupletsOff |
   \ottava #-1
   <fa, mib'>^>^\ff fad <fa mib'>^> la <fa mib'>^> \stemNeutral r |
-  \ottava #0 
+  \ottava #0
   mi'''_"loco"^\fp ->-. dod-. sib-. sol-. mi-. dod-. |
   si-. sold-. fa-. re-. si-. sold-. |
   \ottava #-1 \stemDown
-  <fa mib'>^>^\ff sol <fa mib'>^> la <fa mib'>^> la |
+  <fa? mib'>^>^\ff sol <fa mib'>^> la <fa mib'>^> la |
   }
   \ottava #0 s2 \ottava #-1
   \t {
@@ -467,7 +469,8 @@ TroisPianoMg =
 
   %%% 2x7 %%%
   \tupletsOn
-  r32 <fa, fa'>4...*7/15->-- \laissezVibrer \md \stemDown
+  r32 <fa, fa'>4...*7/15->-- \laissezVibrer
+  <>_"(con Ped.)" \md \stemDown
   \t {
   <dod'' fa la>8 s <dod fa la>
   \tupletsOff
@@ -542,7 +545,7 @@ TroisPianoMg =
   \ottava #0 s4*2/3_\dyn "(ppp)" }
   {\oneVoice <mib'''' lab sib re>2--_(_\dyn "mp_en dehors"
   <mi fad la dod>-- \voiceOne <do fa sol si>2.--)
-  \clef treble } 
+  \clef treble }
   <mib lab sib re>4.--_( <mi fad la dod>-- |
   <do fa sol si>2--)\laissezVibrer
   \clef bass \ottava #-1 la,,,2\laissezVibrer \ottava #0 \clef treble
@@ -597,7 +600,7 @@ TroisPianoMg =
   } \stemNeutral
   r32 <mi,, mi'>4...*7/15->-- \laissezVibrer \md \stemDown
   \t {
-  <re''' fa sold>8 s <fad la do>
+  \mg <re''' fa sold>8 \md s <fad la do>
   s <sib, dod mi> s \mg <sol sib dod> s <la, do mib> |
   s <mib' fad la> s <sol sib dod> s \md <si re fa>
   } \mg \stemNeutral
diff --git a/scores/sonate/mesures.ly b/scores/sonate/mesures.ly
index 16e95e7..f3aac7c 100644
--- a/scores/sonate/mesures.ly
+++ b/scores/sonate/mesures.ly
@@ -63,7 +63,7 @@ TroisTitre = "III."
         Gravure réalisée au moyen du logiciel libre
         \with-url #"http://www.lilypond.org"
         \concat {\bold "GNU LilyPond" ,}
-        \concat { $(string-append "version " (lilypond-version) ".") } 
+        \concat { $(string-append "version " (lilypond-version) ".") }
       }
     }
   }
@@ -79,7 +79,7 @@ UnMesures = {
   s1*5/4*7 \allowPageTurn
   s1*5/4*7 \allowPageTurn
   \bar "||"
-  
+
   %%% Variation II %%%
   \time 7/4
   \tempo "Stesso Tempo"
@@ -93,7 +93,7 @@ UnMesures = {
   s1*7/4*2 \allowPageTurn
   s1*7/4 \allowPageTurn
   \bar "||"
-  
+
   %%% Variation III %%%
   \time 3/4 s2.
   \time 4/4 s1*2
@@ -111,7 +111,7 @@ UnMesures = {
   \time 4/4 s1*2
   \time 3/4 s2. \allowPageTurn
   \bar "||"
-  
+
   %%% Variation IV %%%
   \time 3/4
   \tempo "(Non allargando)"
@@ -125,7 +125,7 @@ UnMesures = {
   s2.*5 \allowPageTurn
   s2.*2 \allowPageTurn
   \bar "||"
-  
+
   %%% Variation V %%%
   \time 2/4
   \tempo "A piacere"
@@ -141,7 +141,7 @@ UnMesures = {
   \tempo "Tempo I"
   s2*5 \allowPageTurn
   \bar "||"
-  
+
   %%% Variation VI %%%
   \time 5/4
   \tempo "Un poco più largo"
@@ -182,6 +182,7 @@ off = {
 DeuxMesures = {
   \time 6/4
   \set beamExceptions = #'()
+  \set subdivideBeams = ##t
   \tempo "Vif (avec souplesse)"
   \off s1.*3 \allowPageTurn
   \ter s1.
diff --git a/scores/sonate/scherzo.ly b/scores/sonate/scherzo.ly
index fece671..102ba5f 100644
--- a/scores/sonate/scherzo.ly
+++ b/scores/sonate/scherzo.ly
@@ -20,8 +20,8 @@ DeuxPianoMd =
   \ottava #1
   \slurDashed
   s64
-  do'''16([-\dyn "mf,_non legato (quasi staccato)"
-  la do si sold])
+  do'''16([\dyn "mf,_non legato (quasi staccato)"
+  la do si? sold])
   si[( sold si sib sol])
   la[( fad fa lab])
   sol[( mi mib solb])
@@ -42,13 +42,13 @@ DeuxPianoMd =
   sib(\< reb mib fab)-.--\! mib-. reb-.
   do( la do si)-. sold-. la-.
   dod(\< sib mi fa)-.--\! re-. reb-. |
-  do(^\> si) la-. do-. si^\! fad re' do
+  do(^\> si) la-. do?-. si^\! fad re' do
   lab'(^\> sol) fa-. lab-. sol^\! sib, dod sol
   mi'(^\> red) dod-. mi-. mib(^\! re) dod si |
   do lab do si sol lab si mi\< red lab' sol do
-  re(-\dyn "poco_f" dod) sib re
+  re(\dyn "poco_f" dod) sib re
   dod la fa fad sib(\> la) fa reb |
-  do[-\dyn "p_articolato ad lib" la do]
+  do[\dyn "p_articolato ad lib" la do]
   si[ sol lab sib] dod[\cresc mi dod] re[ fad
   fa mib] si'[ sold sib] la[ fad sol mib'] fa[ re mi] |
   do'->\mf do-> do-> la, sib' \ottava #1 si' do'-> do->
@@ -57,7 +57,7 @@ DeuxPianoMd =
 
   do,->[\! do r do] do^"netto" do do do do_ "(senza dim.)" do do do
   do do do do do do do do do do do do |
-  si''8-.-- -\dyn "p_sempre"
+  si''8-.-- \dyn "p_sempre"
   r do,,16 sold''-.-- r8 fa16-. la-. do,, do
   do do do8 reb''-.-> do,,16 do do sib''-. r do,, |
   do do do8 mi'16_(_"simile" sol') r do,,, do do r8
@@ -65,9 +65,10 @@ DeuxPianoMd =
   \ottava #1 re'''(\fp do') \ottava #0 do,,,,-"loco" do |
   r8. la'''16(_\dyn "pp_leggiero" fa lab
   mib, sol' mi sib,8-.) r16
-  do, do do do do do do do do do do do |
+  do,[ do do do do do] do do do do do do |
   s1.*2
-  <do do'>16->-\dyn "fpp" <do la'> <do do'> <do si'> sold' si
+  <do do'>16->\dyn "fpp" ^"non legato"
+  <do la'> <do do'> <do si'> sold' si
   sib sol do, do do do <do reb'>-> <do do'> <do sib'> <do reb'>
   do' si la do si sold^\< do mi |
   fa([^\! reb fa] mi)[ si mi mib]
@@ -85,7 +86,7 @@ DeuxPianoMd =
   re[ sib, re solb]
   sib[\> la lab sol fa]
   solb[\> fa mi mib reb] |
-  do'[-\dyn "f_sub." la do si sold]
+  do'[\dyn "f_sub." la do si sold]
   sib[ sol la fa]
   solb[ mib solb] fa[ re reb] \ottava #0
   do[\dim la si sold]\!
@@ -100,11 +101,11 @@ DeuxPianoMd =
   fad[ do'(-> la] do[ si)
   sol sib] lab[ do(-> la] do[ si) sold
   do]->( la[ si sold]) |
-  \ottava #1 do'[-\dyn "ff_quasi martelato" la do si sold]
+  \ottava #1 do'[\dyn "ff_quasi martelato" la do si sold]
   si[ sold si sib sol]
   la[ fad fa lab]
   fad[ re dod mi]
-  \ottava #0 do[-"loco" -\dyn "meno_f" la do] si[ sol sib] |
+  \ottava #0 do[-"loco" \dyn "meno_f" la do] si[ sol sib] |
   fad[ re fad] fa[ dod mi]
   do[\dim la si sold]
   sol[ sib fad la]
@@ -118,7 +119,7 @@ DeuxPianoMg =
   \slurDashed
   si''16[( sold si sib sol])
   do[( la do si la])
-  sold[( mid fad la])
+  sold[( mid fad la?])
   fad[( red mi sol])
   mi[( do reb]) fa[( re lad16*3/4]) |
   si16[( sold si do sib])
@@ -129,7 +130,7 @@ DeuxPianoMg =
   si[ sold si] do[ la sol]
   fad[ la sib sol]
   mi[ sol lab fa]
-  re[ fa mib solb mib]
+  re[ fa? mib solb mib]
   do[ mib reb fa, si,] |
 
   mi,--( red' sol do) mi dod
diff --git a/scores/sonate/score.ly b/scores/sonate/score.ly
index bc5335c..58e574b 100644
--- a/scores/sonate/score.ly
+++ b/scores/sonate/score.ly
@@ -1,2 +1,3 @@
+input = "fr"
 skel = "piano"
-structure = '("Un" "Deux" "Trois")
+structure = '("Un|" "Deux|" "Trois")
diff --git a/scores/sonate/variations.ly b/scores/sonate/variations.ly
index 8af35ea..511ed2e 100644
--- a/scores/sonate/variations.ly
+++ b/scores/sonate/variations.ly
@@ -9,20 +9,21 @@
     \Voice
     \remove Forbid_line_break_engraver
     \override Glissando #'breakable = ##t
+    subdivideBeams = ##t
   }
 }
 
-UnPianoMd = \relative {
+UnPianoMd = \relative do' {
 
   %%% Variation I %%%
   si'2--\p si2~( si8. do16 | si2.) si2 |
   si2.( la2) | si1*5/4 |
-  si2--(-\dyn "p_sempre" si2.--) |
+  si2--(\dyn "p_sempre" si2.--) |
   si2~( si8. do16 si2~ | si\> la2.) |
 
   si2\! si~( si8 do | <sold la si>2.)\pp si2 |
-  si2.~( si8 la~ la4) | si1*5/4\> |
-  si2-\dyn "p_sub."
+  si2.~( si8 la?~ la4) | si1*5/4\> |
+  si2\dyn "p_sub."
 
   \pl {
     s2. r2 <mi,? fa>2. s1*5/4 |
@@ -41,7 +42,7 @@ UnPianoMd = \relative {
   }{
     sol2\mp sol~( sol8. lab16 |
     sol1) fa4~( | fa2 sol2.) |
-    si4.(-\dyn "più_p" la8~ la4 si2~ |
+    si4.(\dyn "più_p" la8~ la4 si2~ |
     si4~ si8. do16 si2.~) | si2 si2. |
   }
   <re,? la'>2(\> <mi fa si>2.)\! \fermata |
@@ -50,7 +51,7 @@ UnPianoMd = \relative {
   r4 si'2~--\pp si8. do16( si2.) |
   r8 si--~( si4.. do32 si la4~)
   la8 r \stemUp \t {la4( si8~)} si r \stemNeutral |
-  si8(-\dyn "poco_più" do~) \t {do reb,( do'~)}
+  si8(\dyn "poco_più" do~) \t {do reb,( do'~)}
   do do--~ do4 si8.( do16~) do4 \t {r8 \longHairpin si(\< do)} |
   do(\! reb~) reb reb4-- do8--~ \t {do re,!( do')}
   do(\< reb~ \t {reb do si'\!~} si do,?) |
@@ -61,15 +62,17 @@ UnPianoMd = \relative {
   r4\! si2--\pp \t {do8( si4~)} si2. |
   r8 si--~ si4~ si16\< -"cantando" la8( red16~
   red16.\! do,32 fa8~) fa4. si8--~ si r |
-  la8-\dyn "p_dolce" ( sib~) \t {sib sold( la~)}
+  la8\dyn "p_dolce" ( sib~) \t {sib sold( la~)}
   la16 sib( sold la)
-  la8( sib~) sib16 fa( mi'8~)
+  la8( sib~) sib16 fa( mi'?8~)
   \t {mi la,16.-- sold'32 sib,8--~} sib r |
-  si(-\dyn "poco_più" do~) do16 do8-- fad16(
+  si(\dyn "poco_più" do~) do16 do8-- fad16(
   \tt {sol,16) mib'( la dod, sib)}
+  \halfBeat
   mi32->( fa,16.) \t {la'16( sib, mi}
   \t {fa,4--) do'16(\> reb,~)} reb8.\! mi16
   la16(\< fa) \t {lad( si do)} |
+  \fullBeat
   \tt {dod8--(\! re-- mib16--~)}
   \ttt {mib si'( la mi sol lab,)}
   \ttt {si'( la mi fad sol, do}
@@ -80,6 +83,7 @@ UnPianoMd = \relative {
 
   si2.\ppp \startTrillSpan ~ si8\stopTrillSpan la\startTrillSpan ~
   la4~ \t {la(\stopTrillSpan si) sold8 \t {sold16( la lad}} |
+  \halfBeat
   si4)\startTrillSpan ~ \tt {si32(\stopTrillSpan do si do si}
   la8)\startTrillSpan ~ \t {la16\stopTrillSpan si( sold}
   \t {si32 sold sol)} si16~
@@ -87,15 +91,18 @@ UnPianoMd = \relative {
   si do( si8)\startTrillSpan ~ si4~ si8~ si16\stopTrillSpan r |
   si32(\< la si sold sol si) mi,( fad)
   \t {red4(\! si'8)\startTrillSpan ~}
+  \fullBeat
   \t {si8.\stopTrillSpan do,16( si8)\startTrillSpan ~}
   \t {si16\stopTrillSpan do8(->--} \t {reb->-- si16~->--)}
   si32\> reb( do solb' fa la si16\!)\startTrillSpan ~
   si4~ si8\stopTrillSpan r |
   \showStaffSwitch
-  \times 8/12 {r32 la(_\mp si sold sol sib mib, re fad do reb fa}
+  \graceNotes \lightBeams \tuplet 12/8 {
+    r32 la(_\mp si sold sol sib mib, re fad do reb fa
+  }
   \t {\mg \stemUp re,!4--) \md \stemNeutral si'8--\startTrillSpan ~}
   si4~\> si8.\stopTrillSpan \stemUp la16( si8)\! r
-  \hideStaffSwitch
+  \hideStaffSwitch \halfBeat
   do16(\p si8) do16( \t {si8) la16~(} la16 si32 sold) | \stemNeutral
   \t {sol4_( si8)\startTrillSpan ~} si8~ si\stopTrillSpan ~
   si16. do32( si8~) si r <re, la'>4\>(
@@ -108,7 +115,9 @@ UnPianoMd = \relative {
   solb16. lab32( fa16.) sol32( |
   \t {mi8) red'16--(} \t {dod lad sold}
   mi16.)_\> lad32(-> mi8)~
+  \fullBeat
   \ttt {mi16_\! red'--( dod lad sold mi)~}
+  \halfBeat
   mi16. fad32( mib16.) fa32( |
   \t {re8)\dim dod'16(} \t {si sold fad)}
   \t {re8( do'16} \t {sib sol fa)}
@@ -139,20 +148,24 @@ UnPianoMd = \relative {
     \voiceTwo si4~ \t {si4 do,8^- ~} do4
   } {
     s2 r8^\cresc solb''-- ~ solb16 solb8.->-- ~
+    \halfBeat
     solb16 lab \t {fa_(^\! solb lab)}
   }
   <si, lad'>8->-- \mf <si lad'>--~ <si lad'>16. si32( lad'8)->
   do,16\<( si)~ \t {si do,_( si')\!} |
   \pl {
+    \halfBeat
     r16. do32(_- si8)~ si16 la^(~ \t {la si sold)}
   } {
     lad'8->-- \t {r lad16--~} lad4
   }
   \ottava #0
-  si,16(-"loco"-\dyndim "dim. molto" sold sol si)~
+  \fullBeat
+  si,16(-"loco"\dyndim "dim. molto" sold sol si)~
   \tt {si sol( sold mi red} |
 
-  fad8.)-\dyn "p_semplice" mid16( fad2)~
+  fad8.)\dyn "p_semplice" mid16( fad2)~
+  \halfBeat
   fad16 do( reb32-- do mid fad)~ |
   fad8 \t {do16( si'8)~} si16 sol? sold32( mi red fad~
   fad16 sold) \tt {mid32(\< fad sold sib la)} |
@@ -160,7 +173,7 @@ UnPianoMd = \relative {
     do2~ do8. reb16
   } {
     si'4.-- do8^( si2*1/2)\laissezVibrer
-  } do,16(\> do' \ottava #1 si si'--)~
+  } \fullBeat do,16(\> do' \ottava #1 si si'--)~
   si\! la( fa?8-- \t {sol\> mi mib)} |
 
   solb4--\pp solb4..-- lab16( |
@@ -187,7 +200,7 @@ UnPianoMd = \relative {
   <mi fa si>2.)\! \laissezVibrer \fermata
 
   %%% Variation IV %%%
-  <do fa sol si>4.^-^( -\dyn "f_(franc)"
+  <do fa sol si>4.^-^( \dyn "f_(franc)"
   <mi la si red>^-)~ <mi la si red>2 r4 |
   <do fa sol si>^-( <mi la si red>^- <fa sib do mi>^-) |
   <mi la si red>2.^- ~ <mi la si red>4 r <do fa sol si>^- |
@@ -242,7 +255,7 @@ UnPianoMd = \relative {
     <mi la si red>8 r
   }
 
-  <lab, reb mib sol>4---\dyn "mp_calorosamente" %% FIXME: is that a word?
+  <lab, reb mib sol>4--\dyn "mp_calorosamente" %% FIXME: is that a word?
   <lab reb mib sol>4..-- <sibb lab'>16( |
   <lab do re sol>2) r4 |
   <lab reb mib sol>4--^( <do mi fad si>2--) |
@@ -261,12 +274,13 @@ UnPianoMd = \relative {
   r4 <re la'>2( | <do mi fa sol si>2.)\laissezVibrer
 
   %%% Variation V %%%
-  do4--~-\dyn "mf_(con Ped.)" \t {do8 do4~} |
+  \fullBeat
+  do4--~\dyn "mf_(con Ped.)" \t {do8 do4~} |
   \t {do8. si16( do8)~} do4~ |
   \t {do8 si( do} \t {si \mg mi, red} |
   \md do'4) \t {si8--( si-- do--)} |
   \tt {solb'--( fa-- red16--~} red\> mi) lab( sol) |
-  si4.-- -\dyn "p_dolce" do8( si4)~ |
+  si4.-- \dyn "p_dolce" do8( si4)~ |
   si8 do do( si) fa'( solb) |
   si,2~ si8 do( | si2) si4~ |
   si8 sib la( lab) fab'( mib) |
@@ -276,7 +290,7 @@ UnPianoMd = \relative {
   \t {do8 si'4)\laissezVibrer } r8 sol,--~ sol4~ |
   sol8 sol--~ \t {sol la lad(~} \t {lad si) la'16( si} |
 
-  <do, la' do>4.)-\dyn "mf_malinconico" %% FIXME: word?
+  <do, la' do>4.)\dyn "mf_malinconico" %% FIXME: word?
   <si sold' si>8( <do la' do>4)~ |
   <do la' do>8 <si sol' si> <si sol' si>( <do lab' do>)
   <mi, do' mi>( <red si' red>) |
@@ -302,9 +316,9 @@ UnPianoMd = \relative {
     \oneVoice mib[(_"dolce" re] sib'[ la]
     dod,4.)\> do8 do^( fa,?)\!
   }
-  
+
   si,4--~\mp \t {si8 si4--~} | \t {si8 do( si)~} si4~ |
-  \t {si8 \mg \stemUp do,(-\dyn "cantando" si)} \t {lab^( mib' do} |
+  \t {si8 \mg \stemUp do,(\dyn "cantando" si)} \t {lab^( mib' do} |
   \set tieWaitForNote = ##t
   \md \stemNeutral si'4)~\> \t {si8 la~ re~} |
   <la re sol>2\!\laissezVibrer \fermata
@@ -327,8 +341,10 @@ UnPianoMd = \relative {
   fad,16-- la8.--\laissezVibrer
   r8 \ottava #1 mi''''16^(_\sf sold,,) %%%BUG
   \t {red'4_- \ottava #0 re,,_-_"loco" \stemUp \mg dod,^-} |
+  \halfBeat
   \stemNeutral \md \t {r16 mi'''(-> _\> fa,~} fa re)~
   \t {re8_\! \mg \stemUp sol,,( \stemNeutral \md sold')}
+  \fullBeat
   \pl { r4 la8_"(loco)"\mf}
   {\ottava #1 r32 dod'(_\pp red'8.-.) \ottava #0
   r4 r8 \ottava #1 lad'-.}
@@ -373,11 +389,13 @@ UnPianoMd = \relative {
   <la la'>8 <si si'>->--)~ <si si'>2}
 
   \pl r4 <si si'>2*1/2->--^\sfz\laissezVibrer \>
+  \halfBeat
   r8\mp \lightBeams \graceNotes {do'32( si, re la)
    sol(^\dyn "pp_élégant" fa, la mi)
   \tt {re( sol do mi si}
   fa') do'( re, mi' \t {fa16_\> sol la} si8)_\! } r |
   \tt {r16 re,,,( sol do la'} <si si'>4)
+  \fullBeat
   \pl {\ottava #0 <si,,, mi fa si>4._-_"loco"_(
   \ottava #0 <do re sol la>_-_)
   \ottava #0 <si mi fa si>2_- _"loco" <si mi fa si>2*1/2_- }
@@ -386,11 +404,13 @@ UnPianoMd = \relative {
   do'( si) re,( mi sol la) fa
   mi, sol re( la' si fa do') si, \ottava #0
   do la^"loco" re, mi( fa\> si sol do,)}} \clef bass
+  \halfBeat
   \t {r16 \lightBeams \graceNotes { la,( si,)}}
   \lightBeams \graceNotes {do32 mi, re'( mi
   \tt {fa) sol, fa( la sol')}} r8 |
   \clef treble \pl <do mi fad si>2*1/2--\p
-  \t {r8 \ottava #1 fad'''32_>_( sol la si si,_> do re mi)}
+  \t {\tupletBeat r8 \ottava #1 fad'''32_>_( sol la si si,_> do re mi)}
+  \halfBeat
   \t {fa16-.(_"(with swing)" reb-. mib-.}
   \t {lab,-. sib-. fa-.)} \ottava #0
   \t {r16 sib,(\> reb} \t {mib) fa,(-. lab-.)}
@@ -402,7 +422,7 @@ UnPianoMd = \relative {
   { \t {r8 \ottava #1 \acciaccatura do''''16-> si,8-- re-.}
   \oneVoice \t {sib \acciaccatura mi16-> red,8-- fad-.} }
   \t {re \ottava #0 \acciaccatura lab'16-> sol,8-- sib-.(}
-  fad-.) si,4.\glissando \ottava #1 |
+  fad-.) si,4.\glissando ^"gliss." \ottava #1 |
   si'''4->-- r si,,,\<\glissando si'''->--\! \ottava #0
   \pl { s4 r } { \oneVoice si,,,,-"loco"\<\glissando
   \ottava #1 <do'''' do,>2*1/2->--\fp\laissezVibrer }
@@ -473,13 +493,13 @@ UnPianoMd = \relative {
     r4 mib^(~ mib8. fab16 mib2) |
     lab,2.(\> solb2)\! \breathe
   } |
-  <reb mib sol>2--(-\dyn "p_possibile" <reb mib sol>~-- sol8. lab16 |
+  <reb mib sol>2--(\dyn "p_possibile" <reb mib sol>~-- sol8. lab16 |
   sol2.--) \longHairpin lab2(\> <re, mib fad>1--)\! r4
   \pl mi1*5/4_-_"dolce assai" {r4 r8 fa^(~ fa2 sol4)} |
   <re sol la>2^(~\> <re sol la>8 <mi fa si>2*5/4)\!\laissezVibrer\fermata
 }
 
-UnPianoMg = \relative {
+UnPianoMg = \relative do' {
   <mi fa>2--( <mi fa>2.--) |
   <mi fa>2--( <mi fa>2.--) |
   <mi fa>2_"simile" <mi fa>2. |
@@ -535,7 +555,7 @@ UnPianoMg = \relative {
 
   %%% Variation III %%%
   \tt {si16_"legato assai"
-  -\dyn "pp_sotto voce, con Ped." do, re fa sol}
+  \dyn "pp_sotto voce, con Ped." do, re fa sol}
   \tt {si do, re fa sol}
   \tt {si do, re fa sol} |
   \tt {si do, re fa sol}
@@ -793,8 +813,10 @@ UnPianoMg = \relative {
   s4 \ottava #-1 si,,,16(-. do'-. la-. re-.) \ottava #0 r4
   \ottava #-1 la,16(-. sol'-. fa-. si-. re,-. mi-. do8--) |
   \pl si2*1/2\laissezVibrer \t {r8 \ottava #1 \clef treble
+  \tupletBeat
   \tupletDown \t {sol''''''16_(-. la-. fad-.}
   \t {mi-. do-. re-.)}} \tupletNeutral
+  \halfBeat
   \ottava #0 fad,32( sol la si do, dod red mi)
   <mib, sol la re>4--_"(espr.)" \clef bass
   r32 mi,(_\ppp fa sol \tt {la) la,( sib do re)}
@@ -802,6 +824,7 @@ UnPianoMg = \relative {
   \ottava #-1 si,2\laissezVibrer \ottava #0 \clef treble
   \longHairpin <lab''' reb mib sol>8(^\mp^\<
   <do fa sol si>4) <do fa sol si>4.-- | \clef bass
+  \fullBeat
   r8^\! \ottava #-1 si,,,4.\laissezVibrer \clef treble \ottava #0
   \graceNotes { \tttt {r16 dod'''_( red fad sold lad dod}
   \tttt {red fad sold lad \ottava #1 dod red fad}
-- 
2.11.4.GIT