--- psiconv/trunk/program/psiconv/psiconv.h	2002/05/10 15:55:55	147
+++ psiconv/trunk/program/psiconv/psiconv.h	2004/02/04 12:19:09	196
@@ -1,6 +1,6 @@
 /*
     psiconv.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999-2004  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,25 +17,42 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef PSICONV_PSICONV_H
-#define PSICONV_PSICONV_H
+#ifndef PSICONV_H
+#define PSICONV_H
 
-#include "psiconv/data.h"
+#include <psiconv/data.h>
+#include <psiconv/configuration.h>
 
-#ifndef PSICONV_ENC_H
-#include "encoding.h"
-#endif
+#define FORMAT_WORD             0x01
+#define FORMAT_TEXTED           0x02
+#define FORMAT_CLIPART_SINGLE   0x04
+#define FORMAT_CLIPART_MULTIPLE 0x08
+#define FORMAT_MBM_SINGLE       0x10
+#define FORMAT_MBM_MULTIPLE     0x20
+#define FORMAT_SKETCH           0x40
+
+typedef enum
+{ 
+  ENCODING_UTF8,
+  ENCODING_UCS2,
+  ENCODING_PSION,
+  ENCODING_ASCII,
+  ENCODING_ASCII_HTML
+} encoding;
 
-typedef int output_function(const char *filename, const psiconv_file,
+typedef int output_function(const psiconv_config config,
+                            psiconv_list list, const psiconv_file file,
                             const char *type,
-			    const psiconv_encoding encoding_type);
+			    const encoding encoding_type);
 
-typedef struct psiconv_fileformat_s {
+typedef struct fileformat_s {
   const char *name;
   const char *description;
+  int supported_format;
   output_function *output;
-} *psiconv_fileformat;
+} *fileformat;
 
 psiconv_list fileformat_list; /* of struct psiconv_fileformat */
 
-#endif /* PSICONV_GEN_H */
+
+#endif /* PSICONV_H */