Digit fields have different spacing

[ypp-sc-tools.db-live.git] / pctb / ocr.c

diff --git a/pctb/ocr.c b/pctb/ocr.c
index fd4cba9fe841e1c6a439f34edc741eae31d44c5c..d12218f39fd2953eef1f892c9bb7fbd360e3b64c 100644 (file)
--- a/pctb/ocr.c
+++ b/pctb/ocr.c
@@ -46,10 +46,27 @@ static const char *context_names[]= {
   "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]))
 
-#define SPACE_SPACES 4
+#define NCONTEXTS (sizeof(context_names)/sizeof(context_names[0]))
 
 struct OcrReader {
   int h;
@@ -320,20 +337,6 @@ static void add_result(OcrReader *rd, const char *s, int l, int r,
   rd->nresults++;
 }
 
-struct OcrCellTypeInfo {
-  unsigned initial, nextword, midword;
-  const char *name;
-};
-const struct OcrCellTypeInfo ocr_celltype_number= {
-  4,4,4,
-  .name= "number"
-};
-const struct OcrCellTypeInfo ocr_celltype_text= {
-  .initial=2, /* Uppercase */
-  .nextword=3, /* Either */
-  .midword=1, /* Lower only */
-  .name= "text"
-};
 
 const char *ocr_celltype_name(OcrCellType ct) { return ct->name; }
 
@@ -362,7 +365,7 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
     if (!cols[x]) {
       nspaces++;
       x++;
-      if (nspaces==SPACE_SPACES) {
+      if (nspaces == ct->space_spaces) {
        debugf("OCR  x=%x nspaces=%d space\n",x,nspaces);
        ctxmap= ct->nextword;
       }
@@ -370,7 +373,7 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
     }
 
     /* something here, so we need to add the spaces */
-    if (nspaces>=SPACE_SPACES)
+    if (nspaces >= ct->space_spaces)
       add_result(rd," ",x-nspaces,x+1,0);
     nspaces=0;
 
@@ -435,7 +438,7 @@ OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
       if (uniquematch->s[0]) ctxmap= ct->midword;
       else debugf(" (empty)");
       if (uniquematch->endsword) {
-       nspaces= SPACE_SPACES;
+       nspaces= ct->space_spaces;
        debugf("_");
        ctxmap= ct->nextword;
       }