--- psiconv/trunk/program/psiconv/gen_txt.c	2004/01/09 22:20:03	185
+++ psiconv/trunk/program/psiconv/gen_txt.c	2014/10/22 19:53:40	351
@@ -1,7 +1,7 @@
 /*
  * gen_text.c - Part of psiconv, a PSION 5 file formats converter
  * Copyright (c) 1999  Andrew Johnson <anjohnson@iee.org>
- * Portions Copyright (c) 1999,2003  Frodo Looijaard <frodol@dds.nl>
+ * Portions Copyright (c) 1999-2014  Frodo Looijaard <frodo@frodo.looijaard.name>
  * 
  * 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
@@ -34,9 +34,9 @@
 
 static void output_para(const psiconv_config config,psiconv_list list,
                         const psiconv_paragraph para,encoding encoding_type);
-static void gen_txt_word(const psiconv_config config, psiconv_list list, 
+static void gen_word(const psiconv_config config, psiconv_list list, 
                          psiconv_word_f wf, encoding encoding_type);
-static void gen_txt_texted(const psiconv_config config, psiconv_list list, 
+static void gen_texted(const psiconv_config config, psiconv_list list, 
                            psiconv_texted_f tf, encoding encoding_type);
 static int gen_txt(const psiconv_config config, psiconv_list list,
 			   const psiconv_file file, const char *dest,
@@ -46,6 +46,7 @@
   {
     "ASCII",
     "Plain text without much layout",
+    FORMAT_WORD | FORMAT_TEXTED,
     gen_txt
   };
 
@@ -112,7 +113,7 @@
   }
 }
 
-void gen_txt_word(const psiconv_config config, psiconv_list list, 
+void gen_word(const psiconv_config config, psiconv_list list, 
                          psiconv_word_f wf, encoding encoding_type)
 {
   int i;
@@ -149,7 +150,7 @@
   }
 }
 
-void gen_txt_texted(const psiconv_config config, psiconv_list list, 
+void gen_texted(const psiconv_config config, psiconv_list list, 
                            psiconv_texted_f tf, encoding encoding_type)
 {
   int i;
@@ -191,10 +192,10 @@
 			   const encoding encoding_type)
 {
   if (file->type == psiconv_word_file) {
-    gen_txt_word(config,list,(psiconv_word_f) file->file,encoding_type);
+    gen_word(config,list,(psiconv_word_f) file->file,encoding_type);
     return 0;
   } else if (file->type == psiconv_texted_file) {
-    gen_txt_texted(config,list,(psiconv_texted_f) file->file,encoding_type);
+    gen_texted(config,list,(psiconv_texted_f) file->file,encoding_type);
     return 0;
   } else
     return -1;