X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fdefine-grobs.scm;h=a132929ac94aa07dd31d58c1f21480c978328aca;hb=26633bbfbf821a7cfdfe7a0367d1ea94a440be2e;hp=020d1424ff353e1a1e6c356168a5607dd6ab3d8f;hpb=1d806d5a5a49dcf192259feac48510cf4e332291;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 020d1424ff..a132929ac9 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -95,13 +95,13 @@ (BarNumber . ( - (molecule-callback . ,brew-new-markup-molecule) + (molecule-callback . ,Text_item::brew_molecule) (breakable . #t) (break-visibility . ,begin-of-line-visible) (padding . 1.0) (direction . 1) (font-family . roman) - (font-relative-size . -1) + (font-size . -2) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (self-alignment-X . 1) @@ -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-size . -4) + (font-magnification . 0.8) (kern . 0.2) (meta . ((interfaces . (text-interface rhythmic-grob-interface bass-figure-interface item-interface @@ -133,7 +137,7 @@ (molecule-callback . ,Beam::brew_molecule) (concaveness-gap . 2.0) (concaveness-threshold . 0.08) - + (gap . 0.8) (positions . (#f . #f)) (position-callbacks . (,Beam::least_squares ,Beam::check_concave @@ -223,8 +227,7 @@ (font-family . music) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) - (space-alist . ( - (ambitus . (extra-space . 2.0)) + (space-alist . ((ambitus . (extra-space . 2.0)) (staff-bar . (minimum-space . 3.7)) (key-signature . (minimum-space . 4.0)) (time-signature . (minimum-space . 4.2)) @@ -254,10 +257,10 @@ (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) - (font-family . roman) + (word-space . 0.0) + (font-family . sans) (meta . ((interfaces . (font-interface rhythmic-grob-interface text-interface chord-name-interface item-interface )))) )) @@ -319,7 +322,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) @@ -364,23 +367,23 @@ (Fingering . ( - (molecule-callback . ,brew-new-markup-molecule) + (molecule-callback . ,Text_item::brew_molecule) (padding . 0.6) - ;; (direction . -1) (self-alignment-X . 0) (self-alignment-Y . 0) (script-priority . 100) (font-family . number) - (font-relative-size . -3) + (font-size . -4) (font-shape . upright) (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface )))) )) - (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)))) )) @@ -424,7 +427,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) @@ -486,7 +489,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) @@ -511,23 +514,22 @@ (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) - (break-align-symbol . time-signature) (direction . 1) (breakable . #t) - (font-relative-size . 1) + (font-size . 2) (font-family . roman) (baseline-skip . 2) (break-visibility . ,end-of-line-invisible) (padding . 0.8) - (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface )))) + (meta . ((interfaces . (break-aligned-interface text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface )))) )) (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) @@ -563,25 +565,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)))) )) @@ -609,6 +611,8 @@ (molecule-callback . ,Note_head::brew_molecule) (ligature-primitive-callback . ,Note_head::brew_molecule) (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)) (stem-attachment-function . ,note-head-style->attachment-coordinates) (meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface )))) @@ -641,7 +645,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 )))) )) @@ -649,14 +653,13 @@ (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) + (font-size . -4) (font-family . roman) (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface )))) )) @@ -738,7 +741,7 @@ (RepeatSlash . ( - (molecule-callback . , Percent_repeat_item_interface::beat_slash) + (molecule-callback . ,Percent_repeat_item_interface::beat_slash) (thickness . 0.48) (slope . 1.7) (meta . ((interfaces . (percent-repeat-interface item-interface )))) @@ -849,7 +852,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) @@ -884,7 +887,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) @@ -938,9 +941,9 @@ (beamed-lengths . (3.26 3.26 1.5)) ;; [Wanske] lists three sets of minimum lengths. One - ;; set for the nomal case, and one set for beams with `der - ;; Balkenendpunkt weiter "uber bzw. unter die Systemgrenze - ;; hinaus (bei Gruppen mit grossem Tonumfang)' and the extreme + ;; set for the nomal case, and one set for beams with "der + ;; Balkenendpunkt weiter uber bzw. unter die Systemgrenze + ;; hinaus (bei Gruppen mit grossem Tonumfang)" and the extreme ;; case. ;; Note that Wanske lists numbers lengths starting from top of @@ -950,10 +953,10 @@ ;; and the extreme minima as abolute minimum length. ;; The 'normal' minima - (beamed-minimum-free-lengths . (2.5 2.0 1.0)) + (beamed-minimum-free-lengths . (1.83 1.5 1.25)) ;; The 'extreme case' minima - (beamed-extreme-minimum-free-lengths . (1.83 1.5 1.25)) + (beamed-extreme-minimum-free-lengths . (2.5 2.0 1.0)) (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback) @@ -961,8 +964,6 @@ (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (adjust-if-on-staffline . #t) (font-family . music) - (avoid-note-head . #f) - (up-to-staff . #f) (meta . ((interfaces . (stem-interface font-interface item-interface )))) )) @@ -1055,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) @@ -1071,11 +1072,13 @@ . ( (molecule-callback . ,Text_spanner::brew_molecule) (font-family . roman) - (style . line) + (style . dashed-line) ;; urg, only for (de)cresc. text spanners (if-text-padding . 1.0) (width-correct . -1) + (dash-fraction . 0.2) + (dash-period . 3.0) (direction . 1) (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface)))) )) @@ -1088,6 +1091,7 @@ (enclose-bounds . #t) (width-correct . 0.0) (style . dashed-line) + (dash-fraction . 0.3) (edge-height . (0 . 1.5)) (direction . 1) (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface)))) @@ -1097,7 +1101,7 @@ . ( (font-family . roman) (style . default) - (molecule-callback . ,tablature-molecule-callback) + (molecule-callback . ,Text_item::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up! (stem-attachment-function . ,tablature-stem-attachment-function) @@ -1133,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 . ( @@ -1142,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 )))) )) @@ -1160,13 +1166,13 @@ (font-shape . italic) (font-series . bold) - (font-relative-size . -1) + (font-size . -2) (meta . ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface)))) )) (UnaCordaPedal . ( - (molecule-callback . ,brew-new-markup-molecule) + (molecule-callback . ,Text_item::brew_molecule) (font-family . roman) (font-shape . italic) (no-spacing-rods . #t) @@ -1191,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) @@ -1209,7 +1215,7 @@ (height . 2.0) ; staffspace; (minimum-space . 5) (font-family . number) - (font-relative-size . -2) + (font-size . -4) (meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface spanner-interface)))) )) @@ -1217,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)))) )) @@ -1225,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)))) ))