X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=eba1fe7d4a884681275ceeac0e15fe54dd4e1858;hb=bcbcf02fdbddaca8f090471055f98588b8c9b8ca;hp=8d18393e7c296811bf5e74cb74ea3143ea82123e;hpb=a5871e0034d512b8f621e635e56bcf71690bfcbc;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 8d18393e7c..eba1fe7d4a 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -17,7 +17,6 @@ (Accidental . ( (print-function . ,Accidental_interface::print) - (font-family . music) (cautionary-style . parentheses) (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface font-interface)))) )) @@ -32,26 +31,55 @@ (right-padding . 0.15) (meta . ((interfaces . (item-interface accidental-placement-interface)))) )) - (Ambitus . ( - (breakable . #t) - (break-align-symbol . ambitus) + (axes . (0 1)) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (space-alist . ( + (clef . (extra-space . 0.5)) + (key-signature . (extra-space . 0.0)) + (staff-bar . (extra-space . 0.0)) + (time-signature . (extra-space . 0.0)) + (first-note . (fixed-space . 0.0)) + )) + (breakable . #t) + (break-align-symbol . ambitus) + (break-visibility . ,begin-of-line-visible) + (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface )))) + )) + + (AmbitusLine + . ( (print-function . ,Ambitus::print) - (font-family . music) - (note-head-style . "noteheads-2") - (break-visibility . ,begin-of-line-visible) (join-heads . #t) - (space-alist . ( - (clef . (extra-space . 0.0)) - (key-signature . (extra-space . 0.0)) - (staff-bar . (extra-space . 0.0)) - (time-signature . (extra-space . 0.0)) - (first-note . (fixed-space . 0.0)) - )) - (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface font-interface)))) + (thickness . 2) + (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent)) + + (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface item-interface font-interface)))) )) - + (AmbitusAccidental + . ( + (print-function . ,Accidental_interface::print) + (font-family . music) + (padding . 0.5) + (X-offset-callbacks . (,Side_position_interface::aligned_side)) + (direction . -1) + (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 )))) + )) + (Arpeggio . ( (X-extent-callback . ,Arpeggio::width_callback) @@ -322,21 +350,20 @@ (meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface )))) )) - (DoublePercentRepeat . - ( - (print-function . ,Percent_repeat_item_interface::double_percent) - (breakable . #t) - (slope . 1.0) - (font-encoding . fetaMusic) - (width . 2.0) - (thickness . 0.48) - (break-align-symbol . staff-bar) - (break-visibility . ,begin-of-line-invisible) - (meta . ((interfaces . (font-interface - break-aligned-interface - percent-repeat-interface item-interface )))) - )) - + (DoublePercentRepeat + . ( + (print-function . ,Percent_repeat_item_interface::double_percent) + (breakable . #t) + (slope . 1.0) + (font-encoding . fetaMusic) + (width . 2.0) + (thickness . 0.48) + (break-align-symbol . staff-bar) + (break-visibility . ,begin-of-line-invisible) + (meta . ((interfaces . (font-interface + break-aligned-interface + percent-repeat-interface item-interface )))) + )) (DynamicText . ( (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) @@ -485,7 +512,15 @@ (breakable . #t) (meta . ((interfaces . (key-signature-interface font-interface break-aligned-interface item-interface )))) )) - + (LedgerLineSpanner + . ( + (print-function . ,Ledger_line_spanner::print) + (X-extent-callback . #f) + (Y-extent-callback . #f) + (print-function . ,Ledger_line_spanner::print) + (meta . ((interfaces . (spanner-interface ledger-line-interface)))) + )) + (LigatureBracket . ( (ligature-primitive-callback . ,Note_head::print) @@ -563,8 +598,6 @@ (print-function . ,Text_item::print) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . 1) - (breakable . #t) - (break-visibility . ,end-of-line-invisible) (padding . 0.8) (meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface)))) )) @@ -589,7 +622,6 @@ (thick-thickness . 6.6) (hair-thickness . 2.0) (padding . 1) - (font-encoding . fetaMusic) (meta . ((interfaces . (multi-measure-rest-interface multi-measure-interface rest-interface font-interface staff-symbol-referencer-interface)))) )) @@ -667,7 +699,7 @@ (Y-extent-callback . #f) (print-function . ,Line_spanner::print) (after-line-breaking-callback . ,Line_spanner::after_line_breaking) - (meta . ((interfaces . (line-spanner-interface spanner-interface)))) + (meta . ((interfaces . (line-spanner-interface line-interface spanner-interface)))) )) (NoteName @@ -700,32 +732,20 @@ (before-line-breaking-callback . ,Paper_column::before_line_breaking) (X-extent-callback . ,Axis_group_interface::group_extent_callback) -;ppp (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f) +; (print-function . ,Paper_column::print) (font-name . "ecrm8") (Y-extent-callback . #f) (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface )))) )) (PhrasingSlur . ( - (print-function . ,Slur::print) + (print-function . ,New_slur::print) (thickness . 1.2) (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) - (after-line-breaking-callback . ,Slur::after_line_breaking) - (extremity-function . ,calc-slur-extremity) - (extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist) - (de-uglify-parameters . (1.5 0.8 -2.0)) - (Y-extent-callback . ,Slur::height) + (after-line-breaking-callback . ,New_slur::after_line_breaking) + (Y-extent-callback . ,New_slur::height) (height-limit . 2.0) (ratio . 0.333) - (beautiful . 0.5) - (y-free . 0.75) - (attachment . (#f . #f)) - (attachment-offset . ((0 . 0) . (0 . 0))) - (slope-limit . 0.8) - (details . ((force-blowfit . 0.5) - (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006) - (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2) - (bezier-area-steps . 1.0))) (meta . ((interfaces . (slur-interface spanner-interface)))) )) @@ -736,7 +756,7 @@ (before-line-breaking-callback . ,Paper_column::before_line_breaking) (breakable . #t) ;; debugging stuff: print column number. -; (print-function . ,Paper_column::print) (font-name . "cmr8") (Y-extent-callback . #f) +; (print-function . ,Paper_column::print) (font-name . "ecrm8") (Y-extent-callback . #f) (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface )))) @@ -830,26 +850,15 @@ (Slur . ( - (print-function . ,Slur::print) + (print-function . ,New_slur::print) (thickness . 1.2) (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) - (after-line-breaking-callback . ,Slur::after_line_breaking) - (extremity-function . ,calc-slur-extremity) - (extremity-offset-alist . ,default-slur-extremity-offset-alist) - (de-uglify-parameters . (1.5 0.8 -2.0)) - (Y-extent-callback . ,Slur::height) + (after-line-breaking-callback . ,New_slur::after_line_breaking) + (Y-extent-callback . ,New_slur::height) + ; Slur::height) (height-limit . 2.0) - (ratio . 0.333) - (beautiful . 0.5) - (y-free . 0.75) - (attachment . (#f . #f)) - (attachment-offset . ((0 . 0) . (0 . 0))) - (slope-limit . 0.8) - (details . ((force-blowfit . 0.5) - (bezier-pct-c0 . -0.2) (bezier-pct-c3 . 0.000006) - (bezier-pct-out-max . 0.8) (bezier-pct-in-max . 1.2) - (bezier-area-steps . 1.0))) + (ratio . 0.25) (meta . ((interfaces . (slur-interface spanner-interface)))) )) @@ -965,7 +974,6 @@ ;; FIXME this should come from 'lengths (beamed-lengths . (3.26 3.26 1.5)) -; (beamed-lengths . (3.5 3.5 3.5 4.5 5.0)) ;; We use the normal minima as minimum for the ideal lengths, ;; and the extreme minima as abolute minimum length.