* lily/note-column.cc: reformat.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 333c6a8e9e1179521727b056976fc916fc570090..05b7d5eb2c74de0863bf720945892709b57e463b 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; distances are given in line-thickness (thicknesses) and
@@ -194,8 +194,6 @@
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
 
        (self-alignment-X . 1)
-
-       ;; want the bar number before the clef at line start. 
        (break-align-symbol . left-edge)
        (meta .
              ((class . Item)
@@ -508,7 +506,7 @@
     (Dots
      . (
        (stencil . ,ly:dots::print)
-       (dot-count . ,dots::calc-dot-count)
+       (dot-count . 1)
        (meta . ((class . Item)
                 (interfaces . (font-interface
                                staff-symbol-referencer-interface
@@ -630,7 +628,7 @@
 
        (stencil . ,ly:text-interface::print)
        (direction . ,ly:script-interface::calc-direction)
-       (text . ,fingering::calc-text) 
+
        (font-encoding . fetaNumber)
        (font-size . -5)                ; don't overlap when next to heads.
        (meta . ((class . Item)
@@ -1038,7 +1036,6 @@
     (NoteHead
      . (
        (stencil . ,ly:note-head::print)
-       (duration-log . ,note-head::calc-duration-log)
        (stem-attachment . ,ly:note-head::calc-stem-attachment)
        (glyph-name . ,note-head::calc-glyph-name) 
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -1277,7 +1274,6 @@
     (Rest
      . (
        (stencil . ,ly:rest::print)
-       (duration-log . ,note-head::calc-duration-log)
        (X-extent . ,ly:rest::width)
        (Y-extent . ,ly:rest::height)
        (Y-offset . ,ly:rest::y-offset-callback)
@@ -1300,10 +1296,13 @@
      . (
        ;; don't set direction here: it breaks staccato.
 
-       ;; padding set in script definitions.
+       ;; This value is sensitive: if too large, staccato dots will move a
+       ;; space a away.
+       (padding . 0.20)
        (staff-padding . 0.25)
        ;; (script-priority . 0) priorities for scripts, see script.scm
        (X-offset . , ly:self-alignment-interface::centered-on-x-parent)
+       
 
        (stencil . ,ly:script-interface::print)
        (direction . ,ly:script-interface::calc-direction)
@@ -1456,7 +1455,6 @@
     (Stem
      . (
        (direction . ,ly:stem::calc-direction)
-       (duration-log . ,note-head::calc-duration-log)
        (default-direction . ,ly:stem::calc-default-direction)
        (stem-end-position . ,ly:stem::calc-stem-end-position)
        (neutral-direction . ,DOWN)
@@ -1519,7 +1517,6 @@
     (StringNumber
      . (
        (stencil . ,print-circled-text-callback)
-       (text . ,string-number::calc-text)
        (padding . 0.5)
        (staff-padding . 0.5)
        (self-alignment-X . 0)
@@ -1639,7 +1636,6 @@
      . (
        (stencil . ,ly:text-interface::print)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
-       (duration-log . ,note-head::calc-duration-log)
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
        (font-series . bold)
@@ -1694,7 +1690,7 @@
     (Tie
      . (
        (control-points . ,ly:tie::calc-control-points)
-       (springs-and-rods . ,ly:spanner::set-spacing-rods)
+       (springs-and-rods . ,ly:spacing-spanner::set-springs)
        (avoid-slur . inside)
        (direction . ,ly:tie::calc-direction)
        (stencil . ,ly:tie::print)
@@ -1717,7 +1713,6 @@
                    (outer-tie-vertical-gap . 0.25)
                    (multi-tie-region-size . 1)
                    (between-length-limit . 1.0)))
-       
        (thickness . 1.2)
        (line-thickness . 0.8)
        (meta . ((class . Spanner)
@@ -1882,7 +1877,6 @@
        (Y-extent . ,ly:axis-group-interface::height)
        (X-extent . ,ly:axis-group-interface::width)
        (stacking-dir . -1)
-       (padding . 0.1) 
        (meta . ((class . Spanner)
                 (interfaces . (align-interface
                                axis-group-interface))))))