From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 26 May 2004 15:53:10 +0000 (+0000)
Subject: * lily/parser.yy (book_body): set default bookpaper.
X-Git-Tag: release/2.3.2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6627bce531e58e8ec051bbe8ebe2ad5c6fbc187f;p=lilypond.git

* lily/parser.yy (book_body): set default bookpaper.

* scm/output-tex.scm (header): kludge: hard code linewidth.
---

diff --git a/ChangeLog b/ChangeLog
index 99082be3b4..6dbfe2d7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-26  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/parser.yy (book_body): set default bookpaper.
+
 	* scm/output-tex.scm (header): kludge: hard code linewidth. 
 
 	* lily/my-lily-parser.cc (My_lily_parser): don't delete lexer.
diff --git a/lily/parser.yy b/lily/parser.yy
index 07562de665..bc31074cd9 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -651,6 +651,7 @@ book_body:
 	{
 		$$ = new Book;
 		$$->set_spot (THIS->here_input ());
+		$$->bookpaper_ = unsmob_book_paper_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ();
 		scm_gc_unprotect_object ($$->bookpaper_->self_scm ());
 	}
 	| book_body book_paper_block {
diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index e44ab4c316..364f2f85f6 100644
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -269,7 +269,9 @@
    ;; FIXME
    ;; this is -of course- severely broken, (--hwn)
    (tex-string-def  "lilypondpaper" 'linewidth
-		    "18cm")
+		    (ly:number->string (/ 18 0.175))) ; 18 cm.
+   (tex-string-def  "lilypondpaper" 'interscoreline
+		    (ly:number->string 0.0))
    ))
 
 (define (output-tex-string s)