From 38cfe900a3ecf91e35e1b1714a7155270538013f Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 24 Apr 2001 22:45:55 +0200
Subject: [PATCH] patch::: 1.3.150.uu1

1.3.150.jcn2
============

* Fix to standchen.

* Compilation fix.

* Windows: ly2dvi fix, tex install fix, cygwin path conversion switch
on again (arg!), minor doco fixes, fixed some urls.

1.3.150
=======
---
 CHANGES                                |  13 ++
 Documentation/header.html.in           |  36 ++-
 Documentation/index.texi               |  44 +++-
 Documentation/topdocs/INSTALL.texi     |  88 ++++----
 Documentation/user/bugs.itexi          |   2 +-
 Documentation/user/literature.itely    |   8 +-
 Documentation/windows/compiling.texi   |   6 +-
 Documentation/windows/installing.texi  |  42 ++--
 Documentation/windows/latex-wrapper.sh |   2 +-
 Documentation/windows/post-miktex.sh   |   2 +-
 VERSION                                |   2 +-
 lily/kpath.cc                          |   4 +-
 lily/performer-group-performer.cc      |   8 +-
 make/GNUmakefile                       |   2 -
 make/lilypond.spec.in                  | 160 -------------
 make/redhat.spec.in                    | 158 +++++++++++++
 make/suse.spec.in                      | 298 +++++++++++++++++++++++++
 mutopia/F.Schubert/standchen.ly        |  16 +-
 scripts/ly2dvi.py                      |   6 +-
 19 files changed, 621 insertions(+), 276 deletions(-)
 create mode 100644 make/redhat.spec.in
 create mode 100644 make/suse.spec.in

diff --git a/CHANGES b/CHANGES
index 6552157a3c..45c28df75c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+1.3.150.jcn2
+============
+
+* Fix to standchen.
+
+* Compilation fix.
+
+* Windows: ly2dvi fix, tex install fix, cygwin path conversion switch
+on again (arg!), minor doco fixes, fixed some urls.
+
+1.3.150
+=======
+
 1.3.149.jcn3
 ============
 
diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 47d8a1386f..423327d58b 100644
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -35,25 +35,16 @@ which substitutes some @AT_VARIABLES@ as well.
   <tr>
     <td align=left valign=top width="15%" bgcolor="#e8ffe8">
     <table align=left>
-      <tr><td bgcolor="#e8e8ff"><a href="@INDEX@"><b>Home</b></a></td></tr>
-      <tr><td><font size=-1>
-        <a href="http://www.lilypond.org/">LilyPond website</a><br>
-        <a href="http://www.lilypond.org/wiki">WikiWikiWeb</a><br>
-        <a href="http://www.gnu.org">GNU Project</a><br>
-        <a href="http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations</a><br>
-        <a href="http://www.cs.uu.nl/~hanwen/lilypond/">Han-Wen's site</a><br>
-	<br>
-      </td></tr>
+  
       <tr><td bgcolor="#e8e8ff">
-    	<a href="@TOP@Documentation/out-www/index.html"><b>Documentation</b></a>
+      <b>Documentation</b>
       </td></tr>
       <tr><td><font size=-1>
-    	<a href="@TOP@Documentation/out-www/CHANGES.html">Change Log</a><br>
-    	<a href="http://appel.lilypond.org/wiki?LilyPondFaqs">FAQ</a><br>
-    	<a href="@TOP@Documentation/user/out-www/lilypond/lilypond.html">User manual</a><br>
-	<a href="@TOP@Documentation/out-www/regression-test.html">Regression Test</a><br>
-	<a href="@TOP@Documentation/user/out-www/lilypond-internals/lilypond-internals.html">Documentation of internals</a><br>
-<br>
+    	<a href="@TOP@Documentation/out-www/index.html#everyone">General information</a><br>
+    	<a href="@TOP@Documentation/out-www/index.html#new-users">New users</a><br>
+    	<a href="@TOP@Documentation/out-www/index.html#other-users">Other users</a><br>
+    	<a href="@TOP@Documentation/out-www/index.html#developers">Developers</a><br>
+    	<a href="@TOP@Documentation/out-www/index.html#background">Background info</a><br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">
 	<b>Download </b>
@@ -63,18 +54,18 @@ which substitutes some @AT_VARIABLES@ as well.
 	<a href="@TOP@Documentation/topdocs/out-www/INSTALL.html#download-binaries">Binary</a>	<br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">
-	<a href="@INDEX@#music"><b>Music</b></a>
+	<b>Music</b>
       </td></tr>
       <tr><td><font size=-1>
 	<a href="@TOP@short-examples.html">Short examples</a><br>
 	<a href="@TOP@long-examples.html">Longer examples</a><br>
 	<a href="http://www.mutopiaproject.org/">Mutopia Project</a><br>
 
-	<a href="http://appel.lilypond.org/wiki?DownloadLilyPondScores">Other URLs</a><br>
+	<a href="http://www.lilypond.org/wiki?DownloadLilyPondScores">Other URLs</a><br>
 	<br>
       </td></tr>
       <tr><td bgcolor="#e8e8ff">
-        <a href="@INDEX@#mailing-lists"><b>Mailing Lists</b></a>
+	<b>Mailing Lists</b>
       </td></tr>
       <tr><td><font size=-1>
 	<a href="http://mail.gnu.org/mailman/listinfo/gnu-music-discuss/">Discussion</a><br>
