Mercurial > hg > xemacs-beta

changeset 2418:e19aeba465d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-12-05 22:30:39 by adrian] [PATCH] xemacs-21.5: make man/xemacs-faq.texi ready to replace <3byk8v6x.fsf@smtprelay.t-online.de>
author adrian
date Sun, 05 Dec 2004 22:30:40 +0000
parents 8b907450718f
children 9d2ccd3f9049
files man/ChangeLog man/Makefile man/xemacs-faq.texi
diffstat 3 files changed, 63 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/man/ChangeLog	Sun Dec 05 08:48:12 2004 +0000
+++ b/man/ChangeLog	Sun Dec 05 22:30:40 2004 +0000
@@ -1,3 +1,27 @@
+2004-12-05  Adrian Aichner  <adrian@xemacs.org>
+
+	* Makefile (TEXI2HTML): Changed to produce unsplit output.
+	* Makefile (TEXI2HTML_SPLIT): New.
+	* Makefile (CP): New.
+	* Makefile (PHOTODIR): New.
+	* Makefile ($(HTMLDIR)/cl.html): Use TEXI2HTML_SPLIT.
+	* Makefile ($(HTMLDIR)/custom.html): Ditto.
+	* Makefile ($(HTMLDIR)/emodules.html): Ditto.
+	* Makefile ($(HTMLDIR)/external-widget.html): Ditto.
+	* Makefile ($(HTMLDIR)/info.html): Ditto.
+	* Makefile ($(HTMLDIR)/standards.html): Ditto.
+	* Makefile ($(HTMLDIR)/term.html): Ditto.
+	* Makefile ($(HTMLDIR)/termcap.html): Ditto.
+	* Makefile ($(HTMLDIR)/texinfo.html): Ditto.
+	* Makefile ($(HTMLDIR)/widget.html): Ditto.
+	* Makefile ($(HTMLDIR)/xemacs-faq.html): Ditto.
+	Produce unsplit output for website also, copy photos to HTMLDIR.
+	* Makefile ($(HTMLDIR)/xemacs.html): Ditto.
+	* Makefile ($(HTMLDIR)/lispref.html): Ditto.
+	* Makefile ($(HTMLDIR)/internals.html): Ditto.
+	* Makefile ($(HTMLDIR)/new-users-guide.html): Ditto.
+	* xemacs-faq.texi (Q1.3.1): Fix broken image links in HTML output.
+
 2004-11-26  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* internals/internals.texi (Better Rendering Support --
--- a/man/Makefile	Sun Dec 05 08:48:12 2004 +0000
+++ b/man/Makefile	Sun Dec 05 22:30:40 2004 +0000
@@ -22,9 +22,11 @@
 SHELL    = /bin/sh
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
-TEXI2HTML = texi2html -verbose -split chapter
+TEXI2HTML = texi2html -verbose -subdir $(HTMLDIR)
+TEXI2HTML_SPLIT = $(TEXI2HTML) -split chapter
 
 RM = rm -f
+CP = cp
 
 .SUFFIXES:
 .SUFFIXES: .html .info .texi .dvi .pdf
@@ -37,6 +39,7 @@
 
 INFODIR = ../info
 HTMLDIR = ../html
+PHOTODIR = ../etc/photos
 
 info_files = \
 	$(INFODIR)/cl.info \
@@ -338,50 +341,59 @@
 ############################################################################
 
 $(HTMLDIR)/cl.html : cl.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) cl.texi
+	$(TEXI2HTML_SPLIT) cl.texi
 
 $(HTMLDIR)/custom.html : custom.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) custom.texi
+	$(TEXI2HTML_SPLIT) custom.texi
 
 $(HTMLDIR)/emodules.html : emodules.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) emodules.texi
+	$(TEXI2HTML_SPLIT) emodules.texi
 
 $(HTMLDIR)/external-widget.html : external-widget.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) external-widget.texi
+	$(TEXI2HTML_SPLIT) external-widget.texi
 
 $(HTMLDIR)/info.html : info.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) info.texi
+	$(TEXI2HTML_SPLIT) info.texi
 
 $(HTMLDIR)/standards.html : standards.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) standards.texi
+	$(TEXI2HTML_SPLIT) standards.texi
 
 $(HTMLDIR)/term.html : term.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) term.texi
+	$(TEXI2HTML_SPLIT) term.texi
 
 $(HTMLDIR)/termcap.html : termcap.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) termcap.texi
+	$(TEXI2HTML_SPLIT) termcap.texi
 
 $(HTMLDIR)/texinfo.html : texinfo.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) texinfo.texi
+	$(TEXI2HTML_SPLIT) texinfo.texi
 
 $(HTMLDIR)/widget.html : widget.texi
-	$(TEXI2HTML) -subdir $(HTMLDIR) widget.texi
+	$(TEXI2HTML_SPLIT) widget.texi
 
 $(HTMLDIR)/xemacs-faq.html : xemacs-faq.texi
-	$(TEXI2HTML) -top_file xemacs-faq_1.html -subdir $(HTMLDIR) xemacs-faq.texi
+	$(TEXI2HTML) xemacs-faq.texi
+	$(TEXI2HTML_SPLIT) -top_file xemacs-faq_1.html xemacs-faq.texi
+	$(CP) $(PHOTODIR)/ben.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/cthomp.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/hniksic.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/jwz.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/martin.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/mly.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/piper.png $(HTMLDIR)
+	$(CP) $(PHOTODIR)/slb.png $(HTMLDIR)
 
 # Manuals with their own subdirectory
 $(HTMLDIR)/xemacs.html : $(xemacs-srcs)
-	$(TEXI2HTML) -subdir $(HTMLDIR) xemacs/xemacs.texi
+	$(TEXI2HTML_SPLIT) xemacs/xemacs.texi
 
 $(HTMLDIR)/lispref.html : $(lispref-srcs)
-	$(TEXI2HTML) -subdir $(HTMLDIR) lispref/lispref.texi
+	$(TEXI2HTML_SPLIT) lispref/lispref.texi
 
 $(HTMLDIR)/internals.html : $(internals-srcs)
-	$(TEXI2HTML) -subdir $(HTMLDIR) internals/internals.texi
+	$(TEXI2HTML_SPLIT) internals/internals.texi
 
 $(HTMLDIR)/new-users-guide.html : $(new-users-guide-srcs)
-	$(TEXI2HTML) -subdir $(HTMLDIR) new-users-guide/new-users-guide.texi
+	$(TEXI2HTML_SPLIT) new-users-guide/new-users-guide.texi
 
 xemacs : $(HTMLDIR)/xemacs.html
 lispref : $(HTMLDIR)/lispref.html
--- a/man/xemacs-faq.texi	Sun Dec 05 08:48:12 2004 +0000
+++ b/man/xemacs-faq.texi	Sun Dec 05 22:30:40 2004 +0000
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2004/12/05 08:48:12 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2004/12/05 22:30:40 $
 @sp 1
 @author Ben Wing <ben@@xemacs.org>
 @author Tony Rossini <rossini@@u.washington.edu>
@@ -1545,42 +1545,45 @@
 @itemize @bullet
 @item @email{andy@@xemacs.org, Andy Piper}
 @html
-<br><img src="wing.gif" alt="Portrait of Ben Wing"><br>
+<br><img src="piper.png" alt="Portrait of Andy Piper"><br>
 @end html
 
 @item @email{ben@@xemacs.org, Ben Wing}
 @html
-<br><img src="wing.gif" alt="Portrait of Ben Wing"><br>
+<br><img src="ben.png" alt="Portrait of Ben Wing"><br>
 @end html
 
 @item @email{cthomp@@xemacs.org, Chuck Thompson}
 @html
-<br><img src="cthomp.jpeg" alt="Portrait of Chuck Thompson"><br>
+<br><img src="cthomp.png" alt="Portrait of Chuck Thompson"><br>
 @end html
 
 @item @email{hniksic@@xemacs.org, Hrvoje Niksic}
 
 @html
-<br><img src="hniksic.jpeg" alt="Portrait of Hrvoje Niksic"><br>
+<br><img src="hniksic.png" alt="Portrait of Hrvoje Niksic"><br>
 @end html
 
 @item @email{jwz@@jwz.org, Jamie Zawinski}
 @html
-<br><img src="jwz.gif" alt="Portrait of Jamie Zawinski"><br>
+<br><img src="jwz.png" alt="Portrait of Jamie Zawinski"><br>
 @end html
 
 @item @email{martin@@xemacs.org, Martin Buchholz}
 @html
-<br><img src="mrb.jpeg" alt="Portrait of Martin Buchholz"><br>
+<br><img src="martin.png" alt="Portrait of Martin Buchholz"><br>
 @end html
 
 @item @email{mly@@adoc.xerox.com, Richard Mlynarik}
+@html
+<br><img src="mly.png" alt="Portrait of Richard Mlynarik"><br>
+@end html
 
 @item @email{stephen@@xemacs.org, Stephen Turnbull}
 
 @item @email{steve@@xemacs.org, Steve Baur}
 @html
-<br><img src="steve.gif" alt="Portrait of Steve Baur"><br>
+<br><img src="slb.png" alt="Portrait of Steve Baur"><br>
 @end html
 @end itemize