sweph 2.10.3-4 → 2.10.3-5

package/README.md

@@ -38,6 +38,9 @@ This library is version locked to the Swiss Ephemeris in addition to its own rev
 
 Updates to this library will be released under new revisions, while updates to Swiss Ephemeris will be released under matching SemVer versions.
 
+**Current Version: 2.10.3-b-1**  
+**Equivalent to Swiss Ephemeris version: 2.10.03b revision 1**
+
 ## Documentation
 
 This library is fully typed and documented via intellisense. To access its documentation simply hover over its functions in your favorite code editor:

package/binding.gyp

@@ -14,7 +14,8 @@
 				"swisseph"
 			],
 			"defines": [
-				"NAPI_DISABLE_CPP_EXCEPTIONS"
+				"NAPI_DISABLE_CPP_EXCEPTIONS",
+				'NAPI_VERSION=6'
 			]
 		},
 		{

package/index.js

@@ -1,7 +1,16 @@
-"use strict";
-
-const sweph = require("./build/Release/sweph.node");
-sweph.constants = require("./constants.js");
-sweph.sweph = sweph;
-sweph.default = sweph;
-module.exports = sweph;
+/// <reference path="index.d.ts"/>
+"use strict";
+
+/** @type {Omit<import("sweph"), "constants" | "sweph" | "default">} */
+// @ts-ignore
+const s = require("node-gyp-build")(__dirname);
+const c = require("./constants.js");
+
+const sweph = {
+    ...s,
+    constants: c,
+    sweph: s,
+    default: s
+}
+
+module.exports = sweph;

package/index.mjs

@@ -1,109 +1,116 @@
 import { createRequire } from "module";
+import { fileURLToPath } from "url";
 import c from "./constants.js";
 
+const __dirname = fileURLToPath(new URL(".", import.meta.url));
 const require = createRequire(import.meta.url);
-export const sweph = require("./build/Release/sweph.node");
 
-sweph.constants = c;
-sweph.sweph = sweph;
-sweph.default = sweph;
+/** @type {Omit<import("sweph"), "constants" | "sweph" | "default">} */
+const s = require("node-gyp-build")(__dirname);
+
+export const sweph = {
+    ...s,
+    constants: c,
+    sweph: s,
+    default: s
+}
 
 export default sweph;
-export const constants = sweph.constants;
-export const close = sweph.close;
-export const set_delta_t_userdef = sweph.set_delta_t_userdef;
-export const set_ephe_path = sweph.set_ephe_path;
-export const set_jpl_file = sweph.set_jpl_file;
-export const set_sid_mode = sweph.set_sid_mode;
-export const set_tid_acc = sweph.set_tid_acc;
-export const set_topo = sweph.set_topo;
-export const version = sweph.version;
-export const get_library_path = sweph.get_library_path;
-export const get_tid_acc = sweph.get_tid_acc;
-export const get_planet_name = sweph.get_planet_name;
-export const get_current_file_data = sweph.get_current_file_data;
-export const get_orbital_elements = sweph.get_orbital_elements;
-export const get_ayanamsa_name = sweph.get_ayanamsa_name;
-export const get_ayanamsa_ex_ut = sweph.get_ayanamsa_ex_ut;
-export const get_ayanamsa_ex = sweph.get_ayanamsa_ex;
-export const get_ayanamsa_ut = sweph.get_ayanamsa_ut;
-export const get_ayanamsa = sweph.get_ayanamsa;
-export const calc = sweph.calc;
-export const calc_ut = sweph.calc_ut;
-export const calc_pctr = sweph.calc_pctr;
-export const fixstar = sweph.fixstar;
-export const fixstar_ut = sweph.fixstar_ut;
-export const fixstar_mag = sweph.fixstar_mag;
-export const fixstar2 = sweph.fixstar2;
-export const fixstar2_ut = sweph.fixstar2_ut;
-export const fixstar2_mag = sweph.fixstar2_mag;
-export const nod_aps = sweph.nod_aps;
-export const nod_aps_ut = sweph.nod_aps_ut;
-export const orbit_max_min_true_distance = sweph.orbit_max_min_true_distance;
-export const sol_eclipse_when_loc = sweph.sol_eclipse_when_loc;
-export const sol_eclipse_when_glob = sweph.sol_eclipse_when_glob;
-export const sol_eclipse_how = sweph.sol_eclipse_how;
-export const sol_eclipse_where = sweph.sol_eclipse_where;
-export const lun_occult_when_loc = sweph.lun_occult_when_loc;
-export const lun_occult_when_glob = sweph.lun_occult_when_glob;
-export const lun_occult_where = sweph.lun_occult_where;
-export const lun_eclipse_when_loc = sweph.lun_eclipse_when_loc;
-export const lun_eclipse_when = sweph.lun_eclipse_when;
-export const lun_eclipse_how = sweph.lun_eclipse_how;
-export const rise_trans = sweph.rise_trans;
-export const rise_trans_true_hor = sweph.rise_trans_true_hor;
-export const pheno = sweph.pheno;
-export const pheno_ut = sweph.pheno_ut;
-export const azalt = sweph.azalt;
-export const azalt_rev = sweph.azalt_rev;
-export const refrac = sweph.refrac;
-export const refrac_extended = sweph.refrac_extended;
-export const heliacal_ut = sweph.heliacal_ut;
-export const vis_limit_mag = sweph.vis_limit_mag;
-export const heliacal_pheno_ut = sweph.heliacal_pheno_ut;
-export const julday = sweph.julday;
-export const date_conversion = sweph.date_conversion;
-export const revjul = sweph.revjul;
-export const utc_time_zone = sweph.utc_time_zone;
-export const utc_to_jd = sweph.utc_to_jd;
-export const jdet_to_utc = sweph.jdet_to_utc;
-export const jdut1_to_utc = sweph.jdut1_to_utc;
-export const time_equ = sweph.time_equ;
-export const lmt_to_lat = sweph.lmt_to_lat;
-export const lat_to_lmt = sweph.lat_to_lmt;
-export const deltat = sweph.deltat;
-export const deltat_ex = sweph.deltat_ex;
-export const house_name = sweph.house_name;
-export const houses = sweph.houses;
-export const houses_armc = sweph.houses_armc;
-export const houses_armc_ex2 = sweph.houses_armc_ex2;
-export const houses_ex = sweph.houses_ex;
-export const houses_ex2 = sweph.houses_ex2;
-export const house_pos = sweph.house_pos;
-export const gauquelin_sector = sweph.gauquelin_sector;
-export const sidtime = sweph.sidtime;
-export const sidtime0 = sweph.sidtime0;
-export const cotrans = sweph.cotrans;
-export const cotrans_sp = sweph.cotrans_sp;
-export const degnorm = sweph.degnorm;
-export const radnorm = sweph.radnorm;
-export const split_deg = sweph.split_deg;
-export const csnorm = sweph.csnorm;
-export const difcsn = sweph.difcsn;
-export const difdegn = sweph.difdegn;
-export const difcs2n = sweph.difcs2n;
-export const difdeg2n = sweph.difdeg2n;
-export const csroundsec = sweph.csroundsec;
-export const d2l = sweph.d2l;
-export const day_of_week = sweph.day_of_week;
-export const cs2timestr = sweph.cs2timestr;
-export const cs2lonlatstr = sweph.cs2lonlatstr;
-export const cs2degstr = sweph.cs2degstr;
-export const solcross = sweph.solcross;
-export const solcross_ut = sweph.solcross_ut;
-export const mooncross = sweph.mooncross;
-export const mooncross_ut = sweph.mooncross_ut;
-export const mooncross_node = sweph.mooncross_node;
-export const mooncross_node_ut = sweph.mooncross_node_ut;
-export const helio_cross = sweph.helio_cross;
-export const helio_cross_ut = sweph.helio_cross_ut;
+export const constants = c;
+export const close = s.close;
+export const set_delta_t_userdef = s.set_delta_t_userdef;
+export const set_ephe_path = s.set_ephe_path;
+export const set_jpl_file = s.set_jpl_file;
+export const set_sid_mode = s.set_sid_mode;
+export const set_tid_acc = s.set_tid_acc;
+export const set_topo = s.set_topo;
+export const version = s.version;
+export const get_library_path = s.get_library_path;
+export const get_tid_acc = s.get_tid_acc;
+export const get_planet_name = s.get_planet_name;
+export const get_current_file_data = s.get_current_file_data;
+export const get_orbital_elements = s.get_orbital_elements;
+export const get_ayanamsa_name = s.get_ayanamsa_name;
+export const get_ayanamsa_ex_ut = s.get_ayanamsa_ex_ut;
+export const get_ayanamsa_ex = s.get_ayanamsa_ex;
+export const get_ayanamsa_ut = s.get_ayanamsa_ut;
+export const get_ayanamsa = s.get_ayanamsa;
+export const calc = s.calc;
+export const calc_ut = s.calc_ut;
+export const calc_pctr = s.calc_pctr;
+export const fixstar = s.fixstar;
+export const fixstar_ut = s.fixstar_ut;
+export const fixstar_mag = s.fixstar_mag;
+export const fixstar2 = s.fixstar2;
+export const fixstar2_ut = s.fixstar2_ut;
+export const fixstar2_mag = s.fixstar2_mag;
+export const nod_aps = s.nod_aps;
+export const nod_aps_ut = s.nod_aps_ut;
+export const orbit_max_min_true_distance = s.orbit_max_min_true_distance;
+export const sol_eclipse_when_loc = s.sol_eclipse_when_loc;
+export const sol_eclipse_when_glob = s.sol_eclipse_when_glob;
+export const sol_eclipse_how = s.sol_eclipse_how;
+export const sol_eclipse_where = s.sol_eclipse_where;
+export const lun_occult_when_loc = s.lun_occult_when_loc;
+export const lun_occult_when_glob = s.lun_occult_when_glob;
+export const lun_occult_where = s.lun_occult_where;
+export const lun_eclipse_when_loc = s.lun_eclipse_when_loc;
+export const lun_eclipse_when = s.lun_eclipse_when;
+export const lun_eclipse_how = s.lun_eclipse_how;
+export const rise_trans = s.rise_trans;
+export const rise_trans_true_hor = s.rise_trans_true_hor;
+export const pheno = s.pheno;
+export const pheno_ut = s.pheno_ut;
+export const azalt = s.azalt;
+export const azalt_rev = s.azalt_rev;
+export const refrac = s.refrac;
+export const refrac_extended = s.refrac_extended;
+export const heliacal_ut = s.heliacal_ut;
+export const vis_limit_mag = s.vis_limit_mag;
+export const heliacal_pheno_ut = s.heliacal_pheno_ut;
+export const julday = s.julday;
+export const date_conversion = s.date_conversion;
+export const revjul = s.revjul;
+export const utc_time_zone = s.utc_time_zone;
+export const utc_to_jd = s.utc_to_jd;
+export const jdet_to_utc = s.jdet_to_utc;
+export const jdut1_to_utc = s.jdut1_to_utc;
+export const time_equ = s.time_equ;
+export const lmt_to_lat = s.lmt_to_lat;
+export const lat_to_lmt = s.lat_to_lmt;
+export const deltat = s.deltat;
+export const deltat_ex = s.deltat_ex;
+export const house_name = s.house_name;
+export const houses = s.houses;
+export const houses_armc = s.houses_armc;
+export const houses_armc_ex2 = s.houses_armc_ex2;
+export const houses_ex = s.houses_ex;
+export const houses_ex2 = s.houses_ex2;
+export const house_pos = s.house_pos;
+export const gauquelin_sector = s.gauquelin_sector;
+export const sidtime = s.sidtime;
+export const sidtime0 = s.sidtime0;
+export const cotrans = s.cotrans;
+export const cotrans_sp = s.cotrans_sp;
+export const degnorm = s.degnorm;
+export const radnorm = s.radnorm;
+export const split_deg = s.split_deg;
+export const csnorm = s.csnorm;
+export const difcsn = s.difcsn;
+export const difdegn = s.difdegn;
+export const difcs2n = s.difcs2n;
+export const difdeg2n = s.difdeg2n;
+export const csroundsec = s.csroundsec;
+export const d2l = s.d2l;
+export const day_of_week = s.day_of_week;
+export const cs2timestr = s.cs2timestr;
+export const cs2lonlatstr = s.cs2lonlatstr;
+export const cs2degstr = s.cs2degstr;
+export const solcross = s.solcross;
+export const solcross_ut = s.solcross_ut;
+export const mooncross = s.mooncross;
+export const mooncross_ut = s.mooncross_ut;
+export const mooncross_node = s.mooncross_node;
+export const mooncross_node_ut = s.mooncross_node_ut;
+export const helio_cross = s.helio_cross;
+export const helio_cross_ut = s.helio_cross_ut;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sweph",
-	"version": "2.10.3-4",
+	"version": "2.10.3-5",
 	"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.7.0",
+		"node-gyp-build": "^4.8.4"
 	},
 	"devDependencies": {
-		"eslint": "^8.44.0"
+		"prebuildify": "^6.0.1"
 	}
 }

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 

