* Documentation/topdocs/INSTALL.texi (Top): change GUILE

requirements.

* buildscripts/mutopia-index.py (read_lilypond_header): update
mutopia-index.py to 1.4 syntax [sic]

diff --git a/ChangeLog b/ChangeLog
index 96022a7767c884f5bed5b858bd309c407f0451f0..62fe85dafbbbbbd2878a315de88b75525510338a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,27 @@
+2003-08-08  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/topdocs/INSTALL.texi (Top): change GUILE
+       requirements.
+
+       * buildscripts/mutopia-index.py (read_lilypond_header): update
+       mutopia-index.py to 1.4 syntax [sic]
+
 2003-08-07  Heikki Junes <hjunes@cc.hut.fi>
 
        * make/lilypond.mandrake.spec.in: remove menu, sync with redhat-spec.
 
 2003-08-07  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * Documentation/index.html.in: url for regression pdf
+
+       * Documentation/user/cheatsheet.itely (Cheat sheet): single staff.
+
+       * Documentation/user/tutorial.itely (Piano staves): s/staffs/staves/g
+
+       * make/lilypond.redhat.spec.in (Buildrequires): texinfo >= 4.6 reqd.
+
+       * VERSION: 1.8.0 released
+       
        * GNUmakefile.in (local-WWW-post): footify build fix.
 
        * configure.in: require GUILE 1.6.4

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index d848a07efa683b748ddcf05903caf65151f93c7e..a8e5b85883f79f798b8f77c2e7903eedb9a4d7ec 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -94,7 +94,7 @@
      <br>(for LilyPond hackers)
 
            <li>
-     <a  class="title" href="../../input/regression/out-www/collated-files.html">Regression tests</a> (in <a  class="title" href="../../input/regression/out-www/regression.pdf">PDF</a>)
+     <a  class="title" href="../../input/regression/out-www/collated-files.html">Regression tests</a> (in <a  class="title" href="../../input/regression/out-www/collated-files.pdf">PDF</a>)
 
      <br>(for developers)
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 153423aa2aed8bfe3f8e1e9eb20178c3ad6e4a0e..90b01a2fd95f0daba56a5bc3bc505e16362d8d3b 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -84,7 +84,7 @@ Check out
 
 @item @uref{http://www.python.org,Python} (version 2.1 or newer).
 
-@item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version 1.6.4 or newer).
+@item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version 1.6.0 or newer).
 
 @item @uref{ftp://ftp.gnu.org/gnu/make/,GNU Make} (version 3.78 or newer),  
 
@@ -146,7 +146,7 @@ following software:
 @itemize @bullet
 @item @TeX{}.
 @item Xdvi and Ghostscript.
-@item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} 1.6.4, or newer.
+@item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} 1.6.0, or newer.
 @end itemize
 
 For running LilyPond successfully

diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely
index 9af26d928d76fce43b36cbe1ccadd83184a9f749..5bb8a30e7720293f870281c3e0d3d71ba38fbeab 100644 (file)
--- a/Documentation/user/cheatsheet.itely
+++ b/Documentation/user/cheatsheet.itely
@@ -150,7 +150,7 @@ a8-[ b-]
 
 
 @item @code{< \context Staff ... >}
