From fbf2c50fb050d195e8ddc0942bc70fd6ca52fc67 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Thu, 23 Sep 2010 12:36:40 +0200
Subject: [PATCH] Accidentals should be remembered 2 measures, add sottovoce,
 vide improved

---
 orchestrallily.ily | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/orchestrallily.ily b/orchestrallily.ily
index b1330f4..bc6d122 100644
--- a/orchestrallily.ily
+++ b/orchestrallily.ily
@@ -1596,9 +1596,15 @@ slashedGrace =
     \override RestCollision #'positioning-done = #merge-rests-on-positioning
     % Auto-Accidentals: Use modern-cautionary style...
     extraNatural = ##f
+    % Accidental rules (the rule giving the most accidentals wins!)
+    % -) Reset accidentals at each barline -> accs not in key sig will always be printed
+    % -) Same octave accidentals are remembered for two measures -> cancellation
+    % -) other octave accidentals are remembered for next measure -> cancellation
     autoAccidentals = #`(Staff  ,(make-accidental-rule 'same-octave 0)
                                 ,(make-accidental-rule 'any-octave 0)
-                                ,(make-accidental-rule 'same-octave 1))
+                                ,(make-accidental-rule 'any-octave 1)
+                                ,(make-accidental-rule 'same-octave 2))
+    % No auto-cautionaries, we always use autoAccidentals!
 %     autoCautionaries = #`(Staff ,(make-accidental-rule 'any-octave 0)
 %                                 ,(make-accidental-rule 'same-octave 1))
     printKeyCancellation = ##t
@@ -1620,6 +1626,8 @@ bracketts = ^\markup{"[Solo]"}
 brackettt = ^\markup{"[Tutti]"}
 bracketsolo = ^\markup{"[Solo]"}
 
+sottovoce = \markup "sotto voce"
+
 dashedSlur = -\tweak #'dash-definition #'((0 1 0.4 0.75))(
 dashedTie = -\tweak #'dash-definition #'((0 1 0.4 0.75))~
 
@@ -1715,12 +1723,12 @@ editorialDynamic = \once \override DynamicText #'stencil = #(lambda (grob) (edit
 editorialMarkup =  \once \override TextScript  #'stencil = #(lambda (grob) (editorial-bracket-stencil (ly:text-interface::print grob) 0.2 0.55))
 
 % videStart = \mark \markup { \hspace #1 \musicglyph #"scripts.coda"  \with-dimensions #'(0 . 0) #'(0 . 0) \left-align { vi-} }
-videStart = \mark \markup \halign #-2.3 \concat { \musicglyph #"scripts.coda" \with-dimensions #'(0 . 0) #'(0 . 0) \left-align { vi- } }
+videStart = \mark \markup \halign #-2.3 \concat { \hspace #4.5 \musicglyph #"scripts.coda" \left-align { vi- } }
 % videEnd = \notemode {
 %   \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
 %   \mark \markup \concat{ \with-dimensions #'(0 . 0) #'(0 . 0) \right-align { -de } \hspace #1 \musicglyph #"scripts.coda" }
 %}
 videEnd = \notemode {
 	\once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
-	\mark \markup \concat{ \with-dimensions #'(0 . 0) #'(0 . 0) \right-align { -de } \hspace #1.5 \musicglyph #"scripts.coda" \hspace #0.2 }
+	\mark \markup \concat{ \right-align { -de } \hspace #1.5 \musicglyph #"scripts.coda" \hspace #4.2 }
 }
-- 
2.11.4.GIT