release commit

diff --git a/VERSION b/VERSION
index a801de457e2e77d5025a024c7c93a37136632e32..b9f0174e81772f0bfff080bb9e081994b7ffe26f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=64
-MY_PATCH_LEVEL=jcn1
+PATCH_LEVEL=65
+MY_PATCH_LEVEL=
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 15c50847ee6ae92b9ebb70c85f948571d6fcfde2..e589bdd90c53c435af80d490b56f535e9a2680c5 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -138,11 +138,8 @@ Score_engraver::announce_grob (Grob_info info)
 {
   announce_info_arr_.push (info);
   pscore_p_->line_l_->typeset_grob (info.grob_l_);
-
-
 }
 
-
 void
 Score_engraver::typeset_grob (Grob *elem_p)
 {
@@ -153,7 +150,6 @@ Score_engraver::typeset_grob (Grob *elem_p)
     elem_p_arr_.push (elem_p);
 }
 
-
 void
 Score_engraver::typeset_all ()
 {

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 9a381cede41a4ba24e50fd4183b3d144179ef014..e8d49a7771aab97134fb36d7d7c8cd78504281a7 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -96,5 +96,5 @@ this engraver should be removed from @code{Score} and placed in
 @code{Staff}.",
 /* creats*/       "",
 /* acks  */       "",
-/* reads */       "timeSignatureFraction barCheckNoSynchronize barNonAuto whichBar barAlways defaultBarType skipBars timing oneBeat measureLength measurePosition currentBarNumber",
+/* reads */       "timeSignatureFraction barNonAuto whichBar barAlways defaultBarType skipBars timing oneBeat measureLength measurePosition currentBarNumber",
 /* write */       "");

diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index f445241a5f8f33ca25d31cc2b8439c68397b088a..c979b32af126a35319cd1dda630ebb0a86243756 100644 (file)
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -118,8 +118,9 @@ melismata, and align lyrics accordingly.
 
 (translator-property-description 'barAlways boolean? " If set to true a bar line is drawn after each note.
 ")
-(translator-property-description 'barCheckNoSynchronize boolean? "If set, don't reset measurePosition when finding a bbarcheck. This
-makes bar-checks for polyphonic music easier.")
+(translator-property-description 'barCheckSynchronize boolean? "If
+true then reset measurePosition when finding a barcheck. Turn off when
+using barchecks in polyphonic music.")
 (translator-property-description 'barNonAuto boolean? " If set to true then bar lines will not be printed
     automatically; they must be explicitly created with @code{bar}
     keywords.  Unlike with the @code{cadenza} keyword, measures are