Optimize beam scoring.

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0b6cd7b3aa68fc1dbda2aff660eb160553b9083a..7f7297e4145df839cd5b0fb70365d326fae0f4df 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
 %%%% 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
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify


@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 %%%% 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.27"
+\version "2.13.48"

 
 \context {
   \name "Global"
 
 \context {
   \name "Global"


@@ -40,6 +40,10 @@
   \consists "Font_size_engraver"
   \consists "Instrument_name_engraver"
 
   \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
 }
 
   predefinedDiagramTable = #default-fret-table
 }
 


@@ -75,6 +79,7 @@
   \consists "Figured_bass_engraver"
   \consists "Figured_bass_position_engraver"
   \consists "Script_row_engraver"
   \consists "Figured_bass_engraver"
   \consists "Figured_bass_position_engraver"
   \consists "Script_row_engraver"

+  \consists "Cue_clef_engraver"

 
   localKeySignature = #'()
   createSpacing = ##t
 
   localKeySignature = #'()
   createSpacing = ##t


@@ -83,7 +88,6 @@
   %% explicitly set instrument, so we don't get
   %% weird effects when doing instrument names for
   %% piano staves
   %% explicitly set instrument, so we don't get
   %% weird effects when doing instrument names for
   %% piano staves

-

   instrumentName = #'()
   shortInstrumentName = #'()
 
   instrumentName = #'()
   shortInstrumentName = #'()
 


@@ -125,8 +129,12 @@
   \consists "Vertical_align_engraver"
   topLevelAlignment = ##f
 
   \consists "Vertical_align_engraver"
   topLevelAlignment = ##f
 

+  \consists "Instrument_name_engraver"

   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBracket
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBracket

+  %% explicitly set instrument, so it is not inherited from the parent
+  instrumentName = #'()
+  shortInstrumentName = #'()

   vocalName = #'()
   shortVocalName = #'()
 
   vocalName = #'()
   shortVocalName = #'()
 


@@ -155,7 +163,7 @@ contained staves are not connected vertically."
   \name RhythmicStaff
   \alias "Staff"
 
   \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
 
   \override VoltaBracket #'staff-padding = #3
   \override StaffSymbol #'line-count = #1
 


@@ -174,6 +182,10 @@ contained staves are not connected vertically."
   \consists "Axis_group_engraver"
   \consists "Ledger_line_engraver"
 
   \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"
   \accepts "Voice"
   \accepts "CueVoice"
   \defaultchild "Voice"


@@ -295,15 +307,21 @@ multiple voices on the same staff."
 side, grouping the staves together.  The bar lines of the
 contained staves are connected vertically."
 
 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
   \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"
 
   \defaultchild "Staff"
   \accepts "Staff"
   \accepts "FiguredBass"
   \accepts "Dynamics"

+  \accepts "ChordNames"

 }
 
 \context{
 }
 
 \context{


@@ -311,16 +329,13 @@ contained staves are connected vertically."
   \name "PianoStaff"
   \alias "GrandStaff"
 
   \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
 
   \consists "Vertical_align_engraver"
   \consists "Keep_alive_together_engraver"
   topLevelAlignment = ##f
 

-  \override StaffGrouper #'between-staff-spacing #'stretchability = #5
-

   instrumentName = #'()
   shortInstrumentName = #'()
 }
   instrumentName = #'()
   shortInstrumentName = #'()
 }


@@ -332,10 +347,14 @@ instrument names at the start of each system."
   \consists "Vertical_align_engraver"
   topLevelAlignment = ##f
 
   \consists "Vertical_align_engraver"
   topLevelAlignment = ##f
 

+  \consists "Instrument_name_engraver"

   \consists "Span_bar_engraver"
   \consists "Span_arpeggio_engraver"
   \consists "Output_property_engraver"
   systemStartDelimiter = #'SystemStartBracket
   \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"
 
 
   \consists "System_start_delimiter_engraver"
 


@@ -375,7 +394,9 @@ a collection of staves, with a bracket in front and spanning bar lines."
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")
   \override VerticalAxisGroup #'staff-affinity = #CENTER
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")
   \override VerticalAxisGroup #'staff-affinity = #CENTER

-  \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5) (padding . 0.5))
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+    #'((basic-distance . 5)
+       (padding . 0.5))

   \override TextScript #'font-shape = #'italic
   \override DynamicLineSpanner #'Y-offset = #0
 
   \override TextScript #'font-shape = #'italic
   \override DynamicLineSpanner #'Y-offset = #0
 


@@ -401,16 +422,23 @@ printing of a single line of lyrics."
   \consists "Instrument_name_engraver"
   \consists "Font_size_engraver"
   \consists "Hara_kiri_engraver"
   \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 #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \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)
