[Jörg Lehmann <joergl@us...>]

Update of /cvsroot/pyx/pyx/pyx/font
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23501/pyx/font

Modified Files:
	t1font.py 
Log Message:
follow PLRM p. 27 and accept various characters as indicators for a new token

Index: t1font.py
===================================================================
RCS file: /cvsroot/pyx/pyx/pyx/font/t1font.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** t1font.py	29 Sep 2005 15:51:56 -0000	1.4
--- t1font.py	12 Feb 2006 13:06:52 -0000	1.5
***************
*** 524,528 ****
      """cursor to read a string token by token"""
  
!     def __init__(self, data, startstring, eattokensep=1, tokenseps=" \t\r\n"):
          """creates a cursor for the string data
  
--- 524,528 ----
      """cursor to read a string token by token"""
  
!     def __init__(self, data, startstring, eattokensep=1, tokenseps=" \t\r\n", tokenstarts="()<>[]{}/"):
          """creates a cursor for the string data
  
***************
*** 533,545 ****
          followed by a tokensep and this first tokensep is also consumed.
          tokenseps is a string containing characters to be used as token
!         separators.
          """
          self.data = data
          self.pos = data.index(startstring) + len(startstring)
          self.tokenseps = tokenseps
          if eattokensep:
!             if self.data[self.pos] not in self.tokenseps:
!                 raise ValueError("cursor initialization string is not followed by a token separator")
!             self.pos += 1
  
      def gettoken(self):
--- 533,548 ----
          followed by a tokensep and this first tokensep is also consumed.
          tokenseps is a string containing characters to be used as token
!         separators. tokenstarts is a string containing characters which 
!         directly (even without intermediate token separator) start a new token.
          """
          self.data = data
          self.pos = data.index(startstring) + len(startstring)
          self.tokenseps = tokenseps
+         self.tokenstarts = tokenstarts
          if eattokensep:
!             if self.data[self.pos] not in self.tokenstarts:
!                 if self.data[self.pos] not in self.tokenseps:
!                     raise ValueError("cursor initialization string is not followed by a token separator")
!                 self.pos += 1
  
      def gettoken(self):
***************
*** 552,558 ****
          startpos = self.pos
          while self.data[self.pos] not in self.tokenseps:
              self.pos += 1
!         self.pos += 1 # consume a single tokensep
!         return self.data[startpos: self.pos-1]
  
      def getint(self):
--- 555,566 ----
          startpos = self.pos
          while self.data[self.pos] not in self.tokenseps:
+             # any character in self.tokenstarts ends the token
+             if self.pos>startpos and self.data[self.pos] in self.tokenstarts:
+                 break
              self.pos += 1
!         result = self.data[startpos:self.pos]
!         if self.data[self.pos] in self.tokenseps:
!             self.pos += 1 # consume a single tokensep
!         return result
  
      def getint(self):