*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 363f126d07f830b2ec973d61703a4dc09f1db760..b896cf54c58bb3dc7dda6d198a4a6f29931db2fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2004-02-09  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * lily/span-dynamic-performer.cc (process_music): deprecate span-type.
+
        * scripts/lilypond-book.py (Lilypond_snippet.notice_include):
        write .dep file.
+       (Lilypond_snippet.ly): add \renameinput.
 
 2004-02-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 15ae9daea556aadf0b781e875e3d7cb42d9346b6..5b5f4df1c58dcc4eff197580794c4a0482a9ab2a 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4486,6 +4486,8 @@ In @code{soloADue} mode, when the two voices play the same notes on and
 off, the part combiner may typeset @code{a2} more than once in a
 measure.
 
+@code{\partcombine} can not be inside @code{\times}. 
+
 
 
 @node Hiding staves
@@ -8283,10 +8285,6 @@ field. Titles are made by La@TeX{}, so La@TeX{} commands should be used
 for formatting.
 
 
-@menu
-* Markup construction in scheme::  
-* Markup command definition::   
-@end menu
 
 @node Markup construction in scheme
 @subsubsection Markup construction in scheme
@@ -8399,20 +8397,7 @@ consing a list with the extra setting.
 
 However, suppose that we are using a font that does not have a
 small-caps variant. In that case, we have to fake the small caps font,
-by setting a string in upcase, with the first letter a little larger.
-
-The @code{smallcaps} command first splits its string argument into
-tokens separated by spaces (@code{(string-split str #\Space)}); for
-each token, a markup is built with the first letter made large and
-upcased (@code{#:large (string-upcase (substring s 0 1))}), and a
-second markup built with the following letters made tiny and upcased
-(@code{#:tiny (string-upcase (substring s 1))}). As LilyPond
-introduces a space between markups on a line, the second markup is
-translated to the left (@code{#:translate (cons -0.6 0) ...}). Then,
-the markups built for each token are put in a line
-(@code{(make-line-markup ...)}). Finally, the resulting markup is
-passed to the @code{interpret-markup} function, with the @code{paper}
-and @code{props} arguments.
+by setting a string in upcase, with the first letter a little larger:
 
 @example
 #(def-markup-command (smallcaps paper props str) (string?)
@@ -8428,6 +8413,19 @@ and @code{props} arguments.
           (string-split str #\Space)))))
 @end example
 
+The @code{smallcaps} command first splits its string argument into
+tokens separated by spaces (@code{(string-split str #\Space)}); for
+each token, a markup is built with the first letter made large and
+upcased (@code{#:large (string-upcase (substring s 0 1))}), and a
+second markup built with the following letters made tiny and upcased
+(@code{#:tiny (string-upcase (substring s 1))}). As LilyPond
+introduces a space between markups on a line, the second markup is
+translated to the left (@code{#:translate (cons -0.6 0) ...}). Then,
+the markups built for each token are put in a line
+(@code{(make-line-markup ...)}). Finally, the resulting markup is
+passed to the @code{interpret-markup} function, with the @code{paper}
+and @code{props} arguments.
+
 Finally, suppose that we are typesetting a recitative in an opera, and
 we would like to define a command that will show character names in a
 custom manner. Names should be printed with small caps and translated a