From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Mar 2002 23:08:34 +0000 (+0100)
Subject: patch::: 1.5.43.jcn2
X-Git-Tag: release/1.5.44~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ee9d99190ecd2a054322eabca66b1e0c2507474f;p=lilypond.git

patch::: 1.5.43.jcn2

2002-03-20  Jan Nieuwenhuizen  <janneke@gnu.org>

	* mf/GNUmakefile (lilypond.map): Don't prepend TeX to font name
	(this fixes pdf output).  Drop awk dependency.
---

diff --git a/ChangeLog b/ChangeLog
index d9cb4964fe..6e1811d6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2002-03-20  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* mf/GNUmakefile (lilypond.map): Don't prepend TeX to font name
+	(this fixes pdf output).  Drop awk dependency.
+
 2002-03-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* scripts/ly2dvi.py (ly_paper_to_latexpaper): Assume LilyPond's
+	dimensions (linewidth) are in mm.
+
 	* mf/GNUmakefile (depth): Always allow manual access to pfa target.
 
 	* tex/lily-ps-defs.tex: scaletounit using PT/IN==72.
diff --git a/VERSION b/VERSION
index 421be982f6..42ad48e313 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=43
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
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 22d0607ea8..ab77ff12b9 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -69,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.
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'