Commit Graph

54 Commits

Author SHA1 Message Date
Edwin Groothuis
531a1a4b2c Replace -b with -C and -B (as proposed by Alexander).
Add -3, -A and -B to the usage.
Update regression test for the new parameters.
2010-03-21 21:33:21 +00:00
Edwin Groothuis
4af997a87f - With the introduction of -A, -B and -3, not all combinations of
arguments makes sense anymore. For example, what would a combination
  of -3 (show three months) and -y (show the whole year) do?
  We will abort on these cases.
- Move the debug option -d to -H (from highlight), while -d is now
  used for setting the day of "today" so that -y and friends can
  be tested.
2010-03-12 06:57:53 +00:00
Edwin Groothuis
1d0e1dac57 - Fix the highlighting for non-terminals when the last week is not
7 days long.
- "-m <N> <YYYY>" now prints only the month, not the whole year.
2010-03-09 06:43:35 +00:00
Edwin Groothuis
cae11c25e3 - document the -3, -A and -B properly in Synopsis.
- add highlight of current date for non-terminals.
- fix -J option.
- code cleanup.

MFC after:	2 weeks
2010-03-07 21:54:28 +00:00
Edwin Groothuis
6f3bc07b8b Remove no-op of WARNS?=
Submitted by:	Ulrich Sp??rlein <uqs@spoerlein.net>
2010-03-04 12:18:24 +00:00
Edwin Groothuis
0851fbdf3b - Implement -3 option (show previous, this and next month) option.
- Add -A option (months after this month).
- Add -B option (months before this month).
- Fix highlighting of today in year overview.
- Fix aligning of "foreign" characters.

MFC after:	2 weeks
2010-03-04 07:04:27 +00:00
Xin LI
821df508e8 Revert most part of 200420 as requested, as more review and polish is
needed.
2009-12-13 03:14:06 +00:00
Xin LI
6f2d322192 Remove unneeded header includes from usr.bin/ except contributed code.
Tested with:	make universe
2009-12-11 23:35:38 +00:00
Hajimu UMEMOTO
46f39347f5 Since the width is always 2, it is enough to put just one
trailing space is enough.

MFC after:	1 week
2009-06-18 16:40:00 +00:00
Hajimu UMEMOTO
bd97a998dc Fix column width of weekday names for multibyte locales.
Noticed by:	nyan
Discussed with:	matusita, takawata
MFC after:	1 week
2009-06-17 14:47:06 +00:00
Roman Divacky
7149aa0155 Mention -h in usage() and manpage. Rename term_{r,e} to term_{so,se}.
Suggested by:	ru
Approved by:	ed (mentor)
2009-05-02 07:02:31 +00:00
Ruslan Ermilov
0c4ffccadb Fixed multi-byte character support to actually work. 2009-04-30 13:53:00 +00:00
Ruslan Ermilov
65710fd2d2 Fixed missing dependency. 2009-04-30 13:30:27 +00:00
Roman Divacky
0cd51de155 Couple of changes based on feedback
o	Change mr/me to so/se [1].
	o	Introduce a -h option to disable highlighting. [2]
	o	Spell STDOUT_FILENO as such and pass NULL to tgetent()
		to handle the case of unset TERM. [3]

Suggested by:	naddy mips.inka.de (Christian Weisgerber) [1]
Requested by:	danfe, deischen	[2]
Suggested by:	jmallett	[3]
Approved by:	ed (mentor)
2009-04-21 17:44:46 +00:00
Roman Divacky
e454a17158 Implement highlighting of today in month view of cal/ncal just like
gnu cal does. This is currently disabled for year view because of hard
coded padding in that case. This will hopefully be fixed soon.

Reviewed by:	Simon 'corecode' Schubert <corecode fs.ei.tum.de>
Approved by:	ed
2009-04-20 18:19:38 +00:00
David Schultz
4646cea766 Multibyte character support for cal(1).
PR:		131578
2009-03-14 18:55:51 +00:00
Garrett Wollman
ba29aec0d3 Implement a new feature for the "-m" option: if the month number is
followed by 'f' or 'p', use the following or preceding month of that
number, respectively.  Document this.  Also includes other minor
grammatical and punctuation fixes to the manual page (capitalize
Easter, etc.).

MFC after:	1 month
2008-12-22 21:22:42 +00:00
Tim J. Robbins
e21dde7b1d Document incorrect handling of multibyte characters.
PR:		87724
2005-10-23 01:37:25 +00:00
Xin LI
c49d3c9bac Remove unnecessary SRCS= where could be guessed directly by our
bsd.*.mk infrasture.

