Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  lilypond-book: Generate valid HTML 4.01 Transistional
  Fix @warning{} box.

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 4ef3123bfdbed271a2cd015e2b581f5ef4a555c9..c13b839542105bba7acf30d44aa3f612ef03c756 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -6,8 +6,9 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c @value{version}
 @macro version
-@value{version}
+2.11.41
 @end macro
 
 @c   ***** Displaying text *****
@@ -26,6 +27,12 @@
 @end macro
 
 @macro warning{TEXT}
+@html
+@cartouche
+@b{Note:} \TEXT\
+@end cartouche
+@end html
+@ifnothtml
 @quotation
 @quotation
 @cartouche
@@ -33,6 +40,7 @@
 @end cartouche
 @end quotation
 @end quotation
+@end ifnothtml
 @end macro
 
 @ifnotinfo

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 60886775165b63ffd9627c531db6f86f8d360b7b..5e6ff2b32a0870e2b2f202e9cad63e950cc8461d 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -590,7 +590,7 @@ output = {
  <a href="%(base)s.ly">''',
 
         OUTPUT: r'''
-  <img align="center" valign="center"
+  <img align="middle" 
     border="0" src="%(image)s" alt="%(alt)s">''',
 
         PRINTFILENAME: '<p><tt><a href="%(base)s.ly">%(filename)s</a></tt></p>',
@@ -655,7 +655,7 @@ output = {
 @html
 <p>
  <a href="%(base)s.ly">
-  <img align="center" valign="center"
+  <img align="middle"
     border="0" src="%(image)s" alt="%(alt)s">
  </a>
 </p>