X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=b8c36e4f338dff45d3c9e204d9b72003188d3e60;hb=5091a221086ba923451781a1d51a2a715369b7e4;hp=c200465244f40c3fc04c91f75cb95f3ec2112580;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index c200465244..b8c36e4f33 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,56 +1,119 @@
+\version "2.10.0"
 
-\version "1.3.146"
-breve = \duration #(make-duration -1 0)
-longa = \duration #(make-duration -2 0 )
-maxima = \duration #(make-duration -3 0)
+%% < 1.8 compatibility switch
+#(ly:set-option 'old-relative)
 
-\include "nederlands.ly"		% dutch
+%% named durations
+breve = #(ly:make-duration -1 0)
+longa = #(ly:make-duration -2 0)
+maxima = #(ly:make-duration -3 0)
+
+\include "markup-init.ly"
+\include "music-functions-init.ly"
+\include "toc-init.ly"
+
+%% default note names are dutch
+\include "nederlands.ly"
+
+\include "drumpitch-init.ly"		
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
 % declarations for standard directions
-left = -1
-right = 1
-up = 1
-down = -1
-start = -1
-stop = 1
-smaller = -1
-bigger = 1
-center=0
-
-break =  \penalty  #-10000
-noBreak =  \penalty #10000
-\include "scale-definitions-init.ly"
+left = #-1
+right = #1
+up = #1
+down = #-1
+start = #-1
+stop = #1
+smaller = #-1
+bigger = #1
+center = #0
+
+%% FIXME
+%% should also set allowBeamBreak, but how to do it "portably"? (ie. also
+%% working with lyric sections)
+%%
+%% try \once \set Score.allowBeamBreak = ##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 '())))
+%% \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)))
+
+
+%
+% Code articulation definitions
+%
+noBeam = #(make-music 'BeamForbidEvent) 
+pipeSymbol = #(make-music 'BarCheck)
+bracketOpenSymbol = #(make-span-event 'BeamEvent START)
+bracketCloseSymbol = #(make-span-event 'BeamEvent STOP)
+tildeSymbol = #(make-music 'TieEvent)
+parenthesisOpenSymbol =  #(make-span-event 'SlurEvent START)
+parenthesisCloseSymbol = #(make-span-event 'SlurEvent STOP)
+escapedExclamationSymbol = #(make-span-event 'CrescendoEvent STOP)
+escapedParenthesisOpenSymbol = #(make-span-event 'PhrasingSlurEvent START)
+escapedParenthesisCloseSymbol = #(make-span-event 'PhrasingSlurEvent STOP)
+escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
+escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
-melisma = \property Staff.melismaBusy = ##t
-melismaEnd = \property Staff.melismaBusy = ##f
 
 
-\include "engraver-init.ly"
-\include "grace-init.ly"
+\include "scale-definitions-init.ly"
 
-singleLine = \paper { linewidth = 1. }
+melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
+melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
 
-% ugh
+laissezVibrer = #(make-music 'LaissezVibrerEvent)
+repeatTie = #(make-music 'RepeatTieEvent)
+		  
+\include "grace-init.ly"
 \include "midi-init.ly"
+\include "paper-defaults.ly"
+
+\layout {
+    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)
+    
+    \include "engraver-init.ly"
 
-papersize = "a4"
-paperfile = \papersize + "-init.ly"
+    #(set-paper-dimension-variables (current-module))
+}
 
-\include "generic-paper-init.ly"
-\include "paper20-init.ly"
+#(set-default-paper-size (ly:get-option 'paper-size))
 
+partCombineListener = \layout {
+    \context {
+	\Score
+	skipTypesetting = ##t
+	ignoreBarChecks = ##t
+	\alias "Timing"
+    }
+}
 
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
-
 \include "property-init.ly"
 
+setDefaultDurationToQuarter = { c4 }
 
+%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
+#(define musicQuotes (make-hash-table 29))
 
-% reset default duration
-unusedEntry = \notes { c4 }	
-
-% music = "\melodic\relative c"
+#(define toplevel-book-handler print-book-with-defaults)
+#(define toplevel-music-handler collect-music-for-book)
+#(define toplevel-score-handler collect-scores-for-book)
+#(define toplevel-text-handler collect-scores-for-book)
 
+#(define book-music-handler collect-book-music-for-book)
+#(define book-score-handler ly:book-add-score!)
+#(define book-text-handler ly:book-add-score!)