* Documentation/header.html.in: remove FAQ

* Documentation/index.texi (Top): reorganise

* Documentation/topdocs/INSTALL.texi (Top): add note about fonts.

* Documentation/topdocs/FAQ.texi: remove.

* stepmake/stepmake/documentation-targets.make (footify): must
depend on all .html files, otherwise rebuilds are broken due to
the time stamps

* ly/declarations-init.ly (noBreak): set penalty to 10001 (>
10000).

diff --git a/ChangeLog b/ChangeLog
index 83e615be18f8fdc4aafc152b8a4e58795c09235c..aaaa0c6aea1a7be450397912d845296ccbf02825 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2002-08-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/header.html.in: remove FAQ
+
+       * Documentation/index.texi (Top): reorganise
+
+       * Documentation/topdocs/INSTALL.texi (Top): add note about fonts.
+
+       * Documentation/topdocs/FAQ.texi: remove.
+
+       
+
+       * stepmake/stepmake/documentation-targets.make (footify): must
+       depend on all .html files, otherwise rebuilds are broken due to
+       the time stamps 
+
+       * ly/declarations-init.ly (noBreak): set penalty to 10001 (>
+       10000).
+
 2002-08-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * ly/engraver-init.ly (ChordNamesContext): minimumverticalExtent

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ec408176919d3b119d15d68057a7fbd7cdac7ab4..4b7c27c927b595a2cf872e3a971b5c7c60b93c4f 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -13,7 +13,7 @@ include $(depth)/make/stepmake.make
 default: local-doc
 
 wiki-dump = $(outdir)/wiki-dump/LilyPond.html
-wiki-slurp: $(wiki-dump)
+#wiki-slurp: $(wiki-dump)
 
 $(wiki-dump):
        mkdir -p $(outdir)/wiki-dump
@@ -22,7 +22,7 @@ foe:
        mkdir -p $(outdir)/wiki-dump/images
        ln -f $(builddir)/Documentation/pictures/$(outbase)/lelie-icon.png $(outdir)/wiki-dump/images/wikibase.png
 
-local-WWW: copy-for-me txt-to-html $(PS_GZ_FILES) $(PDF_FILES) wiki-slurp footify
+local-WWW: copy-for-me txt-to-html $(PS_GZ_FILES) $(PDF_FILES) footify
 
 local-WWW-clean: deep-WWW-clean
 

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index b295af7c165493a040d3f9b3874431a287393766..1e70051a4b6c6575b7d8930659b825098e8f20a0 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -69,7 +69,6 @@ which substitutes some @AT_VARIABLES@ as well.
        <a href="@TOP@Documentation/topdocs/out-www/README.html#mailing-lists">Mailing lists</a><br>
         <a href="http://www.lilypond.org/search/">Search</a><br>
         <a href="http://www.lilypond.org/wiki/">WikiWiki</a><br>
-       <a href="http://www.lilypond.org/wiki?LilyPondFaqs">FAQs</a><br>        
        <br>
       </font></td></tr>
     <tr><td bgcolor="#e8e8ff"><b>External sites</b></td></tr>

diff --git a/Documentation/index.texi b/Documentation/index.texi
index c08349c769fcd9ae0878cdaab1d033feb3789150..61ead8170959a4e3c7395980a1088cab907915e3 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -18,12 +18,9 @@
 
 
 @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
