* lily/self-aligment-interface.cc (set_align_self): new function

(set_center_parent): new function.

* lily/side-position-interface.cc (set_axis): new function.

* lily/new-fingering-engraver.cc (position_scripts): use drul for
generic code.

* scm/define-grob-properties.scm (all-user-grob-properties):
remove [XY]-offset-callbacks add [YX]-offset

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index bc7d3b9bd77d0426508c465c787c2c84c62ea8ae..19f8ce95202ab1eea55ac8eb292bf935a83c3549 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -1393,8 +1393,7 @@ rather than to the @internalsref{Voice} context.  Here is an example,
   \new Voice \with {
     \remove "Ambitus_engraver"
   } \relative c'' {
-    \override Ambitus #'X-offset-callbacks
-      = #(list (lambda (grob axis) -1.0))
+    \override Ambitus #'X-offset = #-1.0
     \voiceOne
     c4 a d e f2
   }
@@ -1411,8 +1410,7 @@ rather than to the @internalsref{Voice} context.  Here is an example,
 This example uses one advanced feature,
 
 @example
-\override Ambitus #'X-offset-callbacks
-  = #(list (lambda (grob axis) -1.0))
+\override Ambitus #'X-offset = #-1.0
 @end example
 
 @noindent

diff --git a/VERSION b/VERSION
index 7f57d381b86ac3b271e927ea4e4b8548aec078ce..531282a1c7447abd1be2bf3988b9f81c83c454c8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=14
+PATCH_LEVEL=15
 MY_PATCH_LEVEL=
 

diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly
index e8c359f56b9df17c3ed35500745e775ebe3d9b81..98e82935c196fabcbbfab366bf0e79cbd3bf3f5f 100644 (file)
--- a/input/regression/grid-lines.ly
+++ b/input/regression/grid-lines.ly
@@ -57,8 +57,8 @@ skips =
   \consists "Grid_line_span_engraver"
   \override SystemStartBrace #'transparent = ##t
 
-  \override NoteColumn #'X-offset-callbacks = #(list (lambda (x a) -0.5))
-  \override NoteHead #'Y-offset-callbacks = #(list (lambda (x a) 0.75))
+  \override NoteColumn #'X-offset = #-0.5
+  \override NoteHead #'Y-offset = #0.75
 
 }
 \new StaffGroup <<

diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index ef94123d5e06a5d41be430704c7b6e40999f5830..8665b5fb19a00fd20b692c19bcbc4ee55089eb5b 100644 (file)
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -16,8 +16,7 @@ ambitus must be moved manually to prevent collisions."
     \new Voice \with {
        \consists "Ambitus_engraver"
     } \relative c'' {
-       \override Ambitus #'X-offset-callbacks
-       =  #(list (lambda (grob axis) -1.0))
+       \override Ambitus #'X-offset = #-1.0
        \voiceOne
        c4 a d e f2
     }

diff --git a/lily/grob.cc b/lily/grob.cc
index 9b86dea40fef61bcd4e66ee0b9890fe023ccc333..e2899e8627d3fccb4b2f09f75a2c718c82338071 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -351,7 +351,13 @@ Grob::get_offset (Axis a) const
 
   SCM sym = axis_offset_symbol (a);
   me->dim_cache_[a].offset_ = new Real (0.0);
-  *me->dim_cache_[a].offset_ += robust_scm2double (internal_get_property (sym), 0.0);
+
+  /*
+    UGH: can't fold next 2 statements together. Apparently GCC thinks
+    dim_cache_[a].offset_ is unaliased.
+  */
+  Real off = robust_scm2double (internal_get_property (sym), 0.0);
+  *me->dim_cache_[a].offset_ += off;
 
   me->del_property (sym);
   return *me->dim_cache_[a].offset_;

diff --git a/python/convertrules.py b/python/convertrules.py
index 5425221668ffbab9e646cc4fbff81777dd30cdd2..fb80ba1b335af9e9b7f55cc59b8ae9ef396c9b19 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2636,3 +2636,12 @@ def conv (str):
 
 conversions.append (((2, 7, 14), conv,
                     '''Remove callbacks property, deprecate XY-extent-callback. '''))
+
+
+def conv (str):
+       if re.search ('[XY]-offset-callbacks', str):
+               error_file.write (NOT_SMART % "[XY]-offset-callbacks")
+       return str
+
+conversions.append (((2, 7, 15), conv,
+                    '''Use grob closures iso. XY-offset-callbacks.'''))