From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 29 Sep 2003 16:49:07 +0000 (+0000)
Subject: * scripts/lilypond-book.py: resurrect 'eps' option.
X-Git-Tag: release/2.1.0~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8d36bd0a930751ed4a373415aa446b954697ea98;p=lilypond.git

* 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 501ca6080d..260b4df71a 100644
--- 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 3b76cb1959..0ca5a6f5a8 100644
--- 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 c0ca09a553..99a59dfeb8 100644
--- 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':