(key-signature . (extra-space . 0.0))
(staff-bar . (extra-space . 0.0))
(time-signature . (extra-space . 0.0))
- (first-note . (extra-space . 0.0))
+ (first-note . (fixed-space . 0.0))
))
(meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface item-interface font-interface))))
))
(custos . (minimum-space . 2.0))
(clef . (minimum-space . 1.0))
(key-signature . (extra-space . 1.0))
- (first-note . (extra-space . 1.3))
+ (first-note . (fixed-space . 1.3))
+ (next-note . (semi-fixed-space . 1.3))
(right-edge . (extra-space . 0.0))
))
(auto-knee-gap . 5.5)
;; only for debugging.
-; (font-name . "cmr10")
+ (font-family . roman)
(space-function . ,Beam::space_function)
(meta . ((interfaces . (staff-symbol-referencer-interface beam-interface spanner-interface))))
(key-signature . (minimum-space . 1.5))
(staff-bar . (minimum-space . 1.5))
(clef . (minimum-space . 2.0))
- (first-note . (minimum-space . 1.0))
+ (first-note . (fixed-space . 1.0)) ;huh?
(right-edge . (extra-space . 0.1))
))
(molecule-callback . ,Text_item::brew_molecule)
(staff-bar . (extra-space . 0.7))
(key-signature . (minimum-space . 4.0))
(time-signature . (minimum-space . 4.2))
- (first-note . (minimum-space . 5.0))
+ (first-note . (minimum-fixed-space . 5.0))
(next-note . (extra-space . 0.5))
(right-edge . (extra-space . 0.5))
))
(adjust-if-on-staffline . #t)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
(space-alist . (
- (first-note . (minimum-space . 0.0))
+ (first-note . (minimum-fixed-space . 0.0))
(right-edge . (extra-space . 0.1))
))
(meta . ((interfaces
(DotColumn
. (
(axes . (0))
- (direction . 1)
+ (direction . ,RIGHT)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-offset-callbacks . (,Dot_column::side_position))
(meta . ((interfaces . (dot-column-interface axis-group-interface item-interface ))))
. (
(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 item-interface ))))
))
(staff-bar . (extra-space . 0.0))
(breathing-sign . (minimum-space . 0.0))
(clef . (extra-space . 0.85))
- (first-note . (extra-space . 1.0))
+ (first-note . (fixed-space . 1.0))
(right-edge . (extra-space . 0.0))
(key-signature . (extra-space . 0.0))
))
(minimum-length . 2.0)
(if-text-padding . 1.0)
(width-correct . -1.0)
-
- (dash-thickness . 1.2)
(dash-length . 4.0)
(self-alignment-Y . 0)
(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
- (meta . ((interfaces . (hairpin-interface self-alignment-interface dynamic-interface spanner-interface))))
+ (meta . ((interfaces . (hairpin-interface line-interface self-alignment-interface dynamic-interface spanner-interface))))
))
(HorizontalBracket
(time-signature . (extra-space . 1.25))
(staff-bar . (extra-space . 1.1))
(right-edge . (extra-space . 0.5))
- (first-note . (extra-space . 2.5))
+ (first-note . (fixed-space . 2.5))
))
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
(break-align-symbol . key-signature)
(LyricHyphen
. (
- (thickness . 1.0)
- (height . 0.4)
+ (thickness . 1.3)
+ (height . 0.42)
+ (dash-period . 10.0)
+ (length . 0.66)
(minimum-length . 0.5)
- (maximum-length . 100)
- (spacing-procedure . ,Hyphen_spanner::set_spacing_rods)
(molecule-callback . ,Hyphen_spanner::brew_molecule)
(Y-extent-callback . ,Grob::point_dimension_callback)
(meta . ((interfaces . (lyric-hyphen-interface spanner-interface))))
. (
(molecule-callback . ,Lyric_extender::brew_molecule)
(thickness . 0.8) ; stafflinethickness;
+ (minimum-length . 1.5)
(Y-extent-callback . ,Grob::point_dimension_callback)
(meta . ((interfaces . (lyric-extender-interface spanner-interface))))
))
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
(self-alignment-X . 0)
(word-space . 0.6)
- (ignore-length-mismatch . #f)
- (begin-alignment . 4)
- (end-alignment . 2)
(font-family . roman)
+ (font-series . bold-narrow)
(font-shape . upright)
-
+ (font-size . 1.0)
(meta . ((interfaces . (rhythmic-grob-interface lyric-syllable-interface self-alignment-interface text-interface font-interface item-interface ))))
))
. ((molecule-callback . ,Text_item::brew_molecule)
(font-family . roman)
(font-series . bold)
- (padding . 1.5)
+ (padding . 1.0)
(X-offset-callbacks . (,Side_position_interface::aligned_side))
(direction . ,LEFT)
- (meta . ((interfaces . (text-interface font-interface item-interface ))))
+ (meta . ((interfaces . (side-position-interface text-interface font-interface item-interface ))))
))
(StaffSpacing
;; 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 3.26 1.5))
-
- ;; [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.
+
+ ;; FIXME this should come from 'lengths
+
+; (beamed-lengths . (3.26 3.26 1.5))
+ (beamed-lengths . (3.5 3.5 3.5 4.5 5.0))
;; We use the normal minima as minimum for the ideal lengths,
;; and the extreme minima as abolute minimum length.
(beamed-minimum-free-lengths . (1.83 1.5 1.25))
;; The 'extreme case' minima
- (beamed-extreme-minimum-free-lengths . (2.5 2.0 1.0))
+ (beamed-extreme-minimum-free-lengths . (2.0 1.25))
(X-offset-callbacks . (,Stem::off_callback))
(X-extent-callback . ,Stem::dim_callback)
(SeparationItem
. (
+ (X-extent-callback . #f)
+ (Y-extent-callback . #f)
(meta . ((interfaces . (spacing-interface separation-item-interface item-interface ))))
))
(SeparatingGroupSpanner
. (
(spacing-procedure . ,Separating_group_spanner::set_spacing_rods)
- (meta . ((interfaces . (spacing-interface separation-spanner-interface spanner-interface))))
+ (meta . ((interfaces . (only-prebreak-interface spacing-interface separation-spanner-interface spanner-interface))))
))
(SustainPedal
(OttavaSpanner
. (
- (Y-offset-callbacks . (,Side_position_interface::aligned_side))
- (molecule-callback . ,Text_spanner::brew_molecule)
+ (Y-offset-callbacks . (,Side_position_interface::out_of_staff
+ ,Side_position_interface::aligned_side))
+ (molecule-callback . ,Ottava_bracket::brew_molecule)
+ (font-shape . italic)
(font-family . roman)
+ (text-repeat-if-broken . #t)
+ (shorten-pair . (0.0 . -0.6))
+ (staff-padding . 1.0)
+ (padding . 1.0)
(enclose-bounds . #t)
(width-correct . 0.0)
(style . dashed-line)
(dash-fraction . 0.3)
- (edge-height . (0 . 1.5))
+ (edge-height . (0 . 1.2))
(direction . 1)
- (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface))))
+ (meta . ((interfaces . (ottava-bracket-interface
+ line-interface side-position-interface
+ font-interface text-interface spanner-interface))))
))
(TabNoteHead
(break-align-symbol . time-signature)
(break-visibility . ,all-visible)
(space-alist . (
- (first-note . (extra-space . 2.0))
+ (first-note . (fixed-space . 2.0))
(right-edge . (extra-space . 0.5))
(staff-bar . (minimum-space . 2.0))
))
(font-series . bold)
(font-size . -2)
- (meta . ((interfaces . (text-interface tuplet-bracket-interface font-interface spanner-interface))))
+ (meta . ((interfaces . (text-interface line-interface tuplet-bracket-interface font-interface spanner-interface))))
))
(UnaCordaPedal
projects / lilypond.git / blobdiff