-                                                             (minimum-distance . 2.8))
-  \override VerticalAxisGroup #'non-affinity-spacing #'padding = #1.0
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+    #'((basic-distance . 5.5)
+       (padding . 0.5)
+       (stretchability . 1))
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
+     #'((basic-distance . 0)
+       (minimum-distance . 2.8)
+       (padding . 0.2)
+       (stretchability . 0))
+  \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.5

   \override InstrumentName #'self-alignment-Y = ##f
 
   %% sync with define-grobs.scm ;
   \override InstrumentName #'self-alignment-Y = ##f
 
   %% sync with define-grobs.scm ;


@@ -418,7 +446,7 @@ printing of a single line of lyrics."
 
   %% make sure that barlines aren't collapsed, when
   %% Bar_engraver is there.
 
   %% 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)

 
 }
 
 
 }
 


@@ -449,16 +477,20 @@ printing of a single line of lyrics."
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #DOWN
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #DOWN

-  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
-  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5

 }
 
 
 RemoveEmptyStaves = \with {
   \remove "Axis_group_engraver"
 }
 
 
 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"
   \remove "Hara_kiri_engraver"
   \consists "Hara_kiri_engraver"

-  \override Beam #'auto-knee-gap = #'()

   \override VerticalAxisGroup #'remove-empty = ##t
 }
 
   \override VerticalAxisGroup #'remove-empty = ##t
 }
 


@@ -526,6 +558,7 @@ automatically when an output definition (a @code{\score} or
   soloIIText = #"Solo II"
   aDueText = #"a2"
   printPartCombineTexts = ##t
   soloIIText = #"Solo II"
   aDueText = #"a2"
   printPartCombineTexts = ##t

+  partCombineTextsOnNote = ##t

   systemStartDelimiter =#'SystemStartBar
 
   drumStyleTable = #drums-style
   systemStartDelimiter =#'SystemStartBar
 
   drumStyleTable = #drums-style


@@ -547,6 +580,7 @@ automatically when an output definition (a @code{\score} or
   automaticBars = ##t
 
   explicitClefVisibility = #all-visible
   automaticBars = ##t
 
   explicitClefVisibility = #all-visible

+  explicitCueClefVisibility = #end-of-line-invisible

   explicitKeySignatureVisibility = #all-visible
   implicitTimeSignatureVisibility = #end-of-line-invisible
 
   explicitKeySignatureVisibility = #all-visible
   implicitTimeSignatureVisibility = #end-of-line-invisible
 


@@ -597,7 +631,7 @@ automatically when an output definition (a @code{\score} or
     (6 . ,FLAT) (2  . ,FLAT) (5 . ,FLAT ) (1  . ,FLAT) (4  . ,FLAT) (0  . ,FLAT) (3  . ,FLAT)
     (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP)
     (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT)
     (6 . ,FLAT) (2  . ,FLAT) (5 . ,FLAT ) (1  . ,FLAT) (4  . ,FLAT) (0  . ,FLAT) (3  . ,FLAT)
     (3 . ,SHARP) (0 . ,SHARP) (4 . ,SHARP) (1 . ,SHARP) (5 . ,SHARP) (2 . ,SHARP) (6 . ,SHARP)
     (6 . ,DOUBLE-FLAT) (2 . ,DOUBLE-FLAT) (5 . ,DOUBLE-FLAT ) (1 . ,DOUBLE-FLAT) (4 . ,DOUBLE-FLAT) (0 . ,DOUBLE-FLAT) (3 . ,DOUBLE-FLAT)

-    (3  . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP)
+    (3  . ,DOUBLE-SHARP) (0 . ,DOUBLE-SHARP) (4 . ,DOUBLE-SHARP) (1 . ,DOUBLE-SHARP) (5 . ,DOUBLE-SHARP) (2 . ,DOUBLE-SHARP) (6 . ,DOUBLE-SHARP)

   )
 
   barCheckSynchronize = ##f
   )
 
   barCheckSynchronize = ##f


@@ -698,8 +732,8 @@ automatically when an output definition (a @code{\score} or
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP

-  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
-  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5

 }
 
 \context {
 }
 
 \context {


@@ -718,7 +752,7 @@ context."
   \name "TabVoice"
   \alias "Voice"
   \consists "Tab_note_heads_engraver"
   \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"
 
   \remove "Note_heads_engraver"
   \remove "Fingering_engraver"


@@ -782,6 +816,7 @@ context."
   \override Hairpin #'transparent = ##t
   \override Script #'stencil = ##f
   \override TextScript #'stencil = ##f
   \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)
   %% 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)


@@ -821,8 +856,6 @@ contexts and handles the line spacing, the tablature clef etc. properly."
   \override Clef #'stencil = #clef::print-modern-tab-if-set
   %% no time signature
   \override TimeSignature #'stencil = ##f
   \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
   %% no arpeggios
   \override Arpeggio #'stencil = ##f
   %% we ignore collision warnings that may occur due to