X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=d5289bd14fa947ea07b997bec0e17de87091d199;hb=46ef5daa401f06c6beeb996a00854e1310501dc1;hp=51fbb8bc449f268dc3720453d1f1d47d11a709a3;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git diff --git a/ly/property-init.ly b/ly/property-init.ly index 51fbb8bc44..d5289bd14f 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,84 +1,80 @@ % property-init.ly -\version "2.1.21" +\version "2.2.0" -stemUp = \property Voice.Stem \set #'direction = #1 -stemDown = \property Voice.Stem \set #'direction = #-1 -stemBoth= \property Voice.Stem \revert #'direction +stemUp = \override Stem #'direction = #1 +stemDown = \override Stem #'direction = #-1 +stemBoth= \revert Stem #'direction -slurUp = \property Voice.Slur \set #'direction = #1 -slurDown = \property Voice.Slur \set #'direction = #-1 -slurBoth = \property Voice.Slur \revert #'direction +slurUp = \override Slur #'direction = #1 +slurDown = \override Slur #'direction = #-1 +slurBoth = \revert Slur #'direction % There's also dash, but setting dash period/length should be fixed. -slurDotted = \property Voice.Slur \set #'dashed = #1 -slurSolid = \property Voice.Slur \revert #'dashed +slurDotted = \override Slur #'dashed = #1 +slurSolid = \revert Slur #'dashed -phrasingSlurUp = \property Voice.PhrasingSlur \set #'direction = #1 -phrasingSlurDown = \property Voice.PhrasingSlur \set #'direction = #-1 -phrasingSlurBoth = \property Voice.PhrasingSlur \revert #'direction +phrasingSlurUp = \override PhrasingSlur #'direction = #1 +phrasingSlurDown = \override PhrasingSlur #'direction = #-1 +phrasingSlurBoth = \revert PhrasingSlur #'direction -shiftOn = \property Voice.NoteColumn \set #'horizontal-shift = #1 -shiftOnn = \property Voice.NoteColumn \set #'horizontal-shift = #2 -shiftOnnn = \property Voice.NoteColumn \set #'horizontal-shift = #3 -shiftOff = \property Voice.NoteColumn \revert #'horizontal-shift +shiftOn = \override NoteColumn #'horizontal-shift = #1 +shiftOnn = \override NoteColumn #'horizontal-shift = #2 +shiftOnnn = \override NoteColumn #'horizontal-shift = #3 +shiftOff = \revert NoteColumn #'horizontal-shift -tieUp = \property Voice.Tie \set #'direction = #1 -tieDown = \property Voice.Tie \set #'direction = #-1 -tieBoth = \property Voice.Tie \revert #'direction +tieUp = \override Tie #'direction = #1 +tieDown = \override Tie #'direction = #-1 +tieBoth = \revert Tie #'direction -tieDotted = \property Voice.Tie \set #'dashed = #1 -tieSolid = \property Voice.Tie \revert #'dashed +tieDotted = \override Tie #'dashed = #1 +tieSolid = \revert Tie #'dashed +setEasyHeads = \sequential { + \override NoteHead #'print-function = #Note_head::brew_ez_stencil + \override NoteHead #'Y-extent-callback = #'() + \override NoteHead #'X-extent-callback = #'() +} -dynamicUp = { - \property Voice.DynamicText \set #'direction = #1 - \property Voice.DynamicLineSpanner \set #'direction = #1 +dynamicUp = { + \override DynamicText #'direction = #1 + \override DynamicLineSpanner #'direction = #1 } dynamicDown = { - \property Voice.DynamicText \set #'direction = #-1 - \property Voice.DynamicLineSpanner \set #'direction = #-1 + \override DynamicText #'direction = #-1 + \override DynamicLineSpanner #'direction = #-1 } dynamicBoth = { - \property Voice.DynamicText \revert #'direction - \property Voice.DynamicLineSpanner \revert #'direction + \revert DynamicText #'direction + \revert DynamicLineSpanner #'direction } -scriptUp = { - \property Voice.TextScript \set #'direction = #1 - \property Voice.Script \set #'direction = #1 +scriptUp = { + \override TextScript #'direction = #1 + \override Script #'direction = #1 } scriptDown = { - \property Voice.TextScript \set #'direction = #-1 - \property Voice.Script \set #'direction = #-1 + \override TextScript #'direction = #-1 + \override Script #'direction = #-1 } scriptBoth = { - \property Voice.TextScript \revert #'direction - \property Voice.Script \revert #'direction + \revert TextScript #'direction + \revert Script #'direction } -dotsUp = \property Voice.Dots \set #'direction = #1 -dotsDown = \property Voice.Dots \set #'direction = #-1 -dotsBoth = \property Voice.Dots \revert #'direction +dotsUp = \override Dots #'direction = #1 +dotsDown = \override Dots #'direction = #-1 +dotsBoth = \revert Dots #'direction -tupletUp = \property Voice.TupletBracket \set #'direction = #1 -tupletDown = \property Voice.TupletBracket \set #'direction = #-1 -tupletBoth = \property Voice.TupletBracket \revert #'direction +tupletUp = \override TupletBracket #'direction = #1 +tupletDown = \override TupletBracket #'direction = #-1 +tupletBoth = \revert TupletBracket #'direction -cadenzaOn = \property Timing.timing = ##f +cadenzaOn = \set Timing.timing = ##f cadenzaOff = { - \property Timing.timing = ##t - \property Timing.measurePosition = #(ly:make-moment 0 1) -} - -newpage = \notes -{ - \break - % urg, only works for TeX output - \context Score \applyoutput - #(outputproperty-compatibility (make-type-checker 'paper-column-interface) - 'between-system-string "\\newpage") + \set Timing.timing = ##t + \set Timing.measurePosition = #(ly:make-moment 0 1) } % dynamic ly:dir? text script, articulation script ly:dir? @@ -89,133 +85,38 @@ voiceThree =#(context-spec-music (make-voice-props-set 2) 'Voice) voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice) -tiny = - \property Voice.fontSize= #-2 +tiny = + \set fontSize = #-2 -small = - \property Voice.fontSize= #-1 +small = + \set fontSize = #-1 normalsize = { - \property Voice.fontSize= #0 + \set fontSize = #0 } % End the incipit and print a ``normal line start''. endincipit = \notes \context Staff { \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit - \once \property Staff.Clef \set #'full-size-change = ##t - \once \property Staff.Clef \set #'non-default = ##t + \once \override Staff.Clef #'full-size-change = ##t + \once \override Staff.Clef #'non-default = ##t \bar "" } -autoBeamOff = \property Voice.autoBeaming = ##f -autoBeamOn = \property Voice.autoBeaming = ##t - -fatText = \property Voice.TextScript \set #'no-spacing-rods = ##f -emptyText = \property Voice.TextScript \set #'no-spacing-rods = ##t +autoBeamOff = \set autoBeaming = ##f +autoBeamOn = \set autoBeaming = ##t -showStaffSwitch = \property Voice.followVoice = ##t -hideStaffSwitch = \property Voice.followVoice = ##f +fatText = \override TextScript #'no-spacing-rods = ##f +emptyText = \override TextScript #'no-spacing-rods = ##t -% accidentals as they were common in the 18th century. -defaultAccidentals = { - \property Current.extraNatural = ##t - \property Current.autoAccidentals = #'(Staff (same-octave . 0)) - \property Current.autoCautionaries = #'() -} - -% accidentals in voices instead of staves. -% Notice that accidentals from one voice do NOT get cancelled in other voices -voiceAccidentals = { - \property Current.extraNatural = ##t - \property Current.autoAccidentals = #'(Voice (same-octave . 0)) - \property Current.autoCautionaries = #'() - -} +showStaffSwitch = \set followVoice = ##t +hideStaffSwitch = \set followVoice = ##f -% accidentals as suggested by Kurt Stone, Music Notation in the 20th century. -% This includes all the default accidentals, but accidentals also needs cancelling -% in other octaves and in the next measure. -modernAccidentals = { - \property Current.extraNatural = ##f - \property Current.autoAccidentals = #'(Staff (same-octave . 0) (any-octave . 0) (same-octave . 1)) - \property Current.autoCautionaries = #'() -} - -% the accidentals that Stone adds to the old standard as cautionaries -modernCautionaries = { - \property Current.extraNatural = ##f - \property Current.autoAccidentals = #'(Staff (same-octave . 0)) - \property Current.autoCautionaries = #'(Staff (any-octave . 0) (same-octave . 1)) -} - -% Multivoice accidentals to be read both by musicians playing one voice -% and musicians playing all voices. -% Accidentals are typeset for each voice, but they ARE cancelled across voices. -modernVoiceAccidentals = { - \property Current.extraNatural = ##f - \property Current.autoAccidentals = #'( - Voice (same-octave . 0) (any-octave . 0) (same-octave . 1) - Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) - ) - \property Current.autoCautionaries = #'() -} - -% same as modernVoiceAccidental eccept that all special accidentals are typeset -% as cautionaries -modernVoiceCautionaries = { - \property Current.extraNatural = ##f - \property Current.autoAccidentals = #'( - Voice (same-octave . 0) - ) - \property Current.autoCautionaries = #'( - Voice (any-octave . 0) (same-octave . 1) - Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) - ) -} - -% stone's suggestions for accidentals on grand staff. -% Accidentals are cancelled across the staves in the same grand staff as well -pianoAccidentals = { - \property Current.autoAccidentals = #'( - Staff (same-octave . 0) (any-octave . 0) (same-octave . 1) - GrandStaff (any-octave . 0) (same-octave . 1) - ) - \property Current.autoCautionaries = #'() -} - -pianoCautionaries = { - \property Current.autoAccidentals = #'( - Staff (same-octave . 0) - ) - \property Current.autoCautionaries = #'( - Staff (any-octave . 0) (same-octave . 1) - GrandStaff (any-octave . 0) (same-octave . 1) - ) -} - - -% Do not reset the key at the start of a measure. Accidentals will be -% printed only once and are in effect until overridden, possibly many -% measures later. -noResetKey = { - \property Current.autoAccidentals = #'(Staff (same-octave . #t)) - \property Current.autoCautionaries = #'() -} - -% do not set localKeySignature when a note alterated differently from -% localKeySignature is found. -% Causes accidentals to be printed at every note instead of -% remembered for the duration of a measure. -% accidentals not being remembered, causing accidentals always to be typeset relative to the time signature -forgetAccidentals = { - \property Current.autoAccidentals = #'(Staff (same-octave . -1)) - \property Current.autoCautionaries = #'() -} % To remove a Volta bracket or some other graphical object, -% set it to turnOff. Example: \property Staff.VoltaBracket = \turnOff +% set it to turnOff. Example: \set Staff.VoltaBracket = \turnOff %% %% DO NOT USE THIS. IT CAN LEAD TO CRASHES. @@ -226,40 +127,56 @@ turnOff = #(cons '() '()) % of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether % cross-staff brackets are desired. -arpeggioBracket = #Arpeggio::brew_chord_bracket -arpeggio = #(make-music-by-name 'ArpeggioEvent) -glissando = #(make-music-by-name 'GlissandoEvent) +arpeggio = #(make-music 'ArpeggioEvent) + +arpeggioUp = \sequential { + \revert Arpeggio #'print-function + \override Arpeggio #'arpeggio-direction = #1 +} +arpeggioDown = \sequential { + \revert Arpeggio #'print-function + \override Arpeggio #'arpeggio-direction = #-1 +} +arpeggioBoth = \sequential { + \revert Arpeggio #'print-function + \revert Arpeggio #'arpeggio-direction +} +arpeggioBracket = \sequential { + \override Arpeggio #'print-function = #Arpeggio::brew_chord_bracket +} + +glissando = #(make-music 'GlissandoEvent) fermataMarkup = \markup { \musicglyph #"scripts-ufermata" } setMmRestFermata = - \once \property Voice.MultiMeasureRestNumber \override #'text = + \once \override MultiMeasureRestNumber #'text = #fermataMarkup hideNotes =\sequential { % hide notes, accidentals, etc. - \property Voice.Dots \override #'transparent = ##t - \property Voice.NoteHead \override #'transparent = ##t - \property Voice.Stem \override #'transparent = ##t - \property Voice.Beam \override #'transparent = ##t - \property Staff.Accidental \override #'transparent = ##t + \override Dots #'transparent = ##t + \override NoteHead #'transparent = ##t + \override Stem #'transparent = ##t + \override Beam #'transparent = ##t + \override Staff.Accidental #'transparent = ##t } -unHideNotes = \sequential { - \property Staff.Accidental \revert #'transparent - \property Voice.Beam \revert #'transparent - \property Voice.Stem \revert #'transparent - \property Voice.NoteHead \revert #'transparent - \property Voice.Dots \revert #'transparent +unHideNotes = \sequential { + \revert Staff.Accidental #'transparent + \revert Beam #'transparent + \revert Stem #'transparent + \revert NoteHead #'transparent + \revert Dots #'transparent } germanChords = { - \property ChordNames. chordRootNamer = #(chord-name->german-markup #t) - \property ChordNames. chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #t) + \set chordNoteNamer = #note-name->german-markup } semiGermanChords = { - \property ChordNames. chordRootNamer = #(chord-name->german-markup #f) - \property ChordNames. chordNoteNamer = #note-name->german-markup + \set chordRootNamer = #(chord-name->german-markup #f) + \set chordNoteNamer = #note-name->german-markup }