sweph 2.10.3-4 → 2.10.3-6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sweph",
-	"version": "2.10.3-4",
+	"version": "2.10.3-6",
 	"description": "The definitive Swiss Ephemeris bindings for Node.js",
 	"keywords": [
 		"sweph",
@@ -21,9 +21,9 @@
 	"license": "(AGPL-3.0-or-later OR LGPL-3.0-or-later)",
 	"author": "Timotej Valentin Rojko",
 	"exports": {
+		"types": "./index.d.ts",
 		"require": "./index.js",
-		"import": "./index.mjs",
-		"types": "./index.d.ts"
+		"import": "./index.mjs"
 	},
 	"main": "index.js",
 	"types": "./index.d.ts",
@@ -32,6 +32,7 @@
 		"./index.mjs",
 		"./index.d.ts",
 		"./constants.js",
+		"./prebuilds",
 		"./binding.gyp",
 		"./swisseph",
 		"./src/functions",
@@ -40,13 +41,16 @@
 	],
 	"scripts": {
 		"preinstall": "node -e \"const { readdirSync, readFileSync, writeFileSync } = require('fs'); const file = readdirSync('./src/functions').map((x,i) => readFileSync('./src/functions/' + x, 'utf8').replace(/args/g, 'args' + i).replace('#include <sweph.h>', '')).reduce((a,b) => a + b, '#include <sweph.h>'); writeFileSync('./src/functions.cpp', file, 'utf8');\"",
-		"install": "node-gyp rebuild && npm run test",
-		"test": "node -e \"const s = require('./'); const c = s.calc(2222222,0,4); console.log('OK')\""
+		"rebuild": "node-gyp rebuild && npm run test",
+		"test": "node -e \"const s = require('./'); const c = s.calc(2222222,0,4); console.log('OK')\"",
+		"install": "node-gyp-build && npm run test",
+		"prebuild": "prebuildify --napi --strip"
 	},
 	"dependencies": {
-		"node-addon-api": "*"
+		"node-addon-api": "^8.9.0",
+		"node-gyp-build": "^4.8.4"
 	},
 	"devDependencies": {
-		"eslint": "^8.44.0"
+		"prebuildify": "^6.0.1"
 	}
 }

package/src/functions/deg_midp.cpp

@@ -0,0 +1,19 @@
+#include <sweph.h>
+
+constexpr std::pair<int, const char*> args[] = {
+	{ 2, "Expecting 2 arguments: deg1, deg2" },
+	{ NUMBER, "Argument 1 should be a number - first point in degrees" },
+	{ NUMBER, "Argument 2 should be a number - second point in degrees" }
+};
+
+Napi::Value sweph_deg_midp(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	if(!sweph_type_check(args, info)) {
+		return env.Null();
+	}
+	double mid = swe_deg_midp(
+		info[0].As<Napi::Number>().DoubleValue(),
+		info[1].As<Napi::Number>().DoubleValue()
+	);
+	return Napi::Number::New(env, mid);
+}

package/src/functions/difrad2n.cpp

@@ -0,0 +1,19 @@
+#include <sweph.h>
+
+constexpr std::pair<int, const char*> args[] = {
+	{ 2, "Expecting 2 arguments: rad, rad" },
+	{ NUMBER, "Argument 1 should be a number - radians" },
+	{ NUMBER, "Argument 2 should be a number - radians" }
+};
+
+Napi::Value sweph_difrad2n(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	if(!sweph_type_check(args, info)) {
+		return env.Null();
+	}
+	double dif = swe_difrad2n(
+		info[0].As<Napi::Number>().DoubleValue(),
+		info[1].As<Napi::Number>().DoubleValue()
+	);
+	return Napi::Number::New(env, dif);
+}

package/src/functions/rad_midp.cpp

@@ -0,0 +1,19 @@
+#include <sweph.h>
+
+constexpr std::pair<int, const char*> args[] = {
+	{ 2, "Expecting 2 arguments: rad1, rad2" },
+	{ NUMBER, "Argument 1 should be a number - first point in radians" },
+	{ NUMBER, "Argument 2 should be a number - second point in radians" }
+};
+
+Napi::Value sweph_rad_midp(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	if(!sweph_type_check(args, info)) {
+		return env.Null();
+	}
+	double mid = swe_rad_midp(
+		info[0].As<Napi::Number>().DoubleValue(),
+		info[1].As<Napi::Number>().DoubleValue()
+	);
+	return Napi::Number::New(env, mid);
+}

