From: hanwen <hanwen>
Date: Thu, 14 Apr 2005 10:06:04 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.5.23~157
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=104d5361f6c370ed8015df394b2cfcba49f30376;p=lilypond.git

release commit
---

diff --git a/ChangeLog b/ChangeLog
index 54b50729b6..506fac9c6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* Documentation/user/lilypond-book.itely (Invoking lilypond-book):
+	only put xrefs in info documentation.
+
 	* make/ly-rules.make ($(outdir)/%.html.omf): transplant .dvi ->
 	.pdf rule to tex-rules.make.
 
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 6cbd7583d8..d5a1871a35 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -552,9 +552,16 @@ ps2pdf yourfile.ps
 
 To produce a Texinfo document (in any output format), follow the normal
 procedures for Texinfo (this is, either call @command{texi2dvi} or
-@command{makeinfo}, depending on the output format you want to create).
+@command{makeinfo}, depending on the output format you want to
+create).
+@ifinfo
 @xref{Format with texi2dvi, , , texinfo, GNU Texinfo}, and @ref{Creating
 an Info File, , , texinfo, GNU Texinfo}.
+@end ifinfo
+@ifnotinfo
+See the documentation of Texinfo for further details.
+@end ifnotinfo
+
 
 @command{lilypond-book} accepts the following command line options:
 
diff --git a/ly/init.ly b/ly/init.ly
index 8fa1a1ad0c..04fa987483 100644
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -27,7 +27,7 @@
 #(if (and (ly:get-option 'old-relative)
       (defined? 'input-file-name)
       (not (ly:get-option 'old-relative-used)))
-  (ly:warn (string-append
+  (ly:warning (string-append
 	    "\n"
 	    input-file-name ": old relative compatibility was not used."
 	)))%% there is a problem at the end of the input file
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 43935d4086..870310f6a2 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2467,7 +2467,14 @@ conversions.append (((2, 5, 17),
 		     conv,
 		     'ly:stencil-set-extent! removed'))
 		    
+def conv (str):
+	str = re.sub (r"ly:warn\b", 'ly:warning', str)
+	return str
 
+conversions.append (((2, 5, 18),
+		     conv,
+		     'ly:warn -> ly:warning'))
+		    
 ################################
 #	END OF CONVERSIONS
 ################################