%%%% This file is part of LilyPond, the GNU music typesetter.
%%%%
-%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
%%%% Jan Nieuwenhuizen <janneke@gnu.org>
%%%%
%%%% LilyPond is free software: you can redistribute it and/or modify
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.13.27"
+\version "2.15.20"
\context {
\name "Global"
\consists "Font_size_engraver"
\consists "Instrument_name_engraver"
- predefinedDiagramTable = #fretboard-table
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
+
+ predefinedDiagramTable = #default-fret-table
+ handleNegativeFrets = #'recalculate
}
\context {
\consists "Output_property_engraver"
\consists "Bar_engraver"
+ \consists "Pure_from_neighbor_engraver"
%% Bar_engraver must be first so default bars aren't overwritten
%% with empty ones.
\consists "Figured_bass_engraver"
\consists "Figured_bass_position_engraver"
\consists "Script_row_engraver"
+ \consists "Cue_clef_engraver"
localKeySignature = #'()
createSpacing = ##t
%% explicitly set instrument, so we don't get
%% weird effects when doing instrument names for
%% piano staves
-
instrumentName = #'()
shortInstrumentName = #'()
\consists "Vertical_align_engraver"
topLevelAlignment = ##f
+ \consists "Instrument_name_engraver"
\consists "System_start_delimiter_engraver"
systemStartDelimiter = #'SystemStartBracket
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
vocalName = #'()
shortVocalName = #'()
\name RhythmicStaff
\alias "Staff"
- \override BarLine #'bar-size = #4
+ \override BarLine #'bar-extent = #'(-2 . 2)
\override VoltaBracket #'staff-padding = #3
\override StaffSymbol #'line-count = #1
\consists "Axis_group_engraver"
\consists "Ledger_line_engraver"
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
+
\accepts "Voice"
\accepts "CueVoice"
\defaultchild "Voice"
You have to instantiate this explicitly if you want to have
multiple voices on the same staff."
- localKeySignature = #'()
\consists "Font_size_engraver"
\consists "Pitched_trill_engraver"
\consists "Dots_engraver"
\consists "Rest_engraver"
\consists "Tweak_engraver"
+ \consists "Footnote_engraver"
%% switch on to make stem directions interpolate for the
%% center line.
\consists "New_fingering_engraver"
\consists "Chord_tremolo_engraver"
+ \consists "Double_percent_repeat_engraver"
\consists "Percent_repeat_engraver"
\consists "Slash_repeat_engraver"
\consists "Part_combine_engraver"
side, grouping the staves together. The bar lines of the
contained staves are connected vertically."
+ \consists "Instrument_name_engraver"
\consists "Span_bar_engraver"
+ \consists "Span_bar_stub_engraver"
\consists "Span_arpeggio_engraver"
\consists "System_start_delimiter_engraver"
+ \consists "Vertical_align_engraver"
systemStartDelimiter = #'SystemStartBrace
+ topLevelAlignment = ##f
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
\defaultchild "Staff"
\accepts "Staff"
+ \accepts "RhythmicStaff"
+ \accepts "DrumStaff"
+ \accepts "TabStaff"
+ \accepts "Lyrics"
\accepts "FiguredBass"
\accepts "Dynamics"
+ \accepts "ChordNames"
}
\context{
\name "PianoStaff"
\alias "GrandStaff"
- \description "Just like @code{GrandStaff} but with support for
-instrument names at the start of each system."
+ \description "Just like @code{GrandStaff}, but the staves are only removed
+together, never separately."
- \consists "Instrument_name_engraver"
\consists "Vertical_align_engraver"
\consists "Keep_alive_together_engraver"
topLevelAlignment = ##f
- \override StaffGrouper #'between-staff-spacing #'stretchability = #5
-
instrumentName = #'()
shortInstrumentName = #'()
}
\consists "Vertical_align_engraver"
topLevelAlignment = ##f
+ \consists "Instrument_name_engraver"
\consists "Span_bar_engraver"
+ \consists "Span_bar_stub_engraver"
\consists "Span_arpeggio_engraver"
\consists "Output_property_engraver"
systemStartDelimiter = #'SystemStartBracket
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
\consists "System_start_delimiter_engraver"
\consists "Text_engraver"
\consists "Text_spanner_engraver"
\consists "Axis_group_engraver"
+ \consists "Tweak_engraver"
pedalSustainStrings = #'("Ped." "*Ped." "*")
pedalUnaCordaStrings = #'("una corda" "" "tre corde")
\override VerticalAxisGroup #'staff-affinity = #CENTER
- \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5) (padding . 0.5))
+ \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+ #'((basic-distance . 5)
+ (padding . 0.5))
\override TextScript #'font-shape = #'italic
\override DynamicLineSpanner #'Y-offset = #0
+ \override DynamicText #'X-offset =
+ #(ly:make-simple-closure
+ `(,+
+ ,(ly:make-simple-closure
+ (list ly:self-alignment-interface::centered-on-note-columns))
+ ,(ly:make-simple-closure
+ (list ly:self-alignment-interface::x-aligned-on-self))))
\description "Holds a single line of dynamics, which will be
centered between the staves surrounding this context."
printing of a single line of lyrics."
\name "Lyrics"
- instrumentName = #'()
- shortInstrumentName = #'()
-
\consists "Lyric_engraver"
\consists "Extender_engraver"
\consists "Hyphen_engraver"
\consists "Instrument_name_engraver"
\consists "Font_size_engraver"
\consists "Hara_kiri_engraver"
+ \consists "Pure_from_neighbor_engraver"
+ searchForVoice = ##f
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
\override VerticalAxisGroup #'remove-first = ##t
\override VerticalAxisGroup #'remove-empty = ##t
\override VerticalAxisGroup #'staff-affinity = #UP
- \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5.5) (stretchability . 1) (padding . 0.5))
- \override VerticalAxisGroup #'inter-loose-line-spacing = #'((space . 0)
- (stretchability . 0)
- (padding . 0.2)
- (minimum-distance . 2.8))
- \override VerticalAxisGroup #'non-affinity-spacing #'padding = #1.0
+ \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+ #'((basic-distance . 5.5)
+ (padding . 0.5)
+ (stretchability . 1))
+ \override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
+ #'((basic-distance . 0)
+ (minimum-distance . 2.8)
+ (padding . 0.2)
+ (stretchability . 0))
+ \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.5
\override InstrumentName #'self-alignment-Y = ##f
%% sync with define-grobs.scm ;
%% make sure that barlines aren't collapsed, when
%% Bar_engraver is there.
- \override BarLine #'bar-size = #0.1
+ \override BarLine #'bar-extent = #'(-0.05 . 0.05)
}
\description "A context for printing the names of notes."
\consists "Axis_group_engraver"
- % FIXME: not sure what the default should be here.
- \override VerticalAxisGroup #'staff-affinity = #DOWN
+ \override VerticalAxisGroup #'staff-affinity = #UP
+ \override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
+ #'((basic-distance . 0)
+ (minimum-distance . 2.8)
+ (padding . 0.2)
+ (stretchability . 0))
+ \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+ #'((basic-distance . 5.5)
+ (padding . 0.5)
+ (stretchability . 1))
+ \override VerticalAxisGroup
+ #'nonstaff-unrelatedstaff-spacing #'padding = 1.5
\consists "Tie_engraver"
\consists "Note_name_engraver"
\override VerticalAxisGroup #'remove-first = ##t
\override VerticalAxisGroup #'remove-empty = ##t
\override VerticalAxisGroup #'staff-affinity = #DOWN
- \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
- \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
-}
-
-
-RemoveEmptyStaves = \with {
- \remove "Axis_group_engraver"
- \remove "Hara_kiri_engraver"
- \consists "Hara_kiri_engraver"
- \override Beam #'auto-knee-gap = #'()
- \override VerticalAxisGroup #'remove-empty = ##t
+ \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+ \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5
}
-
\context {
\type "Score_engraver"
\name "Score"
%% move the alias along with the engraver.
+ % timing translator must come BEFORE bar number engraver
\consists "Timing_translator"
\consists "Default_bar_line_engraver"
\consists "Output_property_engraver"
\consists "Stanza_number_align_engraver"
\consists "Bar_number_engraver"
\consists "Parenthesis_engraver"
+ \consists "Concurrent_hairpin_engraver"
+ \consists "Beam_collision_engraver"
\defaultchild "Staff"
\accepts "VaticanaStaff"
\accepts "GregorianTranscriptionStaff"
\accepts "MensuralStaff"
+ \accepts "PetrucciStaff"
\accepts "StaffGroup"
\accepts "DrumStaff"
\accepts "Lyrics"
soloIIText = #"Solo II"
aDueText = #"a2"
printPartCombineTexts = ##t
+ partCombineTextsOnNote = ##t
systemStartDelimiter =#'SystemStartBar
drumStyleTable = #drums-style
defaultBarType = #"|"
doubleRepeatType = #":|:"
- barNumberVisibility = #first-bar-number-invisible
+ barNumberVisibility = #first-bar-number-invisible-and-no-parenthesized-bar-numbers
+ barNumberFormatter = #robust-bar-number-function
automaticBars = ##t
explicitClefVisibility = #all-visible
+ explicitCueClefVisibility = #end-of-line-invisible
explicitKeySignatureVisibility = #all-visible
implicitTimeSignatureVisibility = #end-of-line-invisible
(6 . ,FLAT) (2 . ,FLAT) (5 . ,FLAT ) (1 . ,FLAT) (4 . ,FLAT) (0 . ,FLAT) (3 . ,FLAT)
(3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP)
(6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT)
- (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP)
+ (3 . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (1 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP)
)
barCheckSynchronize = ##f
%% chord names:
chordNameFunction = #ignatzek-chord-names
+ minorChordModifier = #(make-simple-markup "m")
+ additionalPitchPrefix = #"" % was "add"
majorSevenSymbol = #whiteTriangleMarkup
chordNameLowercaseMinor = ##f
- chordNameSeparator = #(make-simple-markup "/")
+ chordNameSeparator = #(make-hspace-markup 0.5)
+ slashChordSeparator = #(make-simple-markup "/")
chordNameExceptions = #ignatzekExceptions
chordNoteNamer = #'()
chordRootNamer = #note-name->markup
graceSettings = #`(
(Voice Stem direction ,UP)
(Voice Stem font-size -3)
+ (Voice Flag font-size -3)
(Voice NoteHead font-size -3)
(Voice TabNoteHead font-size -4)
(Voice Dots font-size -3)
)
keepAliveInterfaces = #'(
- rhythmic-grob-interface
+ bass-figure-interface
+ chord-name-interface
+ cluster-beacon-interface
+ fret-diagram-interface
+ lyric-syllable-interface
+ note-head-interface
+ tab-note-head-interface
lyric-interface
percent-repeat-item-interface
percent-repeat-interface
\override VerticalAxisGroup #'remove-empty = ##t
\override VerticalAxisGroup #'remove-first = ##t
\override VerticalAxisGroup #'staff-affinity = #UP
- \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
- \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
+ \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+ \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5
}
\context {
\name "TabVoice"
\alias "Voice"
\consists "Tab_note_heads_engraver"
- \consists "Tab_harmonic_engraver"
+ \consists "Tab_tie_follow_engraver"
\remove "Note_heads_engraver"
\remove "Fingering_engraver"
%% too big. We have to adjust the beam settings:
\override Beam #'beam-thickness = #0.32
\override Beam #'length-fraction = #0.62
+ %% the same goes for tremolo beams
+ \override StemTremolo #'beam-thickness = #0.32
+ %% NOTE: in lily/stem-tremolo.cc, we have length-fraction = 1,
+ %% and the tablature staff space is scaled (1.5 by default),
+ %% so we use the inversion of the scale factor:
+ \override StemTremolo #'length-fraction = #(lambda (grob)
+ (/ 1 (ly:staff-symbol-staff-space grob)))
+ \override StemTremolo #'beam-width = #stem-tremolo::calc-tab-width
%% No accidental in tablature !
\remove "Accidental_engraver"
%% make the Stems as short as possible to minimize their influence
%% on the slur::calc-control-points routine
- \override Stem #'length = #0
\override Stem #'no-stem-extend = ##t
- \override Stem #'flag-style = #'no-flag
+ \override Flag #'style = #'no-flag
\override Stem #'details = #'((lengths 0 0 0 0 0 0)
(beamed-lengths 0 0 0)
(beamed-minimum-free-lengths 0 0 0)
(stem-shorten 0 0))
%% after all, the stubs of the stems may still be visible, so ...
\override Stem #'transparent = ##t
+ \override Flag #'transparent = ##t
%% automatic beams should be suppressed for similar reasons ...
autoBeaming = ##f
%% remove beams, dots and rests ...
\override Beam #'stencil = ##f
+ \override StemTremolo #'stencil = ##f
\override Dots #'stencil = ##f
\override Rest #'stencil = ##f
\override MultiMeasureRest #'stencil = ##f
\override MultiMeasureRestNumber #'transparent = ##t
+ \override MultiMeasureRestText #'transparent = ##t
%% ... all kinds of ties/slurs
\override Tie #'stencil = ##f
\override RepeatTie #'stencil = ##f
\override Hairpin #'transparent = ##t
\override Script #'stencil = ##f
\override TextScript #'stencil = ##f
+ \override Glissando #'stencil = #glissando::draw-tab-glissando
%% the direction for glissando lines will be automatically corrected
\override Glissando #'extra-dy = #glissando::calc-tab-extra-dy
\override Glissando #'bound-details #'right = #`((attach-dir . ,LEFT)
\override Clef #'stencil = #clef::print-modern-tab-if-set
%% no time signature
\override TimeSignature #'stencil = ##f
- %% better parentheses in a TabStaff
- \override ParenthesesItem #'stencils = #parentheses-item::calc-tabstaff-parenthesis-stencils
%% no arpeggios
\override Arpeggio #'stencil = ##f
%% we ignore collision warnings that may occur due to
%% Special "TAB" clef
clefGlyph = #"clefs.tab"
clefPosition = #0
+ %% Change string if note results in negative fret number
+ handleNegativeFrets = #'recalculate
}
\context {
%% Set default head for notes outside of \[ \].
\override NoteHead #'style = #'mensural
\override Rest #'style = #'mensural
+ \override Flag #'style = #'mensural
%% There are no beams in mensural notation.
autoBeaming = ##f
\override Custos #'neutral-direction = #DOWN
%% Accidentals are valid only once (same as
- %% #(set-accidental-style 'forget))
+ %% \accidentalStyle "forget")
extraNatural = ##f
autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
autoCautionaries = #'()
printKeyCancellation = ##f
}
+\context {
+ \Voice
+ \name "PetrucciVoice"
+ \alias "Voice"
+ \description "Same as @code{Voice} context, except that it is
+accommodated for typesetting a piece in Petrucci style."
+
+ \remove "Ligature_bracket_engraver"
+ \consists "Mensural_ligature_engraver"
+
+ %% Set glyph styles.
+ \override NoteHead #'style = #'petrucci
+ \override Rest #'style = #'mensural
+
+ % Thickens and shortens stems.
+ \override Stem #'thickness = #1.7
+ \override Stem #'length = #5
+
+ %% There are no beams in Petrucci notation.
+ autoBeaming = ##f
+}
+
+\context {
+ \Staff
+ \name "PetrucciStaff"
+ \alias "Staff"
+ \denies "Voice"
+ \defaultchild "PetrucciVoice"
+ \accepts "PetrucciVoice"
+ \description "Same as @code{Staff} context, except that it is
+accommodated for typesetting a piece in Petrucci style."
+
+ \consists "Custos_engraver"
+
+ \override StaffSymbol #'thickness = #1.3
+
+ %% Choose Petrucci g clef on 2nd line as default.
+ clefGlyph = #"clefs.petrucci.g"
+ middleCClefPosition = #-6
+ middleCPosition = #-6
+ clefPosition = #-2
+ clefOctavation = #0
+
+ \override Custos #'style = #'mensural
+ \override Custos #'neutral-position = #3
+ \override Custos #'neutral-direction = #DOWN
+
+ %% Accidentals are valid only once (if the following note is different)
+ extraNatural = ##f
+ autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0)
+ ,neo-modern-accidental-rule)
+ autoCautionaries = #'()
+ printKeyCancellation = ##f
+}
%% Keep the old definitions in here for compatibility (they erase previous
%% settings to the corresponding context!).
\TabStaff
\RemoveEmptyStaves
}
-
projects / lilypond.git / blobdiff