1 files changed, 65 insertions, 9 deletions

diff --git a/src/smlrenderervt100.cpp b/src/smlrenderervt100.cpp
index 2b59d5f..5ab3d82 100644
--- a/src/smlrenderervt100.cpp
+++ b/src/smlrenderervt100.cpp
@@ -63,11 +63,67 @@ Bu::String SmlRendererVt100::getStyle( const StyleStack &sStyle )
                 case stGreen:
                         sRet += "\x1B[1;32m";
                         break;
+
+                case stYellow:
+                        sRet += "\x1B[1;33m";
+                        break;
+
+                case stBlue:
+                        sRet += "\x1B[1;34m";
+                        break;
+
+                case stMagenta:
+                        sRet += "\x1B[1;35m";
+                        break;
+
+                case stCyan:
+                        sRet += "\x1B[1;36m";
+                        break;
+
+                case stWhite:
+                        sRet += "\x1B[1;37m";
+                        break;
         }
 
         return sRet;
 }
 
+SmlRendererVt100::Style SmlRendererVt100::strToStyle( const Bu::String &sTag )
+{
+        if( sTag == "green" )
+        {
+                return stGreen;
+        }
+        else if( sTag == "red" )
+        {
+                return stRed;
+        }
+        else if( sTag == "yellow" )
+        {
+                return stYellow;
+        }
+        else if( sTag == "blue" )
+        {
+                return stBlue;
+        }
+        else if( sTag == "magenta" )
+        {
+                return stMagenta;
+        }
+        else if( sTag == "cyan" )
+        {
+                return stCyan;
+        }
+        else if( sTag == "white" )
+        {
+                return stWhite;
+        }
+        else
+        {
+                return stNone;
+        }
+}
+
 void SmlRendererVt100::render( Bu::Formatter &f, const SmlNode *pNode )
 {
         Bu::String sCurLine;
@@ -93,11 +149,16 @@ void SmlRendererVt100::render( Bu::Formatter &f, const SmlNode *pNode )
                         {
                         //      f << "Pop'd: " << (*sNode.peek())->getText() << f.nl;
                                 Bu::String sTag = (*sNode.peek())->getText();
-                                if( sTag == "green" || sTag == "red" )
+                                Style s = strToStyle( sTag );
+                                if( sStyle.peek() == s )
                                 {
                                         sStyle.pop();
                                         sNextToken += getStyle( sStyle );
                                 }
+                                else
+                                {
+                                        throw Bu::ExceptionBase("Close tag doesn't match open tag.");
+                                }
                                 sNode.peek()++;
                                 continue;
                         }
@@ -199,14 +260,9 @@ void SmlRendererVt100::render( Bu::Formatter &f, const SmlNode *pNode )
                                 {
 //                                      f << "Push'd: " << pNode->getText() << f.nl;
                                         Bu::String sTag = pNode->getText();
-                                        if( sTag == "green" )
-                                        {
-                                                sStyle.push( stGreen );
-                                        }
-                                        else if( sTag == "red" )
-                                        {
-                                                sStyle.push( stRed );
-                                        }
+                                        Style s = strToStyle( sTag );
+                                        if( s != 0 )
+                                                sStyle.push( s );
                                         sNextToken += getStyle( sStyle );
                                         sNode.push( pNode->getChildren().begin() );
                                         continue;