From: David Kastrup <dak@gnu.org>
Date: Fri, 25 Jan 2013 15:40:06 +0000 (+0100)
Subject: Don't initialize variables derived by Timing_translator
X-Git-Tag: release/2.17.12-1~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8d37f20e5a8a7e53065f82d6ff16e4679515c77a;p=lilypond.git

Don't initialize variables derived by Timing_translator
---

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index cd25300e3f..a7754ef67c 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -621,16 +621,13 @@ automatically when an output definition (a @code{\\score} or
 
   repeatCountVisibility = #all-repeat-counts-visible
 
+%% Other Timing variables are derived and set by the Timing_translator
+%% at initialization time by calling the functions in
+%% scm/time-signature-settings.scm
+
   timeSignatureSettings = #default-time-signature-settings
   timeSignatureFraction = 4/4
 
-%% These defaults should be the same as the rules established in
-%%   scm/time-signature-settings.scm for 4/4 time
-  measureLength = #(ly:make-moment 4/4)
-  baseMoment = #(ly:make-moment 1/4)
-  beatStructure = #'(1 1 1 1)
-  beamExceptions = #'((end . (((1 . 8) . (4 4))
-                              ((1 . 12) . (3 3 3 3)))))
   beamHalfMeasure = ##t
 
   autoBeaming = ##t
diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 18a58fd9a3..e39bcf4c48 100644
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -193,7 +193,6 @@
   \name Score
 
   melismaBusyProperties = #default-melisma-properties
-  autoBeaming = ##t  % needed for consistent melismata with engravers
   instrumentName = #"bright acoustic"
   midiChannelMapping = #'staff
 
@@ -230,12 +229,13 @@
   %% Timing variables in layout definitions before any
   %% Timing_translator has been run.
 
+  timeSignatureSettings = #default-time-signature-settings
   timeSignatureFraction = 4/4
+  autoBeaming = ##t  % needed for consistent melismata with engravers
 
-%% These defaults should be the same as the rules established in
-%%   scm/time-signature-settings.scm for 4/4 time
-  measureLength = #(ly:make-moment 4/4)
-  baseMoment = #(ly:make-moment 1/4)
+  %% Other beaming variables are not important as autobeams don't affect
+  %% the Midi.  Melismata are only affected by beams when autobeaming
+  %% is switched off.
 
   \consists "Timing_translator"