diff --git a/src/awk/dayview.awk b/src/awk/dayview.awk index d8eeeed..c48c8e2 100644 --- a/src/awk/dayview.awk +++ b/src/awk/dayview.awk @@ -23,7 +23,10 @@ function hrlines(start, stop, h, starth, stoph, tmp, i) { for (i=h; i < starth + tmp; i++) hrline(i) tmp = substr(stop, 4, 2) == "00" ? 0 : 1 - return stoph + tmp + if (stoph + tmp < daystart) + return daystart + else + return stoph + tmp } BEGIN { FS = "|" diff --git a/src/awk/weekview.awk b/src/awk/weekview.awk index 5f82616..211bbe1 100644 --- a/src/awk/weekview.awk +++ b/src/awk/weekview.awk @@ -11,8 +11,8 @@ BEGIN { OFS = "|" } /^[0-7] 00:00 -- 00:00/ { dayline = dayline " " c(); next } -/^[0-7] 00:00 -- / { dayline = dayline " <-|" $4 " " c(); next } -/^[0-7] [0-9]{2}:[0-9]{2} -- 00:00/ { dayline = dayline " " $2 "|-> " c(); next } +/^[0-7] 00:00 -- / { dayline = dayline " <--" $4 " " c(); next } +/^[0-7] [0-9]{2}:[0-9]{2} -- 00:00/ { dayline = dayline " " $2 "--> " c(); next } /^[0-7] [0-9]{2}:[0-9]{2} -- [0-9]{2}:[0-9]{2}/ { dayline = dayline " " $2 " - " $4 " " c(); next } /^[0-7]$/ && dayline { print "+", startofweek " +" $0-1 " days", "", dayline; } /^[0-7]$/ {