@@ -83,6 +74,13 @@ which substitutes some @AT_VARIABLES@ as well.
         <a href="http://mail.gnu.org/mailman/listinfo/info-gnu-music">Announcements</a><br>
 	<br>
       </td></tr>
+    <tr><td bgcolor="#e8e8ff"><b>Sites</b></td></tr>
+      <tr><td><font size=-1>
+        <a href="http://www.lilypond.org/">Website</a><br>
+        <a href="http://www.lilypond.org/wiki">WikiWiki</a><br>
+        <a href="ftp://ftp.lilypond.org/pub">FTP site</a><br>
+	<br>
+      </td></tr>
     </table>
   <td align=left valign=top width="85%">
 
diff --git a/Documentation/index.texi b/Documentation/index.texi
index 90066f462a..cd1d57d644 100644
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -5,16 +5,29 @@
 @node Top, , , (dir)
 @top
 
+@html
+<a name="everyone">
+@end html
+
+
+@unnumberedsubsec General information
 
-@unnumberedsubsec Documentation for everyone
 
 @itemize @bullet 
 @item @uref{DEDICATION.html,Dedication}  Lily is  dedicated to our friends.
 @item @uref{http://www.gnu.org/copyleft/gpl.html,GPL} it is released under
   the GNU GPL.
+@item @uref{http://www.lilypond.org/wiki, Lilypond Wiki} A wikiwiki site
+  dedicated to lilypond.
 @end itemize
 
+@html
+<a name="new-users">
+@end html
+
+
 @unnumberedsubsec Information for new users
+
 @itemize @bullet
 @item @uref{../../index.html,index} What is Lilypond?
 @item @uref{../topdocs/out-www/README.html, README} general information
@@ -22,15 +35,22 @@
   How install on Unix.
 @item @uref{../windows/out-www/installing.html, WINDOWS}
 How to install on Windows.
-@item @uref{http://appel.lilypond.org/wiki?LilyPondFaqs,FAQ} Frequently
+@item @uref{http://www.lilypond.org/wiki?LilyPondFaqs,FAQ} Frequently
 asked questions, with answers.
-@item @uref{http://appel.lilypond.org/wiki?MailingLists,MailingLists} Subscribe to
+@item @uref{http://www.lilypond.org/wiki?MailingLists,MailingLists} Subscribe to
 the mailing lists
-@item @uref{../out-www/lilypond/Tutorial.html,Tutorial} Learn how to use LilyPond.
+@item @uref{../user/out-www/lilypond/Tutorial.html,Tutorial} Learn how to use LilyPond.
 @end itemize
 
+
+
+@html
+<a name="other-users">
+@end html
+
 @unnumberedsubsec Information for other users
 
+
 @itemize @bullet
 @item @uref{CHANGES.html, CHANGES} things recently done
 
@@ -50,12 +70,23 @@ terms, including translations.  (in
 @uref{../user/out-www/glossary.ps.gz,Postscript})
 @end itemize
 
+
+
+@html
+<a name="developers">
+@end html
+
 @unnumberedsubsec Information for developers
 
+
 @itemize @bullet
 @item @uref{../out-www/regression-test.html,regression-test} A glossary
 of musical terms, including translations.  (in
 @uref{../out-www/regression-test.ps.gz,Postscript})
+@item
+@uref{http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations,lilypond
+textual domain
+}  in the Translation Project.
 @end itemize
 
 
@@ -69,6 +100,11 @@ of musical terms, including translations.  (in
 
 @unnumberedsubsec Background information
 
+
+@html
+<a name="background">
+@end html
+
 @itemize @bullet
 @item @uref{../topdocs/out-www/AUTHORS.html, Authors} documents who did
 what on LilyPond.
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 80cb4abb8a..93b4781825 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -5,18 +5,29 @@
 @node Top, , , (dir)
 @top
 
+@contents
+
 @chapter INSTALL - compiling and installing GNU LilyPond
 
-@section Downloading source code
+
+This document describes how to build LilyPond on Unix platforms.  It is
+also known to run and compile on Windows NT/95/98 as well.  More
+information on this topic can be found at the
+@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/, LilyPond on Windows
+page}.
+
 
 @html
 <a name="download-source">
 @end html
 
+@section Downloading
+
+@subsection  source code
+
+
 If you want to compile LilyPond from source, download here:
 @itemize @bullet
-@item Download stable releases at
-@uref{ftp://ftp.gnu.org/gnu/lilypond/,GNU}
 @item Download development releases from
 @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/, by FTP} and
 @uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/development/, by HTTP}.
@@ -30,16 +41,18 @@ Installing and compiling requires many additional packages, which are
 listed in the @uref{Documentation/topdocs/out-www/INSTALL.html,
 installation instructions}.
 
-
-@section Downloading binaries
-
 @html
-<a name="download-binary">
+<a name="download-binaries">
 @end html
+
+
+
+@subsection Binaries
+
 Binaries are available, but are not updated for every version released.
 @itemize @bullet
-@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/RPMS/, RedHat i386}
-@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/linuxppc, LinuxPPC}
+@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/RedHat/RPMS/, RedHat i386}
+@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/linuxppc, LinuxPPC}
 @item
 @uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond,
 Debian GNU/Linux Stable} 
