From eff03efc46781ed8bcabd787552fb356b5bafc15 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 15 Apr 2005 23:57:25 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog                                  |  2 ++
 input/mutopia/R.Schumann/romanze-op28-2.ly | 17 +++++------
 ly/chord-modifiers-init.ly                 |  4 ---
 python/lilylib.py                          | 33 +++-------------------
 4 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 641f2848ff..ed39603bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 
 2005-04-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* python/lilylib.py (make_ps_images): use -dEPSCrop
+
 	* VERSION (PACKAGE_NAME): release 2.5.19 
 
 	* Documentation/user/lilypond-book.itely (Invoking lilypond-book):
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index ff08b92809..5541533d39 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -1,4 +1,3 @@
-#(ly:set-option 'old-relative)
 % NOT FINISHED!!!!
 
 \include "deutsch.ly"
@@ -237,6 +236,14 @@ leftb =  \transpose c cis {
  c c8 c c16 r4_\fermata r8 \bar "|." |
 }
 
+
+\paper {
+    indent = 0.5 \in
+    % textheight = 29.8 \cm
+    pagenumber = no
+    linewidth = 17.0 \cm
+}  
+		       
 \score { 
   \context PianoStaff <<
     #(set-accidental-style 'piano-cautionary)
@@ -268,13 +275,7 @@ leftb =  \transpose c cis {
 	<< \global \context Voice = "lva" \lefta \context Voice = "lvb" \leftb >>
     }
   >>
-  \layout {
-    interscoreline = 0.0
-    interscorelinefill = 1
-    indent = 0.5 \in
-    % textheight = 29.8 \cm
-    pagenumber = no
-    linewidth = 17.0 \cm
+  \layout { 
     \context {
       \RemoveEmptyStaffContext
     }
diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 858eba1e61..e3ce577382 100644
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -7,10 +7,6 @@ whiteTriangleMarkup = \markup {
   %%  394 capital delta
   #(ly:export (ly:wide-char->utf-8 #x0394))
 
-
-  %% need to have symbol; can't deal with TTF yet.
-  %\override #'(font-name . "Symbol")
-
   %% 2206 : delta from the symbol font.
   %   #(ly:export (ly:wide-char->utf-8 #x2206))
   
diff --git a/python/lilylib.py b/python/lilylib.py
index 7a5d4a7780..3e5848b81e 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -471,48 +471,23 @@ def make_ps_images (ps_name, resolution = 90, papersize = "a4",
 
 	base = re.sub (r'\.e?ps', '', ps_name)
 	header = open (ps_name).read (1024)
-	match = re.search (BOUNDING_BOX_RE, header, re.MULTILINE)
-	bbox = []
-	if match:
-		bbox = map (string.atoi, match.groups ())
 
 	png1 = base + '.png'
 	pngn = base + '-page%d.png'
 	output_file = pngn
 	multi_page = re.search ('\n%%Pages: ', header)
+	
 	if not multi_page:
-		if not bbox:
-			bbox = get_bbox (ps_name)
-			
-		transform_ps = ps_name + '.trans.ps'
-
-		# Use margin to avoid letters getting cropped off.
-		margin = 3 
-		h = open (transform_ps, 'w')
-		h.write ('%d %d translate\n' % (-bbox[0] + margin,
-						-bbox[1] + margin))
-		h.close ()
-
-		x = (2* margin + bbox[2] - bbox[0]) \
-		    * resolution / 72.0
-		y = (2* margin + bbox[3] - bbox[1]) \
-		    * resolution / 72.0
-		if x == 0:
-			x = 1
-		if y == 0:
-			y = 1
-
 		cmd = r'''gs\
-		-g%(x)dx%(y)d\
+		-dEPSCrop
 		-dGraphicsAlphaBits=4\
 		-dNOPAUSE\
 		-dTextAlphaBits=4\
-		-sDEVICE=png16m\
+		-sDEVICE=pnggray\
 		-sOutputFile='%(output_file)s'\
 		-sPAPERSIZE=%(papersize)s\
 		-q\
 		-r%(resolution)d\
-		%(transform_ps)s\
 		'%(ps_name)s'\
 		-c showpage\
 		-c quit ''' % vars ()
@@ -522,7 +497,7 @@ def make_ps_images (ps_name, resolution = 90, papersize = "a4",
 		-dGraphicsAlphaBits=4\
 		-dNOPAUSE\
 		-dTextAlphaBits=4\
-		-sDEVICE=png16m\
+		-sDEVICE=pnggray\
 		-sOutputFile='%(output_file)s'\
 		-sPAPERSIZE=%(papersize)s\
 		-q\
-- 
2.39.2