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

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

diff --git a/ChangeLog b/ChangeLog
index 99082be3b440b1b8b8a2a22b7e86e2ffaf60f0d7..6dbfe2d7fced7cd211077e06412bedee9515ef00 100644 (file)
--- 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 07562de665ccadd0c3afdc6d8952a1118585fc50..bc31074cd9bb5b673f60fb2c610c07fda29daf9a 100644 (file)
--- 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 e44ab4c31688f8359e44c341b91fa33e6e277d88..364f2f85f6a0780caacf6150bdf63ab251f213bf 100644 (file)
--- 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)