* scripts/lilypond-book.py (output_dict) <latex>: `output_tex'

renamed to `output_latex_quoted'.
Added `output_latex_noquote'.
(schedule_lilypond_block): Implement `noquote' option for LaTeX
mode.

diff --git a/ChangeLog b/ChangeLog
index 7af01537479cae4cd3515fe1427d8f7541b04645..5bbd73d0138ab06f0ab0ac5efddfaeee6b5a3d04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-05  Werner Lemberg  <wl@gnu.org>
+
+       * scripts/lilypond-book.py (output_dict) <latex>: `output_tex'
+       renamed to `output_latex_quoted'.
+       Added `output_latex_noquote'.
+       (schedule_lilypond_block): Implement `noquote' option for LaTeX
+       mode.
+
 2002-10-04  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/grob-description.scm (minimum-beam-collision-distance): 0.75

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index a8b9c650a420bfc5f0451bff1cfdd70362d864b1..77870ede96f1d07a741e8d1c0a8b21ace083efca 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -422,7 +422,13 @@ output_dict= {
                'output-noinline': r'''
 %% generated: %(fn)s.eps
 ''',
-               'output-tex': '{\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n}',
+               'output-latex-quoted': r'''{\preLilypondExample
+\input %(fn)s.tex
+\postLilypondExample}''',
+               'output-latex-noquote': r'''{\parindent 0pt
+\preLilypondExample
+\input %(fn)s.tex
+\postLilypondExample}''',
                'pagebreak': r'\pagebreak',
                },
 
@@ -1091,7 +1097,10 @@ def schedule_lilypond_block (chunk):
                if 'eps' in opts:
                        s = 'output-eps'
                else:
-                       s = 'output-tex'
+                       if 'noquote' in opts:
+                               s = 'output-latex-noquote'
+                       else:
+                               s = 'output-latex-quoted'
        elif format == 'texi':
                if 'noquote' in opts:
                        s = 'output-texi-noquote'