Make syntax changes for Easy Notation and text influence on spacing

- \setEasyHeads -> \easyHeadsOn, add \easyHeadsOff
- \fatText -> \textLengthOn, \emptyText -> \textLengthOff

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index b5f0216e7d5fa16257c86ee5b08a791ab9b93eb7..474349b439e12ff7bace3209d9147a323e95ed78 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -40,7 +40,7 @@ See user manual, \NAME\
 
 @ifhtml
 This document is also available in @uref{NEWS.pdf,PDF}. It's part of
-the @uref{../,LilyPond Documentation} 
+the @uref{../,LilyPond Documentation} .
 @end ifhtml
 
 
@@ -65,6 +65,14 @@ which scares away people.
 
 @end ignore
 
+@item
+@code{\setEasyHeads} has been renamed to @code{\easyHeadsOn}, and a new
+command @code{\easyHeadsOff} reverts note heads to normal heads.
+
+@item
+@code{\fatText} and @code{\emptyText} have been renamed to
+@code{\textLengthOn} and @code{\textLengthOff}, respectively.
+
 @item
 Underlining is now possible with the @code{\underline} markup command.
 

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 8ca7f8c284678bf57d6c6cb77a68374133ab54dd..d191086fe98d36abfa04ce65f568927b65cb0b82 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.10.0"
+\version "2.7.38"
 
 stemUp = \override Stem  #'direction = #UP
 stemDown = \override Stem  #'direction = #DOWN 
@@ -8,7 +8,7 @@ stemNeutral= \revert Stem #'direction
 
 slurUp = \override Slur  #'direction = #UP
 slurDown = \override Slur  #'direction = #DOWN
-slurNeutral = \revert Slur #'direction 
+slurNeutral = \revert Slur #'direction
 
 %% There's also dash, but setting dash period/length should be fixed.
 slurDashed = {
@@ -27,16 +27,16 @@ slurSolid = {
 
 phrasingSlurUp = \override PhrasingSlur  #'direction = #UP
 phrasingSlurDown = \override PhrasingSlur  #'direction = #DOWN
-phrasingSlurNeutral = \revert PhrasingSlur #'direction 
+phrasingSlurNeutral = \revert PhrasingSlur #'direction
 
 shiftOn = \override NoteColumn  #'horizontal-shift = #1
 shiftOnn = \override NoteColumn  #'horizontal-shift = #2
 shiftOnnn = \override NoteColumn  #'horizontal-shift = #3
-shiftOff = \revert NoteColumn #'horizontal-shift 
+shiftOff = \revert NoteColumn #'horizontal-shift
 
 tieUp = \override Tie  #'direction = #UP
 tieDown = \override Tie  #'direction = #DOWN
-tieNeutral = \revert Tie #'direction 
+tieNeutral = \revert Tie #'direction
 
 tieDashed = {
   \override Tie #'dash-period = #0.75
@@ -51,13 +51,20 @@ tieSolid = {
   \revert Tie #'dash-fraction
 }
 
-setEasyHeads = \sequential {
+easyHeadsOn = {
   \override NoteHead  #'stencil = #ly:note-head::brew-ez-stencil
   \override NoteHead #'font-size = #-7
   \override NoteHead #'font-family = #'sans
   \override NoteHead #'font-series = #'bold
 }
 
+easyHeadsOff = {
+  \revert NoteHead #'stencil
+  \revert NoteHead #'font-size
+  \revert NoteHead #'font-family
+  \revert NoteHead #'font-series
+}
+
 aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti)
 
 sacredHarpHeads =
@@ -154,11 +161,15 @@ endincipit =  \context Staff {
 autoBeamOff = \set autoBeaming = ##f
 autoBeamOn = \set autoBeaming = ##t
 
-fatText = { \override TextScript  #'extra-spacing-width = #'(0 . 0)
-            \override TextScript  #'infinite-spacing-height = ##t }
+textLengthOn = {
+  \override TextScript  #'extra-spacing-width = #'(0 . 0)
+  \override TextScript  #'infinite-spacing-height = ##t
+}
 
-emptyText = { \override TextScript  #'extra-spacing-width = #'(+inf.0 . -inf.0)
-              \override TextScript  #'infinite-spacing-height = ##f }
+textLengthOff = {
+  \override TextScript  #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  \override TextScript  #'infinite-spacing-height = ##f
+}
 
 showStaffSwitch = \set followVoice = ##t
 hideStaffSwitch = \set followVoice = ##f

diff --git a/python/convertrules.py b/python/convertrules.py
index 5234d65eca9d428afd12db3a3ce6dc6c8a4a904e..3be4c2f49478ffd1f0977fa9001e13d268a6a893 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3025,3 +3025,12 @@ def conv (str):
     return str
 
 conversions.append (((2, 11, 35), conv, """scripts.caesura -> scripts.caesura.curved. Use #'style not #'dash-fraction to select solid/dashed lines."""))
+
+def conv (str):
+    str = re.sub (r"setEasyHeads", r"easyHeadsOn", str)
+    str = re.sub (r"fatText", r"textLengthOn", str)
+    str = re.sub (r"emptyText", r"textLengthOff", str)
+    return str
+
+conversions.append (((2, 11, 38), conv, """\\setEasyHeads -> \\easyHeadsOn, \\fatText -> \\textLengthOn,
+\\emptyText -> \\textLengthOff"""))