StringNumber: change 'avoid-slur setting to 'around.

Add regression test.

diff --git a/input/regression/string-number-around-slur.ly b/input/regression/string-number-around-slur.ly
new file mode 100644 (file)
index 0000000..42c8a39
--- /dev/null
+++ b/input/regression/string-number-around-slur.ly
@@ -0,0 +1,12 @@
+\version "2.11.57"
+
+\header {
+  texidoc = "String numbers should only be moved outside slurs when there
+is a collision."
+}
+
+\relative c'' {
+  \textLengthOn
+  <c\3>4-"inside"( d' <e,\2>-"inside" g
+  <c\1>1-"outside")
+}

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d43ce82efcd375617de9047cdba399b048df210d..f8a6526acf6659202a3845cc2e9a1454ed301da1 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1683,7 +1683,7 @@
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (script-priority . 100)
-       (avoid-slur . outside)
+       (avoid-slur . around)
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
        (meta . ((class . Item)