X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=pctb%2Focr.c;h=b7934c983e2f407a362183c0e5aad6756653165c;hp=be479f83b8d626442899c77f08ffdab049e26747;hb=1d0e4ca6694c19fadd97452eed1451248b156997;hpb=cd6a4f773c32f73aff27f97e8994c6b7c1019bb7

diff --git a/pctb/ocr.c b/pctb/ocr.c
index be479f8..b7934c9 100644
--- a/pctb/ocr.c
+++ b/pctb/ocr.c
@@ -1,78 +1,175 @@
 /*
-  */
+ * Core OCR algorithm (first exact bitmap match)
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
 
 #include "ocr.h"
+#include "convert.h"
 
 typedef struct {
   Pixcol col;
-  struct OCRDatabaseNode *then;
-} OCRDatabaseLink;
-
-#define MAXGLYPHCHRS 3
+  struct DatabaseNode *then;
+} DatabaseLink;
 
-typedef struct OCRDatabaseNode {
-  char s[MAXGLYPHCHRS+1]; /* null-terminated; "" means no match here */
+typedef struct DatabaseNode {
+  char *str;
   int nlinks, alinks;
-  OCRDatabaseLink *links;
-} OCRDatabaseNode;
+  unsigned match:1, defined:1, endsword:1;
+  DatabaseLink *links;
+} DatabaseNode;
+
+static const char *context_names[]= {
+  "Lower",
+  "Upper",
+  "Digit"
+};
+struct OcrCellTypeInfo {
+  /* bitmaps of indices into context_names: */
+  unsigned initial, nextword, midword;
+  int space_spaces;
+  const char *name;
+};
+const struct OcrCellTypeInfo ocr_celltype_number= {
+  4,4,4,
+  .space_spaces= 5,
+  .name= "number"
+};
+const struct OcrCellTypeInfo ocr_celltype_text= {
+  .initial=2, /* Uppercase */
+  .nextword=3, /* Either */
+  .midword=1, /* Lower only */
+  .space_spaces= 4,
+  .name= "text"
+};
+
+
+#define NCONTEXTS (sizeof(context_names)/sizeof(context_names[0]))
+
+struct OcrReader {
+  int h;
+  DatabaseNode contexts[NCONTEXTS];
+  OcrResultGlyph *results;
+  int aresults, nresults;
+};
+
+DEBUG_DEFINE_DEBUGF(ocr)
+
+#define FGETSLINE (dbfile_getsline(lbuf,sizeof(lbuf),__FILE__,__LINE__))
+
+static void cleardb_node(DatabaseNode *n) {
+  int i;
+  free(n->str); n->str=0;
+  n->defined=n->match=n->endsword= 0;
+  for (i=0; i<n->nlinks; i++)
+    cleardb_node(n->links[i].then);
+}
 
-#define N_OCR_CONTEXTS 2
+static void readdb1(OcrReader *rd, const char *which);
 
-static OCRDatabaseNode ocr_contexts[N_OCR_CONTEXTS];
-static FILE *db;
-static OcrResultGlyph *results;
-static int aresults, nresults;
+static void readdb(OcrReader *rd) {
+  int ctxi;
+  
+  for (ctxi=0; ctxi<NCONTEXTS; ctxi++)
+    cleardb_node(&rd->contexts[ctxi]);
 
-static FILE *resolver;
-static pid_t resolver_pid;
-static int resolver_done;
+  readdb1(rd, "master");
+  readdb1(rd, "local");
+}
 
