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

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

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 1a36b7fd19ef8b13a326ac610b08007f3fad19e9..fddfbf09188e839542ae21ad77fdf281f3fb37b4 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -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/>.
 
-\version "2.14.0"
+\version "2.16.0"
 
 %%
 %% setup for Request->Element conversion.
@@ -105,6 +105,7 @@
   \consists "Tie_performer"
   \consists "Note_performer"
   \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
   \consists "Slur_performer"
 }
 
@@ -116,6 +117,7 @@
   \consists "Tie_performer"
   \consists "Note_performer"
   \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
   \consists "Slur_performer"
 }
 
@@ -127,6 +129,7 @@
   \consists "Tie_performer"
   \consists "Note_performer"
   \consists "Beam_performer"
+  autoBeaming = ##f  % needed for consistent melismata with engravers
   \consists "Slur_performer"
 }
 
@@ -167,6 +170,7 @@
 \context {
   \Voice
   \name TabVoice
+  autoBeaming = ##f  % needed for consistent melismata with engravers
 }
 
 \context {
@@ -189,6 +193,7 @@
   \name Score
 
   melismaBusyProperties = #default-melisma-properties
+  autoBeaming = ##t  % needed for consistent melismata with engravers
   instrumentName = #"bright acoustic"
   midiChannelMapping = #'staff
 
@@ -225,7 +230,7 @@
   %% Timing variables in layout definitions before any
   %% Timing_translator has been run.
 
-  timeSignatureFraction = #'(4 . 4)
+  timeSignatureFraction = 4/4
 
 %% These defaults should be the same as the rules established in
 %%   scm/time-signature-settings.scm for 4/4 time