Snippets use new attr syntax

2 files changed, 110 insertions, 110 deletions

diff --git a/emmet-mode.el b/emmet-mode.el
index 75f57bd..1fd1788 100644
--- a/emmet-mode.el
+++ b/emmet-mode.el
@@ -710,22 +710,22 @@ tbl) tbl)
 (puthash "html" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "aliases" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "!" "html:5" tbl)
-(puthash "a:link" "a href=http://" tbl)
-(puthash "a:mail" "a href=mailto:" tbl)
+(puthash "a:link" "a[href=http://]" tbl)
+(puthash "a:mail" "a[href=mailto:]" tbl)
 (puthash "acr" "acronym" tbl)
 (puthash "adr" "address" tbl)
-(puthash "area:c" "area shape=circle coords href alt" tbl)
-(puthash "area:d" "area shape=default href alt" tbl)
-(puthash "area:p" "area shape=poly coords href alt" tbl)
-(puthash "area:r" "area shape=rect coords href alt" tbl)
+(puthash "area:c" "area[shape=circle coords href alt]" tbl)
+(puthash "area:d" "area[shape=default href alt]" tbl)
+(puthash "area:p" "area[shape=poly coords href alt]" tbl)
+(puthash "area:r" "area[shape=rect coords href alt]" tbl)
 (puthash "art" "article" tbl)
-(puthash "bdo:l" "bdo dir=ltr" tbl)
-(puthash "bdo:r" "bdo dir=rtl" tbl)
+(puthash "bdo:l" "bdo[dir=ltr]" tbl)
+(puthash "bdo:r" "bdo[dir=rtl]" tbl)
 (puthash "bq" "blockquote" tbl)
 (puthash "btn" "button" tbl)
-(puthash "btn:b" "button type=button" tbl)
-(puthash "btn:r" "button type=reset" tbl)
-(puthash "btn:s" "button type=submit" tbl)
+(puthash "btn:b" "button[type=button]" tbl)
+(puthash "btn:r" "button[type=reset]" tbl)
+(puthash "btn:s" "button[type=submit]" tbl)
 (puthash "cap" "caption" tbl)
 (puthash "cmd" "command" tbl)
 (puthash "colg" "colgroup" tbl)
@@ -737,72 +737,72 @@ tbl) tbl)
 (puthash "dl+" "dl>dt+dd" tbl)
 (puthash "dlg" "dialog" tbl)
 (puthash "doc" "html>(head>meta charset=UTF-8+title{Document})+body" tbl)
-(puthash "doc4" "html>(head>meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"+title{Document})" tbl)
+(puthash "doc4" "html>(head>meta[http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"]+title{Document})" tbl)
 (puthash "emb" "embed" tbl)
 (puthash "fig" "figure" tbl)
 (puthash "figc" "figcaption" tbl)
-(puthash "form:get" "form action method=get" tbl)
-(puthash "form:post" "form action method=post" tbl)
+(puthash "form:get" "form[action method=get]" tbl)
+(puthash "form:post" "form[action method=post]" tbl)
 (puthash "fset" "fieldset" tbl)
 (puthash "fst" "fieldset" tbl)
 (puthash "ftr" "footer" tbl)
 (puthash "hdr" "header" tbl)
