nu wel 58

diff --git a/ChangeLog b/ChangeLog
index 4ebf815f3e187e09484daf1359fc84e89146c976..03e5f949183c137a48e676e1b1678b12d4a68dc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,12 @@
-2002-05-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+2002-05-22  Han-Wen  <hanwen@cs.uu.nl>
 
+       * VERSION: 1.5.58
+       
        * Documentation/user/refman.itely: Bugfix: add node Repeats and
        MIDI.  Regenerate menu.  Fix @end example.
 
-       * lily/afm.cc (count): Revert.
-
        * lily/accidental.cc: Add cautionary-style to interface.
 
-2002-05-22  Han-Wen  <hanwen@cs.uu.nl>
-
        * mf/feta-beugel.mf (code): use autometric macros for braces.
        This fixes input/bugs/braces.
 
@@ -77,8 +75,8 @@
 
        * input/regression/collision-heads.ly: new file
 
-       * VERSION 1.5.57 released.
-       
+       * VERSION: 1.5.57 released.
+
 2002-05-18  Juergen Reuter  <reuter@ipd.uka.de>
 
        * mf/parmesan-heads.mf, scm/grob-description.scm,

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cedfb13c0a782afb6da8998b42fb2544aaff616d..8833e029d86b407834bae9421878f157bc66f482 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1,6 +1,4 @@
-
-
-@c Note:
+@c Note: -*-texinfo-*-
 @c
 @c A menu is needed before every deeper *section nesting of @node's; run
 @c     M-x texinfo-all-menus-update
@@ -55,30 +53,30 @@ provided in @ref{Tuning output} and @ref{Interpretation context}. The
 syntactical details are described at the end of the manual.
 
 @menu
-* Overview::                   
-* Note entry::                 
-* Staff notation::             
-* Polyphony::                  
-* Beaming::                    
-* Expressive marks::           
-* Ornaments::                  
-* Repeats::                    
-* Rhythmic music::             
-* Piano music::                        
-* Lyrics::                     
-* Chords::                     
-* Writing parts::              
-* Custodes::                   
-* Figured bass::               
-* Tuning output::              
-* Page layout::                        
-* Output formats::             
-* Sound::                      
-* Music entry::                        
-* Skipping corrected music::   
-* Interpretation context::     
-* Syntactic details::          
-* Lexical details::            
+* Overview::                    
+* Note entry::                  
+* Staff notation::              
+* Polyphony::                   
+* Beaming::                     
+* Expressive marks::            
+* Ornaments::                   
+* Repeats::                     
+* Rhythmic music::              
+* Piano music::                 
+* Lyrics::                      
+* Chords::                      
+* Writing parts::               
+* Custodes::                    
+* Figured bass::                
+* Tuning output::               
+* Page layout::                 
+* Output formats::              
+* Sound::                       
+* Music entry::                 
+* Skipping corrected music::    
+* Interpretation context::      
+* Syntactic details::           
+* Lexical details::             
 @end menu
 
 @c . {Overview}
@@ -140,15 +138,15 @@ brevity we omit obligatory lint such as @code{\score} blocks and
 
 
 @menu
-* Notes::                      
-* Pitches::                    
-* Rests::                      
-* Skips::                      
-* Durations::                  
-* Ties::                       
-* Tuplets::                    
-* Defining pitch names::       
-* Easy Notation note heads ::  
+* Notes::                       
+* Pitches::                     
+* Rests::                       
+* Skips::                       
+* Durations::                   
+* Ties::                        
+* Tuplets::                     
+* Defining pitch names::        
+* Easy Notation note heads ::   
 @end menu
 
 @c . {Notes}
@@ -553,11 +551,11 @@ the @code{-f ps} option of lilypond produces the correct result.
 @cindex Staff notation
 
 @menu
-* Key signature::              
-* Clef::                       
-* Time signature::             
-* Unmetered music::            
-* Bar lines::                  
+* Key signature::               
+* Clef::                        
+* Time signature::              
+* Unmetered music::             
+* Bar lines::                   
 @end menu
 
 @c .  {Key}
@@ -1128,11 +1126,11 @@ horizontal, falls two staff spaces:
 
 @c .   {Slurs}
 @menu
-* Slurs ::                     
-* Phrasing slurs::             
-* Breath marks::               
-* Tempo::                      
-* Text spanners::              
+* Slurs ::                      
+* Phrasing slurs::              
+* Breath marks::                
+* Tempo::                       
+* Text spanners::               
 @end menu
 
 @node Slurs 
@@ -1296,11 +1294,11 @@ An application---or rather, a hack---is to fake octavation indications.
 @section Ornaments
 @cindex Ornaments
 @menu
-* Articulations::              
-* Text scripts::               
-* Grace notes::                        
-* Glissando ::                 
-* Dynamics::                   
+* Articulations::               
+* Text scripts::                
+* Grace notes::                 
+* Glissando ::                  
+* Dynamics::                    
 @end menu
 
 @c .   {Articulation}
