Release calc version 2.12.4.0

This commit is contained in:
Landon Curt Noll
2013-05-19 15:55:00 -07:00
parent c9fce6a5bb
commit 7cf611bca8
16 changed files with 117 additions and 1035 deletions

View File

@@ -17,8 +17,8 @@
* received a copy with calc; if not, write to Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* @(#) $Revision: 30.2 $
* @(#) $Id: deg.cal,v 30.2 2010/09/02 06:01:14 chongo Exp $
* @(#) $Revision: 30.1 $
* @(#) $Id: deg.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
* @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/deg.cal,v $
*
* Under source code control: 1990/02/15 01:50:33
@@ -28,9 +28,9 @@
*/
obj deg {deg, min, sec};
obj dms {deg, min, sec};
define deg(deg, min, sec)
define dms(deg, min, sec)
{
local ans;
@@ -38,18 +38,18 @@ define deg(deg, min, sec)
sec = 0;
if (isnull(min))
min = 0;
obj deg ans;
obj dms ans;
ans.deg = deg;
ans.min = min;
ans.sec = sec;
fixdeg(ans);
fixdms(ans);
return ans;
}
define deg_add(a, b)
define dms_add(a, b)
{
local obj deg ans;
local obj dms ans;
ans.deg = 0;
ans.min = 0;
@@ -66,14 +66,14 @@ define deg_add(a, b)
ans.sec += b.sec;
} else
ans.deg += b;
fixdeg(ans);
fixdms(ans);
return ans;
}
define deg_neg(a)
define dms_neg(a)
{
local obj deg ans;
local obj dms ans;
ans.deg = -a.deg;
ans.min = -a.min;
@@ -82,15 +82,15 @@ define deg_neg(a)
}
define deg_sub(a, b)
define dms_sub(a, b)
{
return a - b;
}
define deg_mul(a, b)
define dms_mul(a, b)
{
local obj deg ans;
local obj dms ans;
if (istype(a, ans) && istype(b, ans))
quit "Cannot multiply degrees together";
@@ -103,24 +103,24 @@ define deg_mul(a, b)
ans.min = b.min * a;
ans.sec = b.sec * a;
}
fixdeg(ans);
fixdms(ans);
return ans;
}
define deg_print(a)
define dms_print(a)
{
print a.deg : 'd' : a.min : 'm' : a.sec : 's' :;
}
define deg_abs(a)
define dms_abs(a)
{
return a.deg + a.min / 60 + a.sec / 3600;
}
define fixdeg(a)
define fixdms(a)
{
a.min += frac(a.deg) * 60;
a.deg = int(a.deg);
@@ -134,5 +134,5 @@ define fixdeg(a)
}
if (config("resource_debug") & 3) {
print "obj deg {deg, min, sec} defined";
print "obj dms {deg, min, sec} defined";
}