/[public]/psiconv/trunk/lib/psiconv/parse_layout.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_layout.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 67 Revision 143
… …
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21#include "compat.h"
22
21#include <stdlib.h> 23#include <stdlib.h>
22#include <math.h> 24#include <math.h>
23 25
24#include "data.h"
25#include "parse_routines.h" 26#include "parse_routines.h"
27#include "error.h"
28
29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
26 33
27int psiconv_parse_color(const psiconv_buffer buf, int lev, psiconv_u32 off, 34int psiconv_parse_color(const psiconv_buffer buf, int lev, psiconv_u32 off,
28 int *length, psiconv_color *result) 35 int *length, psiconv_color *result)
29{ 36{
30 int res = 0; 37 int res = 0;
… …
161 168
162 psiconv_progress(lev+2,off+len,"Going to read border thickness"); 169 psiconv_progress(lev+2,off+len,"Going to read border thickness");
163 (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res); 170 (*result)->thickness = psiconv_read_size(buf,lev+2,off+len,&leng,&res);
164 if (res) 171 if (res)
165 goto ERROR2; 172 goto ERROR2;
173#if 0
174 /* This seems no longer necessary to test? */
166 if (((*result)->kind != psiconv_border_solid) && 175 if (((*result)->kind != psiconv_border_solid) &&
167 ((*result)->kind != psiconv_border_double) && 176 ((*result)->kind != psiconv_border_double) &&
168 ((*result)->thickness != 0.0) && 177 ((*result)->thickness != 0.0) &&
169 (fabs((*result)->thickness - 1/20) >= 1/1000)) { 178 (fabs((*result)->thickness - 1/20) >= 1/1000)) {
170 psiconv_warn(lev+2,off, 179 psiconv_warn(lev+2,off,
171 "Border thickness specified for unlikely border type"); 180 "Border thickness specified for unlikely border type");
172 } 181 }
182#endif
173 psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness); 183 psiconv_debug(lev+2,off+len,"Thickness: %f",(*result)->thickness);
174 len += leng; 184 len += leng;
175 185
176 psiconv_progress(lev+2,off+len,"Going to read the border color"); 186 psiconv_progress(lev+2,off+len,"Going to read the border color");
177 if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color))) 187 if ((psiconv_parse_color(buf,lev+2,off+len,&leng,&(*result)->color)))
178 goto ERROR2; 188 goto ERROR2;
179 len += leng; 189 len += leng;
180 190
181 psiconv_progress(lev+2,off+len,"Going to read the final unknown byte " 191 psiconv_progress(lev+2,off+len,"Going to read the final unknown byte "
182 "(0x01 expected)"); 192 "(0x00 or 0x01 expected)");
183 temp = psiconv_read_u8(buf,lev+2,off + len,&res); 193 temp = psiconv_read_u8(buf,lev+2,off + len,&res);
184 if (res) 194 if (res)
185 goto ERROR3; 195 goto ERROR3;
186 if (temp != 0x01) { 196 if ((temp != 0x01) && (temp != 0x00)) {
187 psiconv_warn(lev+2,off,"Unknown last byte in border specification"); 197 psiconv_warn(lev+2,off,"Unknown last byte in border specification");
188 psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x", 198 psiconv_debug(lev+2,off+len, "Last byte: read %02x, expected %02x or %02x",
189 temp,0x01); 199 temp,0x00,0x01);
190 } 200 }
191 len ++; 201 len ++;
192 202
193 if (length) 203 if (length)
194 *length = len; 204 *length = len;
… …
444 "in paragraph layout codes list"); 454 "in paragraph layout codes list");
445 result->justify_ver = psiconv_justify_bottom; 455 result->justify_ver = psiconv_justify_bottom;
446 } 456 }
447 psiconv_debug(lev+3,off+len,"Justify: %02x",temp); 457 psiconv_debug(lev+3,off+len,"Justify: %02x",temp);
448 len ++; 458 len ++;
459 break;
449 case 0x07: 460 case 0x07:
450 psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); 461 psiconv_progress(lev+3,off+len,"Going to read linespacing distance");
451 result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 462 result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
452 if (res) 463 if (res)
453 goto ERROR1; 464 goto ERROR1;
… …
500 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, 511 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
501 &result->no_widow_protection))) 512 &result->no_widow_protection)))
502 goto ERROR1; 513 goto ERROR1;
503 len += leng; 514 len += leng;
504 break; 515 break;
516 case 0x0f:
517 psiconv_progress(lev+3,off+len,"Going to read wrap to fit cell limits");
518 if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng,
519 &result->wrap_to_fit_cell)))
520 goto ERROR1;
521 len += leng;
522 break;
505 case 0x10: 523 case 0x10:
506 psiconv_progress(lev+3,off+len,"Going to read border distance to text"); 524 psiconv_progress(lev+3,off+len,"Going to read border distance to text");
507 result->border_distance = psiconv_read_length(buf,lev+3, 525 result->border_distance = psiconv_read_length(buf,lev+3,
508 off+len,&leng,&res); 526 off+len,&leng,&res);
509 if (res) 527 if (res)
… …
564 goto ERROR1; 582 goto ERROR1;
565 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) { 583 if ((res = psiconv_list_add(result->tabs->extras,temp_tab))) {
566 psiconv_free_tab(temp_tab); 584 psiconv_free_tab(temp_tab);
567 goto ERROR1; 585 goto ERROR1;
568 } 586 }
587 psiconv_free_tab(temp_tab);
569 len += leng; 588 len += leng;
570 break; 589 break;
571 default: 590 default:
572 psiconv_warn(lev+3,off+len, 591 psiconv_warn(lev+3,off+len,
573 "Unknown code in paragraph layout codes list"); 592 "Unknown code in paragraph layout codes list");
… …
636 if (res) 655 if (res)
637 goto ERROR1; 656 goto ERROR1;
638 psiconv_debug(lev+3,off+len,"Id: %02x",id); 657 psiconv_debug(lev+3,off+len,"Id: %02x",id);
639 len ++; 658 len ++;
640 switch(id) { 659 switch(id) {
660 case 0x18:
661 psiconv_progress(lev+3,off+len,"Going to skip an unknown setting");
662 len ++;
663 break;
641 case 0x19: 664 case 0x19:
642 psiconv_progress(lev+3,off+len,"Going to read text color"); 665 psiconv_progress(lev+3,off+len,"Going to read text color");
643 if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) 666 if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color)))
644 goto ERROR1; 667 goto ERROR1;
645 psiconv_free_color(result->color); 668 psiconv_free_color(result->color);
… …
651 if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) 674 if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color)))
652 goto ERROR1; 675 goto ERROR1;
653 psiconv_free_color(result->back_color); 676 psiconv_free_color(result->back_color);
654 result->back_color = temp_color; 677 result->back_color = temp_color;
655 len += leng; 678 len += leng;
679 break;
680 case 0x1b:
681 psiconv_progress(lev+3,off+len,"Going to skip an unknown setting");
682 len ++;
656 break; 683 break;
657 case 0x1c: 684 case 0x1c:
658 psiconv_progress(lev+3,off+len,"Going to read font size"); 685 psiconv_progress(lev+3,off+len,"Going to read font size");
659 result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); 686 result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res);
660 if (res) 687 if (res)
… …
711 goto ERROR1; 738 goto ERROR1;
712 psiconv_free_font(result->font); 739 psiconv_free_font(result->font);
713 result->font = temp_font; 740 result->font = temp_font;
714 len += leng; 741 len += leng;
715 break; 742 break;
743 case 0x23:
744 psiconv_progress(lev+3,off+len,"Going to skip an unknown setting");
745 len ++;
746 break;
716 case 0x24: 747 case 0x24:
717 psiconv_progress(lev+3,off+len, 748 psiconv_progress(lev+3,off+len,
718 "Going to read unknown code 0x24 (%02x expected)", 0); 749 "Going to read unknown code 0x24 (%02x expected)", 0);
719 temp = psiconv_read_u8(buf,lev+3,off+len,&res); 750 temp = psiconv_read_u8(buf,lev+3,off+len,&res);
720 if (res) 751 if (res)
Legend:
Removed from v.67  
changed lines
  Added in v.143
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26