1.1 --- a/yatexgen.el	Thu Jul 07 16:37:05 1994 +0000
     1.2 +++ b/yatexgen.el	Mon Sep 19 16:54:19 1994 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  ;;; -*- Emacs-Lisp -*-
     1.5  ;;; YaTeX add-in function generator.
     1.6 -;;; yatexgen.el rev.2
     1.7 +;;; yatexgen.el rev.3
     1.8  ;;; (c )1991-1994 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
     1.9 -;;; Last modified Fri Jul  8 00:46:09 1994 on figaro
    1.10 +;;; Last modified Tue Sep 20 01:34:46 1994 on figaro
    1.11  ;;; $Id$
    1.12  
    1.13  (require 'yatex)
    1.14 @@ -432,7 +432,7 @@
    1.15        (while (string<
    1.16  	      ""
    1.17  	      (setq cand (read-string (format "Item[%d](RET to exit): " i))))
    1.18 -	(setq cands (concat cands (format "(""%s"")\n" cand))
    1.19 +	(setq cands (concat cands (format "(\"%s\")\n" cand))
    1.20  	      i (1+ i))
    1.21  	(insert cand "\n"))
    1.22        (kill-buffer buf)))
    1.23 @@ -450,33 +450,33 @@
    1.24  )
    1.25  (defun YaTeX-generate-create-read-string (&optional nth)
    1.26    (concat
    1.27 -   "(read-string """
    1.28 +   "(read-string \""
    1.29     (read-string (if nth (format "Prompt for argument#%d: " nth) "Prompt: "))
    1.30 -   ": ""\n"
    1.31 -   """" (read-string "Default: ") """"
    1.32 +   ": \"\n"
    1.33 +   "\"" (read-string "Default: ") "\""
    1.34     ")\n")
    1.35  )
    1.36  (defun YaTeX-generate-create-completing-read (&optional nth)
    1.37    (concat
    1.38 -   "(completing-read """
    1.39 +   "(completing-read \""
    1.40     (read-string (if nth (format "Prompt for argument#%d: " nth) "Prompt: "))
    1.41 -   ": ""\n"
    1.42 +   ": \"\n"
    1.43     (format "'%s\n" (YaTeX-generate-read-completion-table))
    1.44     "nil "
    1.45     (format "%s)" (y-or-n-p "Require match? ")))
    1.46  )
    1.47  (defun YaTeX-generate-create-read-file-name (&optional nth)
    1.48    (concat
    1.49 -   "(read-file-name """
    1.50 +   "(read-file-name \""
    1.51     (read-string (if nth (format "Prompt for argument#%d: " nth) "Prompt: "))
    1.52 -   ": "" nil nil t """")\n")
    1.53 +   ": \" nil nil t \"\")\n")
    1.54  )
    1.55  (defun YaTeX-generate-create-read-oneof (&optional nth readpos)
    1.56    (concat
    1.57     (if readpos
    1.58 -       "(YaTeX:read-position """
    1.59 -     "(YaTeX:read-oneof """)
    1.60 -   (read-string "Acceptable characters: " "lcr") """)\n")
    1.61 +       "(YaTeX:read-position \""
    1.62 +     "(YaTeX:read-oneof \"")
    1.63 +   (read-string "Acceptable characters: " "lcr") "\")\n")
    1.64  )
    1.65  (defun YaTeX-generate-option-type (command)
    1.66    (let ((func (format "YaTeX:%s" command)) leftp
    1.67 @@ -491,41 +491,41 @@
    1.68  	 (cond
    1.69  	  ;;Read string
    1.70  	  ((eq type 'string)
    1.71 -	   (concat """" (setq leftp (read-string "Left parenthesis: " "{"))
    1.72 -		   """\n"
    1.73 +	   (concat \"\" (setq leftp (read-string "Left parenthesis: " "{"))
    1.74 +		   \""\n"
    1.75  		   (YaTeX-generate-create-read-string)
    1.76 -		   """" (YaTeX-generate-corresponding-paren leftp) """"
    1.77 +		   \"\" (YaTeX-generate-corresponding-paren leftp) \"\"
    1.78  		   ))
    1.79  	  
    1.80  	  ;;Completing-read
    1.81  	  ((eq type 'completion)
    1.82 -	   (concat """" (setq leftp (read-string "Left parenthesis: " "{"))
    1.83 -		   """\n"
    1.84 +	   (concat \"\" (setq leftp (read-string "Left parenthesis: " "{"))
    1.85 +		   \""\n"
    1.86  		   (YaTeX-generate-create-completing-read)
    1.87 -		   """" (YaTeX-generate-corresponding-paren leftp) """")
    1.88 +		   \"\" (YaTeX-generate-corresponding-paren leftp) \"\")
    1.89  	   )
    1.90  	  ((eq type 'file)
    1.91 -	   (concat """" (setq leftp (read-string "Left parenthesis: " "{"))
    1.92 -		   """\n"
    1.93 +	   (concat \"\" (setq leftp (read-string "Left parenthesis: " "{"))
    1.94 +		   \""\n"
    1.95  		   (YaTeX-generate-create-read-file-name)
    1.96 -		   """" (YaTeX-generate-corresponding-paren leftp) """")
    1.97 +		   \"\" (YaTeX-generate-corresponding-paren leftp) \"\")
    1.98  	   )
    1.99  	  ((eq type 'oneof)
   1.100  	   (YaTeX-generate-create-read-oneof nil t)
   1.101  	   )
   1.102  	  ((eq type 'option)
   1.103 -	   (concat "(let ((op (read-string """
   1.104 +	   (concat "(let ((op (read-string \""
   1.105  		   (read-string "Prompt: ")
   1.106 -		   ": "")))\n"
   1.107 -		   "(if (string< """" op)\n"
   1.108 -		   "    (concat ""["" op ""]"")\n"
   1.109 -		   "  """"))\n")
   1.110 +		   ": \")))\n"
   1.111 +		   "(if (string< \"\" op)\n"
   1.112 +		   "    (concat \"[\" op \"]\")\n"
   1.113 +		   "  \"\"))\n")
   1.114  	   )
   1.115  	  
   1.116  	  ((eq type 'coord)
   1.117 -	   (concat "(YaTeX:read-coordinates """
   1.118 +	   (concat "(YaTeX:read-coordinates \""
   1.119  		   (read-string "Prompt for coordinates: ")
   1.120 -		   ": """)
   1.121 +		   ": \")\n")
   1.122  	   )
   1.123  	  ((eq type 'macro)
   1.124  	   (error "not yet supported")