From f1026c1caf1f6b3f432343355d93f7436e2c6b44 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:07:12 +0000
Subject: [PATCH] lilypond-1.5.44

---
 lily/paper-outputter.cc | 8 ++++----
 mf/GNUmakefile          | 7 ++++---
 scripts/ly2dvi.py       | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 9c28f6dcc8..c14eb72224 100644
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -114,7 +114,7 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
 	}
       else if (gh_number_p (v))
 	{
-	  output_Real_def (prefix + s, gh_scm2double (v));	  
+	  output_Real_def (prefix + s, gh_scm2double (v));
 	}
     }
 }
@@ -137,9 +137,9 @@ Paper_outputter::output_Real_def (String k, Real v)
 {
   
   SCM scm = scm_list_n (ly_symbol2scm ("lily-def"),
-		     ly_str02scm (k.ch_l ()),
-		     ly_str02scm (to_str (v).ch_l ()),
-		     SCM_UNDEFINED);
+			ly_str02scm (k.ch_l ()),
+			ly_str02scm (to_str (v).ch_l ()),
+			SCM_UNDEFINED);
   output_scheme (scm);
 }
 
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 39dddbf36c..ab77ff12b9 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -53,8 +53,8 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 # making pfas takes a lot of CPU time. Let's skip it for now.
 #MAKE_PFA_FILES=1
 
-ifdef MAKE_PFA_FILES
 PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
+ifdef MAKE_PFA_FILES
 ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map
 INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1
 INSTALLATION_OUT_FILES4=$(PFA_FILES)
@@ -62,7 +62,6 @@ INSTALLATION_OUT_FILES4=$(PFA_FILES)
 INSTALLATION_OUT_DIR5=$(datadir)/dvips/
 INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
 
-pfa: $(PFA_FILES) 
 endif
 
 export MFINPUTS:=.:$(MFINPUTS)
@@ -70,7 +69,8 @@ export MFINPUTS:=.:$(MFINPUTS)
 default: $(ALL_GEN_FILES)
 
 $(outdir)/lilypond.map: 
-	echo $(FONT_FILES:.mf=) | awk -v RS=' ' '{print $$1 " TeX-" $$1 " <" $$1 ".pfa"}' > $@
+	echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \
+		sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
 
 ##
 ## todo: this also depends on .tfm, FIXME.
@@ -81,4 +81,5 @@ local-clean:
 	rm -f mfplain.mem mfplain.log 
 	rm -f *.tfm *.log
 
+pfa: $(PFA_FILES) 
 
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index d428202869..f1c795ba08 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -571,10 +571,10 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
 	maxlw = max (extra['linewidth'] + [-1])
 	if maxlw < 0:
 	        # who the hell is 597 ?
-		linewidth = '597'
+		linewidth = '597pt'
 	else:
 		linewidth = maxlw
-	s = s + '\geometry{width=%spt%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+	s = s + '\geometry{width=%smm%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
 	if extra['latexoptions']:
 		s = s + '\geometry{twosideshift=4mm}\n'
-- 
2.39.5