-(puthash "html:4s" "!!!4s+doc4 lang=en" tbl)
-(puthash "html:4t" "!!!4t+doc4 lang=en" tbl)
-(puthash "html:5" "!!!+doc lang=en" tbl)
-(puthash "html:xml" "html xmlns=http://www.w3.org/1999/xhtml" tbl)
-(puthash "html:xs" "!!!xs+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
-(puthash "html:xt" "!!!xt+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
-(puthash "html:xxs" "!!!xxs+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
+(puthash "html:4s" "!!!4s+doc4[lang=en]" tbl)
+(puthash "html:4t" "!!!4t+doc4[lang=en]" tbl)
+(puthash "html:5" "!!!+doc[lang=en]" tbl)
+(puthash "html:xml" "html[xmlns=http://www.w3.org/1999/xhtml]" tbl)
+(puthash "html:xs" "!!!xs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
+(puthash "html:xt" "!!!xt+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
+(puthash "html:xxs" "!!!xxs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
 (puthash "ifr" "iframe" tbl)
 (puthash "input:b" "input:button" tbl)
-(puthash "input:button" "input type=button" tbl)
+(puthash "input:button" "input[type=button]" tbl)
 (puthash "input:c" "input:checkbox" tbl)
-(puthash "input:checkbox" "input type=checkbox" tbl)
-(puthash "input:color" "input type=color" tbl)
-(puthash "input:date" "input type=date" tbl)
-(puthash "input:datetime" "input type=datetime" tbl)
-(puthash "input:datetime-local" "input type=datetime-local" tbl)
-(puthash "input:email" "input type=email" tbl)
+(puthash "input:checkbox" "input[type=checkbox]" tbl)
+(puthash "input:color" "input[type=color]" tbl)
+(puthash "input:date" "input[type=date]" tbl)
+(puthash "input:datetime" "input[type=datetime]" tbl)
+(puthash "input:datetime-local" "input[type=datetime-local]" tbl)
+(puthash "input:email" "input[type=email]" tbl)
 (puthash "input:f" "input:file" tbl)
-(puthash "input:file" "input type=file" tbl)
+(puthash "input:file" "input[type=file]" tbl)
 (puthash "input:h" "input:hidden" tbl)
-(puthash "input:hidden" "input type=hidden" tbl)
+(puthash "input:hidden" "input[type=hidden]" tbl)
 (puthash "input:i" "input:image" tbl)
-(puthash "input:image" "input type=image src alt" tbl)
-(puthash "input:month" "input type=month" tbl)
-(puthash "input:number" "input type=number" tbl)
+(puthash "input:image" "input[type=image src alt]" tbl)
+(puthash "input:month" "input[type=month]" tbl)
+(puthash "input:number" "input[type=number]" tbl)
 (puthash "input:p" "input:password" tbl)
-(puthash "input:password" "input type=password" tbl)
+(puthash "input:password" "input[type=password]" tbl)
 (puthash "input:r" "input:radio" tbl)
-(puthash "input:radio" "input type=radio" tbl)
-(puthash "input:range" "input type=range" tbl)
-(puthash "input:reset" "input type=reset" tbl)
+(puthash "input:radio" "input[type=radio]" tbl)
+(puthash "input:range" "input[type=range]" tbl)
+(puthash "input:reset" "input[type=reset]" tbl)
 (puthash "input:s" "input:submit" tbl)
-(puthash "input:search" "input type=search" tbl)
-(puthash "input:submit" "input type=submit" tbl)
+(puthash "input:search" "input[type=search]" tbl)
+(puthash "input:submit" "input[type=submit]" tbl)
 (puthash "input:t" "input" tbl)
 (puthash "input:text" "input" tbl)
-(puthash "input:time" "input type=time" tbl)
-(puthash "input:url" "input type=url" tbl)
-(puthash "input:week" "input type=week" tbl)
+(puthash "input:time" "input[type=time]" tbl)
+(puthash "input:url" "input[type=url]" tbl)
+(puthash "input:week" "input[type=week]" tbl)
 (puthash "kg" "keygen" tbl)
 (puthash "leg" "legend" tbl)
-(puthash "link:atom" "link rel=alternate type=\"application/atom+xml\" title=Atom href=atom.xml" tbl)
-(puthash "link:css" "link rel=stylesheet href=style.css" tbl)
-(puthash "link:favicon" "link icon rel=shortcut type=image/x-icon href=favicon.ico" tbl)
-(puthash "link:print" "link rel=stylesheet href=print.css media=print" tbl)
-(puthash "link:rss" "link rel=alternate type=application/rss+xml title=RSS href=rss.xml" tbl)
-(puthash "link:touch" "link rel=apple-touch-icon href=favicon.png" tbl)
+(puthash "link:atom" "link[rel=alternate type=\"application/atom+xml\" title=Atom href=atom.xml]" tbl)
+(puthash "link:css" "link[rel=stylesheet href=style.css]" tbl)
+(puthash "link:favicon" "link[icon rel=shortcut type=image/x-icon href=favicon.ico]" tbl)
+(puthash "link:print" "link[rel=stylesheet href=print.css media=print]" tbl)
+(puthash "link:rss" "link[rel=alternate type=application/rss+xml title=RSS href=rss.xml]" tbl)
+(puthash "link:touch" "link[rel=apple-touch-icon href=favicon.png]" tbl)
 (puthash "map+" "map>area" tbl)
 (puthash "menu:c" "menu:context" tbl)
-(puthash "menu:context" "menu type=context" tbl)
+(puthash "menu:context" "menu[type=context]" tbl)
 (puthash "menu:t" "menu:toolbar" tbl)
-(puthash "menu:toolbar" "menu type=toolbar" tbl)
-(puthash "meta:compat" "meta http-equiv=X-UA-Compatible content=\"IE=edge,chrome=1\"" tbl)
-(puthash "meta:utf" "meta http-equiv=Content-Type content=\"text/html;charset=UTF-8\"" tbl)
-(puthash "meta:vp" "meta name=viewport content=\"width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0\"" tbl)
-(puthash "meta:win" "meta http-equiv=Content-Type content=\"text/html;charset=windows-1251\"" tbl)
+(puthash "menu:toolbar" "menu[type=toolbar]" tbl)
+(puthash "meta:compat" "meta[http-equiv=X-UA-Compatible content=\"IE=edge,chrome=1\"]" tbl)
+(puthash "meta:utf" "meta[http-equiv=Content-Type content=\"text/html;charset=UTF-8\"]" tbl)
+(puthash "meta:vp" "meta[name=viewport content=\"width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0\"]" tbl)
+(puthash "meta:win" "meta[http-equiv=Content-Type content=\"text/html;charset=windows-1251\"]" tbl)
 (puthash "obj" "object" tbl)
 (puthash "ol+" "ol>li" tbl)
 (puthash "opt" "option" tbl)
@@ -811,7 +811,7 @@ tbl) tbl)
 (puthash "optgroup+" "optgroup>option" tbl)
 (puthash "out" "output" tbl)
 (puthash "prog" "progress" tbl)
-(puthash "script:src" "script src" tbl)
+(puthash "script:src" "script[src]" tbl)
 (puthash "sect" "section" tbl)
 (puthash "select+" "select>option" tbl)
 (puthash "src" "source" tbl)
diff --git a/src/snippets.el b/src/snippets.el
index 59f5dfe..071d7ce 100644
--- a/src/snippets.el
+++ b/src/snippets.el
@@ -572,22 +572,22 @@ tbl) tbl)
 (puthash "html" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "aliases" (let ((tbl (make-hash-table :test 'equal)))
 (puthash "!" "html:5" tbl)
-(puthash "a:link" "a href=http://" tbl)
-(puthash "a:mail" "a href=mailto:" tbl)
+(puthash "a:link" "a[href=http://]" tbl)
+(puthash "a:mail" "a[href=mailto:]" tbl)
 (puthash "acr" "acronym" tbl)
 (puthash "adr" "address" tbl)
-(puthash "area:c" "area shape=circle coords href alt" tbl)
-(puthash "area:d" "area shape=default href alt" tbl)
-(puthash "area:p" "area shape=poly coords href alt" tbl)
-(puthash "area:r" "area shape=rect coords href alt" tbl)
+(puthash "area:c" "area[shape=circle coords href alt]" tbl)
+(puthash "area:d" "area[shape=default href alt]" tbl)
+(puthash "area:p" "area[shape=poly coords href alt]" tbl)
+(puthash "area:r" "area[shape=rect coords href alt]" tbl)
 (puthash "art" "article" tbl)
-(puthash "bdo:l" "bdo dir=ltr" tbl)
-(puthash "bdo:r" "bdo dir=rtl" tbl)
+(puthash "bdo:l" "bdo[dir=ltr]" tbl)
+(puthash "bdo:r" "bdo[dir=rtl]" tbl)
 (puthash "bq" "blockquote" tbl)
 (puthash "btn" "button" tbl)
-(puthash "btn:b" "button type=button" tbl)
-(puthash "btn:r" "button type=reset" tbl)
-(puthash "btn:s" "button type=submit" tbl)
+(puthash "btn:b" "button[type=button]" tbl)
+(puthash "btn:r" "button[type=reset]" tbl)
+(puthash "btn:s" "button[type=submit]" tbl)
 (puthash "cap" "caption" tbl)
 (puthash "cmd" "command" tbl)
 (puthash "colg" "colgroup" tbl)
@@ -599,72 +599,72 @@ tbl) tbl)
 (puthash "dl+" "dl>dt+dd" tbl)
 (puthash "dlg" "dialog" tbl)
 (puthash "doc" "html>(head>meta charset=UTF-8+title{Document})+body" tbl)
-(puthash "doc4" "html>(head>meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"+title{Document})" tbl)
+(puthash "doc4" "html>(head>meta[http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\"]+title{Document})" tbl)
 (puthash "emb" "embed" tbl)
 (puthash "fig" "figure" tbl)
 (puthash "figc" "figcaption" tbl)
-(puthash "form:get" "form action method=get" tbl)
-(puthash "form:post" "form action method=post" tbl)
+(puthash "form:get" "form[action method=get]" tbl)
+(puthash "form:post" "form[action method=post]" tbl)
 (puthash "fset" "fieldset" tbl)
 (puthash "fst" "fieldset" tbl)
 (puthash "ftr" "footer" tbl)
 (puthash "hdr" "header" tbl)
-(puthash "html:4s" "!!!4s+doc4 lang=en" tbl)
-(puthash "html:4t" "!!!4t+doc4 lang=en" tbl)
-(puthash "html:5" "!!!+doc lang=en" tbl)
-(puthash "html:xml" "html xmlns=http://www.w3.org/1999/xhtml" tbl)
-(puthash "html:xs" "!!!xs+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
-(puthash "html:xt" "!!!xt+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
-(puthash "html:xxs" "!!!xxs+doc4 xmlns=http://www.w3.org/1999/xhtml xml:lang=en" tbl)
+(puthash "html:4s" "!!!4s+doc4[lang=en]" tbl)
+(puthash "html:4t" "!!!4t+doc4[lang=en]" tbl)
+(puthash "html:5" "!!!+doc[lang=en]" tbl)
+(puthash "html:xml" "html[xmlns=http://www.w3.org/1999/xhtml]" tbl)
+(puthash "html:xs" "!!!xs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
+(puthash "html:xt" "!!!xt+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
+(puthash "html:xxs" "!!!xxs+doc4[xmlns=http://www.w3.org/1999/xhtml xml:lang=en]" tbl)
 (puthash "ifr" "iframe" tbl)
 (puthash "input:b" "input:button" tbl)
-(puthash "input:button" "input type=button" tbl)
+(puthash "input:button" "input[type=button]" tbl)
 (puthash "input:c" "input:checkbox" tbl)
-(puthash "input:checkbox" "input type=checkbox" tbl)
-(puthash "input:color" "input type=color" tbl)
-(puthash "input:date" "input type=date" tbl)
-(puthash "input:datetime" "input type=datetime" tbl)
-(puthash "input:datetime-local" "input type=datetime-local" tbl)
-(puthash "input:email" "input type=email" tbl)
+(puthash "input:checkbox" "input[type=checkbox]" tbl)
+(puthash "input:color" "input[type=color]" tbl)
+(puthash "input:date" "input[type=date]" tbl)
+(puthash "input:datetime" "input[type=datetime]" tbl)
+(puthash "input:datetime-local" "input[type=datetime-local]" tbl)
+(puthash "input:email" "input[type=email]" tbl)
 (puthash "input:f" "input:file" tbl)
-(puthash "input:file" "input type=file" tbl)
+(puthash "input:file" "input[type=file]" tbl)
 (puthash "input:h" "input:hidden" tbl)
-(puthash "input:hidden" "input type=hidden" tbl)
+(puthash "input:hidden" "input[type=hidden]" tbl)
 (puthash "input:i" "input:image" tbl)
-(puthash "input:image" "input type=image src alt" tbl)
-(puthash "input:month" "input type=month" tbl)
-(puthash "input:number" "input type=number" tbl)
+(puthash "input:image" "input[type=image src alt]" tbl)
+(puthash "input:month" "input[type=month]" tbl)
+(puthash "input:number" "input[type=number]" tbl)
 (puthash "input:p" "input:password" tbl)
-(puthash "input:password" "input type=password" tbl)
+(puthash "input:password" "input[type=password]" tbl)
 (puthash "input:r" "input:radio" tbl)
-(puthash "input:radio" "input type=radio" tbl)
-(puthash "input:range" "input type=range" tbl)
-(puthash "input:reset" "input type=reset" tbl)
+(puthash "input:radio" "input[type=radio]" tbl)
+(puthash "input:range" "input[type=range]" tbl)
+(puthash "input:reset" "input[type=reset]" tbl)
 (puthash "input:s" "input:submit" tbl)
-(puthash "input:search" "input type=search" tbl)
-(puthash "input:submit" "input type=submit" tbl)
+(puthash "input:search" "input[type=search]" tbl)
+(puthash "input:submit" "input[type=submit]" tbl)
 (puthash "input:t" "input" tbl)
 (puthash "input:text" "input" tbl)
-(puthash "input:time" "input type=time" tbl)
-(puthash "input:url" "input type=url" tbl)
-(puthash "input:week" "input type=week" tbl)
+(puthash "input:time" "input[type=time]" tbl)
+(puthash "input:url" "input[type=url]" tbl)
+(puthash "input:week" "input[type=week]" tbl)
 (puthash "kg" "keygen" tbl)
 (puthash "leg" "legend" tbl)
-(puthash "link:atom" "link rel=alternate type=\"application/atom+xml\" title=Atom href=atom.xml" tbl)
-(puthash "link:css" "link rel=stylesheet href=style.css" tbl)
-(puthash "link:favicon" "link icon rel=shortcut type=image/x-icon href=favicon.ico" tbl)
-(puthash "link:print" "link rel=stylesheet href=print.css media=print" tbl)
-(puthash "link:rss" "link rel=alternate type=application/rss+xml title=RSS href=rss.xml" tbl)
-(puthash "link:touch" "link rel=apple-touch-icon href=favicon.png" tbl)
+(puthash "link:atom" "link[rel=alternate type=\"application/atom+xml\" title=Atom href=atom.xml]" tbl)
+(puthash "link:css" "link[rel=stylesheet href=style.css]" tbl)
+(puthash "link:favicon" "link[icon rel=shortcut type=image/x-icon href=favicon.ico]" tbl)
+(puthash "link:print" "link[rel=stylesheet href=print.css media=print]" tbl)
+(puthash "link:rss" "link[rel=alternate type=application/rss+xml title=RSS href=rss.xml]" tbl)
+(puthash "link:touch" "link[rel=apple-touch-icon href=favicon.png]" tbl)
 (puthash "map+" "map>area" tbl)
 (puthash "menu:c" "menu:context" tbl)
-(puthash "menu:context" "menu type=context" tbl)
+(puthash "menu:context" "menu[type=context]" tbl)
 (puthash "menu:t" "menu:toolbar" tbl)
-(puthash "menu:toolbar" "menu type=toolbar" tbl)
-(puthash "meta:compat" "meta http-equiv=X-UA-Compatible content=\"IE=edge,chrome=1\"" tbl)
-(puthash "meta:utf" "meta http-equiv=Content-Type content=\"text/html;charset=UTF-8\"" tbl)
-(puthash "meta:vp" "meta name=viewport content=\"width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0\"" tbl)
-(puthash "meta:win" "meta http-equiv=Content-Type content=\"text/html;charset=windows-1251\"" tbl)
+(puthash "menu:toolbar" "menu[type=toolbar]" tbl)
+(puthash "meta:compat" "meta[http-equiv=X-UA-Compatible content=\"IE=edge,chrome=1\"]" tbl)
+(puthash "meta:utf" "meta[http-equiv=Content-Type content=\"text/html;charset=UTF-8\"]" tbl)
+(puthash "meta:vp" "meta[name=viewport content=\"width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0\"]" tbl)
+(puthash "meta:win" "meta[http-equiv=Content-Type content=\"text/html;charset=windows-1251\"]" tbl)
 (puthash "obj" "object" tbl)
 (puthash "ol+" "ol>li" tbl)
 (puthash "opt" "option" tbl)
@@ -673,7 +673,7 @@ tbl) tbl)
 (puthash "optgroup+" "optgroup>option" tbl)
 (puthash "out" "output" tbl)
 (puthash "prog" "progress" tbl)
-(puthash "script:src" "script src" tbl)
+(puthash "script:src" "script[src]" tbl)
 (puthash "sect" "section" tbl)
 (puthash "select+" "select>option" tbl)
 (puthash "src" "source" tbl)