From 878f89016701d9ce3ad02de0c372fcb37a22e049 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 20 Jul 2006 13:41:42 +0000 Subject: [PATCH] * scm/framework-eps.scm (dump-stencils-as-EPSes): just strip .eps extension from includegraphics. * scripts/lilypond-book.py (main): add support for --pdf. * lily/spacing-determine-loose-columns.cc (is_loose_column): support float_grace_columns_. * Documentation/topdocs/NEWS.tely (Top): doc tupletFullLengthNote. * Documentation/topdocs/NEWS.tely (Top): document new feature. --- ChangeLog | 3 +++ scm/framework-eps.scm | 9 ++------- scripts/lilypond-book.py | 5 +---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index df8dfbaa9f..ca4bbeed67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-07-20 Han-Wen Nienhuys + * scm/framework-eps.scm (dump-stencils-as-EPSes): just strip + .eps extension from includegraphics. + * scripts/lilypond-book.py (main): add support for --pdf. * lily/spacing-spanner.cc (calc_common_shortest_duration): use diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm index 23f5779f86..5026f6126f 100644 --- a/scm/framework-eps.scm +++ b/scm/framework-eps.scm @@ -70,15 +70,12 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment." ;; main body (let* ((tex-system-name (format "~a-systems.tex" basename)) - (pdftex-system-name (format "~a-systems.pdftex" 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)) - (pdftex-system-port (open-output-file pdftex-system-name))) + (texi-system-port (open-output-file texi-system-name))) (ly:message (_ "Writing ~a...") tex-system-name) (ly:message (_ "Writing ~a...") texi-system-name) - (ly:message (_ "Writing ~a...") pdftex-system-name) (set! stencils (widen-left-stencil-edges stencils)) @@ -91,10 +88,8 @@ stencil, so LaTeX includegraphics doesn't fuck up the alignment." \\betweenLilyPondSystem{~a} \\fi " c) tex-system-port)) - (display (format "\\includegraphics{~a-~a.eps}\n" + (display (format "\\includegraphics{~a-~a}\n" basename (1+ c)) tex-system-port) - (display (format "\\includegraphics{~a-~a.pdf}\n" - basename (1+ c)) pdftex-system-port) (display (format "@image{~a-~a}\n" basename (1+ c)) texi-system-port)) (iota (length stencils))) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 433f7712fb..abba494907 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -563,7 +563,7 @@ output = { \preLilyPondExample%% \fi%% \def\lilypondbook{}%% -\input %(base)s-systems.%(texextension)s%% +\input %(base)s-systems.tex%% \ifx\postLilyPondExample \undefined%% \relax%% \else%% @@ -1164,9 +1164,6 @@ class Lilypond_snippet (Snippet): verb = self.substring ('code') str += (output[LATEX][VERBATIM] % vars ()) - texextension = 'tex' - if global_options.create_pdf: - texextension = 'pdftex' str += (output[LATEX][OUTPUT] % vars ()) ## todo: maintain breaks -- 2.39.5