X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=6a871d11cd55075aac9a5b51599f6a7d7de43647;hb=4248f11e51e95dcf14ff67cda43be64c0ea53871;hp=49baf4aa65e6a261a1aacf3461e044ed8c933e77;hpb=67dbe3a34d82077c4baf4b6f1e02823b7c712fca;p=lilypond.git diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 49baf4aa65..6a871d11cd 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2005 Han-Wen Nienhuys +;;;; (c) 1998--2006 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ;;;; distances are given in linethickness (thicknesses) and @@ -103,7 +103,7 @@ (font-family . music) (padding . 0.5) (X-offset . ,Side_position_interface::x_aligned_side) - (direction . -1) + (direction . ,LEFT) (cautionary-style . parentheses) (stencil . ,Accidental_interface::print) @@ -134,14 +134,11 @@ ledgered-interface)))))) (Arpeggio - . ( - - (X-extent . ,Arpeggio::width) + . ((X-extent . ,Arpeggio::width) (stencil . ,Arpeggio::print) - (Y-offset . ,Staff_symbol_referencer::callback) (X-offset . ,Side_position_interface::x_aligned_side) - (direction . -1) + (direction . ,LEFT) (padding . 0.5) (side-axis . ,X) (staff-position . 0.0) @@ -193,7 +190,7 @@ (breakable . #t) (break-visibility . ,begin-of-line-visible) (padding . 1.0) - (direction . 1) + (direction . ,UP) (font-family . roman) (font-size . -2) (Y-offset . ,Side_position_interface::y_aligned_side) @@ -211,26 +208,6 @@ )) (BassFigure - . ( - - (stencil . ,Text_interface::print) - - (Y-offset . ,Self_alignment_interface::y_aligned_on_self) - (direction . 1) - (font-family . number) - - ;; We must do this, other BFs in - ;; layout16 become too small. - (font-size . -4) - (kern . 0.2) - (meta . ((class . Item) - (interfaces . (text-interface - rhythmic-grob-interface - bass-figure-interface - self-alignment-interface - font-interface)))))) - - (NewBassFigure . ( ; (stencil . ,Text_interface::print) @@ -300,11 +277,13 @@ (quantized-positions . ,Beam::set_stem_lengths) (concaveness . ,Beam::calc_concaveness) (direction . ,Beam::calc_direction) + (shorten . ,Beam::calc_stem_shorten) + (beaming . ,Beam::calc_beaming) (stencil . ,Beam::print) ;; TODO: should be in SLT. (thickness . 0.48) ; in staff-space - (neutral-direction . -1) + (neutral-direction . ,DOWN) ;; Whe have some unreferenced problems here. ;; @@ -483,7 +462,7 @@ (no-spacing-rods . #t) (Y-offset . ,Side_position_interface::y_aligned_side) (X-offset . ,Self_alignment_interface::x_aligned_on_self) - (direction . 1) + (direction . ,UP) (padding . 0.5) (staff-padding . 0.5) (script-priority . 200) @@ -506,7 +485,7 @@ (break-visibility . ,end-of-line-visible) (style . vaticana) - (neutral-direction . -1) + (neutral-direction . ,DOWN) (Y-offset . ,Staff_symbol_referencer::callback) (space-alist . ( (first-note . (minimum-fixed-space . 0.0)) @@ -567,7 +546,7 @@ (font-encoding . fetaNumber) (self-alignment-X . 0) (font-size . -2) - (direction . 1) + (direction . ,UP) (padding . 0.2) (staff-padding . 0.25) (side-axis . ,Y) @@ -586,7 +565,7 @@ (avoid-slur . outside) (slur-padding . 0.3) (minimum-space . 1.2) - (direction . -1) + (direction . ,DOWN) (side-axis . ,Y) (Y-extent . ,Axis_group_interface::height) @@ -614,6 +593,7 @@ (font-series . bold) (font-encoding . fetaDynamic) (font-shape . italic) + (avoid-slur . around) (no-spacing-rods . #t) (script-priority . 100) (meta . ((class . Item) @@ -738,7 +718,7 @@ (Y-offset . ,Side_position_interface::y_aligned_side) (padding . 0.2) (staff-padding . 0.2) - (direction . -1) + (direction . ,DOWN) (side-axis . ,Y) (bracket-flare . (0.5 . 0.5)) (meta . ((class . Spanner) @@ -754,7 +734,7 @@ ;; This direction is for aligned_on_support_refpoints ;; (?) --hwn - (direction . 0) + (direction . ,CENTER) (space-alist . ( (left-edge . (extra-space . 1.0)))) @@ -829,9 +809,7 @@ . ( (X-extent . #f) (Y-extent . #f) - (positioning-done . ,Laissez_vibrer_tie_column::calc_positioning_done) - (meta . ((class . Item) (interfaces . (laissez-vibrer-tie-column-interface)) )) @@ -878,16 +856,14 @@ ;; ugh. A ligature bracket is totally different from ;; a tuplet bracket. - (direction . ,Tuplet_bracket::calc_direction) - (positions . ,Tuplet_bracket::calc_positions) - (stencil . ,Tuplet_bracket::print) - - (direction . 1) - (gap . 0.0) (padding . 2.0) (thickness . 1.6) (edge-height . (0.7 . 0.7)) (shorten-pair . (-0.2 . -0.2)) + (direction . ,UP) + (positions . ,Tuplet_bracket::calc_positions) + (stencil . ,Tuplet_bracket::print) + (meta . ((class . Spanner) (interfaces . (tuplet-bracket-interface line-interface)))))) @@ -899,14 +875,16 @@ (dash-period . 10.0) (length . 0.66) (minimum-length . 0.3) + (minimum-distance . 0.1) (padding . 0.07) - ; (springs-and-rods . ,Hyphen_spanner::set_spacing_rods) - + (springs-and-rods . ,Hyphen_spanner::set_spacing_rods) + (stencil . ,Hyphen_spanner::print) (Y-extent . (0 . 0)) (meta . ((class . Spanner) (interfaces . (lyric-interface + font-interface lyric-hyphen-interface spanner-interface)))))) @@ -922,6 +900,17 @@ (interfaces . (lyric-interface lyric-extender-interface)))))) + (LyricSpace + . ((minimum-distance . 0.3) + (springs-and-rods . ,Hyphen_spanner::set_spacing_rods) + (padding . 0.0) + (Y-extent . #f) + (X-extent . #f) + (meta . ((class . Spanner) + (interfaces . (spanner-interface + lyric-hyphen-interface spacing-interface)) + )) + )) (LyricText . ( @@ -939,6 +928,28 @@ text-interface font-interface)))))) + + (MeasureGrouping + . ( + (Y-offset . ,Side_position_interface::y_aligned_side) + (side-axis . ,Y) + + (stencil . ,Measure_grouping::print) + + (padding . 2) + (direction . ,UP) + (thickness . 1) + (height . 2.0) + (staff-padding . 3) + (meta . ((class . Spanner) + (interfaces . (side-position-interface + measure-grouping-interface)))))) + + (MelodyItem + . ( + (neutral-direction . ,DOWN) + (meta . ((class . Item) + (interfaces . (melody-spanner-interface spacing-interface)))))) (MensuralLigature . ( (thickness . 1.4) @@ -955,7 +966,7 @@ (stencil . ,Text_interface::print) (Y-offset . ,Side_position_interface::y_aligned_side) - (direction . 1) + (direction . ,UP) (padding . 0.8) (side-axis . ,Y) (meta . ((class . Item) @@ -964,27 +975,11 @@ font-interface metronome-mark-interface)))))) - (MeasureGrouping - . ( - (Y-offset . ,Side_position_interface::y_aligned_side) - (side-axis . ,Y) - - (stencil . ,Measure_grouping::print) - - (padding . 2) - (direction . 1) - (thickness . 1) - (height . 2.0) - (staff-padding . 3) - (meta . ((class . Spanner) - (interfaces . (side-position-interface - measure-grouping-interface)))))) (MultiMeasureRest . ( - (stencil . ,Multi_measure_rest::print) - + (springs-and-rods . ,Multi_measure_rest::set_spacing_rods) (Y-offset . ,Staff_symbol_referencer::callback) (staff-position . 0) (expand-limit . 10) @@ -1010,7 +1005,7 @@ (side-axis . ,Y) (self-alignment-X . 0) - (direction . 1) + (direction . ,UP) (padding . 0.4) (staff-padding . 0.4) (font-encoding . fetaNumber) @@ -1031,7 +1026,7 @@ (Y-offset . ,Side_position_interface::y_aligned_side) (self-alignment-X . 0) - (direction . 1) + (direction . ,UP) (padding . 0.2) (staff-padding . 0.25) (meta . ((class . Spanner) @@ -1139,7 +1134,7 @@ (minimum-length . 1.0) (dash-fraction . 0.3) (edge-height . (0 . 1.2)) - (direction . 1) + (direction . ,UP) (meta . ((class . Spanner) (interfaces . (ottava-bracket-interface horizontal-bracket-interface @@ -1165,7 +1160,7 @@ spaceable-grob-interface)))))) (PhrasingSlur - . ((slur-details . ,default-slur-details) + . ((details . ,default-slur-details) (control-points . ,Slur::calc_control_points) (direction . ,Slur::calc_direction) @@ -1220,7 +1215,7 @@ ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self))))) (Y-offset . ,Side_position_interface::y_aligned_side) (self-alignment-X . 0) - (direction . 1) + (direction . ,UP) (padding . 0.2) (staff-padding . 0.25) (font-size . -2) @@ -1240,7 +1235,7 @@ (style . line) (bound-padding . 1.0) - (direction . -1) + (direction . ,DOWN) (bracket-flare . (0.5 . 0.5)) (edge-height . (1.0 . 1.0)) (shorten-pair . (0.0 . 0.0)) @@ -1252,16 +1247,16 @@ (RehearsalMark . ( - (stencil . ,Text_interface::print) - - (X-offset . ,Self_alignment_interface::x_aligned_on_self) + (X-offset . ,(ly:make-simple-closure + `(,+ ,(ly:make-simple-closure + `(,Self_alignment_interface::x_aligned_on_self)) + ,(ly:make-simple-closure + `(,Self_alignment_interface::centered_on_x_parent))) + )) (Y-offset . ,Side_position_interface::y_aligned_side) - - (after-line-breaking . ,shift-right-at-line-begin) - (self-alignment-X . 0) - (direction . 1) + (direction . ,UP) (breakable . #t) (font-size . 2) (baseline-skip . 2) @@ -1277,16 +1272,13 @@ (RepeatSlash . ( - (stencil . ,Percent_repeat_item_interface::beat_slash) - (thickness . 0.48) (slope . 1.7) (meta . ((class . Item) (interfaces . (percent-repeat-interface)))))) (Rest . ( - (stencil . ,Rest::print) (X-extent . ,Rest::width) (Y-extent . ,Rest::height) @@ -1355,7 +1347,7 @@ separation-spanner-interface)))))) (Slur - . ((slur-details . ,default-slur-details) + . ((details . ,default-slur-details) (control-points . ,Slur::calc_control_points) (direction . ,Slur::calc_direction) @@ -1460,7 +1452,7 @@ (stencil . ,Text_interface::print) - (direction . 1) + (direction . ,RIGHT) (X-offset . ,Self_alignment_interface::x_aligned_on_self) (no-spacing-rods . #t) (padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner @@ -1482,7 +1474,7 @@ (padding . 1.2) (minimum-space . 1.0) - (direction . -1) + (direction . ,DOWN) (meta . ((class . Spanner) (interfaces . (piano-pedal-interface axis-group-interface @@ -1490,9 +1482,8 @@ (StaffSymbol . ( - + (Y-extent . ,Staff_symbol::height) (stencil . ,Staff_symbol::print) - (line-count . 5) (ledger-line-thickness . (1.0 . 0.1)) (layer . 0) @@ -1502,6 +1493,7 @@ (Stem . ( (direction . ,Stem::calc_direction) + (default-direction . ,Stem::calc_default_direction) (stem-end-position . ,Stem::calc_stem_end_position) (stem-info . ,Stem::calc_stem_info) (positioning-done . ,Stem::calc_positioning_done) @@ -1542,7 +1534,7 @@ ;; default stem direction for note on middle line - (neutral-direction . -1) + (neutral-direction . ,DOWN) ;; We use the normal minima as minimum for the ideal lengths, ;; and the extreme minima as abolute minimum length. @@ -1568,7 +1560,7 @@ (no-spacing-rods . #t) (stencil . ,Sustain_pedal::print) (self-alignment-X . 0) - (direction . 1) + (direction . ,RIGHT) (padding . 0.0) ;; padding relative to SustainPedalLineSpanner (X-offset . ,Self_alignment_interface::x_aligned_on_self) (meta . ((class . Item) @@ -1587,7 +1579,7 @@ (padding . 1.2) (staff-padding . 1.2) (minimum-space . 1.0) - (direction . -1) + (direction . ,DOWN) (meta . ((class . Spanner) (interfaces . (piano-pedal-interface axis-group-interface @@ -1604,35 +1596,59 @@ (SystemStartBrace . ( - (glyph . "brace") + (style . brace) + (padding . 0.3) (stencil . ,System_start_delimiter::print) (collapse-height . 5.0) + (X-offset . ,Side_position_interface::x_aligned_side) + (direction . ,LEFT) (font-encoding . fetaBraces) (Y-extent . #f) (meta . ((class . Spanner) (interfaces . (system-start-delimiter-interface + side-position-interface font-interface)))))) + (SystemStartSquare + . ( + (Y-extent . #f) + (X-offset . ,Side_position_interface::x_aligned_side) + (direction . ,LEFT) + (stencil . ,System_start_delimiter::print) + (style . line-bracket) + (thickness . 1.0) + (meta . ((class . Spanner) + (interfaces . (font-interface + side-position-interface + system-start-delimiter-interface)))))) (SystemStartBracket . ( (Y-extent . #f) - (X-offset . -0.8) + (padding . 0.8) + (X-offset . ,Side_position_interface::x_aligned_side) + (direction . ,LEFT) (stencil . ,System_start_delimiter::print) - (glyph . "bracket") + (style . bracket) (collapse-height . 5.0) (thickness . 0.45) (meta . ((class . Spanner) (interfaces . (font-interface + side-position-interface system-start-delimiter-interface)))))) (SystemStartBar . ( (Y-extent . #f) - (glyph . "bar-line") + (padding . 0.0) + (X-offset . ,Side_position_interface::x_aligned_side) + (direction . ,LEFT) + (style . bar-line) (thickness . 1.6) (stencil . ,System_start_delimiter::print) (meta . ((class . Spanner) - (interfaces . (system-start-delimiter-interface)))))) + (interfaces . (side-position-interface + system-start-delimiter-interface)))))) + (TabNoteHead . ( @@ -1654,7 +1670,7 @@ . ( (no-spacing-rods . #t) (X-offset . ,Self_alignment_interface::x_aligned_on_self) - (direction . -1) + (direction . ,DOWN) ;; sync with Fingering ? (padding . 0.5) @@ -1676,13 +1692,14 @@ (TextSpanner . ( (stencil . ,Text_spanner::print) + (Y-offset . ,Side_position_interface::y_aligned_side) (font-shape . italic) (style . dashed-line) (staff-padding . 0.8) (dash-fraction . 0.2) (dash-period . 3.0) (side-axis . ,Y) - (direction . 1) + (direction . ,UP) (meta . ((class . Spanner) (interfaces . (text-spanner-interface side-position-interface @@ -1691,10 +1708,23 @@ (Tie . ( (control-points . ,Tie::calc_control_points) + (avoid-slur . inside) (direction . ,Tie::calc_direction) (stencil . ,Tie::print) - (details . ((ratio . 0.333) + (details . ( + ;; for a full list, see tie-helper.cc + (ratio . 0.333) + (center-staff-line-clearance . 0.6) + (tip-staff-line-clearance . 0.45) + (note-head-gap . 0.2) + (stem-gap . 0.35) (height-limit . 1.0) + (horizontal-distance-penalty-factor . 10) + (tie-tie-collision-distance . 0.45) + (tie-tie-collision-penalty . 25.0) + (intra-space-threshold . 1.25) + (outer-tie-vertical-distance-symmetry-penalty-factor . 10) + (outer-tie-length-symmetry-penalty-factor . 10) (between-length-limit . 1.0))) (thickness . 1.0) (meta . ((class . Spanner) @@ -1734,7 +1764,7 @@ (style . trill) (staff-padding . 1.0) (padding . 0.5) - (direction . 1) + (direction . ,UP) (Y-offset . ,Side_position_interface::y_aligned_side) (side-axis . ,Y) (meta . ((class . Spanner) @@ -1791,24 +1821,35 @@ (thickness . 1.6) (edge-height . (0.7 . 0.7)) (shorten-pair . (-0.2 . -0.2)) + (staff-padding . 0.25) + (direction . ,Tuplet_bracket::calc_direction) (positions . ,Tuplet_bracket::calc_positions) + (connect-to-neighbor . ,Tuplet_bracket::calc_connect_to_neighbors) + (control-points . ,Tuplet_bracket::calc_control_points) (stencil . ,Tuplet_bracket::print) + + (meta . ((class . Spanner) + (interfaces . (line-interface + tuplet-bracket-interface)))))) + + (TupletNumber + . ( + (stencil . ,Tuplet_number::print) (font-shape . italic) (font-size . -2) + (avoid-slur . inside) (meta . ((class . Spanner) - (interfaces . (text-interface - line-interface - tuplet-bracket-interface + (interfaces . (text-interface tuplet-number-interface font-interface)))))) - + (UnaCordaPedal . ( (stencil . ,Text_interface::print) (font-shape . italic) (no-spacing-rods . #t) (self-alignment-X . 0) - (direction . 1) + (direction . ,RIGHT) (padding . 0.0) ;; padding relative to UnaCordaPedalLineSpanner (X-offset . ,Self_alignment_interface::x_aligned_on_self) (meta . ((class . Item) @@ -1825,7 +1866,7 @@ (padding . 1.2) (staff-padding . 1.2) (minimum-space . 1.0) - (direction . -1) + (direction . ,DOWN) (meta . ((class . Spanner) (interfaces . (piano-pedal-interface axis-group-interface @@ -1866,7 +1907,7 @@ . ( (breakable . #t) (Y-offset . ,Side_position_interface::y_aligned_on_support_refpoints) - (direction . 0) + (direction . ,CENTER) (space-alist . ((left-edge . (extra-space . 1.0)))) (break-align-symbol . instrument-name) (stencil . ,Text_interface::print)