1.1 --- a/yatexgen.el	Sun Apr 09 03:37:47 2000 +0000
     1.2 +++ b/yatexgen.el	Wed May 22 04:57:42 2002 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  ;;; -*- Emacs-Lisp -*-
     1.5  ;;; YaTeX add-in function generator.
     1.6  ;;; yatexgen.el rev.5
     1.7 -;;; (c )1991-1995,1999 by HIROSE Yuuji.[yuuji@yatex.org]
     1.8 -;;; Last modified Thu Aug 26 18:15:14 1999 on firestorm
     1.9 +;;; (c )1991-1995,1999,2000 by HIROSE Yuuji.[yuuji@yatex.org]
    1.10 +;;; Last modified Mon Dec 25 19:17:30 2000 on firestorm
    1.11  ;;; $Id$
    1.12  
    1.13  (require 'yatex)
    1.14 @@ -180,7 +180,7 @@
    1.15  	  (YaTeX-suppress-sparse-keymap map)
    1.16  	  ;;First get input form.
    1.17  	  (recursive-edit)
    1.18 -	  (setq input (buffer-string)
    1.19 +	  (setq input (YaTeX-minibuffer-string)
    1.20  		end (1- (length input)))
    1.21  	  (if (string= "" input) (error YaTeX-generate-abort-message))
    1.22  	  (YaTeX-generate-move-to-add-in-position)
    1.23 @@ -200,7 +200,7 @@
    1.24  	  (unwind-protect
    1.25  	      (recursive-edit)
    1.26  	    (fset 'self-insert-command (symbol-function 'si)))
    1.27 -	  (setq output (buffer-string))
    1.28 +	  (setq output (YaTeX-minibuffer-string))
    1.29  	  (cond ((string= "" output)	(error YaTeX-generate-abort-message))
    1.30  		((string= input output)	(error YaTeX-generate-same-message))
    1.31  		((< (length output) (length input))
    1.32 @@ -356,7 +356,7 @@
    1.33     ((eq YaTeX-current-completion-type 'begin)
    1.34      (goto-char (point-min))
    1.35      (skip-chars-forward "^{")
    1.36 -    (setq env-name
    1.37 +    (setq YaTeX-env-name
    1.38  	  (buffer-substring (1+ (point))
    1.39  			    (progn (skip-chars-forward "^}") (point))))
    1.40      (forward-char 1))
    1.41 @@ -374,9 +374,9 @@
    1.42    (concat
    1.43     "YaTeX:"
    1.44     (cond
    1.45 -    ((eq YaTeX-current-completion-type 'begin) env-name)
    1.46 -    ((eq YaTeX-current-completion-type 'section) section-name)
    1.47 -    ((eq YaTeX-current-completion-type 'maketitle) single-command)))
    1.48 +    ((eq YaTeX-current-completion-type 'begin) YaTeX-env-name)
    1.49 +    ((eq YaTeX-current-completion-type 'section) YaTeX-section-name)
    1.50 +    ((eq YaTeX-current-completion-type 'maketitle) YaTeX-single-command)))
    1.51  )
    1.52  
    1.53  (defun YaTeX-generate-lisp-quote (str)
    1.54 @@ -590,13 +590,14 @@
    1.55    (or command
    1.56        (setq command
    1.57  	    (completing-read
    1.58 -	     (format "Making add-in function for (default %s): " section-name)
    1.59 +	     (format
    1.60 +	      "Making add-in function for (default %s): " YaTeX-section-name)
    1.61  	     (append
    1.62  	      section-table user-section-table tmp-section-table
    1.63  	      env-table     user-env-table     tmp-env-table
    1.64  	      singlecmd-table user-singlecmd-table tmp-singlecmd-table)
    1.65  	     nil nil)
    1.66 -	    command (if (string= "" command) section-name command)))
    1.67 +	    command (if (string= "" command) YaTeX-section-name command)))
    1.68    (message
    1.69     (cond
    1.70      (YaTeX-japan "(o)追加型? (a)引数型? (yatexadd.docを参照のこと) :")