package/swisseph/swephexp.h

@@ -400,15 +400,10 @@ extern "C" {
 #if MSDOS
 #  define SE_EPHE_PATH    "\\sweph\\ephe\\"
 #else
-# ifdef MACOS
-#  define SE_EPHE_PATH	":ephe:"
-# else
 #  define SE_EPHE_PATH    ".:/users/ephe2/:/users/ephe/"
-			/* At Astrodienst, we maintain two ephemeris areas for
-			   the thousands of asteroid files: 
-			   the short files in /users/ephe/ast*,
-			   the long file in /users/ephe2/ast*. */
-# endif
+    /* At Astrodienst, we maintain two ephemeris areas for the 600'000+  asteroid files: 
+       the short files in /users/ephe/ast*, the long file in /users/ephe2/ast*.
+       /users  is a synonym for /home on many systems */
 #endif
 #endif  /* SE_EPHE_PATH */
 

package/swisseph/swephlib.c

@@ -3151,7 +3151,7 @@ static double adjust_for_tidacc(double ans, double Y, double tid_acc, double tid
 }
 
 /* returns tidal acceleration used in swe_deltat() and swe_deltat_ex() */
-double CALL_CONV swe_get_tid_acc()
+double CALL_CONV swe_get_tid_acc(void)
 {
   return swed.tid_acc;
 }
@@ -3183,7 +3183,7 @@ void CALL_CONV swe_set_delta_t_userdef(double dt)
   }
 }
 
