/[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 65 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"
… …
49{ 65{
50 psiconv_fileformat ff; 66 psiconv_fileformat ff;
51 int i,j; 67 int i,j;
52 68
53 puts("Syntax: psiconv [OPTIONS..] [FILE]"); 69 puts("Syntax: psiconv [OPTIONS..] [FILE]");
54 puts("Convert the psion Word file FILE to a HTML file"); 70 puts("Convert the psion Word file FILE to other formats");
55 puts("If FILE is not specified, use stdin"); 71 puts("If FILE is not specified, use stdin");
56 puts(" -d, --debug Show debug information on stderr"); 72 puts(" -d, --debug Show debug information on stderr");
57 puts(" -e, --exact Quit on any parse errors or warnings");
58 puts(" -h, --help Display this help and exit"); 73 puts(" -h, --help Display this help and exit");
59 puts(" -o, --outputfile Output to file instead of stdout"); 74 puts(" -o, --outputfile Output to file instead of stdout");
60 puts(" -s, --silent Do not even show warnings on stderr"); 75 puts(" -s, --silent Do not even show warnings on stderr");
61 puts(" -T, --type=FILETYPE Output type"); 76 puts(" -T, --type=FILETYPE Output type");
62 puts(" -V, --version Display the program version and exit"); 77 puts(" -V, --version Display the program version and exit");
63 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");
64 puts(""); 80 puts("");
65 puts("The following output types are known:"); 81 puts("The following output types are known:");
66 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 82 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
67 ff = psiconv_list_get(fileformat_list,i); 83 ff = psiconv_list_get(fileformat_list,i);
68 printf(" %s",ff->name); 84 printf(" %s",ff->name);
69 for (j = strlen(ff->name); j < 15; j++) 85 for (j = strlen(ff->name); j < 15; j++)
70 putchar(' '); 86 putchar(' ');
71 puts(ff->description); 87 puts(ff->description);
72 } 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");
73} 92}
74 93
75void print_version(void) 94void print_version(void)
76{ 95{
77 printf("Version %s\n",VERSION); 96 printf("Version %s\n",VERSION);
… …
93 {"verbose",no_argument,NULL,'v'}, 112 {"verbose",no_argument,NULL,'v'},
94 {"debug",no_argument,NULL,'d'}, 113 {"debug",no_argument,NULL,'d'},
95 {"silent",no_argument,NULL,'s'}, 114 {"silent",no_argument,NULL,'s'},
96 {"outputfile",required_argument,NULL,'o'}, 115 {"outputfile",required_argument,NULL,'o'},
97 {"type",required_argument,NULL,'T'}, 116 {"type",required_argument,NULL,'T'},
98 {"exact",no_argument,NULL,'e'}, 117 {"UTF8",no_argument,NULL,'u'},
99 {0,0,0,0} 118 {0,0,0,0}
100 }; 119 };
101 const char* short_options = "hVvsdo:eT:"; 120 const char* short_options = "hVvsdo:uT:";
102 int option_index; 121 int option_index;
103 FILE * f; 122 FILE * f;
104 struct stat fbuf; 123 struct stat fbuf;
105 124
106 const char *inputfilename = ""; 125 const char *inputfilename = "";
107 const char *outputfilename = ""; 126 const char *outputfilename = "";
108 char *type = strdup("HTML3"); 127 char *type = strdup("HTML3");
109 int exact=0; 128 psiconv_encoding encoding_type=PSICONV_ENCODING_CP1252;
110 129
111 int c,i,res; 130 int c,i,res;
112 psiconv_buffer buf; 131 psiconv_buffer buf;
113 psiconv_file file; 132 psiconv_file file;
114 psiconv_fileformat ff; 133 psiconv_fileformat ff;
… …
117 136
118 fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s)); 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);
… …
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_FATAL; 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;
… …
165 exit(1); 185 exit(1);
166 } 186 }
167 } else 187 } else
168 f = stdin; 188 f = stdin;
169 189
170 buf = psiconv_list_new(sizeof(psiconv_u8)); 190 buf = psiconv_buffer_new();
171 while (! feof(f)) 191 psiconv_buffer_fread_all(buf,f);
172 psiconv_list_fread(buf,1024,f);
173 192
174 if (strlen(inputfilename) != 0) 193 if (strlen(inputfilename) != 0)
175 if (fclose(f)) { 194 if (fclose(f)) {
176 perror(inputfilename); 195 perror(inputfilename);
177 exit(1); 196 exit(1);
178 } 197 }
179 198
180 if (psiconv_parse(buf,&file)) 199 if (psiconv_parse(buf,&file) || (file->type == psiconv_unknown_file))
181 if(exact) 200 {
201 fprintf(stderr,"Parse error\n");
182 exit(1); 202 exit(1);
203 }
183 204
184 /* Set correct output file */ 205 /* Set correct output file */
185 if (strlen(outputfilename) == 0) 206 if (strlen(outputfilename) == 0)
186 outputfilename = "/dev/stdout"; 207 outputfilename = "/dev/stdout";
187 208
188 strtoupper(type); 209 strtoupper(type);
189 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 210 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
190 ff = psiconv_list_get(fileformat_list,i); 211 ff = psiconv_list_get(fileformat_list,i);
191 if (! strcmp(type,ff->name)) { 212 if (! strcasecmp(type,ff->name)) {
192 res = ff->output(outputfilename,file,type); 213 res = ff->output(outputfilename,file,type, encoding_type);
193 if (res) { 214 if (res) {
194 fprintf(stderr, 215 fprintf(stderr,
195 "Output format `%s' not permitted for this file type\n",type); 216 "Output format `%s' not permitted for this file type\n",type);
196 exit(1); 217 exit(1);
197 } 218 }
Legend:
Removed from v.65  
changed lines
  Added in v.147
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26