From 6d5538c46aa1778a42fd40948d0b266429d313f2 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 22 Oct 2009 01:21:43 +0200
Subject: [PATCH] Remove deprecated vertical layout settings; Adjust text
 markup definitions

---
 oly_settings_global.ily | 22 +++++++++++-----------
 orchestrallily.ily      |  3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/oly_settings_global.ily b/oly_settings_global.ily
index 7d8dd43..c185c18 100644
--- a/oly_settings_global.ily
+++ b/oly_settings_global.ily
@@ -6,13 +6,13 @@
 
 % Some spacing settings, need to test them before I can enable them
 \layout {
-  \context { \Staff 
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. . 3)
-    \override VerticalAxisGroup #'remove-empty = ##f
-  }
-  \context { \Lyrics
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
-  }
+%   \context { \Staff
+%     \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. . 3)
+%     \override VerticalAxisGroup #'remove-empty = ##f
+%   }
+%   \context { \Lyrics
+%     \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 0.7)
+%   }
   \context { \Score
     \override BarNumber #'self-alignment-X = #0
     \override BarNumber #'outside-staff-priority = #10
@@ -20,7 +20,7 @@
 %     autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 1))
     autoCautionaries = #'()
   }
-  \context { \StaffGroup 
+  \context { \StaffGroup
     \consists "Instrument_name_engraver"
   }
 }
@@ -60,11 +60,11 @@ vTwo = {\voiceTwo \revert MultiMeasureRest #'staff-position }
 vThree = {\voiceThree \revert MultiMeasureRest #'staff-position }
 oneV = {\oneVoice \revert MultiMeasureRest #'staff-position }
 
-semprefff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+semprefff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "fff")))
-sempreff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+sempreff = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "sempre" #:dynamic "ff")))
-subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0) 
+subitopp = #(make-dynamic-script (markup #:line( #:with-dimensions '(0 . 0)
 '(0 . 0) #:right-align #:normal-text #:italic "subito" #:dynamic "pp")))
 %}
 
diff --git a/orchestrallily.ily b/orchestrallily.ily
index 93f7623..db1f0c7 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -992,7 +992,7 @@ filterArticulations = #(define-music-function (parser location music) (ly:music?
 rit = \markup {\italic "rit."}
 pocorit = \markup {\italic "poco rit."}
 ppmosso = \markup {\italic "poco più mosso"}
-dolce = \markup {\italic "dolce."}
+dolce = \markup {\italic "dolce"}
 pizz = \markup {\italic "pizz."}
 arco = \markup {\italic "arco"}
 perd = \markup {\italic "perdend."}
@@ -1540,6 +1540,7 @@ brackettt = ^\markup{"[Tutti]"}
 ts = ^\markup{"t.s."}
 tt = ^\markup{"Tutti"}
 solo = ^\markup{"Solo"}
+bracketsolo = ^\markup{"[Solo]"}
 tutti = ^\markup{"Tutti"}
 
 dashedSlur = -\tweak #'dash-definition #'((0 1 0.4 0.75))(
-- 
2.11.4.GIT