diff --git a/ChangeLog b/ChangeLog index 7aa2ba78d..d41dd578e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ 'color.history.done' and 'color.history.delete' configuration variables. + Added feature #156, so that task supports both a 'side' and 'diff' style of undo. + + Distribution now includes 7 theme files, for 16- and 256-color terminals. + Fixed bug #406 so that task now includes command aliases in the _commands helper command used by shell completion scripts. + Fixed bug #211 - it was unclear which commands modify a task description. diff --git a/Makefile.am b/Makefile.am index 4acd81db6..a658af8d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,5 +20,5 @@ i18ndir = $(docdir) nobase_dist_i18n_DATA = i18n/strings.de-DE i18n/strings.en-US i18n/strings.es-ES i18n/strings.fr-FR i18n/strings.nl-NL i18n/strings.sv-SE i18n/tips.de-DE i18n/tips.en-US i18n/tips.sv-SE rcfiledir = $(docdir)/rc -dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme +dist_rcfile_DATA = doc/rc/holidays-US.rc doc/rc/holidays-SE.rc doc/rc/dark-16.theme doc/rc/dark-256.theme doc/rc/light-16.theme doc/rc/light-256.theme doc/rc/dark-blue-256.theme doc/rc/dark-green-256.theme doc/rc/dark-red-256.theme diff --git a/NEWS b/NEWS index 9014d017a..eec6a3d3b 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ New Features in task 1.9.2 - New iCalendar/vcalendar export format (RFC-2445, RFC-5545, RFC-5546). - New 'show' command to display configuration settings. - New 'denotate' command to delete annotations. + - New 16-color and 256-color themes included. - New limit:page filter to show only one page of tasks. - Performance enhancements. diff --git a/doc/man/task-color.5 b/doc/man/task-color.5 index 507ed242f..ffcd83cfa 100644 --- a/doc/man/task-color.5 +++ b/doc/man/task-color.5 @@ -234,9 +234,30 @@ be included. To get a good idea of what a color theme looks like, try adding this entry to your .taskrc file: - include /usr/local/share/doc/task/themes/dark-256.theme +.RS +include /usr/local/share/doc/task/rc/dark-256.theme +.RE -Better yet, create your own, and share it. +You can use any of the standard task themes: + +.RS +light-16.theme +.br +light-256.theme +.br +dark-16.theme +.br +dark-256.theme +.br +dark-red-256.theme +.br +dark-green-256.theme +.br +dark-blue-256.theme +.RE + +Better yet, create your own, and share it. We will gladly host the theme file +on . .SH "CREDITS & COPYRIGHTS" task was written by P. Beckingham . diff --git a/doc/man/taskrc.5 b/doc/man/taskrc.5 index 4df65dc49..739f1b7a4 100644 --- a/doc/man/taskrc.5 +++ b/doc/man/taskrc.5 @@ -111,6 +111,18 @@ include By using include files you can divide your main configuration file into several ones containing just the relevant configuration data like colors, etc. +There are two excellent uses of includes in your .taskrc, shown here: + +.RS +include /usr/local/share/doc/task/rc/holidays-US.rc +.br +include /usr/local/share/doc/task/rc/dark-16.theme +.RE + +This includes two standard files that are distributed with task, which define a +set of US holidays, and set up a 16-color theme for task to use, to color the +reports and calendar. + .SH CONFIGURATION VARIABLES Valid variable names and their default values are: @@ -461,6 +473,16 @@ holiday.eastersunday.date=easter .RE .RE +Note that the task distribution contains example holiday files that can be +included like this: + +.RS +.RS +.br +include /usr/local/share/doc/task/rc/holidays-US.rc +.RE +.RE + .TP .B monthsperline=3 Determines how many months the "task calendar" command renders across the @@ -568,13 +590,12 @@ Colors any of the messages printed last. .TP .B color.summary.bar=on green -Colors the summary progress bar. Should include both a foreground and a -background color. +Colors the summary progress bar. Should consist of a background color. .RE .TP .B color.summary.background=on black -Colors the summary progress bar. Should include at least a background color. +Colors the summary progress bar. Should consist of a background color. .RE .TP diff --git a/doc/rc/dark-16.theme b/doc/rc/dark-16.theme index fac3fff8f..a670360ee 100644 --- a/doc/rc/dark-16.theme +++ b/doc/rc/dark-16.theme @@ -1,4 +1,4 @@ -# Sample task 1.9 (or later) dark color theme +# Sample task 1.9 (or later) dark 16-color theme color=on color.header=yellow @@ -25,7 +25,7 @@ color.calendar.weeknumber=bold blue color.recurring=magenta color.overdue=bold red -color.due.today=bold red on bright black +color.due.today=red color.due=red color.active=black on bright green color.pri.none= diff --git a/doc/rc/dark-256.theme b/doc/rc/dark-256.theme index 8770a2216..20defe891 100644 --- a/doc/rc/dark-256.theme +++ b/doc/rc/dark-256.theme @@ -1,4 +1,4 @@ -# Sample task 1.9 (or later) dark color theme +# Sample task 1.9 (or later) dark 256-color theme color=on color.header=color3 diff --git a/doc/rc/dark-blue-256.theme b/doc/rc/dark-blue-256.theme index 75a85602d..2d8128a2b 100644 --- a/doc/rc/dark-blue-256.theme +++ b/doc/rc/dark-blue-256.theme @@ -1,4 +1,4 @@ -# Sample task 1.9 (or later) dark color theme, featuring blue. +# Sample task 1.9 (or later) dark 256-color theme, featuring blue. color=on color.header=rgb013 diff --git a/doc/rc/dark-green-256.theme b/doc/rc/dark-green-256.theme index 8b9c08089..9497a1b47 100644 --- a/doc/rc/dark-green-256.theme +++ b/doc/rc/dark-green-256.theme @@ -1,4 +1,4 @@ -# Sample task 1.9 (or later) dark color theme, featuring green. +# Sample task 1.9 (or later) dark 256-color theme, featuring green. color=on color.header=rgb031 diff --git a/doc/rc/dark-red-256.theme b/doc/rc/dark-red-256.theme index 81909def0..3e0f75c9a 100644 --- a/doc/rc/dark-red-256.theme +++ b/doc/rc/dark-red-256.theme @@ -1,4 +1,4 @@ -# Sample task 1.9 (or later) dark color theme, featuring red. +# Sample task 1.9 (or later) dark 256-color theme, featuring red. color=on color.header=rgb100 diff --git a/doc/rc/light-16.theme b/doc/rc/light-16.theme index 99b48867b..db0cd526f 100644 --- a/doc/rc/light-16.theme +++ b/doc/rc/light-16.theme @@ -1 +1,37 @@ -# Sample task 1.9 (or later) color theme +# Sample task 1.9 (or later) light 16-color theme + +color=on +color.header=blue +color.footnote=blue +color.debug=blue + +color.summary.bar=on green +color.summary.background=on black + +color.history.add=black on red +color.history.done=black on green +color.history.delete=black on yellow + +color.undo.before=red +color.undo.after=green + +color.calendar.today=black on cyan +color.calendar.due=white on red +color.calendar.due.today=bold white on red +color.calendar.overdue=black on bright red +color.calendar.weekend=white on bright black +color.calendar.holiday=black on bright yellow +color.calendar.weeknumber=bright blue + +color.recurring=blue +color.overdue=bold red +color.due.today=red +color.due=red +color.active=black on green +color.pri.none= +color.pri.H=bold black +color.pri.M=black +color.pri.L= +color.tagged=green +color.alternate= + diff --git a/doc/rc/light-256.theme b/doc/rc/light-256.theme index 99b48867b..5b86b8627 100644 --- a/doc/rc/light-256.theme +++ b/doc/rc/light-256.theme @@ -1 +1,37 @@ -# Sample task 1.9 (or later) color theme +# Sample task 1.9 (or later) light 256-color theme + +color=on +color.header=color4 +color.footnote=color4 +color.debug=color4 + +color.summary.bar=on rgb141 +color.summary.background=on color0 + +color.history.add=color0 on rgb500 +color.history.done=color0 on rgb050 +color.history.delete=color0 on rgb550 + +color.undo.before=color1 +color.undo.after=color2 + +color.calendar.today=color0 on rgb053 +color.calendar.due=color0 on color9 +color.calendar.due.today=color15 on color1 +color.calendar.overdue=color0 on color1 +color.calendar.weekend=on color253 +color.calendar.holiday=color0 on color11 +color.calendar.weeknumber=rgb013 + +color.recurring=rgb013 +color.overdue=color1 +color.due.today=rgb400 +color.due=color9 +color.active=rgb555 on rgb520 +color.pri.none= +color.pri.H=color232 +color.pri.M=color237 +color.pri.L=color242 +color.tagged=rgb020 +color.alternate=on color254 +