-\version "2.10.0"
+\version "2.12.0"
\context {
\name "Global"
\consists "Separating_line_group_engraver"
\consists "Font_size_engraver"
\consists "Instrument_name_engraver"
+
+ predefinedDiagramTable = #fretboard-table
}
\context {
\context {
\type "Engraver_group"
- \name "InnerChoirStaff"
+ \name "ChoirStaff"
\consists "System_start_delimiter_engraver"
systemStartDelimiter = #'SystemStartBracket
vocalName = #'()
\accepts "PianoStaff"
\accepts "Lyrics"
\accepts "ChordNames"
+ \accepts "ChoirStaff"
+ \accepts "StaffGroup"
\defaultchild "Staff"
-}
-
-\context {
- \InnerChoirStaff
- \name ChoirStaff
-
- \defaultchild "Staff"
- \accepts "InnerChoirStaff"
- \accepts "InnerStaffGroup"
\description "Identical to @code{StaffGroup} except that the
contained staves are not connected vertically."
-
}
\context{
\consists "Part_combine_engraver"
\consists "Text_engraver"
- \consists "Dynamic_engraver"
+ \consists "New_dynamic_engraver"
+ \consists "Dynamic_align_engraver"
+% \consists "Dynamic_engraver"
\consists "Fingering_engraver"
\consists "Bend_engraver"
fontSize = #-4
\override Stem #'length-fraction = #(magstep -4)
\override Beam #'length-fraction = #(magstep -4)
+ \override Beam #'thickness = #0.35
}
\context {
\description "A voice on a percussion staff."
\remove "Arpeggio_engraver"
- \consists "Multi_measure_rest_engraver"
- \consists "Text_spanner_engraver"
\consists "Grob_pq_engraver"
\remove "Note_head_line_engraver"
\remove "Fingering_engraver"
\remove "Cluster_spanner_engraver"
- \consists "Tuplet_engraver"
\consists "Skip_event_swallow_translator"
}
\consists "System_start_delimiter_engraver"
systemStartDelimiter = #'SystemStartBrace
+ \defaultchild "Staff"
\accepts "Staff"
\accepts "FiguredBass"
}
\name "PianoStaff"
\alias "GrandStaff"
- \description "Just like @code{GrandStaff} but with a forced
-distance between the staves, so cross staff beaming and slurring
-can be used."
+ \description "Just like @code{GrandStaff} but with support for
+instrument names at the start of each system."
\consists "Instrument_name_engraver"
\context {
\type "Engraver_group"
- \name InnerStaffGroup
+ \name "StaffGroup"
\consists "Span_bar_engraver"
\consists "Span_arpeggio_engraver"
\accepts "TabStaff"
\accepts "Lyrics"
\accepts "ChordNames"
-}
-
-\context {
- \InnerStaffGroup
- \name StaffGroup
+ \accepts "FiguredBass"
+ \accepts "ChoirStaff"
+ \accepts "StaffGroup"
\description "Groups staves while adding a bracket on the left
side, grouping the staves together. The bar lines of the contained
staves are connected vertically. @code{StaffGroup} only consists of
a collection of staves, with a bracket in front and spanning bar lines."
-
- \accepts "InnerChoirStaff"
- \accepts "ChoirStaff"
- \accepts "InnerStaffGroup"
- \accepts "FiguredBass"
}
-
\context{
\type "Engraver_group"
\override VerticalAxisGroup #'minimum-Y-extent = #'(-0.75 . 2.0)
tieWaitForNote = ##f
clefGlyph = #"clefs.G"
clefPosition = #-2
+ middleCClefPosition = #-6
middleCPosition = #-6
firstClef = ##t
+
+ crescendoSpanner = #'hairpin
+ decrescendoSpanner = #'hairpin
defaultBarType = #"|"
+ doubleRepeatType = #":|:"
barNumberVisibility = #first-bar-number-invisible
automaticBars = ##t
explicitKeySignatureVisibility = #all-visible
implicitTimeSignatureVisibility = #end-of-line-invisible
+ repeatCountVisibility = #all-repeat-counts-visible
+
autoBeamSettings = #default-auto-beam-settings
autoBeaming = ##t
autoBeamCheck = #default-auto-beam-check
markFormatter = #format-mark-letters
rehearsalMark = #1
subdivideBeams = ##f
- allowBeamBreak = ##f
extraNatural = ##t
- autoAccidentals = #'(Staff (same-octave . 0))
+ autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0))
autoCautionaries = #'()
printKeyCancellation = ##t
bassStaffProperties = #'((assign clefGlyph "clefs.F")
(assign clefPosition 2)
- (assign middleCPosition 6))
+ (assign middleCPosition 6)
+ (assign middleCClefPosition 6))
%% tablature:
stringOneTopmost = ##t
highStringOne = ##t
(Voice Beam thickness 0.384)
(Voice Beam length-fraction 0.8)
(Voice Accidental font-size -4)
+ (Voice AccidentalCautionary font-size -4)
(Voice Slur direction ,DOWN)
+ (Voice Script font-size -3)
)
keepAliveInterfaces = #'(
rhythmic-grob-interface
lyric-interface
+ percent-repeat-item-interface
+ percent-repeat-interface
;; need this, as stanza numbers are items, and appear only once.
stanza-number-interface
- percent-repeat-interface)
+ )
quotedEventTypes = #'(
note-event
rest-event
instrumentTransposition = #(ly:make-pitch 0 0 0)
verticallySpacedContexts = #'(Staff)
-
- hairpinToBarline = ##t
timing = ##t
}
clefPosition = #0
}
-%% TODO: Gregorian Chant contexts should be moved to gregorian-init.ly,
+%% TODO: Gregorian Chant contexts should be moved to gregorian.ly,
%% but this does not work (is this a bug or intended behaviour?):
%%
%% If I try to do so, I get "error: unknown escaped string:
%% `\VaticanaStaff'" in params-init.ly. If I also move
%% "\context { \Vaticana*Context }" from params-init.ly to the end
-%% of gregorian-init.ly, then I get "error: parse error, unexpected
+%% of gregorian.ly, then I get "error: parse error, unexpected
%% TRANSLATOR: \context { \VaticanaStaff }" in
-%% gregorian-init.ly. --jr
+%% gregorian.ly. --jr
\context {
\Voice
%% Choose vaticana do clef on 3rd line as default.
clefGlyph = #"clefs.vaticana.do"
middleCPosition = #1
+ middleCClefPosition = #1
clefPosition = #1
clefOctavation = #0
%% Select vaticana style font.
- \override KeySignature #'style = #'vaticana
+ \override KeySignature #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
\override Accidental #'glyph-name-alist = #alteration-vaticana-glyph-name-alist
\override Custos #'style = #'vaticana
\override Custos #'neutral-position = #3
\Voice
\name "GregorianTranscriptionVoice"
\alias "Voice"
-
+
%% Removing ligature bracket engraver without replacing it by some
%% other ligature engraver would cause a "Junking event: `LigatureEvent'"
%% warning for every "\[" and "\]". Therefore, we make the grob
\consists "Mensural_ligature_engraver"
%% Set default head for notes outside of \[ \].
- \override NoteHead #'style = #'petrucci
+ \override NoteHead #'style = #'mensural
+ \override Rest #'style = #'mensural
%% There are no beams in mensural notation.
autoBeaming = ##f
%% FIXME: unit on StaffSymbol's width should be \linewidth.
%% \override StaffSymbol #'width = #60.0
- %% Choose petrucci g clef on 2nd line as default.
- clefGlyph = #"clefs.petrucci.g"
+ %% Choose mensural g clef on 2nd line as default.
+ clefGlyph = #"clefs.mensural.g"
+ middleCClefPosition = #-6
middleCPosition = #-6
clefPosition = #-2
clefOctavation = #0
%% Select mensural style font.
\override TimeSignature #'style = #'mensural
- \override KeySignature #'style = #'mensural
+ \override KeySignature #'glyph-name-alist = #alteration-mensural-glyph-name-alist
\override Accidental #'glyph-name-alist = #alteration-mensural-glyph-name-alist
\override Custos #'style = #'mensural
\override Custos #'neutral-position = #3
%% Accidentals are valid only once (same as
%% #(set-accidental-style 'forget))
extraNatural = ##f
- autoAccidentals = #'(Staff (same-octave . -1))
- autoCautionaries = #'()
+ autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
+ autoCautionaries = #'()
printKeyCancellation = ##f
}