X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fproperty-init.ly;h=47750ece1344b79cf5bc5bb00229e96bb7292047;hb=f91591962027bf9b8b6ecadf084a1336ec29bc82;hp=4b200d509be2087e80c28cdbd35441d82d1d1eb2;hpb=8e25b11a9f3dbf7854e41d35e9dd6dd8a66986e4;p=lilypond.git diff --git a/ly/property-init.ly b/ly/property-init.ly index 4b200d509b..7cae78ebb1 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,210 +1,285 @@ % property-init.ly -\version "1.3.146" +\version "2.11.38" -stemUp = \property Voice.Stem \set #'direction = #1 -stemDown = \property Voice.Stem \set #'direction = #-1 -stemBoth= \property Voice.Stem \revert #'direction +stemUp = \override Stem #'direction = #UP +stemDown = \override Stem #'direction = #DOWN +stemNeutral= \revert Stem #'direction -slurUp = \property Voice.Slur \override #'direction = #1 -slurDown = \property Voice.Slur \override #'direction = #-1 -slurBoth = \property Voice.Slur \revert #'direction -shiftOn = \property Voice.NoteColumn \override #'horizontal-shift = #1 -shiftOnn = \property Voice.NoteColumn \override #'horizontal-shift = #2 -shiftOnnn = \property Voice.NoteColumn \override #'horizontal-shift = #3 -shiftOff = \property Voice.NoteColumn \revert #'horizontal-shift +slurUp = \override Slur #'direction = #UP +slurDown = \override Slur #'direction = #DOWN +slurNeutral = \revert Slur #'direction -tieUp = \property Voice.Tie \override #'direction = #1 -tieDown = \property Voice.Tie \override #'direction = #-1 -tieBoth = \property Voice.Tie \revert #'direction - -dynamicUp = { - \property Voice.DynamicText \override #'direction = #1 - \property Voice.DynamicLineSpanner \override #'direction = #1 +%% There's also dash, but setting dash period/length should be fixed. +slurDashed = { + \override Slur #'dash-period = #0.75 + \override Slur #'dash-fraction = #0.4 } -dynamicDown = { - \property Voice.DynamicText \override #'direction = #-1 - \property Voice.DynamicLineSpanner \override #'direction = #-1 +slurDotted = { + \override Slur #'dash-period = #0.75 + \override Slur #'dash-fraction = #0.1 } -dynamicBoth = { - \property Voice.DynamicText \revert #'direction - \property Voice.DynamicLineSpanner \revert #'direction +slurSolid = { + \revert Slur #'dash-period + \revert Slur #'dash-fraction } -scriptUp = { - \property Voice.TextScript \override #'direction = #1 - \property Voice.Script \override #'direction = #1 + +phrasingSlurUp = \override PhrasingSlur #'direction = #UP +phrasingSlurDown = \override PhrasingSlur #'direction = #DOWN +phrasingSlurNeutral = \revert PhrasingSlur #'direction + +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 +tieNeutral = \revert Tie #'direction + +tieDashed = { + \override Tie #'dash-period = #0.75 + \override Tie #'dash-fraction = #0.4 } -scriptDown = { - \property Voice.TextScript \override #'direction = #-1 - \property Voice.Script \override #'direction = #-1 +tieDotted = { + \override Tie #'dash-period = #0.75 + \override Tie #'dash-fraction = #0.1 } -scriptBoth = { - \property Voice.TextScript \revert #'direction - \property Voice.Script \revert #'direction +tieSolid = { + \revert Tie #'dash-period + \revert Tie #'dash-fraction } -dotsUp = \property Voice.Dots \override #'direction = #1 -dotsDown = \property Voice.Dots \override #'direction = #-1 -dotsBoth = \property Voice.Dots \revert #'direction +easyHeadsOn = { + \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \override NoteHead #'font-size = #-7 + \override NoteHead #'font-family = #'sans + \override NoteHead #'font-series = #'bold +} -% why doubly? -tupletUp = { - \property Voice.TupletBracket \override #'direction = #1 - \property Voice.TupletBracket \override #'direction = #1 +easyHeadsOff = { + \revert NoteHead #'stencil + \revert NoteHead #'font-size + \revert NoteHead #'font-family + \revert NoteHead #'font-series } -tupletDown = { - \property Voice.TupletBracket \override #'direction = #-1 - \property Voice.TupletBracket \override #'direction = #-1 + +aikenHeads = \set shapeNoteStyles = ##(do re mi fa #f la ti) + +sacredHarpHeads = + \set shapeNoteStyles = ##(fa #f la fa #f la mi) + +dynamicUp = { + \override DynamicText #'direction = #UP + \override DynamicLineSpanner #'direction = #UP } -tupletBoth = { - \property Voice.TupletBracket \revert #'direction - \property Voice.TupletBracket \revert #'direction + +dynamicDown = { + \override DynamicText #'direction = #DOWN + \override DynamicLineSpanner #'direction = #DOWN } +dynamicNeutral = { + \revert DynamicText #'direction + \revert DynamicLineSpanner #'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 +tupletNeutral = \revert TupletBracket #'direction -cadenzaOn = \property Score.timing = ##f +cadenzaOn = \set Timing.timing = ##f cadenzaOff = { - \property Score.timing = ##t - \property Score.measurePosition = #(make-moment 0 1) + \set Timing.timing = ##t + \set Timing.measurePosition = #ZERO-MOMENT } -newpage = { - \break - % urg, only works for TeX output - \context Score \outputproperty #(make-type-checker 'paper-column-interface) - #'between-system-string = #"\\newpage" +% 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) +voiceFour = #(context-spec-music (make-voice-props-set 3) 'Voice) + +voiceOneStyle = { + \override NoteHead #'style = #'diamond + \override NoteHead #'color = #red + \override Stem #'color = #red + \override Beam #'color = #red +} +voiceTwoStyle = { + \override NoteHead #'style = #'triangle + \override NoteHead #'color = #blue + \override Stem #'color = #blue + \override Beam #'color = #blue +} +voiceThreeStyle = { + \override NoteHead #'style = #'xcircle + \override NoteHead #'color = #green + \override Stem #'color = #green + \override Beam #'color = #green +} +voiceFourStyle = { + \override NoteHead #'style = #'cross + \override NoteHead #'color = #magenta + \override Stem #'color = #magenta + \override Beam #'color = #magenta +} +voiceNeutralStyle = { + \revert NoteHead #'style + \revert NoteHead #'color + \revert Stem #'color + \revert Beam #'color } -% dynamic dir? text script, articulation script dir? -oneVoice = { - \stemBoth - \slurBoth - \tieBoth - \shiftOff + +tiny = { + \set fontSize = #-2 } -voiceOne = { - \stemUp - \slurUp - \tieUp - \dotsUp +small = { + \set fontSize = #-1 } -voiceTwo = { - \stemDown - \slurDown - \tieDown - \dotsDown +normalsize = { + \set fontSize = #0 +} +large = { + \set fontSize = #1 } - -voiceThree = { - \stemUp - \slurUp - \tieUp - \shiftOn - \dotsUp + +huge = { + \set fontSize = #2 } -voiceFour = { - \stemDown - \slurDown - \tieDown - \shiftOn - \dotsDown +%% End the incipit and print a ``normal line start''. +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 + \bar "" } -% There's also dash, but setting dash period/length should be fixed. -slurDotted = \property Voice.Slur \override #'dashed = #1 -slurSolid = \property Voice.Slur \revert #'dashed -tieDotted = \property Voice.Tie \override #'dashed = #1 -tieSolid = \property Voice.Tie \revert #'dashed +autoBeamOff = \set autoBeaming = ##f +autoBeamOn = \set autoBeaming = ##t - -tiny = - \property Voice.fontSize= -2 +textLengthOn = { + \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 +} -small = - \property Voice.fontSize= -1 +showStaffSwitch = \set followVoice = ##t +hideStaffSwitch = \set followVoice = ##f +expandFullBarRests = { + \set Score.skipBars = ##f +} -normalsize = { - \property Voice.fontSize= 0 +compressFullBarRests = { + \set Score.skipBars = ##t } -normalkey = { - \property Staff.keyOctaviation = ##f +numericTimeSignature = { + \override Staff.TimeSignature #'style = #'() } -specialkey = { - \property Staff.keyOctaviation = ##t +defaultTimeSignature = { + \revert Staff.TimeSignature #'style } -% End the incipit and print a ``normal line start''. -endincipit = \notes{ - \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit - \context Staff \outputproperty #(make-type-checker 'clef-interface) #'full-size-change = ##t - \context Staff \outputproperty #(make-type-checker 'clef-interface) #'non-default = ##t - \bar "" + +% For drawing vertical chord brackets with \arpeggio +% This is a shorthand for the value of the print-function property +% of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether +% cross-staff brackets are desired. + +arpeggio = #(make-music 'ArpeggioEvent) + +arpeggioUp = \sequential { + \revert Arpeggio #'stencil + \override Arpeggio #'arpeggio-direction = #UP +} +arpeggioDown = \sequential { + \revert Arpeggio #'stencil + \override Arpeggio #'arpeggio-direction = #DOWN +} +arpeggioNeutral = \sequential { + \revert Arpeggio #'stencil + \revert Arpeggio #'arpeggio-direction +} +arpeggioBracket = \sequential { + \override Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket } -autoBeamOff = \property Voice.noAutoBeaming = ##t -autoBeamOn = \property Voice.noAutoBeaming = ##f +glissando = #(make-music 'GlissandoEvent) -emptyText = \property Voice.textNonEmpty = ##f -fatText = \property Voice.textNonEmpty = ##t +fermataMarkup = \markup { \musicglyph #"scripts.ufermata" } + +hideNotes =\sequential { + % 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 +} -showStaffSwitch = \property PianoStaff.followVoice = ##t -hideStaffSwitch = \property PianoStaff.followVoice = ##f -% FIXME: Move this docu (to where?) +unHideNotes = \sequential { + \revert Accidental #'transparent + \revert Beam #'transparent + \revert Stem #'transparent + \revert NoteHead #'transparent + \revert NoteHead #'no-ledgers + \revert Dots #'transparent +} -% accidentals as they were common in the 18th century. -defaultAccidentals = { - \property Score.extraNatural = ##t - \property Score.autoAccidentals = #'((measure-same-octave . 0)) - \property Score.autoCautionaries = #'() +germanChords = { + \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 } -% 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 Score.extraNatural = ##f - \property Score.autoAccidentals = #'((measure-same-octave . 0) (measure-any-octave . 0) (measure-any-octave . 1)) - \property Score.autoCautionaries = #'() +frenchChords = { + \set chordRootNamer = #(chord-name->italian-markup #t) + \set chordPrefixSpacer = #0.4 } -% the accidentals that Stone adds to the old standard as cautionaries -modernCautionaries = { - \property Score.extraNatural = ##f - \property Score.autoAccidentals = #'((measure-same-octave . 0)) - \property Score.autoCautionaries = #'((measure-any-octave . 0) (measure-any-octave . 1)) +italianChords = { + \set chordRootNamer = #(chord-name->italian-markup #f) + \set chordPrefixSpacer = #0.4 } -% 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 Score.autoAccidentals = #'((measure-same-octave . #t)) - \property Score.autoCautionaries = #'() +improvisationOn = { + \set squashedPosition = #0 + \override NoteHead #'style = #'slash + \override Accidental #'stencil = ##f } -% 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 Score.autoAccidentals = #'((measure-same-octave . -1)) - \property Score.autoCautionaries = #'() +improvisationOff = { + \unset squashedPosition + \revert NoteHead #'style + \revert Accidental #'stencil } +textSpannerUp = \override TextSpanner #'direction = #UP +textSpannerDown = \override TextSpanner #'direction = #DOWN +textSpannerNeutral = \revert TextSpanner #'direction -% To remove a Volta bracket or some other graphical object, -% set it to turnOff. Example: \property Staff.VoltaBracket = \turnOff -turnOff = #'()