X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=0ffc57a578ee11dff5143a44a1381a4632b161a6;hb=0328dfdc99168708d47e4c4fd6a86200506091ee;hp=39aeabdb61d8f4bf9c90e5a629443f9dcfd58c04;hpb=17f11c2f5ab963bfb07b7652b4860dc4dda5540a;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 39aeabdb61..0ffc57a578 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+%%%% Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %%%%                          Jan Nieuwenhuizen <janneke@gnu.org>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
@@ -16,10 +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.12.0"
-
-%% < 1.8 compatibility switch
-#(ly:set-option 'old-relative)
+\version "2.17.6"
 
 %% named durations
 breve = #(ly:make-duration -1 0)
@@ -41,6 +38,10 @@ maxima = #(ly:make-duration -3 0)
 
 #(define default-fret-table (make-hash-table 101))
 #(define chord-shape-table (make-hash-table 29))
+#(call-after-session
+  (lambda ()
+   (hash-clear! default-fret-table)
+   (hash-clear! chord-shape-table)))
 
 % declarations for standard directions
 left = #-1
@@ -54,19 +55,19 @@ bigger = #1
 center = #0
 
 %% FIXME
-%% should also set \override Beam #'breakable, but how to do it "portably"? (ie. also
+%% should also set \override Beam.breakable, but how to do it "portably"? (ie. also
 %% working with lyric sections)
 %%
-%% try \once \override Score.Beam #'breakable = ##t
+%% try \once \override Score.Beam.breakable = ##t
 
 %% rather name \newline, \pageBreak ?
-break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force)))
-noBreak = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission '())))
+break = #(make-music 'LineBreakEvent 'break-permission 'force)
+noBreak = #(make-music 'LineBreakEvent 'break-permission '())
 %% \pageBreak, \noPageBreak, \pageTurn, \noPageTurn, \allowPageTurn are defined
 %% as music functions
 
-stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
-startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
+stopStaff = #(make-span-event 'StaffSpanEvent STOP)
+startStaff = #(make-span-event 'StaffSpanEvent START)
 
 
 %
@@ -99,6 +100,9 @@ repeatTie = #(make-music 'RepeatTieEvent)
 
 %% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
 #(define musicQuotes (make-hash-table 29))
+#(call-after-session
+  (lambda ()
+   (hash-clear! musicQuotes)))
 
 #(define toplevel-book-handler print-book-with-defaults)
 #(define toplevel-bookpart-handler collect-bookpart-for-book)
@@ -114,6 +118,8 @@ repeatTie = #(make-music 'RepeatTieEvent)
 #(define bookpart-score-handler ly:book-add-score!)
 #(define bookpart-text-handler ly:book-add-score!)
 #(define bookpart-music-handler collect-book-music-for-book)
+#(define output-def-music-handler context-defs-from-music)
+#(define context-mod-music-handler context-mod-from-music)
 
 \include "predefined-fretboards-init.ly"
 \include "string-tunings-init.ly"
@@ -122,31 +128,29 @@ repeatTie = #(make-music 'RepeatTieEvent)
 \include "grace-init.ly"
 \include "midi-init.ly"
 \include "paper-defaults-init.ly"
+\include "context-mods-init.ly"
 
 \layout {
-    mm = #(ly:output-def-lookup $defaultpaper 'mm)
-    unit = #(ly:output-def-lookup $defaultpaper 'unit)
+  mm = #(ly:output-def-lookup $defaultpaper 'mm)
+  unit = #(ly:output-def-lookup $defaultpaper 'unit)
 
-    in = #(* 25.4 mm)
-    pt = #(/  in 72.27)
-    cm = #(* 10 mm)
+  in = #(* 25.4 mm)
+  pt = #(/ in 72.27)
+  cm = #(* 10 mm)
 
-    \include "engraver-init.ly"
+  \include "engraver-init.ly"
 
-    #(set-paper-dimension-variables (current-module))
+  #(set-paper-dimension-variables (current-module))
 }
 
 #(set-default-paper-size (ly:get-option 'paper-size))
 partCombineListener = \layout {
-    \context {
-	\Score
-	skipTypesetting = ##t
-	ignoreBarChecks = ##t
-	\alias "Timing"
-    }
+  \context {
+    \Score
+    skipTypesetting = ##t
+    ignoreBarChecks = ##t
+    \alias "Timing"
+  }
 }
 
 setDefaultDurationToQuarter = { c4 }
-
-
-