package/src/functions/set_lapse_rate.cpp

@@ -0,0 +1,14 @@
+#include <sweph.h>
+
+constexpr std::pair<int, const char*> args[] = {
+	{ 1, "Expecting 1 arguments: lapse_rate" },
+	{ NUMBER, "Argument 1 should be a number - lapse rate [°K/m]" }
+};
+
+void sweph_set_lapse_rate(const Napi::CallbackInfo& info) {
+	if(!sweph_type_check(args, info)) {
+		return;
+	}
+	swe_set_lapse_rate(info[0].As<Napi::Number>().DoubleValue());
+	return;
+}

package/src/sweph.cpp

@@ -5,6 +5,7 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
 	exports["set_delta_t_userdef"] = Napi::Function::New(env, sweph_set_delta_t_userdef);
 	exports["set_ephe_path"] = Napi::Function::New(env, sweph_set_ephe_path);
 	exports["set_jpl_file"] = Napi::Function::New(env, sweph_set_jpl_file);
+	exports["set_lapse_rate"] = Napi::Function::New(env, sweph_set_lapse_rate);
 	exports["set_sid_mode"] = Napi::Function::New(env, sweph_set_sid_mode);
 	exports["set_tid_acc"] = Napi::Function::New(env, sweph_set_tid_acc);
 	exports["set_topo"] = Napi::Function::New(env, sweph_set_topo);
@@ -84,6 +85,9 @@ Napi::Object Init(Napi::Env env, Napi::Object exports) {
 	exports["difdegn"] = Napi::Function::New(env, sweph_difdegn);
 	exports["difcs2n"] = Napi::Function::New(env, sweph_difcs2n);
 	exports["difdeg2n"] = Napi::Function::New(env, sweph_difdeg2n);
+	exports["difrad2n"] = Napi::Function::New(env, sweph_difrad2n);
+	exports["deg_midp"] = Napi::Function::New(env, sweph_deg_midp);
+	exports["rad_midp"] = Napi::Function::New(env, sweph_rad_midp);
 	exports["csroundsec"] = Napi::Function::New(env, sweph_csroundsec);
 	exports["d2l"] = Napi::Function::New(env, sweph_d2l);
 	exports["day_of_week"] = Napi::Function::New(env, sweph_day_of_week);

package/src/sweph.h

@@ -9,6 +9,7 @@ void sweph_close(const Napi::CallbackInfo& info);
 void sweph_set_delta_t_userdef(const Napi::CallbackInfo& info);
 void sweph_set_ephe_path(const Napi::CallbackInfo& info);
 void sweph_set_jpl_file(const Napi::CallbackInfo& info);
+void sweph_set_lapse_rate(const Napi::CallbackInfo& info);
 void sweph_set_sid_mode(const Napi::CallbackInfo& info);
 void sweph_set_tid_acc(const Napi::CallbackInfo& info);
 void sweph_set_topo(const Napi::CallbackInfo& info);
@@ -88,6 +89,9 @@ Napi::Value sweph_difcsn(const Napi::CallbackInfo& info);
 Napi::Value sweph_difcs2n(const Napi::CallbackInfo& info);
 Napi::Value sweph_difdegn(const Napi::CallbackInfo& info);
 Napi::Value sweph_difdeg2n(const Napi::CallbackInfo& info);
+Napi::Value sweph_difrad2n(const Napi::CallbackInfo& info);
+Napi::Value sweph_deg_midp(const Napi::CallbackInfo& info);
+Napi::Value sweph_rad_midp(const Napi::CallbackInfo& info);
 Napi::Value sweph_csroundsec(const Napi::CallbackInfo& info);
 Napi::Value sweph_d2l(const Napi::CallbackInfo& info);
 Napi::Value sweph_day_of_week(const Napi::CallbackInfo& info);
@@ -116,4 +120,4 @@ enum TYPES {
 	TRUEFALSE
 };
 
-#endif 
+#endif 

package/swisseph/swecl.c

@@ -771,7 +771,7 @@ iter_where:
   } else {
     if (serr != NULL)
       sprintf(serr, "no solar eclipse at tjd = %f", tjd);
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 2; i++)
       geopos[i] = 0;
     *dcore = 0;
     retc = 0;
