* scripts/musicxml2ly.py (NonDentedHeadingFormatter.format_headi):

[lilypond.git] / scm / framework-eps.scm

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 52035c5232abff6cc63a1dfc67755c24d7106faf..01a09a5a8765c7ddc9a7964c8a9389e7a279f5bd 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -20,6 +20,28 @@
 
 (define framework-eps-module (current-module))
 
+
+(define (widen-left-stencil-edges stencils)
+  "Change STENCILS to use the union for the left extents in every
+stencil, so LaTeX includegraphics doesn't fuck up the alignment."
+
+  (define left
+    (apply min
+          (map (lambda (stc)
+                 (interval-start (ly:stencil-extent stc X)))
+               stencils)))
+
+  (map (lambda (stil)
+        
+        (ly:make-stencil
+         (ly:stencil-expr stil)
+         (cons
+          left
+          (cdr (ly:stencil-extent stil X)))
+         (ly:stencil-extent stil Y)
+         ))
+       stencils))
+
 (define (dump-stencils-as-EPSes stencils book basename)
   (define paper (ly:paper-book-paper book))
   (define (dump-infinite-stack-EPS stencils)
@@ -30,29 +52,42 @@
     (if (pair? stencils)
        (let* ((line (car stencils))
               (rest (cdr stencils)))
+
          (dump-stencil-as-EPS
           paper
           line (format "~a-~a" basename count)
           (ly:output-def-lookup paper 'force-eps-font-include))
          
          (dump-stencils-as-separate-EPS rest (1+ count)))))
-  
+
+
+  ;; main body 
   (let* ((tex-system-name (format "~a-systems.tex" basename))
         (texi-system-name (format "~a-systems.texi" basename))
         (tex-system-port (open-output-file tex-system-name))
         (texi-system-port (open-output-file texi-system-name)))
     
-    (ly:message (_ ("Writing ~a...") tex-system-name))
-    (ly:massage (_ ("Writing ~a...") texi-system-name))
+    (ly:message (_ "Writing ~a...") tex-system-name)
+    (ly:message (_ "Writing ~a...") texi-system-name)
+
+    (set! stencils (widen-left-stencil-edges stencils))
+    
     (dump-stencils-as-separate-EPS stencils 1)
     (for-each (lambda (c)
-               (display (format "\\includegraphics{~a-~a.eps}%\n"
+               (if (< 0 c)
+                   (display (format "\\ifx\\betweenLilyPondSystem \\undefined
+  \\linebreak
+\\else
+  \\betweenLilyPondSystem{~a}
+\\fi
+" c) tex-system-port))
+               (display (format "\\includegraphics{~a-~a.eps}\n"
                                 basename (1+ c)) tex-system-port)
-               (display (format "@image{~a-~a}@c\n"
+               (display (format "@image{~a-~a}\n"
                                 basename (1+ c)) texi-system-port))
              (iota (length stencils)))
-
-    (display "@c eof - 'eof' is a Makefile marker; don not remove. " texi-system-port)
+    
+    (display "@c eof - 'eof' is a Makefile marker; do not remove. " texi-system-port)
     (display "% eof - 'eof' is Makefile marker; do not remove. " tex-system-port)
     
     (dump-infinite-stack-EPS stencils))
@@ -61,8 +96,9 @@
 
 (define-public (output-classic-framework basename book scopes fields)
   (output-scopes scopes fields basename)
+  
   (dump-stencils-as-EPSes
-   (map ly:paper-system-stencil (ly:paper-book-systems book))
+   (map paper-system-stencil (ly:paper-book-systems book))
    book
    basename))