patch::: 1.4.2.jcn3

1.4.2.jcn3

diff --git a/CHANGES b/CHANGES
index d2bbb25c390968b8eb4a7b6baf07c4271ec743e6..aed14109108d0bdcbf7752731b71f3e887660fc3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,11 @@
-1.4.2.jcn2
+1.4.2.jcn3
 ==========
 
 * Windows: bugfix for tex-wrappers, added tex wrapper for dvips.
 LilyPond (read: ly2dvi) should now work right out of the box.
 
 Amazing; it seems that ly2dvi won't generate PK files without this
-dvips wrapper.  We had over 150 downloads of setup.exe, yet only one
+dvips wrapper.  We had over 200 downloads of setup.exe, yet only one
 `call for help'.  Did all the others give up, or did none of them
 bother to share their fix/file a bug report?  Urg.
 

diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile
index b2afb6c5cddd035755aac4b392aa848c672e51e4..21477ab0eb40dabae2410989e733975b2c0e3c18 100644 (file)
--- a/Documentation/windows/GNUmakefile
+++ b/Documentation/windows/GNUmakefile
@@ -60,12 +60,16 @@ $(outdir)/%: python-wrapper.sh
 #      cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
 #      chmod 755 $@
 
-$(outdir)/tex: tex-wrapper.sh
-       cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@
+$(outdir)/latex: tex-wrapper.sh
+       cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@
        chmod 755 $@
 
-$(outdir)/latex: latex-wrapper.sh
-       cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@
+$(outdir)/dvips: tex-wrapper.sh
+       cat $< | sed $(sed-atvariables) -e "s!@name@!dvips!g" > $@
+       chmod 755 $@
+
+$(outdir)/tex: tex-wrapper.sh
+       cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@
        chmod 755 $@
 
 default: $(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) $(OUT_POST_INSTALLS) $(OUT_PROFILES)

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index e71cae45cf58dce55b2ad8940ddf33683b8fe524..9f2fa8bf9b3759eae578a16ed0c01f18dada128e 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -29,7 +29,8 @@ Download and run
 to install LilyPond.
 
 This will install the minimal set of cygwin tools needed to run
-LilyPond.
+LilyPond.  Make sure to install in the default place, @file{c:/cygwin},
+and install everything.
 
 As of version 1.3.150, you also have the option to install MiKTeX,
 Python and GSView from this installer, which is recommended.  If you
@@ -79,13 +80,18 @@ do:
 
 @quotation
 @example
-PATH=/usr/lilypond-1.3.147/bin:$PATH
+PATH=/usr/lilypond-1.4.2/bin:$PATH
 @end example
 @end quotation
 
 and try again.
 
 
+@subsection Trouble
+
+For problems and solutions see
+@uref{Troubleshooting Windows,http://lilypond.org/TroubleshootingWindows}.
+
 
 @subsection Additional software
 
@@ -148,14 +154,9 @@ We have not tried using newer versions than 1.5.2.
 * emacs-mode installation, figure out and describe proper
 emacs-on-cygwin setup.
 
-* talk about /etc/profile.d/lilypond-profile.sh
-
-* GUILE errors, simple guile test
-
-* (La)TEX errors, simple tex test
+]
 
 
-]
 @ignore 
 
   guile -v

diff --git a/Documentation/windows/latex-wrapper.sh b/Documentation/windows/latex-wrapper.sh
index 82a2fd44e367e272fcdb581c4558ca830e2e4043..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/Documentation/windows/latex-wrapper.sh
+++ b/Documentation/windows/latex-wrapper.sh
@@ -1,8 +0,0 @@
-#!@SHELL@
-# @name@.sh -- @name@ wrapper for Windows
-
-MFINPUTS="$WINDOWS_MFINPUTS"
-TEXINPUTS="$WINDOWS_TEXINPUTS"
-TFMFONTS="$WINDOWS_TFMFONTS"
-
-@name@.exe "$*"

diff --git a/VERSION b/VERSION
index ea43a0cf3fcb463ad931c3998981c1c85a9bf96a..e1a008903362aba2ba9f4584735648babe6a1e43 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=2
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.