X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fgrob-description.scm;h=169118c83214b1580d39cc90ded53c84dcf46e01;hb=fd8ed70c80d71a3bc6e0e62cc86a3659e23eb0a2;hp=d6e3d431a2677124f469f1dccdafae64ee57fba0;hpb=fa65a4be862681bc8b06207b9013a07b47ee7f56;p=lilypond.git diff --git a/scm/grob-description.scm b/scm/grob-description.scm index d6e3d431a2..169118c832 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -5,26 +5,51 @@ ;;;; (c) 1998--20.301 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen - ; distances are given in stafflinethickness (thicknesses) and - ; staffspace (distances) +;;;; distances are given in stafflinethickness (thicknesses) and +;;;; staffspace (distances) -;;; WARNING: the meta field should be the last one. +;;;; 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 `( - (Accidentals + (Accidental . ( - (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.5) - (paren-cautionaries . #t) + (molecule-callback . ,Accidental_interface::brew_molecule) (font-family . music) - (meta . ,(grob-description accidentals-interface font-interface side-position-interface)) + (cautionary-style . smaller) + (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface font-interface)))) )) + (AccidentalPlacement + . ( + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + (left-padding . 0.3) + + ;; 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 . ( @@ -35,7 +60,7 @@ (X-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . -1) (staff-position . 0.0) - (meta . ,(grob-description arpeggio-interface side-position-interface font-interface)) + (meta . ((interfaces . (arpeggio-interface staff-symbol-referencer-interface side-position-interface item-interface font-interface)))) )) (BarLine @@ -45,14 +70,14 @@ (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 . ( (time-signature . (extra-space . 0.75)) (custos . (minimum-space . 2.0)) (clef . (minimum-space . 1.0)) - (begin-of-note . (extra-space . 1.3)) + (first-note . (extra-space . 1.3)) )) ;; @@ -62,7 +87,7 @@ (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (meta . ,(grob-description bar-line-interface font-interface)) + (meta . ((interfaces . (bar-line-interface item-interface break-aligned-interface font-interface)))) )) @@ -70,101 +95,118 @@ . ( (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) (font-relative-size . -1) (Y-offset-callbacks . (,Side_position_interface::aligned_side)) - (meta . ,(grob-description - side-position-interface - text-interface font-interface break-aligned-interface)) - )) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (self-alignment-X . 1) + (extra-offset . (1.3 . 0)) + (meta . + ((interfaces . (side-position-interface + text-interface + self-alignment-interface + font-interface item-interface break-aligned-interface)))) + + )) (BassFigure . ( (molecule-callback . ,brew-bass-figure) - (Y-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (direction . 0) (font-family . number) (font-relative-size . -1) (padding . 0.1) (kern . 0.2) (thickness . 1.0) - (meta . ,(grob-description text-interface font-interface )) + (meta . ((interfaces . (text-interface bass-figure-interface item-interface self-alignment-interface font-interface)))) )) (Beam . ( ;; todo: clean this up a bit: the list is getting ;; rather long. (molecule-callback . ,Beam::brew_molecule) + (concaveness-gap . 2.0) (concaveness-threshold . 0.08) (positions . (#f . #f)) (position-callbacks . (,Beam::least_squares ,Beam::check_concave ,Beam::slope_damping - ,Beam::new_quanting - )) - + ,Beam::shift_region_to_valid + ,Beam::quanting + )) + + ;; TODO: should be in SLT. (thickness . 0.48) ; in staff-space (before-line-breaking-callback . ,Beam::before_line_breaking) - (after-line-breaking-callback . (,Beam::after_line_breaking - ,Beam::end_after_line_breaking)) + (after-line-breaking-callback . ,Beam::after_line_breaking) (neutral-direction . -1) - (dir-function . ,beam-dir-majority) - (left-position-quant-function . ,default-left-beam-pos-quants) - (right-position-quant-function . ,default-right-beam-pos-quants) - (beamed-stem-shorten . (1.0 0.5)) + (dir-function . ,beam-dir-majority-median) + + ;; 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) - (space-function . ,default-beam-space-function) (damping . 1) - (auto-knee-gap . 7) + (auto-knee-gap . 5.5) (font-name . "cmr10") - (quant-score-functions . (,Beam::score_forbidden_quants - ,Beam::score_slopes_dy - ,Beam::score_stem_lengths - )) - (meta . ,(grob-description beam-interface)) + (space-function . ,Beam::space_function) + (meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface)))) )) (BreakAlignment . ( (breakable . #t) (stacking-dir . 1) - (axes 0) - (meta . ,(grob-description - axis-group-interface - ) - ) - )) + (axes . (0)) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + (meta . ((interfaces . (break-alignment-interface item-interface axis-group-interface))))) + ) (BreakAlignGroup . ( (axes . (0)) (X-offset-callbacks . (,Break_align_interface::alignment_callback)) - - (meta . ,(grob-description axis-group-interface)) + (X-extent-callback . ,Axis_group_interface::group_extent_callback) + (meta . ((interfaces . (break-aligned-interface item-interface axis-group-interface item-interface )))) )) (BreathingSign . ( (break-align-symbol . breathing-sign) - (breakable . #t ) + (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)) - (begin-of-note . (minimum-space . 1.0)) + (first-note . (minimum-space . 1.0)) )) (molecule-callback . ,Text_item::brew_molecule) (lookup . name) (font-family . music) (text . "scripts-rcomma") (Y-offset-callbacks . (,Breathing_sign::offset_callback)) - (visibility-lambda . ,begin-of-line-invisible) - (meta . ,(grob-description break-aligned-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 @@ -174,15 +216,17 @@ (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)) - (begin-of-note . (minimum-space . 5.0)) + (first-note . (minimum-space . 5.0)) + (next-note . (extra-space . 0.5)) )) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (meta . ,(grob-description clef-interface font-interface break-aligned-interface )) + (meta . ((interfaces . (clef-interface staff-symbol-referencer-interface font-interface break-aligned-interface item-interface )))) )) (ChordName @@ -191,7 +235,7 @@ (after-line-breaking-callback . ,Chord_name::after_line_breaking) (chord-name-function . ,default-chord-name-function) (font-family . roman) - (meta . ,(grob-description font-interface text-interface chord-name-interface)) + (meta . ((interfaces . (font-interface text-interface chord-name-interface item-interface )))) )) (Custos @@ -199,37 +243,38 @@ (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 . ( - (begin-of-note . (minimum-space . 0.0)) + (first-note . (minimum-space . 0.0)) )) - (meta . ,(grob-description custos-interface staff-symbol-referencer-interface break-aligned-interface) ) + (meta . ((interfaces + . (custos-interface staff-symbol-referencer-interface + font-interface + break-aligned-interface item-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 dot-column-interface axis-group-interface)) + (meta . ((interfaces . (dot-column-interface axis-group-interface item-interface )))) )) (Dots . ( (molecule-callback . ,Dots::brew_molecule) (dot-count . 1) - (staff-position . 0.0) (Y-offset-callbacks . (,Dots::quantised_position_callback ,Staff_symbol_referencer::callback)) - (meta . ,(grob-description font-interface dots-interface )) + (meta . ((interfaces . (font-interface staff-symbol-referencer-interface dots-interface item-interface )))) )) (DoublePercentRepeat . @@ -241,66 +286,71 @@ (width . 2.0) (thickness . 0.48) (break-align-symbol . staff-bar) - (visibility-lambda . ,begin-of-line-invisible) - (meta . ,(grob-description font-interface percent-repeat-interface)) - )) + (break-visibility . ,begin-of-line-invisible) + (meta . ((interfaces . (font-interface + break-aligned-interface + percent-repeat-interface item-interface )))) + )) (DynamicText . ( - (Y-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self + ,Self_alignment_interface::centered_on_parent)) (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 font-interface text-interface dynamic-interface)) + (meta . ((interfaces . (font-interface text-interface self-alignment-interface dynamic-interface script-interface item-interface )))) )) (DynamicLineSpanner . ( - (axes . ( 1)) + (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 . ,(grob-description 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)) - (begin-of-note . (extra-space . 0.0)) + (first-note . (extra-space . 1.0)) (key-signature . (extra-space . 0.0)) )) - (meta . ,(grob-description break-aligned-interface)) + (meta . ((interfaces . (break-aligned-interface item-interface )))) )) (Fingering . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position_interface::centered_on_parent - ,Side_position_interface::aligned_on_self)) + (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 . ,(grob-description finger-interface font-interface - text-script-interface text-interface side-position-interface)) + (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface )))) )) @@ -308,8 +358,8 @@ . ( (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback)) (Y-extent-callback . ,Hara_kiri_group_spanner::y_extent) - (axes 1) - (meta . ,(grob-description axis-group-interface hara-kiri-group-interface)) + (axes . (1)) + (meta . ((interfaces . (axis-group-interface hara-kiri-group-interface item-interface spanner-interface)))) )) (Hairpin @@ -325,14 +375,14 @@ (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-interface dynamic-interface)) + (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface)))) )) (InstrumentName . ( (breakable . #t) - (Y-offset-callbacks . (,Side_position_interface::aligned_on_self + (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self ,Side_position_interface::aligned_on_support_refpoints)) ;; huh? what's this for? (direction . 0) @@ -343,10 +393,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 . ,(grob-description font-interface text-interface break-aligned-interface)) + (meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface item-interface )))) )) (KeySignature @@ -355,14 +405,42 @@ (space-alist . ( (time-signature . (extra-space . 1.25)) (staff-bar . (extra-space . 1.1)) - (begin-of-note . (extra-space . 2.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 . ,(grob-description key-signature-interface font-interface break-aligned-interface)) + (meta . ((interfaces . (key-signature-interface font-interface break-aligned-interface item-interface )))) )) + (Ligature + . ( + (molecule-callback . ,Ligature_bracket::brew_molecule) + (meta . ((interfaces . (ligature-interface)))) + )) + + (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 spanner-interface)))) + )) + + (LigatureHead + . ( + (ligature-primitive-callback . ,Note_head::brew_molecule) + (molecule-callback . ,Ligature_head::brew_molecule) + (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 + font-interface + note-head-interface staff-symbol-referencer-interface)))) + )) (LyricHyphen . ( @@ -372,13 +450,7 @@ (maximum-length . 100) (molecule-callback . ,Hyphen_spanner::brew_molecule) (Y-extent-callback . ,Grob::point_dimension_callback) - (meta . ,(grob-description lyric-hyphen-interface )) - )) - - (LineOfScore - . ( - (axes . (0 1)) - (meta . ,(grob-description line-of-score-interface axis-group-interface)) + (meta . ((interfaces . (lyric-hyphen-interface spanner-interface)))) )) (LyricExtender @@ -387,22 +459,34 @@ (height . 0.8) ; stafflinethickness; (right-trim-amount . 0.5) (Y-extent-callback . ,Grob::point_dimension_callback) - (meta . ,(grob-description lyric-extender-interface)) + (meta . ((interfaces . (lyric-extender-interface spanner-interface)))) )) (LyricText . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent + ,Self_alignment_interface::aligned_on_self)) (self-alignment-X . 0) - (non-rhythmic . #t) (word-space . 0.6) (ignore-length-mismatch . #f) (begin-alignment . 4) (end-alignment . 2) (font-family . roman) (font-shape . upright) - (meta . ,(grob-description lyric-syllable-interface text-interface font-interface )) + + ;; duh, side-position-interface? + (meta . ((interfaces . (lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface )))) + )) + + (MensuralLigature + . ( + (thickness . 1.4) + (flexa-width . 2.0) + (ligature-primitive-callback . ,Mensural_ligature::brew_ligature_primitive) + (molecule-callback . ,Mensural_ligature::brew_molecule) + (font-family . ancient) + (meta . ((interfaces . (mensural-ligature-interface font-interface)))) )) (Porrectus @@ -410,28 +494,28 @@ (style . mensural) (auto-properties . #f) (solid . #f) - (porrectus-width . 2.4) - (line-thickness . 1.0) + (width . 2.4) + (thickness . 1.0) (add-stem . #t) - (stem-direction . 1) + (direction . 1) (molecule-callback . ,Porrectus::brew_molecule) - (meta . ,(grob-description porrectus-interface)) + (meta . ((interfaces . (porrectus-interface)))) )) (RehearsalMark . ( (molecule-callback . ,Text_item::brew_molecule) - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (self-alignment-X . 0) (direction . 1) (breakable . #t) (font-family . roman) - (font-shape . upright) - (font-relative-size . 1) - (visibility-lambda . ,end-of-line-invisible) + (baseline-skip . 2) + (break-visibility . ,end-of-line-invisible) (padding . 0.8) - (meta . ,(grob-description mark-interface side-position-interface)) + (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface item-interface )))) )) (MultiMeasureRest @@ -441,27 +525,30 @@ (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (staff-position . 0) (expand-limit . 10) - (padding . 2.0) ; staffspace - (minimum-width . 12.5) ; staffspace + (number-threshold . 1) + (padding . 1) + (thickness . 6.6) (font-family . number) - (font-relative-size . 1) - (meta . ,(grob-description multi-measure-rest-interface rest-interface font-interface )) + (padding . 1) + (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface spanner-interface)))) )) (NoteCollision . ( - (axes 0 1) + (axes . (0 1)) ;; Ugh, should not be hard-coded. (note-width . 1.321) - (meta . ,(grob-description - note-collision-interface axis-group-interface - )) + (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 item-interface )))) )) (NoteColumn . ( (axes . (0 1)) - (meta . ,(grob-description axis-group-interface note-column-interface)) + (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 item-interface )))) )) (NoteHead @@ -470,7 +557,7 @@ (molecule-callback . ,Note_head::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (stem-attachment-function . ,note-head-style->attachment-coordinates) - (meta . ,(grob-description rhythmic-head-interface font-interface note-head-interface)) + (meta . ((interfaces . (rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface )))) )) (Glissando @@ -481,7 +568,7 @@ (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ,(grob-description line-spanner-interface)) + (meta . ((interfaces . (line-spanner-interface spanner-interface)))) )) (VoiceFollower @@ -492,34 +579,39 @@ (X-extent-callback . #f) (Y-extent-callback . #f) (molecule-callback . ,Line_spanner::brew_molecule) - (meta . ,(grob-description line-spanner-interface)) + (meta . ((interfaces . (line-spanner-interface spanner-interface)))) )) (NoteName . ( (molecule-callback . ,Text_item::brew_molecule) (font-family . roman) - (meta . ,(grob-description note-name-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) - (X-offset-callbacks . (,Side_position_interface::centered_on_parent ,Side_position_interface::aligned_on_self)) + (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 . ,(grob-description text-interface font-interface )) + (meta . ((interfaces . (text-interface self-alignment-interface side-position-interface font-interface item-interface )))) )) (PaperColumn . ( - (axes 0) - ; (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8") - (meta . ,(grob-description paper-column-interface axis-group-interface spaceable-element-interface)) + (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 item-interface )))) )) (PhrasingSlur @@ -531,26 +623,32 @@ (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)) + (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 . ,(grob-description 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) - ; (molecule-callback . ,Paper_column::brew_molecule) (font-name . "cmr8") - (meta . ,(grob-description paper-column-interface - axis-group-interface spaceable-element-interface)) + (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 item-interface )))) )) (PercentRepeat @@ -561,7 +659,7 @@ (thickness . 0.48) (minimum-width . 12.5) ; staffspace (font-family . music) - (meta . ,(grob-description 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 @@ -572,10 +670,12 @@ (if-text-padding . 1.0) (width-correct . 0) (outer . #t) - (angle-left . #f) - (angle-right . #f) - (text-start . #f) - (meta . ,(grob-description text-spanner-interface piano-pedal-interface font-interface)) + (direction . -1) + (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 spanner-interface)))) )) (RepeatSlash @@ -583,7 +683,7 @@ (molecule-callback . , Percent_repeat_item_interface::beat_slash) (thickness . 0.48) (slope . 1.7) - (meta . ,(grob-description percent-repeat-interface)) + (meta . ((interfaces . (percent-repeat-interface item-interface )))) )) (Rest . ( @@ -593,33 +693,38 @@ (molecule-callback . ,Rest::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (minimum-beam-collision-distance . 1.5) - (meta . ,(grob-description - rhythmic-head-interface - staff-symbol-referencer-interface - rest-interface)) - )) + (meta . ( + (interfaces . (font-interface + rhythmic-head-interface + staff-symbol-referencer-interface + rest-interface item-interface )) + )))) (RestCollision . ( (minimum-distance . 0.75) - (meta . ,(grob-description rest-collision-interface )) + (meta . ((interfaces . (rest-collision-interface item-interface )))) )) (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) + (molecule-callback . ,Script_interface::brew_molecule) + + ;; This value is sensitive: if too large, staccato dots will move a + ;; space a away. + (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 . ,(grob-description 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 . ,(grob-description script-column-interface)) + (meta . ((interfaces . (script-column-interface item-interface )))) )) (Slur @@ -631,33 +736,30 @@ (after-line-breaking-callback . ,Slur::after_line_breaking) (extremity-rules . ,default-slur-extremity-rules) (extremity-offset-alist . ,default-slur-extremity-offset-alist) - (de-uglify-parameters . ( 1.5 0.8 -2.0)) + (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 . ,(grob-description 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 . ( (spacing-procedure . ,Spacing_spanner::set_springs) - (grace-space-factor . 0.8) - + (grace-space-factor . 0.6) (shortest-duration-space . 2.0) (spacing-increment . 1.2) - - (X-extent-callback . #f) - (Y-extent-callback . #f) - - - (meta . ,(grob-description spacing-spanner-interface)) + (base-shortest-duration . ,(make-moment 1 8)) + (meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface)))) )) (SpanBar @@ -665,8 +767,9 @@ (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) (glyph . "|") (before-line-breaking-callback . ,Span_bar::before_line_breaking) @@ -679,7 +782,8 @@ (thin-kern . 3.0) (hair-thickness . 1.6) (thick-thickness . 6.0) - (meta . ,(grob-description span-bar-interface bar-line-interface )) + (meta . ((interfaces . (span-bar-interface font-interface + bar-line-interface item-interface )))) )) (StanzaNumber @@ -687,83 +791,117 @@ (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 . ,(grob-description break-aligned-interface text-interface font-interface)) + (meta . ((interfaces . (break-aligned-interface text-interface font-interface item-interface )))) )) (StaffSpacing . ( (breakable . #t) - (X-extent-callback . #f) (stem-spacing-correction . 0.4) - (Y-extent-callback . #f) - (meta . ,(grob-description staff-spacing-interface)) + (knee-spacing-correction . 0.75) + (meta . ((interfaces . (spacing-interface staff-spacing-interface item-interface )))) )) (NoteSpacing . ( - (X-extent-callback . #f) - (Y-extent-callback . #f) (stem-spacing-correction . 0.5) - (space-factor . 1.0) - (meta . ,(grob-description note-spacing-interface)) + (knee-spacing-correction . 0.75) + (meta . ((interfaces . (spacing-interface note-spacing-interface item-interface )))) )) (StaffSymbol . ( (molecule-callback . ,Staff_symbol::brew_molecule) - (staff-space . 1.0) (line-count . 5) (layer . 0) - (meta . ,(grob-description staff-symbol-interface )) + (meta . ((interfaces . (staff-symbol-interface spanner-interface)))) )) (SostenutoPedal . ( (molecule-callback . ,Text_item::brew_molecule) (direction . 1) - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) - (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (no-spacing-rods . #t) (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner (pedal-type . mixed) (font-family . roman) (font-shape . italic) (self-alignment-X . 0) - (meta . ,(grob-description text-interface font-interface)) + (meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface)))) )) (SostenutoPedalLineSpanner . ( - (axes . ( 1)) + (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 . ,(grob-description piano-pedal-interface axis-group-interface side-position-interface)) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) (Stem . ( (before-line-breaking-callback . ,Stem::before_line_breaking) (molecule-callback . ,Stem::brew_molecule) - (thickness . 0.8) - (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. + (thickness . 1.3) + ;; 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) + (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) (adjust-if-on-staffline . #t) (font-family . music) - (meta . ,(grob-description stem-interface font-interface)) + (avoid-note-head . #f) + (up-to-staff . #f) + (meta . ((interfaces . (stem-interface font-interface item-interface )))) )) (StemTremolo @@ -772,21 +910,20 @@ (Y-extent-callback . ,Stem_tremolo::height) (X-extent-callback . #f) - (beam-width . 2.0) ; staff-space - (beam-thickness . 0.42) ; staff-space - (beam-space-function . ,default-beam-space-function) - (meta . ,(grob-description stem-tremolo-interface )) + (beam-width . 1.6) ; staff-space + (beam-thickness . 0.48) ; staff-space + (meta . ((interfaces . (stem-tremolo-interface item-interface )))) )) (SeparationItem . ( - (meta . ,(grob-description separation-item-interface )) + (meta . ((interfaces . (spacing-interface separation-item-interface item-interface )))) )) (SeparatingGroupSpanner . ( (spacing-procedure . ,Separating_group_spanner::set_spacing_rods) - (meta . ,(grob-description separation-spanner-interface)) + (meta . ((interfaces . (spacing-interface separation-spanner-interface spanner-interface)))) )) (SustainPedal @@ -797,18 +934,28 @@ (direction . 1) (padding . 0.0) ;; padding relative to SustainPedalLineSpanner (pedal-type . text) - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) - (Y-offset-callbacks . (,Side_position_interface::aligned_side )) - (meta . ,(grob-description piano-pedal-interface side-position-interface font-interface)) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (meta . ((interfaces . (piano-pedal-interface text-spanner-interface text-interface self-alignment-interface font-interface item-interface)))) )) (SustainPedalLineSpanner . ( - (axes . ( 1)) + (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 . ,(grob-description piano-pedal-interface axis-group-interface side-position-interface)) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) + )) + + (System + . ( + (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 spanner-interface)))) )) (SystemStartBrace @@ -818,7 +965,7 @@ (collapse-height . 5.0) (font-family . braces) (Y-extent-callback . #f) - (meta . ,(grob-description system-start-delimiter-interface font-interface)) + (meta . ((interfaces . (system-start-delimiter-interface font-interface)))) )) (SystemStartBracket @@ -832,7 +979,7 @@ (arch-width . 1.5) (bracket-collapse-height . 1) (thickness . 0.25) - (meta . ,(grob-description system-start-delimiter-interface )) + (meta . ((interfaces . (system-start-delimiter-interface spanner-interface)))) )) (SystemStartBar @@ -842,19 +989,21 @@ (glyph . "bar-line") (thickness . 1.6) (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking) - (meta . ,(grob-description 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 . ,(grob-description 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 @@ -868,9 +1017,25 @@ (width-correct . -1) (direction . 1) - (meta . ,(grob-description 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) @@ -878,44 +1043,51 @@ (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 . ,(grob-description tie-interface )) + (meta . ((interfaces . (tie-interface spanner-interface)))) )) (TieColumn . ( (after-line-breaking-callback . ,Tie_column::after_line_breaking) - (meta . ,(grob-description tie-column-interface )) + (X-extent-callback . ()) + (Yoo-extent-callback . ()) + (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 . ( - (begin-of-note . (extra-space . 2.0)) + (first-note . (extra-space . 2.0)) (staff-bar . (minimum-space . 2.0)) )) (breakable . #t) (style . C) (font-family . number) - (meta . ,(grob-description time-signature-interface font-interface)) + (meta . ((interfaces . (time-signature-interface break-aligned-interface font-interface item-interface )))) )) (TupletBracket . ( - (number-gap . 2.0) - (thick . 1.0) + (gap . 2.0) + (padding . 0.9) + (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) (font-family . roman) (font-shape . italic) + (font-relative-size . -1) - (meta . ,(grob-description text-interface - tuplet-bracket-interface font-interface)) + (meta . ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface)))) )) (UnaCordaPedal @@ -928,23 +1100,25 @@ (direction . 1) (pedal-type . text) (padding . 0.0) ;; padding relative to UnaCordaPedalLineSpanner - (X-offset-callbacks . (,Side_position_interface::aligned_on_self)) - (Y-offset-callbacks . (,Side_position_interface::aligned_side )) - (meta . ,(grob-description text-interface font-interface)) + (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) + (meta . ((interfaces . (text-interface self-alignment-interface font-interface item-interface )))) )) (UnaCordaPedalLineSpanner . ( - (axes . ( 1)) + (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 . ,(grob-description piano-pedal-interface axis-group-interface side-position-interface)) + (meta . ((interfaces . (piano-pedal-interface axis-group-interface side-position-interface spanner-interface)))) )) (VoltaBracket . ( - (molecule-callback . ,Volta_spanner::brew_molecule) + (molecule-callback . ,Volta_bracket_interface::brew_molecule) (direction . 1) (padding . 1) (font-style . volta) @@ -954,25 +1128,26 @@ (minimum-space . 5) (font-family . number) (font-relative-size . -2) - (meta . ,(grob-description volta-bracket-interface side-position-interface font-interface)) + (meta . ((interfaces . (volta-bracket-interface text-interface side-position-interface font-interface spanner-interface)))) )) (VerticalAlignment . ( - (axes 1) + (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) - (X-extent-callback . #f) (stacking-dir . -1) - (meta . ,(grob-description align-interface axis-group-interface)) + (meta . ((interfaces . (align-interface axis-group-interface spanner-interface)))) )) (VerticalAxisGroup . ( - (axes 1) - (meta . ,(grob-description axis-group-interface)) + (axes . (1)) + (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + + (meta . ((interfaces . (axis-group-interface spanner-interface)))) )) - ) - ) + ) + ) @@ -981,13 +1156,17 @@ "transplant assoc key into 'name entry of 'meta of X " (let* ((name-sym (car x)) - (entry (cdr x)) - (metaentry (cdr (assoc 'meta entry))) - (new-metaentry (assoc-set! metaentry 'name name-sym)) - ) - - (cons name-sym (assoc-set! entry 'meta new-metaentry)) - )) + (grob-entry (cdr x)) + (metaentry (cdr (assoc 'meta grob-entry))) + (ifaces-entry + (cdr (assoc 'interfaces metaentry))) + + ) + (set! metaentry (assoc-set! metaentry 'name name-sym)) + (set! metaentry (assoc-set! metaentry 'interfaces + (cons 'grob-interface ifaces-entry))) + (set! grob-entry (assoc-set! grob-entry 'meta metaentry)) + (cons name-sym grob-entry))) (set! all-grob-descriptions (map completize-grob-entry all-grob-descriptions)) @@ -1001,6 +1180,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