From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 9 Mar 2004 23:00:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.30~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ce6805d467a8a002389a419f590794df52ef899e;p=lilypond.git

*** empty log message ***
---

diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 9abe85dfba..3739e2349e 100644
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -7,6 +7,8 @@
 
 %}
 
+latinTest = \markup { \latin-i "Hellö" }
+    
 sizeTest = \markup {
 	\column <
             { \normalsize "normalsize"
@@ -101,7 +103,7 @@ spaceTest = \markup { "two space chars" }
 \score {
     \context Staff \notes \relative c' {
 	c2-\sizeTest c2-\spaceTest
-	% \break c2 c2
+	\break c2-\latinTest c2
     }
 }
 
@@ -111,7 +113,6 @@ spaceTest = \markup { "two space chars" }
 
 \score {
     \context Staff \notes \relative c' {
-	c2-\sizeTest c2-\spaceTest
-	% \break c2 c2
+	\repeat unfold 10 { a b c d \break }
     }
 }
diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 0394a1c3c9..8beddc6d33 100644
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -90,12 +90,14 @@ Paper_book::Paper_book ()
 void
 Paper_book::output (String outname)
 {
-  Paper_outputter *out = papers_.top ()->get_paper_outputter (outname);
+  /* Generate all stencils to trigger font loads.  */
+  Link_array<Page> *pages = get_pages ();
 
-  out->output_metadata (get_scopes (0), papers_.top ());
-  out->output_header (papers_.top ());
+  Paper_def *paper = papers_[0];
+  Paper_outputter *out = paper->get_paper_outputter (outname);
+  out->output_metadata (get_scopes (0), paper);
+  out->output_header (paper);
 
-  Link_array<Page> *pages = get_pages ();
   int page_count = pages->size ();
   for (int i = 0; i < page_count; i++)
     (*pages)[i]->output (out, i + 1 == page_count);
@@ -125,7 +127,8 @@ Paper_book::get_title (int i)
   SCM s = ly_modules_lookup (get_scopes (i), field); 
   if (s != SCM_UNDEFINED && scm_variable_bound_p (s) == SCM_BOOL_T)
     return unsmob_stencil (gh_call2 (make_title,
-				     papers_[i]->self_scm (),
+				     // papers_[i]->self_scm (),
+				     papers_[0]->self_scm (),
 				     scm_variable_ref (s)));
   return 0;
 }
@@ -154,7 +157,6 @@ Paper_book::get_pages ()
   Real book_height = 0;
   for (int i = 0; i < score_count; i++)
     {
-      //SCM lines = scores_[i];
       Stencil *title = get_title (i);
       if (title)
 	book_height += title->extent (Y_AXIS).length ();
@@ -167,7 +169,8 @@ Paper_book::get_pages ()
 	}
     }
 
-  Page *page = new Page (papers_.top ());
+  Paper_def *paper = papers_[0];
+  Page *page = new Page (paper);
   fprintf (stderr, "book_height: %f\n", book_height);
   fprintf (stderr, "vsize: %f\n", page->vsize_);
   fprintf (stderr, "pages: %f\n", book_height / page->text_height ());
@@ -191,7 +194,7 @@ Paper_book::get_pages ()
 	  if (page->height_ + h > text_height)
 	    {
 	      pages->push (page);
-	      page = new Page (papers_.top ());
+	      page = new Page (paper);
 	    }
 	  if (page->height_ + h <= text_height || page->height_ == 0)
 	    {
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index ffc971cc8f..7553e2f1de 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -267,7 +267,6 @@
 	  (begin
 	    (ly:warn
 	     (format "Programming error: No such font: ~S" name-mag-pair))
-	    (write font-name-alist)
 	    ""))))
   
   (string-append (select-font name-mag-pair) exp))