-  devoted to LilyPond.  Also available as a local
-  @uref{wiki-dump/LilyPond.html, Frozen Copy}.
+@item Lily is @uref{DEDICATION.html,dedicated to our friends.}  
+@item
+It is released under the @uref{http://www.gnu.org/copyleft/gpl.html, GNU GPL}.
 @end itemize
 
 @html
@@ -45,33 +42,27 @@
 @unnumberedsubsubsec Installation
 
 @itemize @bullet
-@item @uref{../topdocs/out-www/README.html, README} General information.
-@item @uref{../topdocs/out-www/INSTALL.html, INSTALL}
-  How install on Unix.
-@item @uref{../windows/out-www/installing.html, WINDOWS}
-How to install on Windows. @uref{http://cygwin.com/setup.exe, Install
-Lily now}.
-
+@item The @uref{../topdocs/out-www/README.html, README} contains general information.
+@item   How to @uref{../topdocs/out-www/INSTALL.html, install on Unix}
+@item How to install @uref{../windows/out-www/installing.html, on
+Windows}.  (or @uref{http://cygwin.com/setup.exe, click here} to
+install Lily now).
 @end itemize
 
 @c also for users...
 @unnumberedsubsubsec Support
 
 @itemize @bullet
-@item @uref{../../index.html,Front Page} What is LilyPond?
-@item @uref{../topdocs/out-www/FAQ.html,mini-FAQ} Mini FAQ -- very
-frequently asked questions, with answers.
-@item @uref{http://www.lilypond.org/wiki?LilyPondFaqs,FAQs} Frequently
-Asked Questions, with answers.
-@item @uref{http://www.lilypond.org/wiki?MailingLists,MailingLists} Subscribe to
-the mailing lists.
+@item @uref{../../index.html,Front Page}: What is LilyPond?
+@item  Subscribe to the
+@uref{../topdocs/out-www/README.html#mailing-lists,mailing lists}
 @end itemize
 
 @unnumberedsubsubsec Documents
 
 @c direct links into first steps and running lily?
 @itemize @bullet
-@item @uref{../user/out-www/lilypond/Tutorial.html,Tutorial} Learn how to use LilyPond.
+@item @uref{../user/out-www/lilypond/Tutorial.html,Learn} how to use LilyPond.
 @end itemize
 
 @end quotation
@@ -84,43 +75,36 @@ the mailing lists.
 
 
 @itemize @bullet
-@item @uref{ChangeLog.html, ChangeLog} Things recently done.
-
-@c download sites?
-
-@c archives?
-
-@c tutorial?
+@item The complete @uref{../user/out-www/lilypond/lilypond.html,user
+manual}, (also in @uref{../user/out-www/lilypond.ps.gz,PostScript} and
+@uref{../user/out-www/lilypond.pdf,PDF}).
 
 @item
-@uref{../user/out-www/lilypond/Reference-Manual.html,Reference-Manual}
-The reference manual, and 
-@uref{../user/out-www/lilypond/Index.html,Master Index}.
-
-@item @uref{../user/out-www/lilypond/lilypond.html,Top Table of Contents} The complete
-user manual, (in @uref{../user/out-www/lilypond.ps.gz,PostScript} and
-@uref{../user/out-www/lilypond.pdf,PDF}). This manual contains among
-others the tutorial, the reference manual.  The HTML version is also
-available as @uref{../user/out-www/lilypond.html,one big page}.
+The @uref{../user/out-www/lilypond.html,user manual} as one big page,
+for easy searching, or look it up in the
+@uref{../user/out-www/lilypond/Index.html,index}.
 
 @c glossary maybe for new users?
-@item @uref{../user/out-www/glossary.html,Glossary} A glossary of musical
-terms, including translations.  (in
-@uref{../user/out-www/glossary.ps.gz,PostScript}
-and
-@uref{../user/out-www/glossary.pdf,PDF}) Read this if you're not
+ @item
+ A  @uref{../user/out-www/glossary.html,glossary}  of musical
+terms, including translations.  (also in
+@uref{../user/out-www/glossary.ps.gz,PostScript} and
+@uref{../user/out-www/glossary.pdf,PDF}).  Read this if you're not
 familiar with English terms for notation.
 
-@item @uref{../user/out-www/lilypond-internals/lilypond-internals.html,Lilypond-Internals}
-Full documentation of internals, generated from the sources.  If you
-want to fine-tune output, you need the information in this document.
+@item Documentation of
+@uref{../user/out-www/lilypond-internals/lilypond-internals.html,internals},
+ generated from the source code.  If
+you want to fine-tune output, you need the information in this
+document.
 
-@item @uref{../../input/templates/out-www/templates.html,Templates}
-input templates, for different formats of music. Add notes, and done!
+@item
+ @uref{../../input/templates/out-www/templates.html, Templates}, for
+different music styles. Add notes, and done!
 
-@item @uref{../../input/test/out-www/test.html,Input snippets}
-All of the tips-and-trick input snippets, with the corresponding output
-shown.  Also available in
+@item All of the @uref{../../input/test/out-www/test.html,tips-and-tricks}
+ input snippets, with the corresponding
+output shown.  Also available in
 @uref{../../input/test/out-www/test.ps.gz,PostScript} and
 @uref{../../input/test/out-www/test.pdf,PDF} formats.
 @end itemize
@@ -137,9 +121,10 @@ shown.  Also available in
 @c Jan's site?
 
 @itemize @bullet
-@item @uref{../../input/regression/out-www/regression.html,Regression Tests}
-A large document with snippets that test all basic features.  Also
-available in
+@item The @uref{ChangeLog.html, ChangeLog} lists things recently done.
+@item The
+@uref{../../input/regression/out-www/regression.html,Regression Tests}
+are lot of snippets that test all basic features.  Also available in
 @uref{../../input/regression/out-www/regression.ps.gz,PostScript} and
 @uref{../../input/regression/out-www/regression.pdf,PDF} formats.
 @item
@@ -150,48 +135,12 @@ Textual Domain
 @end itemize
 
 
-@unnumberedsubsec Logo
-@itemize @bullet
-@item Logo at @uref{../pictures/out-www/lelieblond.png, large} size.
-@item Logo at @uref{../pictures/out-www/lelie-logo.png, medium} size.
-@item Logo at @uref{../pictures/out-www/lelie-icon.png, small} size.
-@end itemize
-
-
-@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.
-@item @uref{../out-www/NEWS.txt,NEWS} summary of changes for 1.4
-@item @uref{../misc/out-www/CHANGES-0.0.html, CHANGES-0.0} Change logs from 0.0 till 0.1
-@item @uref{../misc/out-www/CHANGES-0.1.html, CHANGES-0.1} Change logs from 0.1 till 1.0 
-@item @uref{../misc/out-www/CHANGES-1.0.html, CHANGES-1.0} Change logs from 1.0 till 1.1 
-@item @uref{../misc/out-www/CHANGES-1.1.html, CHANGES-1.1} Change logs from 1.1 till
-1.2 
-@item @uref{../misc/out-www/CHANGES-1.2.html, CHANGES-1.2} Change logs from 1.2 till 1.3 
-@item @uref{../misc/out-www/NEWS-1.2.html, NEWS-1.2} summary of changes from 1.1 till 1.2
-@item @uref{../misc/out-www/ANNOUNCE-0.1.html, ANNOUNCE-0.1} Announcement of 0.1 (includes summary of
-changes)
-@item @uref{../misc/out-www/ANNOUNCE-1.0.html, ANNOUNCE-1.0} Announcement of 1.0 (includes summary of
-changes)
-@item @uref{../misc/out-www/ANNOUNCE-1.2.html, ANNOUNCE-1.2} Announcement of 1.2 (includes summary of changes)
-@item @uref{../misc/out-www/AIMS.html, AIMS} Why LilyPond?
-@item @uref{../misc/out-www/interview.html, interview} Answers to the Brave GNU world standard questions.
-@item @uref{../windows/out-www/lily-wins.html, lily-wins} musings on the
-Windows installer
-@end itemize
 
 @unnumberedsubsec Literature
 
 @itemize @bullet
 @item @uref{../bibliography/out-www/colorado.html,University of
-Colorado Engraving music bibliography}. Books refered from the
+Colorado Engraving music bibliography}. Books referred to at the
 @uref{http://www.cc.colorado.edu/Dept/MU/Musicpress/,Big Site of Music
 Notation and Engraving} at University of Colorado.
 @item References on
@@ -208,12 +157,7 @@ by computer}.
 @end html
 @unnumberedsec Mailing lists
 
-If you have questions, do write to the mailing lists.  But don't forget
-to read the @uref{../topdocs/out-www/FAQ.html,Very Frequently
-Asked Questions} and @uref{http://appel.dyndns.org/wiki?LilyPondFaqs,
-Frequently Asked Questions} first.
-
-
+If you have questions, you can write to our mailing lists:
 @itemize @bullet
 @item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org}
 This list is for discussions concerning the development release of
@@ -241,18 +185,61 @@ Searchable archives are available from
 @item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org}
 If you have bugreports, you should send them to this list.  
 
-
-        Please include in your bugreport the version of LilyPond that
-you experience the problem with, a description of your system and sample
-input to reproduce the problem. Do not send output files over the list,
-they tend to be very big and don't help with describing the problem.
-
+Please include in your bugreport the version of LilyPond that you
+experience the problem with, a description of your system and sample
+input to reproduce the problem. Do not send output files over the
+list, they tend to be very big and don't help with describing the
+problem.
 
 Searchable archives are available from
 @uref{http://www.mail-archive.com/bug-lilypond@@gnu.org}.
 
 @end itemize
 
+
+@unnumberedsubsec Logo
+@itemize @bullet
+@item Logo in @uref{../pictures/out-www/lelieblond.png, large} size.
+@item Logo in @uref{../pictures/out-www/lelie-logo.png, medium} size.
+@item Logo in @uref{../pictures/out-www/lelie-icon.png, small} size.
+@end itemize
+
+
+@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.
+@item @uref{../out-www/NEWS.txt,NEWS} summary of changes for 1.4
+@item @uref{../misc/out-www/CHANGES-1.4.html, CHANGES-1.4} Change logs
+from 1.4 up to 1.5
+@item @uref{../misc/out-www/CHANGES-1.3.html, CHANGES-1.3} Change logs from 1.3 up to 1.4 
+@item @uref{../misc/out-www/CHANGES-1.2.html, CHANGES-1.2} Change logs from 1.2 up to 1.3 
+@item @uref{../misc/out-www/CHANGES-1.1.html, CHANGES-1.1} Change logs from 1.1 up to
+1.2 
+@item @uref{../misc/out-www/CHANGES-1.0.html, CHANGES-1.0} Change logs from 1.0 up to 1.1 
+@item @uref{../misc/out-www/CHANGES-0.1.html, CHANGES-0.1} Change logs from 0.1 up to 1.0 
+@item @uref{../misc/out-www/CHANGES-0.0.html, CHANGES-0.0} Change logs from 0.0 up to 0.1
+@item @uref{../misc/out-www/NEWS-1.4.html, NEWS-1.4} summary of changes from 1.2 till 1.4
+
+@item @uref{../misc/out-www/NEWS-1.2.html, NEWS-1.2} summary of changes from 1.0 till 1.2
+
+@item @uref{../misc/out-www/ANNOUNCE-1.2.html, ANNOUNCE-1.2} Announcement of 1.2 (includes summary of changes)
+@item @uref{../misc/out-www/ANNOUNCE-1.0.html, ANNOUNCE-1.0} Announcement of 1.0 (includes summary of
+changes)
+@item @uref{../misc/out-www/ANNOUNCE-0.1.html, ANNOUNCE-0.1} Announcement of 0.1 (includes summary of
+changes)
+@item @uref{../misc/out-www/AIMS.html, AIMS} Why LilyPond?
+@item @uref{../misc/out-www/interview.html, interview} Answers to the Brave GNU world standard questions.
+@item @uref{../windows/out-www/lily-wins.html, lily-wins} musings on the
+Windows installer
+@end itemize
+
 These pages were entirely created from a @strong{development snapshot}
 of the LilyPond package.  The version of this webpage is printed at the
 bottom.

diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi
deleted file mode 100644 (file)
index 7bde350..0000000
--- a/Documentation/topdocs/FAQ.texi
+++ /dev/null
@@ -1,92 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-@setfilename FAQ.info
-@settitle FAQ - GNU LilyPond Frequently Asked Questions
-
-@html
-<!--- @@WEB-TITLE@@=Frequently Asked Questions --->
-@end html
-
-@node Top
-@chapter FAQ - GNU LilyPond Frequently Asked Questions
-
-
-@menu
-* General::                      General questions
-* Installation::                 Installation questions
-@end menu
-
-
-@node General
-@section General
-
-@subsection I'm stuck, HELP!
-
-Please read the
-@uref{http://lilypond.org/wiki?LilyPondFaqs, full online
-FAQs}.  Also, please look in the searchable mailinglist archives:
-
-@itemize @bullet
-@item
-@uref{http://www.mail-archive.com/lilypond-user@@gnu.org,lilypond-user}
-@item
-@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org,bug-lilypond}
-@item
-@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org,lilypond-devel}
-@item
-@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org,gnu-music-discuss}
-(this is the archive of the `old' mailing list.) 
-@end itemize
-
-Or try the various @uref{http://lilypond.org/search, searching facilities}.
-
-If you are still at loss, send your questions to the @strong{mailing
-list}, and not to authors directly.
-
-@node Installation
-@section Installation
-
-@subsection Where is guile, libguileX, guile-config?
-
-Red Hat users need to install guile-1.4 and guile-devel-1.4, Debian
-users need to get guile1.4, libguile9 and libguile9-dev.
-
-If you're building from source, you need guile 1.4 or newer.  Verify
-that the correct guile, guile-config, and libguile* in your PATH and
-LD_LIBRARY_PATH (or @file{/etc/ld.so.conf}).
-
-@subsection I upgraded by applying a patch, and now my configure/build breaks.
-
-Patches don't include automatically generated files, i.e. 
-@file{configure} and files generated by @file{configure}.  Regenerate them 
-yourself:
-@quotation
-@example 
-
-    ./autogen.sh
-    ./configure
- 
-@end example 
-@end quotation 
-
-@subsection I downloaded the windows32 port, and it doesn't match the website!
-
-The website is usually made from the latest snapshots.  Binary releases,
-in particular the windows32 binaries, are only made every once in a while.
-They may lag several versions behind the latest version.
-
-@subsection Beams, slurs and crescendi are not displayed at all!
-
-XDvi uses GhostScript for displaying PostScript, check that you have
-GhostScript installed.  If you use a different DVI viewer (eg, on
-Windows), check if it will display embedded PostScript.  Don't worry,
-the symbols should appear on the printout.
-
-@subsection I upgraded, and now my symbols are all messed up
-
-We obviously mucked with the fonts in the upgrade.  Remove all
-previous fonts, including any .pk and .tfm fonts in
-@file{/var/lib/texmf}, @file{/var/spool/texmf}, @file{/var/tmp/texmf}
-or @file{/tmp}.  A script automating this has been included, see
-@file{buildscripts/clean-fonts.sh}.
-
-@bye

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index fc28a49b738460744b6962c392cc6e46392fbec6..087116b392a14caf65f04cb082bb0adb398f11a6 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -123,6 +123,18 @@ on the FTP site.
 @end example
 @end itemize
 
+@subsection Font problems.
+
+If you are upgrading from a previous version of LilyPond, be sure to
+remove all old font files. These include @file{.pk} and @file{.tfm} files
+that may be located in @file{/var/lib/texmf}, @file{/var/spool/texmf},
+@file{/var/tmp/texmf} or @file{@var{prefix}/share/lilypond/fonts/}.  A
+script automating this has been included, see
+@file{buildscripts/clean-fonts.sh}.
+
+
+
+
 @section Requirements
 
 @subsection Compilation
@@ -224,7 +236,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.
 
-@subsection Website requirements
+@subsection Building website 
 
 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
@@ -245,7 +257,7 @@ fonts. Get it from @uref{http://www.cs.uu.nl/~hanwen/mftrace/}.  You
 will need to install some additional packages to get mftrace to work.
 @end itemize
 
-@section Building  LilyPond
+@section Building LilyPond
 
 to install GNU LilyPond, type:
 @example 

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index b4ce2c21cada099660804cc8a41e29552be9285c..2229220a8cbbbfc61b6014d3157789088ade7b79 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -36,50 +36,34 @@ source archives; Xdelta (@file{.xd}) files are supplied on the website.
 @section Compilation
 
 For compiling and running LilyPond please refer to the installation
-instructions.  These instructions can be found when you unpack lilypond,
-as @file{lilypond-x.y.z/INSTALL.txt}.
+instructions.  These instructions can be found when you unpack
+lilypond, as @file{lilypond-x.y.z/INSTALL.txt}. They are also
+available on the web at
+@uref{http://lilypond.org/Documentation/topdocs/out-www/INSTALL.html}.
 
-
-NOTE: If you downloaded a binary (.rpm or a W95/NT .zip file),
-you don't have to compile LilyPond.
+NOTE: If you downloaded a binary (@file{.rpm} or a W95/NT @file{.zip}
+file), you don't have to compile LilyPond.
 
 
 @section Documentation
 
 The documentation is available online at
-@uref{http://www.lilypond.org/}.  You can also build it locally. This
-does require a working LilyPond binary.  The following formats are
-supported:
-@itemize @bullet
-
-@item HTML. Refer to INSTALL.txt for information
-on how to make the HTML documentation.
-
-@item @file{.dvi},  for the tutorial and reference manual. Do
-@example 
-
- make -C Documentation/user/ dvi 
+@uref{http://www.lilypond.org/Documentation/out-www/index.html}.
 
-@end example 
-The printable documentation is left in @file{Documentation/user/out/}.
-
-@item paper. Create the .dvi documentation, and print it with dvips.
-
-@end itemize
+You can also build it locally: follow the instructions under `Building
+website' in the installation instructions.
 
 
 @section Comments
 
-LilyPond is a long way from finished and polished, so please send your
-criticism, comments, bugreports, patches, etc., to the mailing list,
-@emph{not} to us personally.
+LilyPond is a long way from finished so we appreciate your criticism,
+comments, bugreports, patches, etc. Please send them to the mailing
+list, @emph{not} to us personally.
 
 @html
 <a name="mailing-lists">
 @end html
 
-
-
 We have the following mailing lists:
 
 @itemize @bullet
@@ -89,6 +73,7 @@ is a low-volume list for information on the GNU Music project.
     @email{drl@@gnu.org, David R. Linn} or
     @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this
 list.
+
 @item
 @uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org}
   For discussions about developing lilypond, in particular the unstable series.
