From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 31 Aug 2001 13:29:28 +0000 (+0200)
Subject: patch::: 1.4.7.jcn1
X-Git-Tag: release/1.4.8~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8d31ea5333c21c8160708473791b934ec6812368;p=lilypond.git

patch::: 1.4.7.jcn1

1.4.7.jcn1
==========

* Add mktextfm wrapper for windows (thanks Mats).

1.4.7
=====
---

diff --git a/CHANGES b/CHANGES
index 8f6bd248ce..5d7820e960 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+1.4.7.jcn1
+==========
+
+* Add mktextfm wrapper for windows (thanks Mats).
+
+1.4.7
+=====
+
 1.4.6.hwn1
 ==========
 
diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile
index 6ad23e453c..5806e4d922 100644
--- a/Documentation/windows/GNUmakefile
+++ b/Documentation/windows/GNUmakefile
@@ -37,7 +37,7 @@ PYTHON_WRAPPERS=\
 
 OUT_PYTHON_WRAPPERS=$(PYTHON_WRAPPERS:%=$(outdir)/%)
 
-TEX_WRAPPERS=dvips latex tex yap
+TEX_WRAPPERS=dvips latex mktextfm tex yap
 OUT_TEX_WRAPPERS=$(TEX_WRAPPERS:%=$(outdir)/%)
 
 # profiles
@@ -55,6 +55,8 @@ $(outdir)/%: python-wrapper.sh
 	cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
 	chmod 755 $@
 
+ATVARIABLES += OPTIONS
+
 # tex wrappers
 #$(outdir)/%: %-wrapper.sh
 #	cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
@@ -68,6 +70,11 @@ $(outdir)/dvips: tex-wrapper.sh
 	cat $< | sed $(sed-atvariables) -e "s!@name@!dvips!g" > $@
 	chmod 755 $@
 
+MKTEXFTM_OPTIONS=--dest-dir \"$$(cygpath -w \"\"/usr/lilypond/share/lilypond/tfm\"\")\"
+$(outdir)/mktextfm: tex-wrapper.sh
+	cat $< | sed -e 's!@OPTIONS@!$(MKTEXFTM_OPTIONS)!' $(sed-atvariables) -e "s!@name@!maketfm!g" > $@
+	chmod 755 $@
+
 $(outdir)/tex: tex-wrapper.sh
 	cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@
 	chmod 755 $@
diff --git a/Documentation/windows/tex-wrapper.sh b/Documentation/windows/tex-wrapper.sh
index 5fc16a42ee..64fed9a157 100644
--- a/Documentation/windows/tex-wrapper.sh
+++ b/Documentation/windows/tex-wrapper.sh
@@ -7,5 +7,5 @@ TFMFONTS="$WINDOWS_TFMFONTS"
 
 export MFINPUTS TEXINPUTS TFMFONTS
 
-@name@.exe $*
+@name@.exe @OPTIONS@ $*
 
diff --git a/VERSION b/VERSION
index 830da425b3..6dc322dae4 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=7
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.