From 89dfaeec1540f73ba85dbd25dd5332416f98778e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 7 Jun 2009 18:41:20 +0100 Subject: [PATCH 1/1] Renames and cleanups. --- .gitignore | 12 +-- pctb/Makefile | 13 ++-- pctb/ls-xwindow-names | 36 --------- pctb/ocr.c | 2 +- pctb/stuff/csr.xbm | 5 -- pctb/stuff/old | 9 --- pctb/stuff/t.xpm | 83 --------------------- pctb/text.xpm | 19 ----- pctb/wrap-wip | 8 -- pctb/{show-thing.tcl => yppsc-ocr-resolver} | 12 ++- 10 files changed, 19 insertions(+), 180 deletions(-) delete mode 100755 pctb/ls-xwindow-names delete mode 100644 pctb/stuff/csr.xbm delete mode 100644 pctb/stuff/old delete mode 100644 pctb/stuff/t.xpm delete mode 100644 pctb/text.xpm delete mode 100755 pctb/wrap-wip rename pctb/{show-thing.tcl => yppsc-ocr-resolver} (97%) diff --git a/.gitignore b/.gitignore index 367468d..f795243 100644 --- a/.gitignore +++ b/.gitignore @@ -7,14 +7,6 @@ pctb/*.o pctb/t.* pctb/u.* -pctb/#*#.* -pctb/convert -pctb/x-manip-window - -pctb/stuff/text.ppm -pctb/stuff/text.png -pctb/stuff/text.pbm -pctb/stuff/text.xbm +pctb/ypp-commodities -pctb/stuff/database -pctb/stuff/t.* +pctb/#*#.* diff --git a/pctb/Makefile b/pctb/Makefile index a993776..afea428 100644 --- a/pctb/Makefile +++ b/pctb/Makefile @@ -1,3 +1,4 @@ +CC= gcc OPTIMISE= -O2 WERROR= -Werror WARNINGS= -Wall -Wwrite-strings -Wpointer-arith -Wmissing-prototypes \ @@ -6,16 +7,16 @@ DEBUG=-g CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG) -TARGETS= convert x-manip-window +TARGETS= ypp-commodities all: $(TARGETS) -CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o +CONVERT_OBJS= convert.o ocr.o pages.o structure.o -convert: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 -$(CONVERT_OBJS): ocr.h convert.h structure.h +ypp-commodities: $(CONVERT_OBJS) -lnetpbm -lXtst -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) -x-manip-window: -lXtst -lX11 +$(CONVERT_OBJS): ocr.h convert.h structure.h common.h clean: - rm -f $(TARGETS) *.o core core.* + rm -f $(TARGETS) *.o core core.* *~ t t.* u u.* ./#pages#.ppm diff --git a/pctb/ls-xwindow-names b/pctb/ls-xwindow-names deleted file mode 100755 index 7fbbe40..0000000 --- a/pctb/ls-xwindow-names +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/perl -w -use strict (qw(vars)); - -use IO::File; - -our @pipes; - -sub reap_pipe () { - my ($child, $pipe) = @{ shift @pipes }; - { local ($/) = undef; $_= <$pipe>; } - if (m/^WM_NAME: +not found/) { - } elsif (m/^WM_NAME\(STRING\) = $/) { - } elsif (m/^WM_NAME\(STRING\) = \"(.*)\"$/) { - print "$child $1\n" or die $!; - } else { - die "$child $_ ?"; - } - $!=0; $pipe->close(); $? and die "$? $! ?"; -} - -open WI, "LC_ALL=C xwininfo -root -children |" or die $!; -while () { - next unless m/^\s+\d+ children:/..0; - next unless m/^\s+(0x[0-9a-f]+) /; - my $child= $1; - - my $pipe= new IO::File "LC_ALL=C xprop -id $child WM_NAME |" or die $!; - push @pipes, [ $child, $pipe ]; - - while (@pipes > 40) { reap_pipe(); } -} -$!=0; close WI; $? and die "$? $! ?"; - -while (@pipes) { reap_pipe(); } - -close STDOUT or die $!; diff --git a/pctb/ocr.c b/pctb/ocr.c index 314a829..5fdc457 100644 --- a/pctb/ocr.c +++ b/pctb/ocr.c @@ -200,7 +200,7 @@ static void callout_unknown(OcrReader *rd, int w, Pixcol cols[], /* 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: */ sysassert( dup2(donepipe[1],4) ==4 ); - execlp("./show-thing.tcl", "./show-thing.tcl", + execlp("./yppsc-ocr-resolver", "yppsc-ocr-resolver", DEBUGP(callout) ? "--debug" : "--noop-arg", "--automatic-1", (char*)0); diff --git a/pctb/stuff/csr.xbm b/pctb/stuff/csr.xbm deleted file mode 100644 index c581f92..0000000 --- a/pctb/stuff/csr.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define csr_width 11 -#define csr_height 11 -static unsigned char csr_bits[] = { - 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x21, 0x04, 0x22, 0x02, 0x25, 0x05, - 0xaa, 0x02, 0x74, 0x01, 0xa8, 0x00, 0x70, 0x00, 0x20, 0x00}; diff --git a/pctb/stuff/old b/pctb/stuff/old deleted file mode 100644 index 557b690..0000000 --- a/pctb/stuff/old +++ /dev/null @@ -1,9 +0,0 @@ -"\"+ c #111\", -\"a c #600\", -\"A c #fcc\", -\"b c #006\", -\"B c #ccf\", -\"u c #000\", -\"U c #888\", -\"q c #440\", -\"Q c #ff0\",\n" diff --git a/pctb/stuff/t.xpm b/pctb/stuff/t.xpm deleted file mode 100644 index e2d7c7a..0000000 --- a/pctb/stuff/t.xpm +++ /dev/null @@ -1,83 +0,0 @@ -/* XPM */ -static char *t[] = { -/* columns rows colors chars-per-pixel */ -"379 67 9 1", -"+ c #111", -"a c #600", -"A c #fcc", -"b c #008", -"B c #ccf", -"u c #000", -"U c #ff0", -"q c #000", -"Q c #ff0", -/* pixels */ -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+AAAAA+aaaaa+AAAAA+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+AAAAA+aaaaa+AAAAA+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+AAAAA+aaaaa+AAAAA+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+AAAAA+aaaaa+AAAAA+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+AAAAA+aaaaa+AAAAA+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+bbbbb+uuuuu+AAAAA+aaaaa+AAAAA+AAAAA+aaaaa+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+bbbbb+uuuuu+AAAAA+aaaaa+AAAAA+AAAAA+aaaaa+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+bbbbb+uuuuu+AAAAA+aaaaa+AAAAA+AAAAA+aaaaa+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+bbbbb+uuuuu+AAAAA+aaaaa+AAAAA+AAAAA+aaaaa+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+bbbbb+uuuuu+AAAAA+aaaaa+AAAAA+AAAAA+aaaaa+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+AAAAA+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+AAAAA+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+AAAAA+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+AAAAA+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+AAAAA+aaaaa+AAAAA+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+AAAAA+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+UUUUU+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+qqqqq+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+UUUUU+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+QQQQQ+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+QQQQQ+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+QQQQQ+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+QQQQQ+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+BBBBB+bbbbb+bbbbb+bbbbb+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+QQQQQ+qqqqq+qqqqq+QQQQQ+QQQQQ+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+UUUUU+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+qqqqq+QQQQQ+QQQQQ+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+qqqqq+QQQQQ+QQQQQ+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+qqqqq+QQQQQ+QQQQQ+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+qqqqq+QQQQQ+QQQQQ+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+bbbbb+BBBBB+BBBBB+BBBBB+BBBBB+uuuuu+AAAAA+aaaaa+aaaaa+aaaaa+AAAAA+uuuuu+qqqqq+QQQQQ+QQQQQ+qqqqq+QQQQQ+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+UUUUU+UUUUU+UUUUU+uuuuu+uuuuu+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+", -"+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+bbbbb+bbbbb+bbbbb+bbbbb+bbbbb+uuuuu+aaaaa+aaaaa+aaaaa+aaaaa+aaaaa+uuuuu+qqqqq+qqqqq+qqqqq+qqqqq+qqqqq+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+uuuuu+UUUUU+uuuuu+", -"+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", -}; - diff --git a/pctb/text.xpm b/pctb/text.xpm deleted file mode 100644 index d5c14ed..0000000 --- a/pctb/text.xpm +++ /dev/null @@ -1,19 +0,0 @@ -/* XPM */ -static char *t[] = { -/* columns rows colors chars-per-pixel */ -"63 11 2 1", -" c black", -"o c white", -/* pixels */ -" ", -" o o oo ", -" o o o ", -" oo oo o ", -" o o o ooo o oo o o ooo o oooo ooo o", -" o o o o oo o o o o o o o o o ", -" o o oooo o o o o oooo o o o oooo o ", -" o o o o o o o o o o o o o o o o ", -" o o o o o o o oo o o o oooo o o o", -" o o oooo o o oo o oooo ooo o oooo ", -" o o ", -}; diff --git a/pctb/wrap-wip b/pctb/wrap-wip deleted file mode 100755 index 5c5bc1e..0000000 --- a/pctb/wrap-wip +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -ex - -xwd -name 'Puzzle Pirates - Aristarchus on the Midnight ocean' >t.xwd -# 60-odd commodity pages! Will take ~2 mins to run through them all - -convert t.xwd t.pnm -pnmdepth u.pnm diff --git a/pctb/show-thing.tcl b/pctb/yppsc-ocr-resolver similarity index 97% rename from pctb/show-thing.tcl rename to pctb/yppsc-ocr-resolver index 5356c32..016a95e 100755 --- a/pctb/show-thing.tcl +++ b/pctb/yppsc-ocr-resolver @@ -261,7 +261,7 @@ proc recursor//01 {z1} { .d.csr.csr.l configure -text {adjust} place .d.csr.csr -x [expr {$cur*$mul - 7}] bind_key space { othercursor } - bind_leftright cur_$z1 0 [expr {$cols-1}] + bind_leftright_q cur_$z1 0 [expr {$cols-1}] if {[llength $glyphsdone]} { bind_key Tab { set cur_mode already; recursor } } else { @@ -279,6 +279,7 @@ proc recursor//01 {z1} { {Space {switch to moving other cursor}} {Return {confirm location, enter letter(s)}} {Tab {switch to correcting earlier ocr}} + {Q {quit and abandon OCR run}} } } proc othercursor {} { @@ -320,7 +321,7 @@ proc recursor/already {} { place .d.csr.csr -x [expr {$rmax*$mul-3}] bind_key Return {} bind_key space {} - bind_leftright cur_already 0 [expr {[llength $glyphsdone]/4-1}] + bind_leftright_q cur_already 0 [expr {[llength $glyphsdone]/4-1}] bind_key Tab { bind_key Delete {}; set cur_mode 1; recursor } bind_key Delete { RETURN_RESULT DELETE [lrange $glyphsdone \ @@ -331,6 +332,7 @@ proc recursor/already {} { {{<- ->} {move cursor, selecting glyph to correct}} {Del {clear this glyph from the recognition database}} {Tab {switch to selecting area to define as new glyph}} + {Q {quit and abandon OCR run}} } } @@ -344,9 +346,13 @@ proc unbind_all_keys {} { foreach k [array names keybindings] { bind_key $k {} } } -proc bind_leftright {var min max} { +proc bind_leftright_q {var min max} { bind_key Left [list leftright $var $min $max -1] bind_key Right [list leftright $var $min $max +1] + bind_key q { + puts stderr "\nCharacter resolver quitting as you requested." + exit 1 + } } proc leftright {var min max inc} { upvar #0 $var v -- 2.30.2