Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond into lilypond/translation

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 1e73c3e8dddb51581e342972c43f69717ca3b4fb..dbc8dbea56b086840fd47b5ea01284d17139c174 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -46,6 +46,7 @@
 
   predefinedDiagramTable = #default-fret-table
   handleNegativeFrets = #'recalculate
+  restrainOpenStrings = ##f
 }
 
 \context {
@@ -60,6 +61,7 @@
 
   \consists "Font_size_engraver"
   \consists "Separating_line_group_engraver"
+  \consists "Dot_column_engraver"
   \consists "Staff_collecting_engraver"
 
  %% perhaps move to Voice context?
@@ -225,7 +227,6 @@ multiple voices on the same staff."
   \consists "Breathing_sign_engraver"
   \consists "Note_heads_engraver"
   \consists "Dots_engraver"
-  \consists "Dot_column_engraver"
   \consists "Rest_engraver"
   \consists "Tweak_engraver"
   \consists "Footnote_engraver"
@@ -527,7 +528,14 @@ automatically when an output definition (a @code{\score} or
   \consists "Repeat_acknowledge_engraver"
   \consists "Staff_collecting_engraver"
 
-  %% move the alias along with the engraver.
+  \alias "Timing"
+
+  %% An alias for Timing is established by the Timing_translator in
+  %% whatever context it is initialized, and the timing variables are
+  %% then copied from wherever Timing had been previously established.
+  %% The alias at Score level provides a target for initializing
+  %% Timing variables in layout definitions before any
+  %% Timing_translator has been run.
 
   % timing translator must come BEFORE bar number engraver
   \consists "Timing_translator"
@@ -614,6 +622,9 @@ automatically when an output definition (a @code{\score} or
   beatStructure = #'(1 1 1 1)
   beamExceptions = #'((end . (((1 . 8) . (4 4))
                               ((1 . 12) . (3 3 3 3)))))
+  beamWholeMeasure = ##t
+  beamHalfMeasure = ##f
+
   autoBeaming = ##t
   autoBeamCheck = #default-auto-beam-check
 
@@ -889,6 +900,8 @@ contexts and handles the line spacing, the tablature clef etc. properly."
   clefPosition = #0
   %% Change string if note results in negative fret number
   handleNegativeFrets = #'recalculate
+  %% Allow open strings even if minimumFret is set
+  restrainOpenStrings = ##f
 }
 
 \context {
@@ -1121,8 +1134,6 @@ accommodated for typesetting a piece in Petrucci style."
  \description "Same as @code{Voice} context, except that it is
 accommodated for typesetting a piece in Kievan style."
 
-% \override Stem #'stencil = ##f
-
  %% Set glyph styles.
  \override NoteHead #'style = #'kievan
  \override Rest #'style = #'mensural
@@ -1146,6 +1157,8 @@ accommodated for typesetting a piece in Kievan style."
  \description "Same as @code{Staff} context, except that it is
 accommodated for typesetting a piece in Kievan style."
 
+ \remove "Time_signature_engraver"
+
  %% Choose Kievan tsefaut clef
  clefGlyph = #"clefs.kievan.do"
  middleCClefPosition = #0