X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fcontext-mods-init.ly;h=1b8201879e7148329846618b665eac3f745cf0c7;hb=f92a7cd52fc45a083bbd7bc54130d14b314d9a4b;hp=b8361a58ecfb07f0c44629c6ae13db00570379d3;hpb=569714401fbe0e814f0282059f157aa36a54c706;p=lilypond.git

diff --git a/ly/context-mods-init.ly b/ly/context-mods-init.ly
index b8361a58ec..1b8201879e 100644
--- a/ly/context-mods-init.ly
+++ b/ly/context-mods-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.15.31"
+\version "2.16.0"
 
 RemoveEmptyStaves = \with {
   \remove "Axis_group_engraver"
@@ -31,78 +31,3 @@ RemoveEmptyStaves = \with {
   \description "Remove staves which are considered to be empty according
 to the list of interfaces set by @code{keepAliveInterfaces}."
 }
-
-"layout-from" =
-#(define-void-function (parser location bottom music)
-   ((symbol? 'Voice) ly:music?)
-   (_i "To be used in output definitions.  Take the layout instruction
-events from @var{music} and do the equivalent of context modifications
-duplicating their effect.
-
-This is handy for making layout definitions by using property
-definitions like @code{\\accidentalStyle} or definitions like
-@code{\\tabFullNotation} that may work in multiple or unknown
-contexts.
-
-Layout instructions specified without explicit context get mapped to
-the context symbol @var{bottom}, with a default of @code{'Voice}.
-
-For example, you can tell @code{\\layout-from} to apply a contained
-@example
-\\override #'font-size = #2
-@end example
-to @samp{TabVoice} or @samp{Lyrics} context instead of the default
-@samp{Voice} context, if the context where you would normally use
-@var{music} is not one that would have @samp{Voice} as its
-@samp{Bottom}.")
-   (let loop ((m music) (mods #f))
-     ;; The parser turns all sets, overrides etc into something
-     ;; wrapped in ContextSpeccedMusic.  If we ever get a set,
-     ;; override etc that is not wrapped in ContextSpeccedMusic, the
-     ;; user has created it in Scheme himself without providing the
-     ;; required wrapping.  In that case, using #f in the place of a
-     ;; context modification results in a reasonably recognizable
-     ;; error.
-     (if (music-is-of-type? m 'layout-instruction-event)
-	 (ly:add-context-mod
-	  mods
-	  (case (ly:music-property m 'name)
-	    ((PropertySet)
-	     (list 'assign
-		   (ly:music-property m 'symbol)
-		   (ly:music-property m 'value)))
-	    ((PropertyUnset)
-	     (list 'unset
-		   (ly:music-property m 'symbol)))
-	    ((OverrideProperty)
-	     (list 'push
-		   (ly:music-property m 'symbol)
-		   (ly:music-property m 'grob-property-path)
-		   (ly:music-property m 'grob-value)))
-	    ((RevertProperty)
-	     (list 'pop
-		   (ly:music-property m 'symbol)
-		   (ly:music-property m 'grob-property-path)))))
-	 (case (ly:music-property m 'name)
-	   ((SequentialMusic SimultaneousMusic)
-	    (fold loop mods (ly:music-property m 'elements)))
-	   ((ContextSpeccedMusic)
-	    ;; It is actually rather embarrassing that we have no
-	    ;; reliable way to check for the type of a context-def.
-	    ;; Nor have a Scheme way to add to a context-def.
-	    (let ((sym (ly:music-property m 'context-type)))
-	      (if (eq? sym 'Bottom)
-		  (set! sym bottom))
-	      (if (module-bound? (current-module) sym)
-		  (module-set!
-		   (current-module)
-		   sym
-		   #{ \context {
-				 $(module-ref (current-module) sym)
-				 $(loop (ly:music-property m 'element)
-					(ly:make-context-mod))
-		      }
-		   #})
-		  (ly:warning music (_f "Cannot find context-def \\~a"
-					sym)))))))
-     mods))