Mercurial > hgrepos > hgweb.cgi > yatex

changeset 225:bd9dc9d53a3a dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New func. YaTeX-getset-builtin introduced to update builtin line interactive.
author yuuji@gentei.org
date Mon, 23 Jan 2012 00:11:09 +0900
parents 9705855793ca
children 60844b664f54
files yatexlib.el
diffstat 1 files changed, 38 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/yatexlib.el	Sun Jan 22 21:37:09 2012 +0900
+++ b/yatexlib.el	Mon Jan 23 00:11:09 2012 +0900
@@ -2,7 +2,7 @@
 ;;; YaTeX and yahtml common libraries, general functions and definitions
 ;;; yatexlib.el
 ;;; (c)1994-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Mon Jan  9 20:20:09 2012 on firestorm
+;;; Last modified Mon Jan 23 00:09:36 2012 on firestorm
 ;;; $Id$
 
 ;; General variables
@@ -1084,16 +1084,18 @@
 	 (get-file-buffer pf)
 	 (switch-to-buffer (get-file-buffer pf)))))
 
-(defun YaTeX-get-builtin (key)
+(defun YaTeX-getset-builtin (key &optional value)
   "Read source built-in command of %# usage."
   (catch 'builtin
-    (let ((bl (delq nil (list (current-buffer)
+    (let*((bl (delq nil (list (current-buffer)
 			      (and YaTeX-parent-file
 				   (get-file-buffer YaTeX-parent-file)))))
-	  (leader (or (cdr-safe (assq major-mode
-				      '((yatex-mode . "%#")
-					(yahtml-mode . "<!-- #"))))
-		      "")))
+	  (tuple (cdr (assq major-mode
+			    '((yatex-mode "%#" . "\n")
+			      (yahtml-mode "<!-- #" . "[ \t]*-->\\|\n")))))
+	  (leader (or (car tuple) ""))
+	  (closer (or (cdr tuple) ""))
+	  (prompt (format "Built-in for %s: " key)))
       (save-excursion
 	(while bl
 	  (set-buffer (car bl))
@@ -1103,17 +1105,35 @@
 		      (concat "^" (regexp-quote (concat leader key))) nil t)
 		     (not (eolp)))
 		(throw 'builtin
-		       (YaTeX-buffer-substring
-			(progn
-			  (skip-chars-forward " \t" (point-end-of-line))
-			  (point))
-			(if (string< "" comment-end)
-			    (progn
-			      (search-forward
-			       comment-end (point-end-of-line) t)
-			      (match-beginning 0))
-			  (point-end-of-line))))))
-	  (setq bl (cdr bl)))))))
+		       (let (b e w)
+			 (skip-chars-forward " \t" (point-end-of-line))
+			 (setq b (point)
+			       e (if (re-search-forward closer nil t)
+				     (match-beginning 0)
+				   (point-end-of-line))
+			       w (YaTeX-buffer-substring b e))
+			 (if (null value)
+			     w
+			   (delete-region b e)
+			   (goto-char b)
+			   (if (symbolp value)
+			       (setq value (read-string prompt w)))
+			   (insert value)
+			   value)))))
+	  (setq bl (cdr bl)))
+	; not found
+	(if (null value)
+	    nil				;not set mode, return simply nil
+	  (if (symbolp value)
+	      (setq value (read-string prompt)))
+	  (save-excursion
+	    (goto-char (point-min))
+	    (insert leader key " " value "\n")
+	    value))))))			;on set mode, return set value
+
+(defun YaTeX-get-builtin (key)
+  "Read source built-in command of %# usage."
+  (YaTeX-getset-builtin key))
 
 ;;;VER2
 (defun YaTeX-insert-struc (what env)

yatex.org