@@ -47,13 +60,13 @@ Debian GNU/Linux Stable}
 @uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond1.3,
 Debian GNU/Linux Unstable} 
 @item @uref{http://home.austin.rr.com/jbr/jeff/lilypond/, Windows Stable}
-@item @uref{ftp://ftp.lilypond.org/pub/lilypond/gnu-windows, Windows
-Testing}
-@end itemize
-
+@c @item @uref{ftp://ftp.lilypond.org/pub/lilypond/gnu-windows, Windows
+@c Testing} 
+@uref{http://www.lilypond.org/gnu-windows, Windows Testing}
 
+@end itemize
 
-@section Upgrading
+@subsection Upgrading
 
 There are two  options for upgrading sources.
 
@@ -77,13 +90,9 @@ on the FTP site.
 @end example
 @end itemize
 
-@section Build requirements
+@section Requirements
 
-This document describes how to build LilyPond on Unix platforms.  It is
-also known to run and compile on Windows NT/95/98 as well.  More
-information on this topic can be found at the
-@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/, LilyPond on Windows
-page}.
+@subsection Compilation
 
 You need the following packages to compile Lilypond.
 
@@ -151,7 +160,7 @@ configure something like:
 
 @end itemize
 
-@section Running requirements
+@subsection Running requirements
 
 GNU LilyPond does use a lot of resources. For operation you need the
 following software
@@ -173,7 +182,7 @@ Csh and bourne sh scripts are left in
 LilyPond is a big and slow program.  A fast CPU and plenty of RAM is
 recommended for comfortable use.
 
-@section Website requirements
+@subsection Website requirements
 
 The documentation comes in the form of a website. You can view this
 website on the internet, but you can also build it locally. This process
@@ -210,7 +219,7 @@ see our hypertextified bibliography.
 
 @end itemize
 
-@section Configuring and compiling
+@section Building  LilyPond
 
 to install GNU LilyPond, type:
 @example 
@@ -242,7 +251,7 @@ hand.
 
 
 
-@section Configuring for multiple platforms
+@subsection Configuring for multiple platforms
 
 If you want to build multiple versions of LilyPond with different
 configuration settings, you can use the @code{--enable-config=CONF}
@@ -270,8 +279,6 @@ and for the profiling version, I specify a different configuration.
 
 
 
-
-
 @section Emacs mode
 
 An emacs mode for LilyPond is included with the source archive as
@@ -279,7 +286,7 @@ An emacs mode for LilyPond is included with the source archive as
 an RPM, it is in @file{/usr/share/doc/lilypond-X/}.  You have to install
 it yourself.
 
-Add this to your ~/.emacs or ~/.emacs.el:
+Add this to your @file{~/.emacs} or @file{~/.emacs.el}:
 @example 
     (load-library "lilypond-mode.el")
     (setq auto-mode-alist
@@ -290,14 +297,15 @@ Add this to your ~/.emacs or ~/.emacs.el:
 If you have the latest LilyPond-1.3.x Debian package, LilyPond-mode is
 automatically loaded, so you need not modify your @code{~/.emacs} file.
 
+@section Compiling for distributions 
 
-@section Red Hat Linux
+@subsection Red Hat Linux
 
 Red Hat 7.0 i386 RPMS are available from
 @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/RedHat/}.
 
 You can also compile them yourself.  A spec file is in
-@file{make/out/lilypond.spec}. This file is distributed along with the
+@file{make/out/redhat.spec}. This file is distributed along with the
 sources.  You can make the rpm by issuing
 @example 
 
@@ -313,18 +321,21 @@ For compilation on a Red Hat system you need these packages, in addition
 to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel,
 guile-devel, flex, bison, texinfo, tetex-devel, groff, libgr-progs.
 
-@section SuSE
+@subsection SuSE
 
-[TODO: document this]
-
-Install @code{tetex}, @code{te_mpost}, @code{te_kpath}.
+You can also compile them yourself.  A spec file is in
+@file{make/out/suse.spec}. This file is distributed along with the
+sources.
 
+You must have the following packages: guile tcsh tetex te_latex te_mpost
+libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib
+gs_fonts guile
 
-@section Mandrake
+@subsection Mandrake
 
 [TODO]
 
-@section Debian GNU/Linux
+@subsection Debian GNU/Linux
 
 A Debian package is also available.  You may install it easily by using
 apt-get as root:
@@ -418,7 +429,7 @@ mailing your problems.  If you find bugs, please send bug reports to
 
 Bugs that are not fault of LilyPond are documented here.
 
-@unnumbered NetBSD
+@unnumberedsubsec NetBSD
 
 @itemize @bullet
 @item The flex precompiled in NetBSD-1.4.2 is broken.
@@ -434,21 +445,20 @@ CFLAGS='-I /usr/pkg/include' LDFLAGS='-L/usr/pkg/lib' ./configure
 
 @end itemize
 
-@unnumbered Solaris:
+@unnumberedsubsec  Solaris:
 
 @itemize @bullet
 @item Sparc64/Solaris 2.6, GNU make-3.77
 
 GNU make-3.77 is buggy on this platform, upgrade to 3.78.1 or newer.
 
-
 @item Sparc64/Solaris 2.6, ld
 
 Not yet resolved.
 @end itemize
 
 
-@unnumbered AIX
+@unnumberedsubsec   AIX
 
 @itemize @bullet
 @item AIX 4.3 ld
diff --git a/Documentation/user/bugs.itexi b/Documentation/user/bugs.itexi
index 206b56b704..fc51178df9 100644
--- a/Documentation/user/bugs.itexi
+++ b/Documentation/user/bugs.itexi
@@ -30,5 +30,5 @@ system libraries, whether you downloaded a binary release)
 You can send the report to @email{bug-gnu-music@@gnu.org}. This is a
 mailinglist, but you don't have to be subscribed to it.  You may also
 enter the bug in the LilyPond wiki, at
