2001-09-27 18:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* Makefile.in: Illustrated manual.
	* gnus.texi: Put message.texi and emacs-mime.texi in the
	illustrated manual.
	* texi2latex.el: Ditto.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 61bf09f..a1b321b 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-27 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * Makefile.in: Illustrated manual.
+       * gnus.texi: Put message.texi and emacs-mime.texi in the
+       illustrated manual.
+       * texi2latex.el: Ditto.
+
 2001-09-27 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.texi: Remove the extra white-space.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index acbb1b3..5ac5ade 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -74,39 +74,39 @@ texi2latex.elc: texi2latex.el
 
 latex: gnus.latexi gnus-faq.latexi
 
-gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc gnusconfig.tex
+gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi texi2latex.elc
        srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
 
 .latexi.dvi-x:
+       make gnusconfig.tex
        make tmps
        rm -f gnus.aux
-       egrep -v "label.*Index|chapter.*Index" $< > gnus.tmplatexi1
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi1
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) $<
        $(srcdir)/splitindex
        makeindex -o gnus.kind gnus.kidx
        makeindex -o gnus.cind gnus.cidx
        makeindex -o gnus.gind gnus.gidx
        sed 's/\\char 5E\\relax {}/\\symbol{"5E}/' < gnus.kind > gnus.tmpkind
        mv gnus.tmpkind gnus.kind
-       egrep -v "end\{document\}" gnus.tmplatexi1 > gnus.tmplatexi
+       egrep -v "end\{document\}" $< > gnus.tmplatexi
        cat $(srcdir)/postamble.tex >> gnus.tmplatexi
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
        mv gnus.dvi $@
 
 .latexi.pdf-x:
+       make gnusconfig.tex
        make tmps
        cd ps; make pdf
        rm -f gnus.aux
-       egrep -v "label.*Index|chapter.*Index" $< > gnus.tmplatexi1
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi1
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) $<
        $(srcdir)/splitindex
        makeindex -o gnus.kind gnus.kidx
        makeindex -o gnus.cind gnus.cidx
        makeindex -o gnus.gind gnus.gidx
        sed 's/\\char 5E\\relax {}/\\symbol{"5E}/' < gnus.kind > gnus.tmpkind
        mv gnus.tmpkind gnus.kind
-       egrep -v "end\{document\}" gnus.tmplatexi1 > gnus.tmplatexi
+       egrep -v "end\{document\}" $< > gnus.tmplatexi
        cat $(srcdir)/postamble.tex >> gnus.tmplatexi
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
        TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5db978a..abc5808 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -17925,6 +17925,14 @@ the new score, which should be an integer.
 Gnus will try to decay scores once a day.  If you haven't run Gnus for
 four days, Gnus will decay the scores four times, for instance.
 
+@iftex
+@iflatex
+@chapter Message
+@include message.texi
+@chapter Emacs MIME
+@include emacs-mime.texi
+@end iflatex
+@end iftex
 
 @node Various
 @chapter Various

diff --git a/texi/message.texi b/texi/message.texi
index 27bbd51..be5d061 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1404,7 +1404,7 @@ the mailed copy.  If the string contains the format spec @samp{%s}, the
 newsgroups the article has been posted to will be inserted there.  If
 this variable is @code{nil}, no such courtesy message will be added.
 The default value is @samp{"The following message is a courtesy copy of
-an article\nthat has been posted to %s as well.\n\n"}.
+an article\\nthat has been posted to %s as well.\\n\\n"}.
 
 @end table
 

diff --git a/texi/texi2latex.el b/texi/texi2latex.el
index 9aae918..bab1b6b 100644 (file)
--- a/texi/texi2latex.el
+++ b/texi/texi2latex.el
@@ -35,9 +35,11 @@
   "Translate."
   (interactive)
   (latexi-translate-file "gnus")
-  (latexi-translate-file "gnus-faq"))
+  (latexi-translate-file "gnus-faq")
+  (latexi-translate-file "message" t)
+  (latexi-translate-file "emacs-mime" t))
 
-(defun latexi-translate-file (file)
+(defun latexi-translate-file (file &optional as-a-chapter)
   "Translate file a LaTeX file."
   (let ((item-string "")
        (item-stack nil)
@@ -102,15 +104,26 @@
                                  "ifnottex" "direntry"))
                (latexi-discard-until command))
               ((member command '("subsection" "subsubsection"))
-               (latexi-switch-line command arg))
+               (if as-a-chapter
+                   (latexi-switch-line (format "sub%s" command) arg)
+                 (latexi-switch-line command arg)))
               ((member command '("chapter"))
-               (latexi-switch-line 
-                (format 
-                 "gnus%s{\\epsfig{figure=ps/new-herd-%d,scale=.5}}"
-                  command (incf chapter))
-                arg))
+               (if (string-match "Index" arg)
+                   (latexi-strip-line)
+                 (if as-a-chapter
+                     (latexi-switch-line "gnussection" arg)
+                   (latexi-switch-line 
+                    (format 
+                     "gnus%s{%s}" command
+                     (if (> (incf chapter) 10)
+                         ""
+                       (format "\\epsfig{figure=ps/new-herd-%d,scale=.5}"
+                               chapter)))
+                    arg))))
               ((member command '("section"))
-               (latexi-switch-line (format "gnus%s" command) arg))
+               (if as-a-chapter
+                   (latexi-switch-line "subsection" arg)
+                 (latexi-switch-line (format "gnus%s" command) arg)))
               ((member command '("cindex" "findex" "kindex" "vindex"))
                (latexi-index-command command arg))
               ((member command '("*"))
@@ -120,7 +133,8 @@
                (replace-match "" t t))
               ((equal command "node")
                (latexi-strip-line)
-               (insert (format "\\label{%s}\n" arg)))
+               (unless (string-match "Index" arg)
+                 (insert (format "\\label{%s}\n" arg))))
               ((equal command "contents")
                (latexi-strip-line)
                ;;(insert (format "\\tableofcontents\n" arg))
@@ -196,7 +210,9 @@
                (insert "duppat{}"))
               ((equal command "settitle")
                (latexi-strip-line)
-               (insert (format "\\newcommand{\\gnustitlename}{%s}\n" arg)))
+               (if (not as-a-chapter)
+                   (insert 
+                    (format "\\newcommand{\\gnustitlename}{%s}\n" arg))))
               ((equal command "title")
                (latexi-strip-line)
                (insert (format "\\gnustitlename{%s}\n" arg)))
@@ -213,7 +229,9 @@
                (delete-char 1))
               ((equal command "include")
                (latexi-strip-line)
-               (insert "\\input{gnus-faq.latexi}\n"))
+               (string-match "\\.texi" arg)
+               (insert (format "\\input{%s.latexi}\n" 
+                               (substring arg 0 (match-beginning 0)))))
               ((equal command "noindent")
                (latexi-strip-line)
                (insert "\\noindent\n"))