/[public]/psiconv/trunk/program/psiconv/psiconv.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/psiconv.c

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

Revision 53 Revision 180
… …
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/
19
20/*
21 2002/Apr. Keita KAWABE
22 * Support for narrow build Asian Psions added.
23
24 Now psiconv understands -u or --UTF8 option.
25 This option is passed to output_function as the fourth parameter
26 (thus the typedef of output_function was changed).
27
28 If a called generator (gen_*.c) can handle UTF8, then it handles
29 the character conversion etc. accordingly.
30
31 * psiconv seemed to want to take the argument of the options
32 case-insensitively (i.e. LaTeX -> LATEX), but that was not working
33 under my environment. Fixed it.
18*/ 34*/
19 35
20/* Driver program */ 36/* Driver program */
21 37
22#include "config.h" 38#include "config.h"
… …
31#ifdef HAVE_UNISTD_H 47#ifdef HAVE_UNISTD_H
32#include <unistd.h> 48#include <unistd.h>
33#endif 49#endif
34 50
35#ifdef IMAGEMAGICK 51#ifdef IMAGEMAGICK
36#include <magick/magick.h> 52#include "magick-aux.h"
37#endif 53#endif
38 54
39#include "data.h" 55#include "psiconv/data.h"
40#include "parse.h" 56#include "psiconv/parse.h"
57#include "psiconv/configuration.h"
41#include "gen.h" 58#include "gen.h"
42#include "psiconv.h" 59#include "psiconv.h"
43 60
44static void print_help(void); 61static void print_help(void);
45static void print_version(void); 62static void print_version(void);
46static void strtoupper(char *str); 63static void strtoupper(char *str);
47 64
48int psiconv_verbosity = PSICONV_VERB_WARN;
49
50void print_help(void) 65void print_help(void)
51{ 66{
52 psiconv_fileformat ff; 67 psiconv_fileformat ff;
53 int i,j; 68 int i,j;
54 69
55 puts("Syntax: psiconv [OPTIONS..] [FILE]"); 70 puts("Syntax: psiconv [OPTIONS..] [FILE]");
56 puts("Convert the psion Word file FILE to a HTML file"); 71 puts("Convert the psion Word file FILE to other formats");
57 puts("If FILE is not specified, use stdin"); 72 puts("If FILE is not specified, use stdin");
58 puts(" -d, --debug Show debug information on stderr"); 73 puts(" -d, --debug Show debug information on stderr");
59 puts(" -e, --exact Quit on any parse errors or warnings");
60 puts(" -h, --help Display this help and exit"); 74 puts(" -h, --help Display this help and exit");
61 puts(" -o, --outputfile Output to file instead of stdout"); 75 puts(" -o, --outputfile Output to file instead of stdout");
62 puts(" -s, --silent Do not even show warnings on stderr"); 76 puts(" -s, --silent Do not even show warnings on stderr");
63 puts(" -T, --type=FILETYPE Output type"); 77 puts(" -T, --type=FILETYPE Output type");
64 puts(" -V, --version Display the program version and exit"); 78 puts(" -V, --version Display the program version and exit");
65 puts(" -v, --verbose Show progress indicators on stderr"); 79 puts(" -v, --verbose Show progress indicators on stderr");
80 puts(" -u, --UTF8 Input file is encoded in UTF8");
66 puts(""); 81 puts("");
67 puts("The following output types are known:"); 82 puts("The following output types are known:");
68 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 83 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
69 ff = psiconv_list_get(fileformat_list,i); 84 ff = psiconv_list_get(fileformat_list,i);
70 printf(" %s",ff->name); 85 printf(" %s",ff->name);
71 for (j = strlen(ff->name); j < 15; j++) 86 for (j = strlen(ff->name); j < 15; j++)
72 putchar(' '); 87 putchar(' ');
73 puts(ff->description); 88 puts(ff->description);
74 } 89 }
90 puts("");
91 puts("When using UTF8 with LaTeX type, the resulting LaTeX source should be converted");
92 puts(" to a suitable encoding for your LaTeX installation before being typeset");
75} 93}
76 94
77void print_version(void) 95void print_version(void)
78{ 96{
79 printf("Version %s\n",VERSION); 97 printf("Version %s\n",VERSION);
… …
95 {"verbose",no_argument,NULL,'v'}, 113 {"verbose",no_argument,NULL,'v'},
96 {"debug",no_argument,NULL,'d'}, 114 {"debug",no_argument,NULL,'d'},
97 {"silent",no_argument,NULL,'s'}, 115 {"silent",no_argument,NULL,'s'},
98 {"outputfile",required_argument,NULL,'o'}, 116 {"outputfile",required_argument,NULL,'o'},
99 {"type",required_argument,NULL,'T'}, 117 {"type",required_argument,NULL,'T'},
100 {"exact",no_argument,NULL,'e'}, 118 {"UTF8",no_argument,NULL,'u'},
101 {0,0,0,0} 119 {0,0,0,0}
102 }; 120 };
103 const char* short_options = "hVvsdo:eT:"; 121 const char* short_options = "hVvsdo:uT:";
104 int option_index; 122 int option_index;
105 FILE * f; 123 FILE * f;
106 struct stat fbuf; 124 struct stat fbuf;
107 125
108 const char *inputfilename = ""; 126 const char *inputfilename = "";
109 const char *outputfilename = ""; 127 const char *outputfilename = "";
110 char *type = strdup("HTML3"); 128 char *type = strdup("HTML3");
111 int exact=0; 129 psiconv_encoding encoding_type=PSICONV_ENCODING_CP1252;
112 130
113 int c,i,res; 131 int c,i,res;
114 psiconv_buffer buf; 132 psiconv_buffer buf;
115 psiconv_file file; 133 psiconv_file file;
116 psiconv_fileformat ff; 134 psiconv_fileformat ff;
117 135
136 psiconv_config config = psiconv_config_default();
137 psiconv_config_read(NULL,&config);
138
118 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat)); 139 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s));
119 init_txt(); 140 init_txt();
120 init_html(); 141 init_html();
121 init_html4(); 142 init_html4();
143 init_latex();
122 init_rtf(); 144 init_rtf();
123 init_image(); 145 init_image();
124 146
125 while(1) { 147 while(1) {
126 c = getopt_long(argc,argv,short_options, long_options, &option_index); 148 c = getopt_long(argc,argv,short_options, long_options, &option_index);
127 if (c == -1) 149 if (c == -1)
128 break; 150 break;
129 switch(c) { 151 switch(c) {
130 case 'h': print_help(); exit(0); 152 case 'h': print_help(); exit(0);
131 case 'V': print_version(); exit(0); 153 case 'V': print_version(); exit(0);
132 case 'v': if (psiconv_verbosity < PSICONV_VERB_PROGRESS) 154 case 'v': if (config->verbosity < PSICONV_VERB_PROGRESS)
133 psiconv_verbosity = PSICONV_VERB_PROGRESS; 155 config->verbosity = PSICONV_VERB_PROGRESS;
134 break; 156 break;
135 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break; 157 case 'd': config->verbosity = PSICONV_VERB_DEBUG; break;
136 case 's': psiconv_verbosity = PSICONV_VERB_SILENT; break; 158 case 's': config->verbosity = PSICONV_VERB_FATAL; break;
137 case 'e': exact = 1; break;
138 case 'o': outputfilename = strdup(optarg); break; 159 case 'o': outputfilename = strdup(optarg); break;
139 case 'T': type = strdup(optarg); break; 160 case 'T': type = strdup(optarg); break;
161 case 'u': encoding_type = PSICONV_ENCODING_UTF8; break;
140 case '?': case ':': fputs("Try `-h' for more information\n",stderr); 162 case '?': case ':': fputs("Try `-h' for more information\n",stderr);
141 exit(1); 163 exit(1);
142 default: fprintf(stderr,"Internal error: getopt_long returned character " 164 default: fprintf(stderr,"Internal error: getopt_long returned character "
143 "code 0%o ?? (contact the author)\n", c); 165 "code 0%o ?? (contact the author)\n", c);
144 exit(1); break; 166 exit(1); break;
… …
149 "Try `-h' for more information\n",stderr); 171 "Try `-h' for more information\n",stderr);
150 exit(1); 172 exit(1);
151 } else if (optind == argc-1) 173 } else if (optind == argc-1)
152 inputfilename = strdup(argv[optind]); 174 inputfilename = strdup(argv[optind]);
153 175
176
154 /* Open inputfile for reading */ 177 /* Open inputfile for reading */
155 178
156 if (strlen(inputfilename) != 0) { 179 if (strlen(inputfilename) != 0) {
157 if(stat(inputfilename,&fbuf) < 0) { 180 if(stat(inputfilename,&fbuf) < 0) {
158 perror(inputfilename); 181 perror(inputfilename);
… …
164 exit(1); 187 exit(1);
165 } 188 }
166 } else 189 } else
167 f = stdin; 190 f = stdin;
168 191
169 buf = psiconv_list_new(sizeof(psiconv_u8)); 192 buf = psiconv_buffer_new();
170 while (! feof(f)) 193 psiconv_buffer_fread_all(buf,f);
171 psiconv_list_fread(buf,1024,f);
172 194
173 if (strlen(inputfilename) != 0) 195 if (strlen(inputfilename) != 0)
174 if (fclose(f)) { 196 if (fclose(f)) {
175 perror(inputfilename); 197 perror(inputfilename);
176 exit(1); 198 exit(1);
177 } 199 }
178 200
179 if (psiconv_parse(buf,&file)) 201 if (psiconv_parse(config,buf,&file) || (file->type == psiconv_unknown_file))
180 if(exact) 202 {
203 fprintf(stderr,"Parse error\n");
181 exit(1); 204 exit(1);
205 }
182 206
183 /* Set correct output file */ 207 /* Set correct output file */
184 if (strlen(outputfilename) == 0) 208 if (strlen(outputfilename) == 0)
185 outputfilename = "/dev/stdout"; 209 outputfilename = "/dev/stdout";
186 210
187 strtoupper(type); 211 strtoupper(type);
188 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 212 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
189 ff = psiconv_list_get(fileformat_list,i); 213 ff = psiconv_list_get(fileformat_list,i);
190 if (! strcmp(type,ff->name)) { 214 if (! strcasecmp(type,ff->name)) {
191 res = ff->output(outputfilename,file,type); 215 res = ff->output(outputfilename,file,type, encoding_type);
192 if (res) { 216 if (res) {
193 fprintf(stderr, 217 fprintf(stderr,
194 "Output format `%s' not permitted for this file type\n",type); 218 "Output format `%s' not permitted for this file type\n",type);
195 exit(1); 219 exit(1);
196 } 220 }
Legend:
Removed from v.53  
changed lines
  Added in v.180
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26