Some web build fixes. Are we at .58 yet?

diff --git a/ChangeLog b/ChangeLog
index e9ffedd54b5efe852ec2f77517c2054f0fcc691e..4ebf815f3e187e09484daf1359fc84e89146c976 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-05-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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>

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cc22005e4b8b15924a1cbca3f37da61e7a5c562d..cedfb13c0a782afb6da8998b42fb2544aaff616d 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1638,6 +1638,7 @@ Make beat or measure repeats. These look like percent signs.
 
 @menu
 * Repeat syntax::              
+* Repeats and MIDI::           
 * Manual repeat commands::     
 * Tremolo repeats::            
 * Tremolo subdivisions::       
@@ -1700,7 +1701,7 @@ the specified number of repeats.
 }
 @end lilypond
 
-@subsection Repeats and MIDI
+@node Repeats and MIDI
 @subsection Repeats and MIDI
 
 @cindex expanding repeats
@@ -1886,13 +1887,14 @@ 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} @end example 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 @internalsref{Voice}
-for @var{childcontexttype}. The autochanger switches on basis of pitch
-(central C is the turning point), and it looks ahead skipping over
-rests to switch rests in advance.
+               @var{musicexp}
+@end example
+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
+@internalsref{Voice} for @var{childcontexttype}. The autochanger
+switches on basis of pitch (central C is the turning point), and it
+looks ahead skipping over rests to switch rests in advance.
         
 @lilypond[verbatim,singleline]
 \score { \notes \context PianoStaff <

diff --git a/lily/afm.cc b/lily/afm.cc
index dc5c5519680cb737033a0c6c6ed73cfe7ea62414..2c0256b04634d9a8ba4dab8accc96e3b3906107f 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -83,8 +83,8 @@ 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 ;
+  return ascii_to_metric_idx_.size ();
 }
 
 Box