(Accidental
. (
(print-function . ,Accidental_interface::print)
+ (inside-slur . #t)
(cautionary-style . parentheses)
- (after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface font-interface))))
+ (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)
+ . ((X-extent-callback . ,Axis_group_interface::group_extent_callback)
(left-padding . 0.2)
;; this is quite small, but it is very ugly to have
(breakable . #t)
(break-align-symbol . ambitus)
(break-visibility . ,begin-of-line-visible)
- (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface ))))
+ (meta . ((interfaces . (axis-group-interface break-aligned-interface ambitus-interface item-interface ))))
))
(AmbitusLine
(cautionary-style . parentheses)
(after-line-breaking-callback . ,Accidental_interface::after_line_breaking) (meta . ((interfaces . (item-interface accidental-interface break-aligned-interface side-position-interface font-interface))))
))
+
(AmbitusNoteHead
. (
(duration-log . 2)
(style . default)
(print-function . ,Note_head::print)
(glyph-name-procedure . ,find-notehead-symbol)
- (X-extent-callback . ,Note_head::extent)
- (Y-extent-callback . ,Note_head::extent)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
- (meta . ((interfaces . (font-interface note-head-interface ambitus-interface staff-symbol-referencer-interface rhythmic-head-interface item-interface ))))
+ (meta . ((interfaces . (font-interface note-head-interface
+ ambitus-interface
+ staff-symbol-referencer-interface
+ rhythmic-head-interface
+ ledgered-interface
+ item-interface ))))
))
(Arpeggio
(custos . (minimum-space . 2.0))
(clef . (minimum-space . 1.0))
(key-signature . (extra-space . 1.0))
+ (key-cancellation . (extra-space . 1.0))
(first-note . (fixed-space . 1.3))
(next-note . (semi-fixed-space . 1.3))
(right-edge . (extra-space . 0.0))
(BarNumber
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(breakable . #t)
(break-visibility . ,begin-of-line-visible)
(padding . 1.0)
(BassFigure
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(direction . 1)
(font-family . number)
;; We must do this, other BFs in
- ;; paper16 become too small.
+ ;; layout16 become too small.
(font-size . -4)
(kern . 0.2)
(meta . ((interfaces . (text-interface rhythmic-grob-interface
;; todo: clean this up a bit: the list is getting
;; rather long.
(print-function . ,Beam::print)
- (concaveness-gap . 1.85)
- (concaveness-threshold . 0.26)
(gap . 0.8)
(positions . (#f . #f))
(position-callbacks . (,Beam::least_squares
;; sadly possibly breaking patterns with high order beams.
(beamed-stem-shorten . (1.0 0.5 0.25))
- (slope-limit . 0.2)
(flag-width-function . ,beam-flag-width-function)
(damping . 1)
(auto-knee-gap . 5.5)
(breakable . #t)
(stacking-dir . 1)
(break-align-orders . #(; end-of-line:
- (instrument-name left-edge ambitus breathing-sign
- clef staff-bar key-signature
- time-signature custos)
+ (instrument-name
+ left-edge ambitus breathing-sign
+ clef staff-bar key-cancellation key-signature
+ time-signature custos)
; unbroken
(instrument-name left-edge ambitus breathing-sign
- clef staff-bar key-signature
+ clef staff-bar key-cancellation key-signature
staff
time-signature custos)
; begin of line
(instrument-name left-edge ambitus breathing-sign
- clef key-signature staff-bar
+ clef key-cancellation key-signature staff-bar
time-signature custos)
))
(first-note . (fixed-space . 1.0)) ;huh?
(right-edge . (extra-space . 0.1))
))
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(text . ,(make-musicglyph-markup "scripts-rcomma"))
(Y-offset-callbacks . (,Breathing_sign::offset_callback))
(break-visibility . ,begin-of-line-invisible)
(break-visibility . ,begin-of-line-visible)
(space-alist . ((ambitus . (extra-space . 2.0))
(staff-bar . (extra-space . 0.7))
+ (key-cancellation . (minimum-space . 4.0))
(key-signature . (minimum-space . 4.0))
(time-signature . (minimum-space . 4.2))
(first-note . (minimum-fixed-space . 5.0))
(ChordName
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(after-line-breaking-callback . ,Chord_name::after_line_breaking)
(word-space . 0.0)
(font-family . sans)
(DynamicText
. (
(Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
,Self_alignment_interface::centered_on_parent))
(self-alignment-X . 0)
(padding . 0.6)
(minimum-space . 1.2)
(direction . -1)
- (meta . ((interfaces . (dynamic-interface axis-group-interface side-position-interface spanner-interface))))
- ))
+
+ (meta . ((interfaces . (dynamic-interface axis-group-interface
+ side-position-interface spanner-interface)))) ))
(LeftEdge
. (
(first-note . (fixed-space . 1.0))
(right-edge . (extra-space . 0.0))
(key-signature . (extra-space . 0.0))
+ (key-cancellation . (extra-space . 0.0))
+
))
(meta . ((interfaces . (break-aligned-interface item-interface ))))
))
(Fingering
. (
- (print-function . ,Text_item::print)
- (padding . 0.6)
- (staff-padding . 0.6)
+ (print-function . ,Text_interface::print)
+
+ ; sync with TextScript (?)
+ (padding . 0.5)
+ (staff-padding . 0.5)
(self-alignment-X . 0)
(self-alignment-Y . 0)
(script-priority . 100)
(font-encoding . fetaNumber)
(font-size . -5) ; don't overlap when next to heads.
- (meta . ((interfaces . (finger-interface font-interface text-script-interface text-interface side-position-interface self-alignment-interface item-interface ))))
+ (meta . ((interfaces . (finger-interface
+ font-interface text-script-interface text-interface
+ side-position-interface self-alignment-interface
+ item-interface))))
))
(Glissando
(Y-extent-callback . #f)
(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
(print-function . ,Line_spanner::print)
- (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+ (meta . ((interfaces . (line-interface line-spanner-interface spanner-interface))))
))
(Hairpin
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(padding . 0.2)
(direction . -1)
- (meta . ((interfaces . (horizontal-bracket-interface side-position-interface spanner-interface))))
+ (bracket-flare . (0.5 . 0.5))
+ (meta . ((interfaces . (horizontal-bracket-interface
+ side-position-interface
+ line-interface
+ spanner-interface))))
))
(InstrumentName
. (
))
(self-alignment-Y . 0)
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(break-align-symbol . instrument-name)
(break-visibility . ,begin-of-line-visible)
(baseline-skip . 2)
(space-alist . ((left-edge . (extra-space . 1.0))
))
(break-align-symbol . instrument-name)
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(break-align-symbol . clef)
(break-visibility . ,begin-of-line-visible)
(baseline-skip . 2)
side-position-interface text-interface
break-aligned-interface item-interface ))))
))
-
+ (KeyCancellation
+ . (
+ (print-function . ,Key_signature_interface::print)
+ (space-alist . (
+ (time-signature . (extra-space . 1.25))
+ (staff-bar . (extra-space . 0.6))
+ (key-signature . (extra-space . 0.5))
+ (right-edge . (extra-space . 0.5))
+ (first-note . (fixed-space . 2.5))
+ ))
+ (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+ (break-align-symbol . key-cancellation)
+ (break-visibility . ,begin-of-line-invisible)
+ (breakable . #t)
+
+ (meta . ((interfaces . (key-signature-interface font-interface
+ break-aligned-interface item-interface ))))
+ ))
(KeySignature
. (
(print-function . ,Key_signature_interface::print)
(break-align-symbol . key-signature)
(break-visibility . ,begin-of-line-visible)
(breakable . #t)
- (meta . ((interfaces . (key-signature-interface font-interface break-aligned-interface item-interface ))))
+
+ (meta . ((interfaces . (key-signature-interface font-interface
+ break-aligned-interface item-interface ))))
))
(LedgerLineSpanner
. (
))
(LyricText
- . ((print-function . ,Text_item::print)
+ . ((print-function . ,Text_interface::print)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
(self-alignment-X . 0)
(word-space . 0.6)
(RehearsalMark
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(after-line-breaking-callback . ,shift-right-at-line-begin)
(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 item-interface ))))
+ (meta . ((interfaces . (text-interface
+ side-position-interface font-interface mark-interface
+ self-alignment-interface item-interface ))))
))
(MetronomeMark
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(direction . 1)
(padding . 0.8)
- (meta . ((interfaces . (text-interface side-position-interface font-interface metronome-mark-interface item-interface))))
+ (meta . ((interfaces . (text-interface
+ side-position-interface font-interface
+ metronome-mark-interface item-interface))))
))
(MeasureGrouping
. (
(MultiMeasureRestNumber
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(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 . 1.3)
- (staff-padding . 1.3)
+ (padding . 0.4)
+ (staff-padding . 0.4)
(font-encoding . fetaNumber)
(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
))
(MultiMeasureRestText
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(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 . 1.5)
- (staff-padding . 1.5)
+ (padding . 0.2)
+ (staff-padding . 0.25)
(meta . ((interfaces . (side-position-interface multi-measure-interface self-alignment-interface font-interface spanner-interface text-interface))))
))
(NoteCollision
(print-function . ,Note_head::print)
(ligature-primitive-callback . ,Note_head::print)
(glyph-name-procedure . ,find-notehead-symbol)
- (X-extent-callback . ,Note_head::extent)
- (Y-extent-callback . ,Note_head::extent)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
(stem-attachment-function . ,note-head-style->attachment-coordinates)
- (meta . ((interfaces . (rhythmic-grob-interface rhythmic-head-interface font-interface note-head-interface staff-symbol-referencer-interface item-interface ))))
+ (meta . ((interfaces . (rhythmic-grob-interface
+ rhythmic-head-interface font-interface note-head-interface
+ ledgered-interface
+ staff-symbol-referencer-interface item-interface ))))
))
(NoteSpacing
(NoteName
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(meta . ((interfaces . (note-name-interface
text-interface font-interface item-interface ))))
))
(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))
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
;; no Y dimensions, because of lyrics under tenor clef.
(Y-extent . (0 . 0))
))
(PhrasingSlur
- . (
- (print-function . ,New_slur::print)
+ . ((slur-details . ,default-slur-details)
+ (print-function . ,Slur::print)
(thickness . 1.2)
(spacing-procedure . ,Spanner::set_spacing_rods)
(minimum-length . 1.5)
- (after-line-breaking-callback . ,New_slur::after_line_breaking)
- (Y-extent-callback . ,New_slur::height)
+ (after-line-breaking-callback . ,Slur::after_line_breaking)
+ (Y-extent-callback . ,Slur::height)
(height-limit . 2.0)
(ratio . 0.333)
(meta . ((interfaces . (slur-interface spanner-interface))))
))
(Slur
- . (
- (print-function . ,New_slur::print)
+ . ((slur-details . ,default-slur-details)
+ (print-function . ,Slur::print)
(thickness . 1.2)
(spacing-procedure . ,Spanner::set_spacing_rods)
(minimum-length . 1.5)
- (after-line-breaking-callback . ,New_slur::after_line_breaking)
- (Y-extent-callback . ,New_slur::height)
+ (after-line-breaking-callback . ,Slur::after_line_breaking)
+ (Y-extent-callback . ,Slur::height)
; Slur::height)
(height-limit . 2.0)
(ratio . 0.25)
(grace-space-factor . 0.6)
(shortest-duration-space . 2.0)
(spacing-increment . 1.2)
-; (base-shortest-duration . ,(ly:make-moment 1 8 3 2))
- (base-shortest-duration . ,(ly:make-moment 1 8))
+ (base-shortest-duration . ,(ly:make-moment 3 16))
(meta . ((interfaces . (spacing-interface spacing-spanner-interface spanner-interface))))
))
))
(StanzaNumber
- . ((print-function . ,Text_item::print)
+ . ((print-function . ,Text_interface::print)
(font-series . bold)
(padding . 1.0)
(X-offset-callbacks . (,Side_position_interface::aligned_side))
(SostenutoPedal
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(direction . 1)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(no-spacing-rods . #t)
;; FIXME this should come from 'lengths
- (beamed-lengths . (3.26 3.26 1.5))
+ (beamed-lengths . (3.26 3.5 3.6))
;; 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 . (1.83 1.5 1.25))
+ ;(beamed-minimum-free-lengths . (2.0 1.83 1.25))
;; The 'extreme case' minima
(beamed-extreme-minimum-free-lengths . (2.0 1.25))
(TextScript
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(no-spacing-rods . #t)
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(direction . -1)
+
+ ; sync with Fingering ?
(padding . 0.5)
(staff-padding . 0.5)
(script-priority . 200)
))
(CombineTextScript
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(no-spacing-rods . #t)
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
(TabNoteHead
. (
(style . default)
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(Y-offset-callbacks . (,Staff_symbol_referencer::callback))
(extra-offset . (0 . -0.65)) ;; UGH! TODO: Clean this up!
(stem-attachment-function . ,tablature-stem-attachment-function)
(TimeSignature
. (
(print-function . ,Time_signature::print)
-; (print-function . ,Text_item::print)
+; (print-function . ,Text_interface::print)
(break-align-symbol . time-signature)
(break-visibility . ,all-visible)
(space-alist . (
(UnaCordaPedal
. (
- (print-function . ,Text_item::print)
+ (print-function . ,Text_interface::print)
(font-shape . italic)
(no-spacing-rods . #t)
(self-alignment-X . 0)
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
(stacking-dir . -1)
+; (threshold . (6 . 1000))
(meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
))