Issue 1029: \thumb should behave like other fingerings

This changes \thumb from a script to an actual bona-fide fingering.
The size tweak is a bit ugly: it might make some sense to resize the
actual glyph to match fingerings, but maybe it should then also be
relocated from "scripts.thumb".

diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly
index 671e9e4a2d5defe6b4d480a85c88ec88bc5a10fa..ef64790ffd1f55310ae0a0729b503f8ef8aaf0c9 100644 (file)
--- a/Documentation/included/script-chart.ly
+++ b/Documentation/included/script-chart.ly
@@ -50,7 +50,6 @@ This chart shows all articulations, or scripts, that the feta font contains.
     '("upbow"
       "downbow"
       "flageolet"
-      "thumb"
       "snappizzicato"
       "open"
       "halfopen"

diff --git a/ly/script-init.ly b/ly/script-init.ly
index ed7aed59486874bcbc4d35182d2b6f35b5d49d21..0baf24258b2af8c41e8ebf3ef86e8ea085671082 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -46,7 +46,9 @@ staccatissimo = #(make-articulation "staccatissimo")
 staccato = #(make-articulation "staccato")
 stopped = #(make-articulation "stopped")
 tenuto = #(make-articulation "tenuto")
-thumb = #(make-articulation "thumb")
+thumb = \tweak text \markup \scale #(cons (magstep 5) (magstep 5))
+                            \musicglyph #"scripts.thumb"
+        #(make-music 'FingeringEvent)
 trill = #(make-articulation "trill")
 turn = #(make-articulation "turn")
 upbow = #(make-articulation "upbow")

diff --git a/scm/script.scm b/scm/script.scm
index 905a9f5a623b70079193d6fdb7b70c4a2ad7d37f..125a2fee5d1348b4e5c8daa7ceef130acf3314b5 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -293,13 +293,6 @@
        (avoid-slur . inside)
        (padding . 0.20)
        (side-relative-direction . ,DOWN)))
-    ("thumb"
-     . (
-       (script-stencil . (feta . ("thumb"  . "thumb")))
-       (avoid-slur . around)
-       (padding . 0.50)
-       (direction . ,UP)
-       (staff-padding . 0.5)))
     ("trill"
      . (
        (script-stencil . (feta . ("trill" . "trill")))