X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Fgrob-description.scm;h=291566e75b0bde4590fb62619c4ee42133bb0c1c;hb=397619f8d14da1248ddc4a40231ae9360df40486;hp=ab3b20afbc2ad0ca607fe45026f0fccd82e4a996;hpb=60fdc53305e8628dad96b4ebea177bc6ee8d95cd;p=lilypond.git diff --git a/scm/grob-description.scm b/scm/grob-description.scm index ab3b20afbc..291566e75b 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -9,7 +9,18 @@ ; 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,20 +150,6 @@ (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 ) @@ -166,10 +163,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) @@ -219,14 +231,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 +270,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 . ( @@ -315,7 +334,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 )) @@ -330,7 +350,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 )) @@ -385,7 +406,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) @@ -414,15 +435,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) @@ -443,6 +469,7 @@ (Script . ( ;; don't set direction here: it breaks staccato. (molecule-callback . ,Script::brew_molecule) + (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)) @@ -456,7 +483,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) @@ -486,7 +513,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) @@ -550,7 +577,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) @@ -589,12 +616,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) @@ -618,14 +645,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") @@ -638,7 +664,7 @@ )) (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) @@ -657,6 +683,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)) )) @@ -674,8 +701,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) @@ -684,7 +712,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 . ( @@ -706,6 +734,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)) ))