From e2987765da55a51735fb221505eebf07c3b9f43d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 19 Sep 2004 09:09:53 +0000
Subject: [PATCH] * ly/init.ly: reverse collected scores.

* scm/page-layout.scm (ly:optimal-page-breaks): use non-ragged
layout to determine force.
---
 ChangeLog                         |  7 +++++
 input/regression/lyric-combine.ly | 50 +++++++++++++++----------------
 ly/init.ly                        |  2 +-
 scm/page-layout.scm               |  3 +-
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88744c7de5..fa9f7b1180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* ly/init.ly: reverse collected scores.
+
+	* scm/page-layout.scm (ly:optimal-page-breaks): use non-ragged
+	layout to determine force.
+	
 2004-09-18  Werner Lemberg  <wl@gnu.org>
 
 	* ly/engraver-init.ly <Score> [quotedEventTypes]: Add tuplets and
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 927bf94a56..60a434cd51 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -2,7 +2,7 @@
 \version "2.3.17"
 
 \header{
-texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
+    texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
 discarded.  Lyrics will not be set over rests.  You can have melismata
 either by setting a property melismaBusy, or by setting
 automaticMelismas (which will set melismas during slurs and ties).  If
@@ -13,37 +13,37 @@ extenders do not assume anything about lyric lengths, so they continue
 to work."
 }
 
-    \paper { raggedright= ##t }
+\paper { raggedright= ##t }
 
 
 
-m =   \relative c'' {
-	\autoBeamOff
-	g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
-	\emptyText
-	d8.^"melisma" 	\melisma c16
-	\melismaEnd
-	b }
+m = \relative c'' {
+    \autoBeamOff
+    g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
+    \emptyText
+    d8.^"melisma" 	\melisma c16
+    \melismaEnd
+    b
+}
 
 noise = \repeat unfold 6  \relative c'' { g16 g g g }
 
- textI = \context Lyrics = "middle-1" \lyricmode { la2 __ la -- la __ la la la la la  }
+textI = \context Lyrics = "middle-1" \lyricmode { la2 __ la -- la __ la la la la la  }
 textII = \context Lyrics = "middle-1" \lyricmode { da -- da __ da -- da da da da da  }
 
-\score {
-     << \context Staff = SA \noise
-      \context Lyrics = LA { s1 }
-      \context Staff = SB { s1 }
-      \context Lyrics = LB { s1 }
-      \context Staff = SC \noise
-      
-      \oldaddlyrics
-	  \context Staff = SB \context Voice="middle" \m
-	  << \context Lyrics = LA \textI
-	    \context Lyrics = LB \textII
-	  >>
-	  
-    >>
-}
+
+<< \context Staff = SA \noise
+   \context Lyrics = LA { s1 }
+   \context Staff = SB { s1 }
+   \context Lyrics = LB { s1 }
+   \context Staff = SC \noise
+   
+   \oldaddlyrics
+   \context Staff = SB \context Voice="middle" \m
+   << \context Lyrics = LA \textI
+      \context Lyrics = LB \textII
+  >>
+   
+>>
 
 
diff --git a/ly/init.ly b/ly/init.ly
index 0956b0cfce..38350767dd 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -32,5 +32,5 @@
 
 #(if (pair? toplevel-scores)
   (ly:parser-print-book parser
-   (apply ly:make-book $defaultbookpaper $globalheader toplevel-scores)))
+   (apply ly:make-book $defaultbookpaper $globalheader (reverse toplevel-scores))))
 
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 49568d251d..590c4d8cda 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -337,7 +337,8 @@ is what have collected so far, and has ascending page numbers."
 		  springs rods space
 		  ragged?))
 
-	 (force (car result))
+	 (force (car (ly:solve-spring-rod-problem
+		      springs rods space #f)))
 	 (positions
 	  (map (lambda (y)
 		       (+ y topskip)) 
-- 
2.39.2