From 7f9f38e375496e9f539c6cd1c801a7053a9c2404 Mon Sep 17 00:00:00 2001 From: Erik Sandberg Date: Sun, 23 Oct 2005 15:58:41 +0000 Subject: [PATCH] * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson. --- ChangeLog | 4 ++++ THANKS | 1 + scripts/lilypond-book.py | 28 ++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d73042d239..94ddca93ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-10-23 Erik Sandberg + + * scripts/lilypond-book.py: Backport bugfix by Mats Bengtsson. + 2005-10-11 Jan Nieuwenhuizen * cygwin/postinstall-lilypond.sh: Remove cruft. diff --git a/THANKS b/THANKS index aef612c9ec..e82db88711 100644 --- a/THANKS +++ b/THANKS @@ -80,6 +80,7 @@ Ed Jackson Erik Ronström Fernando Pablo Lopez-Lezcano Gilles Sadowski +Pothárn Imre Jack O'Quin Jeff Smith Johannes Schindelin diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index e8cebdd43a..9618c066b6 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -561,9 +561,13 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s %(preamble_string)s -%% ******************************** + + + + +%% **************************************************************** %% Start cut-&-pastable-section -%% ******************************** +%% **************************************************************** \paper { #(define dump-extents #t) @@ -579,16 +583,32 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s FRAGMENT_LY = r''' %(notes_string)s { + + +%% **************************************************************** %% ly snippet contents follows: +%% **************************************************************** %(code)s + + +%% **************************************************************** %% end ly snippet +%% **************************************************************** } ''' FULL_LY = ''' + + +%% **************************************************************** %% ly snippet: +%% **************************************************************** %(code)s + + +%% **************************************************************** %% end ly snippet +%% **************************************************************** ''' texinfo_linewidths = { @@ -1034,10 +1054,10 @@ class Lilypond_snippet (Snippet): if VERBATIM in self.option_dict: verb = self.substring ('code') str += (output[LATEX][VERBATIM] % vars ()) - if QUOTE in self.option_dict: - str = output[LATEX][QUOTE] % vars () str += (output[LATEX][OUTPUT] % vars ()) + if QUOTE in self.option_dict: + str = output[LATEX][QUOTE] % vars () return str def output_print_filename (self, format): -- 2.39.5