From: Pedro Kroger Date: Mon, 2 Aug 2004 16:19:16 +0000 (+0000) Subject: * scm/page-layout.scm (default-page-make-stencil): If leftmargin X-Git-Tag: release/2.3.11~9 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=79ab1b579a21ed33c3d20222dcfb5d1b2812ed31;p=lilypond.git * 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 9f0f7146f7..82c403631f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-08-02 Pedro Kroger + + * 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 * Fix some problems after the renaming of my-lily -> lily diff --git a/scm/page-layout.scm b/scm/page-layout.scm index 3e9ec78197..4afd58b713 100644 --- 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 501d7d187c..211208ac86 100644 --- 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)