Obtained from:	ru
2005-01-27 14:52:47 +00:00
Ruslan Ermilov
4438d91ea2 Scheduled mdoc(7) sweep. 2005-01-11 10:32:52 +00:00
Garrett Wollman
f14eed08c0 Use ?= with WARNS.
Requested by: ru
2004-11-30 16:41:40 +00:00
Garrett Wollman
0c4cafead9 Add a `-m month' flag to provide a more convenient interface for
displaying a calendar for a specific month of the current year than
`cal $(date +"%Y") month'.  A few minor code cleanups.  Set WARNS=1.
(This code is WARNS=5 clean except for "`O' modifier used with `%B'
strftime format", which is legal in FreeBSD but GCC doesn't know about.)

MFC after:	1 week
2004-11-23 22:57:17 +00:00
Ruslan Ermilov
6a3e8b0adc Mechanically kill hard sentence breaks. 2004-07-02 22:22:35 +00:00
Ruslan Ermilov
47d7e8a96f Fixed style of DPADD and LDADD assignments as per style.Makefile(5). 2004-02-05 22:44:25 +00:00
Peter Pentchev
ac6d1c224f Teach ncal(1) about month names specified on the command line.
Reviewed by:	-audit
Approved by:	silence on -audit
MFC after:	3 weeks
2002-10-02 12:31:10 +00:00
Tim J. Robbins
1b2edc04ee Correct History: cal(1) appeared in V5, not V6. 2002-06-03 15:02:02 +00:00
Mark Murray
f372d010df Easy warns fixes; constify. 2002-04-28 12:25:03 +00:00
Mark Murray
348870705a Style; line up columns, space things out more consistently. 2002-04-28 12:24:20 +00:00
Philippe Charnier
e8937ba009 Use `The .Nm utility' 2002-04-20 12:18:28 +00:00
John Baldwin
72b1c1af40 Remove gcc specific compiler flags, at least one of which doesn't work with
gcc 3.0.2.  (-fstrict-prototypes)
2002-01-08 08:53:12 +00:00
Dima Dorfman
70d51341bf mdoc(7) police: remove extraneous .Pp before and/or after .Sh. 2001-07-09 09:54:33 +00:00
Andrey A. Chernov
1c593a0d69 Handle ASCII and US-ASCII aliases 2001-06-10 23:26:47 +00:00
Andrey A. Chernov
c052429fde Remove "SU" - not valid country code
Fix locale comparison with "C", add "POSIX"
2001-06-10 21:06:01 +00:00
Andrey A. Chernov
3740863d60 Properly deal with one char weekdays 2001-03-22 00:38:46 +00:00
Andrey A. Chernov
e036a70eb9 Uppercase first month letter
Terminate weekday string
2001-03-22 00:25:26 +00:00
Andrey A. Chernov
f5e40af22e Use nl_langinfo instead of %EF 2001-03-21 14:24:05 +00:00
Ruslan Ermilov
9884911506 mdoc(7) police: fixed broken references. 2001-01-16 11:52:00 +00:00
Ruslan Ermilov
536e683425 mdoc(7) police: fix the weird construct. 2001-01-15 16:49:28 +00:00
Ruslan Ermilov
8fe908ef0c mdoc(7) police: use the new features of the Nm macro. 2000-11-20 19:21:22 +00:00
Andrey A. Chernov
9d969a8b29 Use %EF instead of hardcoded order for each country 1999-11-30 20:08:50 +00:00
Andrey A. Chernov
2a31c9cc9e use %OB for months names 1999-09-12 13:33:33 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Bill Fumerola
9ef5c48bef Clean up some ambiguous nested if/elses. 1999-07-04 17:26:16 +00:00
Wolfgang Helbig
cf5f6adf44 Due to the switch form Julian to Gregorian calender,
even a whole month might be missing.
This caused a bug for the LN -calender, whose switch was
on Dec 12, 9999.
1999-03-27 21:08:13 +00:00
Poul-Henning Kamp
f24a941b31 fix ncal.1 grammar
PR:		6394
Reviewed by:	phk
Submitted by:	Josh Gilliam <josh@quick.net>
1998-04-26 06:21:29 +00:00
Philippe Charnier
306005e78c .Sh AUTHOR -> .Sh AUTHORS. Use .An/.Aq. 1998-03-23 07:48:45 +00:00
Wolfgang Helbig
630d15bbf9 Handle option -j correctly.
Synchronize usage message with man page.
PR:	bin/5488
1998-01-15 10:23:34 +00:00
David E. O'Brien
81b199e2f1 changed 1st appeared in clause -- about to import into -stable 1998-01-12 05:02:57 +00:00
Philippe Charnier
a99e456443 Sync usage and synopsis. Add rcsid. 1998-01-07 07:46:33 +00:00
Wolfgang Helbig
f8a0edba2c 1. Don't be confused if the first day of a month is dropped due to
Gregorian Reformation. E. G. in Albania December 1, 1912 doesn't exist.
2. Add some countries in the switch table (BE, FI, LN, LU)
3. Correct some entries from the new found source of calendar knowledge:
   http://www.pip.dknet.dk/~c-t/calendar.html,
   That is Claus Tondering's Calendar FAQ.
1998-01-06 00:46:11 +00:00