]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.3.149.jcn1
authorJan Nieuwenhuizen <janneke@gnu.org>
Thu, 19 Apr 2001 09:50:53 +0000 (11:50 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Thu, 19 Apr 2001 09:50:53 +0000 (11:50 +0200)
1.3.149.jcn1
============

* Windows installer stuff: the ``It shouldn't be hard -- but do need
  some sleep'' release.

  Think of it: /shouldn't/ is *exactly* why GNU/Linux exists, and
  why we advise to run LilyPond on Linux -- UMSDOS if you must.

  You may consider our part of the job done.  Any more of this
  sad and sorry stuff will drive me to drink.  It makes you realise
  again how much fun using Linux actually is.

  We'll take patches from now on, from people that have a stronger
  stomach.  Good night.

  - Ly2dvi: run commands from sh (so that tex wrappers be used).

  - Added cygwin man,less and windows gs, gsview, miktex, python to
    lilypond installer repository.  Moved profile.d setup functionality to
    postinstall.
  - Added tex and latex wrappers.
  - Wrappers for all python scripts.

* Removed RMAIL header from german-chords.ly + fixes (Rune).

1.3.149
=======

24 files changed:
CHANGES
Documentation/topdocs/WINDOWS.texi
Documentation/windows/GNUmakefile
Documentation/windows/fix-suffixes.sh [new file with mode: 0644]
Documentation/windows/latex-wrapper.sh [new file with mode: 0644]
Documentation/windows/lily-gs.sh [new file with mode: 0644]
Documentation/windows/lily-miktex.sh [new file with mode: 0644]
Documentation/windows/lily-python.sh
Documentation/windows/lily-tex.sh
Documentation/windows/lilypond-profile.z.sh
Documentation/windows/ly2dvi-wrapper.sh
Documentation/windows/post-gs.sh [new file with mode: 0644]
Documentation/windows/post-lily.sh [new file with mode: 0644]
Documentation/windows/post-miktex.sh [new file with mode: 0644]
Documentation/windows/post-python.sh [new file with mode: 0644]
Documentation/windows/python-wrapper.sh [new file with mode: 0644]
Documentation/windows/registry.in [new file with mode: 0644]
Documentation/windows/tex-wrapper.sh [new file with mode: 0644]
Documentation/windows/zlily-profile.sh [new file with mode: 0644]
VERSION
ly/german-chords.ly
make/substitute.make
scm/chord-name.scm
scripts/ly2dvi.py

diff --git a/CHANGES b/CHANGES
index 54da3bce7eaef6da33715b1221c4459c62a4f929..6ef74cf32f799846bd447f0dff256b291a4a7e76 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,32 @@
+1.3.149.jcn1
+============
+
+* Windows installer stuff: the ``It shouldn't be hard -- but do need
+  some sleep'' release.
+
+  Think of it: /shouldn't/ is *exactly* why GNU/Linux exists, and
+  why we advise to run LilyPond on Linux -- UMSDOS if you must.
+
+  You may consider our part of the job done.  Any more of this
+  sad and sorry stuff will drive me to drink.  It makes you realise
+  again how much fun using Linux actually is.
+
+  We'll take patches from now on, from people that have a stronger
+  stomach.  Good night.
+
+  - Ly2dvi: run commands from sh (so that tex wrappers be used).
+
+  - Added cygwin man,less and windows gs, gsview, miktex, python to
+    lilypond installer repository.  Moved profile.d setup functionality to
+    postinstall.
+  - Added tex and latex wrappers.
+  - Wrappers for all python scripts.
+
+* Removed RMAIL header from german-chords.ly + fixes (Rune).
+
+1.3.149
+=======
+
 1.3.148.jcn3
 ============
 
index f3eff2dbfaf2641a4f1c3d53846a754abdc14c8a..57807d2488f910ab23166e42fc1ed35e87357900 100644 (file)
@@ -31,6 +31,7 @@ webpage}.  You may need the patch @file{guile-1.4-gnu-windows.patch}
 included in LilyPond's source distribution.
 @end table
 
+
 @section Windows precompiled binaries
 
 @table @code
@@ -59,7 +60,7 @@ compilation scripts}.
 
 @section Windows running requirements
 
