--- psiconv/trunk/lib/psiconv/parse_layout.c 2000/12/28 00:24:58 84 +++ psiconv/trunk/lib/psiconv/parse_layout.c 2001/03/04 22:10:45 110 @@ -451,6 +451,7 @@ } psiconv_debug(lev+3,off+len,"Justify: %02x",temp); len ++; + break; case 0x07: psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); @@ -507,6 +508,13 @@ goto ERROR1; len += leng; break; + case 0x0f: + psiconv_progress(lev+3,off+len,"Going to read wrap to fit cell limits"); + if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, + &result->wrap_to_fit_cell))) + goto ERROR1; + len += leng; + break; case 0x10: psiconv_progress(lev+3,off+len,"Going to read border distance to text"); result->border_distance = psiconv_read_length(buf,lev+3, @@ -643,6 +651,10 @@ psiconv_debug(lev+3,off+len,"Id: %02x",id); len ++; switch(id) { + case 0x18: + psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); + len ++; + break; case 0x19: psiconv_progress(lev+3,off+len,"Going to read text color"); if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) @@ -659,6 +671,10 @@ result->back_color = temp_color; len += leng; break; + case 0x1b: + psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); + len ++; + break; case 0x1c: psiconv_progress(lev+3,off+len,"Going to read font size"); result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); @@ -718,6 +734,10 @@ result->font = temp_font; len += leng; break; + case 0x23: + psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); + len ++; + break; case 0x24: psiconv_progress(lev+3,off+len, "Going to read unknown code 0x24 (%02x expected)", 0);