yatex: yahtml.el comparison

comparison yahtml.el @ 437:27f00e6e0150 dev

yahtml:datalist can complete id in a buffer

author	HIROSE Yuuji <yuuji@gentei.org>
date	Sat, 16 Jul 2016 13:33:36 +0859
parents	8a9ef7c96a0a
children	1b9beabd3fd1

comparison

equal deleted inserted replaced

-:e78a87bc2c9e
+:27f00e6e0150
 ;;; yahtml.el --- Yet Another HTML mode -*- coding: sjis -*-
 ;;; (c) 1994-2015 by HIROSE Yuuji [yuuji(@)yatex.org]
-;;; Last modified Tue Jan  5 10:17:40 2016 on firestorm
+;;; Last modified Sat Jul 16 13:32:35 2016 on firestorm
 ;;; $Id$
 (defconst yahtml-revision-number "1.78.1"
 "Revision number of running yahtml.el")
 (defvar yahtml-command-regexp "[A-Za-z0-9]+"
 "Regexp of constituent of html commands.")
 ;;; Completion tables for `form'
 (defvar yahtml-form-table
-'(("img") ("input") ("link") ("meta")))
+'(("img") ("input") ("link") ("meta") ("label")))
 (defvar yahtml-user-form-table nil)
 (defvar yahtml-tmp-form-table nil)
 (defvar yahtml-last-form "img")
 (defvar yahtml-env-table
 ("table") ("thead") ("tbody") ("tfoot") ("tr") ("th") ("td")
 ("address") ("button")
 ("h1") ("h2") ("h3") ("h4") ("h5") ("h6")
 ;; ("p") ;This makes indentation screwed up!
 ("style") ("script") ("noscript") ("div") ("object") ("ins") ("del")
-("option")
+("option") ("datalist")
 ))
 (if yahtml-html4-strict
 (setq yahtml-env-table
 	  (delete (assoc "center" yahtml-env-table) yahtml-env-table)))
 	       (string< "" s))
 	  (if (eq (aref s 0) ? ) s (concat " " s))
 	""))))
 (defvar yahtml-completing-buffer nil)
-(defun yahtml-collect-labels (&optional file)
+(defun yahtml-collect-labels (&optional file ptn withouthash)
 "Collect current buffers label (<?? name=...>).
 If optional argument FILE is specified collect labels in FILE."
-(let (list end)
+(let ((attrptn (concat "\\(" (or ptn "name\\|id") "\\)\\s *="))
+	(hash (if withouthash "" "#"))
+	list end)
 (save-excursion
-(set-buffer yahtml-completing-buffer)
+(set-buffer (or yahtml-completing-buffer (current-buffer)))
 (if file (let (hilit-auto-highlight)
 		 (set-buffer (find-file-noselect file))))
 (save-excursion
 	(goto-char (point-min))
 	(while ;(re-search-forward "<\\w+\\b" nil t)
-	    (re-search-forward "\\(name\\|id\\)\\s *=" nil t)
+	    (re-search-forward attrptn nil t)
 	  ;(setq bound (match-end 0))
 	  ;(search-forward ">" nil t)
 	  (setq end (match-end 0))
 	  (if (and ;(re-search-backward "\\(name\\|id\\)\\s *=" bound t)
 	       (yahtml-on-assignment-p)
 	       (progn
 		 (goto-char end)
 		 (skip-chars-forward " \t\n")
 		 (looking-at "\"?#?\\([^\">]+\\)\"?\\b")))
 	      (setq list (cons
-			  (list (concat "#" (YaTeX-match-string 1)))
+			  (list (concat hash (YaTeX-match-string 1)))
 			  list))))
 	list))))
+(defun yahtml-collect-ids (&optional file)
+(yahtml-collect-labels file "id" 'withouthash))
 (defvar yahtml-url-completion-map nil "Key map used in URL completion buffer")
 (if yahtml-url-completion-map nil
 (setq yahtml-url-completion-map
 	(copy-keymap minibuffer-local-completion-map))
 " " (if yahtml-prefer-upcase-attributes "ACTION" "action") "=\""
 (read-string-with-history "Action: ") "\""))
 (defun yahtml:select ()
 "Add-in function for `select' input format"
-(setq yahtml-last-single-cmd "option")
+(setq yahtml-last-single-cmd "option"  ;;<- it's old
+	yahtml-last-typeface-cmd "option")
 (concat " " (if yahtml-prefer-upcase-attributes "NAME" "name") "=\""
 	  (read-string-with-history "name: ") "\""))
+(defun yahtml:label ()
+"Add-in function for `<label>'"
+(concat " " (if yahtml-prefer-upcase-attributes "FOR" "for") "=\""
+	  (read-string-with-history "for: ") "\""))
 (defun yahtml:ol ()
 "Add-in function for <ol>"
 (setq yahtml-last-single-cmd "li")
 (let ((start (YaTeX-read-string-or-skip "start="))
 '(("text") ("password") ("checkbox") ("radio") ("submit")
 ("reset") ("image") ("hidden") ("file")))
 (defun yahtml:input ()
 "Add-in function for `input' form"
-(let ((size "") name type value checked (maxlength "")
+(let ((size "") name type value id (maxlength "")
 	(l yahtml-prefer-upcase-attributes))
 (setq name (read-string-with-history "name: ")
 	  type (YaTeX-completing-read-or-skip "type (default=text): "
 				yahtml-input-types nil t)
-	  value (YaTeX-read-string-or-skip "value: "))
+	  value (YaTeX-read-string-or-skip "value: ")
-(if (string-match "text\\|password\\|^$" type)
+	  id (YaTeX-read-string-or-skip "id: "))
+(if (string-match "text\\|password\\|^$" typxe)
 	(setq size (YaTeX-read-string-or-skip "size: ")
 	      maxlength (YaTeX-read-string-or-skip "maxlength: ")))
 (concat
 (if l "NAME" "name") "=\"" name "\""
 (yahtml-make-optional-argument "type" type)
 (yahtml-make-optional-argument "value" value)
+(yahtml-make-optional-argument "id" id)
 (yahtml-make-optional-argument "size" size)
 (yahtml-make-optional-argument "maxlength" maxlength))))
+(defun yahtml:datalist ()
+"Add-in function for `datalist' form"
+(setq yahtml-last-typeface-cmd "option")
+(let ((ids (yahtml-collect-ids)))
+(yahtml-make-optional-argument
+"id" (YaTeX-completing-read-or-skip "id: " ids nil t))))
 (defun yahtml:textarea ()
 "Add-in function for `textarea'"
 (interactive)
 (let (name rows cols)
 (or yahtml-always-/li yahtml-faithful-to-htmllint (insert " "))
 (yahtml-indent-line))
 (fset 'yahtml-intelligent-newline-ol 'yahtml-intelligent-newline-ul)
+(defun yahtml-intelligent-newline-datalist ()
+(interactive)
+(yahtml-insert-form "option")
+(save-excursion (yahtml-insert-form "/option")))
 (defun yahtml-intelligent-newline-dl ()
 (interactive)
 (let ((case-fold-search t))
 (if (save-excursion
 	  (re-search-backward "<\\(\\(dt\\)\\|\\(dd\\)\\)[ \t>]"

Mercurial > hgrepos > hgweb.cgi > yatex

comparison yahtml.el @ 437:27f00e6e0150 dev