(default-script-alist): set paddings for every

type here, increase for portato mark.

diff --git a/ChangeLog b/ChangeLog
index 3e3168e817146151315d57fd6aea1484118ef97a..a6b074497e6ff1612052bd709a220cae9bfc4b2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/script.scm (default-script-alist): set paddings for every
+       type here, increase for portato mark.
+
        * scm/lily.scm (define-scheme-options): typo: add s, so it is 
        -dinclude-eps-fonts
 

diff --git a/lily/font-config.cc b/lily/font-config.cc
index afa210a7ad4faba7d0ea887d4ee4634e10138333..cbf77c7944d012c9186e50edb1c1dd7143a1f034 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,9 +30,11 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+#if 0
+  // always returns 0 for FC 2.4
   if (!cache_file)
     programming_error ("Cannot find file for FontConfig cache.");
-
+#endif
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 7c05131a85f2164381d2c317cdeaa85ac91875c5..cb3a007d53ed6f3e160e713ce5ec78373a5bbedc 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -92,8 +92,9 @@ copy_property (Grob *g, SCM sym, SCM alist)
    could be saved by tacking the props onto the Script grob (i.e. make
    ScriptStaccato , ScriptMarcato, etc. ).
 */
-void make_script_from_event (Grob *p,  Context *tg,
-                            SCM art_type, int index)
+void
+make_script_from_event (Grob *p,  Context *tg,
+                       SCM art_type, int index)
 {
   SCM alist = tg->get_property ("scriptDefinitions");
   SCM art = scm_assoc (art_type, alist);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e2a2d7746741d7fc83d7f03ba36f887003ca56c1..0e9ae37693c27d8857e260e32af4066d7f3ae857 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1296,9 +1296,7 @@
      . (
        ;; don't set direction here: it breaks staccato.
 
-       ;; This value is sensitive: if too large, staccato dots will move a
-       ;; space a away.
-       (padding . 0.20)
+       ;; padding set in script definitions.
        (staff-padding . 0.25)
        ;; (script-priority . 0) priorities for scripts, see script.scm
        (X-offset . , ly:self-alignment-interface::centered-on-x-parent)

diff --git a/scm/script.scm b/scm/script.scm
index 18f39cc7a54f89bf51d8ce26c3acd83ba641b0c0..a83d0a506781a792ce1213277205656c8f30a40f 100644 (file)
--- a/scm/script.scm
+++ b/scm/script.scm
@@ -8,34 +8,42 @@
       (append 
        '(("thumb" .
          ((script-stencil . (feta . ("thumb"  . "thumb")))
+          (padding . 0.20)        
           (direction . 1)))
          ("accent" .
          ((avoid-slur . around)
+          (padding . 0.20)        
           (quantize-position . #t)
           (script-stencil . (feta . ("sforzato" .  "sforzato")))
           (side-relative-direction . -1)))
          ("espressivo" .
          ((avoid-slur . around)
+          (padding . 0.20)        
           (quantize-position . #t)
           (script-stencil . (feta . ("espr" .  "espr")))
           (side-relative-direction . -1)))      
         ("marcato" .
          ((script-stencil . (feta . ("dmarcato" . "umarcato")))
+          (padding . 0.20)        
 ;         (staff-padding . ())
           (quantize-position . #t)
           (side-relative-direction .  -1)))
         ("staccatissimo" .
          ((avoid-slur . inside) 
           (script-stencil . (feta . ("dstaccatissimo" . "ustaccatissimo")))
+          (padding . 0.20)        
           (side-relative-direction .  -1)))
         
         ("portato" .
          ((script-stencil . (feta . ("uportato" . "dportato")))
+          (padding . 0.45)
+          (padding . 0.20)        
           (side-relative-direction . -1)))
 
         ("accentus" .
          ((script-stencil . (feta . ("uaccentus" . "uaccentus")))
           (side-relative-direction .  -1)
+          (padding . 0.20)        
           (quantize-position . #t)
           (script-priority . -100)
           (direction  . 1)))
@@ -43,140 +51,178 @@
          ((script-stencil . (feta . ("ictus" . "ictus")))
           (side-relative-direction .  -1)
           (quantize-position . #t)
+          (padding . 0.20)        
           (script-priority . -100)
           (direction  . -1)))
         ("semicirculus" .
          ((script-stencil . (feta . ("dsemicirculus" . "dsemicirculus")))
           (side-relative-direction .  -1)
           (quantize-position . #t)
+          (padding . 0.20)        
           (script-priority . -100)
           (direction  . 1)))
         ("circulus" .
          ((script-stencil . (feta . ("circulus" . "circulus")))
           (side-relative-direction .  -1)
+          (padding . 0.20)        
           (quantize-position . #t)
           (script-priority . -100)
           (direction  . 1)))
 
         ("signumcongruentiae" .
          ((script-stencil . (feta . ("dsignumcongruentiae" . "usignumcongruentiae")))
+          (padding . 0.20)        
           (direction .  1)))
         ("fermata" .
          ((script-stencil . (feta . ("dfermata" . "ufermata")))
+          (padding . 0.20)        
           (avoid-slur . around)
           (script-priority . 4000)
           (direction .  1)))
         ("shortfermata" .
          ((script-stencil . (feta . ("dshortfermata" . "ushortfermata")))
+          (padding . 0.20)        
           (direction .  1)))
         ("longfermata" .
          ((script-stencil . (feta . ("dlongfermata" . "ulongfermata")))
+          (padding . 0.20)        
           (direction .  1)))
         ("verylongfermata" .
          ((script-stencil . (feta . ("dverylongfermata" . "uverylongfermata")))
+          (padding . 0.20)        
           (direction .  1)))
         ("stopped" .
          ((script-stencil . (feta . ("stopped" . "stopped")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("staccato" .
          ((script-stencil . (feta . ("staccato" . "staccato")))
           (side-relative-direction .  -1)
           (quantize-position . #t)
           (avoid-slur . inside) 
+          (padding . 0.20)        
           (script-priority . -100)))
         ("tenuto" .
          ((script-stencil . (feta . ("tenuto" . "tenuto")))
           (quantize-position . #t)
           (avoid-slur . inside)
+          (padding . 0.20)        
           (side-relative-direction . -1)))
         ("comma" .
          ((script-stencil . (feta . ("lcomma" . "rcomma")))
           (quantize-position . #t)
+          (padding . 0.20)        
           (direction . 1)))
         ("varcomma" .
          ((script-stencil . (feta . ("lvarcomma" . "rvarcomma")))
           (quantize-position . #t)
+          (padding . 0.20)        
           (direction . 1)))
         ("upbow" .
          ((script-stencil . (feta . ("upbow" . "upbow")))
           (avoid-slur . around)
+          (padding . 0.20)        
           (direction  . 1)))
         ("downbow" .
          ((script-stencil . (feta . ("downbow" . "downbow")))
+          (padding . 0.20)        
           (avoid-slur . around)
           (direction  . 1)))
         ("lheel" .
          ((script-stencil . (feta . ("upedalheel" . "upedalheel")))
+          (padding . 0.20)        
           (direction .  -1))
          )
         ("rheel" .
          ((script-stencil . (feta . ("dpedalheel" . "dpedalheel")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("ltoe" .
          ((script-stencil . (feta . ("upedaltoe" . "upedaltoe")))
+          (padding . 0.20)        
           (direction  . -1)))
         ("rtoe" .
          ((script-stencil . (feta . ("dpedaltoe" . "dpedaltoe")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("turn" .
          ((script-stencil . (feta . ("turn" . "turn")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("open" .
          ((avoid-slur . outside)
-                (script-stencil . (feta . ("open" . "open")))
+          (padding . 0.20)        
+          (script-stencil . (feta . ("open" . "open")))
           (direction  . 1)))
         ("flageolet" .
          ((script-stencil . (feta . ("flageolet" . "flageolet")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("reverseturn" .
          ((script-stencil . (feta . ("reverseturn" . "reverseturn")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("trill" .
          ((script-stencil . (feta . ("trill" . "trill")))
           (direction . 1)
+          (padding . 0.20)        
           (avoid-slur . outside)
           (script-priority . 2000)))
         ("prall" .
          ((script-stencil . (feta . ("prall" . "prall")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("mordent" .
          ((script-stencil . (feta . ("mordent" . "mordent")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("prallprall" .
          ((script-stencil . (feta . ("prallprall" . "prallprall")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("prallmordent" .
          ((script-stencil . (feta . ("prallmordent" . "prallmordent")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("upprall" .
          ((script-stencil . (feta . ("upprall" . "upprall")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("downprall" .
          ((script-stencil . (feta . ("downprall" . "downprall")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("upmordent" .
          ((script-stencil . (feta . ("upmordent" . "upmordent")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("downmordent" .
          ((script-stencil . (feta . ("downmordent" . "downmordent")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("lineprall" .
          ((script-stencil . (feta . ("lineprall" . "lineprall")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("pralldown" .
          ((script-stencil . (feta . ("pralldown" . "pralldown")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("prallup" .
          ((script-stencil . (feta . ("prallup" . "prallup")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("segno" .
          ((script-stencil . (feta . ("segno" . "segno")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("coda" .
          ((script-stencil . (feta . ("coda" . "coda")))
+          (padding . 0.20)        
           (direction  . 1)))
         ("varcoda" .
          ((script-stencil . (feta . ("varcoda" . "varcoda")))
+          (padding . 0.20)        
           (direction  . 1))))
        default-script-alist)
       )