@@ -1637,12 +1635,12 @@ Make beat or measure repeats. These look like percent signs.
 @end table  
 
 @menu
-* Repeat syntax::              
-* Repeats and MIDI::           
-* Manual repeat commands::     
-* Tremolo repeats::            
-* Tremolo subdivisions::       
-* Measure repeats::            
+* Repeat syntax::               
+* Repeats and MIDI::            
+* Manual repeat commands::      
+* Tremolo repeats::             
+* Tremolo subdivisions::        
+* Measure repeats::             
 @end menu
 
 @node Repeat syntax
@@ -1840,7 +1838,7 @@ with slashes, and repeating that measure with percents.
 
 
 @menu
-* Rhythmic staves::            
+* Rhythmic staves::             
 @end menu
 
 @node Rhythmic staves
@@ -1870,11 +1868,11 @@ behavior.  In this section we discuss the @internalsref{PianoStaff} and some
 other pianistic peculiarities.
 
 @menu
-* Automatic staff changes::    
-* Manual staff switches::      
-* Pedals::                     
-* Arpeggio::                   
-* Voice follower lines::       
+* Automatic staff changes::     
+* Manual staff switches::       
+* Pedals::                      
+* Arpeggio::                    
+* Voice follower lines::        
 @end menu 
 
 
@@ -1887,8 +1885,9 @@ Voices can switch automatically between the top and the bottom
 staff. The syntax for this is
 @example
         \autochange @var{contexttype} \context @var{childcontexttype}
-               @var{musicexp}
+               @var{musicexp} 
 @end example
+@c
 This will switch the interpretation context of @var{musicexp} between
 a @var{contexttype} named @code{up} and @code{down}. Typically, you
 use @internalsref{Staff} for @var{contexttype}, and
@@ -2097,10 +2096,10 @@ The associated grob is @internalsref{VoiceFollower}.
 
 
 @menu
-* Lyrics mode::                        
-* Printing lyrics::            
+* Lyrics mode::                 
+* Printing lyrics::             
 * Automatic syllable durations::  
-* More stanzas::               
+* More stanzas::                
 @end menu
 
 @c .  {Lyrics mode}
@@ -2325,8 +2324,8 @@ not attempt to be intelligent. If you enter @code{f bes d}, it does not
 interpret this as an inversion.
 
 @menu
-* Chords mode::                        
-* Printing named chords::      
+* Chords mode::                 
+* Printing named chords::       
 @end menu
 
 @c .  {Chords mode}
@@ -2547,14 +2546,14 @@ problems in orchestral music.
 
 @c .  {Transpose}
 @menu
-* Rehearsal marks::            
-* Bar numbers::                        
-* Instrument names::           
-* Transpose::                  
+* Rehearsal marks::             
+* Bar numbers::                 
+* Instrument names::            
+* Transpose::                   
 * Sound output for transposing instruments::  
-* Multi measure rests::                
-* Automatic part combining::   
-* Hara kiri staves::           
+* Multi measure rests::         
+* Automatic part combining::    
+* Hara kiri staves::            
 @end menu
 
 @c .   {Rehearsal marks}
@@ -2940,13 +2939,13 @@ affecting a whole set of objects.  Second, you can select one specific
 object, and set a grob property in that object.
 
 @menu
-* Tuning groups of grobs ::    
-* Tuning per grob ::           
-* What to tune?::              
-* Font selection::             
-* Text markup::                        
-* Invisible grobs::            
-* Dirty tricks::               
+* Tuning groups of grobs ::     
+* Tuning per grob ::            
+* What to tune?::               
+* Font selection::              
+* Text markup::                 
+* Invisible grobs::             
+* Dirty tricks::                
 @end menu
 
 @node Tuning groups of grobs 
@@ -3492,13 +3491,13 @@ and (La)@TeX{} putting the notation on a page, including page breaks.
 The part of LilyPond is documented here.
 
 @menu
-* Paper block::                        
-* Paper variables::            
-* Font Size::                  
-* Paper size::                 
-* Line break::                 
-* Page break::                 
-* Output scaling::             
+* Paper block::                 
+* Paper variables::             
+* Font Size::                   
+* Paper size::                  
+* Line break::                  
+* Page break::                  
+* Output scaling::              
 @end menu
 
 @c .  {Paper block}
@@ -3748,10 +3747,10 @@ meaning that you don't have access to continuously scaled fonts.
 LilyPond can output processed music in different output formats.  
 
 @menu
-* TeX output::                 
-* PostScript output::          
-* Scheme output::              
-* ASCIIScript output::         
+* TeX output::                  
+* PostScript output::           
+* Scheme output::               
+* ASCIIScript output::          
 @end menu
 
 @node TeX output
