Upload all version 7.80 files

Author: CruiserOne

Makefile

@@ -1,7 +1,7 @@
-# Astrolog (Version 7.70) File: Makefile (Unix version)
+# Astrolog (Version 7.80) File: Makefile (Unix version)
 #
 # IMPORTANT NOTICE: Astrolog and all chart display routines and anything
-# not enumerated elsewhere in this program are Copyright (C) 1991-2024 by
+# not enumerated elsewhere in this program are Copyright (C) 1991-2025 by
 # Walter D. Pullen (Astara@msn.com, http://www.astrolog.org/astrolog.htm).
 # Permission is granted to freely use, modify, and distribute these
 # routines provided these credits and notices remain unmodified with any

astexo.csv

@@ -1,4 +1,4 @@
-@AD770  ; Astrolog 7.70 default settings file astrolog.as
+@AD780  ; Astrolog 7.80 default settings file astrolog.as
 
 ; The contents of this file can be automatically generated with the
 ; "File / Save Program Settings" menu command, or with the -od command switch.
@@ -22,26 +22,32 @@ _c3     ; 3D house boundaries       ["=c3" is 3D houses, "_c3" is 2D   ]
 _k      ; Ansi color text           ["=k" is color, "_k" is monochrome ]
 :d 48   ; Searching divisions       [Change "48" to desired divisions  ]
 _b0     ; Print zodiac seconds      ["_b0" to minute, "=b0" to second  ]
