From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 1 Mar 2004 09:09:18 +0000 (+0000)
Subject: really checkin
X-Git-Tag: release/2.1.29~38
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=82212b68d1ee84c844ca098a2f01950d97987da9;p=lilypond.git

really checkin
---

diff --git a/ChangeLog b/ChangeLog
index ff24acfb9d..8bf4939e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
 
 2004-02-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* Documentation/user/introduction.itely (Introduction): Use @image
+	iso @html <img...>.  Add workaround for images in columns in info.
+
 	* stepmake/aclocal.m4: Store computed version in variable.
 
 	* configure.in: Export MAKEINFO_VERSION.
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 82ec806ff0..98e7d316d7 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -45,8 +45,9 @@ ifeq ($(out),www)
 #info: $(INFO_FILES)
     # Cancel the special, non-image info generation rule that skips images:
     $(outdir)/%.info: $(outdir)/%.nexi
-local-install-info: info
-	(cd $(package_infodir) && ln -s $(local_package_docdir)/html/Documentation/user/out-www/*png .)
+local-install-info: install-info info
+	-$(INSTALL) -d $(DESTDIR)$(package_infodir)
+	(cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
 local-uninstall-WWW:
 	rm -f $(package_infodir)/*.png
 else
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 2377c3327c..a3f1e4b038 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -40,28 +40,34 @@ thicker than Henle's lines.
 
 @multitable @columnfractions  .1 .3 .3 .3
 @item @tab
+@ifnotinfo
 @iftex
 @image{henle-flat-bw,4cm}
 @end iftex
-@html
-<img src=henle-flat-bw.png>
-@end html
+@ifnottex
+@image{henle-flat-bw,,,png}
+@end ifnottex
 
 @tab
 @iftex
 @image{baer-flat-bw,4cm}
 @end iftex
-@html
-<img  src=baer-flat-bw.png>
-@end html
+@ifnottex
+@image{baer-flat-bw,,,png}
+@end ifnottex
 
 @tab
 @iftex
 @image{lily-flat-bw,4cm}
 @end iftex
-@html
-<img src=lily-flat-bw.png>
-@end html
+@ifnottex
+@image{lily-flat-bw,,,png}
+@end ifnottex
+@end ifnotinfo
+@ifinfo
+@c workaround for makeinfo-4.6: line breaks and multi-column cookies
+@image{henle-flat-bw,,,png} @image{baer-flat-bw,,,png} @image{lily-flat-bw,,,png}
+@end ifinfo
 
 @item @tab
 Henle (2000)
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 37bcbf4c97..4ed2d829f9 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -6,8 +6,7 @@
 @end iftex
 
 @ignore
-@c FIXME: use `make install-info'
-Distributions will want to install lilypond.info doing:
+Distributions will want to install lilypond.info in postinstall, doing:
 
     install-info --info-dir=/usr/share/info out/lilypond.info