/[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 146 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(" -h, --help Display this help and exit"); 73 puts(" -h, --help Display this help and exit");
58 puts(" -o, --outputfile Output to file instead of stdout"); 74 puts(" -o, --outputfile Output to file instead of stdout");
59 puts(" -s, --silent Do not even show warnings on stderr"); 75 puts(" -s, --silent Do not even show warnings on stderr");
60 puts(" -T, --type=FILETYPE Output type"); 76 puts(" -T, --type=FILETYPE Output type");
61 puts(" -V, --version Display the program version and exit"); 77 puts(" -V, --version Display the program version and exit");
62 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");
63 puts(""); 80 puts("");
64 puts("The following output types are known:"); 81 puts("The following output types are known:");
65 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 82 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
66 ff = psiconv_list_get(fileformat_list,i); 83 ff = psiconv_list_get(fileformat_list,i);
67 printf(" %s",ff->name); 84 printf(" %s",ff->name);
68 for (j = strlen(ff->name); j < 15; j++) 85 for (j = strlen(ff->name); j < 15; j++)
69 putchar(' '); 86 putchar(' ');
70 puts(ff->description); 87 puts(ff->description);
71 } 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");
72} 92}
73 93
74void print_version(void) 94void print_version(void)
75{ 95{
76 printf("Version %s\n",VERSION); 96 printf("Version %s\n",VERSION);
92 {"verbose",no_argument,NULL,'v'}, 112 {"verbose",no_argument,NULL,'v'},
93 {"debug",no_argument,NULL,'d'}, 113 {"debug",no_argument,NULL,'d'},
94 {"silent",no_argument,NULL,'s'}, 114 {"silent",no_argument,NULL,'s'},
95 {"outputfile",required_argument,NULL,'o'}, 115 {"outputfile",required_argument,NULL,'o'},
96 {"type",required_argument,NULL,'T'}, 116 {"type",required_argument,NULL,'T'},
117 {"UTF8",no_argument,NULL,'u'},
97 {0,0,0,0} 118 {0,0,0,0}
98 }; 119 };
99 const char* short_options = "hVvsdo:eT:"; 120 const char* short_options = "hVvsdo:uT:";
100 int option_index; 121 int option_index;
101 FILE * f; 122 FILE * f;
102 struct stat fbuf; 123 struct stat fbuf;
103 124
104 const char *inputfilename = ""; 125 const char *inputfilename = "";
105 const char *outputfilename = ""; 126 const char *outputfilename = "";
106 char *type = strdup("HTML3"); 127 char *type = strdup("HTML3");
128 psiconv_encoding encoding_type=PSICONV_ENCODING_CP1252;
107 129
108 int c,i,res; 130 int c,i,res;
109 psiconv_buffer buf; 131 psiconv_buffer buf;
110 psiconv_file file; 132 psiconv_file file;
111 psiconv_fileformat ff; 133 psiconv_fileformat ff;
132 break; 154 break;
133 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break; 155 case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
134 case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break; 156 case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
135 case 'o': outputfilename = strdup(optarg); break; 157 case 'o': outputfilename = strdup(optarg); break;
136 case 'T': type = strdup(optarg); break; 158 case 'T': type = strdup(optarg); break;
159 case 'u': encoding_type = PSICONV_ENCODING_UTF8; break;
137 case '?': case ':': fputs("Try `-h' for more information\n",stderr); 160 case '?': case ':': fputs("Try `-h' for more information\n",stderr);
138 exit(1); 161 exit(1);
139 default: fprintf(stderr,"Internal error: getopt_long returned character " 162 default: fprintf(stderr,"Internal error: getopt_long returned character "
140 "code 0%o ?? (contact the author)\n", c); 163 "code 0%o ?? (contact the author)\n", c);
141 exit(1); break; 164 exit(1); break;
184 outputfilename = "/dev/stdout"; 207 outputfilename = "/dev/stdout";
185 208
186 strtoupper(type); 209 strtoupper(type);
187 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) { 210 for (i = 0; i < psiconv_list_length(fileformat_list); i ++) {
188 ff = psiconv_list_get(fileformat_list,i); 211 ff = psiconv_list_get(fileformat_list,i);
189 if (! strcmp(type,ff->name)) { 212 if (! strcasecmp(type,ff->name)) {
190 res = ff->output(outputfilename,file,type); 213 res = ff->output(outputfilename,file,type, encoding_type);
191 if (res) { 214 if (res) {
192 fprintf(stderr, 215 fprintf(stderr,
193 "Output format `%s' not permitted for this file type\n",type); 216 "Output format `%s' not permitted for this file type\n",type);
194 exit(1); 217 exit(1);
195 } 218 }

Legend:
Removed from v.146  
changed lines
  Added in v.147

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26