X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fdeclarations-init.ly;h=e85362a8859bfa147eb3fcf12276c6ac9201e8e6;hb=f65bcd9801ffddcaad51ffb733a0d8c67e943a33;hp=1e2f355132b43b3672a2ee78765ba775a23a5a94;hpb=eba82770802a246bca4afab7eab1f78e84785214;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 1e2f355132..e85362a885 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,11 +1,18 @@
+\version "2.3.16"
+
+%% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
-\version "2.1.26"
+%% named durations
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
 
-\include "nederlands.ly"		% dutch
+\include "music-functions-init.ly"
+
+%% default note names are dutch
+\include "nederlands.ly"
+
 \include "drumpitch-init.ly"		
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
@@ -19,18 +26,40 @@ start = -1
 stop = 1
 smaller = -1
 bigger = 1
-center=0
+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-penalty-music -10001 0)))
+noBreak = #(make-event-chord (list (make-penalty-music 10001 0)))
+pageBreak = #(make-event-chord (list (make-penalty-music -10001 -10001)))
+noPageBreak = #(make-event-chord (list (make-penalty-music 0 10001)))
 
-should also set allowBeamBreak, but how to do it "portably"? (ie. also
-working with lyric sections)
 
-%}
-break =#(make-event-chord (list (make-penalty-music -10001)))
-noBreak = #(make-event-chord (list (make-penalty-music 10001)))
+%
+% 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 'CrescendoEvent START)
+escapedSmallerSymbol = #(make-span-event 'DecrescendoEvent START)
 
-noBeam = #(make-music-by-name 'BeamForbidEvent) 
+
+
+foo = { \pageBreak }
 
 \include "scale-definitions-init.ly"
 
@@ -38,96 +67,49 @@ melisma = #(make-span-event 'ManualMelismaEvent START)
 melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 \include "grace-init.ly"
-
-% ugh
 \include "midi-init.ly"
+\include "book-paper-defaults.ly"
 
-
-% Do units first; must be done before any units are specified.
 \paper {
-    unit = "mm"
-    mm = 1.0
-    in = 25.4
+    mm = #(ly:output-def-lookup $defaultbookpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultbookpaper 'unit)
+
+    in = #(* 25.4 mm)
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
-
-    #(define font-defaults
-      '((font-family . music)
-	(font-shape . upright)
-	(baseline-skip . 2)
-	(word-space . 0.6)
-	(font-series . medium)
-    ))
     
     \include "engraver-init.ly"
 }
 
-#(set-paper-size "a4")
-
-
-%{
-
-; note:
-; you can add fonts manually  in the paper block by issuing
-
-#(set! fonts (append ...myfonts... fonts))
-
-for the format of myfonts, see font.scm
-
-%}
-
-
-paperEleven = \paper {
-    #(paper-set-staff-size (* 11.0 pt))
-}
-
-paperThirteen = \paper {
-    #(paper-set-staff-size (* 13.0 pt))
-}
-
-paperSixteen = \paper {
-    #(paper-set-staff-size (* 16.0 pt))
-}
-
-paperEightteen = \paper {
-    #(paper-set-staff-size (* 18.0 pt))
-}
-
-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))
-}
+#(set-default-paper-size "a4")
 
-\paper { \paperTwenty }
 
 partCombineListener = \paper {
- \translator {
-	  \VoiceContext
-	  \consists Note_heads_engraver
-	  \consists Rest_engraver
-	  \type "Recording_group_engraver"
-	  recordEventSequence = #notice-the-events-for-pc
- }
- \translator { \ScoreContext skipTypesetting = ##t }
+    \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"
 
+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 }
-
-#(define musicQuotes (make-hash-table)) 
+#(define toplevel-book-handler ly:parser-print-book)
+#(define toplevel-music-handler collect-music-for-book)
+#(define toplevel-score-handler collect-scores-for-book)