X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=57d5c0b92ffc5ef7dc0ac460dfed8b8a3b164cca;hb=09d3a31e317dd1b24ea57fed99c21acdbd7e9b1c;hp=a06502de5c150a76a5b638bb31942d8da72648c3;hpb=761d9d702b12303257565fdc8e40e2b635e6c99b;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index a06502de5c..57d5c0b92f 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -25,11 +25,11 @@ (AccidentalPlacement . ( (X-extent-callback . ,Axis_group_interface::group_extent_callback) - (left-padding . 0.3) + (left-padding . 0.2) ;; this is quite small, but it is very ugly to have ;; accs closer to the previous note than to the next one. - (right-padding . 0.25) + (right-padding . 0.15) (meta . ((interfaces . (item-interface accidental-placement-interface)))) )) @@ -189,6 +189,22 @@ . ( (breakable . #t) (stacking-dir . 1) + (break-align-orders . #(; end-of-line: + (instrument-name left-edge ambitus breathing-sign + clef staff-bar key-signature + time-signature custos) + + ; unbroken + (instrument-name left-edge ambitus breathing-sign + clef staff-bar key-signature + staff + time-signature custos) + ; begin of line + (instrument-name left-edge ambitus breathing-sign + clef key-signature staff-bar + time-signature custos) + + )) (axes . (0)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (meta . ((interfaces . (break-alignment-interface item-interface axis-group-interface))))) @@ -245,6 +261,7 @@ (ClusterSpannerBeacon . ( (print-function . #f) + (Y-extent-callback . ,Cluster_beacon::height) (meta . ((interfaces . (cluster-beacon-interface item-interface)))) )) @@ -276,9 +293,7 @@ (print-function . ,Custos::print) (break-visibility . ,end-of-line-visible) (style . vaticana) - (neutral-position . 0) (neutral-direction . -1) - (adjust-if-on-staffline . #t) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (space-alist . ( (first-note . (minimum-fixed-space . 0.0)) @@ -312,7 +327,7 @@ (print-function . ,Percent_repeat_item_interface::double_percent) (breakable . #t) (slope . 1.0) - (font-family . music) + (font-encoding . fetaMusic) (width . 2.0) (thickness . 0.48) (break-align-symbol . staff-bar) @@ -332,7 +347,7 @@ (no-spacing-rods . #t) (script-priority . 100) (font-series . bold) - (font-family . dynamic) + (font-encoding . fetaDynamic) (font-shape . italic) (self-alignment-Y . 0) (meta . ((interfaces . (font-interface text-interface self-alignment-interface dynamic-interface script-interface item-interface)))) @@ -377,20 +392,22 @@ (self-alignment-X . 0) (self-alignment-Y . 0) (script-priority . 100) - (font-family . number) + (font-encoding . fetaNumber) (font-size . -5) ; don't overlap when next to heads. - (font-shape . upright) (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface )))) )) - - (RemoveEmptyVerticalGroup + (Glissando . ( - (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)))) + (style . line) + (gap . 0.5) + (zigzag-width . 0.75) + (breakable . #t) + (X-extent-callback . #f) + (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)))) )) (Hairpin @@ -432,7 +449,6 @@ (break-align-symbol . instrument-name) (break-visibility . ,begin-of-line-visible) (baseline-skip . 2) - (font-family . roman) (meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface )))) )) @@ -443,11 +459,11 @@ (direction . 0) (space-alist . ((left-edge . (extra-space . 1.0)) )) + (break-align-symbol . instrument-name) (print-function . ,Text_item::print) (break-align-symbol . clef) (break-visibility . ,begin-of-line-visible) (baseline-skip . 2) - (font-family . roman) (meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface @@ -513,9 +529,7 @@ (X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent)) (self-alignment-X . 0) (word-space . 0.6) - (font-family . roman) (font-series . bold-narrow) - (font-shape . upright) (font-size . 1.0) (meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface )))) )) @@ -539,7 +553,6 @@ (direction . 1) (breakable . #t) (font-size . 2) - (font-family . roman) (baseline-skip . 2) (break-visibility . ,end-of-line-invisible) (padding . 0.8) @@ -550,9 +563,6 @@ (print-function . ,Text_item::print) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . 1) - (breakable . #t) - (font-family . roman) - (break-visibility . ,end-of-line-invisible) (padding . 0.8) (meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface)))) )) @@ -577,6 +587,7 @@ (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)))) )) @@ -590,7 +601,7 @@ (direction . 1) (padding . 1.3) (staff-padding . 1.3) - (font-family . number) + (font-encoding . fetaNumber) (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface)))) )) (MultiMeasureRestText @@ -603,7 +614,6 @@ (direction . 1) (padding . 1.5) (staff-padding . 1.5) - (font-family . roman) (meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface)))) )) (NoteCollision @@ -635,17 +645,15 @@ (meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface )))) )) - (Glissando + (NoteSpacing . ( - (style . line) - (gap . 0.5) - (zigzag-width . 0.75) - (breakable . #t) - (X-extent-callback . #f) - (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)))) + (stem-spacing-correction . 0.5) + + ;; Changed this from 0.75. + ;; If you ever change this back, please document! --hwn + (knee-spacing-correction . 1.0) + + (meta . ((interfaces . (spacing-interface note-spacing-interface item-interface )))) )) (VoiceFollower @@ -663,7 +671,6 @@ (NoteName . ( (print-function . ,Text_item::print) - (font-family . roman) (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface )))) )) @@ -675,11 +682,13 @@ (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) + + ;; no Y dimensions, because of lyrics under tenor clef. + (Y-extent . (0 . 0)) (font-shape . italic) - (padding . 0.4) + (padding . 0.6) (staff-padding . 0.2) (font-size . -4) - (font-family . roman) (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface )))) )) @@ -689,7 +698,7 @@ (before-line-breaking-callback . ,Paper_column::before_line_breaking) (X-extent-callback . ,Axis_group_interface::group_extent_callback) -; (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 )))) )) @@ -725,7 +734,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 )))) @@ -737,14 +746,13 @@ (print-function . ,Multi_measure_rest::percent) (slope . 1.0) (thickness . 0.48) - (font-family . music) + (font-encoding . fetaMusic) (meta . ((interfaces . (multi-measure-rest-interface spanner-interface font-interface percent-repeat-interface)))) )) (PianoPedalBracket ;; an example of a text spanner . ( (print-function . ,Piano_pedal_bracket::print) - (font-family . roman) (style . line) (if-text-padding . 1.0) (direction . -1) @@ -755,6 +763,16 @@ (meta . ((interfaces . (line-interface piano-pedal-interface piano-pedal-bracket-interface spanner-interface)))) )) + + (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)))) + )) + (RepeatSlash . ( (print-function . ,Percent_repeat_item_interface::beat_slash) @@ -793,12 +811,12 @@ ;; This value is sensitive: if too large, staccato dots will move a ;; space a away. - (padding . 0.25) + (padding . 0.20) (staff-padding . 0.25) ;; (script-priority . 0) priorities for scripts, see script.scm (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent)) (before-line-breaking-callback . ,Script_interface::before_line_breaking) - (font-family . music) + (font-encoding . fetaMusic) (meta . ((interfaces . (script-interface side-position-interface font-interface item-interface )))) )) @@ -810,15 +828,20 @@ (Slur . ( - (print-function . ,Slur::print) + (print-function . ; ,New_slur::print) + ,Slur::print) (thickness . 1.2) (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) - (after-line-breaking-callback . ,Slur::after_line_breaking) + (after-line-breaking-callback . ; ,New_slur::after_line_breaking) + ,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) + (Y-extent-callback . + ;; ,#f) + ;; must be of type procedure + ,Slur::height) (height-limit . 2.0) (ratio . 0.333) (beautiful . 0.5) @@ -848,7 +871,6 @@ (break-align-symbol . staff-bar) (bar-size-procedure . ,Span_bar::get_bar_size) (print-function . ,Span_bar::print) - (break-visibility . ,begin-of-line-invisible) (X-extent-callback . ,Span_bar::width_callback) (Y-extent-callback . ()) (breakable . #t) @@ -868,7 +890,6 @@ (StanzaNumber . ((print-function . ,Text_item::print) - (font-family . roman) (font-series . bold) (padding . 1.0) (X-offset-callbacks . (,Side_position_interface::aligned_side)) @@ -883,25 +904,6 @@ (meta . ((interfaces . (spacing-interface staff-spacing-interface item-interface )))) )) - (NoteSpacing - . ( - (stem-spacing-correction . 0.5) - - ;; Changed this from 0.75. - ;; If you ever change this back, please document! --hwn - (knee-spacing-correction . 1.0) - - (meta . ((interfaces . (spacing-interface note-spacing-interface item-interface )))) - )) - - (StaffSymbol - . ( - (print-function . ,Staff_symbol::print) - (line-count . 5) - (ledger-line-thickness . (1.0 . 0.1)) - (layer . 0) - (meta . ((interfaces . (staff-symbol-interface spanner-interface)))) - )) (SostenutoPedal . ( @@ -910,7 +912,6 @@ (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (no-spacing-rods . #t) (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner - (font-family . roman) (font-shape . italic) (self-alignment-X . 0) (meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface)))) @@ -928,16 +929,24 @@ (direction . -1) (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) + + (StaffSymbol + . ( + (print-function . ,Staff_symbol::print) + (line-count . 5) + (ledger-line-thickness . (1.0 . 0.1)) + (layer . 0) + (meta . ((interfaces . (staff-symbol-interface spanner-interface)))) + )) (Stem . ( - ;; this list is rather long. Trim --hwn (before-line-breaking-callback . ,Stem::before_line_breaking) (print-function . ,Stem::print) (thickness . 1.3) - ;; 3.5 (or 3 measured from note head) is standar length + ;; 3.5 (or 3 measured from note head) is standard length ;; 32nd, 64th flagged stems should be longer (lengths . (3.5 3.5 3.5 4.5 5.0)) @@ -958,8 +967,8 @@ ;; 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)) + (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. @@ -974,9 +983,7 @@ (X-extent-callback . ,Stem::dim_callback) (Y-extent-callback . ,Stem::height) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (adjust-if-on-staffline . #t) - (font-family . music) - (meta . ((interfaces . (stem-interface font-interface item-interface )))) + (meta . ((interfaces . (stem-interface font-interface item-interface )))) )) (StemTremolo @@ -1040,7 +1047,7 @@ (glyph . "brace") (print-function . ,System_start_delimiter::print) (collapse-height . 5.0) - (font-family . braces) + (font-encoding . fetaBraces) (Y-extent-callback . #f) (meta . ((interfaces . (system-start-delimiter-interface font-interface)))) )) @@ -1079,8 +1086,6 @@ (staff-padding . 0.5) (script-priority . 200) ;; todo: add X self alignment? - (baseline-skip . 2) - (font-family . roman) (meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface )))) )) (CombineTextScript @@ -1096,14 +1101,13 @@ (script-priority . 200) ;; todo: add X self alignment? (baseline-skip . 2) - (font-family . roman) (font-series . bold) (meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface )))) )) (TextSpanner . ( (print-function . ,Text_spanner::print) - (font-family . roman) + (font-shape . italic) (style . dashed-line) (staff-padding . 0.1) @@ -1120,7 +1124,6 @@ (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (print-function . ,Ottava_bracket::print) (font-shape . italic) - (font-family . roman) (shorten-pair . (0.0 . -0.6)) (staff-padding . 1.0) (padding . 0.5) @@ -1135,7 +1138,6 @@ (TabNoteHead . ( - (font-family . roman) (style . default) (print-function . ,Text_item::print) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) @@ -1184,13 +1186,11 @@ (breakable . #t) (style . C) ; (text . (,time-signature-glue-markup)) - (font-family . number) (meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface item-interface )))) )) (TupletBracket . ( - (gap . 1.5) (padding . 1.1) (thickness . 1.6) (edge-height . (0.7 . 0.7)) @@ -1198,7 +1198,6 @@ (before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking) (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) (print-function . ,Tuplet_bracket::print) - (font-family . roman) (font-shape . italic) (font-series . bold) @@ -1209,7 +1208,6 @@ (UnaCordaPedal . ( (print-function . ,Text_item::print) - (font-family . roman) (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) @@ -1245,12 +1243,11 @@ (print-function . ,Volta_bracket_interface::print) (direction . 1) (padding . 1) - (font-family . number) + (font-encoding . fetaNumber) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (thickness . 1.6) ; linethickness (height . 2.0) ; staffspace; (minimum-space . 5) - (font-family . number) (font-size . -4) (meta . ((interfaces . (volta-bracket-interface line-interface text-interface side-position-interface font-interface spanner-interface)))) ))