From bb5c624382ccd4bf3a6fd256e463a6994661334b Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 25 Feb 2003 12:07:57 -0800 Subject: [PATCH] Release calc version 2.11.6.1 --- CHANGES | 6 ++---- cal/repeat.cal | 6 +++--- help/digits | 13 +++++-------- version.c | 6 +++--- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 4eedac8..b380094 100644 --- a/CHANGES +++ b/CHANGES @@ -82,8 +82,6 @@ The following are the changes from calc version 2.11.6.0 to date: Fixed formation of the custom/.all file. - Fixed repeat(1, repeat_count) bug. - The following are the changes from calc version 2.11.5.5 to 2.11.5.9: @@ -5508,8 +5506,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1: ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.54 $ -## @(#) $Id: CHANGES,v 29.54 2003/01/14 04:04:26 chongo Exp $ +## @(#) $Revision: 29.53 $ +## @(#) $Id: CHANGES,v 29.53 2003/01/14 02:33:58 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $ ## ## Under source code control: 1993/06/02 18:12:57 diff --git a/cal/repeat.cal b/cal/repeat.cal index 4d19cff..525973e 100644 --- a/cal/repeat.cal +++ b/cal/repeat.cal @@ -17,8 +17,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.3 $ - * @(#) $Id: repeat.cal,v 29.3 2003/01/14 04:03:20 chongo Exp $ + * @(#) $Revision: 29.2 $ + * @(#) $Id: repeat.cal,v 29.2 2003/01/14 01:55:22 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/repeat.cal,v $ * * Under source code control: 2003/01/05 00:00:01 @@ -48,6 +48,6 @@ define repeat(digit_set, repeat_count) } /* return repeated set of digits */ - digit_count = max(digits(digit_set), 1); + digit_count = digits(digit_set); return digit_set * (10^(digit_count*repeat_count)-1) / (10^digit_count-1); } diff --git a/help/digits b/help/digits index 1f4f762..327b627 100644 --- a/help/digits +++ b/help/digits @@ -13,15 +13,12 @@ TYPES DESCRIPTION Returns the least non-negative integer n for which abs(x) < b^n. - digits(x, b) = 0 if and only if abs(x) <= 1. + digits(x, b) = 0 if and only if abs(x) < 1. - For real x with absolute value > 1, digits(x, b) is the number + For real x with absolute value >= 1, digits(x, b) is the number of digits in the standard base-b "decimal" representation of int(abs(x)); this is also given by 1 + ilog(x, b). - NOTE: both digits(0) and digits(1) return the value of 1. - This is not a bug, it is a feature of the above equation. :-) - EXAMPLE > print digits(0), digits(0.0123), digits(3.7), digits(-27), digits(-99.7) 0 0 1 2 2 @@ -35,7 +32,7 @@ LINK LIBRARY SEE ALSO digit, places -## Copyright (C) 1999-2003 Landon Curt Noll +## Copyright (C) 1999 Landon Curt Noll ## ## Calc is open software; you can redistribute it and/or modify it under ## the terms of the version 2.1 of the GNU Lesser General Public License @@ -51,8 +48,8 @@ SEE ALSO ## received a copy with calc; if not, write to Free Software Foundation, Inc. ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ## -## @(#) $Revision: 29.4 $ -## @(#) $Id: digits,v 29.4 2003/01/14 04:09:35 chongo Exp $ +## @(#) $Revision: 29.3 $ +## @(#) $Id: digits,v 29.3 2000/12/14 10:32:24 chongo Exp $ ## @(#) $Source: /usr/local/src/cmd/calc/help/RCS/digits,v $ ## ## Under source code control: 1995/10/03 10:40:01 diff --git a/version.c b/version.c index 179ba19..6dd47ad 100644 --- a/version.c +++ b/version.c @@ -19,8 +19,8 @@ * received a copy with calc; if not, write to Free Software Foundation, Inc. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * @(#) $Revision: 29.43 $ - * @(#) $Id: version.c,v 29.43 2003/01/14 04:10:16 chongo Exp $ + * @(#) $Revision: 29.42 $ + * @(#) $Id: version.c,v 29.42 2003/01/14 01:51:46 chongo Exp $ * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $ * * Under source code control: 1990/05/22 11:00:58 @@ -46,7 +46,7 @@ static char *program; #define MAJOR_VER 2 /* major version */ #define MINOR_VER 11 /* minor version */ #define MAJOR_PATCH 6 /* patch level or 0 if no patch */ -#define MINOR_PATCH 2 /* test number or 0 if no minor patch */ +#define MINOR_PATCH 1 /* test number or 0 if no minor patch */ /*