X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fengraver-init.ly;h=c145db09ced0299c97b49ed8862a912ddce455cf;hb=5bcf1227a8997d55521c54598642c9ba518690fb;hp=5ff869b9305964504d06f657caa44d70ac63f595;hpb=1f8a60df45cfe68b39a6461b4f898a677847ff8c;p=lilypond.git

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 5ff869b930..c145db09ce 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,22 @@
-\version "2.12.0"
+%%%% This file is part of LilyPond, the GNU music typesetter.
+%%%%
+%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
+%%%%
+%%%% LilyPond is free software: you can redistribute it and/or modify
+%%%% it under the terms of the GNU General Public License as published by
+%%%% the Free Software Foundation, either version 3 of the License, or
+%%%% (at your option) any later version.
+%%%%
+%%%% LilyPond is distributed in the hope that it will be useful,
+%%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%%% GNU General Public License for more details.
+%%%%
+%%%% 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.10"
 
 \context {
   \name "Global"
@@ -16,9 +34,7 @@
   \description "A context for displaying fret diagrams."
 
   \consists "Fretboard_engraver"
-  \consists "Rest_swallow_translator"
   \consists "Output_property_engraver"
-  \consists "Skip_event_swallow_translator"
   \consists "Hara_kiri_engraver"
   \consists "Separating_line_group_engraver"
   \consists "Font_size_engraver"
@@ -55,7 +71,6 @@
   \consists "Piano_pedal_engraver"
   \consists "Piano_pedal_align_engraver"
   \consists "Instrument_name_engraver"
-  \consists "String_number_engraver"
   \consists "Axis_group_engraver"
   \consists "Figured_bass_engraver"
   \consists "Figured_bass_position_engraver"
@@ -91,7 +106,6 @@
   \remove "Ottava_spanner_engraver"
   \remove "Key_engraver"
   \remove "Piano_pedal_engraver"
-  \remove "String_number_engraver"
 
   \description "Handles typesetting for percussion."
 
@@ -123,6 +137,7 @@
   \accepts "PianoStaff"
   \accepts "Lyrics"
   \accepts "ChordNames"
+  \accepts "FiguredBass"
   \accepts "ChoirStaff"
   \accepts "StaffGroup"
   \defaultchild "Staff"
@@ -237,7 +252,6 @@ multiple voices on the same staff."
   \consists "Tuplet_engraver"
   \consists "Grace_engraver"
   \consists "Instrument_switch_engraver"
-  \consists "Skip_event_swallow_translator"
 }
 
 \context{
@@ -270,8 +284,6 @@ multiple voices on the same staff."
   \remove "Fingering_engraver"
 
   \remove "Cluster_spanner_engraver"
-
-  \consists "Skip_event_swallow_translator"
 }
 
 \context{
@@ -307,7 +319,7 @@ instrument names at the start of each system."
   topLevelAlignment = ##f
 
   \override StaffGrouper #'between-staff-spacing #'stretchability = #5
-  
+
   instrumentName = #'()
   shortInstrumentName = #'()
 }
@@ -350,12 +362,13 @@ a collection of staves, with a bracket in front and spanning bar lines."
   \name Dynamics
   \alias Voice
   \consists "Output_property_engraver"
+  \consists "Bar_engraver"
   \consists "Piano_pedal_engraver"
   \consists "Script_engraver"
   \consists "New_dynamic_engraver"
   \consists "Dynamic_align_engraver"
   \consists "Text_engraver"
-  \consists "Skip_event_swallow_translator"
+  \consists "Text_spanner_engraver"
   \consists "Axis_group_engraver"
 
   pedalSustainStrings = #'("Ped." "*Ped." "*")
@@ -363,6 +376,7 @@ a collection of staves, with a bracket in front and spanning bar lines."
   \override VerticalAxisGroup #'staff-affinity = #CENTER
   \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5) (padding . 0.5))
   \override TextScript #'font-shape = #'italic
