* scripts/lilypond-book.py: resurrect 'eps' option.

* VERSION (PATCH_LEVEL): branch off 2.0, go to 2.1 in HEAD

* VERSION: release 2.0.1

diff --git a/ChangeLog b/ChangeLog
index 501ca6080d6e815fda95a9c9aeb0e393ad7e1738..260b4df71aa44befd3926c362e2b02bb32b12b67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-09-29  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scripts/lilypond-book.py: resurrect 'eps' option. 
+
+       * VERSION (PATCH_LEVEL): branch off 2.0, go to 2.1 in HEAD
+
        * scripts/lilypond.py (run_dvips): use -Ppdf for preview.
 
        * VERSION: release 2.0.1

diff --git a/VERSION b/VERSION
index 3b76cb1959bbbf62fefb673fd78e4d6a911724e8..0ca5a6f5a827e2ccb8b90c6ce8586d3f719b879c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
-MINOR_VERSION=0
-PATCH_LEVEL=1
+MINOR_VERSION=1
+PATCH_LEVEL=0
 MY_PATCH_LEVEL=
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index c0ca09a5537a3aab397da096459f3d33a3d50219..99a59dfeb82faa479282a37e1176ca346134ecd8 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -403,6 +403,7 @@ output_dict= {
                'output-default-post': "\\def\postLilyPondExample{}\n",
                'output-default-pre': "\\def\preLilyPondExample{}\n",
                'usepackage-graphics': '\\usepackage{graphics}\n',
+               'output-eps': '\\noindent\includegraphics{%(fn)s}', 
                'output-noinline': r'''
 %% generated: %(fn)s.eps
 ''',
@@ -1160,6 +1161,8 @@ def format_lilypond_block (chunk):
        elif format == 'latex':
                if 'quote' in opts:
                        s = 'output-latex-quoted'
+               elif 'eps' in opts:
+                       s = 'output-eps'
                else:
                        s = 'output-latex-noquote'
        elif format == 'texi':