* scm/lily.scm (postscript->png): new function

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 8d18393e7c296811bf5e74cb74ea3143ea82123e..890b0b30122e83e9a868643773f3db057586fc3a 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -32,26 +32,55 @@
        (right-padding . 0.15)
        (meta . ((interfaces . (item-interface accidental-placement-interface))))
        ))
-
     (Ambitus
      . (
-       (breakable . #t)
-       (break-align-symbol . ambitus)
+       (axes . (0 1))
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (space-alist . (
+                       (clef . (extra-space . 0.5))
+                       (key-signature . (extra-space . 0.0))
+                       (staff-bar . (extra-space . 0.0))
+                       (time-signature . (extra-space . 0.0)) 
+                       (first-note . (fixed-space . 0.0))
+                       ))
+       (breakable . #t)
+       (break-align-symbol . ambitus)
+       (break-visibility . ,begin-of-line-visible)
+       (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface ))))
+       ))
+
+    (AmbitusLine
+     . (
        (print-function . ,Ambitus::print)
-       (font-family . music)
-       (note-head-style . "noteheads-2")
-       (break-visibility . ,begin-of-line-visible)
        (join-heads . #t)
-       (space-alist . (
-                      (clef . (extra-space . 0.0))
-                      (key-signature . (extra-space . 0.0))
-                      (staff-bar . (extra-space . 0.0))
-                      (time-signature . (extra-space . 0.0)) 
-                      (first-note . (fixed-space . 0.0))
-                      ))
-       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface  font-interface))))
+       (thickness . 2)
+       (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent))
+    
+       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface item-interface  font-interface))))
        ))
-
+    (AmbitusAccidental
+     . (
+       (print-function . ,Accidental_interface::print)
+       (font-family . music)
+       (padding . 0.5)
+       (X-offset-callbacks . (,Side_position_interface::aligned_side))
+       (direction . -1) 
+       (cautionary-style . parentheses)
+       (after-line-breaking-callback . ,Accidental_interface::after_line_breaking)             (meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
+       ))
+    (AmbitusNoteHead
+     . (
+       (duration-log . 2)
+       (style . default)
+       (print-function . ,Note_head::print)
+       (glyph-name-procedure . ,find-notehead-symbol)
+       (X-extent-callback . ,Note_head::extent)
+       (Y-extent-callback . ,Note_head::extent)
+       (Y-offset-callbacks  . (,Staff_symbol_referencer::callback))
+       (meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface item-interface ))))
+       ))
+    
     (Arpeggio
      . (
        (X-extent-callback . ,Arpeggio::width_callback)
@@ -485,7 +514,15 @@
        (breakable . #t)
        (meta . ((interfaces . (key-signature-interface  font-interface  break-aligned-interface item-interface ))))
        ))
-
+    (LedgerLineSpanner
+     . (
+       (print-function . ,Ledger_line_spanner::print)
+       (X-extent-callback . #f)
+       (Y-extent-callback . #f)
+       (print-function . ,Ledger_line_spanner::print)
+       (meta . ((interfaces . (spanner-interface ledger-line-interface))))
+       ))
+    
     (LigatureBracket
      . (
        (ligature-primitive-callback . ,Note_head::print)
@@ -563,8 +600,6 @@
        (print-function . ,Text_item::print)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (direction . 1)
-       (breakable . #t)
-       (break-visibility . ,end-of-line-invisible)
        (padding . 0.8)
        (meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface))))
        ))
@@ -667,7 +702,7 @@
        (Y-extent-callback . #f)                         
        (print-function . ,Line_spanner::print)
        (after-line-breaking-callback . ,Line_spanner::after_line_breaking)
-       (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+       (meta . ((interfaces . (line-spanner-interface line-interface spanner-interface))))
        ))
 
     (NoteName
@@ -700,32 +735,20 @@
        (before-line-breaking-callback . ,Paper_column::before_line_breaking)
        (X-extent-callback . ,Axis_group_interface::group_extent_callback)
 
-;ppp           (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f)
+;              (print-function . ,Paper_column::print) (font-name . "ecrm8") (Y-extent-callback . #f)
        (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
        ))
 
     (PhrasingSlur
      . (
-       (print-function . ,Slur::print)
+       (print-function . ,New_slur::print)
        (thickness . 1.2)               
        (spacing-procedure . ,Spanner::set_spacing_rods)                
        (minimum-length . 1.5)
-       (after-line-breaking-callback . ,Slur::after_line_breaking)
-       (extremity-function . ,calc-slur-extremity)
-       (extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist)
-       (de-uglify-parameters . (1.5  0.8  -2.0))
-       (Y-extent-callback . ,Slur::height)
+       (after-line-breaking-callback . ,New_slur::after_line_breaking)
+       (Y-extent-callback . ,New_slur::height)
        (height-limit . 2.0)
        (ratio . 0.333)
-       (beautiful . 0.5)
-       (y-free . 0.75)
-       (attachment . (#f . #f))
-       (attachment-offset . ((0 . 0) . (0 . 0)))
-       (slope-limit . 0.8)
-       (details . ((force-blowfit . 0.5)
-                   (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006)
-                   (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2)
-                   (bezier-area-steps . 1.0)))
        (meta . ((interfaces . (slur-interface spanner-interface))))
        ))
 
@@ -736,7 +759,7 @@
        (before-line-breaking-callback . ,Paper_column::before_line_breaking)
        (breakable . #t)
        ;; debugging stuff: print column number.
-;      (print-function . ,Paper_column::print) (font-name . "cmr8")    (Y-extent-callback . #f)
+;      (print-function . ,Paper_column::print) (font-name . "ecrm8")   (Y-extent-callback . #f)
 
 
        (meta .  ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface ))))
@@ -830,26 +853,15 @@
 
     (Slur
      . (
-       (print-function . ,Slur::print)
+       (print-function . ,New_slur::print)
        (thickness . 1.2)               
        (spacing-procedure . ,Spanner::set_spacing_rods)                
        (minimum-length . 1.5)
-       (after-line-breaking-callback . ,Slur::after_line_breaking)
-       (extremity-function . ,calc-slur-extremity)
-       (extremity-offset-alist . ,default-slur-extremity-offset-alist)
-       (de-uglify-parameters . (1.5  0.8  -2.0))
-       (Y-extent-callback . ,Slur::height)
+       (after-line-breaking-callback . ,New_slur::after_line_breaking)
+       (Y-extent-callback . ,New_slur::height)
+                                       ; Slur::height)
        (height-limit . 2.0)
-       (ratio . 0.333)
-       (beautiful . 0.5)
-       (y-free . 0.75)
-       (attachment . (#f . #f))
-       (attachment-offset . ((0 . 0) . (0 . 0)))
-       (slope-limit . 0.8)
-       (details . ((force-blowfit . 0.5)
-                   (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006)
-                   (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2)
-                   (bezier-area-steps . 1.0)))
+       (ratio . 0.25)
        (meta . ((interfaces . (slur-interface spanner-interface))))
        ))