Synch to Wanderlust 200404120422.

diff --git a/ChangeLog b/ChangeLog
index 461c23e..47ce3bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * texi/ptexinfmt.el: Support @indicateurl, @LaTeX.
+       @url is now a synonym for @uref.
+
 2004-04-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-util.el (gnus-set-work-buffer): Set buffer multibyte.

diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el
index a36908b..bdb1d89 100644 (file)
--- a/texi/ptexinfmt.el
+++ b/texi/ptexinfmt.el
@@ -306,11 +306,13 @@ DOCSTRING will be printed if ASSERTION is nil and
 
 \f
 ;;; Marking
-;; @url, @env, @command
-(put 'url 'texinfo-format 'texinfo-format-code)
+;; @indicateurl, @url, @env, @command, 
 (put 'env 'texinfo-format 'texinfo-format-code)
 (put 'command 'texinfo-format 'texinfo-format-code)
 
+(put 'indicateurl 'texinfo-format 'texinfo-format-code)
+(put 'url 'texinfo-format 'texinfo-format-uref)        ; Texinfo 4.7
+
 ;; @acronym
 (put 'acronym 'texinfo-format 'texinfo-format-var)
 
@@ -372,13 +374,18 @@ For example, @verb\{|@|\} results in @ and
   (delete-char 1))
 
 \f
-;;; Accents and Special characters
-;; @registeredsymbol{} ==>     (R)
-(put 'pounds 'texinfo-format 'texinfo-format-registeredsymbol)
+;;; @LaTeX, @registeredsymbol{}
+(put 'LaTeX 'texinfo-format 'texinfo-format-LaTeX)
+(ptexinfmt-defun-if-void texinfo-format-LaTeX ()
+  (texinfo-parse-arg-discard)
+  (insert "LaTeX"))
+
+(put 'registeredsymbol 'texinfo-format 'texinfo-format-registeredsymbol)
 (ptexinfmt-defun-if-void texinfo-format-registeredsymbol ()
   (texinfo-parse-arg-discard)
   (insert "(R)"))
 
+;;; Accents and Special characters
 ;; @pounds{}   ==>     #       Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()