From 59786d6589b4e0f20bc1eaa35dee457ce1751a34 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 4 Mar 2004 04:11:00 +0000
Subject: [PATCH] Synch to No Gnus 200403040032.

---
 texi/ChangeLog       |    8 ++++++++
 texi/Makefile.in     |   12 ++++++------
 texi/emacs-mime.texi |    6 +++---
 texi/gnus-ja.texi    |    7 ++++---
 texi/gnus.texi       |   14 +++++++-------
 texi/texi2latex.el   |    5 +++++
 6 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index d9b3ba3..0ecbf8b 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,5 +1,13 @@
 2004-03-04  Jesper Harder  <harder@ifa.au.dk>
 
+	* texi2latex.el (latexi-translate-file): Support accents.
+
+	* gnus.texi: Don't use 8bit chars (except ,A,(B).
+
+	* emacs-mime.texi: do.
+
+	* Makefile.in (.texi, makeinfo): Use --enable-encoding.
+
 	* gnus.texi: Move @documentencoding back, and change to latin-1.
 
 	* emacs-mime.texi: do.
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 039e182..6174220 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -56,8 +56,8 @@ most: texi2latex.elc latex latexps
 	  rm -f $@; \
 	  $(EMACSINFO) $< t; \
 	else \
-	  echo "$(MAKEINFO) -I $(srcdir) -o $@ $<"; \
-	  $(MAKEINFO) -I $(srcdir) -o $@ $<; \
+	  echo "$(MAKEINFO) -I $(srcdir) --enable-encoding -o $@ $<"; \
+	  $(MAKEINFO) -I $(srcdir) --enable-encoding -o $@ $<; \
 	fi
 
 .SUFFIXES: .texi .dvi .ps .pdf .latexi .dvi-x .pdf-x
@@ -70,8 +70,8 @@ most: texi2latex.elc latex latexps
 	  rm -f $@; \
 	  $(EMACSINFO) $<; \
 	else \
-	  echo "$(MAKEINFO) -I $(srcdir) -o $* $<"; \
-	  $(MAKEINFO) -I $(srcdir) -o $* $<; \
+	  echo "$(MAKEINFO) -I $(srcdir) --enable-encoding -o $* $<"; \
+	  $(MAKEINFO) -I $(srcdir) --enable-encoding -o $* $<; \
 	fi
 
 # Files included in gnus.texi
@@ -136,8 +136,8 @@ clean:
 	thumbdta.tex xface.tex *.tpt gnus-manual-*.pdf gnus-manual-*.ps.gz
 
 makeinfo:
-	makeinfo -o gnus gnus.texi
-	makeinfo -o message message.texi
+	makeinfo --enable-encoding -o gnus gnus.texi
+	makeinfo --enable-encoding -o message message.texi
 
 texi2latex.elc: texi2latex.el
 	srcdir=$(srcdir)/../lisp $(EMACSCOMP) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index e536993..69fec6c 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -1140,7 +1140,7 @@ Return the value of the field under point.
 @item mail-encode-encoded-word-region
 @findex mail-encode-encoded-word-region
 Encode the non-@acronym{ASCII} words in the region.  For instance,
