Added explicit self-closing tag support. Closes pugjs#605

strugglefly · May 2, 2012 · 9f37c44 · 9f37c44
1 parent 2ce30df
commit 9f37c44
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/jade.md b/jade.md
@@ -57,6 +57,20 @@
         a Bar
         a Baz
 
+## Self-closing Tags
+
+  Some tags are flagged as self-closing by default, such
+  as `meta`, `link`, and so on. To explicitly self-close
+  a tag simply append the `/` character:
+
+     foo/
+     foo(bar='baz')/
+
+  Would yield:
+
+     <foo/>
+     <foo bar="baz"/>
+
 ## Attributes
 
   Tag attributes look similar to HTML, however

diff --git a/lib/compiler.js b/lib/compiler.js
@@ -344,7 +344,7 @@ Compiler.prototype = {
     if (pp && !tag.isInline())
       this.prettyIndent(0, true);
 
-    if (~selfClosing.indexOf(name) && !this.xml) {
+    if ((~selfClosing.indexOf(name) || tag.selfClosing) && !this.xml) {
       this.buffer('<' + name);
       this.visitAttributes(tag.attrs);
       this.terse

diff --git a/lib/parser.js b/lib/parser.js
@@ -617,7 +617,13 @@ Parser.prototype = {
             break out;
         }
       }
-
+
+    // self-closing
+    if ('/' == this.peek().val) {
+      this.advance();
+      tag.selfClosing = true;
+    }
+
     return this.tag(tag);
   },
 

diff --git a/test/cases/tags.self-closing.html b/test/cases/tags.self-closing.html
@@ -0,0 +1,6 @@
+<body>
+  <foo></foo>
+  <foo bar="baz"></foo>
+  <foo/>
+  <foo bar="baz"/>
+</body>
diff --git a/test/cases/tags.self-closing.jade b/test/cases/tags.self-closing.jade
@@ -0,0 +1,6 @@
+
+body
+  foo
+  foo(bar='baz')
+  foo/
+  foo(bar='baz')/