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

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

Parent Directory | Revision Log | View Patch Patch

Revision 20		Revision 142
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 Frodo Looijaard <frodol@dds.nl>	3	Copyright (c) 1999, 2000 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 "general.h"	26
		27	#ifdef DMALLOC
		28	#include <dmalloc.h>
		29	#endif
27		30
28	static psiconv_color clone_color(psiconv_color color);	31	static psiconv_color clone_color(psiconv_color color);
29	static psiconv_font clone_font(psiconv_font font);	32	static psiconv_font clone_font(psiconv_font font);
30	static psiconv_border clone_border(psiconv_border border);	33	static psiconv_border clone_border(psiconv_border border);
31	static psiconv_bullet clone_bullet(psiconv_bullet bullet);	34	static psiconv_bullet clone_bullet(psiconv_bullet bullet);
32	static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs);	35	static psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs);
33	static void psiconv_free_style_aux(void *style);	36	static void psiconv_free_style_aux(void *style);
34	static void psiconv_free_in_line_layout_aux(void * layout);	37	static void psiconv_free_in_line_layout_aux(void * layout);
35	static void psiconv_free_paragraph_aux(void * paragraph);	38	static void psiconv_free_paragraph_aux(void * paragraph);
36	static void psiconv_free_paint_data_section_aux(void * section);	39	static void psiconv_free_paint_data_section_aux(void * section);
		40	static void psiconv_free_clipart_section_aux(void * section);
		41	static void psiconv_free_formula_aux(void *data);
		42	static void psiconv_free_sheet_worksheet_aux (void *data);
		43	static void psiconv_free_sheet_variable_aux(void * variable);
37		44
		45	static psiconv_word_styles_section psiconv_empty_word_styles_section(void);
		46	static psiconv_text_and_layout psiconv_empty_text_and_layout(void);
		47	static psiconv_texted_section psiconv_empty_texted_section(void);
		48	static psiconv_page_header psiconv_empty_page_header(void);
		49	static psiconv_page_layout_section psiconv_empty_page_layout_section(void);
		50	static psiconv_word_status_section psiconv_empty_word_status_section(void);
		51	static psiconv_word_f psiconv_empty_word_f(void);
		52	static psiconv_sheet_status_section psiconv_empty_sheet_status_section(void);
		53	static psiconv_formula_list psiconv_empty_formula_list(void);
		54	static psiconv_sheet_workbook_section
		55	psiconv_empty_sheet_workbook_section(void);
		56	static psiconv_sheet_f psiconv_empty_sheet_f(void);
		57	static psiconv_texted_f psiconv_empty_texted_f(void);
		58	static psiconv_paint_data_section psiconv_empty_paint_data_section(void);
		59	static psiconv_pictures psiconv_empty_pictures(void);
		60	static psiconv_mbm_f psiconv_empty_mbm_f(void);
		61	static psiconv_sketch_section psiconv_empty_sketch_section(void);
		62	static psiconv_sketch_f psiconv_empty_sketch_f(void);
		63	static psiconv_clipart_f psiconv_empty_clipart_f(void);
		64	static psiconv_cliparts psiconv_empty_cliparts(void);
		65
		66
		67	/* Note: these defaults seem to be hard-coded somewhere outside the
		68	files themself. */
38	psiconv_character_layout psiconv_basic_character_layout(void)	69	psiconv_character_layout psiconv_basic_character_layout(void)
39	{	70	{
40	/* Make the structures static, to oblige IRIX */	71	/* Make the structures static, to oblige IRIX */
41	static struct psiconv_color black =	72	static struct psiconv_color_s black =
42	{	73	{
43	0x00, /* red */	74	0x00, /* red */
44	0x00, /* green */	75	0x00, /* green */
45	0x00, /* blue */	76	0x00, /* blue */
46	};	77	};
47	static struct psiconv_color white =	78	static struct psiconv_color_s white =
48	{	79	{
49	0xff, /* red */	80	0xff, /* red */
50	0xff, /* green */	81	0xff, /* green */
51	0xff, /* blue */	82	0xff, /* blue */
52	};	83	};
53	static struct psiconv_font font =	84	static struct psiconv_font_s font =
54	{	85	{
55	"Times New Roman", /* name */	86	"Times New Roman", /* name */
56	3 /* screenfont */	87	3 /* screenfont */
57	};	88	};
58	struct psiconv_character_layout cl =	89	struct psiconv_character_layout_s cl =
59	{	90	{
60	&black, /* color */	91	&black, /* color */
61	&white, /* back_color */	92	&white, /* back_color */
62	10.0, /* font_size */	93	10.0, /* font_size */
63	psiconv_bool_false, /* italic */	94	psiconv_bool_false, /* italic */
64	psiconv_bool_false, /* bold */	95	psiconv_bool_false, /* bold */
65	psiconv_normalscript, /* super_sub */	96	psiconv_normalscript, /* super_sub */
66	psiconv_bool_false, /* underline */	97	psiconv_bool_false, /* underline */
67	psiconv_bool_false, /* strike_out */	98	psiconv_bool_false, /* strikethrough */
68	NULL, /* font */	99	&font, /* font */
69	};	100	};
70		101
71	return psiconv_clone_character_layout(&cl);	102	return psiconv_clone_character_layout(&cl);
72	}	103	}
73		104
		105	/* Note: these defaults seem to be hard-coded somewhere outside the
		106	files themself. */
