From 0caa7a5f8f5b21dc1d20683774afe85b74c85a20 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Tue, 28 Feb 2023 17:36:06 +0000
Subject: [PATCH] Correct right margin settings, and remove need for pdfcrop.

Also stop keeping EPS files around. We're only using PDF.
---
 firstline.fmt   |  2 +-
 makeGraphics.sh | 30 ++++++++----------------------
 singletune.fmt  |  2 +-
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/firstline.fmt b/firstline.fmt
index 9b75eea..6f0fe78 100644
--- a/firstline.fmt
+++ b/firstline.fmt
@@ -11,5 +11,5 @@ musiconly true
 scale 0.9
 botmargin 0pt
 leftmargin 0pt
-rightmarin 0pt
+rightmargin 0pt
 topmargin 0pt
diff --git a/makeGraphics.sh b/makeGraphics.sh
index ed77ef3..7f7dd91 100755
--- a/makeGraphics.sh
+++ b/makeGraphics.sh
@@ -22,25 +22,16 @@ find $booke -maxdepth 1 -name "*.abc" |
     do
         name=`basename $filename .abc`
 
-        # Make the tune graphic.
+        # Make the tune graphic PDF.
         abcm2ps -E -F singletune -O $graphicsdir/$name.eps $filename
-        # Make $name.eps so we can build with LaTeX.
-        mv $graphicsdir/${name}001.eps $graphicsdir/${name}.eps
-        # And make the corresponding PDF.
-        epstopdf --outfile=$graphicsdir/$name-tocrop.pdf $graphicsdir/${name}.eps
-        # And crop it, so the graphic is as big as possible on the page.
-        pdfcrop $graphicsdir/$name-tocrop.pdf $graphicsdir/$name.pdf
-        rm $graphicsdir/$name-tocrop.pdf
+        epstopdf --outfile=$graphicsdir/$name.pdf $graphicsdir/${name}001.eps
+        rm $graphicsdir/${name}001.eps
 
         # and make the first line graphic.
         $dir/abcfirstline.py $filename > firstline.abc
         abcm2ps -E -F firstline -O $graphicsdir/firstline-$name.eps firstline.abc
-        mv $graphicsdir/firstline-${name}001.eps $graphicsdir/firstline-${name}.eps
-        rm firstline.abc
-        epstopdf --outfile=$graphicsdir/firstline-$name-tocrop.pdf $graphicsdir/firstline-${name}.eps
-        # And crop it, so the graphic is as big as possible on the page.
-        pdfcrop $graphicsdir/firstline-$name-tocrop.pdf $graphicsdir/firstline-$name.pdf
-        rm $graphicsdir/firstline-$name-tocrop.pdf
+        epstopdf --outfile=$graphicsdir/firstline-$name.pdf $graphicsdir/firstline-${name}001.eps
+        rm firstline.abc $graphicsdir/firstline-${name}001.eps
     done
 
 # And make any compact tune graphics.
@@ -53,13 +44,8 @@ find ${booke}/Compact -maxdepth 1 -name "*.abc" |
     do
         name=`basename $filename .abc`
 
-        # Make the tune graphic.
+        # Make the tune graphic PDF.
         abcm2ps -E -F singletune -O $graphicsdir/compact-${name}.eps $filename
-        # Make $name.eps so we can build with LaTeX.
-        mv $graphicsdir/compact-${name}001.eps $graphicsdir/compact-${name}.eps
-        # And make the corresponding PDF.
-        epstopdf --outfile=$graphicsdir/compact-${name}-tocrop.pdf $graphicsdir/compact-${name}.eps
-        # And crop it, so the graphic is as big as possible on the page.
-        pdfcrop $graphicsdir/compact-${name}-tocrop.pdf $graphicsdir/compact-${name}.pdf
-        rm $graphicsdir/compact-${name}-tocrop.pdf
+        epstopdf --outfile=$graphicsdir/compact-${name}.pdf $graphicsdir/compact-${name}001.eps
+        rm $graphicsdir/compact-${name}001.eps
     done
diff --git a/singletune.fmt b/singletune.fmt
index af5fb99..1d46bd3 100644
--- a/singletune.fmt
+++ b/singletune.fmt
@@ -3,7 +3,7 @@ partsbox true
 measurenb false
 botmargin 0
 leftmargin 0
-rightmarin 0
+rightmargin 0
 topmargin 0
 titleformat Y0
 titlespace 0