From 41e5afbe165a10f820ea9efdc92cae82e575aeb0 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 1 Jun 1999 11:06:42 +0000
Subject: [PATCH] lilypond-1.1.46

---
 input/test/auto-beam-4-8.ly | 25 +++++++++++++++++++
 lily/auto-beam-engraver.cc  |  9 ++++---
 ly/auto-beam-settings.ly    | 61 +++++++++++++++++++++++++++++++++++++++++----
 mf/feta-generic.mf          |  5 ++--
 mf/feta-test13.mf           | 21 ++++++++++++++++
 mutopia/gallina.ly          |  2 +-
 6 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 input/test/auto-beam-4-8.ly
 create mode 100644 mf/feta-test13.mf

diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly
new file mode 100644
index 0000000000..c10e2464d1
--- /dev/null
+++ b/input/test/auto-beam-4-8.ly
@@ -0,0 +1,25 @@
+\score{
+   \notes\relative c''{
+     \time 4/8;
+
+%{
+    the default for 4/8 (see ly/auto-beam-settings.ly)
+     ----  --------
+     |  |  |   |--|
+    x| x| x|  x| x|
+%}
+     c8 c c c16 c
+
+
+%{
+    user override
+     --------------
+     |  |  |   |--|
+    x| x| x|  x| x|
+%}
+     \property Voice.beamAutoEnd = "2/4"
+     c8 c c c16 c
+
+  }
+}
+    
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 3a74ab95cb..4e383675d7 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -22,7 +22,8 @@ ADD_THIS_TRANSLATOR (Auto_beam_engraver);
 Auto_beam_engraver::Auto_beam_engraver ()
 {
   stem_l_arr_p_ = 0;
-  shortest_mom_ = 1;
+  //shortest_mom_ = 1;
+  shortest_mom_ = Moment (1, 8);
   finished_beam_p_ = 0;
   finished_grouping_p_ = 0;
   grouping_p_ = 0;
@@ -197,7 +198,8 @@ Auto_beam_engraver::end_beam ()
       delete stem_l_arr_p_;
       stem_l_arr_p_ = 0;
       grouping_p_ = 0;
-      shortest_mom_ = 1;
+      //shortest_mom_ = 1;
+      shortest_mom_ = Moment (1, 8);
     }
 }
  
@@ -329,7 +331,8 @@ Auto_beam_engraver::junk_beam ()
   stem_l_arr_p_ = 0;
   delete grouping_p_;
   grouping_p_ = 0;
-  shortest_mom_ = 1;
+  //shortest_mom_ = 1;
+  shortest_mom_ = Moment (1, 8);
 }
 
 void
diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly
index b24a713d41..329da4ec89 100644
--- a/ly/auto-beam-settings.ly
+++ b/ly/auto-beam-settings.ly
@@ -1,31 +1,82 @@
+%%In the file ly/auto-beam-settings.ly, all necessary i-iii settings should
+%%be listed, here's a new version with more comments, (hw, please include).
+%%duh
+
+% auto-beam-settings.ly
+% setup for auto-beam engraver
 %
-% setup for auto beamer
-%
+% specify generic beam end times
 
-% *num_den (omitted if "1")
+% format:
+%
+%     [time-signature]'beamAutoEnd'[duration]
+%
+% where
+%
+%     time-signature = 'time'[numerator]'_'denominator; eg: 3_4
+%     duration = [numerator]'_'denominator; eg: 3_8, _16
+%
 
-time2_8beamAutoEnd = "2/8";
+% in 3/2 time:
+%   end beams each 1/2 note
+%   end beams with 16th notes each 1/4 note
+%   end beams with 32th notes each 1/8 note
 time3_2beamAutoEnd = "1/2";
 time3_2beamAutoEnd_16 = "1/4";
 time3_2beamAutoEnd_32 = "1/8";
+
 time3_4beamAutoBegin = "1/4";
 time3_4beamAutoEnd_8 = "3/4";
 time3_4beamAutoBegin_32 = "1/8";
 time3_4beamAutoEnd_32 = "1/8";
+
 time3_8beamAutoBegin = "1/8";
 time3_8beamAutoEnd = "3/8";
+
+% in common time:
+%   end beams each 1/2 note
+%   end beams with 32th notes each 1/8 note
+%   end beams with 1/8 triplets each 1/4 note
+
 time4_4beamAutoEnd_8 = "1/2";
-% 1/12 == 1/8 * 2/3
 time4_4beamAutoEnd_12 = "1/4";
 time4_4beamAutoEnd_32 = "1/8";
+
 time4_8beamAutoEnd_8 = "1/4";
 time4_8beamAutoEnd_16 = "1/4";
 time4_8beamAutoEnd_32 = "1/8";
+
 time4_16beamAutoEnd = "1/8";
+
 time6_8beamAutoEnd_8 = "3/8";
 time6_8beamAutoEnd_16 = "3/8";
 time6_8beamAutoEnd_32 = "1/8";
+
 time9_8beamAutoEnd_8 = "3/8";
 time9_8beamAutoEnd_16 = "3/8";
 time6_8beamAutoEnd_32 = "1/8";
 
+%{
+
+Users may override in most cases, simply by issuing
+
+    % from here on consider ending beam every 1/4 note
+    \property Voice.beamAutoEnd = "1/4"
+
+    % no autobeaming
+    \property Voice.beamAuto = "0"  
+
+or, more globally, by doing:
+
+ \paper{
+        \translator{
+            \VoiceContext
+            % consider ending beam at every 1/2 note
+            beamAutoEnd = "1/2";
+        }
+    }
+
+see also input/test/auto-beam-override.ly
+
+%}
+
diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 4d38b9e1dd..9c88e2d9b6 100644
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -35,13 +35,12 @@ if test = 0:
 	input feta-klef;
 	input feta-timesig;
 else:
-	input feta-bolletjes;	
+%	input feta-bolletjes;	
 %	input feta-banier;
 % 	input feta-eindelijk;
 %	input feta-klef;
 %	input feta-toevallig;
-%	input feta-schrift;
-%	input feta-schrift;
+	input feta-schrift;
 %	input feta-haak;
 %	input feta-timesig;
 fi
diff --git a/mf/feta-test13.mf b/mf/feta-test13.mf
new file mode 100644
index 0000000000..3d2ed3cea2
--- /dev/null
+++ b/mf/feta-test13.mf
@@ -0,0 +1,21 @@
+% feta-test16
+% part of LilyPond's pretty-but-neat music font
+
+input feta-autometric;
+fet_beginfont("feta-test", 16);
+staffsize#:=16pt#;
+test:=1;
+
+% smoked cheese
+% test := -1;
+
+
+% dem piksels.
+%test := 1;
+
+input feta-generic;
+
+fet_endfont("feta");
+
+end.
+
diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly
index 8dcbb5fb15..432a60cc1b 100644
--- a/mutopia/gallina.ly
+++ b/mutopia/gallina.ly
@@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper
 definition below. --MB
 %} 
 
-\version "1.0.16";
+\version "1.0.18";
 
 global = \notes {
   \property StaffGroup.timeSignatureStyle = "old"
-- 
2.11.4.GIT