74	psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)	107	psiconv_paragraph_layout psiconv_basic_paragraph_layout(void)
75	{	108	{
76	static struct psiconv_font font =	109	static struct psiconv_font_s font =
77	{	110	{
78	"Times New Roman", /* name */	111	"Times New Roman", /* name */
79	2 /* screenfont */	112	2 /* screenfont */
80	};	113	};
81	static struct psiconv_color black =	114	static struct psiconv_color_s black =
82	{	115	{
83	0x00, /* red */	116	0x00, /* red */
84	0x00, /* green */	117	0x00, /* green */
85	0x00, /* blue */	118	0x00, /* blue */
86	};	119	};
87	static struct psiconv_color white =	120	static struct psiconv_color_s white =
88	{	121	{
89	0xff, /* red */	122	0xff, /* red */
90	0xff, /* green */	123	0xff, /* green */
91	0xff, /* blue */	124	0xff, /* blue */
92	};	125	};
93	static struct psiconv_border no_border =	126	static struct psiconv_border_s no_border =
94	{	127	{
95	psiconv_border_none, /* kind */	128	psiconv_border_none, /* kind */
96	1, /* thickness */	129	1, /* thickness */
97	&black /* color */	130	&black /* color */
98	};	131	};
99	static struct psiconv_bullet bullet =	132	static struct psiconv_bullet_s bullet =
100	{	133	{
101	psiconv_bool_false, /* on */	134	psiconv_bool_false, /* on */
102	10.0, /* font_size */	135	10.0, /* font_size */
103	0x95, /* character */	136	0x95, /* character */
104	psiconv_bool_true, /* indent */	137	psiconv_bool_true, /* indent */
105	&black, /* color */	138	&black, /* color */
106	&font, /* font */	139	&font, /* font */
107	};	140	};
108	static struct psiconv_all_tabs tabs =	141	static struct psiconv_all_tabs_s tabs =
109	{	142	{
110	0.64, /* normal */	143	0.64, /* normal */
111	NULL /* kind */	144	NULL /* kind */
112	};	145	};
113	struct psiconv_paragraph_layout pl =	146	struct psiconv_paragraph_layout_s pl =
114	{	147	{
115	&white, /* back_color */	148	&white, /* back_color */
116	0.0, /* indent_left */	149	0.0, /* indent_left */
117	0.0, /* indent_right */	150	0.0, /* indent_right */
118	0.0, /* indent_first */	151	0.0, /* indent_first */
119	psiconv_justify_left, /* justify_hor */	152	psiconv_justify_left, /* justify_hor */
120	psiconv_justify_middle,/* justify_ver */	153	psiconv_justify_middle,/* justify_ver */
121	0.0, /* interline */	154	10.0, /* linespacing */
122	psiconv_bool_false, /* interline_exact */	155	psiconv_bool_false, /* linespacing_exact */
123	0.0, /* top_space */	156	0.0, /* space_above */
124	0.0, /* bottom_space */	157	0.0, /* space_below */
125	psiconv_bool_false, /* on_one_page */
126	psiconv_bool_false, /* together_with */	158	psiconv_bool_false, /* keep_together */
		159	psiconv_bool_false, /* keep_with_next */
127	psiconv_bool_false, /* on_next_page */	160	psiconv_bool_false, /* on_next_page */
128	psiconv_bool_false, /* no_widow_protection */	161	psiconv_bool_false, /* no_widow_protection */
		162	psiconv_bool_false, /* wrap_to_fit_cell */
129	0.0, /* left_margin */	163	0.0, /* left_margin */
130	&bullet, /* bullet */	164	&bullet, /* bullet */
131	&no_border, /* left_border */	165	&no_border, /* left_border */
132	&no_border, /* right_border */	166	&no_border, /* right_border */
133	&no_border, /* top_border */	167	&no_border, /* top_border */
134	&no_border, /* bottom_border */	168	&no_border, /* bottom_border */
135	&tabs, /* tabs */	169	&tabs, /* tabs */
136	};	170	};
137	psiconv_paragraph_layout res;	171	psiconv_paragraph_layout res;
138		172
139	pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab));	173	if (!(pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab_s))))
		174	return NULL;
