modified src/strokes.txt

diff --git a/data/all.sh b/data/all.sh
new file mode 100755 (executable)
index 0000000..8befdc5
--- /dev/null
+++ b/data/all.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+./convert.py handwriting-ja.xml
+./sort.sh tomoe.utf16
+./sort.sh strokes.txt.bak
+./merge.sh strokes.txt.bak.sorted tomoe.utf16.sorted
+rm *sorted *utf16
+./sort.sh output.txt
+mv output.txt.sorted output.txt

diff --git a/data/convert.py b/data/convert.py
index 74872a7..b34ca8e 100755 (executable)
--- a/data/convert.py
+++ b/data/convert.py
@@ -6,7 +6,7 @@ import codecs
 from math import acos, pi
 
 if len(sys.argv) < 2:
 from math import acos, pi
 
 if len(sys.argv) < 2:

-    print("Usage: %s" % sys.argv[0])
+    print("Usage: %s handwriting-ja.xml" % sys.argv[0])

     sys.exit(1)
 
 class pt:
     sys.exit(1)
 
 class pt:


@@ -51,7 +51,7 @@ def get_chr(pts, cap = False):
        return ret
 
 f = open(sys.argv[1])
        return ret
 
 f = open(sys.argv[1])

-fo = open("tomoe", 'wb')
+fo = open("tomoe.utf16", 'wb')

 fo.write(codecs.BOM_UTF16_LE)
 k = None
 pts = []
 fo.write(codecs.BOM_UTF16_LE)
 k = None
 pts = []

diff --git a/data/merge.py b/data/merge.py
index 5367b9e..b9a114e 100755 (executable)
--- a/data/merge.py
+++ b/data/merge.py
@@ -61,3 +61,4 @@ fo = open("merged.txt.utf8", 'w')
 for i in l1:
        fo.write(i)
 fo.close()
 for i in l1:
        fo.write(i)
 fo.close()

+

diff --git a/data/merge.sh b/data/merge.sh
index 80d0fa0..6e7a0e4 100755 (executable)
--- a/data/merge.sh
+++ b/data/merge.sh
@@ -6,5 +6,5 @@ iconv -f UTF16LE -t UTF8 $2 > $2.utf8
 shopt -s xpg_echo
 echo '\x0A\x0A\c' >> merged.txt.utf8
 crlf -d merged.txt.utf8
 shopt -s xpg_echo
 echo '\x0A\x0A\c' >> merged.txt.utf8
 crlf -d merged.txt.utf8

-(echo '\xFF\xFE\c' & iconv -f UTF8 -t UTF16LE merged.txt.utf8) > merged.txt
+(echo '\xFF\xFE\c' & iconv -f UTF8 -t UTF16LE merged.txt.utf8) > output.txt

 rm *.utf8
 rm *.utf8

diff --git a/data/sort.sh b/data/sort.sh
index 5f5d913..81557b5 100755 (executable)
--- a/data/sort.sh
+++ b/data/sort.sh
@@ -5,5 +5,5 @@ iconv -f UTF16LE -t UTF8 $1 > $1.utf8
 shopt -s xpg_echo
 echo '\x0A\x0A\c' >> $1.utf8_sorted
 crlf -d $1.utf8_sorted
 shopt -s xpg_echo
 echo '\x0A\x0A\c' >> $1.utf8_sorted
 crlf -d $1.utf8_sorted

-(echo '\xFF\xFE\c' & iconv -f UTF8 -t UTF16LE $1.utf8_sorted) > out.txt
+(echo '\xFF\xFE\c' & iconv -f UTF8 -t UTF16LE $1.utf8_sorted) > $1.sorted

 rm *.utf8 *_sorted
 rm *.utf8 *_sorted

diff --git a/data/strokes.txt.bak b/data/strokes.txt.bak
old mode 100755 (executable)
new mode 100644 (file)
index ec27608..137f62a
Binary files a/data/strokes.txt.bak and b/data/strokes.txt.bak differ

diff --git a/src/strokes.txt b/src/strokes.txt
index 9abea7c..d2bd1c6 100644 (file)
Binary files a/src/strokes.txt and b/src/strokes.txt differ