+_b1     ; Print zodiac milliseconds ["_b1" to second, "=b1" to millisec]
 =b      ; Use ephemeris files       ["=b" uses them, "_b" doesn't      ]
 =0b     ; Disable old calculations  ["=0b" disables them, "_0b" allows ]
+_v0     ; Show average velocities   ["=v0" average, "_v0" does absolute]
+=v3 0   ; Wheel subdivision type    [Change "0" to desired subdivision ]
 :w 0    ; Wheel chart text rows     [Change "0" to desired wheel rows  ]
 :I 80   ; Text screen columns       [Change "80" to desired columns    ]
 -YQ 0   ; Text screen scroll limit  [Change "24" or set to "0" for none]
 _sr0    ; Latitudes or declinations ["_sr0" shows lat., "=sr0" declin. ]
+:gs 0   ; Aspect orb type           ["0" +/-, "1" app/sep, "2" wax/wan ]
 _Ys     ; Use plane of solar system ["_Ys" is ecliptic, "=Ys" is solar ]
 _Yn     ; Which Nodes and Lilith    ["_Yn" shows mean, "=Yn" shows true]
 =Yu0    ; Show eclipse information  ["=Yu0" shows, "_Yu0" doesn't show ]
-_Yr     ; Show rounded positions    ["=Yr" rounds, "_Yr" doesn't       ]
 _Yd     ; European date format      ["_Yd" is M/D/Y, "=Yd" is D-M-Y    ]
 _Yt     ; European time format      ["_Yt" is AM/PM, "=Yt" is 24 hour  ]
 _Yv     ; European length units     ["_Yv" is imperial, "=Yv" is metric]
+_Yr     ; Show rounded positions    ["=Yr" rounds, "_Yr" doesn't       ]
 =YC     ; Smart cusp displays       ["=YC" is smart, "_YC" is normal   ]
 =YO     ; Smart copy and printing   ["=YO" does it smart, "_YO" doesn't]
 =Y8     ; Clip text to end of line  ["=Y8" clips, "_Y8" doesn't clip   ]
 -Ya0    ; Input character encoding  [0-3 is Default, IBM, Latin-1, UTF8]
+_Yz1    ; Combine DST and time zone ["=Yz1" combines, "_Yz1" doesn't   ]
 -YP 0   ; Arabic part formula       ["1" is fixed, "0" checks if night ]
 =0n     ; Internet Web queries      ["=0n" disables them, "_0n" allows ]
 
+-Yw 0.0       ; Stationary movement threshold  [0.0 is never "S"]
 :pd 365.24219 ; Progression degrees per day    [365 is secondary]
 :pC 1.0       ; Progressed cusp movement ratio [1.0 is quotidian]
 
@@ -59,7 +65,8 @@ _Yv     ; European length units     ["_Yv" is imperial, "=Yv" is metric]
 ; 22-33: Asc 2nd 3rd Nad 5th 6th Des 8th 9th MC 11th 12th
 ; 34-42: Vul Cup Had Zeu Kro Apo Adm Vulk Pos
 ; 43-51: Hyg Pho Eri Hau Mak Gon Qua Sed Orc
-; 52-83: Planetary moons
+; 52-78: Planetary moons
+; 79-83: Planetary centers of body
 ; 84-133: Fixed stars
 
 -YR 0 10     1 0 0 0 0 0 0 0 0 0 0    ; Planets
@@ -68,7 +75,7 @@ _Yv     ; European length units     ["_Yv" is imperial, "=Yv" is metric]
 -YR 34 42    1 1 1 1 1 1 1 1 1        ; Uranians
 -YR 43 51    1 1 1 1 1 1 1 1 1        ; Dwarfs
 -YR 52 78    1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1  ; Moons
--YR 79 83    1 1 1 1 1                ; Centers of Body
+-YR 79 83    1 1 1 1 1                ; Centers of body
 -YR 84 108   1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1  ; Fixed stars
 -YR 109 133  1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1  ; Fixed stars
 
@@ -88,7 +95,7 @@ _Yv     ; European length units     ["_Yv" is imperial, "=Yv" is metric]
 -YR1 1 1  ; Restrict latitude direction changes, distance direction changes
 -YR2 1 1  ; Restrict latitude zero node crossings, distance equivalence
 
--YR7 0 1 1 0 1  ; Restrict rulerships: std, esoteric, hierarch, exalt, ray
+-YR7 0 1 1 0 1  ; Restrict rulerships: std, esoteric, hierarch, exalt, Ray
 -YRZ 0 0 0 0    ; Restrict angle events: rising, zenith, setting, nadir
 
 
@@ -226,14 +233,18 @@ _Xr              ; Reverse background ["_Xr" is black, "=Xr" is white     ]
 :XS 100          ; Graphics text scale [100-400]
 =XQ              ; Square charts ["=XQ" forces square, "_XQ" allows rectangle]
 =Xu              ; Chart border  ["=Xu" shows border, "_Xu" doesn't show     ]
-:Xv 1            ; Wheel fill    ["0" for none, "1" for standard, "2" rainbow]
 _Xx              ; Thicker lines ["=Xx" is thicker, "_Xx" is thinner         ]
+_Xx0             ; Antialiasing  ["=Xx0" is antialiased lines, "_Xx0" is not ]
+_XA              ; Glyphed lines ["=XA" glyphs on aspect lines, "_XA" doesn't]
+_XL              ; Show cities   ["=XL" shows them in charts, "_XL" doesn't  ]
+=Xv0             ; Show sidebar  ["=Xv0" shows on right edge, "_Xv0" doesn't ]
+:Xv 1            ; Wheel fill    ["0" for none, "1" for standard, "2" rainbow]
 :Xbw             ; Bitmap file type   ["Xbw" is Windows .bmp, "Xbn" is X11   ]
 :YXG 111221      ; Glyphs for [Capricorn, Uranus, Pluto, Lilith, Vertex, Eris]
 :YXg 0           ; Aspect grid cells  ["0" for autodetect  ]
 :YXS 0.0         ; Orbit radius in AU ["0.0" for autodetect]
 :YXj 0           ; Orbit trail count
-:YX7 600         ; Esoteric ray column influence width
+:YX7 600         ; Esoteric Ray column influence width
 :YXf 000000      ; Fonts to use [text, signs, houses, planets, aspects, naks.]
 :YXp 0           ; PostScript paper orientation ["-1" portrait, "1" landscape]
 :YXp0 8.5in 11in ; PostScript paper X and Y sizes

astrolog.as

@@ -1,8 +1,8 @@
 /*
-** Astrolog (Version 7.70) File: astrolog.cpp
+** Astrolog (Version 7.80) File: astrolog.cpp
 **
 ** IMPORTANT NOTICE: Astrolog and all chart display routines and anything
-** not enumerated below used in this program are Copyright (C) 1991-2024 by
+** not enumerated below used in this program are Copyright (C) 1991-2025 by
 ** Walter D. Pullen (Astara@msn.com, http://www.astrolog.org/astrolog.htm).
 ** Permission is granted to freely use, modify, and distribute these
 ** routines provided these credits and notices remain unmodified with any
@@ -48,7 +48,7 @@
 ** Initial programming 8/28-30/1991.
 ** X Window graphics initially programmed 10/23-29/1991.
 ** PostScript graphics initially programmed 11/29-30/1992.
-** Last code change made 4/22/2024.
+** Last code change made 6/19/2025.
 */
 
 #include "astrolog.h"
@@ -527,6 +527,16 @@ int NProcessSwitchesRare(int argc, char **argv, int pos,
     SwitchF(us.fRound);
     break;
 
+  case 'w':
+    if (FErrorArgc("Yw", argc, 1))
+      return tcError;
+    r = RFromSz(argv[1]);
+    if (FErrorValR("Yw", r < 0.0, r, 0))
+      return tcError;
+    us.rStation = r;
+    darg++;
+    break;
+
   case 'C':
     SwitchF(us.fSmartCusp);
     break;
@@ -606,6 +616,9 @@ int NProcessSwitchesRare(int argc, char **argv, int pos,
     if (ch1 == '0' && fAnd) {
       us.rDeltaT = rInvalid;
       break;
+    } else if (ch1 == '1') {
+      SwitchF(us.fOffsetOnly);
+      break;
     }
     if (FErrorArgc("Yz", argc, 1))
       return tcError;
@@ -689,7 +702,7 @@ int NProcessSwitchesRare(int argc, char **argv, int pos,
     if (j > 0)
       ch1 = ch2;
     k = (j == 2 ? NParseSz(argv[2], pmObject) : NFromSz(argv[2]));
-    if (FErrorValN("Ye", k <= 0 && j < 4, k, 2))
+    if (FErrorValN("Ye", k < (int)(j != 2) && j < 4, k, 2))
       return tcError;
     rgObjSwiss[i] = k;
     rgTypSwiss[i] = j;
@@ -787,24 +800,10 @@ int NProcessSwitchesRare(int argc, char **argv, int pos,
       darg++;
       break;
     } else if (ch1 == 'o') {
-      CopyRgb(ignore,  ignoreMem,  sizeof(ignore));
-      CopyRgb(ignore2, ignore2Mem, sizeof(ignore2));
-      CopyRgb(ignorea, ignoreaMem, sizeof(ignorea));
-      CopyRgb(ignorez, ignorezMem, sizeof(ignorez));
-      CopyRgb(ignore7, ignore7Mem, sizeof(ignore7));
-      ignorefMem[0] = us.fIgnoreSign;   ignorefMem[1] = us.fIgnoreDir;
-      ignorefMem[2] = us.fIgnoreDiralt; ignorefMem[3] = us.fIgnoreDirlen;
-      ignorefMem[4] = us.fIgnoreAlt0;   ignorefMem[5] = us.fIgnoreDisequ;
+      InitRestrictions(fTrue);
       break;
     } else if (ch1 == 'i') {
-      CopyRgb(ignoreMem,  ignore,  sizeof(ignore));
-      CopyRgb(ignore2Mem, ignore2, sizeof(ignore2));
-      CopyRgb(ignoreaMem, ignorea, sizeof(ignorea));
-      CopyRgb(ignorezMem, ignorez, sizeof(ignorez));
-      CopyRgb(ignore7Mem, ignore7, sizeof(ignore7));
-      us.fIgnoreSign   = ignorefMem[0]; us.fIgnoreDir    = ignorefMem[1];
-      us.fIgnoreDiralt = ignorefMem[2]; us.fIgnoreDirlen = ignorefMem[3];
-      us.fIgnoreAlt0   = ignorefMem[4]; us.fIgnoreDisequ = ignorefMem[5];
+      InitRestrictions(fFalse);
       AdjustRestrictions();
       break;
     }
@@ -1325,9 +1324,10 @@ flag FProcessSwitches(int argc, char **argv)
     // Switches which determine the type of chart to display:
 
     case 'v':
-      if (ch1 == '0')
+      if (ch1 == '0') {
         SwitchF(us.fVelocity);
-      else if (ch1 == '3') {
+        break;
+      } else if (ch1 == '3') {
         SwitchF(us.fListDecan);
         if (argc > 1 && ((i = NFromSz(argv[1])) > 0 || FNumCh(argv[1][0]) ||
           argv[1][0] == '~')) {
@@ -1361,14 +1361,23 @@ flag FProcessSwitches(int argc, char **argv)
         SwitchF(us.fGridConfig);
       else if (ch1 == 'm' || ch2 == 'm')
         SwitchF(us.fGridMidpoint);
-      if (ch1 == 'a')
-        us.nAppSep = FSwitchF(us.nAppSep);
-      else if (ch1 == 'x')
-        us.nAppSep = FSwitchF(us.nAppSep) * 2;
-      else if (ch1 == 'p')
+      if (ch1 == 'p')
         SwitchF(us.fParallel);
       else if (ch1 == 'd')
         SwitchF(us.fDistance);
+      else if (ch1 == 'a')
+        us.nAppSep = FSwitchF(us.nAppSep);
+      else if (ch1 == 'x')
+        us.nAppSep = FSwitchF(us.nAppSep) * 2;
+      else if (ch1 == 's') {
+        if (FErrorArgc("gs", argc, 1))
+          return fFalse;
+        i = NFromSz(argv[1]);
+        if (FErrorValN("gs", !FValidAppSep(i), i, 0))
+          return fFalse;
+        us.nAppSep = i;
+        argc--; argv++;
+      }
 #ifdef X11
       else if (ch1 == 'e') {
         if (FErrorArgc("geometry", argc, 1))
@@ -1395,18 +1404,26 @@ flag FProcessSwitches(int argc, char **argv)
         SwitchF(us.fAspSummary);
         ch1 = ch2;
       }
-      if (ch1 == 'a') {
-        us.nAppSep = FSwitchF(us.nAppSep);
-        ch1 = ch2;
-      } else if (ch1 == 'x') {
-        us.nAppSep = FSwitchF(us.nAppSep) * 2;
-        ch1 = ch2;
-      } else if (ch1 == 'p') {
+      if (ch1 == 'p') {
         SwitchF(us.fParallel);
         ch1 = ch2;
       } else if (ch1 == 'd') {
         SwitchF(us.fDistance);
         ch1 = ch2;
+      } else if (ch1 == 'a') {
+        us.nAppSep = FSwitchF(us.nAppSep);
+        ch1 = ch2;
+      } else if (ch1 == 'x') {
+        us.nAppSep = FSwitchF(us.nAppSep) * 2;
+        ch1 = ch2;
+      } else if (ch1 == 's') {
+        if (FErrorArgc("as", argc, 1))
+          return fFalse;
+        i = NFromSz(argv[1]);
+        if (FErrorValN("as", !FValidAppSep(i), i, 0))
+          return fFalse;
+        us.nAppSep = i;
+        argc--; argv++;
       }
       switch (ch1) {
       case 'j': us.nAspectSort = asj; break;
@@ -1594,8 +1611,8 @@ flag FProcessSwitches(int argc, char **argv)
       if (j) {
         ch1 = argv[1][0];
         if (ch1) {
-          us.nEphemRate =
-            ch1 == 'h' ? -1 : (ch1 == 'm' ? 1 : (ch1 == 'y' ? 2 : 0));
+          us.nEphemRate = (ch1 == 'n' ? -2 : (ch1 == 'h' ? -1 :
+            (ch1 == 'm' ? 1 : (ch1 == 'y' ? 2 : 0))));
           i = NFromSz(&argv[1][1]);
           us.nEphemFactor = Max(i, 1);
         }
@@ -2060,6 +2077,10 @@ flag FProcessSwitches(int argc, char **argv)
       break;
 
     case 'i':
+      if (ch1 == 'x') {
+        SwapTemp(ciCore, ciTwin, ci);
+        break;
+      }
       if (us.fNoRead) {
         ErrorArgv("i");
         return tcError;
@@ -2079,6 +2100,7 @@ flag FProcessSwitches(int argc, char **argv)
       if (FBetween(ch1, '1', '0' + cRing)) {
         *rgpci[ch1 - '0'] = ciCore;
         ciCore = ci;
+        *rgpcp[ch1 - '0'] = cp0;
       } else if (ch1 == 'D') {
         ciDefa = ciCore;
         ciCore = ci;
@@ -2320,7 +2342,9 @@ flag FProcessSwitches(int argc, char **argv)
     case 'b':
       if (ch1 == '0') {
         SwitchF(us.fSeconds);
-        is.fSeconds = us.fSeconds;
+        break;
+      } else if (ch1 == '1') {
+        SwitchF(us.fSecond1K);
         break;
       } else if (ch1 == 'j')
         us.nSwissEph = FSwitchF(us.nSwissEph == 2) * 2;
@@ -2645,10 +2669,12 @@ flag FProcessSwitches(int argc, char **argv)
       ciCore = ciTwin;
       if (!FInputData(argv[2]))
         return fFalse;
+      cp2 = cp0;
       ciTwin = ciCore;
       ciCore = ci;
       if (!FInputData(argv[1]))
         return fFalse;
+      cp1 = cp0;
       if (i > 2) {
         us.nRatio1 = NFromSz(argv[3]);
         us.nRatio2 = NFromSz(argv[4]);
@@ -2926,6 +2952,33 @@ flag FProcessSwitches(int argc, char **argv)
 ******************************************************************************
 */
 
+// Store or recall the current state of restrictions, as done with the -YRo
+// and -YRi switches.
+
+void InitRestrictions(flag fStore)
+{
+  if (fStore) {
+    CopyRgb(ignore,  ignoreMem,  sizeof(ignore));
+    CopyRgb(ignore2, ignore2Mem, sizeof(ignore2));
+    CopyRgb(ignorea, ignoreaMem, sizeof(ignorea));
+    CopyRgb(ignorez, ignorezMem, sizeof(ignorez));
+    CopyRgb(ignore7, ignore7Mem, sizeof(ignore7));
+    ignorefMem[0] = us.fIgnoreSign;   ignorefMem[1] = us.fIgnoreDir;
+    ignorefMem[2] = us.fIgnoreDiralt; ignorefMem[3] = us.fIgnoreDirlen;
+    ignorefMem[4] = us.fIgnoreAlt0;   ignorefMem[5] = us.fIgnoreDisequ;
+  } else {
+    CopyRgb(ignoreMem,  ignore,  sizeof(ignore));
+    CopyRgb(ignore2Mem, ignore2, sizeof(ignore2));
+    CopyRgb(ignoreaMem, ignorea, sizeof(ignorea));
+    CopyRgb(ignorezMem, ignorez, sizeof(ignorez));
+    CopyRgb(ignore7Mem, ignore7, sizeof(ignore7));
+    us.fIgnoreSign   = ignorefMem[0]; us.fIgnoreDir    = ignorefMem[1];
+    us.fIgnoreDiralt = ignorefMem[2]; us.fIgnoreDirlen = ignorefMem[3];
+    us.fIgnoreAlt0   = ignorefMem[4]; us.fIgnoreDisequ = ignorefMem[5];
+  }
+}
+
+
 // Initialize program variables and tables that aren't done so at compile
 // time. Called once when the program starts from main() or WinMain().
 
@@ -2940,14 +2993,7 @@ void InitProgram()
   SetCI(ciDefa, MM, DD, YY, TT, 0, DEFAULT_ZONE, DEFAULT_LONG, DEFAULT_LAT);
   is.S = stdout;
   ClearB((pbyte)szStarCustom, sizeof(szStarCustom));
-  CopyRgb(ignore,  ignoreMem,  sizeof(ignore));
-  CopyRgb(ignore2, ignore2Mem, sizeof(ignore2));
-  CopyRgb(ignorea, ignoreaMem, sizeof(ignorea));
-  CopyRgb(ignorez, ignorezMem, sizeof(ignorez));
-  CopyRgb(ignore7, ignore7Mem, sizeof(ignore7));
-  ignorefMem[0] = us.fIgnoreSign;   ignorefMem[1] = us.fIgnoreDir;
-  ignorefMem[2] = us.fIgnoreDiralt; ignorefMem[3] = us.fIgnoreDirlen;
-  ignorefMem[4] = us.fIgnoreAlt0;   ignorefMem[5] = us.fIgnoreDisequ;
+  InitRestrictions(fTrue);
   for (i = 0; i < objMax; i++) {
     szObjDisp[i] = szObjName[i];
     rgobjList[i] = i;
@@ -3179,6 +3225,7 @@ void FinalizeProgram(flag fSkip)
   DeallocatePIf(gi.bmpWorld.rgb);
   DeallocatePIf(gi.bmpRising.rgb);
   DeallocatePIf(gi.rgspace);
+  DeallocatePIf(gi.rgConstel);
   DeallocatePIf(gi.szFileOut);
   DeallocatePIf(gs.szSidebar);
   for (i = 0; i <= cRing; i++)
@@ -3199,6 +3246,7 @@ void FinalizeProgram(flag fSkip)
   DeallocatePIf(gi.rges);
   DeallocatePIf(gs.szStarsLin);
   DeallocatePIf(gs.szStarsLnk);
+  DeallocatePIf(is.rgesSort);
 #endif
 #endif // GRAPH
 #ifdef X11