-int32 swi_guess_ephe_flag()
+int32 swi_guess_ephe_flag(void)
 {
   int32 iflag = SEFLG_SWIEPH;
   /* if jpl file is open, assume SEFLG_JPLEPH */
@@ -3933,9 +3933,9 @@ char *CALL_CONV swe_cs2degstr(CSEC t, char *a)
  * for definition of input see function swe_split_deg().
  * output:
  * ideg 	degrees, 
- * imin 	minutes, 
- * isec 	seconds, 
- * dsecfr	fraction of seconds 
+ * imin 	minutes, (zero if rounding to degree)
+ * isec 	seconds, (zero if rounding to minute)
+ * dsecfr	fraction of seconds (zero if rounding used) 
  * inak	nakshatra number; 
  ******************************************************************/
 static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32 *imin, int32 *isec, double *dsecfr, int32 *inak)
@@ -3977,8 +3977,12 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
   if (!(roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN | SE_SPLIT_DEG_ROUND_SEC))) {
     *dsecfr = ddeg * 3600 - *isec;
   } else {
-    *dsecfr = *isec;  // is rounded, no fractional seconds
+    *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg_nakshtra */
 
 /************************************************************
@@ -4003,8 +4007,8 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
 				       * to 10d59'59" (or 10d59' or 10d) * 
  * output:
  *  ideg 	degrees, 
- *  imin 	minutes, 
- *  isec 	seconds, 
+ *  imin 	minutes, (zero if rounding to degree)
+ *  isec 	seconds, (zero if rounding to minute or degree)
  *  dsecfr	fraction of seconds (zero if rounding used) 
  *  isgn	zodiac sign number; 
  *              or +/- sign
@@ -4052,6 +4056,10 @@ void CALL_CONV swe_split_deg(double ddeg, int32 roundflag, int32 *ideg, int32 *i
   } else {
     *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg */
 
 double swi_kepler(double E, double M, double ecce)