From 30cb5fa4f4de35f4b5bf76de6dcd21d4e269d4ba Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 23 Jul 2010 17:29:23 -0700
Subject: [PATCH] Bug #441 - A colon messes up text replacement with ///

- Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
  substitution (thanks to Michelle Crane).
---
 ChangeLog       |  2 ++
 src/Context.cpp | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f58fd839e..09a6abdcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
  + Fixed bug #438, correcting the sorting of the entry_time, start_time
    and end_time columns (thanks to Michelle Crane).
  + Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
+ + Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
+   substitution (thanks to Michelle Crane).
 
 ------ old releases ------------------------------
 
diff --git a/src/Context.cpp b/src/Context.cpp
index a3363b6fe..762b8ba33 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -594,6 +594,18 @@ void Context::parse (
         tagRemovals.push_back (arg->substr (1));
       }
 
+      // Substitution of description and/or annotation text.
+      else if (parseSubst.valid (*arg))
+      {
+        if (foundSequence)
+          foundSomethingAfterSequence = true;
+
+        foundNonSequence = true;
+
+        debug ("parse subst '" + *arg + "'");
+        parseSubst.parse (*arg);
+      }
+
       // Atributes - name[.mod]:[value]
       else if (attribute.valid (*arg))
       {
@@ -640,18 +652,6 @@ void Context::parse (
         }
       }
 
-      // Substitution of description and/or annotation text.
-      else if (parseSubst.valid (*arg))
-      {
-        if (foundSequence)
-          foundSomethingAfterSequence = true;
-
-        foundNonSequence = true;
-
-        debug ("parse subst '" + *arg + "'");
-        parseSubst.parse (*arg);
-      }
-
       // It might be a command if one has not already been found.
       else if (parseCmd.command == "" &&
                parseCmd.valid (*arg))