140	res = psiconv_clone_paragraph_layout(&pl);	175	res = psiconv_clone_paragraph_layout(&pl);
141	psiconv_list_free(pl.tabs->extras);	176	psiconv_list_free(pl.tabs->extras);
142	return res;	177	return res;
143	}	178	}
144		179
145	psiconv_color clone_color(psiconv_color color)	180	psiconv_color clone_color(psiconv_color color)
146	{	181	{
147	psiconv_color result;	182	psiconv_color result;
148	result = malloc(sizeof(*result));	183	if (!(result = malloc(sizeof(*result))))
		184	return NULL;
149	result = color;	185	result = color;
150	return result;	186	return result;
151	}	187	}
152		188
153	psiconv_font clone_font(psiconv_font font)	189	psiconv_font clone_font(psiconv_font font)
154	{	190	{
155	psiconv_font result;	191	psiconv_font result;
156	result = malloc(sizeof(*result));	192	if(!(result = malloc(sizeof(*result))))
		193	goto ERROR1;
157	result = font;	194	result = font;
158	result->name = strdup(result->name);	195	if (!(result->name = strdup(result->name)))
		196	goto ERROR2;
159	return result;	197	return result;
		198	ERROR2:
		199	free(result);
		200	ERROR1:
		201	return NULL;
160	}	202	}
161		203
162	psiconv_border clone_border(psiconv_border border)	204	psiconv_border clone_border(psiconv_border border)
163	{	205	{
164	psiconv_border result;	206	psiconv_border result;
165	result = malloc(sizeof(*result));	207	if (!(result = malloc(sizeof(*result))))
		208	goto ERROR1;
166	result = border;	209	result = border;
167	result->color = clone_color(result->color);	210	if(!(result->color = clone_color(result->color)))
		211	goto ERROR2;
168	return result;	212	return result;
		213	ERROR2:
		214	free(result);
		215	ERROR1:
		216	return NULL;
169	}	217	}
170		218
171	psiconv_bullet clone_bullet(psiconv_bullet bullet)	219	psiconv_bullet clone_bullet(psiconv_bullet bullet)
172	{	220	{
173	psiconv_bullet result;	221	psiconv_bullet result;
174	result = malloc(sizeof(*result));	222	if (!(result = malloc(sizeof(*result))))
		223	goto ERROR1;
175	result = bullet;	224	result = bullet;
176	result->font = clone_font(result->font);	225	if (!(result->font = clone_font(result->font)))
		226	goto ERROR2;
177	result->color = clone_color(result->color);	227	if (!(result->color = clone_color(result->color)))
		228	goto ERROR3;
178	return result;	229	return result;
		230	ERROR3:
		231	psiconv_free_font(result->font);
		232	ERROR2:
		233	free(result);
		234	ERROR1:
		235	return NULL;
179	}	236	}
180		237
181	psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs)	238	psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs)
182	{	239	{
183	psiconv_all_tabs result;	240	psiconv_all_tabs result;
184	result = malloc(sizeof(*result));	241	if (!(result = malloc(sizeof(*result))))
		242	goto ERROR1;
185	result = all_tabs;	243	result = all_tabs;
186	result->extras = psiconv_list_clone(result->extras);	244	if (!(result->extras = psiconv_list_clone(result->extras)))
		245	goto ERROR2;
187	return result;	246	return result;
		247	ERROR2:
		248	free(result);
		249	ERROR1:
		250	return NULL;
188	}	251	}
189		252
190	psiconv_character_layout psiconv_clone_character_layout	253	psiconv_character_layout psiconv_clone_character_layout
191	(psiconv_character_layout ls)	254	(psiconv_character_layout ls)
192	{	255	{
193	psiconv_character_layout result;	256	psiconv_character_layout result;
194		257
195	result = malloc(sizeof(*result));	258	if (!(result = malloc(sizeof(*result))))
		259	goto ERROR1;
196	result = ls;	260	result = ls;
197	result->color = clone_color(result->color);	261	if (!(result->color = clone_color(result->color)))
		262	goto ERROR2;
198	result->back_color = clone_color(result->back_color);	263	if (!(result->back_color = clone_color(result->back_color)))
		264	goto ERROR3;
199	result->font = clone_font(result->font);	265	if (!(result->font = clone_font(result->font)))
		266	goto ERROR4;
200	return result;	267	return result;
		268	ERROR4:
		269	psiconv_free_color(result->back_color);
		270	ERROR3:
		271	psiconv_free_color(result->color);
		272	ERROR2:
		273	free(result);
		274	ERROR1:
		275	return NULL;
201	}	276	}
202		277
203	psiconv_paragraph_layout psiconv_clone_paragraph_layout	278	psiconv_paragraph_layout psiconv_clone_paragraph_layout
204	(psiconv_paragraph_layout ls)	279	(psiconv_paragraph_layout ls)
205	{	280	{
206	psiconv_paragraph_layout result;	281	psiconv_paragraph_layout result;
207		282
208	result = malloc(sizeof(*result));	283	if (!(result = malloc(sizeof(*result))))
		284	goto ERROR1;
209	result = ls;	285	result = ls;
210	result->back_color = clone_color(result->back_color);	286	if (!(result->back_color = clone_color(result->back_color)))
		287	goto ERROR2;
211	result->bullet = clone_bullet(result->bullet);	288	if (!(result->bullet = clone_bullet(result->bullet)))
		289	goto ERROR3;
212	result->left_border = clone_border(result->left_border);	290	if (!(result->left_border = clone_border(result->left_border)))
		291	goto ERROR4;
213	result->right_border = clone_border(result->right_border);	292	if (!(result->right_border = clone_border(result->right_border)))
		293	goto ERROR5;
214	result->top_border = clone_border(result->top_border);	294	if (!(result->top_border = clone_border(result->top_border)))
		295	goto ERROR6;
215	result->bottom_border = clone_border(result->bottom_border);	296	if (!(result->bottom_border = clone_border(result->bottom_border)))
		297	goto ERROR7;
216	result->tabs = clone_all_tabs(result->tabs);	298	if (!(result->tabs = clone_all_tabs(result->tabs)))
		299	goto ERROR8;
217	return result;	300	return result;
		301	ERROR8:
		302	psiconv_free_border(result->bottom_border);
		303	ERROR7:
		304	psiconv_free_border(result->top_border);
		305	ERROR6:
		306	psiconv_free_border(result->right_border);
		307	ERROR5:
		308	psiconv_free_border(result->left_border);
		309	ERROR4:
		310	psiconv_free_bullet(result->bullet);
		311	ERROR3:
		312	psiconv_free_color(result->back_color);
		313	ERROR2:
		314	free(result);
		315	ERROR1:
		316	return NULL;
218	}	317	}
219		318
220	psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr)	319	psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr)
221	{	320	{
222	if (nr == 0)	321	if (nr == 0)
223	return ss->normal;	322	return ss->normal;
224	else	323	else
225	return psiconv_list_get(ss->styles,0xff - nr);	324	return psiconv_list_get(ss->styles,0xff - nr);
226	}	325	}
		326
		327	psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr)
		328	{
		329	return psiconv_list_get(ss,psiconv_list_length(ss)-nr-1);
		330	}
		331
		332	/* TODO: What if a cell is both in a default row and a default column?!? */
		333	psiconv_sheet_cell_layout psiconv_get_default_layout
		334	(psiconv_sheet_line_list row_defaults,
		335	psiconv_sheet_line_list col_defaults,
		336	psiconv_sheet_cell_layout cell_default,
		337	int row,int col)
		338	{
		339	int i;
		340	psiconv_sheet_line line;
		341	for (i = 0;i < psiconv_list_length(row_defaults);i++) {
		342	line = psiconv_list_get(row_defaults,i);
		343	if (line->position == row)
		344	return line->layout;
		345	}
		346	for (i = 0;i < psiconv_list_length(col_defaults);i++) {
		347	line = psiconv_list_get(col_defaults,i);
		348	if (line->position == col)
		349	return line->layout;
		350	}
		351	return cell_default;
		352	}
		353
