Upload all version 7.40 files

CruiserOne · Apr 1, 2022 · 95fd050 · 95fd050
1 parent 809ec59
commit 95fd050
Show file tree

Hide file tree

Showing 41 changed files with 10,105 additions and 4,846 deletions.
diff --git a/Astrolog.vcproj b/Astrolog.vcproj
@@ -59,7 +59,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="shlwapi.lib"
+				AdditionalOptions="shlwapi.lib urlmon.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="shlwapi.lib"
+				AdditionalOptions="shlwapi.lib urlmon.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"

diff --git a/Astrolog.vcxproj b/Astrolog.vcxproj
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CEF86845-ADDB-4E8D-8586-2BDFB2F31698}</ProjectGuid>
+    <RootNamespace>Astrolog</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>16.0.29124.152</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>.\</OutDir>
+    <IntDir>.\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>.\</OutDir>
+    <IntDir>.\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>shlwapi.lib urlmon.lib %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EntryPointSymbol />
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalOptions>shlwapi.lib urlmon.lib %(AdditionalOptions)</AdditionalOptions>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <EntryPointSymbol />
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="astrolog.h" />
+    <ClInclude Include="extern.h" />
+    <ClInclude Include="placalc.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="swehouse.h" />
+    <ClInclude Include="swejpl.h" />
+    <ClInclude Include="swenut2a.h" />
+    <ClInclude Include="sweodef.h" />
+    <ClInclude Include="sweph.h" />
+    <ClInclude Include="swephexp.h" />
+    <ClInclude Include="swephlib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="astrlog1.ico" />
+    <Image Include="astrlog2.ico" />
+    <Image Include="astrlog3.ico" />
+    <Image Include="astrlog4.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="astrolog.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="astrolog.cpp" />
+    <ClCompile Include="atlas.cpp" />
+    <ClCompile Include="calc.cpp" />
+    <ClCompile Include="charts0.cpp" />
+    <ClCompile Include="charts1.cpp" />
+    <ClCompile Include="charts2.cpp" />
+    <ClCompile Include="charts3.cpp" />
+    <ClCompile Include="data.cpp" />
+    <ClCompile Include="express.cpp" />
+    <ClCompile Include="general.cpp" />
+    <ClCompile Include="intrpret.cpp" />
+    <ClCompile Include="io.cpp" />
+    <ClCompile Include="matrix.cpp" />
+    <ClCompile Include="placalc.cpp" />
+    <ClCompile Include="placalc2.cpp" />
+    <ClCompile Include="swecl.cpp" />
+    <ClCompile Include="swedate.cpp" />
+    <ClCompile Include="swehouse.cpp" />
+    <ClCompile Include="swejpl.cpp" />
+    <ClCompile Include="swemmoon.cpp" />
+    <ClCompile Include="swemplan.cpp" />
+    <ClCompile Include="sweph.cpp" />
+    <ClCompile Include="swephlib.cpp" />
+    <ClCompile Include="wdialog.cpp" />
+    <ClCompile Include="wdriver.cpp" />
+    <ClCompile Include="xcharts0.cpp" />
+    <ClCompile Include="xcharts1.cpp" />
+    <ClCompile Include="xcharts2.cpp" />
+    <ClCompile Include="xdata.cpp" />
+    <ClCompile Include="xdevice.cpp" />
+    <ClCompile Include="xgeneral.cpp" />
+    <ClCompile Include="xscreen.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-# Astrolog (Version 7.30) File: Makefile (Unix version)
+# Astrolog (Version 7.40) File: Makefile (Unix version)
 #
 # IMPORTANT NOTICE: Astrolog and all chart display routines and anything
-# not enumerated elsewhere in this program are Copyright (C) 1991-2020 by
+# not enumerated elsewhere in this program are Copyright (C) 1991-2022 by
 # Walter D. Pullen ([email protected], 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

diff --git a/astrolog.as b/astrolog.as
@@ -1,16 +1,19 @@
-@AD730  ; Astrolog 7.30 default settings file astrolog.as
+@AD740  ; Astrolog 7.40 default settings file astrolog.as
+
+; The contents of this file can be automatically generated with the
+; "File / Save Settings" menu command, or with the -od command switch.
 
 -z 8:00W                ; Default time zone     [hours W or E of UTC   ]
 -z0 Autodetect          ; Default Daylight time [0 standard, 1 daylight]
--zl 122W19:59 47N36:35  ; Default location      [longitude and latitude]
+-zl 122W19'59 47N36'35  ; Default location      [longitude and latitude]
 -zv 167ft               ; Default elevation     [in feet or meters     ]
 -zj "Current moment now" "Seattle, WA, USA" ; Default name and location
 
 -Yz 0   ; Time minute addition to be used if "now" charts are offset.
 ;-n      ; Comment out this line to not start with chart for "now".
 
