From: Keith OHara <k-ohara5a5a@oco.net>
Date: Wed, 31 Dec 2014 07:29:23 +0000 (-0800)
Subject: make \shiftOff an assertive \override, not a \revert
X-Git-Tag: release/2.19.16-1~2^2~38^2~3
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=30a6581b78cd49b6600d43e8aa7b6d9e35cabb31

make \shiftOff an assertive \override, not a \revert
---

diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely
index 1ec7ca30ed..db99e027c8 100644
--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -3298,10 +3298,7 @@ was left looking like this:
 @noindent
 The inner note of the first chord (i.e. the A-flat in the fourth
 Voice) need not be shifted away from the note column of the higher
-note.  We might expect to correct this by using @code{\shiftOff}, but
-this will cause warnings about clashing note columns.  Instead, we
-set @code{force-hshift}, which is a property of @code{NoteColumn},
-of this note to zero.
+note, so we use @code{\shiftOff}.
 
 In the second chord we prefer the F to line up with the A-flat and
 the lowest note to be positioned slightly right to avoid a collision
@@ -3327,8 +3324,7 @@ Here's the final result:
     { <ees, c>2 \once \override NoteColumn.force-hshift = 0.5 des }
     \\
     \\
-    { \once \override NoteColumn.force-hshift = 0 aes'2
-      \once \override NoteColumn.force-hshift = 0 f4 fes }
+    { \once \shiftOff aes'2 \once \shiftOff f4 fes }
   >> |
   <c ees aes c>1 |
 }
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 28b9b5c2f1..ef1bea45de 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -482,10 +482,10 @@ walkerHeadsMinor =
 
 %% shifts
 
+shiftOff  = \override NoteColumn.horizontal-shift = #0
 shiftOn   = \override NoteColumn.horizontal-shift = #1
 shiftOnn  = \override NoteColumn.horizontal-shift = #2
 shiftOnnn = \override NoteColumn.horizontal-shift = #3
-shiftOff  = \revert NoteColumn.horizontal-shift
 
 
 %% slurs
diff --git a/python/convertrules.py b/python/convertrules.py
index 02f41a2366..0df4b09b1d 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3728,6 +3728,7 @@ csharp -> c-sharp""")
 def conv(str):
     str = re.sub (r'\bimplicitTimeSignatureVisibility\b', 'initialTimeSignatureVisibility', str)
     str = re.sub (r'\b([a-g])((?:sharp){1,2}|(?:flat){1,2})\b',r'\1-\2', str)
+    str = re.sub (r'\\shiftOff\b', r'\\undo\\shiftOn', str)
     return str
 
 # Guidelines to write rules (please keep this at the end of this file)