X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=2419940c0b52b5f28d69b9ce750ba1983ea1b40a;hb=460165d9b83877a13f47060486f77aa8de0bd649;hp=39aeabdb61d8f4bf9c90e5a629443f9dcfd58c04;hpb=5e44b5f4dba63d3649331e317286be089955edde;p=lilypond.git diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 39aeabdb61..2419940c0b 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 +%%%% Copyright (C) 1996--2012 Han-Wen Nienhuys %%%% Jan Nieuwenhuizen %%%% %%%% LilyPond is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.12.0" +\version "2.14.0" %% < 1.8 compatibility switch #(ly:set-option 'old-relative) @@ -60,13 +60,13 @@ center = #0 %% 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) % @@ -122,31 +122,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 } - - -