* scm/page-layout.scm (default-page-make-stencil): If leftmargin

	isn't specified by the user in \bookpaper center the music in the
	page.

diff --git a/ChangeLog b/ChangeLog
index 9f0f7146f738fdd0e23a64b519d5470139543d0b..82c403631f385e70f4923d2f0f360f9b71d2bd04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-02  Pedro Kroger  <kroeger@pedrokroeger.net>
+
+       * scm/page-layout.scm (default-page-make-stencil): If leftmargin
+       isn't specified by the user in \bookpaper center the music in the
+       page.
+
 2004-08-02  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Fix some problems after the renaming of my-lily -> lily

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 3e9ec78197156bf32454908b0c61a490d8412219..4afd58b713c98265f7a8a5516c9925aafcddb4d8 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -127,11 +127,18 @@
      ((topmargin  (ly:output-def-lookup paper 'topmargin))
       
       ;; TODO: naming vsize/hsize not analogous to TeX.
+
       
-      (leftmargin (ly:output-def-lookup paper 'leftmargin))
-      (rightmargin (ly:output-def-lookup paper 'rightmargin))
       (vsize (ly:output-def-lookup paper 'vsize))
       (hsize (ly:output-def-lookup paper 'hsize))
+      
+      (lmargin (ly:output-def-lookup paper 'leftmargin))
+      (leftmargin (if lmargin
+                      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)))
                     

diff --git a/scm/paper.scm b/scm/paper.scm
index 501d7d187cb99ac39b63086db79dfe6fc3bbc46f..211208ac86bbe041d1efd6723a9c12625b796c69 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -76,7 +76,7 @@
     (module-define! m 'bottommargin (* 6 mm))
     (module-define! m 'headsep (* 4 mm))
     (module-define! m 'footsep (* 4 mm))
-    (module-define! m 'leftmargin (* 10 mm))
+    (module-define! m 'leftmargin #f)
     (module-define! m 'rightmargin (* 10 mm))))
 
 (define (internal-set-paper-size module name)