-static void ocr_readdb(void) {
-  int ctx,nchrs;
-  OCRDatabaseNode *current, *additional;
-  char chrs[MAXGLYPHCHRS+1];
+static void readdb1(OcrReader *rd, const char *which) {
+  int nchrs;
+  DatabaseNode *current, *additional;
+  char chrs[100];
   Pixcol cv;
-  int r,i,j;
+  int j,ctxi;
+  int h, endsword;
+  char lbuf[100];
+
+  char *dbfname= masprintf("%s/#%s-char%d#.txt",
+			   get_vardir(), which, rd->h);
+  
+  if (!dbfile_open(dbfname))
+    goto x;
 
-  assert(!db);
-  db= fopen("database","r");  eassert(db);
+  FGETSLINE;
+  dbassert(!strcmp(lbuf,"# ypp-sc-tools pctb font v1"));
+
+  dbassert( dbfile_scanf("%d", &h) == 1);
+  dbassert(h==rd->h);
 
   for (;;) {
-    r= fscanf(db, "%d %d", &ctx, &nchrs);
-    if (r==EOF) break;
-    eassert(r==2);
-    eassert(ctx>=0 && ctx<N_OCR_CONTEXTS);
-    eassert(nchrs>0 && nchrs<=MAXGLYPHCHRS);
-
-    for (i=0; i<nchrs; i++) {
-      int c;
-      r= fscanf(db, "%x", &c);  eassert(r==1);
-      eassert(c>0 && c<=255);
-      chrs[i]= c;
+    FGETSLINE;
+    if (!lbuf[0] || lbuf[0]=='#') continue;
+    if (!strcmp(lbuf,".")) break;
+
+    for (ctxi=0; ctxi<NCONTEXTS; ctxi++)
+      if (!strcmp(lbuf,context_names[ctxi]))
+	goto found_ctx;
+    /* not found, just skip */
+    for (;;) { FGETSLINE; if (!lbuf[0]) break; }
+    continue;
+
+  found_ctx:
+    for (nchrs=0;;) {
+      int c= fgetc(dbfile); sysassert(!ferror(dbfile)); dbassert(c!=EOF);
+      if (c=='\n') break; /* forces no match */
+      dbassert(nchrs<sizeof(chrs));
+      chrs[nchrs++]= c;
+    }
+    endsword= 0;
+    if (nchrs>0 && chrs[nchrs-1]==' ') {
+      endsword= 1;
+      nchrs--;
     }
-    chrs[nchrs]= 0;
 
-    int twidth;
-    r= fscanf(db, "%d", &twidth);  eassert(r==1);
-    current= &ocr_contexts[ctx];
-    for (i=0; i<twidth; i++) {
-      r= fscanf(db, "%"PSPIXCOL(SCNx), &cv);  eassert(r==1);
+    current= &rd->contexts[ctxi];
+    for (;;) {
+      FGETSLINE;
+      if (!lbuf[0]) { dbassert(current != &rd->contexts[ctxi]); break; }
+      char *ep;
+      cv= strtoul(lbuf,&ep,16);  dbassert(!*ep);
+      dbassert(!(cv & ~((1UL << rd->h)-1)));
+      
       for (j=0; j<current->nlinks; j++)
 	if (current->links[j].col == cv) {
 	  current= current->links[j].then;
 	  goto found_link;
 	}
 
-      additional= malloc(sizeof(*additional)); eassert(additional);
-      additional->s[0]= 0;
+      additional= mmalloc(sizeof(*additional));
+      additional->str= 0;
+      additional->defined= 0;
+      additional->match= 0;
+      additional->endsword= 0;
       additional->nlinks= additional->alinks= 0;
       additional->links= 0;
       if (current->nlinks==current->alinks) {
 	current->alinks++;
 	current->alinks<<=1;
-	current->links= realloc(current->links,
-            sizeof(*current->links) * current->alinks);
-	eassert(current->links);
+	current->links= mrealloc(current->links,
+				 sizeof(*current->links) * current->alinks);
       }
       current->links[current->nlinks].col= cv;
       current->links[current->nlinks].then= additional;
@@ -82,47 +179,60 @@ static void ocr_readdb(void) {
     found_link:;
     }
 
-    eassert(!current->s[0]);
-    strcpy(current->s, chrs);
+    if (!current->defined) {
+      free(current->str);
+      current->str= 0;
+      current->defined= 1;
+      current->match= 0;
+
+      if (nchrs) {
+	current->str= mmalloc(nchrs+1);
+	memcpy(current->str, chrs, nchrs);
+	current->str[nchrs]= 0;
+	current->match= 1;
+	current->endsword= endsword;
+      }
+    }
   }
-  eassert(!ferror(db));
-  eassert(feof(db));
-}      
-
-static void callout_unknown(int w, int h, Pixcol cols[],
-			    int unk_l, int unk_r, int unk_ctx,
-			    const OcrResultGlyph *sofar, int nsofar) {
-  int jobpipe[2],donepipe[2], c, r,i, x,y;
+ x:
+  dbfile_close();
+  free(dbfname);
+}
+
+static void cu_pr_ctxmap(FILE *resolver, unsigned ctxmap) {
+  fprintf(resolver,"{");
+  const char *spc="";
+  int ctxi;
+  for (ctxi=0; ctxi<NCONTEXTS; ctxi++) {
+    if (!(ctxmap & (1u << ctxi))) continue;
+    fprintf(resolver,"%s%s",spc,context_names[ctxi]);
+    spc=" ";
+  }
+  fprintf(resolver,"}");
+}
+
+static void callout_unknown(OcrReader *rd, int w, Pixcol cols[],
+			    int unk_l, int unk_r, unsigned unk_ctxmap) {
+  int c,i, x,y;
   const OcrResultGlyph *s;
   const char *p;
-  char cb;
   Pixcol pv;
+
+  FILE *resolver= resolve_start();
+  if (!resolver)
+    fatal("OCR failed - unrecognised characters or ligatures.\n"
+	  "Character set database needs to be updated or augmented.\n"
+	  "See README.charset.\n");
   
-  if (!resolver) {
-    r= pipe(jobpipe);  eassert(!r);
-    r= pipe(donepipe);  eassert(!r);
-    resolver_pid= fork();
-    eassert(resolver_pid!=-1);
-    if (!resolver_pid) {
-      r= dup2(jobpipe[0],0); eassert(r==0);
-      r= close(jobpipe[1]); eassert(!r);
-      r= close(donepipe[0]); eassert(!r);
-      /* we know donepipe[1] is >= 4 and we have dealt with all the others
-       * so we aren't in any danger of overwriting some other fd 4: */
-      r= dup2(donepipe[1],4); eassert(r==4);
-      execlp("./show-thing.tcl", "./show-thing.tcl",
-	     "--automatic","1",(char*)0);
-      eassert(!"execlp failed");
-    }
-    r= close(jobpipe[0]); eassert(!r);
-    r= close(donepipe[1]); eassert(!r);
-    resolver= fdopen(jobpipe[1],"w"); eassert(resolver);
-    resolver_done= donepipe[0];
-  }
-  fprintf(resolver,"%d %d %d",unk_l,unk_r,unk_ctx);
-  for (i=0, s=sofar; i<nsofar; i++, s++) {
+  fprintf(resolver,
+	  "char\n"
+	  "%d %d ",unk_l,unk_r);
+  cu_pr_ctxmap(resolver,unk_ctxmap);
+  for (i=0, s=rd->results; i<rd->nresults; i++, s++) {
     if (!strcmp(s->s," ")) continue;
-    fprintf(resolver," %d %d %d ",s->l,s->r,s->ctx);
+    fprintf(resolver," %d %d ",s->l,s->r);
+    cu_pr_ctxmap(resolver,s->ctxmap);
+    fprintf(resolver," ");
     for (p=s->s; (c= *p); p++) {
       if (c=='\\') fprintf(resolver,"\\%c",c);
       else if (c>=33 && c<=126) fputc(c,resolver);
@@ -138,79 +248,122 @@ static void callout_unknown(int w, int h, Pixcol cols[],
 	  "\"%d %d 2 1\",\n"
 	  "\"  c black\",\n"
 	  "\"o c white\",\n",
-	  w,h);
-  for (y=0, pv=1; y<h; y++, pv<<=1) {
+	  w,rd->h);
+  for (y=0, pv=1; y<rd->h; y++, pv<<=1) {
     fputc('"',resolver);
     for (x=0; x<w; x++)
       fputc(cols[x] & pv ? 'o' : ' ', resolver);
     fputs("\",\n",resolver);
   }
   fputs("};\n",resolver);
-  eassert(!ferror(resolver));
-  eassert(!fflush(resolver));
 
-  eassert(resolver);
+  resolve_finish();
+  readdb(rd);
+}
+
+static void add_result(OcrReader *rd, const char *s, int l, int r,
+		       unsigned ctxmap) {
+  if (rd->nresults >= rd->aresults) {
+    rd->aresults++; rd->aresults<<=1;
+    rd->results= mrealloc(rd->results, sizeof(*rd->results)*rd->aresults);
+  }
+  rd->results[rd->nresults].s= s;
+  rd->results[rd->nresults].l= l;
+  rd->results[rd->nresults].r= r;
+  rd->results[rd->nresults].ctxmap= ctxmap;
+  rd->nresults++;
+}
+
+
+typedef struct {
+  OcrReader *rd;
+  int w;
+  Pixcol *cols;
+  int x;
+  unsigned ctxmap;
+} FindCharArgs;
+
+static DatabaseNode *findchar_1ctx(const FindCharArgs *fca,
+				   DatabaseNode *start, int *matchx_r) {
+  DatabaseNode *current= start;
+  DatabaseNode *bestmatch= 0;
+  int i;
+  int x= fca->x;
 
   for (;;) {
-    r= read(resolver_done,&cb,1);
-    if (r==-1) { eassert(errno==EINTR); continue; }
+    debug_flush();
+    debugf(" | x=%d",x);
+    if (x > fca->w) break;
+    Pixcol cv= fca->cols[x];
+    debugf(" cv=%"PSPIXCOL(PRIx),cv);
+    for (i=0; i<current->nlinks; i++)
+      if (current->links[i].col == cv)
+	goto found;
+    /* not found */
+    debugf(" ?");
     break;
-  }
 
-  if (r==0) {
-    pid_t pid;
-    for (;;) {
-      pid= waitpid(resolver_pid, &r, 0);
-      if (pid==-1) { eassert(errno==EINTR); continue; }
-      break;
+  found:
+    current= current->links[i].then;
+    if (current->match) {
+      debugf(" \"%s\"%s",current->str,current->endsword?"_":"");
+      bestmatch= current;
+      *matchx_r= x;
+    } else {
+      debugf(" ...");
     }
-    eassert(pid==resolver_pid);
-    if (WIFEXITED(r)) {
-      eassert(!WEXITSTATUS(r));
-      fclose(resolver);
-      close(resolver_done);
-      resolver= 0;
-    } else if (WIFSIGNALED(r)) {
-      eassert(!"resolver child died due to signal");
+
+    x++;
+  }
+  return bestmatch;
+}  
+
+static DatabaseNode *findchar_unique(const FindCharArgs *fca, int *match_rx) {
+  DatabaseNode *uniquematch= 0;
+  int ctxi;
+    
+  debugf("OCR  lx=%d ct_state=%x  ", fca->x, fca->ctxmap);
+  for (ctxi=0; ctxi<NCONTEXTS; ctxi++) {
+    if (!(fca->ctxmap & (1u << ctxi))) continue;
+    debugf(" || %s",context_names[ctxi]);
+
+    DatabaseNode *match=
+      findchar_1ctx(fca, &fca->rd->contexts[ctxi], match_rx);
+    if (!match) continue;
+
+    if (uniquematch && strcmp(match->str, uniquematch->str)) {
+      debugf( " ambiguous");
+      uniquematch= 0;
     } else {
-      eassert(!"weird wait status");
+      uniquematch= match;
     }
-  } else {
-    eassert(r==1);
-    eassert(cb==0);
   }
 
-  fclose(db);
-  db= 0;
-  ocr_readdb();
+  return uniquematch;
 }
 
-static void add_result(const char *s, int l, int r, int ctx) {
-  if (nresults >= aresults) {
-    aresults++; aresults<<=1;
-    results= realloc(results,sizeof(*results)*aresults);
-    eassert(results);
-  }
-  results[nresults].s= s;
-  results[nresults].l= l;
-  results[nresults].r= r;
-  results[nresults].ctx= ctx;
-  nresults++;
-}
+const char *ocr_celltype_name(OcrCellType ct) { return ct->name; }
 
-OcrResultGlyph *ocr(int w, int h, Pixcol cols[]) {
-  int nspaces=-w;
-  int ctx=1,i, x;
+OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
+  int nspaces;
+  int x;
 
-  nresults=0;
-  assert(db);
+  FindCharArgs fca;
+  fca.rd= rd;
+  fca.w= w;
+  fca.cols= cols;
+  fca.x= -1;
 
-  fprintf(debug,"OCR h=%d w=%d",w,h);
-  for (x=0; x<w; x++) fprintf(debug," %"PSPIXCOL(PRIx),cols[x]);
-  fprintf(debug,"\n");
+ restart:
+
+  nspaces=- w;
+  fca.ctxmap= ct->initial;
+  rd->nresults=0;
+  debugf("OCR h=%d w=%d",rd->h,w);
+  for (x=0; x<w; x++) debugf(" %"PSPIXCOL(PRIx),cols[x]);
+  debugf("\n");
   debug_flush();
 
- restart:
   x=0;
   for (;;) {
     debug_flush();
@@ -221,67 +374,65 @@ OcrResultGlyph *ocr(int w, int h, Pixcol cols[]) {
     if (!cols[x]) {
       nspaces++;
       x++;
-      if (nspaces==3) {
-	fprintf(debug,"OCR  x=%x nspaces=%d space\n",x,nspaces);
-	add_result(" ",x-nspaces,x+1,0);
-	ctx=1;
+      if (nspaces == ct->space_spaces) {
+	debugf("OCR  x=%x nspaces=%d space\n",x,nspaces);
+	fca.ctxmap= ct->nextword;
       }
       continue;
     }
-    nspaces=0;
-
-    /* find character */
-    OCRDatabaseNode *current=0, *bestmatch=0;
-    int lx=x;
-    int bestmatch_rx=-1;
-    current= &ocr_contexts[ctx];
-    fprintf(debug,"OCR  lx=%d ctx=%d  ",lx,ctx);
 
-    for (;;) {
-      debug_flush();
-      fprintf(debug,"| x=%d",x);
-      if (x>w) break;
-      Pixcol cv= cols[x];
-      fprintf(debug," cv=%"PSPIXCOL(PRIx),x);
-      for (i=0; i<current->nlinks; i++)
-	if (current->links[i].col == cv)
-	  goto found;
-      /* not found */
-      fprintf(debug," ?");
-      break;
+    /* something here, so we need to add the spaces */
+    if (nspaces >= ct->space_spaces)
+      add_result(rd," ",x-nspaces,x+1,0);
+    nspaces=0;
 
-    found:
-      current= current->links[i].then;
-      if (current->s[0]) {
-	fprintf(debug," \"%s\"",current->s);
-	bestmatch=current; bestmatch_rx=x;
-      } else {
-	fprintf(debug," ...");
+    fca.x= x;
+
+    int match_rx=-1;
+    DatabaseNode *match= findchar_unique(&fca, &match_rx);
+    
+    if (match) {
+      debugf(" || YES");
+      add_result(rd, match->str, x, match_rx, fca.ctxmap);
+      x= match_rx+1;
+      if (match->match) fca.ctxmap= ct->midword;
+      else debugf(" (empty)");
+      if (match->endsword) {
+	nspaces= ct->space_spaces;
+	debugf("_");
+	fca.ctxmap= ct->nextword;
       }
-      x++;
-    }
-
-    if (bestmatch) {
-      fprintf(debug," YES\n");
-      add_result(bestmatch->s, lx, bestmatch_rx, ctx);
-      x= bestmatch_rx+1;
-      ctx= 0;
+      debugf("\n");
     } else {
       int rx;
-      fprintf(debug," UNKNOWN");
-      for (rx=lx; rx<w && cols[rx]; rx++);
-      fprintf(debug," x=%d ctx=%d %d..%d\n",x, ctx, lx,rx);
+      debugf(" || UNKNOWN");
+      for (rx=x; rx<w && cols[rx]; rx++);
+      debugf(" x=%d ctxmap=%x %d..%d\n",x, fca.ctxmap, x,rx);
       debug_flush();
-      callout_unknown(w,h,cols, lx,rx-1,ctx, results,nresults);
+      callout_unknown(rd, w,cols, x,rx-1, fca.ctxmap);
       goto restart;
     }
+
   }
-  add_result(0,-1,-1,0);
-  fprintf(debug,"OCR  finished %d glyphs\n",nresults);
+  add_result(rd, 0,-1,-1,0);
+  debugf("OCR  finished %d glyphs\n",rd->nresults);
   debug_flush();
-  return results;
+  return rd->results;
 }
 
-void ocr_init(void) {
-  ocr_readdb();
+OcrReader *ocr_init(int h) {
+  OcrReader *rd;
+
+  if (o_flags & ff_dict_fetch) {
+    char *fetchfile= masprintf("char%d",h);
+    progress("Updating %s...",fetchfile);
+    fetch_with_rsync(fetchfile);
+    free(fetchfile);
+  }
+
+  rd= mmalloc(sizeof(*rd));
+  memset(rd,0,sizeof(*rd));
+  rd->h= h;
+  readdb(rd);
+  return rd;
 }