X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=9d19e537d0023c0cff1927bc06a8a1cee314e72b;hb=5e963da4031a9efceda94f4969785bf6fa13048b;hp=e83e91104192a0d8a6df5a489d0c02d5b4ecc0f5;hpb=b459e941f3a1044ca6275ae4c3225abf784e2401;p=lilypond.git diff --git a/scm/grob-description.scm b/scm/grob-description.scm index e83e911041..9d19e537d0 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -2,19 +2,30 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ; distances are given in stafflinethickness (thicknesses) and ; staffspace (distances) (define all-grob-descriptions - `((Arpeggio . ( + `( + (Accidentals . ( + (molecule-callback . ,Local_key_item::brew_molecule) + (X-offset-callbacks . (,Side_position_interface::aligned_side)) + (after-line-breaking-callback . ,Local_key_item::after_line_breaking) + (direction . -1) + (left-padding . 0.2) + (right-padding . 0.4) + (meta . ,(grob-description "Accidentals" accidentals-interface font-interface side-position-interface)) + )) + + (Arpeggio . ( (X-extent-callback . ,Arpeggio::width_callback) (Y-extent-callback . #f) (molecule-callback . ,Arpeggio::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (X-offset-callbacks . (,Side_position::aligned_side)) + (X-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . -1) (staff-position . 0.0) (meta . ,(grob-description "Arpeggio" arpeggio-interface side-position-interface font-interface)) @@ -26,7 +37,7 @@ (break-align-symbol . Staff_bar) (glyph . "|") (break-glyph-function . ,default-break-barline) - (barsize-procedure . ,Bar::get_staff_bar_size) + (bar-size-procedure . ,Bar::get_staff_bar_size) (molecule-callback . ,Bar::brew_molecule) (visibility-lambda . ,all-visible) (breakable . #t) @@ -49,7 +60,9 @@ (direction . 1) (font-family . roman) (font-relative-size . -1) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (meta . ,(grob-description "BarNumber" + side-position-interface text-interface font-interface break-aligned-interface)) )) @@ -57,10 +70,17 @@ ;; todo: clean this up a bit: the list is getting ;; rather long. (molecule-callback . ,Beam::brew_molecule) + (y-dy-callbacks . (,Beam::least_squares + ,Beam::cancel_suspect_slope + ,Beam::slope_damping + ,Beam::quantise_dy + ,Beam::user_override + ,Beam::do_quantise_y)) + (thickness . 0.48) ; in staff-space (before-line-breaking-callback . ,Beam::before_line_breaking) (after-line-breaking-callback . ,Beam::after_line_breaking) - (default-neutral-direction . 1) + (neutral-direction . 1) (dir-function . ,beam-dir-majority) (height-quants . ,default-beam-dy-quants) (vertical-position-quant-function . ,default-beam-y-quants) @@ -78,7 +98,6 @@ (breakable . #t) (stacking-dir . 1) (axes 0) - (X-offset-callbacks . (,Break_align_interface::self_align_callback)) (space-alist . ,default-break-align-space-alist) (meta . ,(grob-description "BreakAlignment" axis-group-interface align-interface @@ -128,26 +147,16 @@ (visibility-lambda . ,end-of-line-visible) (style . vaticana) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (meta . ,(grob-description "Custos" custos-interface staff-symbol-interface break-aligned-interface) ) + (meta . ,(grob-description "Custos" custos-interface staff-symbol-referencer-interface break-aligned-interface) ) )) - (Hairpin . ( - (molecule-callback . ,Hairpin::brew_molecule) - (thickness . 1.0) - (height . 0.6666) - - (if-text-padding . 1.0) - (width-correct . -1.0) - - (dash-thickness . 1.2) - (dash-length . 4.0) - (self-alignment-Y . 0) - (Y-offset-callbacks . (,Side_position::aligned_on_self)) - (meta . ,(grob-description "Hairpin" hairpin-interface)) - )) (DotColumn . ( - (axes 0 ) + (axes 0) + (direction . 1) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + + (X-offset-callbacks . (,Dot_column::side_position)) (meta . ,(grob-description "DotColumn" dot-column-interface axis-group-interface)) )) @@ -156,24 +165,40 @@ (dot-count . 1) (staff-position . 0.0) (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) - (meta . ,(grob-description "Dots" font-interface dot-interface )) - )) + (meta . ,(grob-description "Dots" font-interface dots-interface )) + )) + (DoublePercentRepeat + . ((molecule-callback . ,Percent_repeat_item_interface::double_percent) + (breakable . #t) + (slope . 1.0) + (font-family . music) + (width . 2.0) + (thickness . 0.48) + (break-align-symbol . Staff_bar) + (visibility-lambda . ,begin-of-line-invisible) + (meta . ,(grob-description "DoublePercentRepeat" font-interface percent-repeat-interface)) + )) (DynamicText . ( - (Y-offset-callbacks . (,Side_position::aligned_on_self)) + (Y-offset-callbacks . (,Side_position_interface::aligned_on_self)) (molecule-callback . ,Text_item::brew_molecule) +(X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (self-alignment-X . 0) + + (no-spacing-rods . #t) (script-priority . 100) (font-series . bold) (font-family . dynamic) (font-shape . italic) (self-alignment-Y . 0) - (meta . ,(grob-description "DynamicText" font-interface text-interface )) + (meta . ,(grob-description "DynamicText" font-interface text-interface dynamic-interface)) )) (DynamicLineSpanner . ( (axes . ( 1)) (padding . 0.6) (minimum-space . 1.2) + (direction . -1) (meta . ,(grob-description "DynamicLineSpanner" dynamic-interface axis-group-interface side-position-interface)) )) @@ -186,8 +211,9 @@ (Fingering . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self)) + (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self)) (padding . 0.6) + (direction . -1) (self-alignment-X . 0) (font-family . number) (font-relative-size . -3) @@ -209,24 +235,33 @@ (axes 1) (meta . ,(grob-description "HaraKiriVerticalGroup" axis-group-interface hara-kiri-group-interface)) )) - - (LyricHyphen . ( + (Hairpin . ( + (molecule-callback . ,Hairpin::brew_molecule) (thickness . 1.0) - (height . 0.4) - (minimum-length . 0.5) - (molecule-callback . ,Hyphen_spanner::brew_molecule) - (Y-extent-callback . ,Grob::point_dimension_callback) - (meta . ,(grob-description "LyricHyphen" lyric-hyphen-interface )) + (height . 0.6666) + (spacing-procedure . ,Spanner::set_spacing_rods) + (minimum-length . 2.0) + (if-text-padding . 1.0) + (width-correct . -1.0) + + (dash-thickness . 1.2) + (dash-length . 4.0) + (self-alignment-Y . 0) + (Y-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (meta . ,(grob-description "Hairpin" hairpin-interface dynamic-interface)) )) (InstrumentName . ( (breakable . #t) - (Y-offset-callbacks . (,Side_position::centered_on_parent - ,Side_position::aligned_on_self)) + (Y-offset-callbacks . (,Side_position_interface::aligned_on_self + ,Side_position_interface::aligned_on_support_refpoints +)) + (direction . 0) (self-alignment-Y . 0) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . Instrument_name) (visibility-lambda . ,begin-of-line-visible) + (baseline-skip . 2) (font-family . roman) (meta . ,(grob-description "InstrumentName" font-interface text-interface break-aligned-interface)) )) @@ -239,13 +274,15 @@ (meta . ,(grob-description "KeySignature" key-signature-interface font-interface break-aligned-interface)) )) - (Accidentals . ( - (molecule-callback . ,Local_key_item::brew_molecule) - (X-offset-callbacks . (,Side_position::aligned_side)) - (direction . -1) - (left-padding . 0.2) - (right-padding . 0.4) - (meta . ,(grob-description "Accidentals" accidentals-interface font-interface side-position-interface)) + + (LyricHyphen . ( + (thickness . 1.0) + (height . 0.4) + (minimum-length . 0.5) + (maximum-length . 100) + (molecule-callback . ,Hyphen_spanner::brew_molecule) + (Y-extent-callback . ,Grob::point_dimension_callback) + (meta . ,(grob-description "LyricHyphen" lyric-hyphen-interface )) )) (LineOfScore . ( @@ -263,7 +300,7 @@ (LyricText . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position::aligned_on_self)) + (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (self-alignment-X . 0) (non-rhythmic . #t) (word-space . 0.6) @@ -274,9 +311,12 @@ (RehearsalMark . ( (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (self-alignment-X . 0) + (direction . 1) (breakable . #t) - (font-family . number) + (font-family . roman) (font-shape . upright) (font-relative-size . 1) (visibility-lambda . ,end-of-line-invisible) @@ -287,17 +327,19 @@ (MultiMeasureRest . ( (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) (molecule-callback . ,Multi_measure_rest::brew_molecule) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (staff-position . 0) (expand-limit . 10) (padding . 2.0) ; staffspace (minimum-width . 12.5) ; staffspace (font-family . number) (font-relative-size . 1) - (meta . ,(grob-description "MultiMeasureRest" multi-measure-rest-interface font-interface )) + (meta . ,(grob-description "MultiMeasureRest" multi-measure-rest-interface rest-interface font-interface )) )) (NoteCollision . ( (axes 0 1) - (note-width . 1.65) + ;; Ugh, should not be hard-coded. + (note-width . 1.321) (meta . ,(grob-description "NoteCollision" note-collision-interface axis-group-interface )) @@ -311,7 +353,9 @@ (NoteHead . ( (style . default) (molecule-callback . ,Note_head::brew_molecule) - (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) + (stem-attachment-function + . ,note-head-style->attachment-coordinates) (meta . ,(grob-description "NoteHead" rhythmic-head-interface font-interface note-head-interface )) @@ -326,14 +370,14 @@ (meta . ,(grob-description "Glissando" line-spanner-interface)) )) - (FollowThread . ( + (VoiceFollower . ( (type . line) (gap . 0.5) (breakable . #t) (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ,(grob-description "FollowThread" + (meta . ,(grob-description "VoiceFollower" line-spanner-interface)) )) @@ -349,8 +393,8 @@ (self-alignment-X . 0) (text . "8") (visibility-lambda . ,begin-of-line-visible) - (X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self)) - (Y-offset-callbacks . (,Side_position::aligned_side)) + (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self)) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (molecule-callback . ,Text_item::brew_molecule) (font-shape . italic) (font-family . roman) @@ -363,21 +407,62 @@ (before-musical-spacing-factor . 0.4) (meta . ,(grob-description "PaperColumn" paper-column-interface axis-group-interface spaceable-element-interface)) )) + (PhrasingSlur . ( + (molecule-callback . ,Slur::brew_molecule) + (thickness . 1.2) + (spacing-procedure . ,Spanner::set_spacing_rods) + (minimum-length . 1.5) + (after-line-breaking-callback . ,Slur::after_line_breaking) + (extremity-rules . ,default-slur-extremity-rules) + (extremity-offset-alist . ,default-phrasing-slur-extremity-offset-alist) + (de-uglify-parameters . ( 1.5 0.8 -2.0)) + (Y-extent-callback . ,Slur::height) + (details . ((height-limit . 2.0) (ratio . 0.333) (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))) + (beautiful . 0.5) + (y-free . 0.75) + (attachment . (#f . #f)) + (attachment-offset . ((0 . 0) . (0 . 0))) + (slope-limit . 0.8) + (meta . ,(grob-description "PhrasingSlur" slur-interface)) + )) + (NonMusicalPaperColumn . ( (axes 0) (before-musical-spacing-factor . 1.0) (column-space-strength . 2.0) (meta . ,(grob-description "NonMusicalPaperColumn" paper-column-interface axis-group-interface spaceable-element-interface)) )) + + (PercentRepeat . ( + (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) + (molecule-callback . ,Multi_measure_rest::percent) + (slope . 1.0) + (thickness . 0.48) + (minimum-width . 12.5) ; staffspace + (font-family . music) + (meta . ,(grob-description "PercentRepeat" multi-measure-rest-interface font-interface percent-repeat-interface)) + )) + + (RepeatSlash . ( + (molecule-callback . , Percent_repeat_item_interface::beat_slash) + (thickness . 0.48) + (slope . 1.7) + (meta . ,(grob-description "RepeatSlash" percent-repeat-interface)) + )) (Rest . ( (after-line-breaking-callback . ,Rest::after_line_breaking) (X-extent-callback . ,Rest::extent_callback) (Y-extent-callback . ,Rest::extent_callback) (molecule-callback . ,Rest::brew_molecule) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (minimum-beam-collision-distance . 1.5) (meta . ,(grob-description "Rest" rhythmic-head-interface + staff-symbol-referencer-interface rest-interface)) )) (RestCollision . ( @@ -386,9 +471,11 @@ )) (Script . ( + ;; don't set direction here: it breaks staccato. (molecule-callback . ,Script::brew_molecule) - (X-offset-callbacks . (,Side_position::centered_on_parent)) - (after-line-breaking-callback . ,Script::after_line_breaking) + (padding . 0.3) + (X-offset-callbacks . (,Side_position_interface::centered_on_parent)) + (before-line-breaking-callback . ,Script::before_line_breaking) (meta . ,(grob-description "Script" script-interface side-position-interface font-interface)) )) @@ -400,7 +487,7 @@ (Slur . ( (molecule-callback . ,Slur::brew_molecule) (thickness . 1.2) - (spacing-procedure . ,Slur::set_spacing_rods) + (spacing-procedure . ,Spanner::set_spacing_rods) (minimum-length . 1.5) (after-line-breaking-callback . ,Slur::after_line_breaking) (extremity-rules . ,default-slur-extremity-rules) @@ -430,7 +517,7 @@ )) (SpanBar . ( (break-align-symbol . Staff_bar) - (barsize-procedure . ,Span_bar::get_bar_size) + (bar-size-procedure . ,Span_bar::get_bar_size) (molecule-callback . ,Bar::brew_molecule) (visibility-lambda . ,begin-of-line-invisible) (X-extent-callback . ,Span_bar::width_callback) @@ -463,15 +550,17 @@ (StaffSymbol . ( (molecule-callback . ,Staff_symbol::brew_molecule) (staff-space . 1.0) - (line-count . 5 ) + (line-count . 5) + (layer . 0) (meta . ,(grob-description "StaffSymbol" staff-symbol-interface )) )) (SostenutoPedal . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position::aligned_on_self)) + (direction . -1) + (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . - (,Side_position::aligned_side - ,Side_position::centered_on_parent)) + (,Side_position_interface::aligned_side + ,Side_position_interface::centered_on_parent)) (no-spacing-rods . #t) (font-shape . italic) (self-alignment-X . 0) @@ -492,7 +581,7 @@ (lengths . (3.5 3.5 3.5 4.5 5.0)) (stem-shorten . (0.5)) ; if stem is on middle line, choose this direction. - (default-neutral-direction . 1) + (neutral-direction . 1) (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback) (Y-extent-callback . ,Stem::height) @@ -522,19 +611,22 @@ (no-spacing-rods . #t) (molecule-callback . ,Sustain_pedal::brew_molecule) (self-alignment-X . 0) - (X-offset-callbacks . (,Side_position::aligned_on_self)) + (direction . -1) + (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . - (,Side_position::aligned_side - ,Side_position::centered_on_parent)) + (,Side_position_interface::aligned_side + ,Side_position_interface::centered_on_parent)) (meta . ,(grob-description "SustainPedal" sustain-pedal-interface side-position-interface font-interface)) )) - ; should split in 3 + ;; TODO: should split in 3 (SystemStartDelimiter . ( (molecule-callback . ,System_start_delimiter::brew_molecule) (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking) - (collapse-height . 1.0) + ;; really 4.0, but 5 to be on safe side. + (brace-collapse-height . 5.0) + (bracket-collapse-height . 1) (thickness . 1.6) (arch-height . 1.5) (arch-angle . 50.0) @@ -547,7 +639,7 @@ ;; if you want to set point-size, you cannot set ;; relative-size, as no font will be found for other ;; sheets than 20 - ;;(font-point-size . 20) + ;;(font-design-size . 20) ;;(font-relative-size . #f) (meta . ,(grob-description "SystemStartDelimiter" system-start-delimiter-interface font-interface)) )) @@ -555,14 +647,15 @@ (TextScript . ( (molecule-callback . ,Text_item::brew_molecule) (no-spacing-rods . #t) + (direction . -1) (padding . 0.5) +;; todo: add X self alignment? + (baseline-skip . 2) (font-family . roman) - (font-shape . italic) (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface )) )) (TextSpanner . ( (molecule-callback . ,Text_spanner::brew_molecule) - (font-shape . italic) (font-family . roman) (type . "line") @@ -575,11 +668,12 @@ )) (Tie . ( (molecule-callback . ,Tie::brew_molecule) - (spacing-procedure . ,Tie::set_spacing_rods) + (spacing-procedure . ,Spanner::set_spacing_rods) (staffline-clearance . 0.35) (details . ((ratio . 0.333) (height-limit . 1.0))) (thickness . 1.2) (x-gap . 0.2) + (y-offset . 0.6) (minimum-length . 2.5) (meta . ,(grob-description "Tie" tie-interface )) )) @@ -594,6 +688,7 @@ (break-align-symbol . Time_signature) (visibility-lambda . ,all-visible) (breakable . #t) + (style . C) (font-family . number) (meta . ,(grob-description "TimeSignature" time-signature-interface font-interface)) )) @@ -602,8 +697,8 @@ (number-gap . 2.0) (delta-y . 0) (thick . 1.0) - (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking) - (molecule-callback . ,Tuplet_spanner::brew_molecule) + (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) + (molecule-callback . ,Tuplet_bracket::brew_molecule) (font-family . roman) (font-shape . italic) (font-relative-size . -1) @@ -611,16 +706,18 @@ tuplet-bracket-interface font-interface)) )) - (UnaChordaPedal . ( + (UnaCordaPedal . ( (molecule-callback . ,Text_item::brew_molecule) + (font-family . roman) (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) - (X-offset-callbacks . (,Side_position::aligned_on_self)) + (direction . -1) + (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) (Y-offset-callbacks . - (,Side_position::aligned_side - ,Side_position::centered_on_parent)) - (meta . ,(grob-description "UnaChordaPedal" text-interface font-interface)) + (,Side_position_interface::aligned_side + ,Side_position_interface::centered_on_parent)) + (meta . ,(grob-description "UnaCordaPedal" text-interface font-interface)) )) (VoltaBracket . ( @@ -629,7 +726,7 @@ (direction . 1) (padding . 1) (font-style . volta) - (Y-offset-callbacks . (,Side_position::aligned_side)) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (thickness . 1.6) ; stafflinethickness (height . 2.0) ; staffspace; (minimum-space . 5) @@ -642,6 +739,7 @@ (axes 1) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) (X-extent-callback . #f) + (stacking-dir . -1) (meta . ,(grob-description "VerticalAlignment" align-interface axis-group-interface)) ))