Improve alignment tests

8 files changed, 58 insertions, 32 deletions

diff --git a/tests/alignments/data2 b/tests/alignments/data2
index c554511..08d2528 100644
--- a/tests/alignments/data2
+++ b/tests/alignments/data2
@@ -1,18 +1,4 @@
-Number  "Kanji symbol"  Sino-Japanese           'English pronunciation'
-100             百              ひゃく          hyaku
-200             二百            にひゃく        ni-hyaku
-300             三百            さんびゃく      san-byaku
-400             四百            よんひゃく      yon-hyaku
-500             五百            ごひゃく        go-hyaku
-600             六百            ろっぴゃく      roppyaku
-700             七百            ななひゃく      nana-hyaku
-800             八百            はっぴゃく      happyaku
-900             九百            きゅうひゃく    kyuu-hyaku
-1000            千              せん            sen
-10,000          一万            いちまん        ichi-man
-100,000         十万            じゅうまん      juu-man
-"1 million"     百万            ひゃくまん      hyaku-man
-"10 million"    千万            せんまん        sen-man
-"100 million"   億              おく            oku
-"1 billion"     十億            じゅうおく      juu-oku
-"1 trillion"    兆              ちょう          chou
+'a '  ' b c d' 'e f ' ' g h i'
+a     b        'c d'  e        f g ' h i'
+' a ' b        c      d        e f g      h i
+a     b        'c d'  d        e f g      h i
diff --git a/tests/alignments/data3 b/tests/alignments/data3
new file mode 100644
index 0000000..c554511
--- /dev/null
+++ b/tests/alignments/data3
@@ -0,0 +1,18 @@
+Number  "Kanji symbol"  Sino-Japanese           'English pronunciation'
+100             百              ひゃく          hyaku
+200             二百            にひゃく        ni-hyaku
+300             三百            さんびゃく      san-byaku
+400             四百            よんひゃく      yon-hyaku
+500             五百            ごひゃく        go-hyaku
+600             六百            ろっぴゃく      roppyaku
+700             七百            ななひゃく      nana-hyaku
+800             八百            はっぴゃく      happyaku
+900             九百            きゅうひゃく    kyuu-hyaku
+1000            千              せん            sen
+10,000          一万            いちまん        ichi-man
+100,000         十万            じゅうまん      juu-man
+"1 million"     百万            ひゃくまん      hyaku-man
+"10 million"    千万            せんまん        sen-man
+"100 million"   億              おく            oku
+"1 billion"     十億            じゅうおく      juu-oku
+"1 trillion"    兆              ちょう          chou
diff --git a/tests/alignments/t0001.good b/tests/alignments/t0001.good
index 7c8f7fa..b506e0d 100644
--- a/tests/alignments/t0001.good
+++ b/tests/alignments/t0001.good
@@ -2,7 +2,7 @@ $ OUT=$(smenu -c -g: -Cr1,3-4 -Rl/'c d'/ -- t0001.in)
 
  a : b c d:e f : g h i 
 0:07 1:07 2:07 
-  a:b     :c d :e     :f:g: h i 
+  a:b     : c d:     e:f:g: h i 
 
  a :b     :   c:     d:e:f:g   :h:i 
 
diff --git a/tests/alignments/t0002.good b/tests/alignments/t0002.good
index cddf925..b20fd69 100644
--- a/tests/alignments/t0002.good
+++ b/tests/alignments/t0002.good
@@ -1,19 +1,17 @@
-$ OUT=$(smenu -c -g: -Re1 -Rc1 -C r1 -Cc/\\ue799be/,3 -- t0002.in)
+$ OUT=$(smenu -c -g: -Rl/'c d'/ -Cr1,3-4 -- t0002.in)
+
+a  : b c d:e f : g h i 
+0:07 1:07 2:07 
+a  :b     :c d :e     :f:g: h i 
+
+ a :b     :   c:     d:e:f:g   :h:i 
+
+a  :b     :c d :d     :e:f:g   :h:i 
 
-  Number   :Kanji symbol:Sino-Japanese:English pronunciation  ┐
-0:24 1:24 2:24 3:24 4:24 5:24 6:24 7:24 8:24 9:24 10:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 39:24 40:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 50:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 62:20 
-        100:     百     :   ひゃく    :hyaku                      █
-0:07 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 10:07 62:20 
-        200:    二百    :  にひゃく   :ni-hyaku                     │
-62:20 
-        300:    三百    : さんびゃく  :san-byaku                     │
-62:20 
-        400:    四百    : よんひゃく  :yon-hyaku                     ▼
-62:20 
 $ 
 
 $ echo ":$OUT:"
 
-:100:
+:a:
 
 $ exit 0
diff --git a/tests/alignments/t0002.tst b/tests/alignments/t0002.tst
index 8c039dc..2b6e3eb 100644
--- a/tests/alignments/t0002.tst
+++ b/tests/alignments/t0002.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -c -g: -Re1 -Rc1 -C r1 -Cc/\\\\ue799be/,3 -- t0002.in)
+\S[150]\s[10]OUT=$(smenu -c -g: -Rl/'c d'/ -Cr1,3-4 -- t0002.in)
 \S[150]\s[50]\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/alignments/t0003.good b/tests/alignments/t0003.good
new file mode 100644
index 0000000..10d3ed2
--- /dev/null
+++ b/tests/alignments/t0003.good
@@ -0,0 +1,19 @@
+$ OUT=$(smenu -c -g: -Re1 -Rc1 -C r1 -Cc/\\ue799be/,3 -- t0003.in)
+
+  Number   :Kanji symbol:Sino-Japanese:English pronunciation  ┐
+0:24 1:24 2:24 3:24 4:24 5:24 6:24 7:24 8:24 9:24 10:24 12:24 13:24 14:24 15:24 16:24 17:24 18:24 19:24 20:24 21:24 22:24 23:24 25:24 26:24 27:24 28:24 29:24 30:24 31:24 32:24 33:24 34:24 35:24 36:24 37:24 39:24 40:24 41:24 42:24 43:24 44:24 45:24 46:24 47:24 48:24 49:24 50:24 51:24 52:24 53:24 54:24 55:24 56:24 57:24 58:24 59:24 62:20 
+        100:     百     :   ひゃく    :hyaku                      █
+0:07 1:07 2:07 3:07 4:07 5:07 6:07 7:07 8:07 9:07 10:07 62:20 
+        200:    二百    :  にひゃく   :ni-hyaku                     │
+62:20 
+        300:    三百    : さんびゃく  :san-byaku                     │
+62:20 
+        400:    四百    : よんひゃく  :yon-hyaku                     ▼
+62:20 
+$ 
+
+$ echo ":$OUT:"
+
+:100:
+
+$ exit 0
diff --git a/tests/alignments/t0003.in b/tests/alignments/t0003.in
new file mode 120000
index 0000000..cdca2c1
--- /dev/null
+++ b/tests/alignments/t0003.in
@@ -0,0 +1 @@
+data3
\ No newline at end of file
diff --git a/tests/alignments/t0003.tst b/tests/alignments/t0003.tst
new file mode 100644
index 0000000..7ef4dc5
--- /dev/null
+++ b/tests/alignments/t0003.tst
@@ -0,0 +1,4 @@
+\S[150]\s[10]OUT=$(smenu -c -g: -Re1 -Rc1 -C r1 -Cc/\\\\ue799be/,3 -- t0003.in)
+\S[150]\s[50]\r
+\S[150]\s[10]echo ":$\s[10]OUT:"
+exit 0