X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=4e19b91a2251998ef71598b28231a8d0a526be67;hb=73e40a0dd515fd996ee0918dd96b42a754f623d5;hp=9d6f5587ad8638e3020f596bfb1996231206624d;hpb=12b33a8040a80d5b4a1217faf0d4cc7529483cc0;p=lilypond.git diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 9d6f5587ad..4e19b91a22 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -2,31 +2,54 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--20.301 Han-Wen Nienhuys +;;;; (c) 1998--2002 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; distances are given in stafflinethickness (thicknesses) and ;;;; staffspace (distances) ;;;; WARNING: the meta field should be the last one. +;;;; WARNING: don't use anonymous functions for initialization. ;; TODO: junk the meta field in favor of something more compact? -(define all-grob-descriptions +(define-public all-grob-descriptions `( (Accidental . ( (molecule-callback . ,Accidental_interface::brew_molecule) (font-family . music) - (cautionary-style . smaller) - (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (accidental-interface font-interface)))) + (cautionary-style . parentheses) + (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface font-interface)))) )) (AccidentalPlacement . ( - (X-extent-callback . ,Accidental_placement::extent_callback) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) (left-padding . 0.3) - (right-padding . 0.3) - (meta . ((interfaces . (accidental-placement-interface)))) - )) + + ;; 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.15) + (meta . ((interfaces . (item-interface accidental-placement-interface)))) + )) + + (Ambitus + . ( + (breakable . #t) + (break-align-symbol . ambitus) + (molecule-callback . ,Ambitus::brew_molecule) + (font-family . music) + (note-head-style . "noteheads-2") + (visibility-lambda . ,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 . (extra-space . 0.0)) + )) + (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface font-interface)))) + )) (Arpeggio . ( @@ -37,7 +60,7 @@ (X-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . -1) (staff-position . 0.0) - (meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface font-interface)))) + (meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface)))) )) (BarLine @@ -47,7 +70,7 @@ (break-glyph-function . ,default-break-barline) (bar-size-procedure . ,Bar_line::get_staff_bar_size) (molecule-callback . ,Bar_line::brew_molecule) - (visibility-lambda . ,all-visible) + (break-visibility . ,all-visible) (breakable . #t) (before-line-breaking-callback . ,Bar_line::before_line_breaking) (space-alist . ( @@ -55,6 +78,7 @@ (custos . (minimum-space . 2.0)) (clef . (minimum-space . 1.0)) (first-note . (extra-space . 1.3)) + (right-edge . (extra-space . 0.0)) )) ;; @@ -64,7 +88,7 @@ (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (meta . ((interfaces . (bar-line-interface break-aligned-interface font-interface)))) + (meta . ((interfaces . (bar-line-interface item-interface break-aligned-interface font-interface)))) )) @@ -72,7 +96,7 @@ . ( (molecule-callback . ,Text_item::brew_molecule) (breakable . #t) - (visibility-lambda . ,begin-of-line-visible) + (break-visibility . ,begin-of-line-visible) (padding . 1.0) (direction . 1) (font-family . roman) @@ -85,7 +109,7 @@ ((interfaces . (side-position-interface text-interface self-alignment-interface - font-interface break-aligned-interface)))) + font-interface item-interface break-aligned-interface)))) )) @@ -99,7 +123,7 @@ (padding . 0.1) (kern . 0.2) (thickness . 1.0) - (meta . ((interfaces . (text-interface bass-figure-interface self-alignment-interface font-interface)))) + (meta . ((interfaces . (text-interface bass-figure-interface item-interface self-alignment-interface font-interface)))) )) (Beam . ( @@ -112,6 +136,7 @@ (position-callbacks . (,Beam::least_squares ,Beam::check_concave ,Beam::slope_damping + ,Beam::shift_region_to_valid ,Beam::quanting )) @@ -121,15 +146,31 @@ (after-line-breaking-callback . ,Beam::after_line_breaking) (neutral-direction . -1) (dir-function . ,beam-dir-majority-median) - (beamed-stem-shorten . (1.0 0.5)) + + ;; Whe have some unreferenced problems here. + ;; + ;; If we shorten beamed stems less than normal stems (1 staffspace), + ;; or high order less than 8th beams, patterns like + ;; c''4 [c''8 c''] c''4 [c''16 c] + ;; are ugly (different stem lengths). + ;; + ;; But if we shorten 16th beams as much as 8th beams, a single + ;; forced 16th beam looks *very* short. + + ;; We choose to shorten 8th beams the same as single stems, + ;; and high order beams less than 8th beams, so that all + ;; isolated shortened beams look nice and a bit shortened, + ;; sadly possibly breaking patterns with high order beams. + (beamed-stem-shorten . (1.0 0.5 0.25)) + (outer-stem-length-limit . 0.2) (slope-limit . 0.2) - (flag-width-function . ,default-beam-flag-width-function) + (flag-width-function . ,beam-flag-width-function) (damping . 1) - (auto-knee-gap . 7) + (auto-knee-gap . 5.5) (font-name . "cmr10") (space-function . ,Beam::space_function) - (meta . ((interfaces . (staff-symbol-referencer-interface beam-interface)))) + (meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface)))) )) (BreakAlignment @@ -138,7 +179,7 @@ (stacking-dir . 1) (axes . (0)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (break-alignment-interface axis-group-interface))))) + (meta . ((interfaces . (break-alignment-interface item-interface axis-group-interface))))) ) (BreakAlignGroup @@ -146,7 +187,7 @@ (axes . (0)) (X-offset-callbacks . (,Break_align_interface::alignment_callback)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (break-aligned-interface axis-group-interface)))) + (meta . ((interfaces . (break-aligned-interface item-interface axis-group-interface item-interface )))) )) (BreathingSign @@ -154,6 +195,7 @@ (break-align-symbol . breathing-sign) (breakable . #t) (space-alist . ( + (ambitus . (extra-space . 2.0)) (key-signature . (minimum-space . 1.5)) (staff-bar . (minimum-space . 1.5)) (clef . (minimum-space . 2.0)) @@ -164,8 +206,8 @@ (font-family . music) (text . "scripts-rcomma") (Y-offset-callbacks . (,Breathing_sign::offset_callback)) - (visibility-lambda . ,begin-of-line-invisible) - (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface)))) + (break-visibility . ,begin-of-line-invisible) + (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface item-interface )))) )) (Clef @@ -175,16 +217,28 @@ (breakable . #t) (font-family . music) (break-align-symbol . clef) - (visibility-lambda . ,begin-of-line-visible) + (break-visibility . ,begin-of-line-visible) (space-alist . ( + (ambitus . (extra-space . 2.0)) (staff-bar . (minimum-space . 3.7)) (key-signature . (minimum-space . 4.0)) (time-signature . (minimum-space . 4.2)) (first-note . (minimum-space . 5.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 0.5)) + (right-edge . (extra-space . 0.5)) )) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface)))) + (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface )))) + )) + + (Cluster + . ( + (molecule-callback . ,Cluster::brew_molecule) + (spacing-procedure . ,Spanner::set_spacing_rods) + (minimum-length . 0.0) + (padding . 0.25) + (shape . leftsided-stairs) + (meta . ((interfaces . (cluster-interface spanner-interface)))) )) (ChordName @@ -193,7 +247,7 @@ (after-line-breaking-callback . ,Chord_name::after_line_breaking) (chord-name-function . ,default-chord-name-function) (font-family . roman) - (meta . ((interfaces . (font-interface text-interface chord-name-interface)))) + (meta . ((interfaces . (font-interface text-interface chord-name-interface item-interface )))) )) (Custos @@ -201,17 +255,21 @@ (break-align-symbol . custos) (breakable . #t) (molecule-callback . ,Custos::brew_molecule) - (visibility-lambda . ,end-of-line-visible) + (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)) - (font-family . music) + (font-family . ancient) (space-alist . ( (first-note . (minimum-space . 0.0)) + (right-edge . (extra-space . 0.1)) )) - (meta . ((interfaces . (custos-interface staff-symbol-referencer-interface break-aligned-interface)))) + (meta . ((interfaces + . (custos-interface staff-symbol-referencer-interface + font-interface + break-aligned-interface item-interface )))) )) @@ -221,7 +279,7 @@ (direction . 1) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (X-offset-callbacks . (,Dot_column::side_position)) - (meta . ((interfaces . (dot-column-interface axis-group-interface)))) + (meta . ((interfaces . (dot-column-interface axis-group-interface item-interface )))) )) (Dots @@ -229,7 +287,7 @@ (molecule-callback . ,Dots::brew_molecule) (dot-count . 1) (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) - (meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface)))) + (meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface )))) )) (DoublePercentRepeat . @@ -241,10 +299,10 @@ (width . 2.0) (thickness . 0.48) (break-align-symbol . staff-bar) - (visibility-lambda . ,begin-of-line-invisible) + (break-visibility . ,begin-of-line-invisible) (meta . ((interfaces . (font-interface break-aligned-interface - percent-repeat-interface)))) + percent-repeat-interface item-interface )))) )) (DynamicText @@ -260,50 +318,51 @@ (font-family . dynamic) (font-shape . italic) (self-alignment-Y . 0) - (meta . ((interfaces . (font-interface text-interface self-alignment-interface dynamic-interface)))) + (meta . ((interfaces . (font-interface text-interface self-alignment-interface dynamic-interface script-interface item-interface )))) )) (DynamicLineSpanner . ( (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (padding . 0.6) (minimum-space . 1.2) (direction . -1) - (meta . ((interfaces . (dynamic-interface axis-group-interface side-position-interface)))) + (meta . ((interfaces . (dynamic-interface axis-group-interface side-position-interface spanner-interface)))) )) (LeftEdge . ( (break-align-symbol . left-edge) - (X-offset-callbacks . (,Break_align_interface::alignment_callback)) (X-extent-callback . ,Grob::point_dimension_callback) (breakable . #t) (space-alist . ( + (custos . (extra-space . 0.0)) + (ambitus . (extra-space . 2.0)) (time-signature . (extra-space . 0.0)) (staff-bar . (extra-space . 0.0)) (breathing-sign . (minimum-space . 0.0)) (clef . (extra-space . 1.0)) - (first-note . (extra-space . 0.0)) + (first-note . (extra-space . 1.0)) + (right-edge . (extra-space . 0.0)) (key-signature . (extra-space . 0.0)) )) - (meta . ((interfaces . (break-aligned-interface)))) + (meta . ((interfaces . (break-aligned-interface item-interface )))) )) (Fingering . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent - ,Self_alignment_interface::aligned_on_self)) (padding . 0.6) - ; (direction . -1) + ;; (direction . -1) (self-alignment-X . 0) (self-alignment-Y . 0) + (script-priority . 100) (font-family . number) (font-relative-size . -3) (font-shape . upright) - (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface)))) + (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface )))) )) @@ -312,7 +371,7 @@ (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback)) (Y-extent-callback . ,Hara_kiri_group_spanner::y_extent) (axes . (1)) - (meta . ((interfaces . (axis-group-interface hara-kiri-group-interface)))) + (meta . ((interfaces . (axis-group-interface hara-kiri-group-interface item-interface spanner-interface)))) )) (Hairpin @@ -329,9 +388,18 @@ (dash-length . 4.0) (self-alignment-Y . 0) (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) - (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface)))) + (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface)))) )) + (HorizontalBracket + . ( + (thickness . 1.0) + (molecule-callback . ,Horizontal_bracket::brew_molecule) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (padding . 0.2) + (direction . -1) + (meta . ((interfaces . (horizontal-bracket-interface side-position-interface spanner-interface)))) + )) (InstrumentName . ( (breakable . #t) @@ -346,10 +414,10 @@ (self-alignment-Y . 0) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . instrument-name) - (visibility-lambda . ,begin-of-line-visible) + (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)))) + (meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface )))) )) (KeySignature @@ -358,13 +426,14 @@ (space-alist . ( (time-signature . (extra-space . 1.25)) (staff-bar . (extra-space . 1.1)) + (right-edge . (extra-space . 0.5)) (first-note . (extra-space . 2.5)) )) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (break-align-symbol . key-signature) - (visibility-lambda . ,begin-of-line-visible) + (break-visibility . ,begin-of-line-visible) (breakable . #t) - (meta . ((interfaces . (key-signature-interface font-interface break-aligned-interface)))) + (meta . ((interfaces . (key-signature-interface font-interface break-aligned-interface item-interface )))) )) (Ligature @@ -375,11 +444,18 @@ (LigatureBracket . ( - (width . 0.75) - (height . 0.5) (ligature-primitive-callback . ,Note_head::brew_molecule) - (molecule-callback . ,Ligature_bracket::brew_molecule) - (meta . ((interfaces . (ligature-bracket-interface)))) + (direction . 1) + (gap . 0.0) + (padding . 2.0) + (thickness . 1.6) + (edge-widen . (0.0 . 0.0)) + (edge-height . (0.7 . 0.7)) + (shorten-pair . (-0.2 . -0.2)) + (before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking) + (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) + (molecule-callback . ,Tuplet_bracket::brew_molecule) + (meta . ((interfaces . (tuplet-bracket-interface spanner-interface)))) )) (LigatureHead @@ -389,8 +465,11 @@ (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (stem-attachment-function . ,note-head-style->attachment-coordinates) (font-family . ancient) - (style . mensural) - (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface note-head-interface staff-symbol-referencer-interface)))) + (style . default) + (glyph-name-procedure . ,find-notehead-symbol) + (meta . ((interfaces . (ligature-head-interface rhythmic-head-interface + font-interface + note-head-interface staff-symbol-referencer-interface)))) )) (LyricHyphen @@ -401,7 +480,7 @@ (maximum-length . 100) (molecule-callback . ,Hyphen_spanner::brew_molecule) (Y-extent-callback . ,Grob::point_dimension_callback) - (meta . ((interfaces . (lyric-hyphen-interface)))) + (meta . ((interfaces . (lyric-hyphen-interface spanner-interface)))) )) (LyricExtender @@ -410,13 +489,14 @@ (height . 0.8) ; stafflinethickness; (right-trim-amount . 0.5) (Y-extent-callback . ,Grob::point_dimension_callback) - (meta . ((interfaces . (lyric-extender-interface)))) + (meta . ((interfaces . (lyric-extender-interface spanner-interface)))) )) (LyricText . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent + ,Self_alignment_interface::aligned_on_self)) (self-alignment-X . 0) (word-space . 0.6) (ignore-length-mismatch . #f) @@ -424,8 +504,9 @@ (end-alignment . 2) (font-family . roman) (font-shape . upright) + ;; duh, side-position-interface? - (meta . ((interfaces . (lyric-syllable-interface self-alignment-interface text-interface font-interface)))) + (meta . ((interfaces . (lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface )))) )) (MensuralLigature @@ -435,7 +516,7 @@ (ligature-primitive-callback . ,Mensural_ligature::brew_ligature_primitive) (molecule-callback . ,Mensural_ligature::brew_molecule) (font-family . ancient) - (meta . ((interfaces . (mensural-ligature-interface)))) + (meta . ((interfaces . (mensural-ligature-interface font-interface)))) )) (Porrectus @@ -460,11 +541,25 @@ (direction . 1) (breakable . #t) - (visibility-lambda . ,end-of-line-invisible) + (font-family . roman) + (baseline-skip . 2) + (break-visibility . ,end-of-line-invisible) (padding . 0.8) - (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface)))) + (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface )))) + )) + + (MeasureGrouping + . ( + (Y-offset-callbacks . (,Side_position_interface::out_of_staff + ,Side_position_interface::aligned_side)) + (molecule-callback . ,Measure_grouping::brew_molecule) + (padding . 2) + (direction . 1) + (thickness . 1) + (height . 2.0) + (staff-padding . 3) + (meta . ((interfaces . (spanner-interface side-position-interface measure-grouping-interface)))) )) - (MultiMeasureRest . ( (spacing-procedure . ,Multi_measure_rest::set_spacing_rods) @@ -472,14 +567,26 @@ (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (staff-position . 0) (expand-limit . 10) - (number-threshold . 1) + (thick-thickness . 6.6) + (hair-thickness . 2.0) (padding . 1) - (thickness . 6.6) + (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface spanner-interface)))) + )) + + (MultiMeasureRestNumber + . ( + (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self + ,Self_alignment_interface::centered_on_other_axis_parent)) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (self-alignment-X . 0) + (direction . 1) + (padding . 2) (font-family . number) - (padding . 1) - (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface)))) + (meta . ((interfaces . (side-position-interface self-alignment-interface font-interface spanner-interface text-interface)))) )) + (NoteCollision . ( (axes . (0 1)) @@ -487,7 +594,7 @@ (note-width . 1.321) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (note-collision-interface axis-group-interface)))) + (meta . ((interfaces . (note-collision-interface axis-group-interface item-interface )))) )) (NoteColumn @@ -495,38 +602,29 @@ (axes . (0 1)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (axis-group-interface note-column-interface)))) + (meta . ((interfaces . (axis-group-interface note-column-interface item-interface )))) )) (NoteHead . ( (style . default) (molecule-callback . ,Note_head::brew_molecule) + (glyph-name-procedure . ,find-notehead-symbol) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (stem-attachment-function . ,note-head-style->attachment-coordinates) - (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface)))) - )) - - (TabNoteHead - . ( - (font-family . roman) - (style . default) - (molecule-callback . ,tablature-molecule-callback) - (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (stem-attachment-function . ,tablature-stem-attachment-function) - (string-tunings . (-8 -3 2 7 11 16)) - (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface)))) + (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface )))) )) (Glissando . ( (type . line) (gap . 0.5) + (zigzag-width . 0.75) (breakable . #t) (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ((interfaces . (line-spanner-interface)))) + (meta . ((interfaces . (line-spanner-interface spanner-interface)))) )) (VoiceFollower @@ -537,36 +635,39 @@ (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ((interfaces . (line-spanner-interface)))) + (meta . ((interfaces . (line-spanner-interface spanner-interface)))) )) (NoteName . ( (molecule-callback . ,Text_item::brew_molecule) (font-family . roman) - (meta . ((interfaces . (note-name-interface text-interface font-interface)))) + (meta . ((interfaces . (note-name-interface text-interface font-interface item-interface )))) )) (OctavateEight . ( (self-alignment-X . 0) (text . "8") - (visibility-lambda . ,begin-of-line-visible) + (break-visibility . ,begin-of-line-visible) (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self)) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (molecule-callback . ,Text_item::brew_molecule) (font-shape . italic) + (padding . 0.4) + (font-relative-size . -2) (font-family . roman) - (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface)))) + (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface )))) )) (PaperColumn . ( (axes . (0)) + (before-line-breaking-callback . ,Paper_column::before_line_breaking) (X-extent-callback . ,Axis_group_interface::group_extent_callback) ; (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8") (Y-extent-callback . #f) - (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface)))) + (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface )))) )) (PhrasingSlur @@ -580,28 +681,30 @@ (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))) + (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) - (meta . ((interfaces . (slur-interface)))) + (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)))) )) (NonMusicalPaperColumn . ( (axes . (0)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) - + (before-line-breaking-callback . ,Paper_column::before_line_breaking) ;; debugging stuff: print column number. ; (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8") (Y-extent-callback . #f) - (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface)))) + (meta . ((interfaces . (paper-column-interface axis-group-interface spaceable-grob-interface item-interface )))) )) (PercentRepeat @@ -612,7 +715,7 @@ (thickness . 0.48) (minimum-width . 12.5) ; staffspace (font-family . music) - (meta . ((interfaces . (multi-measure-rest-interface font-interface percent-repeat-interface)))) + (meta . ((interfaces . (multi-measure-rest-interface spanner-interface font-interface percent-repeat-interface)))) )) (PianoPedalBracket ;; an example of a text spanner @@ -624,11 +727,11 @@ (width-correct . 0) (outer . #t) (direction . -1) - (edge-width . (0.5 . 0.5)) + (edge-widen . (0.5 . 0.5)) (edge-height . (1.0 . 1.0)) (shorten-pair . (0.0 . 0.0)) (thickness . 1.0) - (meta . ((interfaces . (text-spanner-interface piano-pedal-interface)))) + (meta . ((interfaces . (text-spanner-interface piano-pedal-interface spanner-interface)))) )) (RepeatSlash @@ -636,7 +739,7 @@ (molecule-callback . , Percent_repeat_item_interface::beat_slash) (thickness . 0.48) (slope . 1.7) - (meta . ((interfaces . (percent-repeat-interface)))) + (meta . ((interfaces . (percent-repeat-interface item-interface )))) )) (Rest . ( @@ -645,18 +748,18 @@ (Y-extent-callback . ,Rest::extent_callback) (molecule-callback . ,Rest::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (minimum-beam-collision-distance . 1.5) + (minimum-beam-collision-distance . 0.75) (meta . ( (interfaces . (font-interface rhythmic-head-interface staff-symbol-referencer-interface - rest-interface)) + rest-interface item-interface )) )))) (RestCollision . ( (minimum-distance . 0.75) - (meta . ((interfaces . (rest-collision-interface)))) + (meta . ((interfaces . (rest-collision-interface item-interface )))) )) (Script @@ -666,17 +769,18 @@ ;; This value is sensitive: if too large, staccato dots will move a ;; space a away. - (padding . 0.25) + (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) - (meta . ((interfaces . (script-interface side-position-interface font-interface)))) + (meta . ((interfaces . (script-interface side-position-interface font-interface item-interface )))) )) (ScriptColumn . ( (before-line-breaking-callback . ,Script_column::before_line_breaking) - (meta . ((interfaces . (script-column-interface)))) + (meta . ((interfaces . (script-column-interface item-interface )))) )) (Slur @@ -690,16 +794,18 @@ (extremity-offset-alist . ,default-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))) + (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) - (meta . ((interfaces . (slur-interface)))) + (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)))) )) (SpacingSpanner @@ -708,7 +814,8 @@ (grace-space-factor . 0.6) (shortest-duration-space . 2.0) (spacing-increment . 1.2) - (meta . ((interfaces . (spacing-spanner-interface)))) + (base-shortest-duration . ,(ly:make-moment 1 8)) + (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface)))) )) (SpanBar @@ -716,7 +823,7 @@ (break-align-symbol . staff-bar) (bar-size-procedure . ,Span_bar::get_bar_size) (molecule-callback . ,Span_bar::brew_molecule) - (visibility-lambda . ,begin-of-line-invisible) + (break-visibility . ,begin-of-line-invisible) (X-extent-callback . ,Span_bar::width_callback) (Y-extent-callback . ()) (breakable . #t) @@ -731,7 +838,8 @@ (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (meta . ((interfaces . (span-bar-interface bar-line-interface)))) + (meta . ((interfaces . (span-bar-interface font-interface + bar-line-interface item-interface )))) )) (StanzaNumber @@ -739,30 +847,31 @@ (breakable . #t) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . clef) - (visibility-lambda . ,begin-of-line-visible) + (break-visibility . ,begin-of-line-visible) (font-family . roman) - (meta . ((interfaces . (break-aligned-interface text-interface font-interface)))) + (meta . ((interfaces . (break-aligned-interface text-interface font-interface item-interface )))) )) (StaffSpacing . ( (breakable . #t) (stem-spacing-correction . 0.4) - (meta . ((interfaces . (staff-spacing-interface)))) + (knee-spacing-correction . 0.75) + (meta . ((interfaces . (spacing-interface staff-spacing-interface item-interface )))) )) (NoteSpacing . ( (stem-spacing-correction . 0.5) - (meta . ((interfaces . (note-spacing-interface)))) + (knee-spacing-correction . 0.75) + (meta . ((interfaces . (spacing-interface note-spacing-interface item-interface )))) )) (StaffSymbol . ( (molecule-callback . ,Staff_symbol::brew_molecule) (line-count . 5) - (ragged-right . #f) (layer . 0) - (meta . ((interfaces . (staff-symbol-interface)))) + (meta . ((interfaces . (staff-symbol-interface spanner-interface)))) )) (SostenutoPedal @@ -776,18 +885,20 @@ (font-family . roman) (font-shape . italic) (self-alignment-X . 0) - (meta . ((interfaces . (text-interface self-alignment-interface font-interface)))) + (meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface)))) )) (SostenutoPedalLineSpanner . ( (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (padding . 1.2) (minimum-space . 1.0) (direction . -1) - (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface)))) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) (Stem @@ -795,17 +906,49 @@ (before-line-breaking-callback . ,Stem::before_line_breaking) (molecule-callback . ,Stem::brew_molecule) (thickness . 1.3) - (beamed-lengths . (0.0 2.5 2.0 1.5)) - (beamed-minimum-lengths . (0.0 1.5 1.25 1.0)) - - ;; Stems in unnatural (forced) direction should be shortened, - ;; according to [Roush & Gourlay]. Their suggestion to knock off - ;; a whole staffspace seems a bit drastical: we'll do half. + ;; 3.5 (or 3 measured from note head) is standar length + ;; 32nd, 64th flagged stems should be longer (lengths . (3.5 3.5 3.5 4.5 5.0)) + + ;; Stems in unnatural (forced) direction should be shortened by + ;; one staff space, according to [Roush & Gourlay]. + ;; Flagged stems we shorten only half a staff space. (stem-shorten . (1.0 0.5)) - ; if stem is on middle line, choose this direction. + + ;; default stem direction for note on middle line (neutral-direction . -1) + + ;; [Wanske]: standard length (but no shorter than minimum). + ;; (beamed-lengths . (3.5)) + + ;; FIXME. 3.5 yields too long beams (according to Ross and + ;; looking at Baerenreiter examples) for a number of common + ;; boundary cases. Subtracting half a beam thickness fixes + ;; this, but the bug may well be somewhere else. + (beamed-lengths . (3.26)) + + ;; [Wanske] lists three sets of minimum lengths. One + ;; set for the nomal case, and one set for beams with `der + ;; Balkenendpunkt weiter "uber bzw. unter die Systemgrenze + ;; hinaus (bei Gruppen mit grossem Tonumfang)' and the extreme + ;; case. + + ;; Note that Wanske lists numbers lengths starting from top of + ;; head, so we must add half a staff space. + + ;; We use the normal minima as minimum for the ideal lengths, + ;; and the extreme minima as abolute minimum length. + + ;; The 'normal' minima + (beamed-minimum-free-lengths . (2.5 2.0 1.5)) + + ;; The 'far outside staff' minima, not used + ;(beamed-far-minimum-free-lengths . (1.83)) + + ;; The 'extreme case' minima + (beamed-extreme-minimum-free-lengths . (1.83 1.5)) + (X-offset-callbacks . (,Stem::off_callback)) (X-extent-callback . ,Stem::dim_callback) (Y-extent-callback . ,Stem::height) @@ -813,7 +956,8 @@ (adjust-if-on-staffline . #t) (font-family . music) (avoid-note-head . #f) - (meta . ((interfaces . (stem-interface font-interface)))) + (up-to-staff . #f) + (meta . ((interfaces . (stem-interface font-interface item-interface )))) )) (StemTremolo @@ -822,20 +966,20 @@ (Y-extent-callback . ,Stem_tremolo::height) (X-extent-callback . #f) - (beam-width . 2.0) ; staff-space + (beam-width . 1.6) ; staff-space (beam-thickness . 0.48) ; staff-space - (meta . ((interfaces . (stem-tremolo-interface)))) + (meta . ((interfaces . (stem-tremolo-interface item-interface )))) )) (SeparationItem . ( - (meta . ((interfaces . (separation-item-interface)))) + (meta . ((interfaces . (spacing-interface separation-item-interface item-interface )))) )) (SeparatingGroupSpanner . ( (spacing-procedure . ,Separating_group_spanner::set_spacing_rods) - (meta . ((interfaces . (separation-spanner-interface)))) + (meta . ((interfaces . (spacing-interface separation-spanner-interface spanner-interface)))) )) (SustainPedal @@ -847,18 +991,19 @@ (padding . 0.0) ;; padding relative to SustainPedalLineSpanner (pedal-type . text) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) - (meta . ((interfaces . (piano-pedal-interface text-spanner-interface text-interface self-alignment-interface font-interface)))) + (meta . ((interfaces . (piano-pedal-interface text-spanner-interface text-interface self-alignment-interface font-interface item-interface)))) )) (SustainPedalLineSpanner . ( (axes . (1)) - (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (padding . 1.2) (minimum-space . 1.0) (direction . -1) - (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface)))) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) (System @@ -866,7 +1011,7 @@ (axes . (0 1)) (X-extent-callback . ,Axis_group_interface::group_extent_callback) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (system-interface axis-group-interface)))) + (meta . ((interfaces . (system-interface axis-group-interface spanner-interface)))) )) (SystemStartBrace @@ -890,7 +1035,7 @@ (arch-width . 1.5) (bracket-collapse-height . 1) (thickness . 0.25) - (meta . ((interfaces . (system-start-delimiter-interface)))) + (meta . ((interfaces . (system-start-delimiter-interface spanner-interface)))) )) (SystemStartBar @@ -900,19 +1045,21 @@ (glyph . "bar-line") (thickness . 1.6) (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking) - (meta . ((interfaces . (system-start-delimiter-interface)))) + (meta . ((interfaces . (system-start-delimiter-interface spanner-interface)))) )) (TextScript . ( (molecule-callback . ,Text_item::brew_molecule) (no-spacing-rods . #t) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (direction . -1) (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)))) + (meta . ((interfaces . (text-script-interface text-interface side-position-interface font-interface item-interface )))) )) (TextSpanner @@ -926,9 +1073,25 @@ (width-correct . -1) (direction . 1) - (meta . ((interfaces . (text-spanner-interface font-interface)))) + (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface)))) + )) + + (TabNoteHead + . ( + (font-family . roman) + (style . default) + (molecule-callback . ,tablature-molecule-callback) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) + (extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up! + (stem-attachment-function . ,tablature-stem-attachment-function) + (meta . ((interfaces + . (rhythmic-head-interface + font-interface + note-head-interface staff-symbol-referencer-interface + text-interface item-interface )))) )) + (Tie . ( (molecule-callback . ,Tie::brew_molecule) @@ -936,10 +1099,10 @@ (staffline-clearance . 0.35) (details . ((ratio . 0.333) (height-limit . 1.0))) (thickness . 1.2) - (x-gap . 0.2) + (x-gap . -0.1) (y-offset . 0.6) (minimum-length . 2.5) - (meta . ((interfaces . (tie-interface)))) + (meta . ((interfaces . (tie-interface spanner-interface)))) )) (TieColumn @@ -947,22 +1110,23 @@ (after-line-breaking-callback . ,Tie_column::after_line_breaking) (X-extent-callback . ()) (Yoo-extent-callback . ()) - (meta . ((interfaces . (tie-column-interface)))) + (meta . ((interfaces . (tie-column-interface spanner-interface)))) )) (TimeSignature . ( (molecule-callback . ,Time_signature::brew_molecule) (break-align-symbol . time-signature) - (visibility-lambda . ,all-visible) + (break-visibility . ,all-visible) (space-alist . ( (first-note . (extra-space . 2.0)) + (right-edge . (extra-space . 0.5)) (staff-bar . (minimum-space . 2.0)) )) (breakable . #t) (style . C) (font-family . number) - (meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface)))) + (meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface item-interface )))) )) (TupletBracket @@ -970,9 +1134,9 @@ (gap . 2.0) (padding . 0.9) (thickness . 1.6) - (edge-width . (0.0 . 0.0)) + (edge-widen . (0.0 . 0.0)) (edge-height . (0.7 . 0.7)) - (shorten-pair . (0.0 . 0.0)) + (shorten-pair . (-0.2 . -0.2)) (before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking) (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) (molecule-callback . ,Tuplet_bracket::brew_molecule) @@ -980,7 +1144,7 @@ (font-shape . italic) (font-relative-size . -1) - (meta . ((interfaces . (text-interface tuplet-bracket-interface font-interface)))) + (meta . ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface)))) )) (UnaCordaPedal @@ -994,17 +1158,19 @@ (pedal-type . text) (padding . 0.0) ;; padding relative to UnaCordaPedalLineSpanner (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) - (meta . ((interfaces . (text-interface self-alignment-interface font-interface)))) + (meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface )))) )) (UnaCordaPedalLineSpanner . ( (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (padding . 1.2) (minimum-space . 1.0) (direction . -1) - (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface)))) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) (VoltaBracket @@ -1019,7 +1185,7 @@ (minimum-space . 5) (font-family . number) (font-relative-size . -2) - (meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface)))) + (meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface spanner-interface)))) )) (VerticalAlignment @@ -1027,7 +1193,7 @@ (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) (stacking-dir . -1) - (meta . ((interfaces . (align-interface axis-group-interface)))) + (meta . ((interfaces . (align-interface axis-group-interface spanner-interface)))) )) (VerticalAxisGroup @@ -1035,7 +1201,7 @@ (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - (meta . ((interfaces . (axis-group-interface)))) + (meta . ((interfaces . (axis-group-interface spanner-interface)))) )) ) ) @@ -1046,7 +1212,6 @@ (define (completize-grob-entry x) "transplant assoc key into 'name entry of 'meta of X " - (let* ((name-sym (car x)) (grob-entry (cdr x)) (metaentry (cdr (assoc 'meta grob-entry))) @@ -1072,6 +1237,9 @@ (map (lambda (x) ; (display (car x)) (newline) - (set-object-property! (car x) 'translation-type? list?)) + (set-object-property! (car x) 'translation-type? list?) + (set-object-property! (car x) 'is-grob? #t)) all-grob-descriptions) + +(set! all-grob-descriptions (sort all-grob-descriptions alist