1.1 --- a/yahtml.el	Mon Jul 17 17:05:45 2023 +0900
     1.2 +++ b/yahtml.el	Mon Apr 29 17:09:10 2024 +0900
     1.3 @@ -298,13 +298,14 @@
     1.4        (if (eq system-type 'ms-dos) "/c" "-c")))
     1.5  (defvar yahtml-use-highlighting (or yahtml-use-font-lock yahtml-use-hilit19))
     1.6  
     1.7 -(defun yahtml-define-begend-key-normal (key env &optional map)
     1.8 +(defun yahtml-define-begend-key-normal (key env &optional map func)
     1.9    "Define short cut yahtml-insert-begend key."
    1.10 -  (YaTeX-define-key
    1.11 -   key
    1.12 -   (list 'lambda '(arg) '(interactive "P")
    1.13 -	 (list 'yahtml-insert-begend 'arg env))
    1.14 -   map))
    1.15 +  (let ((func (or func 'yahtml-insert-begend)))
    1.16 +    (YaTeX-define-key
    1.17 +     key
    1.18 +     (list 'lambda '(arg) '(interactive "P")
    1.19 +	   (list func 'arg env))
    1.20 +     map)))
    1.21  
    1.22  (defun yahtml-define-begend-region-key (key env &optional map)
    1.23    "Define short cut yahtml-insert-begend-region key."
    1.24 @@ -312,13 +313,24 @@
    1.25  			      (list 'yahtml-insert-begend t env)) map))
    1.26  
    1.27  (defun yahtml-define-begend-key (key env &optional map)
    1.28 -  "Define short cut key for begin type completion both for
    1.29 -normal and region mode.  To customize yahtml, user should use this function."
    1.30 -  (yahtml-define-begend-key-normal key env map)
    1.31 +  "Define short cut key for begin type completion.
    1.32 +Both for normal and region mode.
    1.33 +To customize yahtml, user should use this function."
    1.34 +  (yahtml-define-begend-key-normal key env map 'yahtml-insert-tag)
    1.35    (if YaTeX-inhibit-prefix-letter nil
    1.36      (yahtml-define-begend-region-key
    1.37       (concat (upcase (substring key 0 1)) (substring key 1)) env map)))
    1.38  
    1.39 +(defun yahtml-define-instag-key (key tag &optional map)
    1.40 +  "Define short cut key for inline-tag type completion.
    1.41 +Both for normal and region mode.
    1.42 +To customize yahtml, user should use this function."
    1.43 +  (yahtml-define-begend-key-normal key tag map 'yahtml-insert-tag)
    1.44 +  (if YaTeX-inhibit-prefix-letter nil
    1.45 +    (yahtml-define-begend-region-key
    1.46 +     (concat (upcase (substring key 0 1)) (substring key 1)) env map
    1.47 +     'yahtml-insert-tag)))
    1.48 +
    1.49  (if yahtml-mode-map nil
    1.50    (setq yahtml-mode-map (make-sparse-keymap)
    1.51  	yahtml-prefix-map (make-sparse-keymap))
    1.52 @@ -356,23 +368,23 @@
    1.53  	  (YaTeX-define-key "b" 'yahtml-insert-begend map))
    1.54        (yahtml-define-begend-key "bh" "html" map)
    1.55        (yahtml-define-begend-key "bH" "head" map)
    1.56 -      (yahtml-define-begend-key "bt" "title" map)
    1.57 +      (yahtml-define-instag-key "bt" "title" map)
    1.58        (yahtml-define-begend-key "bT" "table" map)
    1.59        (yahtml-define-begend-key "bb" "body" map)
    1.60 -      (yahtml-define-begend-key "bc" "center" map)
    1.61 +      (yahtml-define-instag-key "bc" "code" map)
    1.62        (yahtml-define-begend-key "bd" "dl" map)
    1.63        (yahtml-define-begend-key "bD" "div" map)
    1.64        (yahtml-define-begend-key "bu" "ul" map)
    1.65        (yahtml-define-begend-key "bo" "ol" map)
    1.66 -      (yahtml-define-begend-key "b1" "h1" map)
    1.67 -      (yahtml-define-begend-key "b2" "h2" map)
    1.68 -      (yahtml-define-begend-key "b3" "h3" map)
    1.69 -      (yahtml-define-begend-key "ba" "a" map)
    1.70 +      (yahtml-define-instag-key "b1" "h1" map)
    1.71 +      (yahtml-define-instag-key "b2" "h2" map)
    1.72 +      (yahtml-define-instag-key "b3" "h3" map)
    1.73 +      (yahtml-define-instag-key "ba" "a" map)
    1.74        (yahtml-define-begend-key "bf" "form" map)
    1.75 -      (yahtml-define-begend-key "bl" "label" map)
    1.76 +      (yahtml-define-instag-key "bl" "label" map)
    1.77        (yahtml-define-begend-key "bs" "select" map)
    1.78        (yahtml-define-begend-key "bv" "div" map)
    1.79 -      (yahtml-define-begend-key "bS" "span" map)
    1.80 +      (yahtml-define-instag-key "bS" "span" map)
    1.81        (yahtml-define-begend-key "bp" "pre" map)
    1.82        (yahtml-define-begend-key "bq" "blockquote" map)
    1.83        (YaTeX-define-key "b " 'yahtml-insert-begend map)