Use ctxopt.[ch] for options management

The old getopt, derived from egetopt, was too restrictive, so I developed
ctxopt to better manage smenu options.

12 files changed, 17 insertions, 17 deletions

diff --git a/tests/initial_selection/t0001.good b/tests/initial_selection/t0001.good
index c359bbb..160768a 100644
--- a/tests/initial_selection/t0001.good
+++ b/tests/initial_selection/t0001.good
@@ -1,4 +1,4 @@
-$ OUT=$(smenu -sh t0001.in)
+$ OUT=$(smenu -s h t0001.in)
 
 a b c d e f g h i j k l m n o p q r s t u v w x y z 
 14:07 
diff --git a/tests/initial_selection/t0001.tst b/tests/initial_selection/t0001.tst
index fddd207..e6e1bac 100644
--- a/tests/initial_selection/t0001.tst
+++ b/tests/initial_selection/t0001.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -sh t0001.in)
+\S[150]\s[10]OUT=$(smenu -s h t0001.in)
 \S[150]\s[150]\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/rows_cols_in-ex-clusions/t0001.good b/tests/rows_cols_in-ex-clusions/t0001.good
index e0ba6a3..767daf5 100644
--- a/tests/rows_cols_in-ex-clusions/t0001.good
+++ b/tests/rows_cols_in-ex-clusions/t0001.good
@@ -1,4 +1,4 @@
-$ OUT=$(smenu -n 6 -R2,3 -R5 t0001.in)
+$ OUT=$(smenu -n 6 -R2,3 -R5 -- t0001.in)
 
 1 2 3 4 5 
 0:24 2:24 4:24 6:24 8:24 
diff --git a/tests/rows_cols_in-ex-clusions/t0001.tst b/tests/rows_cols_in-ex-clusions/t0001.tst
index 8b528cf..08aa1e4 100644
--- a/tests/rows_cols_in-ex-clusions/t0001.tst
+++ b/tests/rows_cols_in-ex-clusions/t0001.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -n 6 -R2,3 -R5 t0001.in)
+\S[150]\s[10]OUT=$(smenu -n 6 -R2,3 -R5 -- t0001.in)
 \S[150]\s[150]llljljljhkk\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/rows_cols_in-ex-clusions/t0002.good b/tests/rows_cols_in-ex-clusions/t0002.good
index 6087448..90eb12e 100644
--- a/tests/rows_cols_in-ex-clusions/t0002.good
+++ b/tests/rows_cols_in-ex-clusions/t0002.good
@@ -1,4 +1,4 @@
-$ OUT=$(smenu -n 6 -R3-5 -R1 t0002.in)
+$ OUT=$(smenu -n 6 -R3-5 -R1 -- t0002.in)
 
 1 2 3 4 5 
 
diff --git a/tests/rows_cols_in-ex-clusions/t0002.tst b/tests/rows_cols_in-ex-clusions/t0002.tst
index 8dd9baa..f83b463 100644
--- a/tests/rows_cols_in-ex-clusions/t0002.tst
+++ b/tests/rows_cols_in-ex-clusions/t0002.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -n 6 -R3-5 -R1 t0002.in)
+\S[150]\s[10]OUT=$(smenu -n 6 -R3-5 -R1 -- t0002.in)
 \S[150]\s[150]llljljljhkk\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/rows_cols_in-ex-clusions/t0003.good b/tests/rows_cols_in-ex-clusions/t0003.good
index 5a60fc3..1fa62dc 100644
--- a/tests/rows_cols_in-ex-clusions/t0003.good
+++ b/tests/rows_cols_in-ex-clusions/t0003.good
@@ -1,4 +1,4 @@
-$ OUT=$(smenu -n 6 -R3-5,1 t0003.in)
+$ OUT=$(smenu -n 6 -R3-5,1 -- t0003.in)
 
 1 2 3 4 5 
 
diff --git a/tests/rows_cols_in-ex-clusions/t0003.tst b/tests/rows_cols_in-ex-clusions/t0003.tst
index 55a98b5..0bf8f0b 100644
--- a/tests/rows_cols_in-ex-clusions/t0003.tst
+++ b/tests/rows_cols_in-ex-clusions/t0003.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -n 6 -R3-5,1 t0003.in)
+\S[150]\s[10]OUT=$(smenu -n 6 -R3-5,1 -- t0003.in)
 \S[150]\s[150]llljljljhkk\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/special_levels/t0003.good b/tests/special_levels/t0003.good
index 6f64dfd..38985d9 100644
--- a/tests/special_levels/t0003.good
+++ b/tests/special_levels/t0003.good
@@ -1,15 +1,15 @@
-$ OUT=$(smenu -1 1 -1 2 -c -- t0003.in)
+$ OUT=$(smenu -1 1 -level2 2 -c t0003.in)
 
 1  2  3  4  5   ┐
-3:1f 4:1f 16:20 
+0:1f 1:1f 3:20 4:20 16:20 
 6  7  8  9  10  ║
-0:07 1:07 16:20 
+0:07 1:07 12:1f 13:1f 16:20 
 11 12 13 14 15  │
-3:1f 4:1f 16:20 
+0:1f 1:1f 3:1f 4:1f 6:1f 7:1f 9:1f 10:1f 12:1f 13:1f 16:20 
 16 17 18 19 20  │
-12:1f 13:1f 16:20 
+0:1f 1:1f 3:1f 4:1f 6:1f 7:1f 9:1f 10:1f 12:20 13:20 16:20 
 21 22 23 24 25  ▼
-0:1f 1:1f 3:1f 4:1f 6:1f 7:1f 9:1f 10:1f 12:1f 13:1f 16:20 
+0:1f 1:1f 3:20 4:20 6:20 7:20 9:20 10:20 12:20 13:20 16:20 
 $ 
 
 $ echo ":$OUT:"
diff --git a/tests/special_levels/t0003.tst b/tests/special_levels/t0003.tst
index 4178248..c0ee061 100644
--- a/tests/special_levels/t0003.tst
+++ b/tests/special_levels/t0003.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -1 1 -1 2 -c -- t0003.in)
+\S[150]\s[10]OUT=$(smenu -1 1 -level2 2 -c t0003.in)
 \S[150]\s[150]j\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0
diff --git a/tests/tagging/t0013.good b/tests/tagging/t0013.good
index 402456e..a1811ec 100644
--- a/tests/tagging/t0013.good
+++ b/tests/tagging/t0013.good
@@ -1,4 +1,4 @@
-$ OUT=$(smenu -c -P -N'b|d|g' " " t0013.in)
+$ OUT=$(smenu -c -P -N'b|d|g' t0013.in)
 
      a   1) b      c   2) d 
 7:01 8:01 9:01 10:01 21:01 22:01 23:01 24:01 
diff --git a/tests/tagging/t0013.tst b/tests/tagging/t0013.tst
index 328bf85..6ddd72c 100644
--- a/tests/tagging/t0013.tst
+++ b/tests/tagging/t0013.tst
@@ -1,4 +1,4 @@
-\S[150]\s[10]OUT=$(smenu -c -P -N'b|d|g' " " t0013.in)
+\S[150]\s[10]OUT=$(smenu -c -P -N'b|d|g' t0013.in)
 \S[150]\s[150]jjththth\r
 \S[150]\s[10]echo ":$\s[10]OUT:"
 exit 0