bugfix: status display, preview annotation

src/awk/calannot.awk

@@ -16,7 +16,11 @@ BEGIN {
 NR == 1 { print style_month $0 OFF; next }
 NR == 2 { print style_weekdays $0 OFF; next }
 { 
-  sub("\\y"cur"\\y", style_cur cur OFF)
+  if (day == cur) {
-  sub("\\y"day"\\y", style_highlight day OFF)
+    sub("\\y"cur"\\y", style_highlight style_cur cur OFF)
+  } else {
+    sub("\\y"cur"\\y", style_cur cur OFF)
+    sub("\\y"day"\\y", style_highlight day OFF)
+  }
   print
 }

src/sh/theme.sh

@@ -25,6 +25,9 @@ export STYLE_WV_DAY="${STYLE_WV_DAY:-$GREEN}"
 export STYLE_WV_EVENT_DELIM="${STYLE_WV_EVENT_DELIM:-$RED / $OFF}"
 export STYLE_WV_SUMMARY="${STYLE_WV_SUMMARY:-$CYAN}"
 export STYLE_WV_TIME="${STYLE_WV_TIME:-$WHITE}"
+export STYLE_WV_CONFIRMED="${STYLE_WV_CONFIRMED:-$CYAN}"
+export STYLE_WV_TENTATIVE="${STYLE_WV_TENTATIVE:-$FAINT$CYAN}"
+export STYLE_WV_CANCELLED="${STYLE_WV_CANCELLED:-$STRIKE$FAINT$CYAN}"
 
 # List view
 export STYLE_LV="${STYLE_LV:-$FAINT}"
@@ -34,7 +37,7 @@ export STYLE_DV_ALLDAY="${STYLE_DV_ALLDAY:-$LIGHT_CYAN$ITALIC$FAINT    (allday)
 export STYLE_DV_TIME="${STYLE_DV_TIME:-$LIGHT_CYAN}"
 export STYLE_DV_CONFIRMED="${STYLE_DV_CONFIRMED:-$CYAN}"
 export STYLE_DV_TENTATIVE="${STYLE_DV_TENTATIVE:-$FAINT$CYAN}"
-export STYLE_DV_CANCELLED="${STYLE_DV_CANCELLED:-$STRIKE$CYAN}"
+export STYLE_DV_CANCELLED="${STYLE_DV_CANCELLED:-$STRIKE$FAINT$CYAN}"
 export STYLE_DV_HOUR="${STYLE_DV_HOUR:-$FAINT}"
 export STYLE_DV_EMPTYHOUR="${STYLE_DV_EMPTYHOUR:-$FAINT----------------------$OFF}"
 export STYLE_DV_TZ="$WHITE$ITALIC"

src/sh/view.sh

@@ -107,11 +107,11 @@ __view_week() {
       status="$1"
       shift
       if [ "$status" = "TENTATIVE" ]; then
-        symb="$FAINT$CYAN"
+        symb="$STYLE_WV_TENTATIVE"
       elif [ "$status" = "CANCELLED" ]; then
-        symb="$STRIKE"
+        symb="$STYLE_WV_CANCELLED"
       else
-        symb=""
+        symb="$STYLE_WV_CONFIRMED"
       fi
       description="${symb:-}$*$OFF"
       for i in $(seq 0 7); do