diff -rubB xdvik-22.40/libs/t1lib/lib/t1lib/t1enc.c xdvik/libs/t1lib/lib/t1lib/t1enc.c
--- xdvik-22.40/libs/t1lib/lib/t1lib/t1enc.c	Thu Apr 19 01:23:16 2001
+++ xdvik/libs/t1lib/lib/t1lib/t1enc.c	Mon Jun  4 01:22:04 2001
@@ -61,24 +61,99 @@
 #include "t1finfo.h"
 
 
-#define DEFAULTENCODINGNAME  "Unspecified"
+static char *defaultencodingname="Unspecified";
+static char *notdef=".notdef";
+
+/* ScanForWord(): Tokenizer for ScanEncodingFile.  Will skip whitespace and
+   comments and return the tokens/words in the vector passed */
+
+char *ScanForWord(char *lb,int size)
+{
+  static int i=-1;
+  static save_char=0;
+  int j;
+  int comment;
+
+  /* Reset tokenizer */
+  if (lb==NULL) {
+    i=-1;
+    save_char=0;
+    return NULL;
+  }
+
+  if (save_char)
+    lb[i]=save_char;
+  comment=0;
+  j=-1;
+
+  while (++i<size) {
+
+    /* **Inside word */
+    if (j!=-1) {
+      /* Whitespace or comment ends word */
+      if ( isspace((int)lb[i]) || (lb[i]=='%') ) {
+	save_char=lb[i];
+	lb[i]='\0';
+	return &lb[j];
+      }
+      /* End not found */
+      continue;
+    }
+
+    /* **Inside coment */
+    if (comment) {
+      if (lb[i]=='\n')
+	comment=0;
+      continue;
+    }
+    if (lb[i]=='%') {
+      comment=1;
+      continue;
+    }
+
+    /* **Whitespace */
+    if (isspace((int)lb[i]))
+      continue;
+
+    /* **Something else => word */
+    if (j==-1) {
+      j=i;
+      continue;
+    }
+  }
+
+  /* We're at the end of the buffer. Do we have a word? */
+  if (j!=-1)
+    return &lb[j];
+
+  /* We have nothing */
+  return NULL;
+}
+ 
 
 
 /* ScanEncodingFile(): Read an encoding file of an appropriate format
    and prepare the read data for usage with the type1 rasterizer, i.e.
    generate an array char *enc[256]. Return the pointer to the data area
    or NULL in case of an error.
-   */
+
+   Enhanced to read more postscript like syntax as well as the
+   restricted t1lib syntax for compatability with existing postscript
+   .enc files - janl 2/6/2001
+*/
 char **ScanEncodingFile( char *FileName) 
 {
   
   char *linebuf;
+  char *token;
   char *charnames;
   char save_char;
   char **encoding;
+  char postscript=0;
+  char *encname=NULL;
   
   FILE *enc_fp;
-  int filesize, i, j, k, l=0, charname_count;
+  int filesize, i, j, k, charname_count;
 
   if ((enc_fp=fopen( FileName,"r"))==NULL){
     T1_errno=T1ERR_FILE_OPEN_ERR;
@@ -86,7 +161,6 @@
 		      => no encoding read */
   }
   
-  
   /* enc_fp points now to a (hopefully) valid encoding file */
   /* Get the file size */
   fseek( enc_fp, 0, SEEK_END);
@@ -102,7 +176,7 @@
   
   /* Allocate space for character names, assume the worst case and realloc
      later: */
-  if ((charnames=(char *)calloc( filesize + strlen(DEFAULTENCODINGNAME),
+  if ((charnames=(char *)calloc( filesize + strlen(defaultencodingname),
 				 sizeof(char)))==NULL){
     T1_errno=T1ERR_ALLOC_MEM;
     return(NULL);
@@ -113,91 +187,111 @@
 
   i=0;
   
-  while(i<filesize){
-    j=i;     /* Save index of beginning of line */
-    while (isspace((int)linebuf[i])==0)
-      i++;
-    save_char=linebuf[i];
-    linebuf[i]=0;  /* replace ' ' by ASCII-0 */
-    if (strncmp( "Encoding=", &linebuf[j], strlen("Encoding="))==0){
+  (void) ScanForWord(NULL,0);
+
+  token=ScanForWord(linebuf,filesize);
+  
+  if (token[0]=='/') { 
+    /* / indicates start of postscript string literal, so this must
+       be a postscript .enc file */
+    postscript=1;
+    encname=strdup(&token[1]);
+
+    token=ScanForWord(linebuf,filesize);
+
+    if (strcmp(token,"[")!=0) {
+      fprintf(stderr,"Postscript encoding: Expected '[' as next token in %s\n",
+	      FileName);
+      goto scan_exit;
+    }
+  } else if (strncmp( "Encoding=", token, strlen("Encoding="))==0){
       /* We save the current file position to read the encoding name
 	 later */
-      l=j+strlen("Encoding=");
-      /* set index to start of next line */
-      if (save_char=='\n')
-	i++;   
-      else {
-	while (linebuf[i]!='\n')
-	  i++;
-	i++;
+    encname=strdup(&token[strlen("Encoding=")]);
+  } else {
+    fprintf(stderr,"Encoding name not found in %s!\n",FileName);
+    goto scan_exit;
       }
-      /* keyword found => now, 256 lines should follow, each
+  
+/* keyword found => now, 256 lines/words should follow, each
 	 specifying a character name and optionally some comment
 	 to enhance readability: */
-      break;
-    }
-    i++;
-  }
   
-  k=0;
+  k=-1;
   charname_count=0;
 
-  while((i<filesize) && (charname_count<256)){
-    j=i;     /* Save index of beginning of line */
-    while (isspace((int)linebuf[i])==0)
-      i++;
-    save_char=linebuf[i];
-    linebuf[i]=0;  /* replace whitespace by ASCII-0 */
-    /* Copy Name to *char_names-array */
-    while (linebuf[j])
-      charnames[k++]=linebuf[j++];
-    /* Append ASCII-0 */
-    charnames[k++]=linebuf[j++];
-    /* set index to start of next line */
-    if (save_char=='\n')
-      i++;   
-    else {
-      while (linebuf[i]!='\n')
-	i++;
-      i++;
+  while((charname_count<256) && 
+	((token=ScanForWord(linebuf,filesize))!=NULL) ) {
+
+    if (postscript) {
+      /* End of vector operator? */
+      if (token[0]==']')
+	break;
+
+      /* Not interested in quote character */
+      if (token[0]=='/') 
+	token++; 
     }
+
+    /* Copy Name to *char_names-array */
+    j=-1;
+    do {
+      charnames[++k]=token[++j];
+    } while (token[j]);
     /* Increment character counter */
     charname_count++;
+    /* set index to start of next word/line */
+  }
+
+scan_exit:
+
+  if (postscript && charname_count!=256) {
+    /* Postscript encoding-vectors need not have 256 elements, but t1lib
+       does need 256 elements */
+    while (charname_count<256) {
+      j=-1;
+      do {
+	charnames[++k]=notdef[++j];
+      } while (notdef[j]);
+      charname_count++;
+    }
   }
 
   /* Check if exactly 256 characters have been defined, if not,
      return NULL: */
   if (charname_count!=256){
     free(charnames);
+    if (encname) free(encname);
     T1_errno=T1ERR_UNSPECIFIED;
     return(NULL);
   }
 
-  /* Append the string for the encoding's name */
-  i=l;
-  while (isspace((int)linebuf[i])==0 && linebuf[i]!='\0'){
-    charnames[k++]=linebuf[i++];
+  if (encname[0]=='\0') {
+    /* Null string? ScanForWord will not return words with any blanks */ 
+    free(encname);
+    encname=NULL;
   }
   
-  if (i==l){
-    strcpy(&(charnames[k]), DEFAULTENCODINGNAME);
-    k +=strlen(DEFAULTENCODINGNAME);
-    charnames[k++]='\0';
-  }
-  else{
-    charnames[k++]='\0';
-  }
+  if (encname==NULL) encname=defaultencodingname;
+
+  /* Append the string for the encoding's name => 257th entry */
+  i=-1;
+  do  {
+    charnames[++k]=encname[++i];
+  } while (encname[i]);
 
+  if (encname!=defaultencodingname) free(encname);
   free(linebuf);
 
   /* We alloc 257 to save the encoding's name at the 257th entry */
-  if ((encoding=(char **)malloc(257*sizeof(char *)))==NULL){
+  if ((encoding=(char **)malloc(257*sizeof(char *)))==NULL) {
     free(charnames);
     T1_errno=T1ERR_ALLOC_MEM;
     return(NULL);
   }
   /* k should still contain the number of characters copied, so let's
      now realloc charnames */
+  k++; /* It started at -1 */
   charnames=(char *)realloc( charnames, k*sizeof(char));
   /* Now initialize the array with the start-addresses of the character
      name strings */