From 7323d84deb8390c751b1fa696f7de4f1b8803462 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 20 Mar 2002 09:32:31 +0100
Subject: [PATCH] patch::: 1.5.43.jcn3

	* scripts/ly2dvi.py: Read unit from paper vars.

	* ly/params-init.ly (unit): Add interal unit for export to ly2dvi.

---
Generated by janneke@gnu.org,
From = lilypond-1.5.43.jcn2, To = lilypond-1.5.43.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.43.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
---
 ChangeLog         | 13 ++++++++++++-
 VERSION           |  2 +-
 ly/params-init.ly |  1 +
 scripts/ly2dvi.py | 10 ++++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af429a62ad..5c0ad1ca0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
---- ../lilypond-1.5.43/ChangeLog	Tue Mar 19 01:50:26 2002
+--- ../lilypond-1.5.43.jcn2/ChangeLog	Wed Mar 20 00:08:34 2002
+++ b/ChangeLog	Wed Mar 20 09:32:31 2002
+@@ -1,5 +1,9 @@
+ 2002-03-20  Jan Nieuwenhuizen  <janneke@gnu.org>
+ 
+	* scripts/ly2dvi.py: Read unit from paper vars.
+
+	* ly/params-init.ly (unit): Add interal unit for export to ly2dvi.
+
+ 	* mf/GNUmakefile (lilypond.map): Don't prepend TeX to font name
+ 	(this fixes pdf output).  Drop awk dependency.
+ --- ../lilypond-1.5.43/ChangeLog	Tue Mar 19 01:50:26 2002
 ++ b/ChangeLog	Wed Mar 20 02:24:52 2002
 @@ -1,3 +1,29 @@
 2002-03-20  Rune Zedeler <rune@zedeler.dk>
diff --git a/VERSION b/VERSION
index 3f1105dc8b..ae508e86d3 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=43
-MY_PATCH_LEVEL=rz1
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/ly/params-init.ly b/ly/params-init.ly
index d7dc051286..de985ca629 100644
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -18,6 +18,7 @@ paperfile = \papersize + "-init.ly"
 \include \paperfile
 \include "paper-init.ly"
 
+unit = "mm"
 staffspace = \staffheight / 4.0
 stafflinethickness = \staffspace / 10.0
 outputscale = \staffheight / 4.0
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index f1c795ba08..cdc6bf9423 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -334,7 +334,8 @@ extra_init = {
 	'pagenumber' : [1],
 	'textheight' : [], 
 	'linewidth' : [],
-	'orientation' : []
+	'orientation' : [],
+	'unit' : ['pt'],
 }
 
 extra_fields = extra_init.keys ()
@@ -567,14 +568,15 @@ lily output file in TFILES after that, and return the Latex file constructed.  '
 	if extra['orientation']:
 		orientation = extra['orientation'][0]
 
-	# set sane geometry width (a4-width) for linewidth = -1.
+ 	unit = extra['unit'][-1]
+ 	# set sane geometry width (a4-width) for linewidth = -1.
 	maxlw = max (extra['linewidth'] + [-1])
 	if maxlw < 0:
 	        # who the hell is 597 ?
 		linewidth = '597pt'
 	else:
-		linewidth = maxlw
-	s = s + '\geometry{width=%smm%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
+		linewidth = '%d%s' % (maxlw, unit)
+	s = s + '\geometry{width=%s%s,headheight=2mm,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
 
 	if extra['latexoptions']:
 		s = s + '\geometry{twosideshift=4mm}\n'
-- 
2.39.5