From e4de91198cc8c261213799ade7328edfe6cc4ca6 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 9 Nov 2004 21:07:21 +0000
Subject: [PATCH] *** empty log message ***

---
 Documentation/topdocs/NEWS.texi | 2 ++
 VERSION                         | 2 +-
 lily/grob.cc                    | 5 ++---
 lily/paper-column.cc            | 2 +-
 scm/define-grob-properties.scm  | 3 ++-
 scm/framework-tex.scm           | 7 +------
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index a1ffc29ca8..b6caf9afd3 100644
--- 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 092ce9d7c9..7395742c6f 100644
--- 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 54b62eff8e..0fd567d566 100644
--- 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 a955c6663c..b5fe7c1351 100644
--- 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 e58197fe78..d38ce94d10 100644
--- 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 ade6b10099..a42418b930 100644
--- 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"
-- 
2.39.5