Remove last traces of 'no-spacing-rods & add convert rule.

diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index b69bfe67dd28680a71fcea9287b18ea98c4e7450..4cdbc7896749ef50fb2360f7a87e45cfd2ddb95b 100644 (file)
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,4 +1,3 @@
-
 \version "2.12.0"
 \header{
   texidoc="
@@ -8,9 +7,6 @@ natural sign.
 "
 }
 
-
-\layout { ragged-right = ##t }
-
 thenotes =  \relative cis' {
   \time 4/4
   gisis'4 gis geses ges |
@@ -18,10 +14,5 @@ thenotes =  \relative cis' {
 
 <<
   \context Staff \thenotes
-  \context NoteNames  {
-    \override NoteNames.NoteName   #'no-spacing-rods = ##f 
-    \thenotes
-  }
+  \context NoteNames \thenotes
 >>
-
-

diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index f4d9e94e3d153485a5f7c4e2ee2d7e67ca075be6..6e19ca830731d15e87872ba86ed628e18b11b619 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,10 +1,10 @@
-
 \version "2.12.0"
 
 \header{
-  texidoc=" By default, text is set with empty horizontal dimensions.  
-The boolean property @code{no-spacing-rods} in @code{TextScript} is used
-to control the horizontal size of text.  " }
+  texidoc = "By default, text is set with empty horizontal dimensions.
+The property @code{extra-spacing-width} in @code{TextScript} is used
+to control the horizontal size of text."
+}
 
 \layout {
   line-width = 3.0\cm
@@ -12,11 +12,11 @@ to control the horizontal size of text.  " }
 
 \relative c''{
   %% \textLengthOff
-  %% short for \override TextScript  #'no-spacing-rods = ##t
+  %% short for \override TextScript #'extra-spacing-width = #'(+inf.0 . -inf.0)
+  %%           \override TextScript #'extra-spacing-height = #'(0 . 0)
   c2_"very wide and long text" c | \break
-  %% short for \override TextScript  #'no-spacing-rods = ##f
+  %% short for \override TextScript #'extra-spacing-width = #'(0 . 0)
+  %%           \override TextScript #'extra-spacing-height = #'(-inf.0 . +inf.0)
   \textLengthOn
-  c_"very wide and long text" c
+  c2_"very wide and long text" c
 }
-
-

diff --git a/python/convertrules.py b/python/convertrules.py
index 45ade153967a1b2aacc6c30557c537e2a7295299..72479a952f27d98de986e7ab573aaf87d40630c8 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2573,6 +2573,12 @@ def conv (str):
     return re.sub ('ly:clone-parser',
                    'ly:parser-clone', str)
 
+@rule ((2, 11, 3), "no-spacing-rods -> extra-spacing-width")
+def conv (str):
+    str = re.sub (r"no-spacing-rods\s+=\s+##t", r"extra-spacing-width = #'(+inf.0 . -inf.0)", str)
+    str = re.sub (r"no-spacing-rods\s+=\s+##f", r"extra-spacing-width = #'(0 . 0)", str)
+    return str
+
 
 @rule ((2, 11, 5), _ ("deprecate cautionary-style. Use AccidentalCautionary properties"))
 def conv (str):