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

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

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

Revision 142 Revision 240
1/* 1/*
2 data.c - Part of psiconv, a PSION 5 file formats converter 2 data.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 1999-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
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#include "data.h" 24#include "data.h"
25#include "list.h" 25#include "list.h"
26#include "unicode.h"
26 27
27#ifdef DMALLOC 28#ifdef DMALLOC
28#include <dmalloc.h> 29#include <dmalloc.h>
29#endif 30#endif
30 31
… …
39static void psiconv_free_paint_data_section_aux(void * section); 40static void psiconv_free_paint_data_section_aux(void * section);
40static void psiconv_free_clipart_section_aux(void * section); 41static void psiconv_free_clipart_section_aux(void * section);
41static void psiconv_free_formula_aux(void *data); 42static void psiconv_free_formula_aux(void *data);
42static void psiconv_free_sheet_worksheet_aux (void *data); 43static void psiconv_free_sheet_worksheet_aux (void *data);
43static void psiconv_free_sheet_variable_aux(void * variable); 44static void psiconv_free_sheet_variable_aux(void * variable);
45static void psiconv_free_sheet_cell_aux(void *cell);
46static void psiconv_free_sheet_line_aux(void *line);
47static void psiconv_free_sheet_worksheet_aux (void *data);
44 48
45static psiconv_word_styles_section psiconv_empty_word_styles_section(void); 49static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
46static psiconv_text_and_layout psiconv_empty_text_and_layout(void); 50static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
47static psiconv_texted_section psiconv_empty_texted_section(void); 51static psiconv_texted_section psiconv_empty_texted_section(void);
48static psiconv_page_header psiconv_empty_page_header(void); 52static psiconv_page_header psiconv_empty_page_header(void);
… …
79 { 83 {
80 0xff, /* red */ 84 0xff, /* red */
81 0xff, /* green */ 85 0xff, /* green */
82 0xff, /* blue */ 86 0xff, /* blue */
83 }; 87 };
88 static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ',
89 'N','e','w',' ',
90 'R','o','m','a','n',0 };
84 static struct psiconv_font_s font = 91 static struct psiconv_font_s font =
85 { 92 {
86 "Times New Roman", /* name */ 93 font_times, /* name */
87 3 /* screenfont */ 94 3 /* screenfont */
88 }; 95 };
89 struct psiconv_character_layout_s cl = 96 struct psiconv_character_layout_s cl =
90 { 97 {
91 &black, /* color */ 98 &black, /* color */
… …
104 111
105/* Note: these defaults seem to be hard-coded somewhere outside the 112/* Note: these defaults seem to be hard-coded somewhere outside the
106 files themself. */ 113 files themself. */
107psiconv_paragraph_layout psiconv_basic_paragraph_layout(void) 114psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)
108{ 115{
116 static psiconv_ucs2 font_times[16] = { 'T','i','m','e','s',' ',
117 'N','e','w',' ',
118 'R','o','m','a','n',0 };
119
109 static struct psiconv_font_s font = 120 static struct psiconv_font_s font =
110 { 121 {
111 "Times New Roman", /* name */ 122 font_times, /* name */
112 2 /* screenfont */ 123 2 /* screenfont */
113 }; 124 };
114 static struct psiconv_color_s black = 125 static struct psiconv_color_s black =
115 { 126 {
116 0x00, /* red */ 127 0x00, /* red */
… …
131 }; 142 };
132 static struct psiconv_bullet_s bullet = 143 static struct psiconv_bullet_s bullet =
133 { 144 {
134 psiconv_bool_false, /* on */ 145 psiconv_bool_false, /* on */
135 10.0, /* font_size */ 146 10.0, /* font_size */
136 0x95, /* character */ 147 0x201d, /* character */
137 psiconv_bool_true, /* indent */ 148 psiconv_bool_true, /* indent */
138 &black, /* color */ 149 &black, /* color */
139 &font, /* font */ 150 &font, /* font */
140 }; 151 };
141 static struct psiconv_all_tabs_s tabs = 152 static struct psiconv_all_tabs_s tabs =
… …
190{ 201{
191 psiconv_font result; 202 psiconv_font result;
192 if(!(result = malloc(sizeof(*result)))) 203 if(!(result = malloc(sizeof(*result))))
193 goto ERROR1; 204 goto ERROR1;
194 *result = *font; 205 *result = *font;
195 if (!(result->name = strdup(result->name))) 206 if (!(result->name = psiconv_unicode_strdup(result->name)))
196 goto ERROR2; 207 goto ERROR2;
197 return result; 208 return result;
198ERROR2: 209ERROR2:
199 free(result); 210 free(result);
200ERROR1: 211ERROR1:
… …
436 psiconv_free_style_aux(style); 447 psiconv_free_style_aux(style);
437 free(style); 448 free(style);
438 } 449 }
439} 450}
440 451
452void psiconv_free_word_style_list(psiconv_word_style_list style_list)
453{
454 if (style_list)
455 psiconv_list_free_el(style_list,psiconv_free_style_aux);
456}
457
441void psiconv_free_word_styles_section(psiconv_word_styles_section styles) 458void psiconv_free_word_styles_section(psiconv_word_styles_section styles)
442{ 459{
443 if (styles) { 460 if (styles) {
444 psiconv_free_word_style(styles->normal); 461 psiconv_free_word_style(styles->normal);
445 if (styles->styles) 462 psiconv_free_word_style_list(styles->styles);
446 psiconv_list_free_el(styles->styles,psiconv_free_style_aux); 463 free(styles);
447 } 464 }
448} 465}
449 466
450void psiconv_free_header_section(psiconv_header_section header) 467void psiconv_free_header_section(psiconv_header_section header)
451{ 468{
… …
472 free(section->name); 489 free(section->name);
473 free(section); 490 free(section);
474 } 491 }
475} 492}
476 493
494void psiconv_free_object_icon_section(psiconv_object_icon_section section)
495{
496 if (section) {
497 if (section->icon_name)
498 free(section->icon_name);
499 free(section);
500 }
501}
502
503void psiconv_free_object_display_section(psiconv_object_display_section section)
504{
505 if (section)
506 free(section);
507}
508
509void psiconv_free_embedded_object_section
510 (psiconv_embedded_object_section object)
511{
512 if (object) {
513 psiconv_free_object_icon_section(object->icon);
514 psiconv_free_object_display_section(object->display);
515 psiconv_free_file(object->object);
516 free(object);
517 }
518}
519
477void psiconv_free_in_line_layout_aux(void * layout) 520void psiconv_free_in_line_layout_aux(void * layout)
478{ 521{
479 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); 522 psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout);
523 psiconv_free_embedded_object_section
524 (((psiconv_in_line_layout) layout)->object);
480} 525}
481 526
482void psiconv_free_in_line_layout(psiconv_in_line_layout layout) 527void psiconv_free_in_line_layout(psiconv_in_line_layout layout)
483{ 528{
484 if (layout) { 529 if (layout) {
… …
853} 898}
854 899
855void psiconv_free_clipart_section_aux(void *section) 900void psiconv_free_clipart_section_aux(void *section)
856{ 901{
857 if (section) 902 if (section)
858 free(((psiconv_clipart_section ) section)->picture); 903 psiconv_free_paint_data_section(((psiconv_clipart_section) section)->picture);
859} 904}
860 905
861void psiconv_free_clipart_section(psiconv_clipart_section section) 906void psiconv_free_clipart_section(psiconv_clipart_section section)
862{ 907{
863 if (section) { 908 if (section) {
… …
916 const psiconv_font value2) 961 const psiconv_font value2)
917{ 962{
918 if (!value1 || !value2 || !value1->name || !value2->name) 963 if (!value1 || !value2 || !value1->name || !value2->name)
919 return 1; 964 return 1;
920 if ((value1->screenfont == value2->screenfont) && 965 if ((value1->screenfont == value2->screenfont) &&
921 !strcmp(value1->name,value2->name)) 966 !psiconv_unicode_strcmp(value1->name,value2->name))
922 return 0; 967 return 0;
923 else 968 else
924 return 1; 969 return 1;
925} 970}
926 971
… …
1314psiconv_sketch_section psiconv_empty_sketch_section(void) 1359psiconv_sketch_section psiconv_empty_sketch_section(void)
1315{ 1360{
1316 psiconv_sketch_section result; 1361 psiconv_sketch_section result;
1317 if (!(result = malloc(sizeof(*result)))) 1362 if (!(result = malloc(sizeof(*result))))
1318 goto ERROR1; 1363 goto ERROR1;
1319 result->form_xsize = 320; 1364 result->displayed_xsize = 320;
1320 result->form_ysize = 200; 1365 result->displayed_ysize = 200;
1321 result->picture_x_offset = result->picture_y_offset = result->picture_xsize = 1366 result->picture_data_x_offset = result->picture_data_y_offset =
1322 result->picture_ysize = 0; 1367 result->form_xsize = result->form_ysize =
1368 result->displayed_size_x_offset = result->displayed_size_y_offset = 0;
1323 result->magnification_x = result->magnification_y = 1.0; 1369 result->magnification_x = result->magnification_y = 1.0;
1324 result->cut_left = result->cut_right = result->cut_top = 1370 result->cut_left = result->cut_right = result->cut_top =
1325 result->cut_bottom = 0.0; 1371 result->cut_bottom = 0.0;
1326 if (!(result->picture = psiconv_empty_paint_data_section())) 1372 if (!(result->picture = psiconv_empty_paint_data_section()))
1327 goto ERROR2; 1373 goto ERROR2;
Legend:
Removed from v.142  
changed lines
  Added in v.240
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26