;; Synch it to Wanderlust.

Support @docbook, @ifdocbook, @ifnotdocbook, and @registeredsymbol.

diff --git a/ChangeLog b/ChangeLog
index 1edb5af..8746162 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * texi/ptexinfmt.el: Support @docbook, @ifdocbook, @ifnotdocbook,
+       and @registeredsymbol.
+

 2004-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-ofsetup.el (gnus-setup-for-offline): Fix misplaced `)'.
 2004-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-ofsetup.el (gnus-setup-for-offline): Fix misplaced `)'.

diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el
index 69bd366..a36908b 100644 (file)
--- a/texi/ptexinfmt.el
+++ b/texi/ptexinfmt.el
@@ -258,6 +258,9 @@ DOCSTRING will be printed if ASSERTION is nil and
 (put 'ifnotplaintext 'texinfo-format 'texinfo-discard-line)
 (put 'ifnotplaintext 'texinfo-end 'texinfo-discard-command)
 
 (put 'ifnotplaintext 'texinfo-format 'texinfo-discard-line)
 (put 'ifnotplaintext 'texinfo-end 'texinfo-discard-command)
 

+;; @ifnotdocbook ... @end ifnotdocbook (makeinfo 4.7 or later)
+(put 'ifnotdocbook 'texinfo-format 'texinfo-discard-line)
+(put 'ifnotdocbook 'texinfo-end 'texinfo-discard-command)

 
 ;; @ifnotinfo ... @end ifnotinfo (makeinfo 3.11 or later)
 (put 'ifnotinfo 'texinfo-format 'texinfo-format-ifnotinfo)
 
 ;; @ifnotinfo ... @end ifnotinfo (makeinfo 3.11 or later)
 (put 'ifnotinfo 'texinfo-format 'texinfo-format-ifnotinfo)

@@ -273,6 +276,13 @@ DOCSTRING will be printed if ASSERTION is nil and
                 (progn (re-search-forward "@end html[ \t]*\n")
                        (point))))
 
                 (progn (re-search-forward "@end html[ \t]*\n")
                        (point))))
 

+;; @docbook ... @end docbook (makeinfo 4.7 or later)
+(put 'docbook 'texinfo-format 'texinfo-format-docbook)
+(ptexinfmt-defun-if-void texinfo-format-docbook ()
+  (delete-region texinfo-command-start
+                (progn (re-search-forward "@end docbook[ \t]*\n")
+                       (point))))
+

 ;; @ifhtml ... @end ifhtml (makeinfo 3.8 or later)
 (put 'ifhtml 'texinfo-format 'texinfo-format-ifhtml)
 (defun texinfo-format-ifhtml ()
 ;; @ifhtml ... @end ifhtml (makeinfo 3.8 or later)
 (put 'ifhtml 'texinfo-format 'texinfo-format-ifhtml)
 (defun texinfo-format-ifhtml ()

@@ -287,6 +297,12 @@ DOCSTRING will be printed if ASSERTION is nil and
                 (progn (re-search-forward "@end ifplaintext[ \t]*\n")
                        (point))))
 
                 (progn (re-search-forward "@end ifplaintext[ \t]*\n")
                        (point))))
 

+;; @ifdocbook ... @end ifdocbook (makeinfo 4.7 or later)
+(put 'ifdocbook 'texinfo-format 'texinfo-format-ifdocbook)
+(ptexinfmt-defun-if-void texinfo-format-ifdocbook ()
+  (delete-region texinfo-command-start
+                (progn (re-search-forward "@end ifdocbook[ \t]*\n")
+                       (point))))

 
 \f
 ;;; Marking
 
 \f
 ;;; Marking

@@ -357,6 +373,12 @@ For example, @verb\{|@|\} results in @ and
 
 \f
 ;;; Accents and Special characters
 
 \f
 ;;; Accents and Special characters

+;; @registeredsymbol{} ==>     (R)
+(put 'pounds 'texinfo-format 'texinfo-format-registeredsymbol)
+(ptexinfmt-defun-if-void texinfo-format-registeredsymbol ()
+  (texinfo-parse-arg-discard)
+  (insert "(R)"))
+

 ;; @pounds{}   ==>     #       Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()
 ;; @pounds{}   ==>     #       Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()