mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

26121: add -B <lines> option to calendar

Browse source
This commit is contained in:
Peter Stephenson 2008-12-10 13:30:27 +00:00
parent 63e60d3d21
commit 37a4dce4bc
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-12-10 Peter Stephenson <pws@csr.com>
* 26121: Doc/Zsh/calsys.yo, Functions/Calendar/calendar: add
-B <lines> option to calendar.
* users/13566: Etc/FAQ.yo: note problem with unsetting elements
of regular arrays.

4
Doc/Zsh/calsys.yo
View file

@ -357,6 +357,10 @@ item(tt(-b))(
Brief: don't display continuation lines (i.e. indented lines following
the line with the date/time), just the first line.
)
item(tt(-B) var(lines))(
Brief: display at most the first var(lines) lines of the calendar
entry. `tt(-B 1)' is equivalent to `tt(-b)'.
)
item(tt(-C) var(calfile))(
Explicitly specify a calendar file instead of the value of
the tt(calendar-file) style or the the default tt(~/calendar).

27
Functions/Calendar/calendar
View file

@ -60,7 +60,7 @@ while [[ ${argv[opti+1]} = -* ]]; do
########################
# Options with arguments
########################
([CnS])
([BCnS])
if [[ -n $optrest ]]; then
optarg=$optrest
optrest=
@ -72,6 +72,15 @@ while [[ ${argv[opti+1]} = -* ]]; do
return 1
fi
case $opt in
(B)
# Brief, with number of lines to show.
brief=$optarg
if (( brief <= 0 )); then
print -r "$0: option -$opt requires a positive integer." >&2
return 1
fi
;;
(C)
# Pick the calendar file, overriding style and default.
calendar=$optarg
@ -289,17 +298,17 @@ fi
fi
(( shown = 0 ))
if (( brief )); then
showline=${line%%$'\n'*}
showline=${(F)${${(f)line}[1,brief]}}
else
showline=$line
match=()
# Strip continuation lines starting " #".
while [[ $showline = (#b)(*$'\n')[[:space:]]##\#[^$'\n']##(|$'\n'(*)) ]]; do
showline="$match[1]$match[3]"
done
# Strip trailing empty lines
showline=${showline%%[[:space:]]#}
fi
match=()
# Strip continuation lines starting " #".
while [[ $showline = (#b)(*$'\n')[[:space:]]##\#[^$'\n']##(|$'\n'(*)) ]]; do
showline="$match[1]$match[3]"
done
# Strip trailing empty lines
showline=${showline%%[[:space:]]#}
if (( showall || (t >= start && (remaining || t <= stop || icount < showcount)) ))
then
$showprog $start $stop "$showline"