Merge branch 'master' into lilypond/translation

[lilypond.git] / scm / script.scm

diff --git a/scm/script.scm b/scm/script.scm
index 9804c92dc0230885dc33abd13fcc20e554ae9163..4d6dc05a8ea6eb5bcbe8f346cca4470c5b3fe6c1 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -1,8 +1,19 @@
-;;;; script.scm -- Script definitions
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;
-;;;; (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-public default-script-alist
   `(
@@ -10,7 +21,6 @@
      . (
        (avoid-slur . around)
        (padding . 0.20)
-       (quantize-position . #t)
        (script-stencil . (feta . ("sforzato" . "sforzato")))
        (side-relative-direction . ,DOWN)))
     ("accentus"
@@ -53,7 +63,8 @@
        (script-stencil . (feta . ("downbow" . "downbow")))
        (padding . 0.20)
        (avoid-slur . around)
-       (direction . ,UP)))
+       (direction . ,UP)
+       (script-priority . 150)))
     ("downmordent"
      . (
        (script-stencil . (feta . ("downmordent" . "downmordent")))
@@ -72,7 +83,6 @@
      . (
        (avoid-slur . around)
        (padding . 0.20)
-       (quantize-position . #t)
        (script-stencil . (feta . ("espr" .  "espr")))
        (side-relative-direction . ,DOWN)))
 
@@ -92,6 +102,14 @@
        (direction . ,UP)))
 
 
+    ("halfopen"
+     . (
+       (avoid-slur . outside)
+       (padding . 0.20)
+       (script-stencil . (feta . ("halfopen" . "halfopen")))
+       (direction . ,UP)))
+
+
     ("ictus"
      . (
        (script-stencil . (feta . ("ictus" . "ictus")))
@@ -157,7 +175,6 @@
      . (
        (script-stencil . (feta . ("uportato" . "dportato")))
        (avoid-slur . around)
-       (slur-padding . 0.3)
        (padding . 0.45)
        (side-relative-direction . ,DOWN)))
     ("prall"
@@ -248,6 +265,7 @@
     ("staccatissimo"
      . (
        (avoid-slur . inside)
+       (quantize-position . #t)
        (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
        (padding . 0.20)
        (side-relative-direction . ,DOWN)))
@@ -278,9 +296,10 @@
     ("thumb"
      . (
        (script-stencil . (feta . ("thumb"  . "thumb")))
-       (avoid-slur . inside)
-       (padding . 0.20)
-       (direction . ,UP)))
+       (avoid-slur . around)
+       (padding . 0.50)
+       (direction . ,UP)
+       (staff-padding . 0.5)))
     ("trill"
      . (
        (script-stencil . (feta . ("trill" . "trill")))
@@ -301,7 +320,8 @@
        (script-stencil . (feta . ("upbow" . "upbow")))
        (avoid-slur . around)
        (padding . 0.20)
-       (direction . ,UP)))
+       (direction . ,UP)
+       (script-priority . 150)))
     ("upmordent"
      . (
        (script-stencil . (feta . ("upmordent" . "upmordent")))