Do not mention bpp in mustfail1 since we check it ourselves nowadays

[ypp-sc-tools.web-live.git] / pctb / convert.c

diff --git a/pctb/convert.c b/pctb/convert.c
index 3250d183a940caa8397b75e502ed3237b5303e67..ec91f82faefbbb5b8d70aba76a3ec1002e2a4db3 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -66,7 +66,9 @@ FILE *screenshot_file;
 const char *o_ocean, *o_pirate;
 int o_quiet;
 
-enum flags o_flags= ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
+enum flags o_flags=
+   ff_charset_allowedit |
+   ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
 
 static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
 static void vbadusage(const char *fmt, va_list al) {
@@ -123,7 +125,7 @@ void fetch_with_rsync(const char *stem) {
   
     const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
     char *remote= masprintf("%s/master-%s.txt", src, stem);
-    char *local= masprintf("#master-%s#.txt", stem);
+    char *local= masprintf("_master-%s.txt", stem);
     if (DEBUGP(rsync))
       fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
     execlp(rsync, "rsync",
@@ -265,10 +267,12 @@ int main(int argc, char **argv) {
             o_serv_dict_submit,  o_flags & ff_dict_submit);
 
   if (!o_screenshot_fn)
-    o_screenshot_fn= masprintf("%s/#pages#.ppm",get_vardir());
+    o_screenshot_fn= masprintf("%s/_pages.ppm",get_vardir());
 
   /* Actually do the work */
             
+  canon_colour_prepare();
+  
   if (o_mode & mf_findwindow) {
     screenshot_startup();
     find_yppclient_window();