From: Han-Wen Nienhuys Date: Thu, 1 Dec 2005 23:54:29 +0000 (+0000) Subject: (do_file): fix thinkos. X-Git-Tag: release/2.7.21~9 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5ee922293e001d90a65ea69543123a6b60305c7b;p=lilypond.git (do_file): fix thinkos. --- diff --git a/ChangeLog b/ChangeLog index 30472757a7..e7a9253226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-02 Han-Wen Nienhuys + + * scripts/lilypond-book.py (do_file): fix thinkos. + 2005-12-01 Jan Nieuwenhuizen * lily/GNUmakefile ($(outdir)/FlexLexer.h): @@ -9,6 +13,10 @@ * ly/titling-init.ly (tagline): it should be a space between "Music engraving by LilyPond" and the version number. +2005-12-01 Han-Wen Nienhuys + + * VERSION (PACKAGE_NAME): release 2.7.20 + 2005-11-30 Han-Wen Nienhuys * scm/define-markup-commands.scm (pad-to-box): new markup command. diff --git a/VERSION b/VERSION index 811df0c26a..70214b6bd2 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 -PATCH_LEVEL=20 +PATCH_LEVEL=21 MY_PATCH_LEVEL= diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index f2644801d8..a9346b830a 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1354,7 +1354,7 @@ def get_latex_textwidth (source): def modify_preamble (chunk): str = chunk.replacement_text () - if (re.search (r"\\begin{document}", str) + if (re.search (r"\\begin *{document}", str) and not re.search ("{graphic[sx]", str)): str = re.sub (r"\\begin{document}", r"\\usepackage{graphics}" + '\n' @@ -1530,8 +1530,8 @@ def do_file (input_filename): if format == LATEX: for c in chunks: if (c.is_plain () and - re.search (r"\\begin{document}", c.replacement_text())): - modify_preamble (chunks[0]) + re.search (r"\\begin *{document}", c.replacement_text())): + modify_preamble (c) break ly.progress ('\n')