%%%% 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.39"
+\version "2.13.48"
\context {
\name "Global"
\consists "Font_size_engraver"
\consists "Instrument_name_engraver"
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
+
predefinedDiagramTable = #default-fret-table
+ handleNegativeFrets = #'recalculate
}
\context {
\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"
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_arpeggio_engraver"
\consists "System_start_delimiter_engraver"
systemStartDelimiter = #'SystemStartBrace
+ topLevelAlignment = ##f
+ %% explicitly set instrument, so it is not inherited from the parent
+ instrumentName = #'()
+ shortInstrumentName = #'()
\defaultchild "Staff"
\accepts "Staff"
\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 #'staff-staff-spacing #'stretchability = #5
-
instrumentName = #'()
shortInstrumentName = #'()
}
\consists "Vertical_align_engraver"
topLevelAlignment = ##f
+ \consists "Instrument_name_engraver"
\consists "Span_bar_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"
pedalUnaCordaStrings = #'("una corda" "" "tre corde")
\override VerticalAxisGroup #'staff-affinity = #CENTER
\override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
- #'((space . 5)
+ #'((basic-distance . 5)
(padding . 0.5))
\override TextScript #'font-shape = #'italic
\override DynamicLineSpanner #'Y-offset = #0
\consists "Instrument_name_engraver"
\consists "Font_size_engraver"
\consists "Hara_kiri_engraver"
+ %% 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 #'nonstaff-relatedstaff-spacing =
- #'((space . 5.5)
- (stretchability . 1)
- (padding . 0.5))
+ #'((basic-distance . 5.5)
+ (padding . 0.5)
+ (stretchability . 1))
\override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
- #'((space . 0)
- (stretchability . 0)
+ #'((basic-distance . 0)
+ (minimum-distance . 2.8)
(padding . 0.2)
- (minimum-distance . 2.8))
- \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.0
+ (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)
}
RemoveEmptyStaves = \with {
\remove "Axis_group_engraver"
+ % If RemoveEmptyStaves is called twice, two
+ % Hara_kiri_engravers would be added, which leads to a
+ % warning.
+ % This code makes sure that no previous Hara_kiri_engraver
+ % is left before adding a new one.
\remove "Hara_kiri_engraver"
\consists "Hara_kiri_engraver"
- \override Beam #'auto-knee-gap = #'()
\override VerticalAxisGroup #'remove-empty = ##t
}
soloIIText = #"Solo II"
aDueText = #"a2"
printPartCombineTexts = ##t
+ partCombineTextsOnNote = ##t
systemStartDelimiter =#'SystemStartBar
drumStyleTable = #drums-style
automaticBars = ##t
explicitClefVisibility = #all-visible
+ explicitCueClefVisibility = #end-of-line-invisible
explicitKeySignatureVisibility = #all-visible
implicitTimeSignatureVisibility = #end-of-line-invisible
\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"
\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 {