Fix 899.

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index f7a58b4d01da310c224aaa6b50e56d0f858195ba..81b6c8861aa6cebab34d1d906ea1438722288843 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -78,7 +78,7 @@
 
   localKeySignature = #'()
   createSpacing = ##t
-  ignoreFiguredBassRest = ##t
+  ignoreFiguredBassRest = ##f
 
   %% explicitly set instrument, so we don't get
   %% weird effects when doing instrument names for
@@ -407,7 +407,6 @@ printing of a single line of lyrics."
   \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))
   \override VerticalAxisGroup #'non-affinity-spacing #'padding = #1.0
-  \override SeparationItem #'padding = #0.2
   \override InstrumentName #'self-alignment-Y = ##f
 
   %% sync with define-grobs.scm ;
@@ -451,22 +450,13 @@ printing of a single line of lyrics."
 }
 
 
-RemoveEmptyStaffContext = \context {
-  \Staff
+RemoveEmptyStaves = \with {
   \remove "Axis_group_engraver"
   \consists "Hara_kiri_engraver"
   \override Beam #'auto-knee-gap = #'()
   \override VerticalAxisGroup #'remove-empty = ##t
 }
 
-AncientRemoveEmptyStaffContext = \context {
-%% why not add by default?
-
-  \RemoveEmptyStaffContext
-  \accepts "VaticanaVoice"
-  \accepts "GregorianTranscriptionVoice"
-  \accepts "MensuralVoice"
-}
 
 \context {
   \type "Score_engraver"
@@ -527,6 +517,7 @@ automatically when an output definition (a @code{\score} or
 
 
   noteToFretFunction = #determine-frets
+  predefinedDiagramTable = ##f
   soloText = #"Solo"
   soloIIText = #"Solo II"
   aDueText = #"a2"
@@ -617,10 +608,11 @@ automatically when an output definition (a @code{\score} or
   stringOneTopmost = ##t
   highStringOne = ##t
 
-%% One may change the strings tuning as following :
-%% The lenght of the list must be equal to the number of string
+%% One may change the string tunings as follows :
+%% The length of the list must be equal to the number of strings
   stringTunings = #guitar-tuning
   tablatureFormat = #fret-number-tablature-format
+  tabStaffLineLayoutFunction = #tablature-position-on-lines
 
 %%
   figuredBassFormatter = #format-bass-figure
@@ -823,6 +815,8 @@ of Editio Vaticana."
   \remove "Stem_engraver"
   \remove "Ligature_bracket_engraver"
   \consists "Vaticana_ligature_engraver"
+  \remove "Text_spanner_engraver"
+  \consists "Episema_engraver"
 
   %% Set default head for notes outside of \[ \].
   \override NoteHead #'style = #'vaticana.punctum
@@ -833,15 +827,6 @@ of Editio Vaticana."
 
   %% There are no beams in Gregorian Chant notation.
   autoBeaming = ##f
-
-  %% Prepare TextSpanner for \episem{Initium|Finis} use.
-  %%
-  %% FIXME: The line @code{\override TextSpanner #'padding = #-0.1} is
-  %% required to force the articulation signs being placed vertically
-  %% tightly to the correpsonding note heads.
-  %%
-  \override TextSpanner #'style = #'line
-  \override TextSpanner #'padding = #-0.1
 }
 
 \context {
@@ -890,6 +875,7 @@ of Editio Vaticana."
   \Voice
   \name "GregorianTranscriptionVoice"
   \alias "Voice"
+  \consists "Episema_engraver"
 
   %% Removing ligature bracket engraver without replacing it by some
   %% other ligature engraver would cause a "Junking event: `LigatureEvent'"
@@ -904,18 +890,6 @@ of Editio Vaticana."
   %% There are no beams in Gregorian Chant notation.
   autoBeaming = ##f
 
-  %% Prepare TextSpanner for \episem{Initium|Finis} use.
-  %%
-  %% N.B.: dash-fraction MUST be unset; otherwise, TextSpanner will
-  %% always produce dashed lines, regardless of the style property.
-  %%
-  %% FIXME: The line @code{\override TextSpanner #'padding = #-0.1} is
-  %% required to force the articulation signs being placed vertically
-  %% tightly to the correpsonding note heads.
-  %%
-  \override TextSpanner #'dash-fraction = #'()
-  \override TextSpanner #'style = #'line
-  \override TextSpanner #'padding = #-0.1
 }
 
 \context {
@@ -996,24 +970,35 @@ accommodated for typesetting a piece in mensural style."
   printKeyCancellation = ##f
 }
 
+
+%% Keep the old definitions in here for compatibility (they erase previous
+%% settings to the corresponding context!).
+%% For new scores, one should simply insert the \RemoveEmptyStaves settings
+%% into the desired context. That's just as easy, requires only one line more
+%% (the \*Staff), but preserves previous context mods.
+%% TODO: DEPRECATED_2.13.17, remove at some point in the future
+RemoveEmptyStaffContext = \context {
+  \Staff
+  \RemoveEmptyStaves
+}
+
+AncientRemoveEmptyStaffContext = \context {
+  \VaticanaStaff
+  \RemoveEmptyStaves
+}
+
 RemoveEmptyDrumStaffContext = \context {
   \DrumStaff
-  \remove "Axis_group_engraver"
-  \override VerticalAxisGroup #'remove-empty = ##t
-  \consists "Hara_kiri_engraver"
+  \RemoveEmptyStaves
 }
 
 RemoveEmptyRhythmicStaffContext = \context {
   \RhythmicStaff
-  \remove "Axis_group_engraver"
-  \override VerticalAxisGroup #'remove-empty = ##t
-  \consists "Hara_kiri_engraver"
+  \RemoveEmptyStaves
 }
 
 RemoveEmptyTabStaffContext = \context {
   \TabStaff
-  \remove "Axis_group_engraver"
-  \override VerticalAxisGroup #'remove-empty = ##t
-  \consists "Hara_kiri_engraver"
+  \RemoveEmptyStaves
 }