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 8f6bd248ced36a738f3f1af16c9632c09f2fa11f..5d7820e960a66a85fb073b0a7b15ab2b12ce72fd 100644 (file)
--- 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 6ad23e453c79d9c31acc7f4eae5a4c14706c676a..5806e4d9227dedb17c56e058c5ab4b0f4dcbbc1a 100644 (file)
--- 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 5fc16a42eec15270dab70f4bbb025d0cbaf7ddbe..64fed9a1577eeeb0281e4e90542bd4fdcd5e8db0 100644 (file)
--- 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 830da425b3dca92bb74aabb0d7d035324619bc7f..6dc322dae4e2acb8a04147a9997a4fc8594729ca 100644 (file)
--- 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.