-@samp{Naïve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}.
+@samp{Na@"{@dotless{i}}ve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}.
 
 @item mail-encode-encoded-word-buffer
 @findex mail-encode-encoded-word-buffer
@@ -1153,7 +1153,7 @@ Encode the words that need encoding in a string, and return the result.
 
 @example
 (mail-encode-encoded-word-string
- "This is naïve, baby")
+ "This is na@"{@dotless{i}}ve, baby")
 @result{} "This is =?iso-8859-1?q?na=EFve,?= baby"
 @end example
 
@@ -1168,7 +1168,7 @@ Decode the encoded words in the string and return the result.
 @example
 (mail-decode-encoded-word-string
  "This is =?iso-8859-1?q?na=EFve,?= baby")
-@result{} "This is naïve, baby"
+@result{} "This is na@"{@dotless{i}}ve, baby"
 @end example
 
 @end table
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7929da4..f215aca 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -14759,9 +14759,10 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B
 $B$b$78!:w%(%s%8%s$N=PNO7A<0$,JQ99$5$l$k$H!"(B@code{nnweb} $B$O$=$l$r$&$^$/2r(B
 $B<a$G$-$:!"=hM}$O<:GT$9$k$G$7$g$&!#$b$7%&%'%VDs6!<TC#$,$=$s$J$3$H$r$7$?$i!"(B
 $BH`$i$r7c$7$/@U$a$k$Y$-$G$7$g$&(B --- $B$=$l$O9-9p$G6b$r2T$0$N$,H`$i(B
-$B$N(B @emph{$BB8:_M}M3(B} $B$G$"$j!"<R2q$K%5!<%S%9$rDs6!$9$k$3$H$G$O$J$$$+$i$G$9!#(B
-@code{nnweb} $B$OA4$F$N5-;v$+$i9-9p$r@v$$N.$7$F$7$^$&$N$G!"Ds6!<T$?$A$,%`(B
-$B%+$D$$$F$$$k$H;W$o$l$k$+$bCN$l$^$;$s!#$^$"8+$F$F$/$@$5$$!#(B
+$B$N(B @emph{$B%l!<%>%s!&%G!<%H%k(B} ($BB8:_M}M3(B) $B$G$"$j!"<R2q$K%5!<%S%9$rDs6!$9$k(B
+$B$3$H$G$O$J$$$+$i$G$9!#(B@code{nnweb} $B$OA4$F$N5-;v$+$i9-9p$r@v$$N.$7$F$7$^(B
+$B$&$N$G!"Ds6!<T$?$A$,%`%+$D$$$F$$$k$H;W$o$l$k$+$bCN$l$^$;$s!#$^$"8+$F$F$/(B
+$B$@$5$$!#(B
 
 @code{nnweb} $B$r;H$&$K$O!"(B@code{url} $B$H(B @code{w3} $B%Q%C%1!<%8$r%$%s%9%H!<(B
 $B%k$7$F$*$+$J$/$F$J$J$j$^$;$s!#(B
diff --git a/texi/gnus.texi b/texi/gnus.texi
index cebf1e0..ae3c8c8 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -8553,9 +8553,9 @@ CRs into LF (this takes care of Mac line endings)
 Treat quoted-printable (@code{gnus-article-de-quoted-unreadable}).
 Quoted-Printable is one common @acronym{MIME} encoding employed when
 sending non-@acronym{ASCII} (i.e., 8-bit) articles.  It typically
-makes strings like @samp{déjà vu} look like @samp{d=E9j=E0 vu}, which
-doesn't look very readable to me.  Note that this is usually done
-automatically by Gnus if the message in question has a
+makes strings like @samp{d@'ej@`a vu} look like @samp{d=E9j=E0 vu},
+which doesn't look very readable to me.  Note that this is usually
+done automatically by Gnus if the message in question has a
 @code{Content-Transfer-Encoding} header that says that this encoding
 has been done.  If a prefix is given, a charset will be asked for.
 
@@ -15576,7 +15576,7 @@ group as read.
 
 If the search engine changes its output substantially, @code{nnweb}
 won't be able to parse it and will fail.  One could hardly fault the Web
-providers if they were to do this---their @emph{raison d'être} is to
+providers if they were to do this---their @emph{raison d'@^etre} is to
 make money off of advertisements, not to provide services to the
 community.  Since @code{nnweb} washes the ads off all the articles, one
 might think that the providers might be somewhat miffed.  We'll see.
@@ -24584,7 +24584,7 @@ David Moore---rewrite of @file{nnvirtual.el} and many other things.
 Kevin Davidson---came up with the name @dfn{ding}, so blame him.
 
 @item
-François Pinard---many, many interesting and thorough bug reports, as
+Fran@,{c}ois Pinard---many, many interesting and thorough bug reports, as
 well as autoconf support.
 
 @end itemize
@@ -24601,7 +24601,7 @@ Kevin Greiner,
 Jesper Harder,
 Paul Jarc,
 Simon Josefsson,
-David Kågedal,
+David K@aa{}gedal,
 Richard Pieri,
 Fabrice Popineau,
 Daniel Quinlan,
@@ -24691,7 +24691,7 @@ Gunnar Horrigmo,
 Richard Hoskins,
 Brad Howes,
 Miguel de Icaza,
-François Felix Ingrand,
+Fran@,{c}ois Felix Ingrand,
 Tatsuya Ichikawa, @c Ichikawa
 Ishikawa Ichiro, @c Ishikawa
 Lee Iverson,
diff --git a/texi/texi2latex.el b/texi/texi2latex.el
index a96cf93..82cabde 100644
--- a/texi/texi2latex.el
+++ b/texi/texi2latex.el
@@ -65,6 +65,11 @@
     (insert-buffer-substring cur)
     (goto-char (point-min))
     (latexi-strip-line)
+    (latexi-translate-string "@'e" "\\'{e}")
+    (latexi-translate-string "@`a" "\\`{a}")
+    (latexi-translate-string "@,{c}" "\\c{c}")
+    (latexi-translate-string "@aa{}" "{\\aa}")
+    (latexi-translate-string "@\"{@dotless{i}}" "ï")
     (latexi-translate-string "%@{" "\\gnuspercent{}\\gnusbraceleft{}")
     (latexi-translate-string "%@}" "\\gnuspercent{}\\gnusbraceright{}")
     (latexi-translate-string "%1@{" "\\gnuspercent{}1\\gnusbraceright{}")
-- 
1.7.10.4