X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=dc0fbd7a07376d092adad860f9620478da6a05d0;hb=f946b07d4fff20ede501adb2a41af46e964a01e1;hp=3b302aa63dc31abda9cc58a58d0393ef4c77fad7;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 3b302aa63d..dc0fbd7a07 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -2,14 +2,25 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2001 Han-Wen Nienhuys +;;;; (c) 1998--20.301 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) @@ -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) @@ -69,7 +80,7 @@ (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) @@ -139,23 +150,13 @@ (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_interface::aligned_on_self)) - (meta . ,(grob-description "Hairpin" hairpin-interface dynamic-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)) )) @@ -166,10 +167,25 @@ (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) (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_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) @@ -205,13 +221,6 @@ (meta . ,(grob-description "Fingering" finger-interface font-interface text-script-interface text-interface side-position-interface)) )) - (GraceAlignment . ( - (axes . (0)) - (horizontal-space . 1.2) - (padding . 1.0) - (before-line-breaking-callback . ,Grace_align_item::before_line_breaking) - (meta . ,(grob-description "GraceAlignment" axis-group-interface align-interface grace-alignment-interface)) - )) (HaraKiriVerticalGroup . ( (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback)) @@ -219,14 +228,20 @@ (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 . ( @@ -252,14 +267,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_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)) + + (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 . ( @@ -293,7 +309,7 @@ (direction . 1) (breakable . #t) - (font-family . number) + (font-family . roman) (font-shape . upright) (font-relative-size . 1) (visibility-lambda . ,end-of-line-invisible) @@ -304,6 +320,7 @@ (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 @@ -314,7 +331,8 @@ )) (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 )) @@ -329,7 +347,8 @@ (style . default) (molecule-callback . ,Note_head::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (attachment-angle . ,(* 20/360 3.14159)) + (stem-attachment-function + . ,note-head-style->attachment-coordinates) (meta . ,(grob-description "NoteHead" rhythmic-head-interface font-interface note-head-interface )) @@ -344,14 +363,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)) )) @@ -384,7 +403,7 @@ (PhrasingSlur . ( (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) @@ -413,15 +432,20 @@ (PercentRepeat . ( (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) (molecule-callback . ,Multi_measure_rest::percent) - (staff-position . 0) - (expand-limit . 10) - (padding . 2.0) ; staffspace + (slope . 1.0) + (thickness . 0.48) (minimum-width . 12.5) ; staffspace (font-family . music) - (meta . ,(grob-description "PercentRepeat" multi-measure-rest-interface font-interface)) + (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) @@ -442,6 +466,7 @@ (Script . ( ;; don't set direction here: it breaks staccato. (molecule-callback . ,Script::brew_molecule) + (padding . 0.29) (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)) @@ -455,7 +480,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) @@ -475,8 +500,11 @@ )) (SpacingSpanner . ( - (spacing-procedure . ,Spacing_spanner::set_springs) + (spacing-procedure . ,New_spacing_spanner::set_springs) (stem-spacing-correction . 0.5) + (grace-space-factor . 0.8) + + ;; TODO: change naming -- unintuitive (arithmetic-basicspace . 2.0) (arithmetic-multiplier . ,(* 0.9 1.32)) ;; assume that notes at least this long are present. @@ -485,12 +513,10 @@ )) (SpanBar . ( (break-align-symbol . Staff_bar) - (barsize-procedure . ,Span_bar::get_bar_size) - (molecule-callback . ,Bar::brew_molecule) + (bar-size-procedure . ,Span_bar::get_bar_size) + (molecule-callback . ,Span_bar::brew_molecule) (visibility-lambda . ,begin-of-line-invisible) (X-extent-callback . ,Span_bar::width_callback) - (Y-offset-callbacks . (,Span_bar::center_on_spanned_callback)) - (breakable . #t) (glyph . "|") (before-line-breaking-callback . ,Span_bar::before_line_breaking) @@ -549,7 +575,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) @@ -588,12 +614,12 @@ (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) - ;; ugh, in practice, brace has height of 4.1 staff-spaces - (brace-collapse-height . 4.1) + ;; 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) @@ -607,7 +633,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)) )) @@ -617,14 +643,13 @@ (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") @@ -637,11 +662,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 )) )) @@ -656,6 +682,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)) )) @@ -673,8 +700,9 @@ 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) @@ -683,7 +711,7 @@ (Y-offset-callbacks . (,Side_position_interface::aligned_side ,Side_position_interface::centered_on_parent)) - (meta . ,(grob-description "UnaChordaPedal" text-interface font-interface)) + (meta . ,(grob-description "UnaCordaPedal" text-interface font-interface)) )) (VoltaBracket . ( @@ -705,6 +733,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)) ))