X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=05cc4b28f524a84e8907e2a162d176642b13982e;hb=dc57f36aab289a71ac6472fc484c01c071d9f039;hp=c976dbcf46ae7d1f3df57b6f862df848648aea28;hpb=c76d27c59244a331a2873a40e0d7e40ad378d4b8;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index c976dbcf46..05cc4b28f5 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -47,7 +47,7 @@ (breakable . #t) (break-align-symbol . ambitus) (break-visibility . ,begin-of-line-visible) - (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface )))) + (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface )))) )) (AmbitusLine @@ -69,16 +69,20 @@ (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 rhythmic-head-interface item-interface )))) + (meta . ((interfaces . (font-interface note-head-interface + ambitus-interface + staff-symbol-referencer-interface + rhythmic-head-interface + ledgered-interface + item-interface )))) )) (Arpeggio @@ -109,6 +113,7 @@ (custos . (minimum-space . 2.0)) (clef . (minimum-space . 1.0)) (key-signature . (extra-space . 1.0)) + (key-cancellation . (extra-space . 1.0)) (first-note . (fixed-space . 1.3)) (next-note . (semi-fixed-space . 1.3)) (right-edge . (extra-space . 0.0)) @@ -129,7 +134,7 @@ (BarNumber . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (breakable . #t) (break-visibility . ,begin-of-line-visible) (padding . 1.0) @@ -152,13 +157,13 @@ (BassFigure . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (direction . 1) (font-family . number) ;; We must do this, other BFs in - ;; paper16 become too small. + ;; layout16 become too small. (font-size . -4) (kern . 0.2) (meta . ((interfaces . (text-interface rhythmic-grob-interface @@ -170,8 +175,6 @@ ;; todo: clean this up a bit: the list is getting ;; rather long. (print-function . ,Beam::print) - (concaveness-gap . 1.85) - (concaveness-threshold . 0.26) (gap . 0.8) (positions . (#f . #f)) (position-callbacks . (,Beam::least_squares @@ -222,12 +225,12 @@ (break-align-orders . #(; end-of-line: (instrument-name left-edge ambitus breathing-sign - clef key-cancellation staff-bar key-signature + clef staff-bar key-cancellation key-signature time-signature custos) ; unbroken (instrument-name left-edge ambitus breathing-sign - clef key-cancellation staff-bar key-signature + clef staff-bar key-cancellation key-signature staff time-signature custos) ; begin of line @@ -262,7 +265,7 @@ (first-note . (fixed-space . 1.0)) ;huh? (right-edge . (extra-space . 0.1)) )) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (text . ,(make-musicglyph-markup "scripts-rcomma")) (Y-offset-callbacks . (,Breathing_sign::offset_callback)) (break-visibility . ,begin-of-line-invisible) @@ -309,7 +312,7 @@ (ChordName . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (after-line-breaking-callback . ,Chord_name::after_line_breaking) (word-space . 0.0) (font-family . sans) @@ -371,7 +374,7 @@ (DynamicText . ( (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self ,Self_alignment_interface::centered_on_parent)) (self-alignment-X . 0) @@ -437,7 +440,7 @@ (Fingering . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) ; sync with TextScript (?) (padding . 0.5) @@ -463,7 +466,7 @@ (Y-extent-callback . #f) (after-line-breaking-callback . ,Line_spanner::after_line_breaking) (print-function . ,Line_spanner::print) - (meta . ((interfaces . (line-spanner-interface spanner-interface)))) + (meta . ((interfaces . (line-interface line-spanner-interface spanner-interface)))) )) (Hairpin @@ -505,7 +508,7 @@ )) (self-alignment-Y . 0) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (break-align-symbol . instrument-name) (break-visibility . ,begin-of-line-visible) (baseline-skip . 2) @@ -520,7 +523,7 @@ (space-alist . ((left-edge . (extra-space . 1.0)) )) (break-align-symbol . instrument-name) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) (baseline-skip . 2) @@ -535,6 +538,7 @@ (space-alist . ( (time-signature . (extra-space . 1.25)) (staff-bar . (extra-space . 0.6)) + (key-signature . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)) (first-note . (fixed-space . 2.5)) )) @@ -611,7 +615,7 @@ )) (LyricText - . ((print-function . ,Text_item::print) + . ((print-function . ,Text_interface::print) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent)) (self-alignment-X . 0) (word-space . 0.6) @@ -631,7 +635,7 @@ (RehearsalMark . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (after-line-breaking-callback . ,shift-right-at-line-begin) @@ -648,7 +652,7 @@ )) (MetronomeMark . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . 1) (padding . 0.8) @@ -682,7 +686,7 @@ (MultiMeasureRestNumber . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (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)) @@ -695,7 +699,7 @@ )) (MultiMeasureRestText . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (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)) @@ -727,12 +731,11 @@ (print-function . ,Note_head::print) (ligature-primitive-callback . ,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)) (stem-attachment-function . ,note-head-style->attachment-coordinates) (meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface + ledgered-interface staff-symbol-referencer-interface item-interface )))) )) @@ -761,7 +764,7 @@ (NoteName . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface )))) )) @@ -772,7 +775,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)) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) ;; no Y dimensions, because of lyrics under tenor clef. (Y-extent . (0 . 0)) @@ -849,7 +852,7 @@ (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)))) + (meta . ((interfaces . (axis-group-interface vertically-spaceable-interface hara-kiri-group-interface item-interface spanner-interface)))) )) (RepeatSlash @@ -952,7 +955,7 @@ )) (StanzaNumber - . ((print-function . ,Text_item::print) + . ((print-function . ,Text_interface::print) (font-series . bold) (padding . 1.0) (X-offset-callbacks . (,Side_position_interface::aligned_side)) @@ -970,7 +973,7 @@ (SostenutoPedal . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (direction . 1) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (no-spacing-rods . #t) @@ -1030,13 +1033,14 @@ ;; FIXME this should come from 'lengths - (beamed-lengths . (3.26 3.26 1.5)) + (beamed-lengths . (3.26 3.5 3.6)) ;; We use the normal minima as minimum for the ideal lengths, ;; and the extreme minima as abolute minimum length. ;; The 'normal' minima (beamed-minimum-free-lengths . (1.83 1.5 1.25)) + ;(beamed-minimum-free-lengths . (2.0 1.83 1.25)) ;; The 'extreme case' minima (beamed-extreme-minimum-free-lengths . (2.0 1.25)) @@ -1140,7 +1144,7 @@ (TextScript . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (no-spacing-rods . #t) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (direction . -1) @@ -1154,7 +1158,7 @@ )) (CombineTextScript . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (no-spacing-rods . #t) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) @@ -1212,7 +1216,7 @@ (TabNoteHead . ( (style . default) - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up! (stem-attachment-function . ,tablature-stem-attachment-function) @@ -1248,7 +1252,7 @@ (TimeSignature . ( (print-function . ,Time_signature::print) -; (print-function . ,Text_item::print) +; (print-function . ,Text_interface::print) (break-align-symbol . time-signature) (break-visibility . ,all-visible) (space-alist . ( @@ -1280,7 +1284,7 @@ (UnaCordaPedal . ( - (print-function . ,Text_item::print) + (print-function . ,Text_interface::print) (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) @@ -1331,7 +1335,7 @@ (Y-extent-callback . ,Axis_group_interface::group_extent_callback) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (stacking-dir . -1) - (threshold . (12 . 1000)) +; (threshold . (6 . 1000)) (meta . ((interfaces . (align-interface axis-group-interface spanner-interface)))) )) @@ -1341,7 +1345,7 @@ (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)))) + (meta . ((interfaces . (axis-group-interface vertically-spaceable-interface spanner-interface)))) )) ) )