From b752f4012d751e7e01be9092df73047470d51d6c Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Tue, 15 Jul 2008 20:06:28 +0100 Subject: [PATCH] Add X-extent override for \arpeggioParenthesis. Tidy formatting. --- ly/property-init.ly | 132 +++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 64 deletions(-) diff --git a/ly/property-init.ly b/ly/property-init.ly index 9f9d1d2785..26108fb73b 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -2,12 +2,12 @@ \version "2.11.52" -stemUp = \override Stem #'direction = #UP -stemDown = \override Stem #'direction = #DOWN -stemNeutral= \revert Stem #'direction +stemUp = \override Stem #'direction = #UP +stemDown = \override Stem #'direction = #DOWN +stemNeutral = \revert Stem #'direction -slurUp = \override Slur #'direction = #UP -slurDown = \override Slur #'direction = #DOWN +slurUp = \override Slur #'direction = #UP +slurDown = \override Slur #'direction = #DOWN slurNeutral = \revert Slur #'direction %% There's also dash, but setting dash period/length should be fixed. @@ -16,7 +16,7 @@ slurDashed = { \override Slur #'dash-fraction = #0.4 } slurDotted = { - \override Slur #'dash-period = #0.75 + \override Slur #'dash-period = #0.75 \override Slur #'dash-fraction = #0.1 } slurSolid = { @@ -25,8 +25,8 @@ slurSolid = { } -phrasingSlurUp = \override PhrasingSlur #'direction = #UP -phrasingSlurDown = \override PhrasingSlur #'direction = #DOWN +phrasingSlurUp = \override PhrasingSlur #'direction = #UP +phrasingSlurDown = \override PhrasingSlur #'direction = #DOWN phrasingSlurNeutral = \revert PhrasingSlur #'direction mergeDifferentlyDottedOn = { @@ -43,13 +43,13 @@ mergeDifferentlyHeadedOff = { \revert Staff.NoteCollision #'merge-differently-headed } -shiftOn = \override NoteColumn #'horizontal-shift = #1 -shiftOnn = \override NoteColumn #'horizontal-shift = #2 -shiftOnnn = \override NoteColumn #'horizontal-shift = #3 +shiftOn = \override NoteColumn #'horizontal-shift = #1 +shiftOnn = \override NoteColumn #'horizontal-shift = #2 +shiftOnnn = \override NoteColumn #'horizontal-shift = #3 shiftOff = \revert NoteColumn #'horizontal-shift -tieUp = \override Tie #'direction = #UP -tieDown = \override Tie #'direction = #DOWN +tieUp = \override Tie #'direction = #UP +tieDown = \override Tie #'direction = #DOWN tieNeutral = \revert Tie #'direction tieDashed = { @@ -66,7 +66,7 @@ tieSolid = { } easyHeadsOn = { - \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil \override NoteHead #'font-size = #-7 \override NoteHead #'font-family = #'sans \override NoteHead #'font-series = #'bold @@ -81,17 +81,16 @@ easyHeadsOff = { aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti) -sacredHarpHeads = - \set shapeNoteStyles = ##(fa #f la fa #f la mi) +sacredHarpHeads = \set shapeNoteStyles = ##(fa #f la fa #f la mi) dynamicUp = { - \override DynamicText #'direction = #UP - \override DynamicLineSpanner #'direction = #UP + \override DynamicText #'direction = #UP + \override DynamicLineSpanner #'direction = #UP } dynamicDown = { - \override DynamicText #'direction = #DOWN - \override DynamicLineSpanner #'direction = #DOWN + \override DynamicText #'direction = #DOWN + \override DynamicLineSpanner #'direction = #DOWN } dynamicNeutral = { @@ -100,12 +99,12 @@ dynamicNeutral = { } -dotsUp = \override Dots #'direction = #UP -dotsDown = \override Dots #'direction = #DOWN -dotsNeutral = \revert Dots #'direction +dotsUp = \override Dots #'direction = #UP +dotsDown = \override Dots #'direction = #DOWN +dotsNeutral = \revert Dots #'direction -tupletUp = \override TupletBracket #'direction = #UP -tupletDown = \override TupletBracket #'direction = #DOWN +tupletUp = \override TupletBracket #'direction = #UP +tupletDown = \override TupletBracket #'direction = #DOWN tupletNeutral = \revert TupletBracket #'direction cadenzaOn = \set Timing.timing = ##f @@ -114,11 +113,11 @@ cadenzaOff = { \set Timing.measurePosition = #ZERO-MOMENT } -% dynamic ly:dir? text script, articulation script ly:dir? +% dynamic ly:dir? text script, articulation script ly:dir? oneVoice = #(context-spec-music (make-voice-props-revert) 'Voice) voiceOne = #(context-spec-music (make-voice-props-set 0) 'Voice) voiceTwo = #(context-spec-music (make-voice-props-set 1) 'Voice) -voiceThree =#(context-spec-music (make-voice-props-set 2) 'Voice) +voiceThree = #(context-spec-music (make-voice-props-set 2) 'Voice) voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice) voiceOneStyle = { @@ -177,10 +176,10 @@ huge = { } %% End the incipit and print a ``normal line start''. -endincipit = \context Staff { +endincipit = \context Staff { \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit - \once \override Staff.Clef #'full-size-change = ##t - \once \override Staff.Clef #'non-default = ##t + \once \override Staff.Clef #'full-size-change = ##t + \once \override Staff.Clef #'non-default = ##t \bar "" } @@ -188,13 +187,13 @@ autoBeamOff = \set autoBeaming = ##f autoBeamOn = \set autoBeaming = ##t textLengthOn = { - \override TextScript #'extra-spacing-width = #'(0 . 0) - \override TextScript #'infinite-spacing-height = ##t + \override TextScript #'extra-spacing-width = #'(0 . 0) + \override TextScript #'infinite-spacing-height = ##t } textLengthOff = { - \override TextScript #'extra-spacing-width = #'(+inf.0 . -inf.0) - \override TextScript #'infinite-spacing-height = ##f + \override TextScript #'extra-spacing-width = #'(+inf.0 . -inf.0) + \override TextScript #'infinite-spacing-height = ##f } balloonLengthOn = { @@ -235,78 +234,83 @@ defaultTimeSignature = { arpeggio = #(make-music 'ArpeggioEvent) -arpeggioArrowUp = \sequential { +arpeggioArrowUp = { \revert Arpeggio #'stencil + \revert Arpeggio #'X-extent \override Arpeggio #'arpeggio-direction = #UP } -arpeggioArrowDown = \sequential { +arpeggioArrowDown = { \revert Arpeggio #'stencil + \revert Arpeggio #'X-extent \override Arpeggio #'arpeggio-direction = #DOWN } -arpeggioNormal = \sequential { +arpeggioNormal = { \revert Arpeggio #'stencil + \revert Arpeggio #'X-extent \revert Arpeggio #'arpeggio-direction } -arpeggioBracket = \sequential { +arpeggioBracket = { + \revert Arpeggio #'X-extent \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket } -arpeggioParenthesis = \sequential { +arpeggioParenthesis = { \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-slur + \override Arpeggio #'X-extent = #ly:grob::stencil-width } glissando = #(make-music 'GlissandoEvent) fermataMarkup = \markup { \musicglyph #"scripts.ufermata" } -hideNotes =\sequential { +hideNotes = { % hide notes, accidentals, etc. - \override Dots #'transparent = ##t - \override NoteHead #'transparent = ##t - \override NoteHead #'no-ledgers = ##t - \override Stem #'transparent = ##t - \override Beam #'transparent = ##t - \override Accidental #'transparent = ##t + \override Dots #'transparent = ##t + \override NoteHead #'transparent = ##t + \override NoteHead #'no-ledgers = ##t + \override Stem #'transparent = ##t + \override Beam #'transparent = ##t + \override Accidental #'transparent = ##t } -unHideNotes = \sequential { +unHideNotes = { \revert Accidental #'transparent \revert Beam #'transparent \revert Stem #'transparent \revert NoteHead #'transparent \revert NoteHead #'no-ledgers - \revert Dots #'transparent + \revert Dots #'transparent } germanChords = { - \set chordRootNamer = #(chord-name->german-markup #t) - \set chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #t) + \set chordNoteNamer = #note-name->german-markup } semiGermanChords = { - \set chordRootNamer = #(chord-name->german-markup #f) - \set chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #f) + \set chordNoteNamer = #note-name->german-markup } frenchChords = { - \set chordRootNamer = #(chord-name->italian-markup #t) - \set chordPrefixSpacer = #0.4 + \set chordRootNamer = #(chord-name->italian-markup #t) + \set chordPrefixSpacer = #0.4 } italianChords = { - \set chordRootNamer = #(chord-name->italian-markup #f) - \set chordPrefixSpacer = #0.4 + \set chordRootNamer = #(chord-name->italian-markup #f) + \set chordPrefixSpacer = #0.4 } -improvisationOn = { - \set squashedPosition = #0 - \override NoteHead #'style = #'slash - \override Accidental #'stencil = ##f +improvisationOn = { + \set squashedPosition = #0 + \override NoteHead #'style = #'slash + \override Accidental #'stencil = ##f } -improvisationOff = { - \unset squashedPosition - \revert NoteHead #'style - \revert Accidental #'stencil +improvisationOff = { + \unset squashedPosition + \revert NoteHead #'style + \revert Accidental #'stencil } textSpannerUp = \override TextSpanner #'direction = #UP -- 2.39.2