''

diff --git a/ChangeLog b/ChangeLog
index 0a0296a996f7936e63146e7b1fd3ef09da767410..dbb818c7af1098a2d48e806bf292ed8fd1e15361 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-02  Han-Wen  <hanwen@cs.uu.nl>
+
+       * lily/spaceable-grob.cc (add_spring): change incorrect spring to
+       unit spring here. Reduces number of warning messages.
+
+       * lily/auto-beam-engraver.cc: change noAutoBeaming to autoBeaming.
+
 2002-04-01  Han-Wen  <hanwen@cs.uu.nl>
 
        * scm/generic-property.scm: remove generic-property, property-engraver

diff --git a/input/regression/hinterfleisch-gone.ly b/input/regression/hinterfleisch-gone.ly
deleted file mode 100644 (file)
index e24bbee..0000000
--- a/input/regression/hinterfleisch-gone.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\version "1.3.148"
-\header {
-texidoc="The first and last notes of a measure should be spaced nicely."
-}
-% jij had zoon mooi tight spacing example,
-% kan zo'n harde space ook niet voor en na maatstreep!
-\score {
-       \notes \relative c'' {
-       \time 2/4
-       \property Voice.noAutoBeaming=##t
-       a4 a8
-       a32 a a a
-}
-%%set bit wide
-\paper {linewidth = 100.\mm}
-}

diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index a558cd4554e80763af3d524c03b3807cb81401b0..83f6f2aba2f57848f0f2b1cbff9c05ed251a3df2 100644 (file)
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -7,7 +7,7 @@ texidoc = "The flags of 8th notes take some space, but not
 }
 
 \score { \notes \relative c'' \context Staff {
-    \property Voice.noAutoBeaming = ##t
+    \property Voice.autoBeaming = ##f
     [a8 a8 a8 a8] a8 a8 a8 a8
 }
 \paper {
@@ -15,3 +15,5 @@ texidoc = "The flags of 8th notes take some space, but not
 linewidth = -1
     }
      }
+
+\version "1.5.49"

diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly
index 67701eb6d8c4570759669fd2307012d68a16bc0f..cd2199af7e9a771397c0aafc06587cbcf12bd0a5 100644 (file)
--- a/input/scarlatti-properties.ly
+++ b/input/scarlatti-properties.ly
@@ -1,5 +1,7 @@
 %  include file for scarlatti-test
 
+\version "1.5.49"
+
 rh=\property Thread.NoteHead \override #'style = #'default
 lh=\property Thread.NoteHead \override #'style = #'diamond
 
@@ -27,5 +29,5 @@ srs= \property Voice.NoteColumn \override  #'force-hshift = #0.22
 
 
 
-ab=\property Voice.noAutoBeaming=##f
-xb=\property Voice.noAutoBeaming=##t
+ab=\property Voice.autoBeaming = ##t
+xb=\property Voice.autoBeaming = ##f

diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly
index 9d02a9eb8fd42d39bdfbd643e06838f3effb5c3a..73bd8296adf109b86fab836fe0d72562d0c18a51 100644 (file)
--- a/input/scarlatti-test.ly
+++ b/input/scarlatti-test.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 %K000.ly LilyPond 1.2.16
 \header {
 title="John's Scarlatti quotes"
@@ -33,8 +33,8 @@ ls={\property Voice.forceHorizontalShift="-0.6"}
 sls={\property Voice.forceHorizontalShift="-0.22"}
 rs={\property Voice.forceHorizontalShift="0.6"}
 srs={\property Voice.forceHorizontalShift="0.22"}
-ab={\property Voice.noAutoBeaming=##f}
-xb={\property Voice.noAutoBeaming=##t}
+ab={\property Voice.autoBeaming = ##t}
+xb={\property Voice.autoBeaming = ##f}
 %}
 
 

diff --git a/input/template/melody-lyrics-chords.ly b/input/template/melody-lyrics-chords.ly
index 80dcd6c70de4961ead313e237c1efdda3014bf76..c1148989f2267d010e226696e839a81d1b1ac529 100644 (file)
--- a/input/template/melody-lyrics-chords.ly
+++ b/input/template/melody-lyrics-chords.ly
@@ -1,4 +1,4 @@
-\version "1.5.1"
+\version "1.5.49"
 
 \header {
   dedication = "dedication"
@@ -34,7 +34,7 @@ accompaniment = \chords {
     \context ChordNames \accompaniment
     \addlyrics
       \context Staff = one {
-        \property Staff.noAutoBeaming = ##t
+        \property Staff.autoBeaming = ##f
         \property Staff.automaticMelismata = ##t
         \melody
       }

diff --git a/input/template/melody-lyrics.ly b/input/template/melody-lyrics.ly
index 613fa72474ebc9117f6ce0b2e8ee934130a04965..6656c0760849b7912d9ab164f91f2fdbefed4b01 100644 (file)
--- a/input/template/melody-lyrics.ly
+++ b/input/template/melody-lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.5.1"
+\version "1.5.49"
 
 \header {
   dedication = "dedication"
@@ -29,7 +29,7 @@ text = \lyrics {
   <
     \addlyrics
       \context Staff = one {
-        \property Staff.noAutoBeaming = ##t
+        \property Staff.autoBeaming = ##f
         \property Staff.automaticMelismata = ##t
         \melody
       }

diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly
index a1c2c3ecc9815f9da47068915928b8ce313a2c58..adb45581d5eee826f8099646e6d153b050fd2a74 100644 (file)
--- a/input/template/piano-melody-lyrics.ly
+++ b/input/template/piano-melody-lyrics.ly
@@ -1,4 +1,4 @@
-\version "1.5.1"
+\version "1.5.49"
 
 \header {
   dedication = "dedication"
@@ -37,7 +37,7 @@ lower = \notes\relative c {
   <
     \addlyrics
       \context Staff = mel {
-        \property Staff.noAutoBeaming = ##t
+        \property Staff.autoBeaming = ##f
         \property Staff.automaticMelismata = ##t
         \melody
       }

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 035fccf87be027d29412982bb9e85d087dcea5ca..2bc4c2ffbe1ac7e02b601c9b96973aedd6d354ec 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 \header {
     title      = "ancient font test"
     date       = "2000"
@@ -128,7 +128,7 @@ lowerVoice =  \context Staff = lowerNotes <
       #'line-count = #5
 
     \notes \transpose c' {
-       \property Voice.noAutoBeaming = ##t
+       \property Voice.autoBeaming = ##f
        \property Staff.Clef \set #'font-family = #'ancient
        \property Staff.KeySignature \set #'font-family = #'ancient
        \property Staff.KeySignature \override #'style = #'mensural
@@ -248,12 +248,12 @@ lowerVoice =  \context Staff = lowerNotes <
        \translator {
            \ScoreContext
 %          \remove System_start_delimiter_engraver
-%          SystemStartDelimiter \override #'glyph = #'brace
+%          systemStartDelimiter \override #'glyph = #'brace
        }
        \translator {
            \ChoirStaffContext
            \remove System_start_delimiter_engraver
-%          SystemStartDelimiter \override #'glyph = #'empty
+%          systemStartDelimiter \override #'glyph = #'empty
        }
     }
 }

diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly
index 89400e23af3574fe98970d15036007d8dd8db326..6906618a2dcaae0f4977ff15b8872f396626147d 100644 (file)
--- a/input/test/auto-beam-override.ly
+++ b/input/test/auto-beam-override.ly
@@ -1,7 +1,5 @@
 \version "1.3.146"
 
-
-
 %{
   Currently (1.1.27.jcn3), the auto-beam engraver will only engrave
   sensible beams, which means that it will end a beam when:
@@ -29,7 +27,7 @@
        c8 c c4
        r8 c c c
        % no autobeaming
-       \property Voice.noAutoBeaming = ##t
+       \property Voice.autoBeaming = ##f
        c8 c c c
     }
     \paper{

diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly
index f738d1048c9bb9e5be2c95952e08848bc06c6755..8cc5b96899f01b02be649d193a83204a5ac96e5d 100644 (file)
--- a/input/test/hara-kiri-switch.ly
+++ b/input/test/hara-kiri-switch.ly
@@ -2,7 +2,7 @@
 \header {
 texidoc = "some instruments (notably: cello and double bass) are alternatively written on one and two staves. This is the way to do it:"
 }
-\version "1.3.146"
+\version "1.5.49"
 
 
 voiceOne =  \notes \relative c'' {
@@ -48,7 +48,7 @@ grandstaff =  \context GrandStaff = one <
        \paper{
                linewidth=80.0\mm
 
-               \translator { \VoiceContext noAutoBeaming = ##t }
+               \translator { \VoiceContext autoBeaming = ##f }
                \translator { \HaraKiriStaffContext }
                \translator { \OrchestralScoreContext skipBars = ##t }
        }

diff --git a/input/test/slur-area.ly b/input/test/slur-area.ly
index 9893ad3e444c284685cde94244dcd2b3c10c63aa..8f8b926dc45f53ee50067d6032bb30a49564aee6 100644 (file)
--- a/input/test/slur-area.ly
+++ b/input/test/slur-area.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \score{
 \notes\relative c''{
@@ -17,7 +17,7 @@ a(a a a a a d)a
 c,(g' c e f d b)g 
 c,(g' c e f d b)g 
 
-\property Voice.noAutoBeaming = ##t
+\property Voice.autoBeaming = ##f
 \stemUp
 a8(a a a a a a)a
 

diff --git a/input/test/slur-attachment-override.ly b/input/test/slur-attachment-override.ly
index d747f24956c7d97f2ef6efd1790cd495b8d8a4d3..2e2e513f4a325524980e9600ecc83ce62d42ea9b 100644 (file)
--- a/input/test/slur-attachment-override.ly
+++ b/input/test/slur-attachment-override.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \header{
 texidoc="
@@ -8,7 +8,7 @@ In some cases, you may want to set slur attachments by hand.
 
 
 fragment = \notes {
-  \property Voice.noAutoBeaming = ##t
+  \property Voice.autoBeaming = ##f
   \property Voice.Stem \set #'direction = #1
   \property Voice.Slur \set #'direction = #1
   d'32( f'4 )d8..

diff --git a/input/test/slur-attachment.ly b/input/test/slur-attachment.ly
index d72892c5c6fef6ca81f97e3be04b5d28e26c3a93..5fc5e2e3a444a8ce3e94a2c3a43243f051c837aa 100644 (file)
--- a/input/test/slur-attachment.ly
+++ b/input/test/slur-attachment.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 
 fragment = \notes {

diff --git a/input/test/slur-broken-cross-staff.ly b/input/test/slur-broken-cross-staff.ly
index 528a6da97fcbe45c7d5888aef3f1c7bae609e427..bc1c78ca986154cd63f4f4e7369e07c27519b5a2 100644 (file)
--- a/input/test/slur-broken-cross-staff.ly
+++ b/input/test/slur-broken-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 \header{
 texidoc="
 The same goes for slurs. They behave decently when broken across

diff --git a/input/test/slur-broken.ly b/input/test/slur-broken.ly
index 39fc39cc07405e4b29e974dd68b84f0203f67d78..5d6a30b26d3e7b5246b02e4791bbeab906a2ad75 100644 (file)
--- a/input/test/slur-broken.ly
+++ b/input/test/slur-broken.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \score{
        \notes\relative c''{

diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly
index 98cde016c80aebd05e5d73f2352e3f2553bf8dda..56a1d669d88857c6181a5fb16d857be357bf6aeb 100644 (file)
--- a/input/test/slur-damping.ly
+++ b/input/test/slur-damping.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 % test damping
 
 

diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index 13b6c57f46ec14ea2a44833192a2aaf263c9ab8b..e89308cb4efb9b5677a289c834cdfcc1cc2340d4 100644 (file)
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 
 \score{

diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly
index c77ce8210481f8d5f6c5e1880f6a3fd2ebb40dad..7e29edaca55fcd91a5bc7639da015acec4b89d82 100644 (file)
--- a/input/test/slur-follow-music.ly
+++ b/input/test/slur-follow-music.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \score { 
   \context Voice \notes\relative c {

diff --git a/input/test/slur-mininum.ly b/input/test/slur-mininum.ly
index 2fb98a72ce9eccc667daf91e7b0a02f4cb9adbed..930e01ba82ecb67cb4d18f51a92a63bb2f3d9d17 100644 (file)
--- a/input/test/slur-mininum.ly
+++ b/input/test/slur-mininum.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 \header {
 texidoc = "" 
 }

diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly
index 1e97d2c4454f6b9f37d6a9e32f039c3ac5e039a8..1c5c51c8736f5448a90151f29f19bfbe0bdd676c 100644 (file)
--- a/input/test/slur-positions.ly
+++ b/input/test/slur-positions.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \score{
        \notes\relative c''{

diff --git a/input/test/slur-proof.ly b/input/test/slur-proof.ly
index 501315da80c5095073f15d53f9a697bc4289e40b..57a2300001e03765d952429b3277c113a3042941 100644 (file)
--- a/input/test/slur-proof.ly
+++ b/input/test/slur-proof.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 
 x = {

diff --git a/input/test/slur-symmetry-2.ly b/input/test/slur-symmetry-2.ly
index cee8911bc0481a7c6e01377de23d4b25aa2ec049..377a1b3f442275e4f081b55afc0b0ce11f92f5a2 100644 (file)
--- a/input/test/slur-symmetry-2.ly
+++ b/input/test/slur-symmetry-2.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \header{
 % should look the same

diff --git a/input/test/slur-symmetry-3.ly b/input/test/slur-symmetry-3.ly
index 22d944ab6d6d7a312cfd3839696dca90bb8fd8ee..314835d7054561f416af25752de90b2e93ded8ea 100644 (file)
--- a/input/test/slur-symmetry-3.ly
+++ b/input/test/slur-symmetry-3.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \header{
 % should look the same

diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly
index 307b1d7c14e9a12adfb90dc0ee18642f11db2a2f..0a99cb3799eda5843fce2d0ec3f3a5816cf9f96a 100644 (file)
--- a/input/test/slur-ugly.ly
+++ b/input/test/slur-ugly.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.49"
 
 \header {
 texidoc="You can get ugly slurs, if you want.

diff --git a/input/test/slurs.ly b/input/test/slurs.ly
index dc7a9da7224ce34e40b6b0101195a58eba977220..fc4ec4a5d9005680efa17956da8ac4e7bfdea32f 100644 (file)
--- a/input/test/slurs.ly
+++ b/input/test/slurs.ly
@@ -1 +1 @@
-\version "1.3.146"
+\version "1.5.49"

diff --git a/input/tutorial/flowing.ly b/input/tutorial/flowing.ly
index 351f3b6944c7ec74cb052781f76a8fcc73128324..cfcce7d6d17feb7f59665f6e53664ce29ebe4132 100644 (file)
--- a/input/tutorial/flowing.ly
+++ b/input/tutorial/flowing.ly
@@ -1,3 +1,4 @@
+\version "1.5.49"
 
 \header {
         title = "The river is flowing"
@@ -31,7 +32,7 @@ accompaniment =\chords {
 
           \addlyrics
              \context Staff = mel
-             { \property Staff.noAutoBeaming = ##t
+             { \property Staff.autoBeaming = ##f
                \property Staff.automaticMelismata = ##t
                \melody }
              \context Lyrics \text

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index aef96d8da5c3387953fd9aa5c9c74429a5e48222..7c418a024b1913ee3c0b91e862b48c4164332c4d 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -191,8 +191,8 @@ Auto_beam_engraver::test_moment (Direction dir, Moment test_mom)
 void
 Auto_beam_engraver::consider_begin (Moment test_mom)
 {
-  bool off = to_boolean (get_property ("noAutoBeaming"));
-  if (!stem_l_arr_p_ && ! off)
+  bool on = to_boolean (get_property ("autoBeaming"));
+  if (!stem_l_arr_p_ && on)
     {
       bool b = test_moment (START, test_mom);
       if (b)
@@ -206,7 +206,7 @@ Auto_beam_engraver::consider_end (Moment test_mom)
   if (stem_l_arr_p_)
     {
       /* Allow already started autobeam to end:
-        don't check for noAutoBeaming */
+        don't check for autoBeaming */
       bool b = test_moment (STOP, test_mom);
       if (b)
        end_beam ();
@@ -481,5 +481,5 @@ stemRightBeamCount.
 ",
 /* creats*/       "Beam",
 /* acks  */       "stem-interface rest-interface beam-interface bar-line-interface",
-/* reads */       "noAutoBeaming autoBeamSettings subdivideBeams",
+/* reads */       "autoBeaming autoBeamSettings subdivideBeams",
 /* write */       "");

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 71c74fbec6a58cc8b9f6299be57caf661574993e..904945439700aeeee98b35240d6daeaa20838ccb 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -88,8 +88,8 @@ Beam_engraver::try_music (Music *m)
          if (d == STOP)
            {
              SCM m = get_property ("automaticMelismata");
-             SCM b = get_property ("noAutoBeaming");
-             if (to_boolean (m) && to_boolean (b))
+             SCM b = get_property ("autoBeaming");
+             if (to_boolean (m) && !to_boolean (b))
                {
                  set_melisma (false);
                }
@@ -179,8 +179,8 @@ Beam_engraver::start_translation_timestep ()
   if (beam_p_)
     {
       SCM m = get_property ("automaticMelismata");
-      SCM b = get_property ("noAutoBeaming");
-      if (to_boolean (m) && to_boolean (b))
+      SCM b = get_property ("autoBeaming");
+      if (to_boolean (m) && !to_boolean (b))
        {
          set_melisma (true);
        }

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index be05115a6dda560bf32aae8b4e085e5fa1ce4f4b..60e710d68ebbb6343dde5e6d52311633c752bec9 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -262,8 +262,6 @@ Simple_spacer::add_columns (Link_array<Grob> cols)
        {
          programming_error ("Insane spring found. Setting to unit spring.");
 
-         cout << "columns " << Paper_column::rank_i (cols[i])
-              << " " << Paper_column::rank_i (cols[i+1]) << endl;
          desc.hooke_f_ = 1.0;
          desc.ideal_f_ = 1.0;
        }

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index e19252783ed0a87935df56d22b1da1eb82bef565..bb6afc11e6721cbceed36953f7b7be0ea5933a24 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -46,7 +46,9 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan
 {
   if (d < 0.0 || strength <= 0.0)
     {
-      programming_error ("Adding reverse spring!");
+      programming_error ("Adding reverse spring! Setting to unit spring");
+      d = 1.0;
+      strength = 1.0;
     }
   
 #ifndef NDEBUG

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0baf773a3fffb0f37326de312b1be687ccf01b17..2f27452f13a89c54363340922b916cf5313fa8ba 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -376,13 +376,13 @@ ScoreContext = \translator {
        centralCPosition = #-6
        
         automaticPhrasing = ##t
-
+       
        defaultBarType = #"|"
 
        explicitClefVisibility = #all-visible
        explicitKeySignatureVisibility = #all-visible
        autoBeamSettings = #auto-beam-settings
-
+       autoBeaming = ##t
        scriptDefinitions = #default-script-alist
 
        verticalAlignmentChildCallback = #Align_interface::alignment_callback

diff --git a/ly/property-init.ly b/ly/property-init.ly
index c203bd6632e4d4300fdf3f05437ad3643d3e4043..dca3b4930d7abeaedbabfa594a4f29327e69ba19 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -119,8 +119,8 @@ endincipit = \notes{
     \bar ""
 }
 
-autoBeamOff = \property Voice.noAutoBeaming = ##t
-autoBeamOn = \property Voice.noAutoBeaming = ##f
+autoBeamOff = \property Voice.autoBeaming = ##f
+autoBeamOn = \property Voice.autoBeaming = ##t
 
 emptyText = \property Voice.textNonEmpty = ##f
 fatText = \property Voice.textNonEmpty = ##t

diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index b18bcd53887c96c6899582ce9b8f1ce12b3079ff..c5401da0e74af196f2e0a2c6a917d796a0f0853f 100644 (file)
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -41,7 +41,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "1.3.146"
+\version "1.5.49"
 
 dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1
 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
@@ -376,7 +376,7 @@ lyricStaff = \context Lyrics {
 vocals = \context Voice \notes {
        \clef treble
        % certainly no auto-beaming for vocals
-       \property Voice.noAutoBeaming = ##t
+       \property Voice.autoBeaming = ##f
        \property Staff.automaticMelismata= ##t
 
        \dynamicUp

diff --git a/scm/ps.scm b/scm/ps.scm
index 0d2093f7d034cc638e97169339f394e8606b79be..6e3c7e5be8ada2098e0f3e24c93aa1837811b96c 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -153,7 +153,7 @@
    (ly-number->string x1)
    " "
    (ly-number->string y1)
-   " moveto"
+   " moveto "
    (ly-number->string x2)
    " "
    (ly-number->string y2)

diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index ac7dc86cd3bbdbaaf7dbd8f7f95214128ddf471e..54b5a1df9d3a69f5fc1a4061eb9f20baab2dcfff 100644 (file)
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -263,10 +263,8 @@ top of those automatically detected. ")
 MIDI instrument to use ")
 (translator-property-description 'midiMinimumVolume number? "[DOCUMENT-ME]")
 (translator-property-description 'midiMaximumVolume number? "[DOCUMENT-ME]")
-
-
-(translator-property-description 'noAutoBeaming boolean? "If set to true then beams are not generated automatically.
-")
+(translator-property-description 'autoBeaming boolean? "If set to true
+then beams are generated automatically.")
 (translator-property-description 'noDirection boolean? "Don't set directions by a2-engraver when part-combining.")
 (translator-property-description 'oneBeat moment? "  How long does one beat in the current time signature last?")
 (translator-property-description 'pedalSustainStrings list? "List of   string to print for sustain-pedal. Format is

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 6ae1b0e1dd35a7b0fbd69499b9dea1aa67cfd15f..4ea8a92838c889e8d684a13dc183ff9f9b74cf62 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -840,6 +840,13 @@ if 1:
        
        conversions.append (((1,5,38), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('noAutoBeaming *= *##f', 'autoBeaming = ##t', str)
+               str = re.sub ('noAutoBeaming *= *##t', 'autoBeaming = ##f', str)
+               return str
+       
+       conversions.append (((1,5,49), conv, 'noAutoBeaming -> autoBeaming'))
 
 ################################
 #      END OF CONVERSIONS