X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fscript.scm;h=b5e14bae5667974c269dea5e0e8602e8946b7131;hb=07f7ea94c774c7b746a0e7b703bc4a709b73eabf;hp=9804c92dc0230885dc33abd13fcc20e554ae9163;hpb=fe703fa8d6172c1cc615ba04c9e853b8c334836a;p=lilypond.git

diff --git a/scm/script.scm b/scm/script.scm
index 9804c92dc0..b5e14bae56 100644
--- 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--2012 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"
@@ -52,8 +62,10 @@
      . (
 	(script-stencil . (feta . ("downbow" . "downbow")))
 	(padding . 0.20)
+	(skyline-horizontal-padding . 0.20)
 	(avoid-slur . around)
-	(direction . ,UP)))
+	(direction . ,UP)
+	(script-priority . 150)))
     ("downmordent"
      . (
 	(script-stencil . (feta . ("downmordent" . "downmordent")))
@@ -72,7 +84,6 @@
      . (
 	(avoid-slur . around)
 	(padding . 0.20)
-	(quantize-position . #t)
 	(script-stencil . (feta . ("espr" .  "espr")))
 	(side-relative-direction . ,DOWN)))
 
@@ -92,6 +103,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 +176,6 @@
      . (
 	(script-stencil . (feta . ("uportato" . "dportato")))
 	(avoid-slur . around)
-	(slur-padding . 0.3)
 	(padding . 0.45)
 	(side-relative-direction . ,DOWN)))
     ("prall"
@@ -248,8 +266,10 @@
     ("staccatissimo"
      . (
 	(avoid-slur . inside)
+	(quantize-position . #t)
 	(script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
 	(padding . 0.20)
+	(skyline-horizontal-padding . 0.10)
 	(side-relative-direction . ,DOWN)))
     ("staccato"
      . (
@@ -259,6 +279,7 @@
 	(avoid-slur . inside)
 	(toward-stem-shift . 0.5)
 	(padding . 0.20)
+	(skyline-horizontal-padding . 0.10)
 	(script-priority . -100)))
     ("stopped"
      . (
@@ -275,12 +296,6 @@
 	(avoid-slur . inside)
 	(padding . 0.20)
 	(side-relative-direction . ,DOWN)))
-    ("thumb"
-     . (
-	(script-stencil . (feta . ("thumb"  . "thumb")))
-	(avoid-slur . inside)
-	(padding . 0.20)
-	(direction . ,UP)))
     ("trill"
      . (
 	(script-stencil . (feta . ("trill" . "trill")))
@@ -301,7 +316,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")))