*** Project.java	Wed Jul 12 20:51:30 2000
--- ProjectNew.java	Thu Aug 31 06:08:04 2000
***************
*** 678,689 ****
                          value = (String) tokens.get(token);
                          log("Replacing: " + TOKEN_START + token + TOKEN_END + " -> " + value, MSG_VERBOSE);
                          b.append(value);
                      } else {
                          b.append(TOKEN_START);
!                         b.append(token);
!                         b.append(TOKEN_END);
                      }
-                     i = index + TOKEN_START.length() + token.length() + TOKEN_END.length();
                  } while ((index = s.indexOf(TOKEN_START, i)) > -1);
  
                  b.append(s.substring(i));
--- 678,688 ----
                          value = (String) tokens.get(token);
                          log("Replacing: " + TOKEN_START + token + TOKEN_END + " -> " + value, MSG_VERBOSE);
                          b.append(value);
+ 						i = index + TOKEN_START.length() + token.length() + TOKEN_END.length();
                      } else {
                          b.append(TOKEN_START);
! 						i = index + TOKEN_START.length();	// start looking immediately after TOKEN_START
                      }
                  } while ((index = s.indexOf(TOKEN_START, i)) > -1);
  
                  b.append(s.substring(i));