patch::: 1.4.6.jcn2

1.4.6.jcn2

diff --git a/CHANGES b/CHANGES
index 04ee44abc95d1eb3863f1f4e8b055f78b76ccf68..062b9ff2cdf1c0e8806eb8a2d7efbf806e8deff9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,10 @@
-1.4.6.jcn1
+1.4.6.jcn2
 ==========
 
 * Fixes for PostScript beams and stems.
 
+* Use Cygwin included Python; drop Windows Python and workarounds.
+
 1.4.6
 =====
 

diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi
index dc2b06439d9ff8913eefe56b5e0cf41acab13caa..2f9c4f66e0024ca42ccd50c9d01c39696600cd6c 100644 (file)
--- a/Documentation/windows/compiling.texi
+++ b/Documentation/windows/compiling.texi
@@ -70,9 +70,7 @@ We think it's silly, but do this is on special request of Windows users.
 @item @file{fix-suffixes.sh}
 Add @file{.exe} to binary executables, add @file{.py} to Python scripts.
 @item @file{python-wrapper.sh}
-All python scripts get a wrapper script to make direct invocation easier
-and to change file paths to DOS style, which is needed by non-Cygwin
-Python, that's currently used.
+All python scripts get a wrapper script to make direct invocation easier.
 @item @file{latex-wrapper.sh}
 TeX and LaTeX get a wrapper script that changes the TEX path variables
 to DOS style, which is needed by non-Cygwin TeX, that's currently used.

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index a06bc0e4769286fd94339f9a1bfc3868eadc995c..18f9949792a01ca129214d877dba4d4e7676e0dc 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -18,7 +18,7 @@ code that works better (see @uref{compiling.html,compiling}).
 
 @section Windows binary setup 
 
-Apart from LilyPond itself, you need Cygwin, GUILE, Python, and a TeX
+Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX
 installation, but all this software be installed by running setup.exe:
 
 @table @asis
@@ -32,9 +32,9 @@ This will install the minimal set of cygwin tools needed to run
 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
-choose to install these by hand (see below), make sure to install them
+As of version 1.3.150, you also have the option to install MiKTeX and
+GSView from this installer, which is recommended.  If you choose to
+install these by hand (see below), make sure to install them
 @strong{before} you install LilyPond, otherwise your LilyPond setup will
 be broken.
 
@@ -138,13 +138,6 @@ Click @uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs650/gs650w32.exe
 or visit the
 @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
 
-@item Python
-Click @uref{http://www.python.org/ftp/python/win32/py152.exe,here} to
-install Python-1.5.2, or visit
-@uref{http://www.python.org,www.python.org}.
-
-We have not tried using newer versions than 1.5.2.
-
 @end table
 
 

diff --git a/Documentation/windows/python-wrapper.sh b/Documentation/windows/python-wrapper.sh
index 57bff4ea1d4291df87ed83fdf373ac214aeda5c1..2b49c87e8403d4a4fe407a38a3c68d71cbfe31be 100644 (file)
--- a/Documentation/windows/python-wrapper.sh
+++ b/Documentation/windows/python-wrapper.sh
@@ -5,9 +5,9 @@ if echo | python - >/dev/null 2>&1; then
        echo
 else
        cat <<EOF
-Python not found.  Install python-1.5.2 from www.python.org.
+Python not found.  Install python-2.1-1 from http://cygwin.com
 Make sure python.exe in in your PATH
 EOF
        exit 1
 fi
-python "$(cygpath -w ""@prefix@/bin/@name@.py"")" $*
+python "@prefix@/bin/@name@.py" $*

diff --git a/VERSION b/VERSION
index a09582858d4927b086b9543bc6ec089495195d9c..135541fe0bf796fe7e6fc6656cdffdd933de9467 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=6
-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/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 1e9a7329b32ac968d6c4c6cea4085434977d5a8a..7900ef5c89394130ea1dc0d18ad97d485f2b4beb 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -179,10 +179,7 @@ Distributed under terms of the GNU General Public License. It comes with
 NO WARRANTY.'''))
        sys.stdout.write ('\n')
 
-if ( os.name == 'posix' ):
-       errorport=sys.stderr
-else:
-       errorport=sys.stdout
+errorport=sys.stderr
 
 def progress (s):
        errorport.write (s + '\n')
@@ -297,11 +294,6 @@ def system (cmd, ignore_error = 0):
        Exit status of CMD
        """
        
-        if ( os.name != 'posix' ):
-               cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd)
-               cmd = "sh -c \'%s\'" % cmd
-
-               
        if verbose_p:
                progress (_ ("Invoking `%s\'") % cmd)
        st = os.system (cmd)
@@ -576,7 +568,7 @@ None
 
        cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
 
-       if not verbose_p and os.name == 'posix':
+       if not verbose_p:
                progress ( _("Running %s...") % 'LaTeX')
                cmd = cmd + ' 1> /dev/null 2> /dev/null'
 
@@ -601,7 +593,7 @@ None.
 
        cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
        
-       if not verbose_p and os.name == 'posix':
+       if not verbose_p:
                progress ( _("Running %s...") % 'dvips')
                cmd = cmd + ' 1> /dev/null 2> /dev/null'