* scripts/lilypond-book.py (output_dict): remove support for the

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 10d9d597ed55880f09484e8713ce6733bc39269a..a2d25377714be09d86a707071a5c3b4b4d05816c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -120,7 +120,11 @@
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . 1)
        (font-family . number)
-       (font-relative-size . -3)
+
+       ;; We must do this, other BFs in
+       ;; paper16 become too small.
+       (font-relative-size . -2)
+       (font-magnification . 0.8) 
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface
                                                                                                bass-figure-interface item-interface
@@ -570,7 +574,7 @@
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (self-alignment-X . 0)
        (direction . 1)
-       (padding . 2)
+       (padding . 1.3)
        (font-family . number)
        (meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
        ))
@@ -582,7 +586,7 @@
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (self-alignment-X . 0)
        (direction . 1)
-       (padding . 2)
+       (padding . 1.5)
        (font-family . roman)
        (meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface))))
        ))
@@ -650,7 +654,6 @@
     (OctavateEight
      . (
        (self-alignment-X . 0)
-       (text . "8")
        (break-visibility . ,begin-of-line-visible)
        (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -1134,6 +1137,7 @@
     (TimeSignature
      . (
        (molecule-callback . ,Time_signature::brew_molecule)
+;      (molecule-callback . ,Text_item::brew_molecule) 
        (break-align-symbol . time-signature)
        (break-visibility . ,all-visible)
        (space-alist . (
@@ -1143,6 +1147,7 @@
                        ))
        (breakable . #t)
        (style . C)
+;      (text . (,time-signature-glue-markup)) 
        (font-family . number)
        (meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface item-interface ))))
        ))
@@ -1218,6 +1223,7 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        (stacking-dir . -1)
        (meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
        ))
@@ -1226,6 +1232,7 @@
      . (
        (axes . (1))
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
+       (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        
        (meta . ((interfaces . (axis-group-interface spanner-interface))))
        ))