-@uref{http://appel.lilypond.org/wiki?LilyPondBugs}.
+@uref{http://www.lilypond.org/wiki?LilyPondBugs}.
 
diff --git a/Documentation/user/literature.itely b/Documentation/user/literature.itely
index 6b33242eea..f006c72319 100644
--- a/Documentation/user/literature.itely
+++ b/Documentation/user/literature.itely
@@ -1,9 +1,11 @@
 @node Literature
 @chapter Literature
 
-If you need to know more about music notation, here are some interesting
-titles to read. The source archive includes a more elaborate
-bibliography of over 100 entries in @file{Documentation/bibliography/}.
+If you need to know more about music notation, here are some
+interesting titles to read. The source archive includes a more
+elaborate BibTeX bibliography of over 100 entries in
+@file{Documentation/bibliography/}. It is also available online from
+the lilypond website.
 
 @table @cite
 @item Banter 1987
diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi
index dbf0dbad86..2358a4ea9f 100644
--- a/Documentation/windows/compiling.texi
+++ b/Documentation/windows/compiling.texi
@@ -1,8 +1,8 @@
 @section Obtaining LilyPond
 
 You can get the latest version of LilyPond at
-@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,
-ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}.
+@uref{ftp://ftp.lilypond.org/pub/LilyPond/,
+ftp://ftp.lilypond.org/pub/LilyPond/}.
 
 @section Windows build requirements
 You need the following packages to compile Lilypond on Windows.
@@ -21,5 +21,5 @@ included in LilyPond's source distribution.
 
 These binaries are cross compiled for Windows on a GNU/Linux box.  You
 may want to check out the
-@uref{http://appel.lilypond.org/lilypond/gnu-windows/cross-1.1.8.tar.gz,cross
+@uref{http://www.lilypond.org/gnu-windows/cross-1.1.8.tar.gz,cross
 compilation scripts}.
diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index 406dac5010..d26b9ce521 100644
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -11,29 +11,19 @@ This document explains how to install the binary release for windows
 on a Microsoft Windows 95, 98, NT or 2000 machine.
 
 This release is a free extra service of the developers to assist windows
-users. Please remember that we (the developers) rather dislike windows,
+users.  Please remember that we (the developers) rather dislike windows,
 and none of us use it.  Don't complain to us that installing LilyPond is
 too difficult; rather, send us code that works better.
 
-You must install the following software:
+You need the following software (but read on):
 
+@c list these first, because lilypond install scripts look for these
+@c packages
 @table @asis
-@item LilyPond
-Download and run
-@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/setup.exe, setup.exe}
-to install LilyPond.
-
-This will install the minimal set of cygwin tools needed to run
-LilyPond.  If you already have cygwin installed, don't worry: nothing
-will be installed twice.  To expand on this minimal set, click
-@uref{http://sources.redhat.com/cygwin/setup.exe,here},
-or visit a Cygwin
-@uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-
 @item A full TeX installation.
 
-For example,  download  and install 
-@uref{http://prdownloads.sourceforge.net/miktex/miktex-2.0-lvl-1.zip,MikTeX},
+Currently, only MikTeX is supported.  Download and install
+@uref{http://downloads.sourceforge.net/miktex/miktex-2.0-lvl-1.zip,MikTeX},
 or visit @uref{http://www.miktex.org,www.miktex.org}.
 @c See @file{/usr/doc/cygwin/tetex-beta-20001218.README} for details.
 
@@ -66,9 +56,29 @@ 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.
+
+@item LilyPond
+Download and run
+@c let's do http, so that people read the README
+@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}
+to install LilyPond.
+
+This will install the minimal set of cygwin tools needed to run
+LilyPond.
+
+As of version 1.3.150, you also have the option to install MiKTeX,
+Python and GSView from this installer, but that's still somewhat
+experimental.  If you choose to install these by hand (see above), make
+sure to install them @strong{before} you install LilyPond.
+
+If you already have cygwin installed, don't worry: nothing will be
+installed twice.  To expand on this minimal set, click
+@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
+Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
 @end table
 
 
+
 @section Windows running setup
 
 If you're lucky, after running @file{setup.exe} you're all set up.
diff --git a/Documentation/windows/latex-wrapper.sh b/Documentation/windows/latex-wrapper.sh
index 67b805c54c..82a2fd44e3 100644
--- a/Documentation/windows/latex-wrapper.sh
+++ b/Documentation/windows/latex-wrapper.sh
@@ -5,4 +5,4 @@ MFINPUTS="$WINDOWS_MFINPUTS"
 TEXINPUTS="$WINDOWS_TEXINPUTS"
 TFMFONTS="$WINDOWS_TFMFONTS"
 
-@name@ "$*"
+@name@.exe "$*"
diff --git a/Documentation/windows/post-miktex.sh b/Documentation/windows/post-miktex.sh
index e8f131d029..7f3f33879f 100644
--- a/Documentation/windows/post-miktex.sh
+++ b/Documentation/windows/post-miktex.sh
@@ -10,7 +10,7 @@ reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Ro
 b="$(cygpath -u ""$reg"")"
 
 # Where we installed it
-c=texmf="/usr/windows/MiKTeX"
+c="/usr/windows/MiKTeX"
 
 for i in "$a" "$b" "$c"; do
 	if [ -d "$i" ]; then
diff --git a/VERSION b/VERSION
index e9f70f477a..d73144fac9 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=150
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/kpath.cc b/lily/kpath.cc
index 413d4be351..8cbfc86a9f 100644
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -68,8 +68,10 @@ ly_init_kpath (char *av0)
     /var/texmf/fonts, reducing clutter and compilation time.
     
   */
+#ifndef __CYGWIN__  /* mktextfm/mktexpk does not work on windows */
   unsetenv ("TFMFONTS");
-  
+#endif
+
   /*
    initialize kpathsea
    */
diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc
index 3b5ea7f6a3..96e25b97d8 100644
--- a/lily/performer-group-performer.cc
+++ b/lily/performer-group-performer.cc
@@ -75,14 +75,10 @@ Performer_group_performer::do_announces ()
 
   if (announce_info_arr_.size ())
     {
+#if 0  //printf?  -> include <stdio.h>     
       printf ("do_announces: elt: %s\n",
 	      classname (announce_info_arr_[0].elem_l_));
+#endif      
       announce_info_arr_.clear ();
     }
 }
-
-
-
-
-
-
diff --git a/make/GNUmakefile b/make/GNUmakefile
index e62590a7c8..62acae4cdb 100644
--- a/make/GNUmakefile
+++ b/make/GNUmakefile
@@ -2,8 +2,6 @@
 
 depth = ..
 STEPMAKE_TEMPLATES=makedir install
-##BLURBS=BLURB # COPERTINA FLAPTEKST
-
 INSTALLATION_DIR=$(datadir)/make
 INSTALLATION_FILES=$(DIST_FILES)
 
diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 8916512e46..e69de29bb2 100644
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -1,160 +0,0 @@
-%define info yes
-
-Name: lilypond
-Version: @TOPLEVEL_VERSION@
-Release: 1
-License: GPL
-Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
-# music notation software for.. ?
-Summary: A program for printing sheet music.
-URL: http://www.cs.uu.nl/~hanwen/lilypond
-# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
-# Icon: @package@-icon.xpm
-BuildRoot: /tmp/lilypond-install
-Prereq: tetex
-
-# use keywords: music notation software
-%description
-LilyPond is a music typesetter.  It produces beautiful
-sheet music using a high level description file as input.  LilyPond is
-part of the GNU Project.
-
-%package documentation
-Summary: Prebuilt website containing all LilyPond documentation.
-Group: Applications/Publishing
-# BuildArchitectures: noarch
-
-%description documentation
-
-The documentation of LilyPond, both in HTML and PostScript.
-
-%prep
-%setup
-
-%build
-
-#
-
-# DO NOT use % { configure } , it hardcodes all paths, runs libtool,
-# so we can't do make prefix=/tmp/ install.
-
-# In fact, do not take out the spaces between % and { , because RPM will gladly
-# do a substitution anyway.
-
-./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
-
-make all
-
-# urg
-# %build documentation
-# line 42: second %build
-# ok, now make sure that lilypond package will succeed,
-# even if documentation fails to build
-
-make -C Documentation  || true
-make web || true
-
-%install
-
-
-
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
-
-strip lily/out/lilypond midi2ly/out/midi2ly
-make prefix="$RPM_BUILD_ROOT%{_prefix}" install
-%if info=="yes"
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
-%endif
-
-
-
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
-
-
-
-
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
-cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
-cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
-
-# urg
-#%install documentation
-#line 63: second %install
-# again, make sure that main package installs even if doco fails
-mkdir -p web/out
-tar -C web -xzf out/web.tar.gz || true
-
-%ifos cygwin
-# urg, this symlink doesn't come through on cygwin
-# this is the way symlinks work over there, let's fake one
-rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
-echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
-%{fix_suffixes}
-%endif
-
-%post
-
-touch /tmp/.lilypond-install
-rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
-%if info=="yes"
-/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
-%endif
-
-%preun
-%if info=="yes"
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
-fi
-%endif
-
-
-%files
-# hairy to hook it in (possibly non-existing) emacs
-%doc lilypond-mode.el
-%doc lilypond-font-lock.el
-
-%ifnos cygwin
-%{_prefix}/bin/abc2ly
-%{_prefix}/bin/as2text
-%{_prefix}/bin/convert-ly
-%{_prefix}/bin/etf2ly
-%{_prefix}/bin/lilypond
-%{_prefix}/bin/ly2dvi
-%{_prefix}/bin/midi2ly
-%{_prefix}/bin/lilypond-book
-%{_prefix}/bin/mup2ly
-%{_prefix}/bin/musedata2ly
-%{_prefix}/bin/pmx2ly
-%else
-%{_prefix}/bin
-%endif
-
-%if info=="yes"
-%{_prefix}/info/lilypond.info.gz
-%{_prefix}/info/lilypond-internals.info.gz
-%endif
-
-%{_prefix}/man/man1/abc2ly.1.gz
-%{_prefix}/man/man1/as2text.1.gz
-%{_prefix}/man/man1/convert-ly.1.gz
-%{_prefix}/man/man1/etf2ly.1.gz
-%{_prefix}/man/man1/lilypond.1.gz
-%{_prefix}/man/man1/ly2dvi.1.gz
-%{_prefix}/man/man1/midi2ly.1.gz
-%{_prefix}/man/man1/lilypond-book.1.gz
-%{_prefix}/man/man1/musedata2ly.1.gz
-%{_prefix}/man/man1/mup2ly.1.gz
-%{_prefix}/man/man1/pmx2ly.1.gz
-
-%{_prefix}/share/lilypond/
-%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
-# urg?
-%{_prefix}/../etc/profile.d/lilypond.*
-
-%files documentation
-# this gets too messy...
-# %doc input/*.ly
-# verbatim include of input: list the directory without issuing a %dir 
-%doc web/
diff --git a/make/redhat.spec.in b/make/redhat.spec.in
new file mode 100644
index 0000000000..f61dcdb229
--- /dev/null
+++ b/make/redhat.spec.in
@@ -0,0 +1,158 @@
+%define info yes
+
+Name: lilypond
+Version: @TOPLEVEL_VERSION@
+Release: 1
+License: GPL
+Group: Applications/Publishing
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+# music notation software for.. ?
+Summary: A program for printing sheet music.
+URL: http://www.cs.uu.nl/~hanwen/lilypond
+# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
+# Icon: @package@-icon.xpm
+BuildRoot: /tmp/lilypond-install
+Prereq: tetex
+
+# use keywords: music notation software
+%description
+LilyPond is a music typesetter.  It produces beautiful
+sheet music using a high level description file as input.  LilyPond is
+part of the GNU Project.
+
+%package documentation
+Summary: Prebuilt website containing all LilyPond documentation.
+Group: Applications/Publishing
+# BuildArchitectures: noarch
+
+%description documentation
+
+The documentation of LilyPond, both in HTML and PostScript.
+
+%prep
+%setup
+
+%build
+
+# DO NOT use % { configure } , it hardcodes all paths, runs libtool,
+# so we can't do make prefix=/tmp/ install.
+
+# In fact, do not take out the spaces between % and { in the above comment,
+# because RPM will gladly do a substitution anyway.
+
+./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+
+make all
+
+# urg
+# %build documentation
+# line 42: second %build
+# ok, now make sure that lilypond package will succeed,
+# even if documentation fails to build
+
+make -C Documentation  || true
+make web || true
+
+%install
+
+
+
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
+
+strip lily/out/lilypond midi2ly/out/midi2ly
+make prefix="$RPM_BUILD_ROOT%{_prefix}" install
+%if info=="yes"
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+%endif
+
+
+
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
+
+
+
+
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
+cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
+cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
+
+# urg
+#%install documentation
+#line 63: second %install
+# again, make sure that main package installs even if doco fails
+mkdir -p web/out
+tar -C web -xzf out/web.tar.gz || true
+
+%ifos cygwin
+# urg, this symlink doesn't come through on cygwin
+# this is the way symlinks work over there, let's fake one
+rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
+echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
+%{fix_suffixes}
+%endif
+
+%post
+
+touch /tmp/.lilypond-install
+rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
+%if info=="yes"
+/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+%endif
+
+%preun
+%if info=="yes"
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+fi
+%endif
+
+
+%files
+# hairy to hook it in (possibly non-existing) emacs
+%doc lilypond-mode.el
+%doc lilypond-font-lock.el
+
+%ifnos cygwin
+%{_prefix}/bin/abc2ly
+%{_prefix}/bin/as2text
+%{_prefix}/bin/convert-ly
+%{_prefix}/bin/etf2ly
+%{_prefix}/bin/lilypond
+%{_prefix}/bin/ly2dvi
+%{_prefix}/bin/midi2ly
+%{_prefix}/bin/lilypond-book
+%{_prefix}/bin/mup2ly
+%{_prefix}/bin/musedata2ly
+%{_prefix}/bin/pmx2ly
+%else
+%{_prefix}/bin
+%endif
+
+%if info=="yes"
+%{_prefix}/info/lilypond.info.gz
+%{_prefix}/info/lilypond-internals.info.gz
+%endif
+
+%{_prefix}/man/man1/abc2ly.1.gz
+%{_prefix}/man/man1/as2text.1.gz
+%{_prefix}/man/man1/convert-ly.1.gz
+%{_prefix}/man/man1/etf2ly.1.gz
+%{_prefix}/man/man1/lilypond.1.gz
+%{_prefix}/man/man1/ly2dvi.1.gz
+%{_prefix}/man/man1/midi2ly.1.gz
+%{_prefix}/man/man1/lilypond-book.1.gz
+%{_prefix}/man/man1/musedata2ly.1.gz
+%{_prefix}/man/man1/mup2ly.1.gz
+%{_prefix}/man/man1/pmx2ly.1.gz
+
+%{_prefix}/share/lilypond/
+%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
+# urg?
+%{_prefix}/../etc/profile.d/lilypond.*
+
+%files documentation
+# this gets too messy...
+# %doc input/*.ly
+# verbatim include of input: list the directory without issuing a %dir 
+%doc web/
diff --git a/make/suse.spec.in b/make/suse.spec.in
new file mode 100644
index 0000000000..fd57a54bc4
--- /dev/null
+++ b/make/suse.spec.in
@@ -0,0 +1,298 @@
+#
+# spec file for package lilypond (Version 1.3.149)
+# based on 
+#    spec file for package lilypond (Version 1.2.17)
+#    Copyright  (c)  2000  SuSE GmbH  Nuernberg, Germany.
+#
+# Please send bug reports to schlemme@mathe.tu-freiberg.de
+
+%define info yes
+
+# neededforbuild  guile tcsh tetex te_latex te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib gs_fonts guile
+# usedforbuild    aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gpp gppshare groff gs_fonts gs_lib gs_serv guile gzip kbd less libc libgpp libnetpb libpng libtool libz lx_suse make mktemp modules ncurses net_tool netcfg netpbm nkita nkitb nssv1 pam patch perl pgp ps python rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit tcsh te_ams te_latex te_mpost tetex texinfo textutil timezone unzip util vim xdevel xf86 xshared guile
+
+
+Distribution: SuSE Linux 7.0 (i386)
+Name: lilypond
+Version: @TOPLEVEL_VERSION@
+Release: 2
+Copyright:    GPL
+Group: Applications/Publishing
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz
+# music notation software for.. ?
+Summary: A program for printing sheet music.
+URL: http://www.lilypond.org/
+# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm
+# Icon: lilypond-icon.xpm
+BuildRoot: /tmp/lilypond-install
+Prereq: tetex python
+
+# use keywords: music notation software
+%description
+LilyPond is a music typesetter.  It produces beautiful
+sheet music using a high level description file as input.  LilyPond is
+part of the GNU Project.
+
+Authors:
+--------
+    Han-Wen Nienhuys <hanwen@cs.uu.nl>
+    Jan Nieuwenhuizen <janneke@gnu.org>
+    Alexandre Oliva <oliva@dcc.unicamp.br>
+    Mats Bengtsson <matsb@s3.kth.se>
+    Eric Bullinger <eric@aut.ee.ethz.ch>
+    Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no>
+    Anthony Fok <foka@debian.org>
+    Neil Jerram <nj104@cus.cam.ac.uk>
+    Donald Ervin Knuth
+    Werner Lemberg <wl@gnu.org>
+    David R. Linn <drl@vuse.vanderbilt.edu>
+    François Pinard <pinard@iro.umontreal.ca>
+    Jeffrey B. Reed <daboys@bga.com>
+    Shay Rojanski
+    Tom Cato Amundsen <tca@gnu.org>
+    Laura Conrad <lconrad@world.std.com>
+    James Hammons <jlhamm@pacificnet.net>
+    Bjoern Jacke <bjoern.jacke@gmx.de>
+    Michael Krause <m.krause@tu-harburg.de>
+    David R. Linn <drl@vuse.vanderbilt.edu>
+    Adrian Mariano
+    Stephen Peters <portnoy@ai.mit.edu>
+    Glen Prideaux <glenprideaux@iname.com>
+    Roy R. Rankin <Roy.Rankin@alcatel.com.au>
+    Juergen Reuter <reuterj@ira.uka.de>
+    August S.Sigov <august@infran.ru>
+    Rune Zedeler <rune@zedeler.dk>
+
+SuSE series: ap
+
+%package doc
+Summary: Prebuilt website containing all LilyPond documentation.
+Group: Applications/Publishing
+# BuildArchitectures: noarch
+
+%description doc
+
+The documentation of LilyPond, both in HTML and PostScript.
+
+%define INSTALL install -m755 -s
+%define INSTALL_DIR install -d -m755
+%define INSTALL_DATA install -m644
+%prep
+%setup
+
+%build
+
+#
+
+# DO NOT use % { configure } , it hardcodes all paths, runs libtool,
+# so we can't do make prefix=/tmp/ install.
+
+# In fact, do not take out the spaces between % and { , because RPM will gladly
+# do a substitution anyway.
+
+CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared
+
+make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all
+
+# urg
+# %build doc
+# line 42: second %build
+# ok, now make sure that lilypond package will succeed,
+# even if documentation fails to build
+
+make -C Documentation  || true
+make web || true
+
+%install
+
+
+
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
+
+## this is an ugly hack
+mkdir -p scripts/share/lilypond/tex
+cp tex/titledefs.tex scripts/share/lilypond/tex
+## end of hack
+
+
+strip lily/out/lilypond midi2ly/out/midi2ly
+make prefix="$RPM_BUILD_ROOT%{_prefix}" install
+
+%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond
+(cd $RPM_BUILD_ROOT/usr/share/lilypond \
+    && mv mf/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond \
+    && rm -fr mf \
+    && ln -s ../texmf/fonts/source/public/lilypond mf)
+%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond
+(cd $RPM_BUILD_ROOT/usr/share/lilypond \
+    && mv afm/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond \
+    && rm -fr afm \
+    && ln -s ../texmf/fonts/afm/lilypond afm)
+%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond
+(cd $RPM_BUILD_ROOT/usr/share/lilypond \
+    && mv tex/* $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond \
+    && rm -fr tex \
+    && ln -s ../texmf/tex/lilypond tex)
+%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps
+(cd $RPM_BUILD_ROOT/usr/share/lilypond \
+    && mv ps/* $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps \
+    && rm -fr ps \
+    && ln -s ../texmf/lilypond/ps ps)
+
+
+%if info=="yes"
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+%endif
+
+
+
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
+
+
+
+
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
+cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
+cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
+
+# urg
+#%install doc
+#line 63: second %install
+# again, make sure that main package installs even if doco fails
+mkdir -p web/out
+tar -C web -xzf out/web.tar.gz || true
+
+%ifos cygwin
+# urg, this symlink doesn't come through on cygwin
+# this is the way symlinks work over there, let's fake one
+rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
+echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
+%{fix_suffixes}
+%endif
+
+%{?suse_check}
+
+
+%pre
+if [ -d usr/share/lilypond/ps ]; then
+  mv usr/share/lilypond/ps usr/share/lilypond/ps.old
+  echo "please, remove /usr/share/lilypond/ps.old manually."
+fi
+
+%post
+
+touch /tmp/.lilypond-install
+rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
+%if info=="yes"
+/usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+%endif
+mkdir -p var/adm/SuSEconfig
+touch var/adm/SuSEconfig/run-texhash
+
+
+%preun
+%if info=="yes"
+if [ $1 = 0 ]; then
+    /usr/bin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+fi
+%endif
+
+%postun
+mkdir -p var/adm/SuSEconfig
+touch var/adm/SuSEconfig/run-texhash
+
+
+
+%files
+%defattr(-, root, root)
+%doc CHANGES COPYING DEDICATION INSTALL.txt NEWS
+%doc README.txt FAQ.txt AUTHORS.txt VERSION ROADMAP
+%doc buildscripts/
+%doc scripts/
+# hairy to hook it in (possibly non-existing) emacs
+%doc lilypond-mode.el
+%doc lilypond-font-lock.el
+
+%config /etc/profile.d/*
+
+%ifnos cygwin
+%{_prefix}/bin/abc2ly
+%{_prefix}/bin/as2text
+%{_prefix}/bin/convert-ly
+%{_prefix}/bin/etf2ly
+%{_prefix}/bin/lilypond
+%{_prefix}/bin/ly2dvi
+%{_prefix}/bin/midi2ly
+%{_prefix}/bin/lilypond-book
+%{_prefix}/bin/mup2ly
+%{_prefix}/bin/musedata2ly
+%{_prefix}/bin/pmx2ly
+%else
+%{_prefix}/bin
+%endif
+
+%if info=="yes"
+%{_prefix}/info/lilypond.info.gz
+%{_prefix}/info/lilypond-internals.info.gz
+%endif
+
+%{_prefix}/man/man1/abc2ly.1.gz
+%{_prefix}/man/man1/as2text.1.gz
+%{_prefix}/man/man1/convert-ly.1.gz
+%{_prefix}/man/man1/etf2ly.1.gz
+%{_prefix}/man/man1/lilypond.1.gz
+%{_prefix}/man/man1/ly2dvi.1.gz
+%{_prefix}/man/man1/midi2ly.1.gz
+%{_prefix}/man/man1/lilypond-book.1.gz
+%{_prefix}/man/man1/musedata2ly.1.gz
+%{_prefix}/man/man1/mup2ly.1.gz
+%{_prefix}/man/man1/pmx2ly.1.gz
+
+%{_prefix}/share/lilypond/
+%{_prefix}/share/texmf/
+%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo
+# urg?
+#%{_prefix}/../etc/profile.d/lilypond.*
+
+%files doc
+# this gets too messy...
+%doc mutopia/
+%doc input/
+%doc web/
+# verbatim include of input: list the directory without issuing a %dir 
+
+%changelog -n lilypond
+* Sun Apr 22 2001 - schlemme@mathe.tu-freiberg.de
+- update: 1.3.149
+* Mon Apr 10 2000 - bk@suse.de
+- added suse update config macro
+* Thu Mar 16 2000 - kukuk@suse.de
+- Use gs_serv, not gs_both (doesn't exist on all platforms)
+* Wed Mar 01 2000 - uli@suse.de
+- moved man pages to /usr/share
+* Tue Dec 21 1999 - ke@suse.de
+- add documentation (#271).
+* Mon Dec 13 1999 - ke@suse.de
+- update: 1.2.17.
+- compiler fix (thanks to schwab@suse.de).
+- #271.
+* Mon Oct 25 1999 - ke@suse.de
+- update: 1.2.16.
+* Mon Sep 13 1999 - bs@suse.de
+- ran old prepare_spec on spec file to switch to new prepare_spec.
+* Mon Sep 06 1999 - ro@suse.de
+- update to 1.2.6 to make it compile with new guile
+- various fixes and one hack to make this compile at all
+* Sun Aug 22 1999 - ke@suse.de
+- provide /etc/profile.d scripts.
+- make lily.ps available (thanks to Ulrich Windl).
+* Tue Aug 17 1999 - ke@suse.de
+- update: version 1.2.1.
+* Thu Nov 05 1998 - ke@suse.de
+- use the TDS and provide links from /usr/share/lilypond.
+- install examples via %doc.
+* Wed Oct 28 1998 - ke@suse.de
+- update: version 1.0.17.
+* Fri Aug 07 1998 - ke@suse.de
+- initial package: version 1.0.0
diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly
index d5c804ee8f..f20941e907 100644
--- a/mutopia/F.Schubert/standchen.ly
+++ b/mutopia/F.Schubert/standchen.ly
@@ -431,21 +431,7 @@ grandStaff =  \context PianoStaff <
 			\lyricStaff 
 		\grandStaff
 	>
-	\paper { 
-%{		\translator {
-			\HaraKiriStaffContext
-			%VerticalExtent = #'(0 . 0)
-			%MinimumVerticalExtent = #'(0 . 0)
-			%StaffMinimumVerticalExtent = #'(0 . 0)
-		}
-		%}
-		\translator {
-			\LyricsContext
-			VerticalExtent = #'(1.2 . 1.2)
-			MinimumVerticalExtent = #'(0 . 0)
-			StaffMinimumVerticalExtent = #'(1.2 . 1.2)
-		}
-	}
+	\paper {  }
 	\midi{
 		\tempo 4 = 54
 	}
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 1b9a948292..df183c0d66 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -280,6 +280,7 @@ def system (cmd, ignore_error = 0):
 	"""
 	
         if ( os.name != 'posix' ):
+		cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd)
 		cmd = "sh -c \'%s\'" % cmd
 	if verbose_p:
 		progress (_ ("Invoking `%s\'") % cmd)
@@ -562,10 +563,7 @@ None
 	f.write (s)
 	f.close ()
 
-        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')
-- 
2.39.5