tests: add color schema to cal(1) tests

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/cal/color-first-day b/tests/expected/cal/color-first-day
index 446f4fd93e0173c927687fc3d5fad0c837ea745f..229681d6aab403c21ddebe6be9c9fbd411fae02b 100644 (file)
--- a/tests/expected/cal/color-first-day
+++ b/tests/expected/cal/color-first-day
@@ -1,8 +1,8 @@
-    January 0001    
-Su Mo Tu We Th Fr Sa
-                  \e[7m 1\e[0m
- 2  3  4  5  6  7  8
- 9 10 11 12 13 14 15
-16 17 18 19 20 21 22
-23 24 25 26 27 28 29
-30 31               
+\e[35m    January 0001    
+Su Mo Tu We Th Fr Sa\e[0m
+                 \e[31m \e[\e[48;5;160m\e[38;5;221m 1\e[0m\e[0m
+\e[31m 2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[31m  8\e[0m
+\e[31m 9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[31m 15\e[0m
+\e[31m16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[31m 22\e[0m
+\e[31m23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[31m 29\e[0m
+\e[31m30\e[0m\e[1;33m 31\e[0m               

diff --git a/tests/expected/cal/color-last-day b/tests/expected/cal/color-last-day
index ec7793c6b5fd6df619fca58955320e386d4eb8c0..b7020ab3ffd8279b7f1ba4d498d8fc2d490d1c61 100644 (file)
--- a/tests/expected/cal/color-last-day
+++ b/tests/expected/cal/color-last-day
@@ -1,8 +1,8 @@
-    November 9999         December 9999         January 10000   
-Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa
-    1  2  3  4  5  6            1  2  3  4                     1
- 7  8  9 10 11 12 13   5  6  7  8  9 10 11   2  3  4  5  6  7  8
-14 15 16 17 18 19 20  12 13 14 15 16 17 18   9 10 11 12 13 14 15
-21 22 23 24 25 26 27  19 20 21 22 23 24 25  16 17 18 19 20 21 22
-28 29 30              26 27 28 29 30 \e[7m31\e[0m     23 24 25 26 27 28 29
-                                            30 31               
+\e[35m    November 9999         December 9999         January 10000   
+Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa  Su Mo Tu We Th Fr Sa\e[0m
+  \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[31m  6\e[0m          \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m  3\e[0m\e[31m  4\e[0m                   \e[31m  1\e[0m
+\e[31m 7\e[0m\e[1;33m  8\e[0m\e[1;33m  9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[31m 13\e[0m  \e[31m 5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[1;33m  8\e[0m\e[1;33m  9\e[0m\e[1;33m 10\e[0m\e[31m 11\e[0m  \e[31m 2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[31m  8\e[0m
+\e[31m14\e[0m\e[1;33m 15\e[0m\e[1;33m 16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[31m 20\e[0m  \e[31m12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[1;33m 16\e[0m\e[1;33m 17\e[0m\e[31m 18\e[0m  \e[31m 9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[31m 15\e[0m
+\e[31m21\e[0m\e[1;33m 22\e[0m\e[1;33m 23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[31m 27\e[0m  \e[31m19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[1;33m 23\e[0m\e[1;33m 24\e[0m\e[31m 25\e[0m  \e[31m16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[31m 22\e[0m
+\e[31m28\e[0m\e[1;33m 29\e[0m\e[1;33m 30\e[0m              \e[31m26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[1;33m 30\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m31\e[0m\e[0m     \e[31m23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[31m 29\e[0m
+                                            \e[31m30\e[0m\e[1;33m 31\e[0m               

diff --git a/tests/expected/cal/color-reformation-corner-cases-1 b/tests/expected/cal/color-reformation-corner-cases-1
index 4b26465bbe060099392e8f5d26c962234589c514..af9e2bd81a5ce62ccbc796b1d2460c5cd0da01c5 100644 (file)
--- a/tests/expected/cal/color-reformation-corner-cases-1
+++ b/tests/expected/cal/color-reformation-corner-cases-1
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1 \e[7m 2\e[0m 14 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+\e[35m   September 1752   
+Su Mo Tu We Th Fr Sa\e[0m
+     \e[1;33m  1\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m 2\e[0m\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[31m17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[31m24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                     
                     
                     

diff --git a/tests/expected/cal/color-reformation-corner-cases-2 b/tests/expected/cal/color-reformation-corner-cases-2
index db29a7f424b8e0f85cfb2c9e827e974b1584a9a4..75402e99a923061ffb0500a3f72969b1446e0ac3 100644 (file)
--- a/tests/expected/cal/color-reformation-corner-cases-2
+++ b/tests/expected/cal/color-reformation-corner-cases-2
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1  2 14 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+\e[35m   September 1752   
+Su Mo Tu We Th Fr Sa\e[0m
+     \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[31m17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[31m24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                     
                     
                     

diff --git a/tests/expected/cal/color-reformation-corner-cases-3 b/tests/expected/cal/color-reformation-corner-cases-3
index db29a7f424b8e0f85cfb2c9e827e974b1584a9a4..75402e99a923061ffb0500a3f72969b1446e0ac3 100644 (file)
--- a/tests/expected/cal/color-reformation-corner-cases-3
+++ b/tests/expected/cal/color-reformation-corner-cases-3
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1  2 14 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+\e[35m   September 1752   
+Su Mo Tu We Th Fr Sa\e[0m
+     \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[31m17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[31m24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                     
                     
                     

diff --git a/tests/expected/cal/color-reformation-corner-cases-4 b/tests/expected/cal/color-reformation-corner-cases-4
index 6c5571458e006c81172bcd6396143bdd89e38d2c..dbf47a908588c6f3acb43304ac24b86331e8b830 100644 (file)
--- a/tests/expected/cal/color-reformation-corner-cases-4
+++ b/tests/expected/cal/color-reformation-corner-cases-4
@@ -1,8 +1,8 @@
-   September 1752   
-Su Mo Tu We Th Fr Sa
-       1  2 \e[7m14\e[0m 15 16
-17 18 19 20 21 22 23
-24 25 26 27 28 29 30
+\e[35m   September 1752   
+Su Mo Tu We Th Fr Sa\e[0m
+     \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m14\e[0m\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[31m17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[31m24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                     
                     
                     

diff --git a/tests/expected/cal/color-vertical b/tests/expected/cal/color-vertical
index bf5c609413558c693c84e75c1539039f202ad3fa..f4ffac6a5d4415a4e8225fbe922f7d356406a23c 100644 (file)
--- a/tests/expected/cal/color-vertical
+++ b/tests/expected/cal/color-vertical
@@ -1,8 +1,8 @@
-    February 2023      
-Su     5 12 19 26   
-Mo     6 13 20 27   
-Tu     7 14 21 28   
-We  1  8 \e[7m15\e[0m 22      
-Th  2  9 16 23      
-Fr  3 10 17 24      
-Sa  4 11 18 25      
+\e[35m    February 2023      \e[0m
+\e[35mSu\e[0m   \e[31m  5\e[0m\e[31m 12\e[0m\e[31m 19\e[0m\e[31m 26\e[0m   
+\e[35mMo\e[0m   \e[1;33m  6\e[0m\e[1;33m 13\e[0m\e[1;33m 20\e[0m\e[1;33m 27\e[0m   
+\e[35mTu\e[0m   \e[1;33m  7\e[0m\e[1;33m 14\e[0m\e[1;33m 21\e[0m\e[1;33m 28\e[0m   
+\e[35mWe\e[0m\e[1;33m  1\e[0m\e[1;33m  8\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m15\e[0m\e[0m\e[1;33m 22\e[0m      
+\e[35mTh\e[0m\e[1;33m  2\e[0m\e[1;33m  9\e[0m\e[1;33m 16\e[0m\e[1;33m 23\e[0m      
+\e[35mFr\e[0m\e[1;33m  3\e[0m\e[1;33m 10\e[0m\e[1;33m 17\e[0m\e[1;33m 24\e[0m      
+\e[35mSa\e[0m\e[31m  4\e[0m\e[31m 11\e[0m\e[31m 18\e[0m\e[31m 25\e[0m      

diff --git a/tests/expected/cal/color-vertical-week b/tests/expected/cal/color-vertical-week
index d69866e1f1a0b944af5e1f48e5249c8baaf42687..70603618538c801f5d1071deb5cbbe229b24a09c 100644 (file)
--- a/tests/expected/cal/color-vertical-week
+++ b/tests/expected/cal/color-vertical-week
@@ -1,9 +1,9 @@
-    February 2023      
-Su     5 12 19 26   
-Mo     6 13 20 27   
-Tu     7 14 21 28   
-We  1  8 \e[7m15\e[0m 22      
-Th  2  9 16 23      
-Fr  3 10 17 24      
-Sa  4 11 18 25      
-    5  6  7  8  9   
+\e[35m    February 2023      \e[0m
+\e[35mSu\e[0m   \e[31m  5\e[0m\e[31m 12\e[0m\e[31m 19\e[0m\e[31m 26\e[0m   
+\e[35mMo\e[0m   \e[1;33m  6\e[0m\e[1;33m 13\e[0m\e[1;33m 20\e[0m\e[1;33m 27\e[0m   
+\e[35mTu\e[0m   \e[1;33m  7\e[0m\e[1;33m 14\e[0m\e[1;33m 21\e[0m\e[1;33m 28\e[0m   
+\e[35mWe\e[0m\e[1;33m  1\e[0m\e[1;33m  8\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m15\e[0m\e[0m\e[1;33m 22\e[0m      
+\e[35mTh\e[0m\e[1;33m  2\e[0m\e[1;33m  9\e[0m\e[1;33m 16\e[0m\e[1;33m 23\e[0m      
+\e[35mFr\e[0m\e[1;33m  3\e[0m\e[1;33m 10\e[0m\e[1;33m 17\e[0m\e[1;33m 24\e[0m      
+\e[35mSa\e[0m\e[31m  4\e[0m\e[31m 11\e[0m\e[31m 18\e[0m\e[31m 25\e[0m      
+   \e[32m 5\e[0m \e[32m 6\e[0m \e[32m 7\e[0m \e[32m 8\e[0m \e[32m 9\e[0m   

diff --git a/tests/expected/cal/colorw-first-day-week-numbers b/tests/expected/cal/colorw-first-day-week-numbers
index e14aaf3a398c121dcc0852682dae0ee4e040843f..f3117d89b26a0864077a0a000bf3d0281f41c64b 100644 (file)
--- a/tests/expected/cal/colorw-first-day-week-numbers
+++ b/tests/expected/cal/colorw-first-day-week-numbers
@@ -1,8 +1,8 @@
-      January 0001     
-   Su Mo Tu We Th Fr Sa
- 1                   \e[7m 1\e[0m
- 2  2  3  4  5  6  7  8
- 3  9 10 11 12 13 14 15
- 4 16 17 18 19 20 21 22
- 5 23 24 25 26 27 28 29
- 6 30 31               
+\e[35m      January 0001     
+   Su Mo Tu We Th Fr Sa\e[0m
+\e[32m 1\e[0m                  \e[31m \e[\e[48;5;160m\e[38;5;221m 1\e[0m\e[0m
+\e[32m 2\e[0m\e[31m  2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[31m  8\e[0m
+\e[32m 3\e[0m\e[31m  9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[31m 15\e[0m
+\e[32m 4\e[0m\e[31m 16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[31m 22\e[0m
+\e[32m 5\e[0m\e[31m 23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[31m 29\e[0m
+\e[32m 6\e[0m\e[31m 30\e[0m\e[1;33m 31\e[0m               

diff --git a/tests/expected/cal/colorw-last-day-week-numbers b/tests/expected/cal/colorw-last-day-week-numbers
index d0d49cc292067ccf4ef0a13131cc9e4c00ccfcd9..dd081fdfc65a3a7b94ab28fdfd7dfa90658588f8 100644 (file)
--- a/tests/expected/cal/colorw-last-day-week-numbers
+++ b/tests/expected/cal/colorw-last-day-week-numbers
@@ -1,8 +1,8 @@
-     November 9999            December 9999            January 10000     
-   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa
-45     1  2  3  4  5  6  49           1  2  3  4   1                    1
-46  7  8  9 10 11 12 13  50  5  6  7  8  9 10 11   2  2  3  4  5  6  7  8
-47 14 15 16 17 18 19 20  51 12 13 14 15 16 17 18   3  9 10 11 12 13 14 15
-48 21 22 23 24 25 26 27  52 19 20 21 22 23 24 25   4 16 17 18 19 20 21 22
-49 28 29 30              53 26 27 28 29 30 \e[7m31\e[0m      5 23 24 25 26 27 28 29
-                                                   6 30 31               
+\e[35m     November 9999            December 9999            January 10000     
+   Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa     Su Mo Tu We Th Fr Sa\e[0m
+\e[32m45\e[0m   \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[31m  6\e[0m  \e[32m49\e[0m         \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m  3\e[0m\e[31m  4\e[0m  \e[32m 1\e[0m                  \e[31m  1\e[0m
+\e[32m46\e[0m\e[31m  7\e[0m\e[1;33m  8\e[0m\e[1;33m  9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[31m 13\e[0m  \e[32m50\e[0m\e[31m  5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[1;33m  8\e[0m\e[1;33m  9\e[0m\e[1;33m 10\e[0m\e[31m 11\e[0m  \e[32m 2\e[0m\e[31m  2\e[0m\e[1;33m  3\e[0m\e[1;33m  4\e[0m\e[1;33m  5\e[0m\e[1;33m  6\e[0m\e[1;33m  7\e[0m\e[31m  8\e[0m
+\e[32m47\e[0m\e[31m 14\e[0m\e[1;33m 15\e[0m\e[1;33m 16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[31m 20\e[0m  \e[32m51\e[0m\e[31m 12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[1;33m 16\e[0m\e[1;33m 17\e[0m\e[31m 18\e[0m  \e[32m 3\e[0m\e[31m  9\e[0m\e[1;33m 10\e[0m\e[1;33m 11\e[0m\e[1;33m 12\e[0m\e[1;33m 13\e[0m\e[1;33m 14\e[0m\e[31m 15\e[0m
+\e[32m48\e[0m\e[31m 21\e[0m\e[1;33m 22\e[0m\e[1;33m 23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[31m 27\e[0m  \e[32m52\e[0m\e[31m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[1;33m 23\e[0m\e[1;33m 24\e[0m\e[31m 25\e[0m  \e[32m 4\e[0m\e[31m 16\e[0m\e[1;33m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[31m 22\e[0m
+\e[32m49\e[0m\e[31m 28\e[0m\e[1;33m 29\e[0m\e[1;33m 30\e[0m              \e[32m53\e[0m\e[31m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[1;33m 30\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m31\e[0m\e[0m     \e[32m 5\e[0m\e[31m 23\e[0m\e[1;33m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[31m 29\e[0m
+                                                  \e[32m 6\e[0m\e[31m 30\e[0m\e[1;33m 31\e[0m               

diff --git a/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers
index 98fa041f6828ab8dd853bb5a6442c44dbc6d0a8e..a94a28e549eef7872bc8a2773d759c1bb12fc734 100644 (file)
--- a/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers
+++ b/tests/expected/cal/colorw-reformation-corner-cases-1-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1 \e[7m 2\e[0m 14 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+\e[35m     September 1752    
+   Su Mo Tu We Th Fr Sa\e[0m
+\e[32m36\e[0m      \e[1;33m  1\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m 2\e[0m\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[32m37\e[0m\e[31m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[32m38\e[0m\e[31m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                        
                        
                        

diff --git a/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers
index fdbc1997034c54e6ec2abb068ca7e48920cb3995..701eb91fe8305fcb32a12307c621ad44d86cfa10 100644 (file)
--- a/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers
+++ b/tests/expected/cal/colorw-reformation-corner-cases-2-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1  2 14 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+\e[35m     September 1752    
+   Su Mo Tu We Th Fr Sa\e[0m
+\e[32m36\e[0m      \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[32m37\e[0m\e[31m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[32m38\e[0m\e[31m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                        
                        
                        

diff --git a/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers
index fdbc1997034c54e6ec2abb068ca7e48920cb3995..701eb91fe8305fcb32a12307c621ad44d86cfa10 100644 (file)
--- a/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers
+++ b/tests/expected/cal/colorw-reformation-corner-cases-3-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1  2 14 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+\e[35m     September 1752    
+   Su Mo Tu We Th Fr Sa\e[0m
+\e[32m36\e[0m      \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m 14\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[32m37\e[0m\e[31m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[32m38\e[0m\e[31m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                        
                        
                        

diff --git a/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers b/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers
index 307b5398e5604853231ce9db1cd1ae54ca50abbf..e35901a0f3cb9debf59c6418dbccfedd574f5a68 100644 (file)
--- a/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers
+++ b/tests/expected/cal/colorw-reformation-corner-cases-4-week-numbers
@@ -1,8 +1,8 @@
-     September 1752    
-   Su Mo Tu We Th Fr Sa
-36        1  2 \e[7m14\e[0m 15 16
-37 17 18 19 20 21 22 23
-38 24 25 26 27 28 29 30
+\e[35m     September 1752    
+   Su Mo Tu We Th Fr Sa\e[0m
+\e[32m36\e[0m      \e[1;33m  1\e[0m\e[1;33m  2\e[0m\e[1;33m \e[\e[48;5;160m\e[38;5;221m14\e[0m\e[0m\e[1;33m 15\e[0m\e[31m 16\e[0m
+\e[32m37\e[0m\e[31m 17\e[0m\e[1;33m 18\e[0m\e[1;33m 19\e[0m\e[1;33m 20\e[0m\e[1;33m 21\e[0m\e[1;33m 22\e[0m\e[31m 23\e[0m
+\e[32m38\e[0m\e[31m 24\e[0m\e[1;33m 25\e[0m\e[1;33m 26\e[0m\e[1;33m 27\e[0m\e[1;33m 28\e[0m\e[1;33m 29\e[0m\e[31m 30\e[0m
                        
                        
                        

diff --git a/tests/ts/cal/color b/tests/ts/cal/color
index 90840ea4d53b54c0792f1982529de36e06336878..2dffefed38ebf5e36bc39f6d1c1654ac5685014e 100755 (executable)
--- a/tests/ts/cal/color
+++ b/tests/ts/cal/color
@@ -31,64 +31,47 @@ fi
 # --color output depends on terminal type
 export TERM=linux
 
+function call_cal {
+       if [ "$USETERM" == "yes" ]; then
+               XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
+       fi
+       XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+}
+
 USETERM=$( ts_has_option "useterm" "$*" )
 
 [ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
 
 ts_init_subtest "first-day"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 1 1 1
-fi
-$TS_CMD_CAL --color=always 1 1 1 >> $TS_OUTPUT
+call_cal --color=always 1 1 1
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-1"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 2 9 1752
-fi
-$TS_CMD_CAL --color=always 2 9 1752 >> $TS_OUTPUT
+call_cal --color=always 2 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-2"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 3 9 1752
-fi
-$TS_CMD_CAL --color=always 3 9 1752 >> $TS_OUTPUT
+call_cal --color=always 3 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-3"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 13 9 1752
-fi
-$TS_CMD_CAL --color=always 13 9 1752 >> $TS_OUTPUT
+call_cal --color=always 13 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-4"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 14 9 1752
-fi
-$TS_CMD_CAL --color=always 14 9 1752 >> $TS_OUTPUT
+call_cal --color=always 14 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "last-day"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 31 12 9999
-fi
-$TS_CMD_CAL --color=always -3 31 12 9999 >> $TS_OUTPUT
+call_cal --color=always -3 31 12 9999
 ts_finalize_subtest
 
 ts_init_subtest "vertical"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 15 2 2023
-fi
-$TS_CMD_CAL --color=always --vertical 15 2 2023 >> $TS_OUTPUT
+call_cal --color=always --vertical 15 2 2023
 ts_finalize_subtest
 
 ts_init_subtest "vertical-week"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL --color=always 15 2 2023
-fi
-$TS_CMD_CAL --color=always --vertical --week=15 15 2 2023 >> $TS_OUTPUT
+call_cal --color=always --vertical --week=15 15 2 2023
 ts_finalize_subtest
 
 

diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw
index 96e6e0a34ae852a5664d76a45fce6e0bbc834799..541e2f44546b8bdf833495874e3ab61e14eb00cc 100755 (executable)
--- a/tests/ts/cal/colorw
+++ b/tests/ts/cal/colorw
@@ -35,46 +35,35 @@ USETERM=$( ts_has_option "useterm" "$*" )
 
 [ "$USETERM" == "yes" ] && TS_VERBOSE="yes"
 
+function call_cal {
+       if [ "$USETERM" == "yes" ]; then
+                XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@"
+       fi
+       XDG_CONFIG_HOME="$TS_SELF" $TS_CMD_CAL --color=always "$@" >> $TS_OUTPUT
+}
+
 ts_init_subtest "first-day-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 1 1 1
-fi
-$TS_CMD_CAL -w --color=always 1 1 1 >> $TS_OUTPUT
+call_cal -w --color=always 1 1 1
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-1-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 2 9 1752
-fi
-$TS_CMD_CAL -w --color=always 2 9 1752 >> $TS_OUTPUT
+call_cal -w --color=always 2 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-2-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 3 9 1752
-fi
-$TS_CMD_CAL -w --color=always 3 9 1752 >> $TS_OUTPUT
+call_cal -w --color=always 3 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-3-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 13 9 1752
-fi
-$TS_CMD_CAL -w --color=always 13 9 1752 >> $TS_OUTPUT
+call_cal -w --color=always 13 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "reformation-corner-cases-4-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 14 9 1752
-fi
-$TS_CMD_CAL -w --color=always 14 9 1752 >> $TS_OUTPUT
+call_cal -w --color=always 14 9 1752
 ts_finalize_subtest
 
 ts_init_subtest "last-day-week-numbers"
-if [ "$USETERM" == "yes" ]; then
-       $TS_CMD_CAL -w --color=always 31 12 9999
-fi
-$TS_CMD_CAL -w --color=always -3 31 12 9999 >> $TS_OUTPUT
+call_cal -w --color=always -3 31 12 9999
 ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/cal/terminal-colors.d/cal.scheme b/tests/ts/cal/terminal-colors.d/cal.scheme
new file mode 100644 (file)
index 0000000..4f95962
--- /dev/null
+++ b/tests/ts/cal/terminal-colors.d/cal.scheme
@@ -0,0 +1,6 @@
+workday yellow
+weekend red
+today \e[48;5;160m\e[38;5;221
+header magenta
+weeks green
+weeknumber blue