--- trunk/src/mdParser/MDLexer.cpp	2005/12/16 02:57:00	814
+++ branches/development/src/mdParser/MDLexer.cpp	2010/07/09 23:08:25	1465
@@ -1,4 +1,4 @@
-/* $ANTLR 2.7.5 (20050406): "MDParser.g" -> "MDLexer.cpp"$ */
+/* $ANTLR 2.7.7 (20090623): "MDParser.g" -> "MDLexer.cpp"$ */
 #include "MDLexer.hpp"
 #include <antlr/CharBuffer.hpp>
 #include <antlr/TokenStreamException.hpp>
@@ -30,19 +30,22 @@ void MDLexer::initLiterals()
 
 void MDLexer::initLiterals()
 {
-	literals["members"] = 14;
-	literals["position"] = 15;
-	literals["torsion"] = 10;
+	literals["members"] = 16;
+	literals["position"] = 18;
+	literals["torsion"] = 11;
 	literals["component"] = 4;
-	literals["rigidBody"] = 11;
+	literals["restraint"] = 7;
+	literals["rigidBody"] = 13;
+	literals["center"] = 17;
+	literals["inversion"] = 12;
 	literals["zconstraint"] = 6;
-	literals["cutoffGroup"] = 12;
-	literals["bend"] = 9;
-	literals["orientation"] = 16;
-	literals["fragment"] = 13;
-	literals["bond"] = 8;
+	literals["cutoffGroup"] = 14;
+	literals["bend"] = 10;
+	literals["orientation"] = 19;
+	literals["fragment"] = 15;
+	literals["bond"] = 9;
 	literals["molecule"] = 5;
-	literals["atom"] = 7;
+	literals["atom"] = 8;
 }
 
 ANTLR_USE_NAMESPACE(antlr)RefToken MDLexer::nextToken()
@@ -473,9 +476,9 @@ void MDLexer::mWhitespace(bool _createToken) {
 		
 		}
 		if ( inputState->guessing==0 ) {
-#line 218 "MDParser.g"
+#line 233 "MDParser.g"
 			newline();
-#line 479 "MDLexer.cpp"
+#line 482 "MDLexer.cpp"
 		}
 		break;
 	}
@@ -501,10 +504,10 @@ void MDLexer::mWhitespace(bool _createToken) {
 		
 		}
 		if ( inputState->guessing==0 ) {
-#line 223 "MDParser.g"
+#line 238 "MDParser.g"
 			printf("CPP_parser.g continuation line detected\n");
 			deferredNewline();
-#line 508 "MDLexer.cpp"
+#line 511 "MDLexer.cpp"
 		}
 		break;
 	}
@@ -515,9 +518,9 @@ void MDLexer::mWhitespace(bool _createToken) {
 	}
 	}
 	if ( inputState->guessing==0 ) {
-#line 226 "MDParser.g"
+#line 241 "MDParser.g"
 		_ttype = ANTLR_USE_NAMESPACE(antlr)Token::SKIP;
-#line 521 "MDLexer.cpp"
+#line 524 "MDLexer.cpp"
 	}
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -541,9 +544,9 @@ void MDLexer::mComment(bool _createToken) {
 		else if ((LA(1) == 0xa /* '\n' */  || LA(1) == 0xd /* '\r' */ )) {
 			mEndOfLine(false);
 			if ( inputState->guessing==0 ) {
-#line 233 "MDParser.g"
+#line 248 "MDParser.g"
 				deferredNewline();
-#line 547 "MDLexer.cpp"
+#line 550 "MDLexer.cpp"
 			}
 		}
 		else if ((_tokenSet_0.member(LA(1)))) {
@@ -552,17 +555,17 @@ void MDLexer::mComment(bool _createToken) {
 			}
 		}
 		else {
-			goto _loop78;
+			goto _loop86;
 		}
 		
 	}
-	_loop78:;
+	_loop86:;
 	} // ( ... )*
 	match("*/");
 	if ( inputState->guessing==0 ) {
-#line 236 "MDParser.g"
+#line 251 "MDParser.g"
 		_ttype = ANTLR_USE_NAMESPACE(antlr)Token::SKIP;
-#line 566 "MDLexer.cpp"
+#line 569 "MDLexer.cpp"
 	}
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -614,17 +617,17 @@ void MDLexer::mCPPComment(bool _createToken) {
 			}
 		}
 		else {
-			goto _loop82;
+			goto _loop90;
 		}
 		
 	}
-	_loop82:;
+	_loop90:;
 	} // ( ... )*
 	mEndOfLine(false);
 	if ( inputState->guessing==0 ) {
-#line 242 "MDParser.g"
+#line 257 "MDParser.g"
 		_ttype = ANTLR_USE_NAMESPACE(antlr)Token::SKIP; newline();
-#line 628 "MDLexer.cpp"
+#line 631 "MDLexer.cpp"
 	}
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -642,9 +645,9 @@ void MDLexer::mPREPROC_DIRECTIVE(bool _createToken) {
 	match('#' /* charlit */ );
 	mLineDirective(false);
 	if ( inputState->guessing==0 ) {
-#line 249 "MDParser.g"
+#line 264 "MDParser.g"
 		_ttype = ANTLR_USE_NAMESPACE(antlr)Token::SKIP; newline();
-#line 648 "MDLexer.cpp"
+#line 651 "MDLexer.cpp"
 	}
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -662,11 +665,11 @@ void MDLexer::mLineDirective(bool _createToken) {
 	ANTLR_USE_NAMESPACE(antlr)RefToken sl;
 	
 	if ( inputState->guessing==0 ) {
-#line 255 "MDParser.g"
+#line 270 "MDParser.g"
 		
 		deferredLineCount = 0;
 		
-#line 670 "MDLexer.cpp"
+#line 673 "MDLexer.cpp"
 	}
 	{
 	switch ( LA(1)) {
@@ -688,74 +691,74 @@ void MDLexer::mLineDirective(bool _createToken) {
 	}
 	}
 	{ // ( ... )+
-	int _cnt87=0;
+	int _cnt95=0;
 	for (;;) {
 		if ((LA(1) == 0x9 /* '\t' */  || LA(1) == 0xc /* '\14' */  || LA(1) == 0x20 /* ' ' */ )) {
 			mSpace(false);
 		}
 		else {
-			if ( _cnt87>=1 ) { goto _loop87; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+			if ( _cnt95>=1 ) { goto _loop95; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 		}
 		
-		_cnt87++;
+		_cnt95++;
 	}
-	_loop87:;
+	_loop95:;
 	}  // ( ... )+
 	mDecimal(true);
 	n=_returnToken;
 	if ( inputState->guessing==0 ) {
-#line 260 "MDParser.g"
-		setLine(oopse::lexi_cast<int>(n->getText()) - 1);
-#line 710 "MDLexer.cpp"
+#line 275 "MDParser.g"
+		setLine(OpenMD::lexi_cast<int>(n->getText()) - 1);
+#line 713 "MDLexer.cpp"
 	}
 	{ // ( ... )+
-	int _cnt89=0;
+	int _cnt97=0;
 	for (;;) {
 		if ((LA(1) == 0x9 /* '\t' */  || LA(1) == 0xc /* '\14' */  || LA(1) == 0x20 /* ' ' */ )) {
 			mSpace(false);
 		}
 		else {
-			if ( _cnt89>=1 ) { goto _loop89; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+			if ( _cnt97>=1 ) { goto _loop97; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 		}
 		
-		_cnt89++;
+		_cnt97++;
 	}
-	_loop89:;
+	_loop97:;
 	}  // ( ... )+
 	{
 	mStringLiteral(true);
 	sl=_returnToken;
 	}
 	if ( inputState->guessing==0 ) {
-#line 262 "MDParser.g"
+#line 277 "MDParser.g"
 		std::string filename = sl->getText().substr(1,sl->getText().length()-2); observer->notify(filename);
-#line 733 "MDLexer.cpp"
+#line 736 "MDLexer.cpp"
 	}
 	{ // ( ... )*
 	for (;;) {
 		if ((LA(1) == 0x9 /* '\t' */  || LA(1) == 0xc /* '\14' */  || LA(1) == 0x20 /* ' ' */ )) {
 			{ // ( ... )+
-			int _cnt93=0;
+			int _cnt101=0;
 			for (;;) {
 				if ((LA(1) == 0x9 /* '\t' */  || LA(1) == 0xc /* '\14' */  || LA(1) == 0x20 /* ' ' */ )) {
 					mSpace(false);
 				}
 				else {
-					if ( _cnt93>=1 ) { goto _loop93; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+					if ( _cnt101>=1 ) { goto _loop101; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 				}
 				
-				_cnt93++;
+				_cnt101++;
 			}
-			_loop93:;
+			_loop101:;
 			}  // ( ... )+
 			mDecimal(false);
 		}
 		else {
-			goto _loop94;
+			goto _loop102;
 		}
 		
 	}
-	_loop94:;
+	_loop102:;
 	} // ( ... )*
 	mEndOfLine(false);
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
@@ -808,18 +811,18 @@ void MDLexer::mDecimal(bool _createToken) {
 	ANTLR_USE_NAMESPACE(std)string::size_type _saveIndex;
 	
 	{ // ( ... )+
-	int _cnt124=0;
+	int _cnt132=0;
 	for (;;) {
 		if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 			matchRange('0','9');
 		}
 		else {
-			if ( _cnt124>=1 ) { goto _loop124; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+			if ( _cnt132>=1 ) { goto _loop132; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 		}
 		
-		_cnt124++;
+		_cnt132++;
 	}
-	_loop124:;
+	_loop132:;
 	}  // ( ... )+
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -857,9 +860,9 @@ void MDLexer::mStringLiteral(bool _createToken) {
 			
 			}
 			if ( inputState->guessing==0 ) {
-#line 302 "MDParser.g"
+#line 317 "MDParser.g"
 				deferredNewline();
-#line 863 "MDLexer.cpp"
+#line 866 "MDLexer.cpp"
 			}
 		}
 		else if ((_tokenSet_3.member(LA(1)))) {
@@ -868,11 +871,11 @@ void MDLexer::mStringLiteral(bool _createToken) {
 			}
 		}
 		else {
-			goto _loop104;
+			goto _loop112;
 		}
 		
 	}
-	_loop104:;
+	_loop112:;
 	} // ( ... )*
 	match('\"' /* charlit */ );
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
@@ -1032,7 +1035,7 @@ void MDLexer::mEscape(bool _createToken) {
 	{
 		match('x' /* charlit */ );
 		{ // ( ... )+
-		int _cnt115=0;
+		int _cnt123=0;
 		for (;;) {
 			if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ )) && (_tokenSet_1.member(LA(2))) && (true)) {
 				mDigit(false);
@@ -1044,12 +1047,12 @@ void MDLexer::mEscape(bool _createToken) {
 				matchRange('A','F');
 			}
 			else {
-				if ( _cnt115>=1 ) { goto _loop115; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+				if ( _cnt123>=1 ) { goto _loop123; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 			}
 			
-			_cnt115++;
+			_cnt123++;
 		}
-		_loop115:;
+		_loop123:;
 		}  // ( ... )+
 		break;
 	}
@@ -1257,11 +1260,11 @@ void MDLexer::mID(bool _createToken) {
 		}
 		default:
 		{
-			goto _loop120;
+			goto _loop128;
 		}
 		}
 	}
-	_loop120:;
+	_loop128:;
 	} // ( ... )*
 	_ttype = testLiteralsTable(_ttype);
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
@@ -1335,12 +1338,12 @@ void MDLexer::mNUM_INT(bool _createToken) {
 	ANTLR_USE_NAMESPACE(antlr)RefToken f2;
 	ANTLR_USE_NAMESPACE(antlr)RefToken f3;
 	ANTLR_USE_NAMESPACE(antlr)RefToken f4;
-#line 395 "MDParser.g"
+#line 410 "MDParser.g"
 	
 			bool isDecimal = false;
 			ANTLR_USE_NAMESPACE(antlr)RefToken t = ANTLR_USE_NAMESPACE(antlr)nullToken;
 		
-#line 1344 "MDLexer.cpp"
+#line 1347 "MDLexer.cpp"
 	
 	{
 	switch ( LA(1)) {
@@ -1380,28 +1383,28 @@ void MDLexer::mNUM_INT(bool _createToken) {
 	{
 		match('.' /* charlit */ );
 		if ( inputState->guessing==0 ) {
-#line 402 "MDParser.g"
+#line 417 "MDParser.g"
 			_ttype = DOT;
-#line 1386 "MDLexer.cpp"
+#line 1389 "MDLexer.cpp"
 		}
 		{
 		if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 			{ // ( ... )+
-			int _cnt132=0;
+			int _cnt140=0;
 			for (;;) {
 				if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 					matchRange('0','9');
 				}
 				else {
-					if ( _cnt132>=1 ) { goto _loop132; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+					if ( _cnt140>=1 ) { goto _loop140; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 				}
 				
-				_cnt132++;
+				_cnt140++;
 			}
-			_loop132:;
+			_loop140:;
 			}  // ( ... )+
 			{
-			if ((LA(1) == 0x45 /* 'E' */  || LA(1) == 0x65 /* 'e' */ )) {
+			if ((_tokenSet_6.member(LA(1))) && (_tokenSet_7.member(LA(2)))) {
 				mEXPONENT(false);
 			}
 			else {
@@ -1409,13 +1412,13 @@ void MDLexer::mNUM_INT(bool _createToken) {
 			
 			}
 			{
-			if ((_tokenSet_6.member(LA(1)))) {
+			if ((_tokenSet_8.member(LA(1)))) {
 				mFLOAT_SUFFIX(true);
 				f1=_returnToken;
 				if ( inputState->guessing==0 ) {
-#line 403 "MDParser.g"
+#line 418 "MDParser.g"
 					t=f1;
-#line 1419 "MDLexer.cpp"
+#line 1422 "MDLexer.cpp"
 				}
 			}
 			else {
@@ -1423,7 +1426,7 @@ void MDLexer::mNUM_INT(bool _createToken) {
 			
 			}
 			if ( inputState->guessing==0 ) {
-#line 404 "MDParser.g"
+#line 419 "MDParser.g"
 				
 									if ( t &&
 										  (t->getText().find('f') != ANTLR_USE_NAMESPACE(std)string::npos ||
@@ -1434,7 +1437,7 @@ void MDLexer::mNUM_INT(bool _createToken) {
 										_ttype = NUM_DOUBLE; // assume double
 									}
 								
-#line 1438 "MDLexer.cpp"
+#line 1441 "MDLexer.cpp"
 			}
 		}
 		else {
@@ -1460,9 +1463,9 @@ void MDLexer::mNUM_INT(bool _createToken) {
 		{
 			match('0' /* charlit */ );
 			if ( inputState->guessing==0 ) {
-#line 416 "MDParser.g"
+#line 431 "MDParser.g"
 				isDecimal = true;
-#line 1466 "MDLexer.cpp"
+#line 1469 "MDLexer.cpp"
 			}
 			{
 			if ((LA(1) == 0x58 /* 'X' */  || LA(1) == 0x78 /* 'x' */ )) {
@@ -1485,107 +1488,95 @@ void MDLexer::mNUM_INT(bool _createToken) {
 				}
 				}
 				{ // ( ... )+
-				int _cnt139=0;
+				int _cnt147=0;
 				for (;;) {
-					if ((_tokenSet_7.member(LA(1))) && (true) && (true)) {
+					if ((_tokenSet_9.member(LA(1))) && (true) && (true)) {
 						mHEX_DIGIT(false);
 					}
 					else {
-						if ( _cnt139>=1 ) { goto _loop139; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+						if ( _cnt147>=1 ) { goto _loop147; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 					}
 					
-					_cnt139++;
+					_cnt147++;
 				}
-				_loop139:;
+				_loop147:;
 				}  // ( ... )+
 			}
 			else {
-				bool synPredMatched144 = false;
+				bool synPredMatched152 = false;
 				if ((((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ )) && (true) && (true))) {
-					int _m144 = mark();
-					synPredMatched144 = true;
+					int _m152 = mark();
+					synPredMatched152 = true;
 					inputState->guessing++;
 					try {
 						{
 						{ // ( ... )+
-						int _cnt142=0;
+						int _cnt150=0;
 						for (;;) {
 							if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 								matchRange('0','9');
 							}
 							else {
-								if ( _cnt142>=1 ) { goto _loop142; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+								if ( _cnt150>=1 ) { goto _loop150; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 							}
 							
-							_cnt142++;
+							_cnt150++;
 						}
-						_loop142:;
+						_loop150:;
 						}  // ( ... )+
 						{
-						switch ( LA(1)) {
-						case 0x2e /* '.' */ :
-						{
-							match('.' /* charlit */ );
-							break;
-						}
-						case 0x45 /* 'E' */ :
-						case 0x65 /* 'e' */ :
-						{
+						if ((_tokenSet_6.member(LA(1))) && (_tokenSet_7.member(LA(2)))) {
 							mEXPONENT(false);
-							break;
 						}
-						case 0x44 /* 'D' */ :
-						case 0x46 /* 'F' */ :
-						case 0x64 /* 'd' */ :
-						case 0x66 /* 'f' */ :
-						{
+						else if ((LA(1) == 0x2e /* '.' */ )) {
+							match('.' /* charlit */ );
+						}
+						else if ((_tokenSet_8.member(LA(1))) && (true)) {
 							mFLOAT_SUFFIX(false);
-							break;
 						}
-						default:
-						{
+						else {
 							throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
 						}
+						
 						}
 						}
-						}
 					}
 					catch (ANTLR_USE_NAMESPACE(antlr)RecognitionException& pe) {
-						synPredMatched144 = false;
+						synPredMatched152 = false;
 					}
-					rewind(_m144);
+					rewind(_m152);
 					inputState->guessing--;
 				}
-				if ( synPredMatched144 ) {
+				if ( synPredMatched152 ) {
 					{ // ( ... )+
-					int _cnt146=0;
+					int _cnt154=0;
 					for (;;) {
 						if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 							matchRange('0','9');
 						}
 						else {
-							if ( _cnt146>=1 ) { goto _loop146; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+							if ( _cnt154>=1 ) { goto _loop154; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 						}
 						
-						_cnt146++;
+						_cnt154++;
 					}
-					_loop146:;
+					_loop154:;
 					}  // ( ... )+
 				}
 				else if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x37 /* '7' */ )) && (true) && (true)) {
 					{ // ( ... )+
-					int _cnt148=0;
+					int _cnt156=0;
 					for (;;) {
 						if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x37 /* '7' */ ))) {
 							matchRange('0','7');
 						}
 						else {
-							if ( _cnt148>=1 ) { goto _loop148; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+							if ( _cnt156>=1 ) { goto _loop156; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 						}
 						
-						_cnt148++;
+						_cnt156++;
 					}
-					_loop148:;
+					_loop156:;
 					}  // ( ... )+
 				}
 				else {
@@ -1613,16 +1604,16 @@ void MDLexer::mNUM_INT(bool _createToken) {
 					matchRange('0','9');
 				}
 				else {
-					goto _loop151;
+					goto _loop159;
 				}
 				
 			}
-			_loop151:;
+			_loop159:;
 			} // ( ... )*
 			if ( inputState->guessing==0 ) {
-#line 433 "MDParser.g"
+#line 448 "MDParser.g"
 				isDecimal=true;
-#line 1626 "MDLexer.cpp"
+#line 1617 "MDLexer.cpp"
 			}
 			break;
 		}
@@ -1653,16 +1644,31 @@ void MDLexer::mNUM_INT(bool _createToken) {
 			}
 			}
 			if ( inputState->guessing==0 ) {
-#line 435 "MDParser.g"
+#line 450 "MDParser.g"
 				_ttype = NUM_LONG;
-#line 1659 "MDLexer.cpp"
+#line 1650 "MDLexer.cpp"
 			}
 		}
-		else if (((_tokenSet_8.member(LA(1))))&&(isDecimal)) {
+		else if (((_tokenSet_10.member(LA(1))))&&(isDecimal)) {
 			{
-			switch ( LA(1)) {
-			case 0x2e /* '.' */ :
-			{
+			if ((_tokenSet_6.member(LA(1))) && (_tokenSet_7.member(LA(2)))) {
+				mEXPONENT(false);
+				{
+				if ((_tokenSet_8.member(LA(1)))) {
+					mFLOAT_SUFFIX(true);
+					f3=_returnToken;
+					if ( inputState->guessing==0 ) {
+#line 455 "MDParser.g"
+						t=f3;
+#line 1664 "MDLexer.cpp"
+					}
+				}
+				else {
+				}
+				
+				}
+			}
+			else if ((LA(1) == 0x2e /* '.' */ )) {
 				match('.' /* charlit */ );
 				{ // ( ... )*
 				for (;;) {
@@ -1670,14 +1676,14 @@ void MDLexer::mNUM_INT(bool _createToken) {
 						matchRange('0','9');
 					}
 					else {
-						goto _loop156;
+						goto _loop164;
 					}
 					
 				}
-				_loop156:;
+				_loop164:;
 				} // ( ... )*
 				{
-				if ((LA(1) == 0x45 /* 'E' */  || LA(1) == 0x65 /* 'e' */ )) {
+				if ((_tokenSet_6.member(LA(1))) && (_tokenSet_7.member(LA(2)))) {
 					mEXPONENT(false);
 				}
 				else {
@@ -1685,63 +1691,36 @@ void MDLexer::mNUM_INT(bool _createToken) {
 				
 				}
 				{
-				if ((_tokenSet_6.member(LA(1)))) {
+				if ((_tokenSet_8.member(LA(1)))) {
 					mFLOAT_SUFFIX(true);
 					f2=_returnToken;
 					if ( inputState->guessing==0 ) {
-#line 439 "MDParser.g"
+#line 454 "MDParser.g"
 						t=f2;
-#line 1695 "MDLexer.cpp"
+#line 1701 "MDLexer.cpp"
 					}
 				}
 				else {
 				}
 				
 				}
-				break;
 			}
-			case 0x45 /* 'E' */ :
-			case 0x65 /* 'e' */ :
-			{
-				mEXPONENT(false);
-				{
-				if ((_tokenSet_6.member(LA(1)))) {
-					mFLOAT_SUFFIX(true);
-					f3=_returnToken;
-					if ( inputState->guessing==0 ) {
-#line 440 "MDParser.g"
-						t=f3;
-#line 1715 "MDLexer.cpp"
-					}
-				}
-				else {
-				}
-				
-				}
-				break;
-			}
-			case 0x44 /* 'D' */ :
-			case 0x46 /* 'F' */ :
-			case 0x64 /* 'd' */ :
-			case 0x66 /* 'f' */ :
-			{
+			else if ((_tokenSet_8.member(LA(1))) && (true)) {
 				mFLOAT_SUFFIX(true);
 				f4=_returnToken;
 				if ( inputState->guessing==0 ) {
-#line 441 "MDParser.g"
+#line 456 "MDParser.g"
 					t=f4;
-#line 1734 "MDLexer.cpp"
+#line 1715 "MDLexer.cpp"
 				}
-				break;
 			}
-			default:
-			{
+			else {
 				throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
 			}
+			
 			}
-			}
 			if ( inputState->guessing==0 ) {
-#line 443 "MDParser.g"
+#line 458 "MDParser.g"
 				
 									if ( t &&
 										  (t->getText().find('f') != ANTLR_USE_NAMESPACE(std)string::npos ||
@@ -1752,7 +1731,7 @@ void MDLexer::mNUM_INT(bool _createToken) {
 										_ttype = NUM_DOUBLE; // assume double
 									}
 								
-#line 1756 "MDLexer.cpp"
+#line 1735 "MDLexer.cpp"
 			}
 		}
 		else {
@@ -1792,6 +1771,16 @@ void MDLexer::mEXPONENT(bool _createToken) {
 		match('E' /* charlit */ );
 		break;
 	}
+	case 0x64 /* 'd' */ :
+	{
+		match('d' /* charlit */ );
+		break;
+	}
+	case 0x44 /* 'D' */ :
+	{
+		match('D' /* charlit */ );
+		break;
+	}
 	default:
 	{
 		throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
@@ -1830,18 +1819,18 @@ void MDLexer::mEXPONENT(bool _createToken) {
 	}
 	}
 	{ // ( ... )+
-	int _cnt164=0;
+	int _cnt172=0;
 	for (;;) {
 		if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
 			matchRange('0','9');
 		}
 		else {
-			if ( _cnt164>=1 ) { goto _loop164; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+			if ( _cnt172>=1 ) { goto _loop172; } else {throw ANTLR_USE_NAMESPACE(antlr)NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
 		}
 		
-		_cnt164++;
+		_cnt172++;
 	}
-	_loop164:;
+	_loop172:;
 	}  // ( ... )+
 	if ( _createToken && _token==ANTLR_USE_NAMESPACE(antlr)nullToken && _ttype!=ANTLR_USE_NAMESPACE(antlr)Token::SKIP ) {
 	   _token = makeToken(_ttype);
@@ -1894,35 +1883,40 @@ const unsigned long MDLexer::_tokenSet_0_data_[] = { 4
 const unsigned long MDLexer::_tokenSet_0_data_[] = { 4294958079UL, 4294966271UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xb 0xc 0xe 0xf 0x10 0x11 0x12 
 // 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f   ! 
-// \" # $ % & \' ( ) + , - . / 0 1 2 
+// \" # $ % & \' ( ) + , - . / 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_0(_tokenSet_0_data_,16);
 const unsigned long MDLexer::_tokenSet_1_data_[] = { 4294958079UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xb 0xc 0xe 0xf 0x10 0x11 0x12 
 // 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f   ! 
-// \" # $ % & \' ( ) * + , - . / 0 1 2 
+// \" # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_1(_tokenSet_1_data_,16);
 const unsigned long MDLexer::_tokenSet_2_data_[] = { 0UL, 2164195460UL, 268435456UL, 22298694UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// \" \' 0 1 2 
+// \" \' 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_2(_tokenSet_2_data_,10);
 const unsigned long MDLexer::_tokenSet_3_data_[] = { 4294958079UL, 4294967291UL, 4026531839UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xb 0xc 0xe 0xf 0x10 0x11 0x12 
 // 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f   ! 
-// # $ % & \' ( ) * + , - . / 0 1 2 
+// # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_3(_tokenSet_3_data_,16);
 const unsigned long MDLexer::_tokenSet_4_data_[] = { 0UL, 67043456UL, 126UL, 126UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// \' 0 1 2 
+// \' 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_4(_tokenSet_4_data_,10);
 const unsigned long MDLexer::_tokenSet_5_data_[] = { 4294967295UL, 4294967167UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 
-// 0x1f   ! \" # $ % & ( ) * + , - . / 0 1 2 
+// 0x1f   ! \" # $ % & ( ) * + , - . / 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_5(_tokenSet_5_data_,16);
-const unsigned long MDLexer::_tokenSet_6_data_[] = { 0UL, 0UL, 80UL, 80UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
+const unsigned long MDLexer::_tokenSet_6_data_[] = { 0UL, 0UL, 48UL, 48UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_6(_tokenSet_6_data_,10);
-const unsigned long MDLexer::_tokenSet_7_data_[] = { 0UL, 67043328UL, 126UL, 126UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// 0 1 2 
+const unsigned long MDLexer::_tokenSet_7_data_[] = { 0UL, 67053568UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
+// + - 0 1 2 3 4 5 
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_7(_tokenSet_7_data_,10);
-const unsigned long MDLexer::_tokenSet_8_data_[] = { 0UL, 16384UL, 112UL, 112UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
-// . 
+const unsigned long MDLexer::_tokenSet_8_data_[] = { 0UL, 0UL, 80UL, 80UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
 const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_8(_tokenSet_8_data_,10);
+const unsigned long MDLexer::_tokenSet_9_data_[] = { 0UL, 67043328UL, 126UL, 126UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
+// 0 1 2 3 4 5 
+const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_9(_tokenSet_9_data_,10);
+const unsigned long MDLexer::_tokenSet_10_data_[] = { 0UL, 16384UL, 112UL, 112UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
+// . 
+const ANTLR_USE_NAMESPACE(antlr)BitSet MDLexer::_tokenSet_10(_tokenSet_10_data_,10);