@@ -104,6 +89,8 @@ If you have bugreports, you should send them to this list.
   list.
 @end itemize
 
+You can search the lists from the following page:
+@uref{http://lilypond.org/search, searching facilities}.
 
 @section Windows 32
 
@@ -119,15 +106,14 @@ files, eg.,
 @example 
 rm `find /var/lib/texmf/fonts -name 'feta*'` 
 @end example 
-
-a script to do this for you is in @file{buildscripts/out/clean-fonts}
+a script to do this for you is left
+@file{buildscripts/out/clean-fonts}
 
 @section Bugs
 
 Send bug reports to @email{bug-lilypond@@gnu.org}.  For help and
-questions use @email{lilypond-user@@gnu.org}.  Please consult the FAQ
-and installation instructions before mailing your problems.
-
+questions use @email{lilypond-user@@gnu.org}.  Please consult the
+documentation before mailing your problems.
 
 
 @bye

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ca3cf2422a82640a271bd11db9598e0a785c5b13..9961c60889d38867e707404e007f9ecdf428c91e 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,7 +17,7 @@ SUBDIRS = buildscripts scripts flower lily \
 
 SCRIPTS = configure aclocal.m4 autogen.sh
 README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt
 IN_FILES := $(wildcard *.in)
 EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)

diff --git a/NEWS b/NEWS
index 9daae5383288986e435e1236fcadf6c157417837..63cec29d6d4ea9d13559e42507e774bb1a19c544 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,11 +21,8 @@ now.
 * Better spacing: both globally and locally. It includes subtle
 details like optical stem spacing.
 