+  \override DynamicLineSpanner #'Y-offset = #0
 
   \description "Holds a single line of dynamics, which will be
 centered between the staves surrounding this context."
@@ -384,7 +398,6 @@ printing of a single line of lyrics."
   \consists "Hyphen_engraver"
   \consists "Stanza_number_engraver"
   \consists "Instrument_name_engraver"
-  \consists "Skip_event_swallow_translator"
   \consists "Font_size_engraver"
   \consists "Hara_kiri_engraver"
 
@@ -393,6 +406,7 @@ printing of a single line of lyrics."
   \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))
+  \override VerticalAxisGroup #'non-affinity-spacing #'padding = #1.0
   \override SeparationItem #'padding = #0.2
   \override InstrumentName #'self-alignment-Y = ##f
 
@@ -414,9 +428,6 @@ printing of a single line of lyrics."
   % FIXME: not sure what the default should be here.
   \override VerticalAxisGroup #'staff-affinity = #DOWN
 
-
-  \consists "Rest_swallow_translator"
-  \consists "Skip_event_swallow_translator"
   \consists "Tie_engraver"
   \consists "Note_name_engraver"
   \consists "Separating_line_group_engraver"
@@ -427,11 +438,9 @@ printing of a single line of lyrics."
   \name ChordNames
   \description "Typesets chord names."
 
-  \consists "Rest_swallow_translator"
   \consists "Output_property_engraver"
   \consists "Separating_line_group_engraver"
   \consists "Chord_name_engraver"
-  \consists "Skip_event_swallow_translator"
   \consists "Hara_kiri_engraver"
 %  \consists "Note_spacing_engraver"
   \override VerticalAxisGroup #'remove-first = ##t
@@ -442,7 +451,7 @@ printing of a single line of lyrics."
 }
 
 
