From 925036812addff9226196a0eaaf57cc8b23176e7 Mon Sep 17 00:00:00 2001
From: Andrea Crotti <andrea.crotti.0@gmail.com>
Date: Sun, 2 Feb 2014 20:15:33 +0000
Subject: [PATCH] make html inherit from nxml-mode, move some common snippets
 there and set "a" as key for the href  snippet, closes #18

---
 html-mode/.yas-parents                | 1 +
 html-mode/body                        | 6 ------
 html-mode/br                          | 4 ----
 html-mode/code                        | 6 ------
 html-mode/div                         | 3 ---
 html-mode/h1                          | 5 -----
 html-mode/h2                          | 5 -----
 html-mode/h3                          | 5 -----
 html-mode/h4                          | 5 -----
 html-mode/h5                          | 5 -----
 html-mode/h6                          | 5 -----
 html-mode/head                        | 6 ------
 html-mode/hr                          | 4 ----
 html-mode/href                        | 4 ----
 html-mode/img                         | 4 ----
 html-mode/input                       | 4 ----
 html-mode/li                          | 5 -----
 html-mode/ol                          | 7 -------
 html-mode/p                           | 4 ----
 html-mode/pre                         | 6 ------
 html-mode/quote                       | 6 ------
 html-mode/span                        | 4 ----
 html-mode/style                       | 6 ------
 html-mode/table                       | 7 -------
 html-mode/td                          | 5 -----
 html-mode/title                       | 4 ----
 html-mode/tr                          | 7 -------
 html-mode/ul                          | 7 -------
 {html-mode => nxml-mode}/code.class   | 0
 {html-mode => nxml-mode}/div.class    | 0
 {html-mode => nxml-mode}/div.id       | 0
 {html-mode => nxml-mode}/div.id-class | 0
 {html-mode => nxml-mode}/dl.id        | 0
 nxml-mode/href                        | 1 +
 {html-mode => nxml-mode}/li.class     | 0
 {html-mode => nxml-mode}/ol.class     | 0
 {html-mode => nxml-mode}/ol.id        | 0
 {html-mode => nxml-mode}/span.class   | 0
 {html-mode => nxml-mode}/span.id      | 0
 {html-mode => nxml-mode}/ul.class     | 0
 {html-mode => nxml-mode}/ul.id        | 0
 41 files changed, 2 insertions(+), 139 deletions(-)
 create mode 100644 html-mode/.yas-parents
 delete mode 100644 html-mode/body
 delete mode 100644 html-mode/br
 delete mode 100644 html-mode/code
 delete mode 100644 html-mode/div
 delete mode 100644 html-mode/h1
 delete mode 100644 html-mode/h2
 delete mode 100644 html-mode/h3
 delete mode 100644 html-mode/h4
 delete mode 100644 html-mode/h5
 delete mode 100644 html-mode/h6
 delete mode 100644 html-mode/head
 delete mode 100644 html-mode/hr
 delete mode 100644 html-mode/href
 delete mode 100644 html-mode/img
 delete mode 100644 html-mode/input
 delete mode 100644 html-mode/li
 delete mode 100644 html-mode/ol
 delete mode 100644 html-mode/p
 delete mode 100644 html-mode/pre
 delete mode 100644 html-mode/quote
 delete mode 100644 html-mode/span
 delete mode 100644 html-mode/style
 delete mode 100644 html-mode/table
 delete mode 100644 html-mode/td
 delete mode 100644 html-mode/title
 delete mode 100644 html-mode/tr
 delete mode 100644 html-mode/ul
 rename {html-mode => nxml-mode}/code.class (100%)
 rename {html-mode => nxml-mode}/div.class (100%)
 rename {html-mode => nxml-mode}/div.id (100%)
 rename {html-mode => nxml-mode}/div.id-class (100%)
 rename {html-mode => nxml-mode}/dl.id (100%)
 rename {html-mode => nxml-mode}/li.class (100%)
 rename {html-mode => nxml-mode}/ol.class (100%)
 rename {html-mode => nxml-mode}/ol.id (100%)
 rename {html-mode => nxml-mode}/span.class (100%)
 rename {html-mode => nxml-mode}/span.id (100%)
 rename {html-mode => nxml-mode}/ul.class (100%)
 rename {html-mode => nxml-mode}/ul.id (100%)