-* More ancient notation support: mensural ligatures,
-more shapes.
-
-* Support for automatically determining and engraving ambitus (pitch
-range) of voices.
+* More ancient notation support: mensural ligatures, ambitus (pitch
+range) of voices, more shapes, etc.
 
 * Piano notation: bracket pedals, directed arpeggios, arpeggio
 brackets.
@@ -34,7 +31,7 @@ brackets.
 
 * Font completely revised and improved.
 
-* Completely rewritten midi input support.
+* Completely rewritten MIDI import support.
 
 * Manual thoroughly revised.
 

diff --git a/flower/include/source-file.hh b/flower/include/source-file.hh
index 6e4be63601905857b11791a3785e067028d83d36..9e9d8c34c22e2bd902b0668952a15a55196edf41 100644 (file)
--- a/flower/include/source-file.hh
+++ b/flower/include/source-file.hh
@@ -1,7 +1,3 @@
-//
-//  source-file.hh -- declare Source_file
-//
-//  copyright 1997 Jan Nieuwenhuizen <janneke@gnu.org>
 
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH

diff --git a/input/regression/break.ly b/input/regression/break.ly
index e00197442b358a8df7703e8ee7b552be261899a1..4f7887346bf6a843e7f69a985aa10a2168b5c0e6 100644 (file)
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -11,9 +11,10 @@ Breaks can be encouraged and discouraged using @code{\\break} and
 \score{
        \notes\context Voice{
        \emptyText
-       c1 c1^"no break after 2nd note"  \noBreak c1 c1
-         
-         c1^"break after this" \break c1 c1 
+       c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
+       c1 \break \mark "break" c1 \break \mark "break" c1 
        }
-       \paper { linewidth = 4.0\cm}
+       \paper {
+           indent = 0.0
+           linewidth = 4.0\cm}
 }

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 6021e8d72f469b1fc2a16aecedf8bb0695091626..516326f80c268b9c146e4b904db581ca32f88ef4 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -20,7 +20,7 @@ bigger = 1
 center=0
 
 break =  \penalty  #-10000
-noBreak =  \penalty #10000
+noBreak =  \penalty #10001
 \include "scale-definitions-init.ly"
 
 melisma = \property Staff.melismaBusy = ##t

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index c9d4e5c5f59932150e27b8cc7cee2c204ab33c5b..9f5b2ceb7a1c7c3e1437523f59986b3605ba1df0 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -6,7 +6,7 @@ include $(stepdir)/www-targets.make
 
 local-WWW: $(OUTHTML_FILES) footify
 
-footify:
+footify: $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html))
        $(footify) $(sort $(wildcard $(outdir)/*.html out/*.html out-www/*.html))
 
 deep-footify: