6:19 p.m.
Hi All!
I have long wanted to resolve the duplication of FAQ between xemacsweb
and xemacs modules.
Now I got a plan.
Put symlinks in place under xemacsweb/FAQ for backward compatibility.
Maintain the FAQ in the xemacs module only from now on.
Here is the xemacs part of that patch to make this possible.
I intend to commit this shortly.
There shouldn't be much controversy about this, since it fixes
breakage of links image names for HTML output, and nothing else in the
xemacs-faq.texi.
The Makefile change is just an upgrade webmasters or other HTML
generators would care about.
Best regards,
Adrian
xemacs-21.5 ChangeLog patch:
Diff command: cvs -q diff -U 0
Files affected: man/ChangeLog
Index: man/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.271
diff -u -U0 -r1.271 ChangeLog
--- man/ChangeLog 26 Nov 2004 07:37:48 -0000 1.271
+++ man/ChangeLog 5 Dec 2004 18:17:06 -0000
＠＠ -0,0 +1,24 ＠＠
+2004-12-05 Adrian Aichner <adrian(a)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.
+
xemacs-21.5 source patch:
Diff command: cvs -f -z3 -q diff -u -w -N
Files affected: man/xemacs-faq.texi man/Makefile
Index: man/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/Makefile,v
retrieving revision 1.31
diff -u -w -r1.31 Makefile
--- man/Makefile 10 Oct 2003 12:39:27 -0000 1.31
+++ man/Makefile 5 Dec 2004 18:07:17 -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
Index: man/xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.79
diff -u -w -r1.79 xemacs-faq.texi
--- man/xemacs-faq.texi 5 Dec 2004 08:48:12 -0000 1.79
+++ man/xemacs-faq.texi 5 Dec 2004 18:07:21 -0000
＠＠ -1545,42 +1545,45 ＠＠
＠itemize ＠bullet
＠item ＠email{andy＠(a)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＠(a)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＠(a)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＠(a)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＠(a)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＠(a)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＠(a)adoc.xerox.com, Richard Mlynarik}
+＠html
+<br><img src="mly.png" alt="Portrait of Richard
Mlynarik"><br>
+＠end html
＠item ＠email{stephen＠(a)xemacs.org, Stephen Turnbull}
＠item ＠email{steve＠(a)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
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/