@@ -1991,7 +1991,7 @@ end_search_global:
  *              SE_ECL_VISIBLE, 
  *              SE_ECL_MAX_VISIBLE, 
  *              SE_ECL_1ST_VISIBLE, SE_ECL_2ND_VISIBLE
- *              SE_ECL_3ST_VISIBLE, SE_ECL_4ND_VISIBLE
+ *              SE_ECL_3RD_VISIBLE, SE_ECL_4TH_VISIBLE
  *
  * tret[0]	time of maximum eclipse
  * tret[1]	time of first contact
@@ -2048,7 +2048,7 @@ int32 CALL_CONV swe_sol_eclipse_when_loc(double tjd_start, int32 ifl,
  *              SE_ECL_VISIBLE, 
  *              SE_ECL_MAX_VISIBLE, 
  *              SE_ECL_1ST_VISIBLE, SE_ECL_2ND_VISIBLE
- *              SE_ECL_3ST_VISIBLE, SE_ECL_4ND_VISIBLE
+ *              SE_ECL_3RD_VISIBLE, SE_ECL_4TH_VISIBLE
  *              SE_ECL_OCC_BEG_DAYLIGHT, SE_ECL_OCC_END_DAYLIGHT
  * The latter two indicate that the beginning or end of the occultation takes
  * place during the day. If Venus is occulted, it may be observable with the
@@ -2103,7 +2103,7 @@ static int32 eclipse_when_loc(double tjd_start, int32 ifl, double *geopos, doubl
   int32 retflag = 0, retc;
   double t, tjd, dt, dtint, K, T, T2, T3, T4, F, M, Mm;
   double tjdr, tjds;
-  double E, Ff, A1, Om;
+  double E, Ff; // A1, Om;
   double xs[6], xm[6], ls[6], lm[6], x1[6], x2[6], dm, ds;
   double rmoon, rsun, rsplusrm, rsminusrm;
   double dc[3], dctr, dctrmin;
@@ -2149,16 +2149,14 @@ next_try:
                       + 0.1017438 * T2
                       + 0.00001239 * T3
                       + 0.000000058 * T4);
-  Om = swe_degnorm(124.7746 - 1.56375580 * K
-                      + 0.0020691 * T2
-                      + 0.00000215 * T3);
+  // Om = swe_degnorm(124.7746 - 1.56375580 * K + 0.0020691 * T2 + 0.00000215 * T3);
   E = 1 - 0.002516 * T - 0.0000074 * T2;
-  A1 = swe_degnorm(299.77 + 0.107408 * K - 0.009173 * T2);
+  // A1 = swe_degnorm(299.77 + 0.107408 * K - 0.009173 * T2);
   M *= DEGTORAD;
   Mm *= DEGTORAD;
   F *= DEGTORAD;
-  Om *= DEGTORAD;
-  A1 *= DEGTORAD;
+  // Om *= DEGTORAD;
+  // A1 *= DEGTORAD;
   tjd = tjd - 0.4075 * sin(Mm)
             + 0.1721 * E * sin(M);
   swe_set_topo(geopos[0], geopos[1], geopos[2]);
@@ -4213,7 +4211,6 @@ static int32 rise_set_fast(
   int i;
   double xx[6], xaz[6], xaz2[6];
   double dd, dt, refr;
-  double dtsum = 0;
   int32 iflag = epheflag & (SEFLG_JPLEPH|SEFLG_SWIEPH|SEFLG_MOSEPH); 
   int32 iflagtopo = iflag | SEFLG_EQUATORIAL;
   double sda, armc, md, dmd, mdrise, rdi, tr, dalt;
@@ -4307,9 +4304,11 @@ run_rise_again:
     dd = (xaz2[1] - xaz[1]);
     dalt = xaz[1] + rdi;
     dt = dalt / dd / 1000.0;
-    if (dt > 0.1) dt = 0.1;
-    else if (dt < -0.1) dt = -0.1;
-    dtsum += dt;
+    if (dt > 0.1) {
+      dt = 0.1;
+    } else if (dt < -0.1) {
+      dt = -0.1;
+    }
     if ((0) && fabs(dt) > 5.0 / 86400.0 && nloop < 20)
       nloop++;
     tr -= dt;
@@ -4403,8 +4402,8 @@ int32 CALL_CONV swe_rise_trans_true_hor(
   double t, te, tt, dt, twohrs = 1.0 / 12.0;
   double curdist;
   int32 tohor_flag = SE_EQU2HOR;
-int nazalt = 0;
-int ncalc = 0;
+  int nazalt = 0;
+  int ncalc = 0;
   AS_BOOL do_fixstar = (starname != NULL && *starname != '\0');
   if (geopos[2] < SEI_ECL_GEOALT_MIN || geopos[2] > SEI_ECL_GEOALT_MAX) {
     if (serr != NULL)
@@ -4676,8 +4675,8 @@ nazalt++;
     }
     if (t > tjd_ut) {
      *tret = t;
-//  fprintf(stderr, "nazalt=%d\n", nazalt);
-//  fprintf(stderr, "ncalc=%d\n", ncalc);
+    if (0)  fprintf(stderr, "nazalt=%d\n", nazalt);
+    if (0)  fprintf(stderr, "ncalc=%d\n", ncalc);
      return OK;
     }
   }
@@ -5782,7 +5781,7 @@ int32 CALL_CONV swe_get_orbital_elements(
   int32 iflJ2000 = (iflag & SEFLG_EPHMASK)|SEFLG_J2000|SEFLG_XYZ|SEFLG_TRUEPOS|SEFLG_NONUT|SEFLG_SPEED;
   int32 iflJ2000p = (iflag & SEFLG_EPHMASK)|SEFLG_J2000|SEFLG_TRUEPOS|SEFLG_NONUT|SEFLG_SPEED;
   double Gmsm;
-  int32 iflg0 = 0;
+  // int32 iflg0 = 0;
   double fac, sgn, rxy, rxyz, c2, cosnode, sinnode;
   double incl, node, parg, peri, mlon;
   double csid, ctro, csyn, dmot, pa;
@@ -5795,8 +5794,7 @@ int32 CALL_CONV swe_get_orbital_elements(
       sprintf(serr, "error in swe_get_orbital_elements(): object %d not valid\n", ipl);
     return ERR;
   }
-  if (ipl != SE_MOON)
-    iflg0 |= SEFLG_HELCTR;
+  // if (ipl != SE_MOON) iflg0 |= SEFLG_HELCTR;
   /* first, we need a heliocentric distance of the planet */
   if (swe_calc(tjd_et, ipl, iflJ2000p, x, serr) == ERR)
     return ERR;

package/swisseph/swehel.c

@@ -3164,8 +3164,8 @@ static int32 heliacal_ut_vis_lim(double tjd_start, double *dgeo, double *datm, d
 {
   int i;
   double d, darr[10], direct = 1, tjd, tday;
-  int32 epheflag, retval = OK, helflag2;
-  int32 iflag, ipl;
+  int32 retval = OK, helflag2;
+  int32 ipl;
   int32 TypeEvent = TypeEventIn;
   char serr[AS_MAXCH];
   for (i = 0; i < 10; i++)
@@ -3173,10 +3173,6 @@ static int32 heliacal_ut_vis_lim(double tjd_start, double *dgeo, double *datm, d
   *dret = tjd_start;
   *serr = '\0';
   ipl = DeterObject(ObjectName);
-  epheflag = helflag & (SEFLG_JPLEPH|SEFLG_SWIEPH|SEFLG_MOSEPH);
-  iflag = SEFLG_TOPOCTR | SEFLG_EQUATORIAL | epheflag;
-  if (!(helflag & SE_HELFLAG_HIGH_PRECISION)) 
-    iflag |= SEFLG_NONUT | SEFLG_TRUEPOS;
   if (ipl == SE_MERCURY)
     tjd = tjd_start - 30;
   else
@@ -3255,8 +3251,7 @@ static int32 moon_event_vis_lim(double tjdstart, double *dgeo, double *datm, dou
   double tjd, trise;
   char serr[AS_MAXCH];
   char ObjectName[30];
-  int32 iflag, ipl, retval, helflag2, direct;
-  int32 epheflag = helflag & (SEFLG_JPLEPH|SEFLG_SWIEPH|SEFLG_MOSEPH);
+  int32 ipl, retval, helflag2, direct;
   dret[0] = tjdstart; /* will be returned in error case */
   if (TypeEvent == 1 || TypeEvent == 2) {
     if (serr_ret != NULL)
@@ -3265,9 +3260,6 @@ static int32 moon_event_vis_lim(double tjdstart, double *dgeo, double *datm, dou
   }
   strcpy(ObjectName, "moon");
   ipl = SE_MOON;
-  iflag = SEFLG_TOPOCTR | SEFLG_EQUATORIAL | epheflag;
-  if (!(helflag & SE_HELFLAG_HIGH_PRECISION))
-    iflag |= SEFLG_NONUT|SEFLG_TRUEPOS;
   helflag2 = helflag;
   helflag2 &= ~SE_HELFLAG_HIGH_PRECISION;
   /* check Synodic/phase Period */
@@ -3392,7 +3384,7 @@ static int32 heliacal_ut(double JDNDaysUTStart, double *dgeo, double *datm, doub
 */
 int32 CALL_CONV swe_heliacal_ut(double JDNDaysUTStart, double *dgeo, double *datm, double *dobs, char *ObjectNameIn, int32 TypeEvent, int32 helflag, double *dret, char *serr_ret)
 {
-  int32 retval, Planet, itry;
+  int32 retval, Planet;
   char ObjectName[AS_MAXCH], serr[AS_MAXCH], s[AS_MAXCH];
   double tjd0 = JDNDaysUTStart, tjd, dsynperiod, tjdmax, tadd;
   int32 MaxCountSynodicPeriod = MAX_COUNT_SYNPER;
@@ -3490,11 +3482,8 @@ int32 CALL_CONV swe_heliacal_ut(double JDNDaysUTStart, double *dgeo, double *dat
   /* 
    * this is the outer loop over n synodic periods 
    */
-  tjd = tjd0;
   retval = -2;  /* indicates that another synodic period has to be done */
-  for (itry = 0; 
-       tjd < tjdmax && retval == -2; 
-       itry++, tjd += tadd) {
+  for (tjd = tjd0; tjd < tjdmax && retval == -2; tjd += tadd) {
     *serr = '\0';
     retval = heliacal_ut(tjd, dgeo, datm, dobs, ObjectName, TypeEvent, helflag, dret, serr);
     /* if resulting event date < start date for search (tjd0): retry starting

package/swisseph/swehouse.c

@@ -967,7 +967,9 @@ static int CalcH(
   } /*  if */
   hsp->mc = swe_degnorm(hsp->mc);
   if (hsp->do_speed) hsp->mc_speed = AscDash(th, 0, sine, cose); 
-  /* ascendant */
+  // ascendant
+  // In case of ascendant, the great circle is the horizon, which has pole height latitude.
+  // intersection equator horizon is at th + 90, reactasce 90° east of meridian.
   hsp->ac = Asc1(th + 90, fi, sine, cose);
   if (hsp->do_speed) 
     hsp->ac_speed = AscDash(th + 90, fi, sine, cose);
@@ -2049,7 +2051,7 @@ porphyry:
 
 /*****
  * oblique triangle formed by: great circle with pole height f, ecliptic and equator,
- * x = intersection equator - great circle.
+ * x = intersection equator - great circle, measured along equator.
  * return crossing of ecliptic with great circle.
  * Prepare quadrants before doing the work in Asc2.
  */
@@ -2091,7 +2093,8 @@ static double Asc1(double x1, double f, double sine, double cose)
  * f in range -90 .. +90
  * sine, cose around e=23°
  * oblique triangle formed by: great circle with pole height f, ecliptic and equator,
- * x = intersection equator - great circle.
+ * In case of ascendant, the great circle is the horizon, which has pole height latitude.
+ * x = intersection equator - great circle, measured along equator.
  * return crossing of ecliptic with great circle.
  */
 static double Asc2(double x, double f, double sine, double cose) 

package/swisseph/swejpl.c

@@ -81,6 +81,12 @@
   typedef off_t off_t64;
   #define FSEEK fseeko
   #define FTELL ftello
+//  #ifdef __ANDROID_API__ 
+//    #undef FSEEK
+//    #undef FTELL
+//    #define FSEEK fseek
+//    #define FTELL ftell
+//  #endif
 #endif
 
 #define DEBUG_DO_SHOW	FALSE
@@ -945,7 +951,7 @@ int swi_open_jpl_file(double *ss, char *fname, char *fpath, char *serr)
   return retc;
 }
 
-int32 swi_get_jpl_denum()
+int32 swi_get_jpl_denum(void)
 {
   return js->eh_denum;
 }

package/swisseph/swemmoon.c

@@ -1179,7 +1179,7 @@ moonpol[1] *= a;
 moonpol[2] *= a;
 }
 #else
-static void moon1()
+static void moon1(void)
 {
 double a;
 /* This code added by Bhanu Pinnamaneni, 17-aug-2009 */
@@ -1364,7 +1364,7 @@ moonpol[2] *= a;
 }
 #endif	/* MOSH_MOON_200 */
 
-static void moon2()
+static void moon2(void)
 {
 /* terms in T^0 */
 g = STR*(2*(Ea-Ju+D)-MP+648431.172);
@@ -1441,7 +1441,7 @@ g = STR*(SWELP - 2.0*D + 2.5);
 B +=  0.29855 * sin(g);
 }
 
-static void moon3()
+static void moon3(void)
 {
 /* terms in T^0 */
 moonpol[0] = 0.0;
@@ -1455,7 +1455,7 @@ moonpol[2] = 1.0e-4 * moonpol[2] + 385000.52899; /* kilometers */
 
 /* Compute final ecliptic polar coordinates
  */
-static void moon4()
+static void moon4(void)
 {
 moonpol[2] /= AUNIT / 1000;
 moonpol[0] = STR * mods3600( moonpol[0] );
@@ -1760,7 +1760,7 @@ void swi_mean_lunar_elements(double tjd,
   *peri = swe_degnorm(*peri - dcor);
 }
 
-static void mean_elements()
+static void mean_elements(void)
 {
 double fracT = fmod(T, 1);
 /* Mean anomaly of sun = l' (J. Laskar) */
@@ -1817,7 +1817,7 @@ SWELP += ((z[11]*T + z[10])*T + z[9])*T2;
  */
 }
 
-void mean_elements_pl() 
+void mean_elements_pl(void)
 {
 /* Mean longitudes of planets (Laskar, Bretagnon) */
 Ve = mods3600( 210664136.4335482 * T + 655127.283046 );

package/swisseph/sweodef.h

@@ -139,12 +139,6 @@
 # define WATCOMC
 #endif
 
-#ifdef __MWERKS__	/* defined on Macintosh CodeWarrior */
-# if macintosh && powerc
-#  define MACOS MY_TRUE		/* let it undefined otherwise */
-#  define MSDOS MY_FALSE	/* in case one above fired falsely */
-# endif
-#endif
 
 #ifdef MSDOS
 #  define HPUNIX MY_FALSE
@@ -154,17 +148,12 @@
 #  endif
 # define UNIX_FS MY_FALSE
 #else
-# ifdef MACOS
-#  define HPUNIX MY_FALSE
-#  define UNIX_FS MY_FALSE
-# else
 #  define MSDOS MY_FALSE
 #  define HPUNIX MY_TRUE
 #  ifndef _HPUX_SOURCE
 #    define _HPUX_SOURCE
 #  endif
 #  define UNIX_FS MY_TRUE
-# endif
 #endif
 
 #include <math.h>
@@ -321,13 +310,6 @@ typedef int32    centisec;       /* centiseconds used for angles and times */
 #  define BFILE_A_ACCESS "a+b"	/* create/open binary file for append*/
 #  define PATH_SEPARATOR ";"	/* semicolon as PATH separator */
 #  define OPEN_MODE 0666	/* default file creation mode */
-# ifdef MACOS
-#  define FILE_R_ACCESS "r"	/* open text file for reading */
-#  define FILE_RW_ACCESS "r+"	/* open text file for writing and reading */
-#  define FILE_W_CREATE "w"	/* create/open text file for write*/
-#  define FILE_A_ACCESS "a+"	/* create/open text file for append*/
-#  define DIR_GLUE ":"		/* glue string for directory/file */
-# else
 #  define FILE_R_ACCESS "rt"	/* open text file for reading */
 #  define FILE_RW_ACCESS "r+t"	/* open text file for writing and reading */
 #  define FILE_W_CREATE "wt"	/* create/open text file for write*/
@@ -335,7 +317,6 @@ typedef int32    centisec;       /* centiseconds used for angles and times */
 /* attention, all backslashes for msdos directry names must be written as \\,
    because it is the C escape character */
 #  define DIR_GLUE "\\"		/* glue string for directory/file */
-# endif
 #endif
 
 #include <string.h>

package/swisseph/sweph.c

@@ -1316,6 +1316,7 @@ void CALL_CONV swe_set_ephe_path(const char *path)
 {
   int i, iflag;
   char s[AS_MAXCH];
+  char serr[AS_MAXCH];
   char *sp;
   double xx[6];
   /* close all open files and delete all planetary data */
@@ -1343,7 +1344,7 @@ void CALL_CONV swe_set_ephe_path(const char *path)
    * tidal acceleration of the Moon */
   iflag = SEFLG_SWIEPH|SEFLG_J2000|SEFLG_TRUEPOS|SEFLG_ICRS;
   swed.last_epheflag = 2;
-  swe_calc(J2000, SE_MOON, iflag, xx, NULL);
+  swe_calc(J2000, SE_MOON, iflag, xx, serr);
   if (swed.fidat[SEI_FILE_MOON].fptr != NULL) {
     swi_set_tid_acc(0, 0, swed.fidat[SEI_FILE_MOON].sweph_denum, NULL);
   } 
@@ -6210,7 +6211,7 @@ static int CMP_CALL_CONV fstar_node_compare(const void *node1, const void *node2
 int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata, char *serr)
 {
   int i;
-  char s[AS_MAXCH];
+  char s[AS_MAXCH + 20];
   char *sde_d;
   char *cpos[20];
   double epoch, radv, parall, mag;
@@ -6256,6 +6257,7 @@ int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata,
   de_pm = atof(cpos[10]);
   radv = atof(cpos[11]);
   parall = atof(cpos[12]);
+  if (parall < 0) parall = -parall;	// to fix bug like old Rasalgheti
   mag = atof(cpos[13]);
   /****************************************
    * position and speed (equinox)
@@ -6322,7 +6324,7 @@ int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata,
 static int32 load_all_fixed_stars(char *serr) 
 {
   int32 retc = OK;
-  int nstars = 0, line = 0, fline = 0, nrecs = 0, nnamed = 0;
+  int nstars = 0, nrecs = 0, nnamed = 0;
   char s[AS_MAXCH], *sp;
   char srecord[AS_MAXCH];
   struct fixed_star fstdata;
@@ -6344,13 +6346,11 @@ static int32 load_all_fixed_stars(char *serr)
   rewind(swed.fixfp);
   swed.fixed_stars = NULL;
   while (fgets(s, AS_MAXCH, swed.fixfp) != NULL) {
-    fline++;	
     // skip comment lines
     if (*s == '#') continue;
     if (*s == '\n') continue;
     if (*s == '\r') continue;
     if (*s == '\0') continue;
-    line++;
     strcpy(srecord, s);
     retc = fixstar_cut_string(srecord, NULL, &fstdata, serr);
     if (retc == ERR) return ERR;
@@ -6388,7 +6388,7 @@ static int32 load_all_fixed_stars(char *serr)
   swed.n_fixstars_real = nstars;
   swed.n_fixstars_named = nnamed;
   swed.n_fixstars_records = nrecs;
-  //printf("nstars=%d, nrecords=%d\n", nstars, nrecs);
+  // fprintf(stderr, "nstars=%d, nrecords=%d\n", nstars, nrecs);	
   (void) qsort ((void *) swed.fixed_stars, (size_t) nrecs, sizeof (struct fixed_star),
                     (int (CMP_CALL_CONV *)(const void *,const void *))(fixedstar_name_compare));
   return retc;
@@ -7266,7 +7266,7 @@ void CALL_CONV swe_set_topo(double geolon, double geolat, double geoalt)
   swi_force_app_pos_etc();
 }
 
-void swi_force_app_pos_etc()
+void swi_force_app_pos_etc(void)
 {
   int i;
   for (i = 0; i < SEI_NPLANETS; i++)

package/swisseph/sweph.h

@@ -445,14 +445,14 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 /*************************/
 /* 8: J.N. Bhasin; (David Cochrane) 
      We don't have any sources or detailed information about this ayanamsha. */
-{J1900, 360 - 338.634444, FALSE, -1}, // Bhasin
+{J1900, 360 - 338.634444, FALSE, -1}, // 8: Bhasin
 /*************************/
 /* 14 Sept. 2018: the following three ayanamshas have been wrong for
    many years */
 /* 9 - 11: Babylonian, Kugler */
-{1684532.5, -5.66667, TRUE, -1},     /*  9: Babylonian, Kugler 1 */
-{1684532.5, -4.26667, TRUE, -1},     /* 10: Babylonian, Kugler 2 */
-{1684532.5, -3.41667, TRUE, -1},     /* 11: Babylonian, Kugler 3 */
+{1684532.5, -5.66667, TRUE, -1},     //  9: Babylonian, Kugler 1
+{1684532.5, -4.26667, TRUE, -1},     // 10: Babylonian, Kugler 2
+{1684532.5, -3.41667, TRUE, -1},     // 11: Babylonian, Kugler 3 
 /*************************/
 /* 12: Babylonian, Huber 
       P. Huber, "Über den Nullpunkt der babylonischen Ekliptik", in: Centaurus
@@ -464,7 +464,7 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 {1673941, -5.079167, TRUE, -1},      // 13: Babylonian, Mercier
 /*************************/
 /* 14: t0 is defined by Aldebaran at 15 Taurus in year -100 */
-{1684532.5, -4.44138598, TRUE, 0},  
+{1684532.5, -4.44138598, TRUE, 0},  // 14: Babylonian/Aldebaran = 15 Tau
 /*************************/
 /* 15: Hipparchos */
 {1674484.0, -9.33333, TRUE, -1},       // 15: Hipparchos
@@ -476,34 +476,34 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 {0, 0, FALSE, 0},                    // 17: Galactic Center at 0 Sagittarius 
 /*************************/
 /* 18: J2000 */
-{J2000, 0, FALSE, 0},	             /* 18: J2000 */
+{J2000, 0, FALSE, 0},	             // 18: J2000
 /*************************/
 /* 19: J1900 */
-{J1900, 0, FALSE, 0},	             /* 19: J1900 */
+{J1900, 0, FALSE, 0},	             // 19: J1900
 /*************************/
 /* 20: B1950 */
-{B1950, 0, FALSE, 0},	             /* 20: B1950 */
+{B1950, 0, FALSE, 0},	             // 20: B1950
 /*************************/
 /* 21: Suryasiddhanta, assuming ingress of mean Sun into Aries at point of mean
       equinox of date on 21.3.499, near noon, Ujjain (75.7684565 E) 
       = 7:30:31.57 UT = 12:33:36 LMT*/
-{1903396.8128654, 0, TRUE, 0},	     // 21: 
+{1903396.8128654, 0, TRUE, 0},	     // 21: Suryasiddhanta
 /*************************/
 /* 22: Suryasiddhanta, assuming ingress of mean Sun into Aries at true position
       of mean Sun at same epoch */
-{1903396.8128654,-0.21463395, TRUE, 0}, // 22: 
+{1903396.8128654,-0.21463395, TRUE, 0}, // 22: Suryasiddhanta, mean Sun
 /*************************/
 /* 23: Aryabhata, same date, but UT 6:56:55.57 analogous to 21 */
-{1903396.7895321, 0, TRUE, 0},	     // 23: 
+{1903396.7895321, 0, TRUE, 0},	     // 23: Aryabhata
 /*************************/
 /* 24: Aryabhata, analogous 22 */
-{1903396.7895321,-0.23763238, TRUE, 0}, // 24: 
+{1903396.7895321,-0.23763238, TRUE, 0}, // 24: Aryabhata, mean Sun
 /*************************/
 /* 25: Suryasiddhanta, Revati/zePsc at polar long. 359°50'*/
-{1903396.8128654,-0.79167046, TRUE, 0}, // 25: 
+{1903396.8128654,-0.79167046, TRUE, 0}, // 25: SS Revati
 /*************************/
 /* 26: Suryasiddhanta, Citra/Spica at polar long. 180° */
-{1903396.8128654, 2.11070444, TRUE, 0}, // 26: 
+{1903396.8128654, 2.11070444, TRUE, 0}, // 26: SS Citra
 /*************************/
 /* 27: True Citra (Spica exactly at 0 Libra) */
 {0, 0, FALSE, 0},	             // 27: True Citra