X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=661c7f88546afd9f19af5c584bee11998adeeab3;hb=dc8e9c050a98c809e66b10d9ae1d3df9d3b0190f;hp=0c874f436da96dc219126f0c99c24d62f1ca4590;hpb=fedb5fe3fe4dda3c89c29af07a7b92cecd6eac70;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 0c874f436d..661c7f8854 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,138 +1,123 @@
+\version "2.10.0"
+
+%% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
-\version "2.3.2"
+%% named durations
 breve = #(ly:make-duration -1 0)
-longa = #(ly:make-duration -2 0 )
+longa = #(ly:make-duration -2 0)
 maxima = #(ly:make-duration -3 0)
 
+\include "markup-init.ly"
 \include "music-functions-init.ly"
-\include "nederlands.ly"		% dutch
+\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
-
-%{
-
-should also set allowBeamBreak, but how to do it "portably"? (ie. also
-working with lyric sections)
-
-%}
-
-%% rather name \newline, \newpage ?
-break = #(make-event-chord (list (make-penalty-music -10001 0)))
-noBreak = #(make-event-chord (list (make-penalty-music 10001 0)))
-pageBreak = #(make-event-chord (list (make-penalty-music -10001 -10001)))
-pagebreak = \pageBreak % ugh.
-noPageBreak = #(make-event-chord (list (make-penalty-music 0 10001)))
-noPagebreak = \noPageBreak % ugh
-
+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)
 
-foo = \notes { \pageBreak }
 
-\include "scale-definitions-init.ly"
+#(define fretboard-table (make-hash-table 100))
 
+\include "scale-definitions-init.ly"
 
-melisma = #(make-span-event 'ManualMelismaEvent START)
-melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
+melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
+melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
 
+laissezVibrer = #(make-music 'LaissezVibrerEvent)
+repeatTie = #(make-music 'RepeatTieEvent)
+		  
 \include "grace-init.ly"
-
-% ugh
 \include "midi-init.ly"
+\include "paper-defaults-init.ly"
 
-\include "book-paper-defaults.ly"
-
-\paper {
-    mm = #(ly:output-def-lookup $defaultbookpaper  'mm)
-    unit = #(ly:output-def-lookup $defaultbookpaper  'unit)
+\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"
-}
-
-
-#(set-default-paper-size "a4")
-
-
-
-%{
-
-%% these would supercede defaults in \bookpaper.
-% let's comment this out for now. 
-
-
-paperEleven = \paper {
-    #(paper-set-staff-size (* 11.0 pt))
-}
 
-paperThirteen = \paper {
-    #(paper-set-staff-size (* 13.0 pt))
+    #(set-paper-dimension-variables (current-module))
 }
 
-paperSixteen = \paper {
-    #(paper-set-staff-size (* 16.0 pt))
-}
+#(set-default-paper-size (ly:get-option 'paper-size))
 
-paperEightteen = \paper {
-    #(paper-set-staff-size (* 18.0 pt))
+partCombineListener = \layout {
+    \context {
+	\Score
+	skipTypesetting = ##t
+	ignoreBarChecks = ##t
+	\alias "Timing"
+    }
 }
 
-paperTwenty = \paper {
-    #(paper-set-staff-size (* 20.0 pt))
-}
-
-paperTwentythree = \paper {
-    #(paper-set-staff-size (* 23.0 pt))
-}
-
-paperTwentysix = \paper {
-    #(paper-set-staff-size (* 26.0 pt))
-}
-
-\paper { \paperTwenty }
-
-%}
-
-partCombineListener = \paper {
- \context {
-	  \Voice
-	  \consists Note_heads_engraver
-	  \consists Rest_engraver
-	  \type "Recording_group_engraver"
-	  recordEventSequence = #notice-the-events-for-pc
- }
- \context { \Score skipTypesetting = ##t }
-}
-
-#(set-part-combine-listener partCombineListener)
-
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
-
 \include "property-init.ly"
 
-%% reset default duration
-unusedEntry = \notes { c4 }
+setDefaultDurationToQuarter = { c4 }
 
-%% must have size argument for GUILE 1.6 compat.
+%% MAKE-HASH-TABLE in GUILE 1.6 takes mandatory size parameter.
 #(define musicQuotes (make-hash-table 29))
 
-#(define toplevel-book-handler ly:parser-print-book)
+#(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!)
+
+
+\include "predefined-fretboards-init.ly"