227		354
228	void psiconv_free_color (psiconv_color color)	355	void psiconv_free_color (psiconv_color color)
229	{	356	{
230	if (color)	357	if (color)
231	free(color);	358	free(color);
…		…
448	psiconv_free_word_styles_section(file->styles_sec);	575	psiconv_free_word_styles_section(file->styles_sec);
449	free(file);	576	free(file);
450	}	577	}
451	}	578	}
452		579
		580	void psiconv_free_sheet_status_section(psiconv_sheet_status_section section)
		581	{
		582	if (section)
		583	free(section);
		584	}
		585
		586	void psiconv_free_sheet_numberformat(psiconv_sheet_numberformat numberformat)
		587	{
		588	if (numberformat)
		589	free(numberformat);
		590	}
		591
		592	void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout)
		593	{
		594	psiconv_free_paragraph_layout(layout->paragraph);
		595	psiconv_free_character_layout(layout->character);
		596	psiconv_free_sheet_numberformat(layout->numberformat);
		597	}
		598
		599	void psiconv_free_sheet_cell_aux(void *cell)
		600	{
		601	psiconv_sheet_cell data = cell;
		602
		603	psiconv_free_sheet_cell_layout(data->layout);
		604
		605	if ((data->type == psiconv_cell_string) && (data->data.dat_string))
		606	free(data->data.dat_string);
		607	}
		608
		609	void psiconv_free_sheet_cell(psiconv_sheet_cell cell)
		610	{
		611	if (cell) {
		612	psiconv_free_sheet_cell_aux(cell);
		613	free(cell);
		614	}
		615	}
		616
		617	void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list)
		618	{
		619	if (list)
		620	psiconv_list_free_el(list,psiconv_free_sheet_cell_aux);
		621	}
		622
		623	void psiconv_free_sheet_line_aux(void *line)
		624	{
		625	psiconv_sheet_line data = line;
		626
		627	psiconv_free_sheet_cell_layout(data->layout);
		628	}
		629
		630	void psiconv_free_sheet_line(psiconv_sheet_line line)
		631	{
		632	if (line) {
		633	psiconv_free_sheet_line_aux(line);
		634	free(line);
		635	}
		636	}
		637
		638
		639	void psiconv_free_sheet_line_list(psiconv_sheet_line_list list)
		640	{
		641	if (list)
		642	psiconv_list_free_el(list,psiconv_free_sheet_line_aux);
		643	}
		644
		645	void psiconv_free_sheet_grid_break_list(psiconv_sheet_grid_break_list list)
		646	{
		647	if (list)
		648	psiconv_list_free(list);
		649	}
		650
		651	void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s)
		652	{
		653	if (s)
		654	free(s);
		655	}
		656
		657	void psiconv_free_sheet_grid_size_list(psiconv_sheet_grid_size_list list)
		658	{
		659	if (list)
		660	psiconv_list_free(list);
		661	}
		662
		663	void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec)
		664	{
		665	if (sec) {
		666	psiconv_free_sheet_grid_size_list(sec->row_heights);
		667	psiconv_free_sheet_grid_size_list(sec->column_heights);
		668	psiconv_free_sheet_grid_break_list(sec->row_page_breaks);
		669	psiconv_free_sheet_grid_break_list(sec->column_page_breaks);
		670	free(sec);
		671	}
		672	}
		673
		674	void psiconv_free_sheet_worksheet_aux (void *data)
		675	{
		676	psiconv_sheet_worksheet section = data;
		677	psiconv_free_sheet_cell_layout(section->default_layout);
		678	psiconv_free_sheet_cell_list(section->cells);
		679	psiconv_free_sheet_line_list(section->row_default_layouts);
		680	psiconv_free_sheet_line_list(section->col_default_layouts);
		681	psiconv_free_sheet_grid_section(section->grid);
		682	}
		683
		684	void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet)
		685	{
		686	if (sheet) {
		687	psiconv_free_sheet_worksheet_aux(sheet);
		688	free(sheet);
		689	}
		690	}
		691
		692	void psiconv_free_sheet_worksheet_list(psiconv_sheet_worksheet_list list)
		693	{
		694	if (list)
		695	psiconv_list_free_el(list,psiconv_free_sheet_worksheet_aux);
		696	}
		697
		698	void psiconv_free_formula_aux(void *data)
		699	{
		700	psiconv_formula formula;
		701	formula = data;
		702	if (formula->type == psiconv_formula_dat_string)
		703	free(formula->data.dat_string);
		704	else if ((formula->type != psiconv_formula_dat_int) &&
		705	(formula->type != psiconv_formula_dat_var) &&
		706	(formula->type != psiconv_formula_dat_float) &&
		707	(formula->type != psiconv_formula_dat_cellref) &&
		708	(formula->type != psiconv_formula_dat_cellblock) &&
		709	(formula->type != psiconv_formula_dat_vcellblock) &&
		710	(formula->type != psiconv_formula_mark_opsep) &&
		711	(formula->type != psiconv_formula_mark_opend) &&
		712	(formula->type != psiconv_formula_mark_eof) &&
		713	(formula->type != psiconv_formula_unknown))
		714	psiconv_free_formula_list(formula->data.fun_operands);
		715	}
		716
		717	void psiconv_free_formula(psiconv_formula formula)
		718	{
		719	if (formula) {
		720	psiconv_free_formula_aux(formula);
		721	free(formula);
		722	}
		723	}
		724
		725	void psiconv_free_formula_list(psiconv_formula_list list)
		726	{
		727	if (list)
		728	psiconv_list_free_el(list,psiconv_free_formula_aux);
		729	}
		730
		731	void psiconv_free_sheet_name_section(psiconv_sheet_name_section section)
		732	{
		733	if (section) {
		734	if(section->name)
		735	free(section->name);
		736	free(section);
		737	}
		738	}
		739
		740	void psiconv_free_sheet_info_section(psiconv_sheet_info_section section)
		741	{
		742	if (section) {
		743	free(section);
		744	}
		745	}
		746
		747	void psiconv_free_sheet_variable_aux(void * variable)
		748	{
		749	psiconv_sheet_variable var = variable;
		750	if (var->name)
		751	free(var->name);
		752	if (var->type == psiconv_var_string)
		753	free(var->data.dat_string);
		754	}
		755
		756	void psiconv_free_sheet_variable(psiconv_sheet_variable var)
		757	{
		758	if (var) {
		759	psiconv_free_sheet_variable_aux(var);
		760	free(var);
		761	}
		762	}
		763
		764	void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list)
		765	{
		766	if (list)
		767	psiconv_list_free_el(list,psiconv_free_sheet_variable_aux);
		768	}
		769
		770	void psiconv_free_sheet_workbook_section(psiconv_sheet_workbook_section section)
		771	{
		772	if (section) {
		773	psiconv_free_formula_list(section->formulas);
		774	psiconv_free_sheet_worksheet_list(section->worksheets);
		775	psiconv_free_sheet_name_section(section->name);
		776	psiconv_free_sheet_info_section(section->info);
		777	psiconv_free_sheet_variable_list(section->variables);
		778	free(section);
		779	}
		780	}
		781
		782	void psiconv_free_sheet_f(psiconv_sheet_f file)
		783	{
		784	if (file) {
		785	psiconv_free_page_layout_section(file->page_sec);
		786	psiconv_free_sheet_status_section(file->status_sec);
		787	psiconv_free_sheet_workbook_section(file->workbook_sec);
		788	free(file);
		789	}
		790	}
		791
