Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond into ralph

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index ba0d48d987db0199873e33d0716cd28d3d1be820..1b4537290ed59f180086bc4472df0f4064427f86 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.12.0"
 
 \context {
   \name "Global"
@@ -106,7 +106,7 @@
 
 \context {
   \type "Engraver_group"
-  \name "InnerChoirStaff"
+  \name "ChoirStaff"
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBracket
   vocalName = #'()
@@ -119,19 +119,11 @@
   \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{
@@ -253,6 +245,7 @@ multiple voices on the same staff."
   fontSize = #-4
   \override Stem #'length-fraction = #(magstep -4)
   \override Beam #'length-fraction = #(magstep -4)
+  \override Beam #'thickness = #0.35
 }
 
 \context {
@@ -313,7 +306,7 @@ instrument names at the start of each system."
 
 \context {
   \type "Engraver_group"
-  \name InnerStaffGroup
+  \name "StaffGroup"
 
   \consists "Span_bar_engraver"
   \consists "Span_arpeggio_engraver"
@@ -331,24 +324,16 @@ instrument names at the start of each system."
   \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)
@@ -521,6 +506,8 @@ automatically when an output definition (a @code{\score} or
   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
@@ -547,7 +534,6 @@ automatically when an output definition (a @code{\score} or
   markFormatter = #format-mark-letters
   rehearsalMark = #1
   subdivideBeams = ##f
-  allowBeamBreak = ##f
   extraNatural = ##t
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave 0))
   autoCautionaries = #'()  
@@ -718,15 +704,15 @@ context."
   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
@@ -795,7 +781,7 @@ of Editio Vaticana."
   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
@@ -807,7 +793,7 @@ of Editio Vaticana."
   \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
@@ -861,7 +847,8 @@ accommodated for typesetting a piece in mensural style."
   \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
@@ -889,8 +876,8 @@ accommodated for typesetting a piece in mensural style."
   %% 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
@@ -898,7 +885,7 @@ accommodated for typesetting a piece in mensural style."
 
   %% 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
@@ -908,7 +895,7 @@ accommodated for typesetting a piece in mensural style."
   %% #(set-accidental-style 'forget))
   extraNatural = ##f
   autoAccidentals = #`(Staff ,(make-accidental-rule 'same-octave -1))
-  autoCautionaries = #'()  
+  autoCautionaries = #'()
   printKeyCancellation = ##f
 }