-_s      ; Zodiac selection          ["_s" is tropical, "=s" is sidereal]
-:s 0.0  ; Zodiac offset value       [Change "0.0" to desired ayanamsa  ]
+_s      ; Which zodiac to use       ["_s" is tropical, "=s" is sidereal]
+:s 0.0  ; Sidereal zodiac offset    [Change "0.0" to desired ayanamsa  ]
 :sz     ; Zodiac display format     ["z" is sign, "d" is 0-360 deg, etc]
 -A 5    ; Number of aspects         [Change "5" to desired number      ]
 -c Plac ; House system              [Change "Plac" to desired system   ]
@@ -23,23 +26,28 @@ _b0     ; Print zodiac seconds      ["_b0" to minute, "=b0" to second  ]
 :I 80   ; Text screen columns       [Change "80" to desired columns    ]
 -YQ 0   ; Text screen scroll limit  [Change "24" or set to "0" for none]
 _Yn     ; Which Nodes and Lilith    ["_Yn" shows mean, "=Yn" shows true]
-_Yd     ; European date format      ["_Yd" is MDY, "=Yd" is DMY        ]
+_sr0    ; Latitudes or declinations ["_sr0" shows lat., "=sr0" declin. ]
+_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]
 -YP 0   ; Arabic part formula       ["1" is fixed, "0" checks if night ]
 =Yu0    ; Show eclipse information  ["=Yu0" shows, "_Yu0" doesn't show ]
 =0n     ; Internet Web queries      ["=0n" disables them, "_0n" allows ]
 
+:pd 365.24219 ; Progression degrees per day    [365 is secondary]
+:pC 1.0       ; Progressed cusp movement ratio [1.0 is quotidian]
+
 
 ; FILE PATHS (-Yi1 through -Yi9):
 ; For example, point -Yi1 to ephemeris dir, -Yi2 to chart files dir, etc.
 
--Yi1 "C:\ASTROLOG\EPH"
--Yi2 "C:\ASTROLOG\DAT"
+-Yi1 "C:\ASTROLOG\EPHEM"
+-Yi2 "C:\ASTROLOG\CHARTS"
 
 
 ; DEFAULT RESTRICTIONS:
@@ -69,16 +77,19 @@ _Yr     ; Show rounded positions    ["=Yr" rounds, "_Yr" doesn't       ]
 -YR1 1 1  ; Restrict latitude direction changes, distance direction changes
 
 -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
 
 
 ; DEFAULT ASPECT ORBS:
 ;  1- 5: Con Opp Squ Tri Sex
 ;  6-11: Inc SSx SSq Ses Qui BQn
 ; 12-18: SQn Sep Nov BNv BSp TSp QNv
+; 19-24: TDc Un1 Un2 Un3 Un4 Un5
 
 -YAo 1 5     7 7 7 7 6      ; Major aspects
 -YAo 6 11    3 3 3 3 2 2    ; Minor aspects
 -YAo 12 18   1 1 1 1 1 1 1  ; Obscure aspects
+-YAo 19 24   0.5 0.5 0.5 0.5 0.5 0.5  ; Very obscure aspects
 
 ; DEFAULT MAX PLANET ASPECT ORBS:
 
@@ -158,6 +169,11 @@ _Yr     ; Show rounded positions    ["=Yr" rounds, "_Yr" doesn't       ]
 -Yk  0 8    Bla Whi LtG Gra Mar DkG DkC DkB Mag  ; Main colors
 
 
+; OBJECT CUSTOMIZATION:
+
+; [No objects are different from defaults]
+
+
 ; GRAPHICS DEFAULTS:
 
 =Xm              ; Color charts       ["=Xm" is color, "_Xm" is monochrome]
@@ -170,7 +186,7 @@ _Xr              ; Reverse background ["_Xr" is black, "=Xr" is white     ]
 :Xv 1            ; Wheel fill    ["0" for none, "1" for standard, "2" rainbow]
 _Xx              ; Thicker lines ["=Xx" is thicker, "_Xx" is thinner         ]
 :Xbw             ; Bitmap file type   ["Xbw" is Windows .bmp, "Xbn" is X11   ]
-:YXG 1111        ; Glyph selections   [Capricorn, Uranus, Pluto, Lilith]
+:YXG 11122       ; Glyph selections [Capricorn, Uranus, Pluto, Lilith, Vertex]
 :YXg 0           ; Aspect grid cells  ["0" for autodetect  ]
 :YXS 0.0         ; Orbit radius in AU ["0.0" for autodetect]
 :YXj 0           ; Orbit trail count