From db3de3d1ccb3986097e0eef21de02a4e37e44e94 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel@1450.me>
Date: Thu, 7 Aug 2014 13:25:50 +0200
Subject: [PATCH] Tags at the beginning of lines

---
 features/tagging.feature | 29 ++++++++++++++++++++---------
 jrnl/Entry.py            |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/features/tagging.feature b/features/tagging.feature
index 649ff9bf..9e6bca76 100644
--- a/features/tagging.feature
+++ b/features/tagging.feature
@@ -31,12 +31,23 @@ Feature: Tagging
             @c++                 : 1
             @c#                  : 1
             """
-	Scenario:  An email should not be a tag
-		Given we use the config "tags-237.json"
-		When we run "jrnl --tags"
-		Then we should get no error
-		and the output should be
-			"""
-			@newline             : 1
-			@email               : 1
-			"""
\ No newline at end of file
+    Scenario:  An email should not be a tag
+        Given we use the config "tags-237.json"
+        When we run "jrnl --tags"
+        Then we should get no error
+        and the output should be
+            """
+            @newline             : 1
+            @email               : 1
+            """
+
+    Scenario:  Entry cans start and end with tags
+        Scenario: Writing an entry from command line
+        Given we use the config "basic.json"
+        When we run "jrnl today: @foo came over, we went to a @bar"
+        When we run "jrnl --tags"
+        Then the output should be
+            """
+            @foo                 : 1
+            @bar                 : 1
+            """
diff --git a/jrnl/Entry.py b/jrnl/Entry.py
index fb92c3b6..f04d9e0f 100755
--- a/jrnl/Entry.py
+++ b/jrnl/Entry.py
@@ -17,7 +17,7 @@ class Entry:
         self.modified = False
 
     def parse_tags(self):
-        fulltext = " ".join([self.title, self.body]).lower()
+        fulltext =  " " + " ".join([self.title, self.body]).lower()
         tags = re.findall(r'(?u)\s([{tags}][-+*#/\w]+)'.format(tags=self.journal.config['tagsymbols']), fulltext, re.UNICODE)
         self.tags = tags
         return set(tags)