From ac3444d44cf0f776cbae80b8f4b1211cae26c400 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Mon, 20 Sep 2004 20:09:53 +0000
Subject: [PATCH] remove file.

---
 ChangeLog                                     |  2 ++
 input/mutopia/W.A.Mozart/mozart-hrn-3.ly      | 30 +++++++++++--------
 input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily |  9 ++++--
 lily/context.cc                               |  3 +-
 ly/center-init.ly                             | 15 ----------
 ly/part-paper-init.ly                         | 10 -------
 scm/page-layout.scm                           | 18 ++++++-----
 scm/paper.scm                                 |  2 --
 8 files changed, 37 insertions(+), 52 deletions(-)
 delete mode 100644 ly/center-init.ly
 delete mode 100644 ly/part-paper-init.ly

diff --git a/ChangeLog b/ChangeLog
index ab2a6091e2..93726f7927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* ly/part-paper-init.ly: remove file.
+
 	* lily/includable-lexer.cc (new_input): elucidate message.
 
 2004-09-19  Jan Nieuwenhuizen  <janneke@gnu.org>
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 59f5d18d2b..9a450e980e 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -48,35 +48,39 @@ virtuoso that taught in Geneva.
 \include "mozart-hrn3-romanze.ily"
 \include "mozart-hrn3-rondo.ily"
 
-
+    \bookpaper {
+	betweensystempadding = 0.0
+	betweensystemspace = 20 \mm
+%	raggedbottom = ##t 
+	}
 
 
 \book {
-\score
-{
-	 { \transpose c' bes \allegro }
+    \score
+    {
+	{ \transpose c' bes \allegro }
 	\paper{ }
 	\header { piece = "allegro" opus = "" }	
 	\midi{ \tempo 4=90 }
-}
+    }
 
 
-\score
-{
-     { \transpose c' bes \romanze }
+    \score
+    {
+	{ \transpose c' bes \romanze }
 	\header { piece = "romanze" opus = "" }	
 	\midi{ \tempo 4 = 70  }
 	\paper{}
-}
+    }
 
 
-\score
-{
-     { \transpose c' bes	\rondo }
+    \score
+    {
+	{ \transpose c' bes	\rondo }
 	\header { piece = "rondo" opus = "" }
 	\midi{ \tempo 4 = 100 }
 	\paper { }
-}
+    }
 
 
 }
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
index 4cd80c4bf4..aa1f07606b 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
@@ -29,7 +29,7 @@ stopGraceMusic= \sequential {
     \stopGraceMusic
 }
 
-\paper{
+\paper {
     \context {
         \Score
         skipBars = ##t
@@ -47,10 +47,13 @@ stopGraceMusic= \sequential {
     }
     \context {
         \Staff
-        minimumVerticalExtent = #'(-4.5 . 4.5)
+        minimumVerticalExtent = #'(-2.5 . 3.5)
     }
+}
+
+\bookpaper{
+
     % #(define fonts my-sheet)
-    #(define page-breaking ly:optimal-page-breaks)
 
     % stress page breaking on a6 paper:
     % linewidth = 80 \mm
diff --git a/lily/context.cc b/lily/context.cc
index 14abd62adf..cb3029d44a 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -21,8 +21,7 @@ bool
 Context::is_removable () const
 {
   return context_list_ == SCM_EOL && ! iterator_count_ &&
-	  !dynamic_cast<Score_context const*> (this)
-    ;
+	  !dynamic_cast<Score_context const*> (this);
 }
 
 void
diff --git a/ly/center-init.ly b/ly/center-init.ly
deleted file mode 100644
index 0d9a088695..0000000000
--- a/ly/center-init.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-% Toplevel initialisation file. 
-	
-\version "2.3.16"
-
-
-\include "declarations-init.ly"
-#(set-global-staff-size 16)
-
- \paper { 
-  \paperSixteen
-%  linewidth = 7.\cm
-  linewidth = 11.\cm
-}
-
-\maininput
diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly
deleted file mode 100644
index 2723c5db73..0000000000
--- a/ly/part-paper-init.ly
+++ /dev/null
@@ -1,10 +0,0 @@
-\version "2.3.16"
-
-% JUNKME
-%part-paper-init.ly
-
-\paper {
-	\context { \OrchestralPartStaff }
-	\context { \Score skipBars = ##t }
-}
-
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 590c4d8cda..7732965658 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -136,7 +136,7 @@
                       lmargin
                       (/ (- hsize
                             (ly:output-def-lookup paper 'linewidth)) 2)))
- 
+
       (rightmargin (ly:output-def-lookup paper 'rightmargin))
       (bottom-edge (- vsize
 		      (ly:output-def-lookup paper 'bottommargin)))
@@ -168,7 +168,11 @@
 			   page-stencil))))
       )
 
-
+    (if #t
+	(display (list
+		  "leftmargin" leftmargin "rightmargin" rightmargin
+		  )))
+    
     (set! page-stencil (ly:stencil-combine-at-edge
 	  page-stencil Y DOWN head 0. 0.))
 
@@ -344,9 +348,9 @@ is what have collected so far, and has ascending page numbers."
 		       (+ y topskip)) 
 	       (cdr  result)))
 	 )
-
-     (if #f ;; debug.
-	 (begin
+      
+      (if #f ;; debug.
+	  (begin
 	   (display (list "\n# systems: " no-systems
 			  "\nreal-ext" real-extents "\nstaff-ext" staff-extents
 			  "\ninterscore" inter-system-space
@@ -377,8 +381,8 @@ CURRENT-BEST is the best result sofar, or #f."
 
 	   
 	   (ragged? (or (eq? #t (ly:output-def-lookup bookpaper 'raggedbottom))
-		       (and (eq? #t (ly:output-def-lookup bookpaper 'raggedlastbottom))
-			    last?)))
+			(and (eq? #t (ly:output-def-lookup bookpaper 'raggedlastbottom))
+			     last?)))
            (page-height (page-height this-page-num last?))
 	   (vertical-spacing (space-systems page-height current-lines ragged?))
 	   (satisfied-constraints (car vertical-spacing))
diff --git a/scm/paper.scm b/scm/paper.scm
index 13fadc5bdd..a2b359f154 100644
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -108,8 +108,6 @@
 		   module))
      ((pair? entry)
 
-	    
-
       (set! entry (eval (cdr entry) module))
       (if landscape?
 	  (set! entry (swap entry)))
-- 
2.39.5