--- psiconv/trunk/lib/psiconv/parse_layout.c	2004/01/06 20:15:01	184
+++ psiconv/trunk/lib/psiconv/parse_layout.c	2005/11/15 15:52:34	270
@@ -1,6 +1,6 @@
 /*
     parse_layout.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999, 2000  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999-2005  Frodo Looijaard <frodo@frodo.looijaard.name>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@
     goto ERROR2;
   len = 1;
 
-  (*result)->name = psiconv_read_charlist(config,buf,lev+2,off, fontlen-1,&res);
+  (*result)->name = psiconv_read_charlist(config,buf,lev+2,off+len, fontlen-1,&res);
   if (res)
     goto ERROR2;
   len += fontlen - 1;
@@ -235,7 +235,6 @@
   int len = 0;
   int leng;
   int bullet_length;
-  psiconv_u8 temp;
 
   if (!(*result = malloc(sizeof(**result))))
     goto ERROR1;
@@ -256,12 +255,12 @@
   len +=leng;
   
   psiconv_progress(config,lev+2,off+len,"Going to read bullet character");
-  temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
+  (*result)->character = psiconv_unicode_read_char(config,buf,lev+2,
+						   off+len,&leng,&res);
   if (res)
     goto ERROR2;
-  (*result)->character = psiconv_unicode_from_char(config,temp);
   psiconv_debug(config,lev+2,off+len,"Character: %02x",(*result)->character);
-  len ++;
+  len += leng;
   
   psiconv_progress(config,lev+2,off+len,"Going to read indent on/off");
   if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,&(*result)->indent)))