diff --git a/html-mode/.yas-parents b/html-mode/.yas-parents
new file mode 100644
index 0000000..917ade6
--- /dev/null
+++ b/html-mode/.yas-parents
@@ -0,0 +1 @@
+nxml-mode
\ No newline at end of file
diff --git a/html-mode/body b/html-mode/body
deleted file mode 100644
index c924f8c..0000000
--- a/html-mode/body
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <body>...</body>
-# --
-<body$1>
-  $0
-</body>
\ No newline at end of file
diff --git a/html-mode/br b/html-mode/br
deleted file mode 100644
index 3492098..0000000
--- a/html-mode/br
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <br />
-# --
-<br />
\ No newline at end of file
diff --git a/html-mode/code b/html-mode/code
deleted file mode 100644
index 6f558ec..0000000
--- a/html-mode/code
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <code>...</code>
-# --
-<code>
-  $0
-</code>
\ No newline at end of file
diff --git a/html-mode/div b/html-mode/div
deleted file mode 100644
index 1c9c0c8..0000000
--- a/html-mode/div
+++ /dev/null
@@ -1,3 +0,0 @@
-#name : <div...>...</div>
-# --
-<div${1: id="${2:some_id}"}${3: class="${4:some_class}"}>$0</div> 
\ No newline at end of file
diff --git a/html-mode/h1 b/html-mode/h1
deleted file mode 100644
index 414e457..0000000
--- a/html-mode/h1
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h1>...</h1>
-#group : header
-# --
-<h1>$1</h1>
\ No newline at end of file
diff --git a/html-mode/h2 b/html-mode/h2
deleted file mode 100644
index 3722a29..0000000
--- a/html-mode/h2
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h2>...</h2>
-#group : header
-# --
-<h2>$1</h2>
\ No newline at end of file
diff --git a/html-mode/h3 b/html-mode/h3
deleted file mode 100644
index a1eaab1..0000000
--- a/html-mode/h3
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h3>...</h3>
-#group : header
-# --
-<h3>$1</h3>
\ No newline at end of file
diff --git a/html-mode/h4 b/html-mode/h4
deleted file mode 100644
index df71628..0000000
--- a/html-mode/h4
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h4>...</h4>
-#group : header
-# --
-<h4>$1</h4>
\ No newline at end of file
diff --git a/html-mode/h5 b/html-mode/h5
deleted file mode 100644
index 0109822..0000000
--- a/html-mode/h5
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h5>...</h5>
-#group : header
-# --
-<h5>$1</h5>
\ No newline at end of file
diff --git a/html-mode/h6 b/html-mode/h6
deleted file mode 100644
index 21c718f..0000000
--- a/html-mode/h6
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <h6>...</h6>
-#group : header
-# --
-<h6>$1</h6>
\ No newline at end of file
diff --git a/html-mode/head b/html-mode/head
deleted file mode 100644
index d639a73..0000000
--- a/html-mode/head
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <head>...</head>
-# --
-<head>
-  $0
-</head>
\ No newline at end of file
diff --git a/html-mode/hr b/html-mode/hr
deleted file mode 100644
index c2c330c..0000000
--- a/html-mode/hr
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <hr />
-# --
-<hr />
diff --git a/html-mode/href b/html-mode/href
deleted file mode 100644
index 121d589..0000000
--- a/html-mode/href
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <a href="...">...</a>
-# --
-<a href="$1">$2</a>
\ No newline at end of file
diff --git a/html-mode/img b/html-mode/img
deleted file mode 100644
index 897f605..0000000
--- a/html-mode/img
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <img src="..." class="..." alt="..." />
-# --
-<img src="$1" class="$2" alt="$3" />
\ No newline at end of file
diff --git a/html-mode/input b/html-mode/input
deleted file mode 100644
index c79ba87..0000000
--- a/html-mode/input
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <input ... />
-# --
-<input type="$1" name="$2" value="$3" />
\ No newline at end of file
diff --git a/html-mode/li b/html-mode/li
deleted file mode 100644
index c5139fa..0000000
--- a/html-mode/li
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <li>...</li>
-#group : list
-# --
-<li>$1</li>
\ No newline at end of file
diff --git a/html-mode/ol b/html-mode/ol
deleted file mode 100644
index 58899fa..0000000
--- a/html-mode/ol
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ol>...</ol>
-#group : list
-# --
-<ol>
-  $0
-</ol>
\ No newline at end of file
diff --git a/html-mode/p b/html-mode/p
deleted file mode 100644
index 649d9a2..0000000
--- a/html-mode/p
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <p>...</p>
-# --
-<p>$1</p>
\ No newline at end of file
diff --git a/html-mode/pre b/html-mode/pre
deleted file mode 100644
index bfebb3c..0000000
--- a/html-mode/pre
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <pre>...</pre>
-# --
-<pre>
-  $0
-</pre>
\ No newline at end of file
diff --git a/html-mode/quote b/html-mode/quote
deleted file mode 100644
index 65ded74..0000000
--- a/html-mode/quote
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <blockquote>...</blockquote>
-# --
-<blockquote>
-  $1
-</blockquote>
\ No newline at end of file
diff --git a/html-mode/span b/html-mode/span
deleted file mode 100644
index 149758d..0000000
--- a/html-mode/span
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <span>...</span>
-# --
-<span>$1</span>
\ No newline at end of file
diff --git a/html-mode/style b/html-mode/style
deleted file mode 100644
index 300bead..0000000
--- a/html-mode/style
+++ /dev/null
@@ -1,6 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <style type="text/css" media="...">...</style>
-# --
-<style type="text/css" media="${1:screen}">
-  $0
-</style>
\ No newline at end of file
diff --git a/html-mode/table b/html-mode/table
deleted file mode 100644
index 561614f..0000000
--- a/html-mode/table
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <table ...>...</table>
-#group : table
-# --
-<table width="$1" cellspacing="$2" cellpadding="$3" border="$4">
-  $0
-</table>
\ No newline at end of file
diff --git a/html-mode/td b/html-mode/td
deleted file mode 100644
index 4f494eb..0000000
--- a/html-mode/td
+++ /dev/null
@@ -1,5 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <td>...</td>
-#group : table
-# --
-<td$1>$2</td>
\ No newline at end of file
diff --git a/html-mode/title b/html-mode/title
deleted file mode 100644
index 21794cd..0000000
--- a/html-mode/title
+++ /dev/null
@@ -1,4 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <title>...</title>
-# --
-<title>$1</title>
\ No newline at end of file
diff --git a/html-mode/tr b/html-mode/tr
deleted file mode 100644
index 3878a1c..0000000
--- a/html-mode/tr
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <tr>...</tr>
-#group : table
-# --
-<tr>
-  $0
-</tr>
\ No newline at end of file
diff --git a/html-mode/ul b/html-mode/ul
deleted file mode 100644
index 981e6e7..0000000
--- a/html-mode/ul
+++ /dev/null
@@ -1,7 +0,0 @@
-#contributor : Jimmy Wu <frozenthrone88@gmail.com>
-#name : <ul>...</ul>
-#group : list
-# --
-<ul>
-  $0
-</ul>
\ No newline at end of file
diff --git a/html-mode/code.class b/nxml-mode/code.class
similarity index 100%
rename from html-mode/code.class
rename to nxml-mode/code.class
diff --git a/html-mode/div.class b/nxml-mode/div.class
similarity index 100%
rename from html-mode/div.class
rename to nxml-mode/div.class
diff --git a/html-mode/div.id b/nxml-mode/div.id
similarity index 100%
rename from html-mode/div.id
rename to nxml-mode/div.id
diff --git a/html-mode/div.id-class b/nxml-mode/div.id-class
similarity index 100%
rename from html-mode/div.id-class
rename to nxml-mode/div.id-class
diff --git a/html-mode/dl.id b/nxml-mode/dl.id
similarity index 100%
rename from html-mode/dl.id
rename to nxml-mode/dl.id
diff --git a/nxml-mode/href b/nxml-mode/href
index 0db2fae..47cb84a 100644
--- a/nxml-mode/href
+++ b/nxml-mode/href
@@ -1,4 +1,5 @@
 #contributor : Anders Bach Nielsen <abachn@abachn.net>
 #name : <a href="...">...</a>
+#key: a
 # --
 <a href="$1">$2</a>
\ No newline at end of file
diff --git a/html-mode/li.class b/nxml-mode/li.class
similarity index 100%
rename from html-mode/li.class
rename to nxml-mode/li.class
diff --git a/html-mode/ol.class b/nxml-mode/ol.class
similarity index 100%
rename from html-mode/ol.class
rename to nxml-mode/ol.class
diff --git a/html-mode/ol.id b/nxml-mode/ol.id
similarity index 100%
rename from html-mode/ol.id
rename to nxml-mode/ol.id
diff --git a/html-mode/span.class b/nxml-mode/span.class
similarity index 100%
rename from html-mode/span.class
rename to nxml-mode/span.class
diff --git a/html-mode/span.id b/nxml-mode/span.id
similarity index 100%
rename from html-mode/span.id
rename to nxml-mode/span.id
diff --git a/html-mode/ul.class b/nxml-mode/ul.class
similarity index 100%
rename from html-mode/ul.class
rename to nxml-mode/ul.class
diff --git a/html-mode/ul.id b/nxml-mode/ul.id
similarity index 100%
rename from html-mode/ul.id
rename to nxml-mode/ul.id