Skip to content

Highlightening of dates, metadata and numbers #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
glatzor wants to merge 5 commits into from
Closed

Highlightening of dates, metadata and numbers #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7726133
Add highlightening for dates
glatzor Jan 6, 2014
abb617d
Add highlightening for metadata
glatzor Jan 6, 2014
fe60b19
Add highlightening to item numbers
glatzor Jan 6, 2014
c2a5ffb
Use more eye pleasing default colors for metadata, numbers and dates
glatzor Jan 6, 2014
d5a7ac1
Fix the regex for date coloring to only match single dates
glatzor Jan 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions todo.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,20 @@ export REPORT_FILE="$TODO_DIR/report.txt"
# export COLOR_PROJECT=$RED
# export COLOR_CONTEXT=$RED

# There is highlighting for dates.
#
# export COLOR_DATE=$DARK_GREY

# There is highlighting for metadata key:value pairs e.g.
# DUE:2006-08-01 or note:MYNOTE
#
# export COLOR_META=$CYAN

# There is highlighting for item numbers.
#
# export COLOR_NUMBER=$LIGHT_GREY


# === BEHAVIOR ===

## customize list output
Expand Down
28 changes: 27 additions & 1 deletion todo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,15 @@ export PRI_X=$WHITE # color unless explicitly defined
export COLOR_PROJECT=$NONE
export COLOR_CONTEXT=$NONE

# Default color of dates
export COLOR_DATE=$NONE

# Default color of metadata
export COLOR_META=$NONE

# Default color of line number
export COLOR_NUMBER=$NONE

# Default highlight colors.
export COLOR_DONE=$LIGHT_GREY # color for done (but not yet archived) tasks

Expand Down Expand Up @@ -746,6 +755,8 @@ if [ $TODOTXT_PLAIN = 1 ]; then
COLOR_DONE=$NONE
COLOR_PROJECT=$NONE
COLOR_CONTEXT=$NONE
COLOR_DATE=$NONE
COLOR_META=$NONE
fi

[[ "$HIDE_PROJECTS_SUBSTITUTION" ]] && COLOR_PROJECT="$NONE"
Expand Down Expand Up @@ -909,21 +920,36 @@ _format()
}
end_clr = (clr ? highlight("DEFAULT") : "")

num_beg = highlight("COLOR_NUMBER")
num_end = (num_beg ? (highlight("DEFAULT") clr) : "")

prj_beg = highlight("COLOR_PROJECT")
prj_end = (prj_beg ? (highlight("DEFAULT") clr) : "")

ctx_beg = highlight("COLOR_CONTEXT")
ctx_end = (ctx_beg ? (highlight("DEFAULT") clr) : "")

dat_beg = highlight("COLOR_DATE")
dat_end = (dat_beg ? (highlight("DEFAULT") clr) : "")

met_beg = highlight("COLOR_META")
met_end = (met_beg ? (highlight("DEFAULT") clr) : "")

gsub(/[ \t][ \t]*/, "\n&\n")
len = split($0, words, /\n/)

printf "%s", clr
for (i = 1; i <= len; ++i) {
if (words[i] ~ /^[+].*[A-Za-z0-9_]$/) {
if (i == 1 && words[i] ~ /^[0-9]+$/ ) {
printf "%s", num_beg words[i] num_end
} else if (words[i] ~ /^[+].*[A-Za-z0-9_]$/) {
printf "%s", prj_beg words[i] prj_end
} else if (words[i] ~ /^[@].*[A-Za-z0-9_]$/) {
printf "%s", ctx_beg words[i] ctx_end
} else if (words[i] ~ /^(19|20)[0-9]{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$/) {
printf "%s", dat_beg words[i] dat_end
} else if (words[i] ~ /^[[:alnum:]]+:[^ ]+$/) {
printf "%s", met_beg words[i] met_end
} else {
printf "%s", words[i]
}
Expand Down