improvement: styles in theme file, and new exports

src/awk/approx.awk

@@ -1,7 +1,16 @@
 ## src/awk/approx.awk
+##
 ## Generate single-line approximate information for every iCalendar argument.
+## The fields in each line are separated by "\t"
+## The fields are the following:
+## 1. "~" (constant, indicating that the lines contains approximate information)
+## 2. start (this can be used in date (1))
+## 3. end (this can be used in date (1)
+## 4. string to display
+## 5. filename (collection/name)
 ##
 ## @assign collection_labels: See configuration of the current program.
+## @assign style_line: Style for each line
 
 @include "lib/awk/icalendar.awk"
 
@@ -26,17 +35,17 @@ function fn(path,    n, a) {
 function title(start, summary) {
   summary = getcontent(summary)
   gsub("\n",  " ", summary) # This will be put on a single line
-  gsub("\\|",  ":", summary) # we use "|" as delimiter
+  gsub("\\t", " ", summary) # we use "\t" as delimiter
   depth = split(FILENAME, path, "/")
   collection = depth > 1 ? path[depth-1] : ""
   collection = collection in collection2label ? collection2label[collection] : collection
-  return FAINT "~ " collection " " gensub(/^[^0-9]*([0-9]{4})([0-9]{2}).*$/, "\\1-\\2", "1", start) " " summary OFF
+  return style_line "~ " collection " " gensub(/^[^0-9]*([0-9]{4})([0-9]{2}).*$/, "\\1-\\2", "1", start) " " summary OFF
 }
 
 # AWK program
 BEGIN {
   FS="[:;=]"
-  OFS="|"
+  OFS="\t"
   split(collection_labels, mapping, ";")
   for (map in mapping)
   {
@@ -44,7 +53,6 @@ BEGIN {
     collection2label[m[1]] = m[2]
   }
   # Colors
-  FAINT = "\033[2m"
   OFF = "\033[m"
 }
 BEGINFILE             { inside = 0; rs = 0; dur = 0; summary = ""; start = "ERROR"; end = "ERROR" }

src/awk/calannot.awk

@@ -3,22 +3,20 @@
 ##
 ## @assign cur: Day-of-month to mark as `today`
 ## @assign day: Day-of-month to highlight
+## @assign style_month: Theme to use for month
+## @assign style_weekdays: Theme to use for weekdays
+## @assign style_cur: Theme to use for current day 
+## @assign style_highlight: Theme to use for highlighted day
 
 BEGIN {
-  BLACK = "\033[1;30m"
-  GREEN = "\033[1;32m"
-  RED = "\033[1;31m"
-  FAINT = "\033[2m"
-  BOLD = "\033[1m"
-  BG = "\033[41m"
   OFF = "\033[m"
   day = day + 0
   cur = cur + 0
 }
-NR == 1 { print GREEN $0 OFF; next }
+NR == 1 { print style_month $0 OFF; next }
-NR == 2 { print FAINT $0 OFF; next }
+NR == 2 { print style_weekdays $0 OFF; next }
 { 
-  sub("\\y"cur"\\y", BG BLACK BOLD cur OFF)
+  sub("\\y"cur"\\y", style_cur cur OFF)
-  sub("\\y"day"\\y", RED BOLD day OFF)
+  sub("\\y"day"\\y", style_highlight day OFF)
   print
 }

src/awk/dayview.awk

@@ -1,12 +1,33 @@
 ## src/awk/dayview.awk
-## Generate the view of a day from lines of the form
+## Take as input (tab-delimited):
-## ```
+##   1. s (start time, as HH:MM)
-##  <start_date>|<end_date>|<start_time>|<end_time>|<file_path>|<collection>|<description>
+##   2. e (end time, as HH:MM)
-## ```.
+##   3. starttime
+##   4. endtime
+##   5. fpath
+##   6. collection
+##   7. description
+##   8. status
+##
+## filter out irrelevant lines, and generate the view of a day
+## (tab-delimited), including empty hours:
+##   1. start date
+##   2. start time
+##   3. end time
+##   4. file path
+##   5. collection
+##   6. description
 ##
 ## @assign today: Date of `today` in the format %D (%m/%d/%y)
 ## @assign daystart: Hour of start of the day
 ## @assign dayend: Hour of end of the day
+## @assign style_allday
+## @assign style_timerange
+## @assign style_confirmed
+## @assign style_tentative
+## @assign style_cancelled
+## @assign style_hour
+## @assign style_emptyhour
 
 # Functions
 
@@ -15,7 +36,7 @@
 # @input status: Event status, one of TENTATIVE, CONFIRMED, CANCELLED
 # @return: Color modifier
 function color_from_status(status) {
-  return status == "CANCELLED" ? STRIKE CYAN : status == "TENTATIVE" ? FAINT CYAN : CYAN
+  return status == "CANCELLED" ? style_cancelled : status == "TENTATIVE" ? style_tentative : style_confirmed
 }
 
 # Return line for all-day event.
@@ -27,7 +48,7 @@ function color_from_status(status) {
 # @return: Single-line string
 function allday(collection, desc, status,    color) {
   color = color_from_status(status)
-  return collection " " LIGHT_CYAN ITALIC FAINT "    (allday)   " OFF color desc OFF
+  return collection " " style_allday
 }
 
 # Return line for multi-day event, or event that starts at midnight, which ends today.
@@ -40,7 +61,7 @@ function allday(collection, desc, status,    color) {
 # @return: Single-line string
 function endstoday(stop, collection, desc, status) {
   color = color_from_status(status)
-  return collection " " LIGHT_CYAN "      → " stop ": " OFF color desc OFF
+  return collection " " style_timerange "      → " stop ": " OFF color desc OFF
 }
 
 # Return line for event that starts sometime today.
@@ -55,9 +76,9 @@ function endstoday(stop, collection, desc, status) {
 function slice(start, stop, collection, desc, status) {
   color = color_from_status(status)
   if (stop == "00:00")
-    return collection " " LIGHT_CYAN start " →      " ": " OFF color desc OFF
+    return collection " " style_timerange start " →      " ": " OFF color desc OFF
    else
-    return collection " " LIGHT_CYAN start " – " stop ": " OFF color desc OFF
+    return collection " " style_timerange start " – " stop ": " OFF color desc OFF
 }
 
 # Print line for a single hour entry.
@@ -65,7 +86,7 @@ function slice(start, stop, collection, desc, status) {
 # @input hour: Hour of the entry
 function hrline(hour) {
   hour = hour < 10 ? "0"hour : hour
-  print today, hour, "", "", "", "   " FAINT hour ":00          ----------------------" OFF
+  print today, hour, "", "", "", "   " style_hou hour ":00" OFF "          " style_emptyhour
 }
 
 # Print lines for hour entries before an event that starts at `start` and stops
@@ -91,14 +112,9 @@ function hrlines(start, stop, h,    starth, stoph, tmp, i) {
 
 # AWK program
 BEGIN {
-  FS = "|"
+  FS = "\t"
-  LIGHT_CYAN = "\033[1;36m"
+  OFS = "\t"
-  CYAN = "\033[1;36m"
-  ITALIC = "\033[3m"
-  FAINT = "\033[2m"
-  STRIKE = "\033[9m"
   OFF = "\033[m"
-  OFS = "|"
 }
 $1 == "00:00" && $2 == "00:00" { print today, $1, $3, $4, $5, allday($6, $7, $8);        next }
 $1 == "00:00"                  { print today, $1, $3, $4, $5, endstoday($2, $6, $7, $8); next }

src/awk/merge.awk

@@ -4,14 +4,16 @@
 ## to the weeks at which the events take place.
 
 # AWK program
-BEGIN { FS="|" }
+BEGIN { FS="\t"; OFS="\t" }
 NR == FNR {
   i = i + 1
-  from_year[i] = $1
+  split($0, parts, ":")
-  from_week[i] = $2
+  from_year[i] = parts[1]
+  from_week[i] = parts[2]
   getline
-  to_year[i] = $1
+  split($0, parts, ":")
-  to_week[i] = $2
+  to_year[i] = parts[1]
+  to_week[i] = parts[2]
   next
 } # Load start and end week numbers from first file
 
@@ -21,8 +23,8 @@ NR == FNR {
   year_end = to_year[FNR]
   week_end = to_week[FNR]
   while(year_i <= year_end && (year_i < year_end || week_i <= week_end)) {
-    label = year_i"|"week_i
+    label = year_i ":" week_i ":"
-    week[label] = week[label] " " $5
+    week[label] = week[label] ? week[label] " " $5 : $5
     week_i++
     if (week_i > 53) {
       week_i = 1
@@ -30,4 +32,4 @@ NR == FNR {
     }
   }
 }
-END { for (label in week) print label week[label] }
+END { for (label in week) print label, week[label] }

src/awk/parse.awk

@@ -3,6 +3,8 @@
 ## ```
 ## <start> <end> <fpath> <collection> <status> <summary>
 ## ```.
+## The output is space delimited.
+## Summary may contain spaces, but it's the last in the list.
 ##
 ## @assign collection_labels: See configuration of the current program.
 
@@ -18,6 +20,7 @@
 function print_data(start, dur, end, summary,    cmd, collection, depth, path) {
   summary = getcontent(summary)
   gsub("\n", " ",    summary) # This will be put on a single line
+  gsub("\t", "    ", summary) # Generally, we use tab as delimiter.
   depth = split(FILENAME, path, "/")
   fpath = path[depth-1] "/" path[depth]
   collection = depth > 1 ? path[depth-1] : ""

src/awk/weekview.awk

@@ -1,34 +1,39 @@
 ## src/awk/weekview.awk
 ## Print view of all appointments of the current week.
+## Generates view from
+##   printf "%s\t%s\t%s\t%s\n" "$i" "$s" "$e" "$description"
 ##
 ## @assign startofweek: Date of first day in the week
+## @assign style_day: Style for dates
+## @assign style_event_delim: Event delimiter
+## @assign style_summary: Style for summary lines
+## @assign style_time: Style for times
 
 # Functions
 
 # Compose line that will display a day in the week.
 # 
+# @input desc: String with a description of the event
 # @return: Single-line string
-function c() {
+function c(desc) {
-  return CYAN substr($0, index($0, ">") + 1) OFF "  " RED "/" OFF
+  return style_summary desc OFF "  " style_event_delim
 }
 
 # AWK program
 
 BEGIN {
-  GREEN = "\033[1;32m"
+  FS = "\t"
-  RED = "\033[1;31m"
+  OFS = "\t"
-  CYAN = "\033[1;36m"
   OFF = "\033[m"
-  OFS = "|"
 }
-/^[0-7] 00:00 -- 00:00/                         { dayline = dayline " " c(); next }
+$2 == "00:00" && $3 == "00:00" { dayline = dayline " " c($4); next }
-/^[0-7] 00:00 -- /                              { dayline = dayline " → " $4 " " c(); next }
+$2 == "00:00"                  { dayline = dayline style_time " → " $3 OFF " " c($4); next }
-/^[0-7] [0-9]{2}:[0-9]{2} -- 00:00/             { dayline = dayline " " $2 " → " c(); next }
+$3 == "00:00"                  { dayline = dayline style_time " " $2 " → " OFF c($4); next }
-/^[0-7] [0-9]{2}:[0-9]{2} -- [0-9]{2}:[0-9]{2}/ { dayline = dayline " " $2 " – " $4 " " c(); next }
+NF == 4                        { dayline = dayline style_time " " $2 " – " $3 OFF " " c($4); next }
-/^[0-7]$/ && dayline                            { print "+", startofweek " +" $0-1 " days", "", dayline }
+NF == 1 && dayline             { print "+", startofweek " +" $1-1 " days", "", dayline }
-/^[0-7]$/ {
+NF == 1 {
-  cmd = "date -d '" startofweek " +" $0 " days' +\"%a %e %b %Y\""
+  cmd = "date -d '" startofweek " +" $1 " days' +\"%a %e %b %Y\""
   cmd | getline dayline
   close(cmd)
-  dayline = GREEN dayline ":   " OFF
+  dayline = style_day dayline ":   " OFF
 }

src/main.sh

@@ -70,9 +70,7 @@ __refresh_data
 
 ### Exports
 # The preview calls run in subprocesses. These require the following variables:
-export ROOT CAT AWK_GET AWK_CALSHIFT AWK_CALANNOT CYAN STRIKE FAINT WHITE ITALIC OFF AWK_ATTACHLS
 # The reload commands also run in subprocesses, and use in addition
-export COLLECTION_LABELS DAY_START DAY_END AWK_DAYVIEW AWK_WEEKVIEW AWK_PARSE
 # as well as the following variables that will be dynamically specified. So, we
 # export them in the main loop using the following function.
 
@@ -176,7 +174,7 @@ while true; do
           --list-border="top" \
           --list-label-pos=3 \
           --cycle \
-          --delimiter='|' \
+          --delimiter='\t' \
           --with-nth='{6}' \
           --accept-nth='1,2,3,4,5' \
           --preview="$0 --preview-event {}" \
@@ -186,15 +184,15 @@ while true; do
             )+transform(
               [ -n \"\${TZ:-}\" ] && echo \"change-list-label:\$WHITE\$ITALIC(\$TZ)\$OFF\"
             )+transform(
-              [ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview
+              [ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview
             )" \
           --bind="start:hide-preview" \
-          --bind="j:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="j:down+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
-          --bind="k:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="k:up+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
-          --bind="ctrl-j:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="ctrl-j:down+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
-          --bind="ctrl-k:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="ctrl-k:up+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
-          --bind="down:down+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="down:down+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
-          --bind="up:up+hide-preview+transform([ -n \"\$(echo {} | cut -d '|' -f 5)\" ] && echo show-preview)" \
+          --bind="up:up+hide-preview+transform([ -n \"\$(echo {} | cut -f 5)\" ] && echo show-preview)" \
           --bind="l:hide-preview+reload:$0 --reload-day {1} '+1 day'" \
           --bind="h:hide-preview+reload:$0 --reload-day {1} '-1 day'" \
           --bind="right:hide-preview+reload:$0 --reload-day {1} '+1 day'" \
@@ -214,11 +212,11 @@ while true; do
     if [ "$line" = "$key" ]; then
       line=""
     fi
-    DISPLAY_DATE=$(echo "$line" | cut -d '|' -f 1)
+    DISPLAY_DATE=$(echo "$line" | cut -f 1)
-    hour=$(echo "$line" | cut -d '|' -f 2)
+    hour=$(echo "$line" | cut -f 2)
-    start=$(echo "$line" | cut -d '|' -f 3)
+    start=$(echo "$line" | cut -f 3)
-    end=$(echo "$line" | cut -d '|' -f 4)
+    end=$(echo "$line" | cut -f 4)
-    fpath=$(echo "$line" | cut -d '|' -f 5 | sed "s/ /|/g")
+    fpath=$(echo "$line" | cut -f 5)
     if [ "$key" = "ctrl-n" ]; then
       if echo "$hour" | grep ":"; then
         hour="$DAY_START"
@@ -371,7 +369,7 @@ while true; do
           --no-sort \
           --no-hscroll \
           --ellipsis="" \
-          --delimiter="|" \
+          --delimiter="\t" \
           --with-nth="{4}" \
           --accept-nth=1,2 \
           --ansi \
@@ -408,8 +406,8 @@ while true; do
     if [ "$line" = "$key" ]; then
       line=""
     fi
-    sign=$(echo "$line" | cut -d '|' -f 1)
+    sign=$(echo "$line" | cut -f 1)
-    DISPLAY_DATE=$(echo "$line" | cut -d '|' -f 2)
+    DISPLAY_DATE=$(echo "$line" | cut -f 2)
     if [ "$key" = "ctrl-n" ]; then
       if [ "$sign" = "~" ]; then
         DISPLAY_DATE=""

src/sh/awkscripts.sh

@@ -20,87 +20,102 @@ AWK_APPROX=$(
 @@include awk/approx.awk
 EOF
 )
+export AWK_APPROX
 
 AWK_MERGE=$(
   cat <<'EOF'
 @@include awk/merge.awk
 EOF
 )
+export AWK_MERGE
 
 AWK_PARSE=$(
   cat <<'EOF'
 @@include awk/parse.awk
 EOF
 )
+export AWK_PARSE
 
 AWK_WEEKVIEW=$(
   cat <<'EOF'
 @@include awk/weekview.awk
 EOF
 )
+export AWK_WEEKVIEW
 
 AWK_DAYVIEW=$(
   cat <<'EOF'
 @@include awk/dayview.awk
 EOF
 )
+export AWK_DAYVIEW
 
 AWK_GET=$(
   cat <<'EOF'
 @@include awk/get.awk
 EOF
 )
+export AWK_GET
 
 AWK_UPDATE=$(
   cat <<'EOF'
 @@include awk/update.awk
 EOF
 )
+export AWK_UPDATE
 
 AWK_NEW=$(
   cat <<'EOF'
 @@include awk/new.awk
 EOF
 )
+export AWK_NEW
 
 AWK_CALSHIFT=$(
   cat <<'EOF'
 @@include awk/calshift.awk
 EOF
 )
+export AWK_CALSHIFT
 
 AWK_CALANNOT=$(
   cat <<'EOF'
 @@include awk/calannot.awk
 EOF
 )
+export AWK_CALANNOT
 
 AWK_SET=$(
   cat <<'EOF'
 @@include awk/set.awk
 EOF
 )
+export AWK_SET
 
 AWK_ATTACHLS=$(
   cat <<'EOF'
 @@include awk/attachls.awk
 EOF
 )
+export AWK_ATTACHLS
 
 AWK_ATTACHDD=$(
   cat <<'EOF'
 @@include awk/attachdd.awk
 EOF
 )
+export AWK_ATTACHDD
 
 AWK_ATTACHRM=$(
   cat <<'EOF'
 @@include awk/attachrm.awk
 EOF
 )
+export AWK_ATTACHRM
 
 AWK_ATTACH=$(
   cat <<'EOF'
 @@include awk/attach.awk
 EOF
 )
+export AWK_ATTACH

src/sh/clipreview.sh

@@ -6,10 +6,10 @@
 #
 # @input $2: Line from day view containing an event
 if [ "${1:-}" = "--preview-event" ]; then
-  hour=$(echo "$2" | cut -d '|' -f 2)
+  hour=$(echo "$2" | cut -f 2)
-  start=$(echo "$2" | cut -d '|' -f 3)
+  start=$(echo "$2" | cut -f 3)
-  end=$(echo "$2" | cut -d '|' -f 4)
+  end=$(echo "$2" | cut -f 4)
-  fpath=$(echo "$2" | cut -d '|' -f 5 | sed "s/ /|/g")
+  fpath=$(echo "$2" | cut -f 5)
   if [ -n "$hour" ] && [ -n "$fpath" ]; then
     fpath="$ROOT/$fpath"
     start=$(datetime_str "$start" "%a ")
@@ -21,9 +21,9 @@ if [ "${1:-}" = "--preview-event" ]; then
     elif [ "$status" = "CANCELLED" ]; then
       symb="❌"
     fi
-    echo "📅${symb:-} ${CYAN}$start${OFF} → ${CYAN}$end${OFF}"
+    echo "📅${symb:-} ${STYLE_EPV_DATETIME}$start${OFF} → ${STYLE_EPV_DATETIME}$end${OFF}"
     if [ -n "${location:-}" ]; then
-      echo "📍 ${CYAN}$location${OFF}"
+      echo "📍 ${STYLE_EPV_LOCATION}$location${OFF}"
     fi
     attcnt=$(awk "$AWK_ATTACHLS" "$fpath" | wc -l)
     if [ "$attcnt" -gt 0 ]; then
@@ -39,9 +39,9 @@ fi
 #
 # @input $2: Line from week view
 if [ "${1:-}" = "--preview-week" ]; then
-  sign=$(echo "$2" | cut -d '|' -f 1)
+  sign=$(echo "$2" | cut -f 1)
   if [ "$sign" = "+" ]; then
-    startdate=$(echo "$2" | cut -d '|' -f 2)
+    startdate=$(echo "$2" | cut -f 2)
     set -- $(date -d "$startdate" +"%Y %m %d")
     year=$1
     month=$2
@@ -88,12 +88,12 @@ if [ "${1:-}" = "--preview-week" ]; then
     fi
     # show
     (
-      cal "$month_pre2" "$year_pre2" | awk "$AWK_CALSHIFT" | awk -v cur="${var_pre2:-}" "$AWK_CALANNOT"
+      cal "$month_pre2" "$year_pre2" | awk "$AWK_CALSHIFT" | awk -v cur="${var_pre2:-}" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
-      cal "$month_pre" "$year_pre" | awk "$AWK_CALSHIFT" | awk -v cur="${var_pre:-}" "$AWK_CALANNOT"
+      cal "$month_pre" "$year_pre" | awk "$AWK_CALSHIFT" | awk -v cur="${var_pre:-}" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
-      cal "$month" "$year" | awk "$AWK_CALSHIFT" | awk -v cur="${var:-}" -v day="$day" "$AWK_CALANNOT"
+      cal "$month" "$year" | awk "$AWK_CALSHIFT" | awk -v cur="${var:-}" -v day="$day" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
-      cal "$month_nex" "$year_nex" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex:-}" "$AWK_CALANNOT"
+      cal "$month_nex" "$year_nex" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex:-}" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
-      cal "$month_nex2" "$year_nex2" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex2:-}" "$AWK_CALANNOT"
+      cal "$month_nex2" "$year_nex2" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex2:-}" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
-      cal "$month_nex3" "$year_nex3" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex3:-}" "$AWK_CALANNOT"
+      cal "$month_nex3" "$year_nex3" | awk "$AWK_CALSHIFT" | awk -v cur="${var_nex3:-}" -v style_month="$STYLE_CALENDAR_MONTH" -v style_weekdays="$STYLE_CALENDAR_WEEKDAYS" -v style_cur="$STYLE_CALENDAR_CURRENT_DAY" -v style_highlight="$STYLE_CALENDAR_HL_DAY" "$AWK_CALANNOT"
     ) | awk '{ l[NR%8] = l[NR%8] "    " $0 } END {for (i in l) if (i>0) print l[i] }'
   fi
   exit

src/sh/config.sh

@@ -20,15 +20,16 @@ if [ -z "${ROOT:-}" ] || [ -z "${COLLECTION_LABELS:-}" ]; then
   err "Configuration is incomplete."
   exit 1
 fi
-SYNC_CMD=${SYNC_CMD:-echo 'Synchronization disabled'}
+export ROOT COLLECTION_LABELS
-DAY_START=${DAY_START:-8}
+export SYNC_CMD=${SYNC_CMD:-echo 'Synchronization disabled'}
-DAY_END=${DAY_END:-18}
+export DAY_START=${DAY_START:-8}
-ZI_DIR=${ZI_DIR:-/usr/share/zoneinfo/posix}
+export DAY_END=${DAY_END:-18}
+export ZI_DIR=${ZI_DIR:-/usr/share/zoneinfo/posix}
 if [ ! -d "$ZI_DIR" ]; then
   err "Could not determine time-zone information"
   exit 1
 fi
-OPEN=${OPEN:-open}
+export OPEN=${OPEN:-open}
 
 # Check and load required tools
 # - FZF:     Fuzzy finder `fzf``
@@ -39,14 +40,14 @@ OPEN=${OPEN:-open}
 # The presence of POSIX tools is not checked.
 
 if command -v "fzf" >/dev/null; then
-  FZF="fzf --black"
+  export FZF="fzf --black"
 else
   err "Did not find the command-line fuzzy finder fzf."
   exit 1
 fi
 
 if command -v "uuidgen" >/dev/null; then
-  UUIDGEN="uuidgen"
+  export UUIDGEN="uuidgen"
 else
   err "Did not find the uuidgen command."
   exit 1
@@ -58,8 +59,8 @@ elif command -v "batcat" >/dev/null; then
   CAT="batcat"
 fi
 CAT=${CAT:+$CAT --color=always --style=numbers --language=md}
-CAT=${CAT:-cat}
+export CAT=${CAT:-cat}
 
 if command -v "git" >/dev/null && [ -d "$ROOT/.git" ]; then
-  GIT="git -C $ROOT"
+  export GIT="git -C $ROOT"
 fi

src/sh/load.sh

@@ -9,14 +9,15 @@ __load_approx_data() {
     xargs -0 -P0 \
       awk \
       -v collection_labels="$COLLECTION_LABELS" \
+      -v style_line="$STYLE_LV" \
       "$AWK_APPROX"
 }
 
 # For every relevant week, print associated iCalendar files
 __load_weeks() {
-  dates=$(awk -F'|' '{ print $2; print $3 }' "$APPROX_DATA_FILE")
+  dates=$(awk -F'\t' '{ print $2; print $3 }' "$APPROX_DATA_FILE")
   file_dates=$(mktemp)
-  echo "$dates" | date --file="/dev/stdin" +"%G|%V" >"$file_dates"
+  echo "$dates" | date --file="/dev/stdin" +"%G:%V:" >"$file_dates"
   awk "$AWK_MERGE" "$file_dates" "$APPROX_DATA_FILE"
   rm "$file_dates"
 }

src/sh/theme.sh

@@ -1,8 +1,42 @@
+# Colors
 GREEN="\033[1;32m"
+BLACK="\033[1;30m"
 RED="\033[1;31m"
 WHITE="\033[1;97m"
 CYAN="\033[1;36m"
+LIGHT_CYAN="\033[1;36m"
 STRIKE="\033[9m"
 ITALIC="\033[3m"
 FAINT="\033[2m"
+BOLD="\033[1m"
+BG="\033[41m"
 OFF="\033[m"
+
+# Style
+# Calendar
+export STYLE_CALENDAR_MONTH="$GREEN"
+export STYLE_CALENDAR_WEEKDAYS="$FAINT"
+export STYLE_CALENDAR_CURRENT_DAY="$BLACK$BG"
+export STYLE_CALENDAR_HL_DAY="$BOLD$RED"
+
+# Week view
+export STYLE_WV_DAY="$GREEN"
+export STYLE_WV_EVENT_DELIM="$RED / $OFF"
+export STYLE_WV_SUMMARY="$CYAN"
+export STYLE_WV_TIME="$WHITE"
+
+# List view
+export STYLE_LV="$FAINT"
+
+# Day view
+export STYLE_DV_ALLDAY="$LIGHT_CYAN$ITALIC$FAINT    (allday)   $OFF"
+export STYLE_DV_TIME="$LIGHT_CYAN"
+export STYLE_DV_CONFIRMED="$CYAN"
+export STYLE_DV_TENTATIVE="$FAINT$CYAN"
+export STYLE_DV_CANCELLED="$STRIKE$CYAN"
+export STYLE_DV_HOUR="$FAINT"
+export STYLE_DV_EMPTYHOUR="$FAINT----------------------$OFF"
+
+# Event preview
+export STYLE_EPV_DATETIME="$CYAN"
+export STYLE_EPV_LOCATION="$GREEN"

src/sh/view.sh

@@ -3,10 +3,17 @@
 # - __view_week
 # - __view_all
 
-# This function prints the view for the day specified in `$DISPLAY_DATE`.
+# This function prints the view for the day specified in `$DISPLAY_DATE`, in
+# the tab-delimited format with the fields:
+#  1. start date
+#  2. start time
+#  3. end time
+#  4. file path
+#  5. collection
+#  6. description
 __view_day() {
-  weeknr=$(date -d "$DISPLAY_DATE" +"%G.%V")
+  weeknr=$(date -d "$DISPLAY_DATE" +"%G:%V:")
-  files=$(grep "^$weeknr\ " "$WEEKLY_DATA_FILE" | cut -d " " -f 2-)
+  files=$(grep "^$weeknr" "$WEEKLY_DATA_FILE" | cut -f 2)
   # Find relevant files in list of week files
   sef=$({
     set -- $files
@@ -17,6 +24,7 @@ __view_day() {
         "$AWK_PARSE" "$file"
     done
   })
+  # $sef holds (space-delimited): <start> <end> <fpath> <collection> <status> <summary>
   today=$(date -d "$DISPLAY_DATE" +"%D")
   if [ -n "$sef" ]; then
     sef=$(echo "$sef" | while IFS= read -r line; do
@@ -25,13 +33,13 @@ __view_day() {
       shift
       endtime="$1"
       shift
-      fpath="$(echo "$1" | sed 's/|/ /g')" # we will use | as delimiter (need to convert back!)
+      fpath="$1" # we will use | as delimiter (need to convert back!)
       shift
       collection="$1"
       shift
       status="$1"
       shift
-      description="$(echo "$*" | sed 's/|/:/g')" # we will use | as delimiter
+      description="$*"
       #
       daystart=$(date -d "$today 00:00:00" +"%s")
       dayend=$(date -d "$today 23:59:59" +"%s")
@@ -50,16 +58,27 @@ __view_day() {
       else
         continue
       fi
-      echo "$s|$e|$starttime|$endtime|$fpath|$collection|$description|$status"
+      printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n" "$s" "$e" "$starttime" "$endtime" "$fpath" "$collection" "$description" "$status"
     done)
   fi
-  echo "$sef" | sort -n | awk -v today="$today" -v daystart="$DAY_START" -v dayend="$DAY_END" "$AWK_DAYVIEW"
+  echo "$sef" | sort -n | awk \
+    -v today="$today" \
+    -v daystart="$DAY_START" \
+    -v dayend="$DAY_END" \
+    -v style_allday="$STYLE_DV_ALLDAY" \
+    -v style_timerange="$STYLE_DV_TIME" \
+    -v style_confirmed="$STYLE_DV_CONFIRMED" \
+    -v style_tentative="$STYLE_DV_TENTATIVE" \
+    -v style_cancelled="$STYLE_DV_CANCELLED" \
+    -v style_hour="$STYLE_DV_HOUR" \
+    -v style_emptyhour="$STYLE_DV_EMPTYHOUR" \
+    "$AWK_DAYVIEW"
 }
 
 # This function prints the view for the week that contains the day specified in `$DISPLAY_DATE`.
 __view_week() {
-  weeknr=$(date -d "$DISPLAY_DATE" +"%G.%V")
+  weeknr=$(date -d "$DISPLAY_DATE" +"%G:%V:")
-  files=$(grep "^$weeknr\ " "$WEEKLY_DATA_FILE" | cut -d " " -f 2-)
+  files=$(grep "^$weeknr" "$WEEKLY_DATA_FILE" | cut -f 2)
   dayofweek=$(date -d "$DISPLAY_DATE" +"%u")
   delta=$((1 - dayofweek))
   startofweek=$(date -d "$DISPLAY_DATE -$delta days" +"%D")
@@ -99,21 +118,19 @@ __view_week() {
         dayend=$(date -d "$startofweek +$i days 23:59:59" +"%s")
         if [ "$starttime" -gt "$daystart" ] && [ "$starttime" -lt "$dayend" ]; then
           s=$(date -d "@$starttime" +"%H:%M")
-          s="$s -"
         elif [ "$starttime" -le "$daystart" ] && [ "$endtime" -gt "$daystart" ]; then
-          s="00:00 -"
+          s="00:00"
         else
           continue
         fi
         if [ "$endtime" -gt "$daystart" ] && [ "$endtime" -lt "$dayend" ]; then
           e=$(date -d "@$endtime" +"%H:%M")
-          e="- $e"
         elif [ "$endtime" -ge "$dayend" ] && [ "$starttime" -lt "$dayend" ]; then
-          e="- 00:00"
+          e="00:00"
         else
           continue
         fi
-        echo "$i $s$e >$description"
+        printf "%s\t%s\t%s\t%s\n" "$i" "$s" "$e" "$description"
       done
     done)
   fi
@@ -121,7 +138,13 @@ __view_week() {
     echo "$sef"
     seq 0 7
   } | sort -n)
-  echo "$sef" | awk -v startofweek="$startofweek" "$AWK_WEEKVIEW"
+  echo "$sef" | awk \
+    -v startofweek="$startofweek" \
+    -v style_day="$STYLE_WV_DAY" \
+    -v style_event_delim="$STYLE_WV_EVENT_DELIM" \
+    -v style_summary="$STYLE_WV_SUMMARY" \
+    -v style_time="$STYLE_WV_TIME" \
+    "$AWK_WEEKVIEW"
 }
 
 # This function prints all entries.