2000-12-29 10:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* texi2latex.el (latexi-translate-file): Support srcdir.
	(latexi-translate-file): Understand ifnottex, dircategory, and
	direntry. Set coding-system-for-write to iso-8859-1.

	* Makefile.in: Fix for srcdir.

	* gnus.texi (NoCeM): Use file instead of uref.
	(Mail Source Specifiers): Use subsubsection instead of
	subsubheading.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 4a9efdd..e3e5100 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,15 @@
+2000-12-29 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * texi2latex.el (latexi-translate-file): Support srcdir.
+       (latexi-translate-file): Understand ifnottex, dircategory, and
+       direntry. Set coding-system-for-write to iso-8859-1.
+
+       * Makefile.in: Fix for srcdir.
+
+       * gnus.texi (NoCeM): Use file instead of uref.
+       (Mail Source Specifiers): Use subsubsection instead of
+       subsubheading.
+
 2000-12-29 01:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.texi (Top): Set version to Oort Gnus v0.01.

diff --git a/texi/Makefile.in b/texi/Makefile.in
index ffb30c9..5e8f6d4 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -41,23 +41,23 @@ pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
 
 .texi.dvi :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
-       $(TEXI2DVI) gnustmp.texi
+       $(TEXI2DVI) -I $(srcdir) gnustmp.texi
        cp gnustmp.dvi $*.dvi
        rm gnustmp.*
 
 .texi.pdf :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
-       $(TEXI2PDF) gnustmp.texi
+       $(TEXI2PDF) -I $(srcdir) gnustmp.texi
        cp gnustmp.pdf $*.pdf
        rm gnustmp.*
 
 refcard.dvi: refcard.tex gnuslogo.refcard gnusref.tex
-       $(LATEX) refcard.tex
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex
 
 
 refcard.pdf: refcard.tex gnuslogo.refcard gnusref.tex
-       epstopdf gnuslogo.refcard --outfile=gnuslogo.refcard.pdf
-       $(PDFLATEX) refcard.tex
+       epstopdf $(srcdir)/gnuslogo.refcard --outfile=gnuslogo.refcard.pdf
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) refcard.tex
 
 clean:
        rm -f gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
@@ -71,16 +71,16 @@ makeinfo:
        makeinfo -o message message.texi
 
 texi2latex.elc: texi2latex.el
-       $(EMACSINFO) -batch -l bytecomp --eval '(byte-compile-file "texi2latex.el")'
+       srcdir=$(srcdir)/../lisp $(EMACSINFO) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
 
-latex: gnus.texi texi2latex.elc
-       $(EMACSINFO) -batch -q -no-site-file gnus.texi -l ./texi2latex.elc -f latexi-translate
+latex gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc
+       srcdir=$(srcdir) $(EMACSINFO) -l ./texi2latex.elc -f latexi-translate
 
-latexps:
+latexps: gnus.latexi
        make texi2latex.elc
        rm -f gnus.aux
        egrep -v "label.*Index|chapter.*Index" gnus.latexi > gnus.tmplatexi1
-       $(LATEX) gnus.tmplatexi1
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi1
        ./splitindex
        makeindex -o gnus.kind gnus.kidx
        makeindex -o gnus.cind gnus.cidx

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 25b3d4d..b368081 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11542,7 +11542,7 @@ useful when you use local mail and news.
 @end table
 @end table
 
-@subsubheading Function Interface
+@subsubsection Function Interface
 
 Some of the above keywords specify a Lisp function to be executed.
 For each keyword @code{:foo}, the Lisp variable @code{foo} is bound to
@@ -17979,7 +17979,7 @@ people you want to listen to.  The default is @code{("Automoose-1"
 "hweede@@snafu.de")}; fine, upstanding citizens all of them.
 
 Known despammers that you can put in this list are listed at
-@uref{http://www.xs4all.nl/~rosalind/nocemreg/nocemreg.html}.
+@file{http://www.xs4all.nl/~rosalind/nocemreg/nocemreg.html}.
 
 You do not have to heed NoCeM messages from all these people---just the
 ones you want to listen to.  You also don't have to accept all NoCeM

diff --git a/texi/texi2latex.el b/texi/texi2latex.el
index 7a2407d..d7436fa 100644 (file)
--- a/texi/texi2latex.el
+++ b/texi/texi2latex.el
@@ -48,7 +48,8 @@
         (concat 
            "@\\([^{} \t\n]+\\)"
            "\\(\\( +\\(.*$\\)\\|[ \t]*$\\)\\|{\\([^}]*\\)}\\)"))
-       (cur (find-file-noselect (concat file ".texi")))
+       (cur (find-file-noselect (concat (or (getenv "srcdir") ".") 
+                                        "/" file ".texi")))
        (times 3)
        (chapter 0)
        command arg)
@@ -88,9 +89,11 @@
                                  "synindex" "setchapternewpage"
                                  "summarycontents" "bye"
                                  "top" "iftex" "cartouche" 
-                                 "iflatex" "finalout" "vskip"))
+                                 "iflatex" "finalout" "vskip"
+                                 "dircategory"))
                (latexi-strip-line))
-              ((member command '("menu" "tex" "ifinfo" "ignore"))
+              ((member command '("menu" "tex" "ifinfo" "ignore" 
+                                 "ifnottex" "direntry"))
                (latexi-discard-until command))
               ((member command '("subsection" "subsubsection"))
                (latexi-switch-line command arg))
@@ -224,7 +227,7 @@
            (goto-char (match-beginning 0))
            (delete-char 1)
            (insert "\\gnus"))
-          ((member command '("copyright"))
+          ((member command '("copyright" "footnote"))
            (goto-char (match-beginning 0))
            (delete-char 1)
            (insert "\\"))
@@ -271,7 +274,8 @@
       (goto-char (match-beginning 0))
       (delete-char 1))
     (latexi-contributors)
-    (write-region (point-min) (point-max) (concat file ".latexi"))))
+    (let ((coding-system-for-write 'iso-8859-1))
+      (write-region (point-min) (point-max) (concat file ".latexi")))))
 
 (defun latexi-translate-string (in out)
   (let (yes)
@@ -315,4 +319,4 @@
                "\\\\\n"))
       (insert "\\end{tabular}\n")
       (widen))))
-       
\ No newline at end of file
+