* buildscripts/lilypond-profile.sh (Error): more zsh stuff: print

a warning that the warning may erroneous.

* GNUmakefile.in ($(config_h)): config.h should depend on
config.hh.in .
(lilypond.words): remove fontball stuff.

* GNUmakefile.in (rsync-web): permissions and ownership for
website.

diff --git a/ChangeLog b/ChangeLog
index 03dfe70df735949d7288d56d3fc14117fe438601..e3567464bcffc5107328a8da51def5e8b15371d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * buildscripts/lilypond-profile.sh (Error): more zsh stuff: print
+       a warning that the warning may erroneous.
+
        * Documentation/topdocs/INSTALL.texi (Top): add note about get-pfa
        target.
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 014ca0b81c850755c9190311bb2826e63f976781..2ed8bf582646b07a49b3313105bc77ca3c45cbaf 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -144,7 +144,7 @@ rsync-web:
        cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
        cd out-www/web && \
        chgrp -R lilypond . && \
-       chmod -R  664 . && \
+       chmod -R g+w  && \
        chmod 2775 `find -type d` . && \
        rsync --delete --stats --progress -gorltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
        cd out-www && rm -rf web/

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 44559f6e3ec272058b82c1a49c2b9943912932ab..b688455dcdaf788ac8fd5b9f137a6b32244c9396 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,11 +7,19 @@
 # If run by hand or from you .profile, run as follows
 #   . /PATH/TO/lilypond-profile
 
-echo $0
+
+
 # workaround for ZSH posix $0-problem
-[ -n "$ZSH_NAME" ] && setopt nofunctionargzero
 
-if [ `basename "$0"` = "lilypond-profile" ] ; then
+# for zsh: start removing here
+if [ -n "$ZSH_NAME" ] ; then
+    echo "You are running this script under zsh. Edit this script by hand. "
+    echo 
+    echo "(failed to source lilypond-profile)"
+    return 2
+fi
+
+if [ `basename "$0"` = "lilypond-profile" ] ; then 
     cat >/dev/stderr <<EOF
     
 Error: This script cannot be run in a subshell; it MUST be sourced.
@@ -19,7 +27,7 @@ Error: This script cannot be run in a subshell; it MUST be sourced.
 
 EXAMPLE 1: One time use 
 
-       Do
+       * Do
 
            . $0
 
@@ -48,17 +56,11 @@ EXAMPLE 3: Install for all users.
 
        * Logout
 
-
-
 EOF
 
-
-## If the message above is printed erroneously,
-## the following commands  kills the current terminal/shell.
-## hence the ZSH  test above.
-
-    exit 2 
+    return 2
 else
+#  for zsh: till here
 
        if [ -z "$LILYPONDPREFIX" ]; then
            datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
@@ -82,7 +84,7 @@ else
        ## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
        ## export GS_FONTPATH
 
-fi
+fi # remove for zsh
        
 
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index fbba449b9de758b90111fb48a2568287d34cdf7d..8a2b76ac6c06f9116a38f1c234c9f3a76a4ccf7d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -756,7 +756,7 @@ def scan_latex_preamble (chunks):
                if not m:
                        error ("Latex documents must start with a \documentclass command")
                if m.group (1):
-                       options = re.split (',[\n \t]*', m.group (1)[1:-1])
+                       options = re.split (',\s*', m.group (1)[1:-1])
                else:
                        options = []
                if 'twocolumn' in options: