From e98ae73fc1ccc22e35ebc0bf87ae0f83953eb7a0 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Fri, 25 Jun 2010 16:46:36 +0000
Subject: [PATCH] Allowed "," to be in names again.   This was already being
 used in some cases.

---
 Cantera/src/base/stringUtils.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cantera/src/base/stringUtils.cpp b/Cantera/src/base/stringUtils.cpp
index 599b34efa..62bc8e8da 100644
--- a/Cantera/src/base/stringUtils.cpp
+++ b/Cantera/src/base/stringUtils.cpp
@@ -347,7 +347,7 @@ namespace Cantera {
   //================================================================================================
   // Parse a name string, separating out the phase name from the species name
   /*
-   *   Name strings must not contain these internal characters "; \n \t ," 
+   *   Name strings must not contain these internal characters "; \n \t " 
    *   Only one colon is allowed, the one separating the phase name from the
    *   species name. Therefore, names may not include a colon.
    *
@@ -363,11 +363,11 @@ namespace Cantera {
     std::string s = stripws(nameStr);
     std::string::size_type ibegin, iend, icolon;
     phaseName = "";
-    ibegin = s.find_first_not_of(", ;\n\t");
+    ibegin = s.find_first_not_of(" ;\n\t");
     if (ibegin != std::string::npos) {
       s = s.substr(ibegin,s.size());
       icolon = s.find(':');
-      iend = s.find_first_of(", ;\n\t");
+      iend = s.find_first_of(" ;\n\t");
       if (icolon != std::string::npos) {
 	phaseName = s.substr(0, icolon);
 	s = s.substr(icolon+1, s.size());
@@ -378,7 +378,7 @@ namespace Cantera {
       }
       if (iend != std::string::npos) {
 	throw CanteraError("parseSpeciesName()", 
-			   "Species name has \", ;/\n/\t\" in the middle of it: " + nameStr);
+			   "Species name has \" ;/\n/\t\" in the middle of it: " + nameStr);
       }
     }
     return s;