*** empty log message ***

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index a1ffc29ca8e42efd39d78674eac6434890af87fa..b6caf9afd3d9e9b75cbba073bbcf0d0e4b4b8044 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -7,6 +7,8 @@
 @unnumbered New features in 2.5 since 2.4
 
 @itemize @bullet
+@item Positioning of slurs can now be adjusted manually
+
 @item Grace notes are correctly quoted and formatted when using cue notes.
 
 @item Cue notes can now be created with

diff --git a/VERSION b/VERSION
index 092ce9d7c95ac23ee15cc1c16aaf46c728c0ac7b..7395742c6ffb8ce7e08111080ba0d74ab7862be7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=hwn3
+MY_PATCH_LEVEL=
 

diff --git a/lily/grob.cc b/lily/grob.cc
index 54b62eff8e2c39090b68fc28431aa43ab642c097..0fd567d56699df79e662a6a3256a731261f3aa09 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -709,11 +709,10 @@ ADD_INTERFACE (Grob, "grob-interface",
 ,
               "X-offset-callbacks Y-offset-callbacks X-extent-callback stencil cause "
               "Y-extent-callback print-function extra-offset spacing-procedure "
-              "staff-symbol interfaces dependencies X-extent Y-extent extra-X-extent "
+              "context staff-symbol interfaces dependencies X-extent Y-extent extra-X-extent "
               "meta layer before-line-breaking-callback "
               "after-line-breaking-callback extra-Y-extent minimum-X-extent "
-              // FIXME: page-penalty?
-              "minimum-Y-extent page-penalty transparent "
+              "minimum-Y-extent transparent "
               );
 
 

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index a955c6663cb97044817e556c1850be1ae3b74ff4..b5fe7c1351d76467983f1871da69f9039ed6c42b 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -36,7 +36,7 @@ ADD_INTERFACE (Paper_column, "paper-column-interface",
               "\n"
               ,
               "between-cols when bounded-by-me "
-              "shortest-playing-duration shortest-starter-duration");
+              "page-penalty shortest-playing-duration shortest-starter-duration");
 
 void
 Paper_column::do_break_processing ()

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index e58197fe78a4245aaea78fe8734b3a3aa71871c1..d38ce94d100e0742704bcb58bedbe14d2b4f8d71 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -137,8 +137,9 @@ measure of the closeness of the inner stems. It is used for damping
 the slope of the beam.")
      (collapse-height ,ly:dimension? "Minimum height of system start delimiter.  If equal or smaller, the bracket is removed.")
 
+     (context ,ly:context? "Originating context of the grob")
+     
      ;;DOCME
-
      (control-points ,list? "List of 4 offsets (number-pairs) that form control points for the  tie/slur shape.")
 
      (damping ,number? "Amount of beam slope damping. 0: no, 1: yes,

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index ade6b100993286a24b81611b7ab7870c1b5c44b1..a42418b930dd209fecf701ba934370e823a2c70f 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -16,12 +16,6 @@
             (srfi srfi-1)
             (lily))
 
-;; FIXME: rename
-;; what is bla supposed to do?  It breaks the default output terribly:
-
-;; \def\lilypondpaperbla$\backslash${$\backslash$}{bla$\backslash${$\backslash$}}%
-;; \lyitem{089.5557}{-15.3109}{\hbox{\magfontUGQLomTVo{}bla$\backslash${$\backslash$}}}%
-;; --jcn
 (define-public (sanitize-tex-string s)
   (if (ly:get-option 'safe)
       (regexp-substitute/global
@@ -249,6 +243,7 @@
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
+      
       ;;FIXME
       (header paper (length lines) #f)
       "\\def\\lilypondclassic{1}%\n"