453	void psiconv_free_texted_f(psiconv_texted_f file)	792	void psiconv_free_texted_f(psiconv_texted_f file)
454	{	793	{
455	if (file) {	794	if (file) {
456	psiconv_free_page_layout_section(file->page_sec);	795	psiconv_free_page_layout_section(file->page_sec);
457	psiconv_free_texted_section(file->texted_sec);	796	psiconv_free_texted_section(file->texted_sec);
…		…
481	{	820	{
482	if (section)	821	if (section)
483	psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux);	822	psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux);
484	}	823	}
485		824
486	void psiconv_free_mbm_jumptable_section (psiconv_mbm_jumptable_section section)	825	void psiconv_free_jumptable_section (psiconv_jumptable_section section)
487	{	826	{
488	if (section)	827	if (section)
489	psiconv_list_free(section);	828	psiconv_list_free(section);
490	}	829	}
491		830
492	void psiconv_free_mbm_f(psiconv_mbm_f file)	831	void psiconv_free_mbm_f(psiconv_mbm_f file)
493	{	832	{
494	if (file) {	833	if (file) {
495	psiconv_free_pictures(file->sections);	834	psiconv_free_pictures(file->sections);
		835	free(file);
		836	}
		837	}
		838
		839	void psiconv_free_sketch_section(psiconv_sketch_section sec)
		840	{
		841	if (sec) {
		842	psiconv_free_paint_data_section(sec->picture);
		843	free(sec);
		844	}
		845	}
		846
		847	void psiconv_free_sketch_f(psiconv_sketch_f file)
		848	{
		849	if (file) {
		850	psiconv_free_sketch_section(file->sketch_sec);
		851	free(file);
		852	}
		853	}
		854
		855	void psiconv_free_clipart_section_aux(void *section)
		856	{
		857	if (section)
		858	free(((psiconv_clipart_section ) section)->picture);
		859	}
		860
		861	void psiconv_free_clipart_section(psiconv_clipart_section section)
		862	{
		863	if (section) {
		864	psiconv_free_clipart_section_aux(section);
		865	free(section);
		866	}
		867	}
		868
		869	void psiconv_free_cliparts(psiconv_cliparts section)
		870	{
		871	if (section)
		872	psiconv_list_free_el(section,&psiconv_free_clipart_section_aux);
		873	}
		874
		875	void psiconv_free_clipart_f(psiconv_clipart_f file)
		876	{
		877	if (file) {
		878	psiconv_free_cliparts(file->sections);
496	free(file);	879	free(file);
497	}	880	}
498	}	881	}
499		882
500	void psiconv_free_file(psiconv_file file)	883	void psiconv_free_file(psiconv_file file)
…		…
504	psiconv_free_word_f((psiconv_word_f) file->file);	887	psiconv_free_word_f((psiconv_word_f) file->file);
505	else if (file->type == psiconv_texted_file)	888	else if (file->type == psiconv_texted_file)
506	psiconv_free_texted_f((psiconv_texted_f) file->file);	889	psiconv_free_texted_f((psiconv_texted_f) file->file);
507	else if (file->type == psiconv_mbm_file)	890	else if (file->type == psiconv_mbm_file)
508	psiconv_free_mbm_f((psiconv_mbm_f) file->file);	891	psiconv_free_mbm_f((psiconv_mbm_f) file->file);
		892	else if (file->type == psiconv_sketch_file)
		893	psiconv_free_sketch_f((psiconv_sketch_f) file->file);
		894	else if (file->type == psiconv_clipart_file)
		895	psiconv_free_clipart_f((psiconv_clipart_f) file->file);
		896	else if (file->type == psiconv_sheet_file)
		897	psiconv_free_sheet_f((psiconv_sheet_f) file->file);
509	free(file);	898	free(file);
510	}	899	}
511	}	900	}
		901
		902	int psiconv_compare_color(const psiconv_color value1,
		903	const psiconv_color value2)
		904	{
		905	if (!value1 \|\| !value2)
		906	return 1;
		907	if ((value1->red == value2->red) &&
		908	(value1->green == value2->green) &&
		909	(value1->blue == value2->blue))
		910	return 0;
		911	else
		912	return 1;
		913	}
		914
		915	int psiconv_compare_font(const psiconv_font value1,
		916	const psiconv_font value2)
		917	{
		918	if (!value1 \|\| !value2 \|\| !value1->name \|\| !value2->name)
		919	return 1;
		920	if ((value1->screenfont == value2->screenfont) &&
		921	!strcmp(value1->name,value2->name))
		922	return 0;
		923	else
		924	return 1;
		925	}
		926
		927	int psiconv_compare_border(const psiconv_border value1,
		928	const psiconv_border value2)
		929	{
		930	if (!value1 \|\| !value2)
		931	return 1;
		932	if ((value1->kind == value2->kind) &&
		933	(value1->thickness == value2->thickness) &&
		934	!psiconv_compare_color(value1->color,value2->color))
		935	return 0;
		936	else
		937	return 1;
		938	}
		939
		940	int psiconv_compare_bullet(const psiconv_bullet value1,
		941	const psiconv_bullet value2)
		942	{
		943	if (!value1 \|\| !value2)
		944	return 1;
		945	if ((value1->on == value2->on) &&
		946	(value1->font_size == value2->font_size) &&
		947	(value1->character == value2->character) &&
		948	(value1->indent == value2->indent) &&
		949	!psiconv_compare_color(value1->color,value2->color) &&
		950	!psiconv_compare_font(value1->font,value2->font))
		951	return 0;
		952	else
		953	return 1;
		954	}
		955
		956	int psiconv_compare_tab(const psiconv_tab value1, const psiconv_tab value2)
		957	{
		958	if (!value1 \|\| !value2)
		959	return 1;
		960	if ((value1->location == value2->location) &&
		961	(value1->kind == value2->kind))
		962	return 0;
		963	else
		964	return 1;
		965	}
		966
		967	int psiconv_compare_all_tabs(const psiconv_all_tabs value1,
		968	const psiconv_all_tabs value2)
		969	{
		970	int i;
		971
		972	if (!value1 \|\| !value2 \|\| !value1->extras \|\| !value2->extras)
		973	return 1;
		974
		975	if ((value1->normal != value2->normal) \|\|
		976	psiconv_list_length(value1->extras) !=
		977	psiconv_list_length(value2->extras))
		978	return 1;
		979	for (i = 0; i < psiconv_list_length(value1->extras); i++)
		980	if (psiconv_compare_tab(psiconv_list_get(value1->extras,i),
		981	psiconv_list_get(value2->extras,i)))
		982
		983	return 1;
		984	return 0;
		985	}
		986
		987	int psiconv_compare_paragraph_layout(const psiconv_paragraph_layout value1,
		988	const psiconv_paragraph_layout value2)
		989	{
		990	if (!value1 \|\| !value2)
		991	return 1;
		992	if ((value1->indent_left == value2->indent_left) &&
		993	(value1->indent_right == value2->indent_right) &&
		994	(value1->indent_first == value2->indent_first) &&
		995	(value1->justify_hor == value2->justify_hor) &&
		996	(value1->justify_ver == value2->justify_ver) &&
		997	(value1->linespacing == value2->linespacing) &&
		998	(value1->space_above == value2->space_above) &&
		999	(value1->space_below == value2->space_below) &&
		1000	(value1->keep_together == value2->keep_together) &&
		1001	(value1->keep_with_next == value2->keep_with_next) &&
		1002	(value1->on_next_page == value2->on_next_page) &&
		1003	(value1->no_widow_protection == value2->no_widow_protection) &&
		1004	(value1->border_distance == value2->border_distance) &&
		1005	!psiconv_compare_color(value1->back_color,value2->back_color) &&
		1006	!psiconv_compare_bullet(value1->bullet,value2->bullet) &&
		1007	!psiconv_compare_border(value1->left_border,value2->left_border) &&
		1008	!psiconv_compare_border(value1->right_border,value2->right_border) &&
		1009	!psiconv_compare_border(value1->top_border,value2->top_border) &&
		1010	!psiconv_compare_border(value1->bottom_border,value2->bottom_border) &&
		1011	!psiconv_compare_all_tabs(value1->tabs,value2->tabs))
		1012	return 0;
		1013	else
		1014	return 1;
		1015	}
		1016
		1017
		1018	int psiconv_compare_character_layout(const psiconv_character_layout value1,
		1019	const psiconv_character_layout value2)
		1020	{
		1021	if (!value1 \|\| !value2)
		1022	return 1;
		1023	if ((value1->font_size == value2->font_size) &&
		1024	(value1->italic == value2->italic) &&
		1025	(value1->bold == value2->bold) &&
		1026	(value1->super_sub == value2->super_sub) &&
		1027	(value1->underline == value2->underline) &&
		1028	(value1->strikethrough == value2->strikethrough) &&
		1029	!psiconv_compare_color(value1->color,value2->color) &&
		1030	!psiconv_compare_color(value1->back_color,value2->back_color) &&
		1031	!psiconv_compare_font(value1->font,value2->font))
		1032	return 0;
		1033	else
		1034	return 1;
		1035	}
		1036
		1037
		1038
		1039	psiconv_word_styles_section psiconv_empty_word_styles_section(void)
		1040	{
		1041	psiconv_word_styles_section result;
		1042	if (!(result = malloc(sizeof(*result))))
		1043	goto ERROR1;
		1044	if (!(result->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s))))
		1045	goto ERROR2;
		1046	if (!(result->normal = malloc(sizeof(struct psiconv_word_style_s))))
		1047	goto ERROR3;
		1048	if (!(result->normal->character = psiconv_basic_character_layout()))
		1049	goto ERROR4;
		1050	if (!(result->normal->paragraph = psiconv_basic_paragraph_layout()))
		1051	goto ERROR5;
		1052	result->normal->hotkey = 'N';
		1053	result->normal->name = NULL;
		1054	result->normal->built_in = psiconv_bool_true;
		1055	result->normal->outline_level = 0;
		1056	return result;
		1057	ERROR5:
		1058	psiconv_free_character_layout(result->normal->character);
		1059	ERROR4:
		1060	free(result->normal);
		1061	ERROR3:
		1062	psiconv_list_free(result->styles);
		1063	ERROR2:
		1064	free(result);
		1065	ERROR1:
		1066	return NULL;
		1067	}
		1068
		1069	psiconv_text_and_layout psiconv_empty_text_and_layout(void)
		1070	{
		1071	return psiconv_list_new(sizeof(struct psiconv_paragraph_s));
		1072	}
		1073
		1074	psiconv_texted_section psiconv_empty_texted_section(void)
		1075	{
		1076	psiconv_texted_section result;
		1077	if (!(result = malloc(sizeof(*result))))
		1078	goto ERROR1;
		1079	if (!(result->paragraphs = psiconv_empty_text_and_layout()))
		1080	goto ERROR2;
		1081	return result;
		1082	ERROR2:
		1083	free(result);
		1084	ERROR1:
		1085	return NULL;
		1086	}
		1087
		1088	psiconv_page_header psiconv_empty_page_header(void)
		1089	{
		1090	psiconv_page_header result;
		1091	if (!(result = malloc(sizeof(*result))))
		1092	goto ERROR1;
		1093	result->on_first_page = psiconv_bool_true;
		1094	if (!(result->base_paragraph_layout = psiconv_basic_paragraph_layout()))
		1095	goto ERROR2;
		1096	if (!(result->base_character_layout = psiconv_basic_character_layout()))
		1097	goto ERROR3;
		1098	if (!(result->text = psiconv_empty_texted_section()))
		1099	goto ERROR4;
		1100	return result;
		1101	ERROR4:
		1102	psiconv_free_character_layout(result->base_character_layout);
		1103	ERROR3:
		1104	psiconv_free_paragraph_layout(result->base_paragraph_layout);
		1105	ERROR2:
		1106	free(result);
		1107	ERROR1:
		1108	return NULL;
		1109	}
		1110
		1111	psiconv_page_layout_section psiconv_empty_page_layout_section(void)
		1112	{
		1113	psiconv_page_layout_section result;
		1114	if (!(result = malloc(sizeof(*result))))
		1115	goto ERROR1;
		1116	result->first_page_nr = 1;
		1117	result->header_dist = result->footer_dist = 1.27;
		1118	result->left_margin = result->right_margin = 3.175;
		1119	result->top_margin = result->bottom_margin = 2.54;
		1120	result->page_width = 21.0;
		1121	result->page_height = 29.7;
		1122	result->landscape = psiconv_bool_false;
		1123	if (!(result->header = psiconv_empty_page_header()))
		1124	goto ERROR2;
		1125	if (!(result->footer = psiconv_empty_page_header()))
		1126	goto ERROR3;
		1127	return result;
		1128	ERROR3:
		1129	psiconv_free_page_header(result->header);
		1130	ERROR2:
		1131	free(result);
		1132	ERROR1:
		1133	return NULL;
		1134	}
		1135
		1136	psiconv_word_status_section psiconv_empty_word_status_section(void)
		1137	{
		1138	psiconv_word_status_section result;
		1139	if (!(result = malloc(sizeof(*result))))
		1140	return NULL;
		1141	result->show_tabs = result->show_spaces = result->show_paragraph_ends =
		1142	result->show_hard_minus = result->show_hard_space =
		1143	result->fit_lines_to_screen = psiconv_bool_false;
		1144	result->show_full_pictures = result->show_full_graphs =
		1145	result->show_top_toolbar = result->show_side_toolbar =
		1146	psiconv_bool_true;
		1147	result->cursor_position = 0;
		1148	result->display_size = 1000;
		1149	return result;
		1150	}
		1151
		1152	psiconv_word_f psiconv_empty_word_f(void)
		1153	{
		1154	psiconv_word_f result;
		1155	if (!(result = malloc(sizeof(*result))))
		1156	goto ERROR1;
		1157	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1158	goto ERROR2;
		1159	if (!(result->paragraphs = psiconv_empty_text_and_layout()))
		1160	goto ERROR3;
		1161	if (!(result->status_sec = psiconv_empty_word_status_section()))
		1162	goto ERROR4;
		1163	if (!(result->styles_sec = psiconv_empty_word_styles_section()))
		1164	goto ERROR5;
		1165	return result;
		1166	ERROR5:
		1167	psiconv_free_word_status_section(result->status_sec);
		1168	ERROR4:
		1169	psiconv_free_text_and_layout(result->paragraphs);
		1170	ERROR3:
		1171	psiconv_free_page_layout_section(result->page_sec);
		1172	ERROR2:
		1173	free(result);
		1174	ERROR1:
		1175	return NULL;
		1176	}
		1177
		1178	psiconv_sheet_status_section psiconv_empty_sheet_status_section(void)
		1179	{
		1180	psiconv_sheet_status_section result;
		1181	if (!(result = malloc(sizeof(*result))))
		1182	return NULL;
		1183	result->show_horizontal_scrollbar = result->show_vertical_scrollbar =
		1184	psiconv_triple_auto;
		1185	result->show_graph = psiconv_bool_false;
		1186	result->show_top_sheet_toolbar = result->show_side_sheet_toolbar =
		1187	result->show_top_graph_toolbar = result->show_side_graph_toolbar =
		1188	psiconv_bool_true;
		1189	result->cursor_row = result->cursor_column = 0;
		1190	result->sheet_display_size = result->graph_display_size = 1000;
		1191	return result;
		1192	}
		1193
		1194	psiconv_formula_list psiconv_empty_formula_list(void)
		1195	{
		1196	return psiconv_list_new(sizeof(struct psiconv_formula_s));
		1197	}
		1198
		1199	psiconv_sheet_workbook_section psiconv_empty_sheet_workbook_section(void)
		1200	{
		1201	psiconv_sheet_workbook_section result;
		1202	if (!(result = malloc(sizeof(*result))))
		1203	goto ERROR1;
		1204	if (!(result->formulas = psiconv_empty_formula_list()))
		1205	goto ERROR2;
		1206	return result;
		1207	ERROR2:
		1208	free(result);
		1209	ERROR1:
		1210	return NULL;
		1211	}
		1212
		1213
		1214	psiconv_sheet_f psiconv_empty_sheet_f(void)
		1215	{
		1216	psiconv_sheet_f result;
		1217	if (!(result = malloc(sizeof(*result))))
		1218	goto ERROR1;
		1219	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1220	goto ERROR2;
		1221	if (!(result->status_sec = psiconv_empty_sheet_status_section()))
		1222	goto ERROR3;
		1223	if (!(result->workbook_sec = psiconv_empty_sheet_workbook_section()))
		1224	goto ERROR4;
		1225	return result;
		1226	ERROR4:
		1227	psiconv_free_sheet_status_section(result->status_sec);
		1228	ERROR3:
		1229	psiconv_free_page_layout_section(result->page_sec);
		1230	ERROR2:
		1231	free(result);
		1232	ERROR1:
		1233	return NULL;
		1234	}
		1235
		1236	psiconv_texted_f psiconv_empty_texted_f(void)
		1237	{
		1238	psiconv_texted_f result;
		1239	if (!(result = malloc(sizeof(*result))))
		1240	goto ERROR1;
		1241	if (!(result->page_sec = psiconv_empty_page_layout_section()))
		1242	goto ERROR2;
		1243	if (!(result->texted_sec = psiconv_empty_texted_section()))
		1244	goto ERROR3;
		1245	return result;
		1246	ERROR3:
		1247	psiconv_free_page_layout_section(result->page_sec);
		1248	ERROR2:
		1249	free(result);
		1250	ERROR1:
		1251	return NULL;
		1252	}
		1253
		1254	psiconv_paint_data_section psiconv_empty_paint_data_section(void)
		1255	{
		1256	psiconv_paint_data_section result;
		1257	if (!(result = malloc(sizeof(*result))))
		1258	goto ERROR1;
		1259	/* Is this correct? */
		1260	result->xsize = result->ysize = result->pic_xsize = result->pic_ysize = 0;
		1261	/* Probably forbidden... */
		1262	if (!(result->red = malloc(0)))
		1263	goto ERROR2;
		1264	if (!(result->green = malloc(0)))
		1265	goto ERROR3;
		1266	if (!(result->blue = malloc(0)))
		1267	goto ERROR4;
		1268	return result;
		1269	ERROR4:
		1270	free(result->green);
		1271	ERROR3:
		1272	free(result->red);
		1273	ERROR2:
		1274	free(result);
		1275	ERROR1:
		1276	return NULL;
		1277	}
		1278
		1279
		1280	psiconv_pictures psiconv_empty_pictures(void)
		1281	{
		1282	psiconv_pictures result;
		1283	psiconv_paint_data_section pds;
		1284	if (!(result = psiconv_list_new(sizeof(struct psiconv_paint_data_section_s))))
		1285	goto ERROR1;
		1286	if (!(pds = psiconv_empty_paint_data_section()))
		1287	goto ERROR2;
		1288	if (psiconv_list_add(result,pds))
		1289	goto ERROR3;
		1290	free(pds);
		1291	return result;
		1292	ERROR3:
		1293	psiconv_free_paint_data_section(pds);
		1294	ERROR2:
		1295	psiconv_list_free(result);
		1296	ERROR1:
		1297	return NULL;
		1298	}
		1299
		1300	psiconv_mbm_f psiconv_empty_mbm_f(void)
		1301	{
		1302	psiconv_mbm_f result;
		1303	if (!(result = malloc(sizeof(*result))))
		1304	goto ERROR1;
		1305	if (!(result->sections = psiconv_empty_pictures()))
		1306	goto ERROR2;
		1307	return result;
		1308	ERROR2:
		1309	free(result);
		1310	ERROR1:
		1311	return NULL;
		1312	}
		1313
		1314	psiconv_sketch_section psiconv_empty_sketch_section(void)
		1315	{
		1316	psiconv_sketch_section result;
		1317	if (!(result = malloc(sizeof(*result))))
		1318	goto ERROR1;
		1319	result->form_xsize = 320;
		1320	result->form_ysize = 200;
		1321	result->picture_x_offset = result->picture_y_offset = result->picture_xsize =
		1322	result->picture_ysize = 0;
		1323	result->magnification_x = result->magnification_y = 1.0;
		1324	result->cut_left = result->cut_right = result->cut_top =
		1325	result->cut_bottom = 0.0;
		1326	if (!(result->picture = psiconv_empty_paint_data_section()))
		1327	goto ERROR2;
		1328	return result;
		1329	ERROR2:
		1330	free(result);
		1331	ERROR1:
		1332	return NULL;
		1333	}
		1334
		1335	psiconv_sketch_f psiconv_empty_sketch_f(void)
		1336	{
		1337	psiconv_sketch_f result;
		1338	if (!(result = malloc(sizeof(*result))))
		1339	goto ERROR1;
		1340	if (!(result->sketch_sec = psiconv_empty_sketch_section()))
		1341	goto ERROR2;
		1342	return result;
		1343	ERROR2:
		1344	free(result);
		1345	ERROR1:
		1346	return NULL;
		1347	}
		1348
		1349	psiconv_cliparts psiconv_empty_cliparts(void)
		1350	{
		1351	/* Is this correct? */
		1352	return psiconv_list_new(sizeof(struct psiconv_clipart_section_s));
		1353	}
		1354
		1355	psiconv_clipart_f psiconv_empty_clipart_f(void)
		1356	{
		1357	psiconv_clipart_f result;
		1358	if (!(result = malloc(sizeof(*result))))
		1359	goto ERROR1;
		1360	if (!(result->sections = psiconv_empty_cliparts()))
		1361	goto ERROR2;
		1362	return result;
		1363	ERROR2:
		1364	free(result);
		1365	ERROR1:
		1366	return NULL;
		1367	}
		1368
		1369	psiconv_file psiconv_empty_file(psiconv_file_type_t type)
		1370	{
		1371	psiconv_file result;
		1372	if (!(result = malloc(sizeof(*result))))
		1373	return NULL;
		1374	result->type = type;
		1375	if (type == psiconv_word_file) {
		1376	if (!(result->file = psiconv_empty_word_f()))
		1377	goto ERROR;
		1378	} else if (type == psiconv_sheet_file) {
		1379	if (!(result->file = psiconv_empty_sheet_f()))
		1380	goto ERROR;
		1381	} else if (type == psiconv_texted_file) {
		1382	if (!(result->file = psiconv_empty_texted_f()))
		1383	goto ERROR;
		1384	} else if (type == psiconv_mbm_file) {
		1385	if (!(result->file = psiconv_empty_mbm_f()))
		1386	goto ERROR;
		1387	} else if (type == psiconv_sketch_file) {
		1388	if (!(result->file = psiconv_empty_sketch_f()))
		1389	goto ERROR;
		1390	} else if (type == psiconv_clipart_file) {
		1391	if (!(result->file = psiconv_empty_clipart_f()))
		1392	goto ERROR;
		1393	} else
		1394	goto ERROR;
		1395	return result;
		1396	ERROR:
		1397	free(result);
		1398	return NULL;
		1399	}

 Legend:



Removed from v.20
 


changed lines


 
Added in v.142
 Legend:



Removed from v.20
 


changed lines


 
Added in v.142
-Removed from v.20
+Added in v.142

frodo@frodo.looijaard.name	ViewVC Help
Powered by ViewVC 1.1.26