Fleshed out SubstitutionField spec and implementation.

- Added newline modifier to spec and implementation
- Does not belong in Merge, so moved back to glabels
- Incorporated SubstitutionField into RawText

glabels/RawText.h

@@ -22,7 +22,7 @@
 #define RawText_h
 
 
-#include "Merge/Record.h"
+#include "SubstitutionField.h"
 
 #include <QString>
 
@@ -55,12 +55,27 @@ namespace glabels
 		bool isEmpty() const;
 
 		
+		/////////////////////////////////
+		// Private Methods
+		/////////////////////////////////
+	private:
+		void tokenize();
+		
 		/////////////////////////////////
 		// Private Data
 		/////////////////////////////////
 	private:
 		QString mString;
 
+		struct Token
+		{
+			bool              isField;
+			QString           text;
+			SubstitutionField field;
+		};
+		
+		QList<Token> mTokens;
+
 	};
 
 }