Synch to Gnus 200306201049.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 782c5fd..a3033a9 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-20  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi: Add @command.
+
+       * texi2latex.el (latexi-translate-file): Add @command and @:.
+
+       * gnus.texi (Face): Use @uref.
+
 2003-06-19  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.texi (Sieve Commands, Agent Basics, SpamOracle): @xref

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 850cf53..fe60d44 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -53,6 +53,7 @@
 
 \newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}}
 \newcommand{\gnuscode}[1]{\gnustt{#1}}
+\newcommand{\gnuscommand}[1]{\gnustt{#1}}
 \newcommand{\gnusenv}[1]{\gnustt{#1}}
 \newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''}
 \newcommand{\gnuslisp}[1]{\gnustt{#1}}
@@ -20831,38 +20832,37 @@ gnus \e$B$O!"30$K=P$9%a%C%;!<%8$K\e(B X-Face \e$B%X%C%@!<$r4JC1$KA^F~$9$k$?$a$N!"JX
                                  "~/My-face.gif"))))))
 @end lisp
 
-@c TRANSLATEME
 @node Face
 @subsection Face
 @cindex face
 
 @c #### FIXME: faces and x-faces'implementations should really be harmonized.
 
-@code{Face} headers are essentially a funkier version of @code{X-Face}
-ones. They describe a 48x48 pixel colored image that's supposed to
-represent the author of the message.
+@code{Face} \e$B%X%C%@!<$O!"K\<AE*$K$h$j%U%!%s%-!<$J\e(B @code{X-Face} \e$B$NJQ7A$G\e(B
+\e$B$9!#$=$l$i$O!"%a%C%;!<%8$r=q$$$??M$r>]D'$7$F$$$k$3$H$,4|BT$5$l$k!"\e(B
+48\e$B!_\e(B48 \e$B2hAG$N%+%i!<2hA|$rIA$-$^$9!#\e(B
 
 @cindex face
 @findex gnus-article-display-face
-The contents of a @code{Face} header must be a base64 encoded PNG image.
-See @url{http://quimby.gnus.org/circus/face/} for the precise
-specifications.
+@code{Face} \e$B%X%C%@!<$NFbMF$O!"\e(Bbase64 \e$B$G%(%s%3!<%I$5$l$?\e(B PNG \e$B$N2hA|$G$J$1\e(B
+\e$B$l$P$J$j$^$;$s!#@53N$J;EMM$K$D$$$F!"\e(B
+@uref{http://quimby.gnus.org/circus/face/} \e$B$r;2>H$7$F2<$5$$!#\e(B
 
-Gnus provides a few convenience functions and variables to allow
-easier insertion of Face headers in outgoing messages.
+\e$BAw?.$9$k%a%C%;!<%8$K4JC1$K\e(B Face \e$B%X%C%@!<$rA^F~$G$-$k$h$&$K$9$k$?$a$K!"\e(B
+Gnus \e$B$O\e(B 2\e$B!A\e(B3 \e$B$N4X?t$HJQ?t$rDs6!$7$^$9!#\e(B
 
 @findex gnus-convert-png-to-face
-@code{gnus-convert-png-to-face} takes a 48x48 PNG image, no longer than
-726 bytes long, and converts it to a face.
+@code{gnus-convert-png-to-face} \e$B$O\e(B 726-byte \e$B0J2<$N\e(B 48\e$B!_\e(B48 \e$B$N\e(B PNG \e$B$N2hA|\e(B
+\e$B$rFI$_9~$s$G!"$=$l$r\e(B Face \e$B$KJQ49$7$^$9!#\e(B
 
 @findex gnus-face-from-file
 @vindex gnus-convert-image-to-face-command
-@code{gnus-face-from-file} takes a JPEG file as the parameter, and then
-converts the file to Face format by using the
-@code{gnus-convert-image-to-face-command} shell command.
+@code{gnus-face-from-file} \e$B$O\e(B JPEG \e$B$N%U%!%$%kL>$r%Q%i%a!<%?$H$7$F<u$1<h\e(B
+\e$B$j!"\e(Bshell \e$B%3%^%s%I\e(B @code{gnus-convert-image-to-face-command} \e$B$r;H$C$F$=\e(B
+\e$B$N%U%!%$%k$r\e(B Face \e$B%U%)!<%^%C%H$KJQ49$7$^$9!#\e(B
 
-Here's how you would typically use this function. Put something like the
-following in your @file{~/.gnus.el} file:
+\e$B$3$N4X?t$NBeI=E*$J;H$$J}$r5s$2$F$*$-$^$7$g$&!#0J2<$N$h$&$J$b$N\e(B
+\e$B$r\e(B @file{~/.gnus.el} \e$B%U%!%$%k$KF~$l$F2<$5$$\e(B:
 
 @lisp
 (setq message-required-news-headers

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 1e60ae9..7105cd3 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -53,6 +53,7 @@
 
 \newcommand{\gnustt}[1]{{\gnusselectttfont{}#1}}
 \newcommand{\gnuscode}[1]{\gnustt{#1}}
+\newcommand{\gnuscommand}[1]{\gnustt{#1}}
 \newcommand{\gnusenv}[1]{\gnustt{#1}}
 \newcommand{\gnussamp}[1]{``{\fontencoding{OT1}\gnusselectttfont{}#1}''}
 \newcommand{\gnuslisp}[1]{\gnustt{#1}}
@@ -21705,7 +21706,7 @@ represent the author of the message.
 @cindex face
 @findex gnus-article-display-face
 The contents of a @code{Face} header must be a base64 encoded PNG image.
-See @url{http://quimby.gnus.org/circus/face/} for the precise
+See @uref{http://quimby.gnus.org/circus/face/} for the precise
 specifications.
 
 Gnus provides a few convenience functions and variables to allow

diff --git a/texi/texi2latex.el b/texi/texi2latex.el
index 237e8ad..35f7a4f 100644 (file)
--- a/texi/texi2latex.el
+++ b/texi/texi2latex.el
@@ -143,6 +143,8 @@
                (insert "\\\\"))
               ((equal command "sp")
                (replace-match "" t t))
+              ((equal command ":")
+               (replace-match "" t t))
               ((member command '("deffn" "defvar" "defun"))
                (replace-match "" t t))
               ((equal command "node")
@@ -275,7 +277,7 @@
            (latexi-exchange-command (concat "gnus" command) arg))
           ((member command '("sc" "file" "dfn" "emph" "kbd" "key" "uref"
                              "code" "samp" "var" "strong" "i"
-                             "result" "email" "env" "r"))
+                             "result" "email" "env" "r" "command"))
            (goto-char (match-beginning 0))
            (delete-char 1)
            (insert "\\gnus"))