From 8d9ba87c607c8ddbf5013d0acf9855effa2ef1dc Mon Sep 17 00:00:00 2001
From: Tj Holowaychuk <tj@vision-media.ca>
Date: Tue, 5 Oct 2010 05:48:16 -0700
Subject: [PATCH] Release 0.5.2

---
 History.md    | 17 +++++++++++++++++
 lib/jade.js   |  2 +-
 lib/parser.js |  3 ---
 package.json  |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/History.md b/History.md
index c71b4f545..4a596b9b1 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,21 @@
 
+0.5.2 / 2010-10-05 
+==================
+
+  * Added; Text introduces newlines to mimic the grammar.
+    Whitespace handling is a little tricky with this sort of grammar.
+    Jade will now mimic the written grammar, meaning that text blocks
+    using the "|" margin character will introduce a literal newline,
+    where as immediate tag text (ex "a(href='#') Link") will not.
+
+    This may not be ideal, but it makes more sense than what Jade was     
+    previously doing.
+
+  * Added `Tag#text` to disambiguate between immediate / block text
+  * Removed _pretty_ option (was kinda useless in the state it was in)
+  * Reverted ignoring of newlines. Closes #92.
+  * Fixed; `Parser#parse()` ignoring newlines
+
 0.5.1 / 2010-10-04 
 ==================
 
diff --git a/lib/jade.js b/lib/jade.js
index 23ce57fa6..1fd38a899 100644
--- a/lib/jade.js
+++ b/lib/jade.js
@@ -18,7 +18,7 @@ var Parser = require('./parser'),
  * Library version.
  */
 
-exports.version = '0.5.1';
+exports.version = '0.5.2';
 
 /**
  * Intermediate JavaScript cache.
diff --git a/lib/parser.js b/lib/parser.js
index ad06b0abe..1e8b9841e 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -173,9 +173,6 @@ Parser.prototype = {
                 this.lexer.defer(this.lexer.tok('tag', 'div'));
                 this.lexer.defer(tok);
                 return this.parseExpr();
-            case 'newline':
-                this.advance;
-                return this.parseExpr();
         }
     },
     
diff --git a/package.json b/package.json
index 3f10e1786..bc9bade27 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jade",
   "description": "Jade template engine",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "main": "./index.js",
   "bin": { "jade": "./bin/jade" },