(ly_bookpaper_fonts): move from Paperdef

[lilypond.git] / ly / declarations-init.ly

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 26d8cc733c21eaf82942364a388a89c85b330643..f0fc60ee7bfe31284767e96bbd89e022847aa08b 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,10 +1,11 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.36"
+\version "2.2.0"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
 
+\include "music-functions-init.ly"
 \include "nederlands.ly"               % dutch
 \include "drumpitch-init.ly"           
 \include "chord-modifiers-init.ly"
@@ -27,8 +28,12 @@ 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)))
+
+%% 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)))
+noPagebreak = #(make-event-chord (list (make-penalty-music 0 10001)))
 
 noBeam = #(make-music 'BeamForbidEvent) 
 pipeSymbol = #(make-music 'BarCheck)
@@ -60,21 +65,35 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
     #(define $is-paper #t)
     
     #(define font-defaults
-      '((font-encoding . fetaMusic))
-      )
+      '((font-encoding . fetaMusic)))
 
     #(define text-font-defaults
       '((font-encoding . latin1)
        (baseline-skip . 2)
-       (word-space . 0.6)
-       ))
+       (word-space . 0.6)))
 
     #(define page-breaking ly:ragged-page-breaks)
-    %#(define page-breaking ly:optimal-page-breaks)
-    
+    %%#(define page-breaking ly:optimal-page-breaks)
+
+    #(define page-to-stencil ly:page-header-lines-footer-stencil)
+
+    #(define make-header plain-header)
+    #(define make-footer plain-footer)
+    %%#(define make-footer empty-markup)
+    #(define make-tagline TAGLINE-or-tagline-from-header)
+    #(define make-copyright copyright-from-header)
+
     \include "engraver-init.ly"
 }
 
+%
+% 20pt staff, 5 pt = 1.75 mm
+%
+
+#(define-public $defaultbookpaper (ly:make-bookpaper 1.7573))
+  
+
+
 #(set-default-paper-size "a4")
 
 
@@ -137,11 +156,15 @@ partCombineListener = \paper {
 
 \include "property-init.ly"
 
-
-
-% reset default duration
+%% reset default duration
 unusedEntry = \notes { c4 }
 
+%% must have size argument for GUILE 1.6 compat.
+#(define musicQuotes (make-hash-table 29))
+
+%%#(define-public toplevel-music-handler ly:parser-add-book-and-score)
+#(define toplevel-book-handler default-toplevel-book-handler)
+#(define toplevel-music-handler default-toplevel-music-handler)
+#(define toplevel-score-handler default-toplevel-score-handler)
 
-% must have size argument for GUILE 1.6 compat.
-#(define musicQuotes (make-hash-table 29)) 
+#(define toplevel-score-handler default-toplevel-score-handler)