-RemoveEmptyStaffContext= \context {
+RemoveEmptyStaffContext = \context {
   \Staff
   \remove "Axis_group_engraver"
   \consists "Hara_kiri_engraver"
@@ -518,6 +527,7 @@ automatically when an output definition (a @code{\score} or
 
 
   noteToFretFunction = #determine-frets
+  predefinedDiagramTable = ##f
   soloText = #"Solo"
   soloIIText = #"Solo II"
   aDueText = #"a2"
@@ -608,10 +618,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
@@ -646,7 +657,9 @@ automatically when an output definition (a @code{\score} or
     ;; need this, as stanza numbers are items, and appear only once.
     stanza-number-interface
   )
-  quotedEventTypes = #'(
+  % \quoteDuring is supposed to quote everything, cueDuring only the essentials
+  quotedEventTypes = #'(StreamEvent)
+  quotedCueEventTypes = #'(
     note-event
     rest-event
     tie-event
@@ -669,8 +682,6 @@ automatically when an output definition (a @code{\score} or
   \description "A context for printing a figured bass line."
 
   \consists "Figured_bass_engraver"
-  \consists "Note_swallow_translator"
-  \consists "Skip_event_swallow_translator"
   \consists "Separating_line_group_engraver"
   \consists "Hara_kiri_engraver"
 
@@ -688,7 +699,6 @@ automatically when an output definition (a @code{\score} or
 %% don't want to route anything out of here:
   \alias "Staff"
   \alias "Voice"
-  \consists "Swallow_engraver"
   \description "Silently discards all musical information given to this
 context."
 }
@@ -714,21 +724,35 @@ context."
 
   %% No accidental in tablature !
   \remove "Accidental_engraver"
-  %% remove stems, beams, dots and rests ...
-  \override Stem #'stencil = ##f
+  %% 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 Stem #'details = #'((lengths 0 0 0 0 0 0)
+                                (beamed-lengths 0 0 0)
+                                (beamed-minimum-free-lengths 0 0 0)
+                                (beamed-extreme-minimum-free-lengths 0 0)
+                                (stem-shorten 0 0))
+  %% after all, the stubs of the stems may still be visible, so ...
+  \override Stem #'transparent = ##t
+  %% automatic beams should be suppressed for similar reasons ...
+  autoBeaming = ##f
+  %% remove beams, dots and rests ...
   \override Beam #'stencil = ##f
   \override Dots #'stencil = ##f
   \override Rest #'stencil = ##f
   \override MultiMeasureRest #'stencil = ##f
+  \override MultiMeasureRestNumber #'transparent = ##t
   %% ... all kinds of ties/slurs
   \override Tie  #'stencil = ##f
   \override RepeatTie #'stencil = ##f
   \override LaissezVibrerTie #'stencil = ##f
-  \override Slur #'stencil = ##f
+  \override Slur #'stencil = #slur::draw-tab-slur
   \override PhrasingSlur #'stencil = ##f
   %% 'tied to' fret numbers become invisible or parenthesized, respectively)
-  \override Tie #'after-line-breaking = #tie::handle-tab-tie
-  \override RepeatTie #'after-line-breaking = #repeat-tie::parenthesize-tab-note-head
+  \override Tie #'after-line-breaking = #tie::handle-tab-note-head
+  \override RepeatTie #'after-line-breaking = #repeat-tie::handle-tab-note-head
   %% ... and all kinds of markups, spanners etc.
   \override TupletBracket #'stencil = ##f
   \override TupletNumber #'stencil = ##f
@@ -756,12 +780,13 @@ context."
   \denies "Voice"
   \consists "Tab_staff_symbol_engraver"
 
-  \description "Context for generating tablature. [DOCME]"
+  \description "Context for generating tablature. It accepts only @code{TabVoice}
+contexts and handles the line spacing, the tablature clef etc. properly."
 
   \accepts "TabVoice"
   \defaultchild "TabVoice"
 
-  %% 6 strings
+  %% 6 strings, bigger spacing
   \override StaffSymbol #'staff-space = #1.5
 
   %% Don't draw stems over the tablature figures !
@@ -770,7 +795,8 @@ context."
   %% No accidental in tablature !
   \remove "Accidental_engraver"
   \remove "Key_engraver"
-  \remove "String_number_engraver"
+
+  \remove "Ottava_spanner_engraver"
   %% the clef handler
   \override Clef #'stencil = #clef::print-modern-tab-if-set
   %% no time signature
@@ -779,21 +805,14 @@ context."
   \override ParenthesesItem #'stencils = #parentheses-item::calc-tabstaff-parenthesis-stencils
   %% no arpeggios
   \override Arpeggio #'stencil = ##f
+  %% we ignore collision warnings that may occur due to
+  %% stem overlapping, because we have no stems ;-)
+  \override NoteColumn #'ignore-collision = ##t
   %% Special "TAB" clef
   clefGlyph = #"clefs.tab"
   clefPosition = #0
 }
 
-%% 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.ly, then I get "error: parse error, unexpected
-%% TRANSLATOR: \context { \VaticanaStaff }" in
-%% gregorian.ly. --jr
-
 \context {
   \Voice
   \name "VaticanaVoice"
@@ -979,10 +998,24 @@ accommodated for typesetting a piece in mensural style."
   printKeyCancellation = ##f
 }
 
+RemoveEmptyDrumStaffContext = \context {
+  \DrumStaff
+  \remove "Axis_group_engraver"
+  \override VerticalAxisGroup #'remove-empty = ##t
+  \consists "Hara_kiri_engraver"
+}
 
-RemoveEmptyRhythmicStaffContext= \context {
+RemoveEmptyRhythmicStaffContext = \context {
   \RhythmicStaff
   \remove "Axis_group_engraver"
   \override VerticalAxisGroup #'remove-empty = ##t
   \consists "Hara_kiri_engraver"
 }
+
+RemoveEmptyTabStaffContext = \context {
+  \TabStaff
+  \remove "Axis_group_engraver"
+  \override VerticalAxisGroup #'remove-empty = ##t
+  \consists "Hara_kiri_engraver"
+}
+