From owner-svn-src-user@FreeBSD.ORG  Sat Mar  6 23:01:11 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CC7E106564A;
	Sat,  6 Mar 2010 23:01:11 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C2008FC14;
	Sat,  6 Mar 2010 23:01:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26N1Bgo063229;
	Sat, 6 Mar 2010 23:01:11 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26N1BAE063226;
	Sat, 6 Mar 2010 23:01:11 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003062301.o26N1BAE063226@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sat, 6 Mar 2010 23:01:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204812 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Mar 2010 23:01:11 -0000

Author: edwin
Date: Sat Mar  6 23:01:10 2010
New Revision: 204812
URL: http://svn.freebsd.org/changeset/base/204812

Log:
  Fix the -y option
  In the Julian day format, properly highlight the current day
  Update the manpage with -3, -A and -B

Modified:
  user/edwin/ncal/ncal.1
  user/edwin/ncal/ncal.c
Directory Properties:
  user/edwin/ncal/   (props changed)

Modified: user/edwin/ncal/ncal.1
==============================================================================
--- user/edwin/ncal/ncal.1	Sat Mar  6 22:38:38 2010	(r204811)
+++ user/edwin/ncal/ncal.1	Sat Mar  6 23:01:10 2010	(r204812)
@@ -33,24 +33,32 @@
 .Nd displays a calendar and the date of Easter
 .Sh SYNOPSIS
 .Nm
-.Op Fl hjy
+.Op Fl 3hjy
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Oo
 .Op Ar month
 .Ar year
 .Oc
 .Nm
-.Op Fl hj
+.Op Fl 3hj
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Fl m Ar month
 .Op Ar year
 .Nm ncal
-.Op Fl hjJpwy
+.Op Fl 3hjJpwy
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Op Fl s Ar country_code
 .Oo
 .Op Ar month
 .Ar year
 .Oc
 .Nm ncal
-.Op Fl hJeo
+.Op Fl 3hJeo
+.Op Fl A Ar number
+.Op Fl B Ar number
 .Op Ar year
 .Sh DESCRIPTION
 The

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Sat Mar  6 22:38:38 2010	(r204811)
+++ user/edwin/ncal/ncal.c	Sat Mar  6 23:01:10 2010	(r204812)
@@ -369,6 +369,12 @@ main(int argc, char *argv[])
 		usage();
 	}
 
+	if (flag_hole_year) {
+		m = 1;
+		before = 0;
+		after = 11;
+	}
+
 	if (flag_month != NULL) {
 		if (parsemonth(flag_month, &m, &y)) {
 			errx(EX_USAGE,
@@ -723,7 +729,7 @@ mkmonthr(int y, int m, int jd_flag, stru
 				if (jd_flag)
 					dt.d = j - jan1 + 1;
 				else
-					sdateb(j, &dt);
+					sdater(j, &dt);
 				/* separator */
 				mlines->lines[i][k] = ' ';
 				/* the actual text */