… | |
… | |
20 | #include "config.h" |
20 | #include "config.h" |
21 | #include "compat.h" |
21 | #include "compat.h" |
22 | #include <stdlib.h> |
22 | #include <stdlib.h> |
23 | #include <string.h> |
23 | #include <string.h> |
24 | |
24 | |
25 | #include "data.h" |
|
|
26 | #include "parse_routines.h" |
25 | #include "parse_routines.h" |
|
|
26 | #include "error.h" |
27 | |
27 | |
28 | static int psiconv_parse_layout_section(const psiconv_buffer buf, |
28 | static int psiconv_parse_layout_section(const psiconv_buffer buf, |
29 | int lev,psiconv_u32 off, |
29 | int lev,psiconv_u32 off, |
30 | int *length, |
30 | int *length, |
31 | psiconv_text_and_layout result, |
31 | psiconv_text_and_layout result, |
… | |
… | |
87 | (*result)->file = psiconv_texted_file; |
87 | (*result)->file = psiconv_texted_file; |
88 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
88 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
89 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
89 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
90 | (*result)->file = psiconv_sketch_file; |
90 | (*result)->file = psiconv_sketch_file; |
91 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
91 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
|
|
92 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
|
|
93 | (*result)->file = psiconv_sheet_file; |
|
|
94 | psiconv_debug(lev+2,off+len,"File is a Sheet file"); |
92 | } |
95 | } |
93 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
96 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
94 | (*result)->file = psiconv_mbm_file; |
97 | (*result)->file = psiconv_mbm_file; |
95 | if ((*result)->uid3 != 0x00) |
98 | if ((*result)->uid3 != 0x00) |
96 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
99 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
97 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
100 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
… | |
… | |
714 | psiconv_progress(lev+4,off+len,"Going to read the element type"); |
717 | psiconv_progress(lev+4,off+len,"Going to read the element type"); |
715 | temp = psiconv_read_u8(buf,lev+4,len+off,&res); |
718 | temp = psiconv_read_u8(buf,lev+4,len+off,&res); |
716 | if (res) |
719 | if (res) |
717 | goto ERROR4; |
720 | goto ERROR4; |
718 | len += 1; |
721 | len += 1; |
719 | psiconv_debug(lev+4,off,"Type: %02x",temp); |
722 | psiconv_debug(lev+4,off+len,"Type: %02x",temp); |
720 | psiconv_progress(lev+4,off, |
723 | psiconv_progress(lev+4,off+len, |
721 | "Going to read the number of characters it applies to"); |
724 | "Going to read the number of characters it applies to"); |
722 | in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); |
725 | in_line.length = psiconv_read_u32(buf,lev+4,len+off,&res); |
723 | if (res) |
726 | if (res) |
724 | goto ERROR4; |
727 | goto ERROR4; |
725 | psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); |
728 | psiconv_debug(lev+4,off+len,"Length: %02x",in_line.length); |
… | |
… | |
767 | psiconv_list_free(anon_styles); |
770 | psiconv_list_free(anon_styles); |
768 | |
771 | |
769 | if (length) |
772 | if (length) |
770 | *length = len; |
773 | *length = len; |
771 | |
774 | |
772 | psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x", |
775 | psiconv_progress(lev+1,off+len-1,"End of layout section (total length: %08x)", |
773 | len); |
776 | len); |
774 | |
777 | |
775 | return 0; |
778 | return 0; |
776 | |
779 | |
777 | ERROR4_4: |
780 | ERROR4_4: |
… | |
… | |
822 | { |
825 | { |
823 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
826 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
824 | } |
827 | } |
825 | |
828 | |
826 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
829 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
827 | int lev,psiconv_u32 off, |
830 | int lev,psiconv_u32 off, |
828 | int *length, |
831 | int *length, |
829 | psiconv_text_and_layout result, |
832 | psiconv_text_and_layout result, |
830 | psiconv_character_layout base_char, |
833 | const psiconv_character_layout base_char, |
831 | psiconv_paragraph_layout base_para) |
834 | const psiconv_paragraph_layout base_para) |
832 | { |
835 | { |
833 | int res = 0; |
836 | int res = 0; |
834 | psiconv_word_styles_section styles_section; |
837 | psiconv_word_styles_section styles_section; |
835 | |
838 | |
836 | if (!(styles_section = malloc(sizeof(*styles_section)))) |
839 | if (!(styles_section = malloc(sizeof(*styles_section)))) |