-@tab more staffs
+@tab more staves
 @tab
 @lilypond[fragment]
 < \context Staff = SA { c'1 }
@@ -267,7 +267,7 @@ a-\> a a-\!
 @tab polyphony
 @tab
 @lilypond[fragment,relative 1]
- < c \\ g' >
+\context Staff < c \\ g' >
 @end lilypond
 
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 4a3582295677e07ebcbeb7d50b00d495d0d8ba75..ad11d6ad09b3b267dcb40cb9363044016e6fa221 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1058,7 +1058,7 @@ c4
 @end lilypond
 
 In scores with many staves, a @code{\bar} command in one staff is
-automatically applied to all staffs. The resulting bar lines are
+automatically applied to all staves. The resulting bar lines are
 connected between different staves of a @internalsref{StaffGroup}:
 @c
 @lilypond[fragment, verbatim]
@@ -1097,7 +1097,7 @@ You are encouraged to use @code{\repeat} for repetitions.  See
 
 
 The bar line objects that are created at @internalsref{Staff} level
-are called @internalsref{BarLine}, the bar lines that span staffs are
+are called @internalsref{BarLine}, the bar lines that span staves are
 @internalsref{SpanBar}s.
 
 @cindex bar lines at start of system
@@ -2207,7 +2207,7 @@ Grace notes cannot be used in the smallest size (@file{paper11.ly}).
 
 A score that starts with an @code{\grace} section needs an explicit
 @code{\context Voice} declaration, otherwise the main note and grace
-note end up on different staffs.
+note end up on different staves.
 
 Grace note synchronization can also lead to surprises. Staff notation,
 such as key signatures, barlines, etc. are also synchronized. Take
@@ -3311,7 +3311,7 @@ melody and the lyrics with the @code{\addlyrics} expression:
 
 Normally, this will put the lyrics below the staff. For different or
 more complex orderings, the best way is to setup the hierarchy of
-staffs and lyrics first, e.g.
+staves and lyrics first, e.g.
 @example
 \context ChoirStaff \notes <
   \context Lyrics = LA @{ s1 @}
@@ -3925,14 +3925,14 @@ some common problems in orchestral music.
 * Transpose::                   
 * Multi measure rests::         
 * Automatic part combining::    
-* Hiding staffs::               
+* Hiding staves::               
 * Sound output for transposing instruments::  
 @end menu
 
 @node Multiple staff contexts
 @subsection Multiple staff contexts
 
-Polyphonic scores consist of many staffs. These staffs can be
+Polyphonic scores consist of many staves. These staves can be
 constructed in three different ways:
 @itemize @bullet
 @item The group is started with a brace at the left. This is done with the
@@ -4042,7 +4042,7 @@ used to position the number correctly.
 @subsection Instrument names
 
 In an orchestral score, instrument names are printed left side of the
-staffs.
+staves.
 
 This can be achieved by setting @internalsref{Staff}.@code{instrument}
 and @internalsref{Staff}.@code{instr}. This will print a string before
@@ -4306,11 +4306,11 @@ The part combiner is slated to be rewritten [TODO: explain why].
 @cindex @code{Voice_engraver}
 @cindex @code{A2_engraver}
 
-@node Hiding staffs
-@subsection Hiding staffs
+@node Hiding staves
+@subsection Hiding staves
 
 @cindex Frenched scores
-@cindex Hiding staffs
+@cindex Hiding staves
 
 In orchestral scores, staff lines that only have rests are usually
 removed.  This saves some space. This style is called `French Score'.
@@ -4319,8 +4319,8 @@ For @internalsref{Lyrics}, @internalsref{LyricsVoice},
 switched on by default.  When these line of these contexts turn out
 empty after the line-breaking process, they are removed.
 
-For normal staffs, a specialized @internalsref{Staff} context is
-available, which does the same: staffs containing nothing (or only
+For normal staves, a specialized @internalsref{Staff} context is
+available, which does the same: staves containing nothing (or only
 multi measure rests) are removed. The context definition is stored in
 @code{\RemoveEmptyStaffContext} variable. Observe how the second staff
 in this example disappears in the second line:

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index b9f8a5a262f7150ea9141b7cdcf3b03380385ac1..2467cf491bead7790ff7bef8e4ab8b5408b126bb 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -57,7 +57,7 @@ should then be able to create and print your first sheets of music.
 * Listening to output::         
 * Titling::                     
 * Single staff polyphony::      
-* Piano staffs::                
+* Piano staves::                
 * Setting variables::           
 * Fine tuning layout::          
 * Organizing larger pieces::    
@@ -1288,14 +1288,14 @@ Again, these expressions can be nested arbitrarily:
 More features of polyphonic typesetting are in the notation manual
 in @ref{Polyphony}.
 
-@node Piano staffs
-@section Piano staffs
+@node Piano staves
+@section Piano staves
 
 @cindex staff switch, manual
 @cindex cross staff voice, manual
 @cindex @code{\translator}
 
-Piano music is always typeset in two staffs connected by a brace.
+Piano music is always typeset in two staves connected by a brace.
 Printing such a staff is done similar to the polyphonic example in
 @ref{Combining music into compound expressions}:
 @example

diff --git a/VERSION b/VERSION
index 9f751dbba57da636da7d9fca260b1f52e6b75127..f2eb41e12f5b97b676096cc319f253cafd2b7552 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=8
 PATCH_LEVEL=0
-MY_PATCH_LEVEL=hwn1
+MY_PATCH_LEVEL=cvs1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/mutopia-index.py b/buildscripts/mutopia-index.py
index dc8cbe54a4bd061b5b037072419367d727fc5d02..e6a0f022b3d55cad2c522172de1653432b975b37 100644 (file)
--- a/buildscripts/mutopia-index.py
+++ b/buildscripts/mutopia-index.py
@@ -88,7 +88,7 @@ def read_lilypond_header (fn):
                        return dict
 
        while s:
-               m = re.search (r"""\s*(\S+)\s*=\s*([^;]+)\s*;""", s)
+               m = re.search (r'''\s*(\S+)\s*=\s*"([^"]+)"''', s)
                if m == None:
                        s = ''
                else:
@@ -137,9 +137,8 @@ def gen_list(inputs, filename):
                (base, ext2) = os.path.splitext (base)          
                ext = ext2 + ext
                
-               print '%s, ' % ex
                header = read_lilypond_header(ex)
-               
+               print header
                def read_dict(s, default, h =header):
                                try:
                                        ret = h[s]

diff --git a/configure.in b/configure.in
index 01a63013defcacb1b41262b3310bf39160d7dfe7..d830d1268dc6fcb47daf884c3ee853a64ca565da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.4)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
 STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)