-GNU LilyPond does use a lot of resources. For operation you need the
+GNU LilyPond does use a lot of resources.  For operation you need the
 following software
 
 @table @code
@@ -91,8 +92,7 @@ specials.  You get annoying @emph{Register Now|Cancel} popups, though.
 Click @uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum/gsv36w32.exe,here} for
 GSview and 
 Click @uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs650/gs650w32.exe
-,here} for GhostScript.
-@uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}.
+,here} for GhostScript,
 or visit the
 @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
 @end table
@@ -106,7 +106,6 @@ Python > 1.5.2 has ugly licensing issues, so we only used and tested
 1.5.2.
 @end table
 
-
 @section Windows running setup
 
 If you're lucky, after running @file{setup.exe} you're all set up.
@@ -186,6 +185,24 @@ This one you should get a single page document with some text
 in each corner.
 ]
 
+
+emacs
+
+http://cygwin.com/ml/cygwin/2000-08/msg01049.html
+http://www.cs.unc.edu/~juliano/my_emacs_files/cygwin32-mount.el
+http://cygwin.com/ml/cygwin/2000-02/msg00109.html
+http://sources.redhat.com/ml/cygwin/2001-01/msg00878/cygwin32-mount.el
+
+  ;; setup Bash shell
+  (setq exec-path (cons "C:/cygwin/bin" exec-path))
+  (setenv "PATH" (concat "C:\\cygwin\\bin;" (getenv "PATH")))
+  (setq process-coding-system-alist '(("bash" . undecided-unix)))
+  (setq w32-quote-process-args ?\")
+  (setq shell-file-name "bash")
+  (setenv "SHELL" shell-file-name) 
+  (setq explicit-shell-file-name shell-file-name) 
+  (add-hook 'comint-output-filter-functions 'comint-strip-ctrl-m)
+
 @end ignore
 
 
index 8351c3d69eecaa3b9ab44baf2699c7da98aa0b3e..ab7e00e73340bcb1597219ea220aa9e920d8506c 100644 (file)
@@ -3,7 +3,7 @@ depth=../..
 
 EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch)
 
-STEPMAKE_TEMPLATES=documentation texinfo
+STEPMAKE_TEMPLATES=documentation texinfo install install-out
 
 include $(depth)/make/stepmake.make 
 
@@ -11,3 +11,95 @@ default: local-doc
 
 local-WWW:
 
+# For cygwin builds only
+target=$(shell gcc -dumpmachine)
+ifeq ($(target),i686-pc-cygwin)
+
+POST_INSTALLS=$(wildcard post-*.sh)
+OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
+
+# lily-*: rename to '-profile' or so
+PROFILES=$(wildcard *lily-*.sh) lilypond-profile.sh
+OUT_PROFILES=$(PROFILES:%=$(outdir)/%)
+
+##as2text.scm
+PYTHON_WRAPPERS=\
+ abc2ly\
+ convert-ly\
+ etf2ly\
+ lilypond-book\
+ ly2dvi\
+ mup2ly\
+ musedata2ly\
+ pmx2ly\
+ update-lily\
+#
+
+OUT_PYTHON_WRAPPERS=$(PYTHON_WRAPPERS:%=$(outdir)/%)
+
+TEX_WRAPPERS=tex latex
+OUT_TEX_WRAPPERS=$(TEX_WRAPPERS:%=$(outdir)/%)
+
+# profiles
+$(outdir)/%.sh: %.sh
+       cat $< | sed $(sed-atvariables) > $@
+       chmod 755 $@
+
+# Urg
+$(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/out/lilypond-profile
+       cp $< $@
+       chmod 755 $@
+
+# python wrappers
+$(outdir)/%: python-wrapper.sh
+       cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@
+       chmod 755 $@
+
+# tex wrappers
+#$(outdir)/%: %-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" > $@
+       chmod 755 $@
+
+$(outdir)/latex: latex-wrapper.sh
+       cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@
+       chmod 755 $@
+
+default: $(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) $(OUT_POST_INSTALLS) $(OUT_PROFILES)
+
+# urg: change suffixes before overwriting python scripts
+
+INSTALLATION_OUT_SUFFIXES=1 2 3 4
+
+# URG.
+# By popular demand,
+# LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
+# The cygwin profile.d dir, however, is in /etc
+
+INSTALLATION_DIR=$(shell dirname $(shell dirname $(prefix)))/etc/postinstall
+INSTALLATION_FILES=$(OUT_POST_INSTALLS)
+
+INSTALLATION_OUT_DIR1=$(shell dirname $(shell dirname $(prefix)))/etc/profile.d
+INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
+
+INSTALLATION_OUT_DIR2=$(prefix)/wrappers
+INSTALLATION_OUT_FILES2=$(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS)
+
+INSTALLATION_OUT_DIR3=$(datadir)/tex
+INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty)
+
+INSTALLATION_OUT_DIR4=$(datadir)/tfm
+INSTALLATION_OUT_FILES4=$(shell kpsewhich cmr10.tfm)
+
+else
+
+local-install:
+       @echo skipping
+
+local-install-outfiles:
+       @echo skipping
+
+endif
diff --git a/Documentation/windows/fix-suffixes.sh b/Documentation/windows/fix-suffixes.sh
new file mode 100644 (file)
index 0000000..0f8792a
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/bash
+## duh, rename executables,
+## for people that use a dumb shell instead of bash
+
+if [ $# -le 0 ]; then
+       echo "Usage: fix-suffixes [FILE]..."
+       exit 2
+fi
+
+echo `basename $0`
+
+function fix_extension ()
+{
+        path=$1
+        ext=$2
+        expr="$3"
+       dir=`dirname $path`
+        file=`basename $path`
+        base=`basename $file $ext`
+        if [ $base$ext != $file ]; then
+                type="`file $path`"
+                if expr "$type" : "$expr"; then
+                        mv -f $path $dir/$base$ext
+                fi
+        fi
+}
+
+for i in `/bin/ls -d1 $*`; do
+       fix_extension $i .exe '.*Windows.*\(executable\).*'
+       fix_extension $i .py '.*\(python\).*'
+done
+
diff --git a/Documentation/windows/latex-wrapper.sh b/Documentation/windows/latex-wrapper.sh
new file mode 100644 (file)
index 0000000..67b805c
--- /dev/null
@@ -0,0 +1,8 @@
+#!@SHELL@
+# @name@.sh -- @name@ wrapper for Windows
+
+MFINPUTS="$WINDOWS_MFINPUTS"
+TEXINPUTS="$WINDOWS_TEXINPUTS"
+TFMFONTS="$WINDOWS_TFMFONTS"
+
+@name@ "$*"
diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh
new file mode 100644 (file)
index 0000000..3a559ca
--- /dev/null
@@ -0,0 +1,31 @@
+#!@SHELL@
+# /etc/profile.d/lily-gs.sh -- Check for GhostScript and GSView
+
+
+gs550="/usr/windows/gstools/gs5.50"
+gs650="/usr/windows/gs/gs6.50"
+
+gsview26="/usr/windows/gstools/gsview"
+gsview36="/usr/windows/Ghostgum/GSview"
+
+# Maybe read registry, but that may be hairy?
+# 
+# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
+# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
+
+
+if [ -e "$gs550/gswin32.exe" ]; then
+       PATH="$gs550:$PATH"
+fi
+
+if [ -e "$gs650/gswin32.exe" ]; then
+       PATH="$gs650:$PATH"
+fi
+
+if [ -e "$gsview26/gsview32.exe" ]; then
+       PATH="$gsview26:$PATH"
+fi
+
+if [ -e "$gsview36/gsview32.exe" ]; then
+       PATH="$gsview36:$PATH"
+fi
diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh
new file mode 100644 (file)
index 0000000..c2c1480
--- /dev/null
@@ -0,0 +1,22 @@
+#!@SHELL@
+# /etc/profile.d/lily-miktex.sh -- Check for MiKTeX
+
+
+# Educated guess in case we have no regtool
+a="//c/Program Files/MiKTeX"
+
+# Registry entry
+reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')"
+b="$(cygpath -u ""$reg"")"
+
+# Where we installed it
+c=texmf="/usr/windows/MiKTeX"
+
+for i in "$a" "$b" "$c"; do
+       if [ -d "$i" ]; then
+               texmf="$i"
+       fi
+done
+
+PATH="$texmf/miktex/bin:$PATH"
+
index c8f71313c6e72251f117512be9813f23f49d2c40..fdefba7d4b9e99bfff5f70ec2d919d60bae84106 100644 (file)
@@ -1,3 +1,20 @@
-#!/bin/bash
+#!@SHELL@
+# /etc/profile.d/post-python.sh -- Check for Python
 
-PATH="//c/Program Files/Python:$PATH"
+# Educated guess in case we have no regtool
+a="//c/Program Files/Python"
+
+# Registry entry
+reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')"
+b="$(cygpath -u ""$reg"")"
+
+# Where we installed it
+c="/usr/windows/Python"
+
+for i in "$a" "$b" "$c"; do
+       if [ -d "$i" ]; then
+               python="$i"
+       fi
+done
+
+PATH="$python:$PATH"
index d2caa6c22bed123c46c3772831c484e930abb030..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,23 +0,0 @@
-#!/bin/bash
-# /etc/profile.d/lily-tex.sh -- Check for TeX or try to setup MiKTeX
-
-texmf='//c/Program Files/MiKTeX'
-texmf_bin='//c/Program Files/MiKTeX/miktex'
-
-if [ ! -e /usr/share/texmf ]; then
-       echo /usr/share/texmf not found
-       if [ -e "$texmf" ]; then
-               ln -s "$texmf" /usr/share/texmf
-               echo MiKTeX found: linked to "$texmf"
-       else
-               echo setup /usr/share/texmf yourself
-       fi
-fi
-if type -p tex; then
-       echo no TeX in PATH
-       if [ -e "$texmf_bin" ]; then
-               echo MiKTeX found: added "$texmf_bin" to PATH
-               PATH=`cygpath -u "$texmf/miktex"`:"$PATH"
-       fi
-fi
-
index 444c94c8ba738a2468b51688c785be87365fc479..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,43 +0,0 @@
-#!/bin/bash
-# /etc/profile.d/lilypond-profile.z.sh  -- profile additions for Windows
-# run after lilypond-profile.sh
-
-POSIX_GS_LIB="$(cygpath -apu $GS_LIB)"
-WINDOWS_GS_LIB="$(cygpath -apw $POSIX_GS_LIB)"
-
-POSIX_GS_FONTPATH="$(cygpath -apu $GS_FONTPATH)"
-WINDOWS_GS_FONTPATH="$(cygpath -apw $POSIX_GS_FONTPATH)"
-
-POSIX_TEXINPUTS="$(cygpath -apu $TEXINPUTS)"
-WINDOWS_TEXINPUTS="$(cygpath -apw $POSIX_TEXINPUTS)"
-
-POSIX_TFMFONTS="$(cygpath -apu $TFMFONTS)"
-WINDOWS_TFMFONTS="$(cygpath -apw $POSIX_TFMFONTS)"
-
-POSIX_MFINPUTS="$(cygpath -apu $MFINPUTS)"
-WINDOWS_MFINPUTS="$(cygpath -apw $POSIX_MFINPUTS)"
-
-# we assume running dos-based TeX, ie, MiKTeX
-# maybe move to /etc/profile.d/lily-tex.sh
-TEXINPUTS="$WINDOWS_TEXINPUTS"
-# TFMFONTS="$WINDOWS_TFMFONTS"
-
-rm -f /usr/lilypond
-# ugh
-# ln -s /usr/lilypond-@TOPLEVEL_VERSION@ /usr/lilypond
-lily=$(ls -utrd1 /usr/lilypond-* | tail -1)
-ln -s $lily /usr/lilypond
-
-PATH="/usr/lilypond/bin:$PATH"
-PATH="$lily/bin:$PATH"
-
-# gsv-2.7-gs-5.50
-PATH="//c/gstools/gsview://c/gstools/gs:$PATH"
-
-# gsv-3.6-gs-6.50
-PATH="//c/Ghostgum/gsview://c/gstools/gs:$PATH"
-
-# python-1.5.2
-PATH="//c/Program Files/Python:$PATH"
-PATH="//c/Program Files/MiKTeX/miktex:$PATH"
-
index 1a8a71013d6621b44131d90a6ed6639c06218f37..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,13 +0,0 @@
-#!/bin/bash
-# ly2dvi.sh -- ly2dvi wrapper for Windows
-
-if echo | python - >/dev/null 2>&1; then
-       echo
-else
-       cat <<EOF
-Python not found.  Install python-1.5.2 from www.python.org.
-Make sure python.exe in in your PATH
-EOF
-       exit 1
-fi
-python $(cygpath -w /usr/lilypond/bin/ly2dvi.py) $*
diff --git a/Documentation/windows/post-gs.sh b/Documentation/windows/post-gs.sh
new file mode 100644 (file)
index 0000000..a460393
--- /dev/null
@@ -0,0 +1,54 @@
+#!@SHELL@
+# /etc/postinstall/post-gs.sh -- Install GS and GSView
+
+
+gs550="/usr/windows/gstools/gs5.50"
+gs650="/usr/windows/gs/gs6.50"
+
+gsview26="/usr/windows/gstools/gsview"
+gsview36="/usr/windows/Ghostgum/GSview"
+
+# maybe set this too, but how (what type is value, a list?)
+# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
+# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
+
+# gsview needs gs register entries, so it seems
+
+if [ -e "$gs550/gswin32.exe" ]; then
+       regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_LIB' \
+               "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
+       regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_DLL' \
+               "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
+fi
+
+if [ -e "$gs650/gswin32.exe" ]; then
+       regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_DLL' \
+               "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
+       regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_LIB' \
+               "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
+fi
+
+# nothing to be done
+if [ -e "$gsview26/gsview32.exe" ]; then
+       true
+fi
+
+if [ -e "$gsview36/gsview32.exe" ]; then
+       regtool -s set 'HKLM\Software\Ghostgum\GSview\3.6' \
+               "C:\cygwin\windows\Ghostgum"
+fi
+
+# What's in the registry
+
+#  regtool -v list HKLM\Software\Aladdin Ghostscript\5.50
+#  GS_LIB = "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
+#  GS_DLL = "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
+
+#  regtool -v list HKLM\Software\Ghostgum\GSview
+#  3.6 = "C:\cygwin\windows\Ghostgum"
+
+#  regtool -v list HKLM\Software\AFPL Ghostscript\6.50
+#  GS_DLL = "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
+#  GS_LIB = "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
+
+
diff --git a/Documentation/windows/post-lily.sh b/Documentation/windows/post-lily.sh
new file mode 100644 (file)
index 0000000..8259c90
--- /dev/null
@@ -0,0 +1,8 @@
+#!@SHELL@
+# /etc/profile.d/post-lily.sh  -- Setup LilyPond
+
+rm -f /usr/lilypond
+lily=@prefix@
+ln -s $lily /usr/lilypond
+
+
diff --git a/Documentation/windows/post-miktex.sh b/Documentation/windows/post-miktex.sh
new file mode 100644 (file)
index 0000000..e8f131d
--- /dev/null
@@ -0,0 +1,30 @@
+#!@SHELL@
+# /etc/profile.d/post-miktex.sh -- Setup MiKTeX
+
+
+# Educated guess in case we have no regtool
+a="//c/Program Files/MiKTeX"
+
+# Registry entry
+reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')"
+b="$(cygpath -u ""$reg"")"
+
+# Where we installed it
+c=texmf="/usr/windows/MiKTeX"
+
+for i in "$a" "$b" "$c"; do
+       if [ -d "$i" ]; then
+               texmf="$i"
+       fi
+done
+
+rm -f /usr/share/texmf
+ln -s "$texmf" /usr/share/texmf
+
+# What's in the registry
+# $ regtool -s set 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\' "C:\cygwin\usr\windows\MiKTeX"
+
+# regtool -v list HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX
+# TEXMF Root Directories = "C:\cygwin\usr\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX"
+# Install Root = "C:\cygwin\usr\windows\MiKTeX"
+
diff --git a/Documentation/windows/post-python.sh b/Documentation/windows/post-python.sh
new file mode 100644 (file)
index 0000000..89b2c6a
--- /dev/null
@@ -0,0 +1,41 @@
+#!@SHELL@
+# /etc/profile.d/post-python.sh -- Setup Python
+
+# Educated guess in case we have no regtool
+a="//c/Program Files/Python"
+
+# Registry entry
+reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')"
+b="$(cygpath -u ""$reg"")"
+
+# Where we installed it
+c="/usr/windows/Python"
+
+for i in "$a" "$b" "$c"; do
+       if [ -d "$i" ]; then
+               python="$i"
+       fi
+done
+
+# What's in the registry
+
+#  regtool -v list HKLM\Software\Python\PythonCore\1.5
+#  InstallPath\ ()
+#  PythonPath\ ()
+#  Dll\ ()
+#  Modules\ ()
+
+#  regtool -v list HKLM\Software\Python\PythonCore\1.5\InstallPath
+#  InstallGroup\ ()
+#   = "C:\cygwin\usr\windows\Python"
+
+#  regtool -v list HKLM\Software\Python\PythonCore\1.5\PythonPath
+#   = "C:\cygwin\usr\windows\Python\Lib\plat-win;C:\cygwin\usr\windows\Python\Lib;C:\cygwin\usr\windows\Python\DLLs;C:\cygwin\usr\windows\Python\Lib\lib-tk"
+
+#  regtool -v list HKLM\Software\Python\PythonCore\1.5\Dll
+#   = "C:\WINDOWS\SYSTEM\Python15.dll"
+
+#  regtool -v list HKLM\Software\Python\PythonCore\1.5\Modules\
+#   = ""
+
+
diff --git a/Documentation/windows/python-wrapper.sh b/Documentation/windows/python-wrapper.sh
new file mode 100644 (file)
index 0000000..57bff4e
--- /dev/null
@@ -0,0 +1,13 @@
+#!@SHELL@
+# @name@.sh -- @name@ wrapper for Windows
+
+if echo | python - >/dev/null 2>&1; then
+       echo
+else
+       cat <<EOF
+Python not found.  Install python-1.5.2 from www.python.org.
+Make sure python.exe in in your PATH
+EOF
+       exit 1
+fi
+python "$(cygpath -w ""@prefix@/bin/@name@.py"")" $*
diff --git a/Documentation/windows/registry.in b/Documentation/windows/registry.in
new file mode 100644 (file)
index 0000000..b89115b
--- /dev/null
@@ -0,0 +1,60 @@
+regtool -v list HKLM\Software\
+Microsoft\ ()
+CLASSES\ ()
+Clients\ ()
+Description\ ()
+INTEL\ ()
+SmartDownload\ ()
+Netscape\ ()
+ODBC\ ()
+LTD\ ()
+Novell\ ()
+KasperskyLab\ ()
+Nico Mak Computing\ ()
+Avance\ ()
+Cygnus Solutions\ ()
+Adobe\ ()
+TRADOS\ ()
+RAINBOW TECHNOLOGIES\ ()
+GNU\ ()
+Aladdin Ghostscript\ ()
+Lilypond 1.3.119\ ()
+MiK\ ()
+Ghostgum\ ()
+Python\ ()
+AFPL Ghostscript\ ()
+
+regtool -v list HKLM\Software\Aladdin Ghostscript\5.50
+GS_LIB = "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts"
+GS_DLL = "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll"
+
+regtool -v list HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX
+TEXMF Root Directories = "C:\cygwin\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX"
+Install Root = "C:\cygwin\windows\MiKTeX"
+
+regtool -v list HKLM\Software\Ghostgum\GSview
+3.6 = "C:\cygwin\windows\Ghostgum"
+
+regtool -v list HKLM\Software\Python\PythonCore\1.5
+InstallPath\ ()
+PythonPath\ ()
+Dll\ ()
+Modules\ ()
+
+regtool -v list HKLM\Software\Python\PythonCore\1.5\InstallPath
+InstallGroup\ ()
+ = "C:\cygwin\usr\windows\Python"
+
+regtool -v list HKLM\Software\Python\PythonCore\1.5\PythonPath
+ = "C:\cygwin\usr\windows\Python\Lib\plat-win;C:\cygwin\usr\windows\Python\Lib;C:\cygwin\usr\windows\Python\DLLs;C:\cygwin\usr\windows\Python\Lib\lib-tk"
+
+regtool -v list HKLM\Software\Python\PythonCore\1.5\Dll
+ = "C:\WINDOWS\SYSTEM\Python15.dll"
+
+regtool -v list HKLM\Software\Python\PythonCore\1.5\Modules\
+ = ""
+
+regtool -v list HKLM\Software\AFPL Ghostscript\6.50
+GS_DLL = "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll"
+GS_LIB = "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts"
+
diff --git a/Documentation/windows/tex-wrapper.sh b/Documentation/windows/tex-wrapper.sh
new file mode 100644 (file)
index 0000000..56f74c4
--- /dev/null
@@ -0,0 +1,10 @@
+#!@SHELL@
+# @name@.sh -- @name@ wrapper for Windows
+
+MFINPUTS="$WINDOWS_MFINPUTS"
+TEXINPUTS="$WINDOWS_TEXINPUTS"
+TFMFONTS="$WINDOWS_TFMFONTS"
+
+export MFINPUTS TEXINPUTS TFMFONTS
+
+@name@.tex "$*"
diff --git a/Documentation/windows/zlily-profile.sh b/Documentation/windows/zlily-profile.sh
new file mode 100644 (file)
index 0000000..23832a5
--- /dev/null
@@ -0,0 +1,31 @@
+#!@SHELL@
+# /etc/profile.d/zlily-profile.sh  -- profile additions for Windows
+# runs after lilypond-profile.sh
+
+# maybe we should do this once (postinstall) and dump result for
+# this login script
+POSIX_GS_LIB="$(cygpath -apu ""$GS_LIB"")"
+WINDOWS_GS_LIB="$(cygpath -apw ""$POSIX_GS_LIB"")"
+
+POSIX_GS_FONTPATH="$(cygpath -apu ""$GS_FONTPATH"")"
+WINDOWS_GS_FONTPATH="$(cygpath -apw ""$POSIX_GS_FONTPATH"")"
+
+POSIX_TEXINPUTS="$(cygpath -apu ""$TEXINPUTS"")"
+WINDOWS_TEXINPUTS="$(cygpath -apw ""$POSIX_TEXINPUTS"")"
+
+POSIX_TFMFONTS="$(cygpath -apu ""$TFMFONTS"")"
+WINDOWS_TFMFONTS="$(cygpath -apw ""$POSIX_TFMFONTS"")"
+
+POSIX_MFINPUTS="$(cygpath -apu ""$MFINPUTS"")"
+WINDOWS_MFINPUTS="$(cygpath -apw ""$POSIX_MFINPUTS"")"
+
+export POSIX_TEXINPUTS POSIX_TFMFONTS POSIX_TFMFONTS
+export WINDOWS_TEXINPUTS WINDOWS_TFMFONTS WINDOWS_MFINPUTS
+
+PATH="/usr/lilypond/bin:$PATH"
+PATH="@prefix@/bin:$PATH"
+
+PATH="/usr/lilypond/wrappers:$PATH"
+PATH="@prefix@/wrappers:$PATH"
+
+
diff --git a/VERSION b/VERSION
index c04251a6c1ea54e2d5c79a4ed4b126873de63e24..5303002d8dbc90ea70c90836709cdd044357a759 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=149
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index 41308cf08741d8a23e93335f29e861b2dc114675..cb741eba1442e72b071ca5876ba3e9e6ce9a7f3c 100644 (file)
@@ -1,48 +1,3 @@
-BABYL OPTIONS: -*- rmail -*-
-Version: 5
-Labels:
-Note:   This is the header of an rmail file.
-Note:   If you are seeing it in rmail,
-Note:    it means the file has no messages in it.
-\1f\f
-1,,
-Return-Path: rz@daimi.au.dk
-Delivery-Date: Fri, 13 Apr 2001 13:33:44 +0200
-Received: from localhost (localhost [127.0.0.1])
-       by appel.lilypond.org (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id NAA02351
-       for <fred@localhost>; Fri, 13 Apr 2001 13:33:43 +0200
-X-XS4ALL-To: <jantien@xs4all.nl>
-Received: from pop.xs4all.nl
-       by localhost with POP3 (fetchmail-5.1.2)
-       for fred@localhost (single-drop); Fri, 13 Apr 2001 13:33:44 +0200 (CEST)
-Received: from smtp5.xs4all.nl (smtp5.xs4all.nl [194.109.6.49])
-       by maildrop7.xs4all.nl (8.11.1/8.11.1) with ESMTP id f3DBWCd93235
-       for <jantien@xs4all.nl>; Fri, 13 Apr 2001 13:32:12 +0200 (CEST)
-       (envelope-from rz@daimi.au.dk)
-Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164])
-       by smtp5.xs4all.nl (8.9.3/8.9.3) with ESMTP id NAA10302
-       for <jantien@xs4all.nl>; Fri, 13 Apr 2001 13:31:04 +0200 (CEST)
-Received: from nightcrawler.daimi.au.dk ([130.225.18.95])
-       by fencepost.gnu.org with esmtp (Exim 3.16 #1 (Debian))
-       id 14o1n2-0008Pp-00
-       for <janneke@gnu.org>; Fri, 13 Apr 2001 07:31:00 -0400
-Received: from daimi.au.dk (localhost [127.0.0.1])
-       by nightcrawler.daimi.au.dk (8.11.2/8.11.2) with ESMTP id f3DBUwX31324
-       for <janneke@gnu.org>; Fri, 13 Apr 2001 13:30:58 +0200
-Sender: rz@daimi.au.dk
-Message-ID: <3AD6E372.640DEE61@daimi.au.dk>
-Date: Fri, 13 Apr 2001 13:30:58 +0200
-From: Rune Zedeler <rz@daimi.au.dk>
-X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.16-3 i686)
-X-Accept-Language: en
-MIME-Version: 1.0
-To: Jan Nieuwenhuizen <janneke@gnu.org>
-Subject: german-chords
-Content-Type: multipart/mixed;
- boundary="------------69CC07F348020448DD291CA8"
-X-UIDL: 987161532.maildrop7.93237
-
-*** EOOH ***
 \version "1.3.148"
 
 %  german-chords.ly:
@@ -84,5 +39,3 @@ X-UIDL: 987161532.maildrop7.93237
      )
    )
  )
-
-\1f
\ No newline at end of file
index daae40c8fe60564731852184ceda90b75986a5cd..59ca7541a2930fd5372bc830325232ffaf6cb79f 100644 (file)
@@ -16,6 +16,7 @@ ATVARIABLES = \
   package\
   PATHSEP\
   PERL\
+  prefix\
   program_prefix\
   program_suffix\
   PYTHON\
index 1e409e4bc7d39a3dbe47302e38d9d6213ae0a6e0..75d3253501a43fb0322f24fa3b04ee107be19c6d 100644 (file)
@@ -64,7 +64,7 @@
 (define simple-super
 ;; duh, no docstrings for 
 ;;  "No real superscript, just raised and small"
-  '((raise . 1) (font-relative-size . -1)))
+  '((raise . 1) (font-relative-size . -2)))
 
 (define (accidental->textp acc pos)
   (if (= acc 0)
@@ -73,8 +73,7 @@
                   (list pos (string-append "accidentals-" (number->string acc))))))
 
 (define (accidental->text acc) (accidental->textp acc 'columns))
-(define (accidental->text-super acc)
-  (accidental->textp acc '((raise . 0.6) (font-relative-size . -1))))
+(define (accidental->text-super acc) (accidental->textp acc 'simple-super))
 (define (accidental->text-sub acc) (accidental->textp acc 'sub))
 
 (define (pitch->note-name pitch)
index 26f7bd263545c309d9380a982347985c9f8ac442..1b9a948292eaf52dad6ecdb18bece3c13f214b86 100644 (file)
@@ -279,6 +279,8 @@ def system (cmd, ignore_error = 0):
        Exit status of CMD
        """
        
+        if ( os.name != 'posix' ):
+               cmd = "sh -c \'%s\'" % cmd
        if verbose_p:
                progress (_ ("Invoking `%s\'") % cmd)
        st = os.system (cmd) >> 8
@@ -563,7 +565,7 @@ None
         if ( os.name == 'posix' ):
                cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
        else:
-               cmd = 'latex \\nonstopmode \\input %s' % latex_fn
+               cmd = 'latex \\\\\\\\nonstopmode \\\\\\\\input %s' % latex_fn
 
        if not verbose_p:
                progress ( _("Running %s...") % 'LaTeX')
@@ -592,8 +594,7 @@ None.
        
        if not verbose_p:
                progress ( _("Running %s...") % 'dvips')
-               if os.name == 'posix':
-                       cmd = cmd + ' 1> /dev/null 2> /dev/null'
+               cmd = cmd + ' 1> /dev/null 2> /dev/null'
                
        system (cmd)