* 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 8e6e40576b2a0f49ddcfd2e59e87d01d7c95e71d..a2d25377714be09d86a707071a5c3b4b4d05816c 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -95,7 +95,7 @@
     
     (BarNumber
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (breakable . #t)
        (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
@@ -116,11 +116,15 @@
 
     (BassFigure
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . 1)
        (font-family . number)
-       (font-relative-size . -1)
+
+       ;; 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
@@ -208,10 +212,8 @@
                        (first-note . (minimum-space . 1.0))
                        (right-edge . (extra-space . 0.1))
                        ))
-       (molecule-callback . ,Breathing_sign::brew_molecule)
-       (lookup . name)
-       (font-family . music)
-       (text . "scripts-rcomma")
+       (molecule-callback . ,Text_item::brew_molecule)
+       (text . ,(make-musicglyph-markup "scripts-rcomma"))
        (Y-offset-callbacks . (,Breathing_sign::offset_callback))
        (break-visibility . ,begin-of-line-invisible)
        (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface item-interface ))))
@@ -256,9 +258,9 @@
 
     (ChordName
      . (
-       (molecule-callback . ,new-chord-name-brew-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (after-line-breaking-callback . ,Chord_name::after_line_breaking)
-       (word-space . 1.0)
+       (word-space . 0.0)
        (font-family . roman)
        (meta . ((interfaces . (font-interface                                                  rhythmic-grob-interface
                                                                                                text-interface chord-name-interface item-interface ))))
@@ -321,7 +323,7 @@
     (DynamicText
      . (
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_parent))
        (self-alignment-X . 0)
@@ -366,7 +368,7 @@
 
     (Fingering
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (padding . 0.6)
        ;;              (direction . -1)
        (self-alignment-X . 0)
@@ -379,10 +381,11 @@
        ))
 
 
-    (HaraKiriVerticalGroup
+    (RemoveEmptyVerticalGroup
      . (
        (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback))
        (Y-extent-callback . ,Hara_kiri_group_spanner::y_extent)
+       (remove-first . #t)
        (axes . (1))
        (meta . ((interfaces . (axis-group-interface hara-kiri-group-interface item-interface  spanner-interface))))
        ))
@@ -426,7 +429,7 @@
                        ))
 
        (self-alignment-Y . 0)
-       (molecule-callback . ,brew-new-markup-molecule)         
+       (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . instrument-name)
        (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
@@ -488,7 +491,7 @@
 
     (LyricText
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
                               ,Self_alignment_interface::aligned_on_self))
        (self-alignment-X . 0)
@@ -513,7 +516,7 @@
 
     (RehearsalMark
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (self-alignment-X . 0)
@@ -529,7 +532,7 @@
        ))
      (MetronomeMark
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side)) 
        (direction . 1)
        (breakable . #t)
@@ -565,25 +568,25 @@
     
     (MultiMeasureRestNumber
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (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))))
        ))
     (MultiMeasureRestText
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (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))))
        ))
@@ -643,7 +646,7 @@
 
     (NoteName
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-family . roman)
        (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface ))))
        ))
@@ -651,11 +654,10 @@
     (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))
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-shape . italic)
        (padding . 0.4)
        (font-relative-size . -2)
@@ -851,7 +853,7 @@
     (StanzaNumber
      . (
        (breakable . #t)
-       (molecule-callback . ,brew-new-markup-molecule)         
+       (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
        (font-family . roman)
@@ -886,7 +888,7 @@
 
     (SostenutoPedal
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (direction . 1)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (no-spacing-rods . #t)
@@ -1057,7 +1059,7 @@
 
     (TextScript
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (no-spacing-rods . #t)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . -1)
@@ -1135,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 . (
@@ -1144,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 ))))
        ))
@@ -1168,7 +1172,7 @@
 
     (UnaCordaPedal
      . (
-       (molecule-callback . ,brew-new-markup-molecule)
+       (molecule-callback . ,Text_item::brew_molecule)
        (font-family . roman)
        (font-shape . italic)
        (no-spacing-rods . #t)
@@ -1193,7 +1197,7 @@
 
     (VaticanaLigature
      . (
-       (thickness . 1.0)
+       (thickness . 0.6)
        (flexa-width . 2.0)
        (ligature-primitive-callback . ,Vaticana_ligature::brew_ligature_primitive)
        (molecule-callback . ,Vaticana_ligature::brew_molecule)
@@ -1205,7 +1209,7 @@
        (molecule-callback . ,Volta_bracket_interface::brew_molecule)
        (direction . 1)
        (padding . 1)
-       (font-style . volta)
+       (font-family . number)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (thickness . 1.6)  ;  stafflinethickness
        (height . 2.0) ; staffspace;
@@ -1219,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))))
        ))
@@ -1227,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))))
        ))