@@ -3935,8 +3934,8 @@ It is currently not possible to use the percussion channel (generally
 channel 10 of a MIDI file).
 
 @menu
-* MIDI block::                 
-* MIDI instrument names::      
+* MIDI block::                  
+* MIDI instrument names::       
 @end menu
 
 @c .  {MIDI block}
@@ -3996,9 +3995,9 @@ number.
 @section Music entry
 @cindex Music entry
 @menu
-* Relative::                   
-* Bar check::                  
-* Point and click::            
+* Relative::                    
+* Bar check::                   
+* Point and click::             
 @end menu
 
 When entering music with LilyPond, it is easy to introduce errors. This
@@ -4216,12 +4215,12 @@ c d b bes a g c2 }
 @section Interpretation context
 
 @menu
-* Creating contexts::          
-* Default contexts::           
-* Context properties::         
-* Engravers and performers::   
+* Creating contexts::           
+* Default contexts::            
+* Context properties::          
+* Engravers and performers::    
 * Changing context definitions::  
-* Defining new contexts::      
+* Defining new contexts::       
 @end menu
 
 
@@ -4568,13 +4567,13 @@ such an identifier outside of @code{\score}, you must do
 This section describes details that were too boring to be put elsewhere.
 
 @menu
-* Top level::                  
-* Identifiers::                        
-* Music expressions::          
+* Top level::                   
+* Identifiers::                 
+* Music expressions::           
 * Manipulating music expressions::  
-* Assignments::                        
-* Lexical modes::              
-* Ambiguities::                        
+* Assignments::                 
+* Lexical modes::               
+* Ambiguities::                 
 @end menu
 
 @c .  {Top level}
@@ -4813,7 +4812,7 @@ More examples are given in the distributed example files in
 
 @c .   {Span requests}
 @menu
-* Span requests::              
+* Span requests::               
 @end menu
 
 @node Span requests
@@ -4972,15 +4971,15 @@ right time between
 Even more boring details, now on lexical side of the input parser.
 
 @menu
-* Comments::                   
-* Direct Scheme::              
-* Keywords::                   
-* Integers::                   
-* Reals::                      
-* Strings::                    
-* Main input::                 
-* File inclusion::             
-* Version information::                
+* Comments::                    
+* Direct Scheme::               
+* Keywords::                    
+* Integers::                    
+* Reals::                       
+* Strings::                     
+* Main input::                  
+* File inclusion::              
+* Version information::         
 @end menu
 
 

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index 2d507514b22a1ade9a2c0efb8fae166002c66abe..024d9ef2b8f271579d52f0192514afdec551d029 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -76,9 +76,8 @@ Enter the following into the file
 
 @end example
 @end quotation
-Close the file and save it. Run the following command a few times (at
-least three times) until it says @code{PS output to `foo.ps', DVI output
-to `foo.dvi'}.
+Close the file and save it. Run the following command. It should say
+@code{PS output to `foo.ps', DVI output to `foo.dvi'}.
 @quotation
 @example
 

diff --git a/VERSION b/VERSION
index b192f194120f2b777e5740aa914b152c943ef675..e0ccf97a576269ed20f5ee3b6758ddac4efc6b35 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=57
+PATCH_LEVEL=58
 MY_PATCH_LEVEL=uu1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/autogen.sh b/autogen.sh
index 99c803624014337eb1c75b7a3af2986c2427fb01..0b9241673a999cdbdda5009a06f45545ad55cc57 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,8 @@
 srcdir=`dirname $0`
 DIE=0
 
+# autoconf > 2.50 is not very common yet,
+# and disappointingly incompatible with the widely available 2.13
 version=`autoconf --version 2>/dev/null | awk '{print $3}'`
 if test "$version" != "2.13"; then
   echo "ERROR: Please install autoconf 2.13"

diff --git a/lily/afm.cc b/lily/afm.cc
index 2c0256b04634d9a8ba4dab8accc96e3b3906107f..3db634c58985b7d6bd1fdeee0872ac00e012179c 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -83,8 +83,7 @@ Adobe_font_metric::find_char_metric (String nm, bool warn) const
 int
 Adobe_font_metric::count () const
 {
-  // return font_inf_->numOfChars ;
-  return ascii_to_metric_idx_.size ();
+  return font_inf_->numOfChars ;
 }
 
 Box

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index e39e57e66d0a4128d18336739f8d66d440829d45..ed8b7be05a0440647abc61f1ef3399e8b15ea249 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -57,7 +57,7 @@ void
 Mark_engraver::acknowledge_grob (Grob_info inf)
 {
   Grob * s = inf.grob_l_;
- if (text_p_ && Bar_line::has_interface (s))
+  if (text_p_ && Bar_line::has_interface (s))
     {
       /*
        Ugh. Figure out how to do this right at beginning of line, (without