* scm/lily.scm (define-scheme-options): alphabetize, add eps-pad-boxes.

* scm/framework-ps.scm (dump-stencil-as-EPS): only pad boxes if
eps-pad-boxes is set.

* scripts/lilypond-book.py (main): use -deps-pad-boxes.

* THANKS: update sponsors.

* ly/english.ly: quarter tone naming (thanks, Trevor Baca)

diff --git a/ChangeLog b/ChangeLog
index 3d4ae6d948da0a7cf57dfd34a595a1c122f664ee..8f067a5be64c65321b64c9aa63327753dae4c4c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/lily.scm (define-scheme-options): alphabetize, add eps-pad-boxes.
+
+       * scm/framework-ps.scm (dump-stencil-as-EPS): only pad boxes if
+       eps-pad-boxes is set.
+
+       * scripts/lilypond-book.py (main): use -deps-pad-boxes.
+
        * THANKS: update sponsors.
 
        * ly/english.ly: quarter tone naming (thanks, Trevor Baca)

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 9095c1a9b903be15d57e3180b2dbd824bfb05226..53d6447c98484e36a8b27a9b4f115fecea2d683c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -518,8 +518,13 @@
           ;; the left-overshoot is to make sure that
           ;; bar numbers  stick out of margin uniformly.
           ;;
-          (list (min left-overshoot (car xext))
-                (car yext) (cdr xext) (cdr yext))))
+          (list
+
+           (if (ly:get-option 'eps-pad-boxes) 
+               (min left-overshoot (car xext))
+               (car xext))
+           (car yext) (cdr xext) (cdr yext))))
+        
         (rounded-bbox (to-bp-box bbox))
         (port (ly:outputter-port outputter))
         (header (eps-header paper rounded-bbox load-fonts?)))

diff --git a/scm/lily.scm b/scm/lily.scm
index 484c81ecd9c172ac1e2e26557910af75790efdb8..5601d1e72722c1c01d8c4ab0140e93bbcae243ce 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -10,39 +10,41 @@
   (for-each (lambda (x)
              (ly:add-option (car x) (cadr x) (caddr x)))
          
-           `((point-and-click #t "use point & click")
-             (paper-size "a4" "the default paper size")
-             (midi-debug #f "generate human readable MIDI")
+           `(
+             (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
+             (book-title-preview #t "include book-titles in preview images.")
+             (debug-gc #f
+                       "dump memory debugging statistics")
+             (delete-intermediate-files #f
+                                        "delete unusable PostScript files")
              (dump-signatures #f "dump output signatures of each system")
+             (eps-font-include #f "Include fonts in separate-system EPS files.")
+             (eps-pad-boxes #f "Pad EPS bounding boxes to guarantee alignment between systems")
+             (gs-font-load #f
+                           "load fonts via Ghostscript.")
+             (gui #f "running from gui; redirect stderr to log file")
              (internal-type-checking #f "check every property assignment for types")
-             (parse-protect #t "continue when finding errors in inline
-scheme are caught in the parser. If off, halt 
-on errors, and print a stack trace.")
-             (profile-property-accesses #f "keep statistics of get_property() calls.")
+             (midi-debug #f "generate human readable MIDI")
              (old-relative #f
                            "relative for simultaneous music works
 similar to chord syntax")
              (object-keys #f
                           "experimental mechanism for remembering tweaks")
+             (point-and-click #t "use point & click")
+             (paper-size "a4" "the default paper size")
+             (parse-protect #t "continue when finding errors in inline
+scheme are caught in the parser. If off, halt 
+on errors, and print a stack trace.")
+             (profile-property-accesses #f "keep statistics of get_property() calls.")
              (resolution 101 "resolution for generating bitmaps")
-             (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
-             (book-title-preview #t "include book-titles in preview images.")
-             (eps-font-include #f "Include fonts in separate-system EPS files.")
-             (gs-font-load #f
-                           "load fonts via Ghostscript.")
-             (gui #f "running from gui; redirect stderr to log file")
-             (delete-intermediate-files #f
-                                        "delete unusable PostScript files")
+             (read-file-list #f "Read files to be processed from command line arguments")
              (safe #f "Run safely")
-             (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")
              (strict-infinity-checking #f "If yes, crash on encountering Inf/NaN")
              (ttf-verbosity 0
                           "how much verbosity for TTF font embedding?")
-             (debug-gc #f
-                       "dump memory debugging statistics")
              (show-available-fonts #f
                                    "List  font names available.")
-             (read-file-list #f "Read files to be processed from command line arguments")
+             (verbose ,(ly:command-line-verbose?) "value for the --verbose flag")
              )))
 
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 9e2932113ffb46b906104ac96c08422ee7a36795..480ab7d63ecc53ce335c4a12f7273c1b1accdaed 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1726,7 +1726,7 @@ def main ():
     if global_options.verbose:
         global_options.process_cmd += " --verbose "
 
-    global_options.process_cmd += " -dread-file-list "
+    global_options.process_cmd += " -dread-file-list -deps-pad-boxes "
 
     identify ()