/[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 147
… …
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"
… …
34 50
35#ifdef IMAGEMAGICK 51#ifdef IMAGEMAGICK
36#include <magick/magick.h> 52#include <magick/magick.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"
41#include "gen.h" 57#include "gen.h"
42#include "psiconv.h" 58#include "psiconv.h"
43 59
44static void print_help(void); 60static void print_help(void);
45static void print_version(void); 61static void print_version(void);
46static void strtoupper(char *str); 62static void strtoupper(char *str);
47 63
48int psiconv_verbosity = PSICONV_VERB_WARN;
49
50void print_help(void) 64void print_help(void)
51{ 65{
52 psiconv_fileformat ff; 66 psiconv_fileformat ff;
53 int i,j; 67 int i,j;
54 68
55 puts("Syntax: psiconv [OPTIONS..] [FILE]"); 69 puts("Syntax: psiconv [OPTIONS..] [FILE]");
56 puts("Convert the psion Word file FILE to a HTML file"); 70 puts("Convert the psion Word file FILE to other formats");
57 puts("If FILE is not specified, use stdin"); 71 puts("If FILE is not specified, use stdin");
58 puts(" -d, --debug Show debug information on stderr"); 72 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"); 73 puts(" -h, --help Display this help and exit");
61 puts(" -o, --outputfile Output to file instead of stdout"); 74 puts(" -o, --outputfile Output to file instead of stdout");
62 puts(" -s, --silent Do not even show warnings on stderr"); 75 puts(" -s, --silent Do not even show warnings on stderr");
63 puts(" -T, --type=FILETYPE Output type"); 76 puts(" -T, --type=FILETYPE Output type");
64 puts(" -V, --version Display the program version and exit"); 77 puts(" -V, --version Display the program version and exit");
65 puts(" -v, --verbose Show progress indicators on stderr"); 78 puts(" -v, --verbose Show progress indicators on stderr");
79 puts(" -u, --UTF8 Input file is encoded in UTF8");
66 puts(""); 80 puts("");
67 puts("The following output types are known:"); 81 puts("The following output types are known:");
68 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 82 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
69 ff = psiconv_list_get(fileformat_list,i); 83 ff = psiconv_list_get(fileformat_list,i);
70 printf(" %s",ff->name); 84 printf(" %s",ff->name);
71 for (j = strlen(ff->name); j < 15; j++) 85 for (j = strlen(ff->name); j < 15; j++)
72 putchar(' '); 86 putchar(' ');
73 puts(ff->description); 87 puts(ff->description);
74 } 88 }
89 puts("");
90 puts("When using UTF8 with LaTeX type, the resulting LaTeX source should be converted");
91 puts(" to a suitable encoding for your LaTeX installation before being typeset");
75} 92}
76 93
77void print_version(void) 94void print_version(void)
78{ 95{
79 printf("Version %s\n",VERSION); 96 printf("Version %s\n",VERSION);
… …
95 {"verbose",no_argument,NULL,'v'}, 112 {"verbose",no_argument,NULL,'v'},
96 {"debug",no_argument,NULL,'d'}, 113 {"debug",no_argument,NULL,'d'},
97 {"silent",no_argument,NULL,'s'}, 114 {"silent",no_argument,NULL,'s'},
98 {"outputfile",required_argument,NULL,'o'}, 115 {"outputfile",required_argument,NULL,'o'},
99 {"type",required_argument,NULL,'T'}, 116 {"type",required_argument,NULL,'T'},
100 {"exact",no_argument,NULL,'e'}, 117 {"UTF8",no_argument,NULL,'u'},
101 {0,0,0,0} 118 {0,0,0,0}
102 }; 119 };
103 const char* short_options = "hVvsdo:eT:"; 120 const char* short_options = "hVvsdo:uT:";
104 int option_index; 121 int option_index;
105 FILE * f; 122 FILE * f;
106 struct stat fbuf; 123 struct stat fbuf;
107 124
108 const char *inputfilename = ""; 125 const char *inputfilename = "";
109 const char *outputfilename = ""; 126 const char *outputfilename = "";
110 char *type = strdup("HTML3"); 127 char *type = strdup("HTML3");
111 int exact=0; 128 psiconv_encoding encoding_type=PSICONV_ENCODING_CP1252;
112 129
113 int c,i,res; 130 int c,i,res;
114 psiconv_buffer buf; 131 psiconv_buffer buf;
115 psiconv_file file; 132 psiconv_file file;
116 psiconv_fileformat ff; 133 psiconv_fileformat ff;
117 134
135 psiconv_verbosity = PSICONV_VERB_WARN;
136
118 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat)); 137 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s));
119 init_txt(); 138 init_txt();
120 init_html(); 139 init_html();
121 init_html4(); 140 init_html4();
141 init_latex();
122 init_rtf(); 142 init_rtf();
123 init_image(); 143 init_image();
124 144
125 while(1) { 145 while(1) {
126 c = getopt_long(argc,argv,short_options, long_options, &option_index); 146 c = getopt_long(argc,argv,short_options, long_options, &option_index);
… …
131 case 'V': print_version(); exit(0); 151 case 'V': print_version(); exit(0);
132 case 'v': if (psiconv_verbosity < PSICONV_VERB_PROGRESS) 152 case 'v': if (psiconv_verbosity < PSICONV_VERB_PROGRESS)
133 psiconv_verbosity = PSICONV_VERB_PROGRESS; 153 psiconv_verbosity = PSICONV_VERB_PROGRESS;
134 break; 154 break;
135 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break; 155 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
136 case 's': psiconv_verbosity = PSICONV_VERB_SILENT; break; 156 case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
137 case 'e': exact = 1; break;
138 case 'o': outputfilename = strdup(optarg); break; 157 case 'o': outputfilename = strdup(optarg); break;
139 case 'T': type = strdup(optarg); break; 158 case 'T': type = strdup(optarg); break;
159 case 'u': encoding_type = PSICONV_ENCODING_UTF8; break;
140 case '?': case ':': fputs("Try `-h' for more information\n",stderr); 160 case '?': case ':': fputs("Try `-h' for more information\n",stderr);
141 exit(1); 161 exit(1);
142 default: fprintf(stderr,"Internal error: getopt_long returned character " 162 default: fprintf(stderr,"Internal error: getopt_long returned character "
143 "code 0%o ?? (contact the author)\n", c); 163 "code 0%o ?? (contact the author)\n", c);
144 exit(1); break; 164 exit(1); break;
… …
149 "Try `-h' for more information\n",stderr); 169 "Try `-h' for more information\n",stderr);
150 exit(1); 170 exit(1);
151 } else if (optind == argc-1) 171 } else if (optind == argc-1)
152 inputfilename = strdup(argv[optind]); 172 inputfilename = strdup(argv[optind]);
153 173
174
154 /* Open inputfile for reading */ 175 /* Open inputfile for reading */
155 176
156 if (strlen(inputfilename) != 0) { 177 if (strlen(inputfilename) != 0) {
157 if(stat(inputfilename,&fbuf) < 0) { 178 if(stat(inputfilename,&fbuf) < 0) {
158 perror(inputfilename); 179 perror(inputfilename);
… …
164 exit(1); 185 exit(1);
165 } 186 }
166 } else 187 } else
167 f = stdin; 188 f = stdin;
168 189
169 buf = psiconv_list_new(sizeof(psiconv_u8)); 190 buf = psiconv_buffer_new();
170 while (! feof(f)) 191 psiconv_buffer_fread_all(buf,f);
171 psiconv_list_fread(buf,1024,f);
172 192
173 if (strlen(inputfilename) != 0) 193 if (strlen(inputfilename) != 0)
174 if (fclose(f)) { 194 if (fclose(f)) {
175 perror(inputfilename); 195 perror(inputfilename);
176 exit(1); 196 exit(1);
177 } 197 }
178 198
179 if (psiconv_parse(buf,&file)) 199 if (psiconv_parse(buf,&file) || (file->type == psiconv_unknown_file))
180 if(exact) 200 {
201 fprintf(stderr,"Parse error\n");
181 exit(1); 202 exit(1);
203 }
182 204
183 /* Set correct output file */ 205 /* Set correct output file */
184 if (strlen(outputfilename) == 0) 206 if (strlen(outputfilename) == 0)
185 outputfilename = "/dev/stdout"; 207 outputfilename = "/dev/stdout";
186 208
187 strtoupper(type); 209 strtoupper(type);
188 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 210 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
189 ff = psiconv_list_get(fileformat_list,i); 211 ff = psiconv_list_get(fileformat_list,i);
190 if (! strcmp(type,ff->name)) { 212 if (! strcasecmp(type,ff->name)) {
191 res = ff->output(outputfilename,file,type); 213 res = ff->output(outputfilename,file,type, encoding_type);
192 if (res) { 214 if (res) {
193 fprintf(stderr, 215 fprintf(stderr,
194 "Output format `%s' not permitted for this file type\n",type); 216 "Output format `%s' not permitted for this file type\n",type);
195 exit(1); 217 exit(1);
196 } 218 }
Legend:
Removed from v.53  
changed lines
  Added in v.147
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26