* stepmake/GNUmakefile.in: remove nested stepmake packaging stuff.

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

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 87033d3af3eedd5e087b708bbaaf8c6e395e6d0d..aca39f17bb4e2a45f5a542ef6f327ac52cdafa70 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,11 @@
 
     (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)
+       (font-relative-size . -3)
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface
                                                                                                bass-figure-interface item-interface
@@ -208,10 +208,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 ))))
@@ -321,7 +319,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)
@@ -356,7 +354,7 @@
                        (time-signature . (extra-space . 0.0)) 
                        (staff-bar . (extra-space . 0.0))
                        (breathing-sign . (minimum-space  . 0.0))
-                       (clef . (extra-space . 1.0))
+                       (clef . (extra-space . 0.85))
                        (first-note . (extra-space . 1.0))
                        (right-edge . (extra-space . 0.0))
                        (key-signature . (extra-space . 0.0))
@@ -366,7 +364,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 +377,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))))
        ))
@@ -418,14 +417,15 @@
        (breakable . #t)
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Side_position_interface::aligned_on_support_refpoints))
-       ;; huh? what's this for?
+       ;; This direction is for aligned_on_support_refpoints
+       ;; (?) --hwn
        (direction . 0)
        (space-alist . (
                        (left-edge . (extra-space . 1.0))
                        ))
 
        (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)
@@ -487,7 +487,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)
@@ -498,7 +498,6 @@
        (font-family . roman)
        (font-shape . upright)
        
-       ;; duh, side-position-interface?
        (meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
        ))
 
@@ -513,7 +512,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 +528,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,7 +564,7 @@
     
     (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))
@@ -577,7 +576,7 @@
        ))
     (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))
@@ -643,7 +642,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 ))))
        ))
@@ -655,7 +654,7 @@
        (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 +850,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 +885,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 +1056,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)
@@ -1168,7 +1167,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 +1192,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 +1204,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;