Merge 59983adbba into 0efc6cb6fc

Closes issue #80.

.github/workflows/ci.yml

@@ -0,0 +1,57 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - main
+      - fix-ci
+
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  compile-linux-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Ubuntu packages
+      run: grep 'sudo apt install' INSTALL | sed 's/\$//' | sh
+    - name: Compile
+      run: make -C GUI/xephem
+    - name: Test
+      run: make -C tests
+
+  compile-macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install OpenMotif
+      run: brew install openmotif && brew info openmotif
+    - name: Install OpenSSL
+      run: brew install openssl && brew info openssl
+    - name: Install XQuartz
+      run: brew install xquartz --cask && brew info xquartz
+    - name: Install groff
+      run: brew install groff && brew info groff
+    - name: Compile
+      run: make -C GUI/xephem
+    - name: Test
+      run: make -C tests
+
+  compile-apple-silicon:
+    runs-on: macos-14
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install OpenMotif
+      run: brew install openmotif && brew info openmotif
+    - name: Install groff
+      run: brew install groff && brew info groff
+    - name: Install OpenSSL
+      run: brew install openssl && brew info openssl
+    - name: Install XQuartz
+      run: brew install xquartz --cask && brew info xquartz
+    - name: Compile
+      run: make -C GUI/xephem
+    - name: Test
+      run: make -C tests

Containers/docker-ubuntu-22.04/Dockerfile

@@ -0,0 +1,35 @@
+FROM ubuntu:22.04
+
+# Install everything XEphem needs to compile.
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt update
+RUN apt upgrade -y -y
+RUN apt install -y -y apt-file
+RUN apt-file update
+RUN apt install -y -y \
+    build-essential \
+    groff-base \
+    libmotif-dev \
+    libssl-dev \
+    libxext-dev \
+    libxmu-dev \
+    libxt-dev
+
+# Remove the Linux empty /srv directory so it does not interrupt tab
+# completion of /src, where we put the XEphem source tree.
+
+RUN rmdir /srv
+
+# Set up /root as our home directory, with a useful bash history and an
+# “.xephem” symlink that shows XEphem where to find its support files.
+
+ENV HOME /root
+RUN ln -s /src/GUI/xephem/auxil /root/.xephem
+RUN echo 'make -C /src/GUI/xephem && (cd /src/GUI/xephem; ./xephem)' \
+    > /root/.bash_history
+
+# Start the user in the /src directory.
+
+WORKDIR /src/GUI/xephem
+CMD /bin/bash

Containers/docker-ubuntu-22.04/README.md

@@ -0,0 +1,21 @@
+
+# XEphem Docker container
+
+This directory offers a `Dockerfile` plus a small shell script `run`.
+Run the shell script to build and launch a Ubuntu 14.04 container with
+all the libraries XEphem needs:
+
+    ./container/run
+
+Then, at the container’s prompt (which looks like `root@...:/src#`),
+you can build XEphem with:
+
+    make -C /src/GUI/xephem
+
+And run it with:
+
+    /src/GUI/xephem/xephem
+
+If you press up-arrow at the bash prompt right after the container
+launches, you will find this pair of commands already in the shell
+history so you can simply press Enter to run them.

Containers/docker-ubuntu-22.04/run

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -ex
+NAME=xephem-ubuntu-22.04
+
+if [ ! -f /usr/bin/docker ]
+then
+    echo 'Error: please "apt install docker.io"' >&2
+    exit 2
+fi
+
+# Change directory to the directory with this script and its Dockerfile.
+
+cd "$(dirname $0)"
+
+# Build the Docker image from the instructions in the Dockerfile.
+# Name the resulting image "xephem".
+
+if [ "$1" = "--no-cache" ]
+then
+    NO_CACHE=--no-cache
+    shift
+else
+    NO_CACHE=
+fi
+docker build -t $NAME . 1>&2 $NO_CACHE
+
+# Run the "xephem" image, exposing several files from the host system
+# that together should let XEphem run and connect to X Windows:
+#
+# 1. This XEphem source tree, which gets mounted at "/src".
+# 2. The collection of X11 sockets in /tmp.
+# 3. Our X session's private authority file.
+
+exec docker run -ti \
+     --net=host \
+     -e DISPLAY=$DISPLAY \
+     -v ${PWD}/../..:/src \
+     -v /tmp/.X11-unix:/tmp/.X11-unix \
+     -v ${XAUTHORITY}:/root/.Xauthority \
+     $NAME \
+     "$@"

GUI/xephem/Makefile

@@ -28,11 +28,23 @@ ifndef MOTIFL
 MOTIFL = /usr/lib
 endif
 
-# for linux and Apple OS X
+# For Linux and Apple OS X
+# /opt/homebrew is for modern Apple Silicon; the other paths, for older macOS.
+
+UNAME_S = $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+  PLATI = -I/opt/homebrew/include \
+          -I/usr/local/opt/openssl@3/include \
+          -I/opt/X11/include
+  PLATL = -L/opt/homebrew/lib \
+          -L/usr/local/opt/openssl@3/lib \
+          -L/opt/X11/lib
+endif
+
 CC = gcc
 CLDFLAGS = -g
-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) $(PLATI)
+LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) $(PLATL)
 XLIBS = -lXm -lXt -lXext -lXmu -lX11
 LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
 

GUI/xephem/auxil/mpcorb2edb.pl

@@ -119,7 +119,7 @@ print "Creating $brtfn and $dimfn..\n";
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime;
 $year += 1900;
 $mon += 1;
-$from = "# Data is from ftp://cfa-ftp.harvard.edu/pub/MPCORB/MPCORB.DAT\n";
+$from = "# Data is from $MPCSITE/$MPCFTPDIR/$MPCFILE\n";
 $what = "# Generated by mpcorb2edb.pl $ver, (c) 2000 Elwood Downey\n";
 $when = "# Processed $year-$mon-$mday $hour:$min:$sec UTC\n";
 

GUI/xephem/datamenu.c

@@ -109,7 +109,7 @@ static ColHdr col[] = {
     {MISC_COL,	"SnLght",  "Light travel time from Sun"},
     {MISC_COL,	"Uranom",  "Volume and page number in Uranometria"},
     {MISC_COL,	"Uran2k",  "Volume and page number in Uranometria 2000"},
-    {MISC_COL,	"MillSA",  "Volume and page number in Millenium Star Atlas"},
+    {MISC_COL,	"MillSA",  "Volume and page number in Millennium Star Atlas"},
 
     {RISET_COL,	"RisTm",   "Rise time, today"},
     {RISET_COL,	"RisAz",   "Rise azimuth, today"},

GUI/xephem/fallbacks.c

@@ -744,11 +744,11 @@ String fallbacks[] = {
     "XEphem*WCS.y: 10",
     "XEphem*WebDB*Pattern.value: ",
     "XEphem*WebDB*Search.set: False",
-    "XEphem*WebDB*URL0.value: http://celestrak.com/NORAD/elements/stations.txt",
-    "XEphem*WebDB*URL1.value: http://celestrak.com/NORAD/elements/science.txt",
-    "XEphem*WebDB*URL2.value: http://celestrak.com/NORAD/elements/tle-new.txt",
-    "XEphem*WebDB*URL3.value: http://celestrak.com/NORAD/elements/amateur.txt",
-    "XEphem*WebDB*URL4.value: http://celestrak.com/NORAD/elements/visual.txt",
+    "XEphem*WebDB*URL0.value: https://celestrak.org/NORAD/elements/stations.txt",
+    "XEphem*WebDB*URL1.value: https://celestrak.org/NORAD/elements/science.txt",
+    "XEphem*WebDB*URL2.value: https://celestrak.org/NORAD/elements/tle-new.txt",
+    "XEphem*WebDB*URL3.value: https://celestrak.org/NORAD/elements/amateur.txt",
+    "XEphem*WebDB*URL4.value: https://celestrak.org/NORAD/elements/visual.txt",
     "XEphem*WebDB*URL5.value: https://www.minorplanetcenter.net/iau/Ephemerides/Comets/Soft03Cmt.txt",
     "XEphem*WebDB*URL6.value: https://www.minorplanetcenter.net/iau/Ephemerides/CritList/Soft03CritList.txt",
     "XEphem*WebDB*URL7.value: https://www.minorplanetcenter.net/iau/Ephemerides/Distant/Soft03Distant.txt",

GUI/xephem/help/xephem.html

@@ -716,7 +716,7 @@ substituted. If you figure
 out how to configure for another browser or you know of a better
 definition please send us your results and we will post on our web site.<br>
 <br>
-Note the entry for using IE under <a href="http://www.cygwin.com"
+Note the entry for using IE under <a href="https://www.cygwin.com"
  target="new">cygwin</a>. In order for this to work,
 you must create an
 environment variable before running XEphem named XEHELPURL set to the
@@ -1082,7 +1082,7 @@ field varies from true north. Put another way,true az = magnetic
 bearing - mag decl. The model is stored in the file wmm.cof in the
 auxil directory of the shared directory. It is valid for 2000
 through the end of 2004. Check <a
- href="http://www.ngdc.noaa.gov/seg/potfld/DoDWMM.shtml" target="new">http://www.ngdc.noaa.gov/seg/potfld/DoDWMM.shtml</a>
+ href="https://www.ncei.noaa.gov/products/world-magnetic-model" target="new">https://www.ncei.noaa.gov/products/world-magnetic-model</a>
 for updates.<br clear="all">
   </li>
 </ul>
@@ -1753,7 +1753,7 @@ number of object's location in the new Uranometria 2000 edition.</li>
 </ul>
 <ul>
   <li><span style="font-weight: bold;">MillSA</span> Volume and Page
-number of object's location in the Millenium Star Atlas, published
+number of object's location in the Millennium Star Atlas, published
 by Sky Publishing Corp.</li>
 </ul>
 Section two controls information related to rising, transitting, and
@@ -1896,14 +1896,14 @@ hspace="10" width="266">This
 window provides a convenient tool to download, display and manage
 images
 from SOHO, the <a target="_blank"
-href="http://sohowww.nascom.nasa.gov/">Solar
+href="https://sohowww.nascom.nasa.gov/">Solar
 &amp; Heliospheric Observatory</a>. <font size="3">Use of this
 extraordinary data is courtesy of the SOHO consortium. SOHO is a
 project
 of international cooperation between ESA and NASA.<br>
 <br>
 The SOHO data is pulled from the web site
-http://sohowww.nascom.nasa.gov. The host name is defined in the XEphem
+https://sohowww.nascom.nasa.gov. The host name is defined in the XEphem
 resource XEphem.SOHOhost. This may be changed if necessary by placing a
 new value in the XEphem resource file.<br>
 </font>
@@ -2195,8 +2195,8 @@ surface but would rather not change the XEphem date to a full Moon.<br>
 This value depends on the gamma of your display. A fine discussion
 of display gamma and a test image with which you can determine the
 gamma value of your own display may be found at the URL: <a
- href="http://web.mit.edu/jmorzins/www/gamma/rwb/gamma.html"
- target="new">http://web.mit.edu/jmorzins/www/gamma/rwb/gamma.html</a>.</div>
+ href="https://web.mit.edu/jmorzins/www/gamma/rwb/gamma.html"
+ target="new">https://web.mit.edu/jmorzins/www/gamma/rwb/gamma.html</a>.</div>
 <br>
 <span style="font-weight: bold;">Movie Demo</span><br>
 <br>
@@ -2547,7 +2547,7 @@ height. </div>
 cloud imagery, ice, sea and land temperatures, courtesy Space
 Science and Engineering Center at the University of Wisconsin. The
 image is a gif file retrieved from <a
- href="http://www.ssec.wisc.edu/data/comp/latest_cmoll.gif" target="new">http://www.ssec.wisc.edu/data/comp/latest_cmoll.gif</a>.
+ href="https://www.ssec.wisc.edu/data/comp/latest_cmoll.gif" target="new">https://www.ssec.wisc.edu/data/comp/latest_cmoll.gif</a>.
 It is updated once every six hours. All other graphical features of
 the Earth view remain available as overlays to this image. Primary
 advantage is ease in determining whether weather will effect
@@ -5391,7 +5391,7 @@ protocol, any other instrumentation whatsoever. The control can be
 performed via a simple fifo connection, or a much more flexible INDI
 interface. For a complete description of the INDI protocol, please
 download the reference specification from <a
- href="http://www.clearskyinstitute.com/INDI/INDI.pdf">http://www.clearskyinstitute.com/INDI/INDI.pdf</a>.
+ href="https://www.clearskyinstitute.com/INDI/INDI.pdf">https://www.clearskyinstitute.com/INDI/INDI.pdf</a>.
 Here we only describe the INDI configuration window, the INDI
 control panel, testing the INDI system using the sample drivers, and
 finally the&nbsp; simple fifo interface.<br>
@@ -6325,13 +6325,12 @@ the frames directly as an actual movie because there are many such
 formats and other tools available to collect the files into a movie in
 your preferred format. For example, you could convert the PNG files
 into GIF files using <em>pngtopnm</em> and <em>ppmtogif</em> tools
-from the <a target="netpbm" href="http://netpbm.sourceforge.net">netpbm</a>
+from the <a target="netpbm" href="https://netpbm.sourceforge.net">netpbm</a>
 toolkit then make an
-animated gif using&nbsp;<a target="whirlgif"
- href="http://www.danbbs.dk/%7Edino/whirlgif">whirlgif</a>
-or <a target="gifsicle" href="http://www.lcdf.org/%7Eeddietwo/gifsicle">gifsicle</a>.
+animated gif using&nbsp;
+<a target="gifsicle" href="https://www.lcdf.org/%7Eeddietwo/gifsicle">gifsicle</a>.
 Another possibility is to use <em>convert</em> which is part of the
-<a target="imagemagick" href="http://www.imagemagick.org">ImageMagick</a>
+<a target="imagemagick" href="https://www.imagemagick.org">ImageMagick</a>
 collection. Check your system before looking too far, these tools are
 often
 already installed on many UN*X systems.<br>
@@ -7992,7 +7991,7 @@ format if it is not already.<br>
 <br>
 Several particularly useful sites as of this build are already entered.
 The first five are from Dr. TS Kelso's Earth satellite lists at <a
- href="http://www.celestrak.com">celestrak.com</a>. The other four are
+ href="https://celestrak.org">celestrak.org</a>. The other four are
 the Minor Planet Center's lists of hot comets and unusual asteroids
 specially formatted for <a
  href="https://www.minorplanetcenter.net/iau/Ephemerides/Soft03.html">XEphem</a>.
@@ -8001,9 +8000,10 @@ catalog to download the file to the Private directory and
 simultaneously load into XEphem memory.<br>
 <br>
 Special files created by the <a
- href="http://cfa-www.harvard.edu/cfa/ps/mpc.html">Minor Planet Center</a>
-and <a href="ftp://ftp.lowell.edu/pub/elgb/astorb.html">Lowell
-Observatory</a> may also be downloaded. Each organization maintains
+ href="https://www.minorplanetcenter.net/data/">Minor Planet Center</a>
+and <a href="https://asteroid.lowell.edu/astorb/">Lowell
+Observatory</a> may also be downloaded.
+Each organization maintains
 extensive lists of all known asteroids and produces on a regular basis
 Keplarian orbital elements precessed to the current date. Both are of
 excellent quality. When the <span style="font-weight: bold;">Get</span>
@@ -8131,7 +8131,7 @@ This catalog has been included with permission of USNO as long as
 we mention the following stipulations:<br>
 <br>
 <div style="margin-left: 40px;"> It may not be the latest version,
-check with http://www.usno.navy.mil. </div>
+check with https://www.usno.navy.mil. </div>
 <br>
 <div style="margin-left: 40px;"> If you paid for XEphem, you paid for
 the software, not this catalog. The catalog is available free from
@@ -8188,7 +8188,7 @@ UCAC</span>
 <div style="margin-left: 40px;"><br>
 This choice allows using the USNO Astrographic catalog with XEphem. For
 more information on this catalog please refer to
-<a target="_blank" href="http://www.usno.navy.mil/USNO/astrometry/optical-IR-prod/ucac">here</a>.
+<a target="_blank" href="https://www.usno.navy.mil/USNO/astrometry/optical-IR-prod/ucac">here</a>.
 As of release UCAC4, the directory specified must be that which contains
 the u4b and u4i directories. In turn, u4b must contain all 900 z files and
 u4i must contain u4index.unf and u4hpm.dat.
@@ -8489,7 +8489,7 @@ Save it, the change only effects XEphem until you exit.<br>
 <h3><a class="mozTocH3" name="mozTocId803196"></a> 8.2.2 Star colors</h3>
 XEphem assigns colors to stars based on their spectral classification.
 The default colors were chosen based on work done by <a
- href="http://www.vendian.org/mncharity/dir3/starcolor">Mitchell Charity</a>.
+ href="https://www.vendian.org/mncharity/dir3/starcolor">Mitchell Charity</a>.
 The colors are specified using X Resources. The resource names each
 begin with "XEphem.starSpect" followed by one or two characters. The
 value of the resource is the color. The following table shows the
@@ -8899,15 +8899,14 @@ correct use of Sky View options in individual planetary views.
 contributed by the late Guillermo Andrade Velasco. <p>
 <p>The Blue Marble project at
 <a target="new"
- href="http://earthobservatory.nasa.gov/Newsroom/BlueMarble">http://earthobservatory.nasa.gov/Newsroom/BlueMarble
-</a>for their
+ href="https://visibleearth.nasa.gov/collection/1484/blue-marble">https://visibleearth.nasa.gov/collection/1484/blue-marble</a>for their
 wonderful
 whole-earth color images.</p>
 <p>
 Corrections for ecliptic longitude from Adrian Robinson, adrianprobinson@yahoo.co.uk </p>
 <p>The stellar spectra colors are based on work by Mitchell Charity,
 mcharity@lcs.mit.edu, at
-<a target="new" href="http://www.vendian.org/mncharity/dir3/starcolor">http://www.vendian.org/mncharity/dir3/starcolor.
+<a target="new" href="https://www.vendian.org/mncharity/dir3/starcolor">https://www.vendian.org/mncharity/dir3/starcolor.
 </a> </p>
 <p>Thanks to Paul Schlyter for some improved anomaly code.<br>
 </p>
@@ -8937,7 +8936,7 @@ based on map from http://www.ebicom.net/~rsf1/fun/sm-new.htm copyright
 </p>
 <p>The local magnetic declination model is from the DoD World Magnetic
 Model as published at <a target="new"
- href="http://www.ngdc.noaa.gov/seg/potfld/DoDWMM.shtml">http://www.ngdc.noaa.gov/seg/potfld/DoDWMM.shtml
+ href="https://www.ncei.noaa.gov/products/world-magnetic-model">https://www.ncei.noaa.gov/products/world-magnetic-model
 </a> </p>
 <p>Thanks to Fridger Schrempp, fridger.schrempp@desy.de, for his long
 term encouragement of the project, and particularly for many
@@ -8950,7 +8949,7 @@ code, as converted from FORTRAN to C by Magnus Backstrom,
 b@eta.chalmers.se. See "Spacetrack Report Number 3: Models for
 Propagation of NORAD Element Sets" at
 <a target="new"
- href="http://www.celestrak.com/NORAD/documentation/spacetrk.pdf">http://www.celestrak.com/NORAD/documentation/spacetrk.pdf</a>
+ href="https://www.celestrak.org/NORAD/documentation/spacetrk.pdf">https://www.celestrak.org/NORAD/documentation/spacetrk.pdf</a>
 </p>
 <p>Improvements to Delta T code, help and wording contributed by Neal
 McBurnett, nealmcb@bell-labs.com.</p>
@@ -8975,13 +8974,13 @@ Laser
 Altimeter on board the Mars Global Surveyor, operated by the Jet
 Propulsion
 Laboratory, NASA.
-See <a target="new" href="http://marsprogram.jpl.nasa.gov/mgs">http://marsprogram.jpl.nasa.gov/mgs</a>
+See <a target="new" href="https://marsprogram.jpl.nasa.gov/mgs">https://marsprogram.jpl.nasa.gov/mgs</a>
 </p>
 <p>The near real-time weather map in the Earth view is provided by
 the Space Science and Engineering Center at the University of
 Wisconsin.
 See their web site at <a target="new"
- href="http://www.ssec.wisc.edu/ssec.html">http://www.ssec.wisc.edu/ssec.html</a>
+ href="https://www.ssec.wisc.edu/data/">https://www.ssec.wisc.edu/data</a>
 </p>
 <p>The XEphem logo was contributed by Jonathan Adams,
 jfadams@mail.arc.nasa.gov. The galaxy background image is from Galaxy
@@ -8989,7 +8988,7 @@ Photography, www.galaxyphoto.com.</p>
 <p>For the years 1999-2010 the natural satellite ephemerides for Mars,
 Jupiter, Saturn and Uranus are based on developments in mixed
 functions computed and contributed at Bureau Des Longitudes,
-<a target="new" href="http://www.bdl.fr">http://www.bdl.fr</a>
+<a target="new" href="https://www.bdl.fr">https://www.bdl.fr</a>
 by J.-E. Arlot, Ch. Ruatti and W. Thuillot. Many
 thanks!</p>
 <p>Outside this range, Jupiter's moons based on information in
@@ -9059,7 +9058,7 @@ which grew into the new bitmap clipmask approach of drawing the stars.</p>
 <p>Thanks to Jim Bell, jimbo@cuspif.tn.cornell.edu, and the team at
 Mars Watch for encourage, support and ideas for the first Mars albedo
 map in XEphem. The map as of Version 3.3 is from
-<a target="new" href="http://maps.jpl.nasa.gov/mars.html">http://maps.jpl.nasa.gov/mars.html</a>
+http://maps.jpl.nasa.gov/mars.html
 </p>
 <p>Thanks to Dimitromanolakis Apostolos &lt;apdim@grecian.net&gt; for
 his contribution leading to support for fetching DSS in gzipped form.</p>
@@ -9135,7 +9134,7 @@ Richard Talcott, published in _Astronomy_, October 1995, page 76.</p>
 <p>Thanks to Richard Clark (rclark@lpl.arizona.edu) for an improved
 version of anomaly.c.</p>
 <p>A great source of comet information is <a target="new"
- href="http://encke.jpl.nasa.gov">http://encke.jpl.nasa.gov</a>
+ href="https://science.nasa.gov/solar-system/comets/">https://science.nasa.gov/solar-system/comets/</a>
 </p>
 <p>Special thanks to Uwe Bonnes, bon@LTE.E-TECHNIK.uni-erlangen.de,
 and Ralphe Neill, ran@rdt.monash.edu.au, for their many ideas and
@@ -9159,9 +9158,9 @@ the July 1993 issue of Sky and Telescope. Any errors in transcription
 are strictly my own.</p>
 <p>Thanks to Lowell Observatory and the Minor Planet Center for
 maintaining their huge lists of asteroids. See
-<a target="new" href="ftp://ftp.lowell.edu/pub/elgb/astorb.html">ftp://ftp.lowell.edu/pub/elgb/astorb.html
+<a target="new" href="https://asteroid.lowell.edu/">https://asteroid.lowell.edu/
 </a> and
-<a target="new" href="http://cfa-www.harvard.edu/cfa/ps/mpc.html">http://cfa-www.harvard.edu/cfa/ps/mpc.html</a>
+<a target="new" href="https://cfa-www.harvard.edu/cfa/ps/mpc.html">https://cfa-www.harvard.edu/cfa/ps/mpc.html</a>
 , respectively.</p>
 <p>Thanks to the National Space Science Data Center and the Smithsonian
 Astrophysical Observatory for the SAO star catalogue.</p>
@@ -9401,6 +9400,6 @@ program
 was named <span style="font-style: italic;">xephem</span>. I have been
 diddling with it ever since. The original <span
  style="font-style: italic;">ephem</span> is still <a
- href="http://www.clearskyinstitute.com/ephem/ephem-4.29.tar.gz">available</a>.<br>
+ href="https://www.clearskyinstitute.com/ephem/">available</a>.<br>
 </body>
 </html>

GUI/xephem/imregmenu.c

@@ -229,7 +229,7 @@ ir_create()
 	s2_w = XmCreateToggleButton (irshell_w, "S1TB", args, n);
 	XtAddCallback (s2_w, XmNvalueChangedCallback, reg_cb, NULL);
 	set_xmstring (s2_w, XmNlabelString,
-		    "Image to be registed is loaded, now click same 2 stars");
+		    "Image to be registered is loaded, now click same 2 stars");
 	XtManageChild (s2_w);
 
 	/* labels for second set of reference stars */

GUI/xephem/patchlevel.c

@@ -4,6 +4,6 @@
 
 #include "xephem.h"
 
-char PATCHLEVEL[] = "4.1.0";
-char PATCHDATE[] = "2021 September 13";
+char PATCHLEVEL[] = "4.2.0";
+char PATCHDATE[] = "2024 February 13";
 char COPYRIGHT[] = "Copyright (c) 1990-2021 by Elwood Charles Downey";

GUI/xephem/skylist.c

@@ -98,7 +98,7 @@ typedef struct {
     char *desc;			/* description */
     char ura[ATLASLEN];		/* Uranometria page number */
     char u2k[ATLASLEN];		/* Uranometria 200 page number */
-    char msa[ATLASLEN];		/* Millenium Star Atlas page number */
+    char msa[ATLASLEN];		/* Millennium Star Atlas page number */
 } ObjInfo;
 
 /* handy "no rise/set" test */
@@ -139,7 +139,7 @@ static SortInfo sinfo[] = {
 
     {"Urano",  "Uranometria",      sort_ura},
     {"Uran2k", "Uranom 2000",      sort_u2k},
-    {"MillSA", "Millenium",        sort_msa},
+    {"MillSA", "Millennium",       sort_msa},
     {"RisTm",  "Rise time",        sort_risetm},
     {"RisAz",  "Rise azimuth",     sort_riseaz},
     {"TrnTm",  "Transit time",     sort_trantm},

GUI/xephem/sunmenu.c

@@ -1,6 +1,9 @@
 /* code to manage the sun display 
  */
 
+/* For the declaration of strptime in <time.h>. */
+#define _XOPEN_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>

GUI/xephem/webdbmenu.c

@@ -158,7 +158,7 @@ wdb_create()
 	    XtSetArg (args[n], XmNrightAttachment, XmATTACH_FORM); n++;
 	    tf_w = XmCreateTextField (f_w, buf, args, n);
 	    defaultTextFN (tf_w, 1, "", NULL);
-	    wtip (tf_w, "URL of file to download (must use HTTP)");
+	    wtip (tf_w, "URL of file to download (must use HTTP or HTTPS)");
 	    XtManageChild (tf_w);
 	    sprintf (buf, "XEphem*WebDB*URL%d.value", i);
 	    sr_reg (tf_w, buf, wdbcategory, 1);

GUI/xephem/xephem.man

@@ -1,9 +1,9 @@
-.TH XEphem 1X
-.SH Name
+.TH XEPHEM 1 "Feb 2024"
+.SH NAME
 XEphem \- an interactive astronomical ephemeris for X11
-.SH Syntax
-\fBxephem [-prfb] [-install {yes|no|guess}] [-resfile <resourcefile>] [-[no]splash]\fP
-.SH Description
+.SH SYNOPSIS
+\fBxephem [\-prfb] [\-install {yes|no|guess}] [\-resfile <resourcefile>] [\-[no]splash]\fP
+.SH DESCRIPTION
 .na
 .nh
 .PP
@@ -144,14 +144,14 @@ multi-user installations. XEphem looks here for support files. Unless
 defined otherwise, the Shared directory is ".", that is, the current 
 directory.
 
-.SH Author
+.SH AUTHOR
 .PP
 Elwood C. Downey, email ecdowney@ClearSkyInstitute.com.
 
-.SH References
+.SH SEE ALSO
 .PP
 The Web homepage, including the FAQ, is maintained at
-.I http://www.clearskyinstitute.com/xephem
+.I https://xephem.github.io/XEphem/Site/xephem.html
 .PP
 The online Help entry
 .I on Credits

INSTALL

@@ -4,12 +4,12 @@ How to install XEphem, either for just yourself or system-wide:
 
     Download the tarfile.
 
-        https://github.com/XEphem/XEphem/archive/refs/tags/4.1.0.tar.gz
+        https://github.com/XEphem/XEphem/archive/refs/tags/4.2.0.tar.gz
 
     Extract it and change directory:
 
-	$ tar xfz xephem-4.1.0.tar.gz
-	$ cd xephem-4.1.0/GUI/xephem
+	$ tar xfz xephem-4.2.0.tar.gz
+	$ cd xephem-4.2.0/GUI/xephem
 
     On a Linux similar to Ubuntu or Debian, do this (on other Linux
     distributions, look for Motif packages equivalent to the ones

README.md

@@ -33,7 +33,8 @@ There are more screenshots at bottom of this README.
 Thanks to our community of contributors, there are XEphem packages
 available for several operating systems (though these are not official):
 
-* [Ubuntu, Fedora, CentOS](https://build.opensuse.org/package/show/home:rjmathar/xephem)
+* [Ubuntu, CentOS](https://build.opensuse.org/package/show/home:rjmathar/xephem)
+* [Fedora](https://packages.fedoraproject.org/pkgs/xephem/xephem/)
 * [Gentoo](https://packages.gentoo.org/packages/sci-astronomy/xephem)
 * [openSUSE](https://build.opensuse.org/package/show/Application:Geo/xephem)
 * [Slack](https://slackbuilds.org/repository/13.37/academic/xephem/)
@@ -54,6 +55,7 @@ when sitting at the repository root are:
     $ ./Containers/docker-ubuntu-14.04/run
     $ ./Containers/docker-ubuntu-20.04/run
     $ ./Containers/docker-ubuntu-21.04/run
+    $ ./Containers/docker-ubuntu-22.04/run
 
 Once one of the containers has launched, use the shell command history:
 press up-arrow to ask for the previous command — it will be the correct

Site/INDI.html

@@ -9,7 +9,7 @@ XEphem: INDI Device Control
 <blockquote>
 <center>
 <font size="+1">
-<b>Control any <a target="newwin" href="http://www.clearskyinstitute.com/INDI/INDI.pdf">INDI</a>-compliant devices with XEphem.
+<b>Control any <a target="newwin" href="https://www.clearskyinstitute.com/INDI/INDI.pdf">INDI</a>-compliant devices with XEphem.
 </b>
 </font>
 <p>
@@ -20,10 +20,10 @@ Get <em>free</em> INDI drivers online for
     <li>Meade and JMI focusers
 </ul>
 and many more devices from the
-<a target="indi" href="http://indilib.org">indilib.org</a>.
+<a target="indi" href="https://indilib.org">indilib.org</a>.
 <p>
 Also see the ASCOM/INDI gateway and Java implementations at 
-<a target="_blank" href="http://www.cloudmakers.eu/jindi">Cloudmakers</a>.
+<a target="_blank" href="https://www.cloudmakers.eu/jindi">Cloudmakers</a>.
 
 <p>
 <img src="INDI.png">

Site/changes.html

@@ -6,7 +6,7 @@
 
 <H3>Changes from 4.1.0 to 4.2.0</H3>
 
-Not yet released.
+Released 2024 February 13.
 
 <ul>
   <li>Elwood himself has contributed a new option
@@ -26,6 +26,8 @@ Not yet released.
       if the code detects it’s being compiled against OpenSSL ≥1.1.
   <li>Closing the INDI window with your window manager’s “Close” button
       no longer crashes XEphem.
+  <li>All references to “celestrak.com”
+      have been changed to their new hostname “celestrak.org”.
   <li>A few other small fixes.
 </ul>
 
@@ -601,7 +603,7 @@ Released June 6, 2004
 	<li>Plot and List now have Undo controls.
 	<li>Plot, List and Solver can now save and restore configurations.
 	<li>Telescope control now supports <a target="newwin"
-	href="http://www.clearskyinstitute.com/INDI/INDI.pdf">INDI</a>, a
+	href="https://www.clearskyinstitute.com/INDI/INDI.pdf">INDI</a>, a
 	highly flexible XML
 	protocol.
 	<li>More data options and crisper graphs in AAVSO plot tool.

Site/earthsat.html

@@ -12,7 +12,7 @@ XEphem: Earth Satellite Tracks
 <b>Plot ground tracks and orbits for any number of Earth satellites
 simultaneously in either "Mission Control" or spherical format. Sunlit side
 shows colored relief profile, night side shows light sources viewed from space.
-Get up-to-date TLE parameter sets with one click from celestrak.com or other
+Get up-to-date TLE parameter sets with one click from celestrak.org or other
 web sites.
 </b>
 

Site/faq.html

@@ -359,7 +359,7 @@ xephem@ClearSkyInstitute.com</a>
     10.8 (Mountain Lion), installing XCode does not install the command line development tools. To
     do that, just start XCode, open Preferences/Components and install the Command Line Tools. Also as 
     of Mountain Lion, Apple no longer ships X11. You now get it from
-    <a target="_blank" href="http://xquartz.macosforge.org">http://xquartz.macosforge.org</a>.
+    <a target="_blank" href="https://xquartz.macosforge.org">https://xquartz.macosforge.org</a>.
     <p>
     Now that you have command line tools such as cc and make and X11 installed, read the INSTALL
     file inside the XEphem tarball for the proper way to invoke the
@@ -522,11 +522,11 @@ using XEphem on my web site or publications?</b>
     placed somewhere on each such page:
     <p>
     <pre>
-    &lt;a target="csiwin" href="http://www.ClearSkyInstitute.com/xephem/xephem.html"&gt;Created using &lt;b&gt;XEphem&lt;/b&gt;&lt;/a&gt;
+    &lt;a target="csiwin" href="https://xephem.github.io/XEphem/Site/xephem.html"&gt;Created using &lt;b&gt;XEphem&lt;/b&gt;&lt;/a&gt;
     </pre>
     <p>
     It should look and work like this:
-    <a target="csiwin" href="http://www.ClearSkyInstitute.com/xephem/xephem.html">
+    <a target="csiwin" href="https://xephem.github.io/XEphem/Site/xephem.html">
     Created using <b>XEphem</b></a>.
     <p>
     Regarding publications, the Postscript files generated by XEphem already

Site/intro.html

@@ -30,7 +30,7 @@ and Solaris.">
 	<img width="291" height="86" border="0" src="xephemdrop.png">
 	<br>
 	<font size="-3">(icon background by
-	<a target="galwin" href="http://www.galaxyphoto.com">Galaxy Photography</a>)
+	<a target="galwin" href="https://www.galaxyphoto.com">Galaxy Photography</a>)
 	</font>
 
 	<br>
@@ -73,7 +73,7 @@ and Solaris.">
     * "It takes some getting used to, but it's worth the effort. Once you
     understand its peculiarities, you'll find that XEphem can do just about
     anything you ask ...". Quoted with permission from
-    <a target="_blank" href="http://www.amazon.com/Astronomy-Hacks-Tools-Observing-Night/dp/0596100604/ref=sr_1_1?ie=UTF8&s=books&qid=1280642536&sr=8-1">Astronomy Hacks</a> 
+    <a target="_blank" href="https://www.amazon.com/Astronomy-Hacks-Tools-Observing-Night/dp/0596100604/ref=sr_1_1?ie=UTF8&s=books&qid=1280642536&sr=8-1">Astronomy Hacks</a>
     Copyright &#169; 2005 Robert Bruce Thompson and Barbara Fritchman Thompson.
     <pre>
     </pre>
@@ -134,9 +134,9 @@ and Solaris.">
     <p>
 	* XEphem does <em>not</em> run under native Windows but it works fine
 	using a virtualization toolkit such as 
-	<a target="_blank" href="http://www.virtualbox.org">Virtualbox</a> and
+	<a target="_blank" href="https://www.virtualbox.org">Virtualbox</a> and
 	a free linux distro such as 
-	<a target="_blank" href="http://www.opensuse.org">OpenSUSE</a>.
+	<a target="_blank" href="https://www.opensuse.org">OpenSUSE</a>.
 
 <tr>
     <td><p>

Site/sun.html

@@ -10,7 +10,7 @@ XEphem: Sun
 <center>
 <font size="+1">
 <b>Near real-time Solar images from the
-<a target="newwin" href="http://sohowww.nascom.nasa.gov">SOHO</a>
+<a target="newwin" href="https://sohowww.nascom.nasa.gov">SOHO</a>
 spacecraft. Download, save and view images from 8 data products in three
 size formats.
 <p>

Tools/check-version.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Print all of the embedded version numbers in XEphem's code and
+# documentation, so the reader can see whether they match.  Particularly
+# useful when doing a release.
+
+set -e
+cd "$(readlink -f $(dirname "${BASH_SOURCE[0]}"))"
+cd ..
+for s in archive/refs/tags 'tar xfz' 'cd xephem'
+do
+    grep -H "$s" INSTALL
+done
+grep -H PATCHLEVEL GUI/xephem/patchlevel.c
+grep -H '^Version' xephem.spec

libastro/constel.c

@@ -1673,7 +1673,7 @@ cns_loadfigs (FILE *fp, char *msg)
 		continue;
 
 	    /* ok, line looks interesting, look more carefully */
-	    if (sscanf (lp, "%d %s %s", &code, rastr, decstr) == 3) {
+	    if (sscanf (lp, "%d %63s %63s", &code, rastr, decstr) == 3) {
 		/* looks like a drawing line */
 		double ra, dec;
 

libastro/earthsat.c

@@ -4,7 +4,7 @@
  *   the original FORTRAN to C by Magnus Backstrom. The paper "Spacetrack
  *   Report Number 3: Models for Propagation of NORAD Element Sets" describes
  *   the calculations.
- *   See http://www.celestrak.com/NORAD/documentation/spacetrk.pdf.
+ *   See http://www.celestrak.org/NORAD/documentation/spacetrk.pdf.
  *
  * A few topocentric routines are also used from the 'orbit' program which is
  *   Copyright (c) 1986,1987,1988,1989,1990 Robert W. Berger N3EMO

libastro/magdecl.c

@@ -148,7 +148,7 @@ GEOMAG:
       c[0][0] = 0.0;
       cd[0][0] = 0.0;
       fgets(c_str, 80, wmmdat);
-      sscanf(c_str,"%f%s",&epoc,model);
+      sscanf(c_str,"%f%19s",&epoc,model);
 S3:
       fgets(c_str, 80, wmmdat);
 /* CHECK FOR LAST LINE IN FILE */

libastro/misc.c

@@ -123,7 +123,7 @@ obj_description (Obj *op)
 	case BINARYSTAR:
 	    if (op->f_class) {
 		int i;
-		for (i = 0; i < NFCM; i++)
+		for (i = 0; i < NBCM; i++)
 		    if (binary_class_map[i].classcode == op->f_class)
 			return (binary_class_map[i].desc);
 	    }
@@ -140,7 +140,7 @@ obj_description (Obj *op)
 		return ("Planet");
 	    if (!biop)
 		getBuiltInObjs (&biop);
-	    sprintf (nsstr, "Moon of %s", biop[op->pl_code].o_name);
+	    sprintf (nsstr, "Moon of %7s", biop[op->pl_code].o_name);
 	    return (nsstr);
 	    }
 	case EARTHSAT:

tests/output.expected

@@ -1,19 +1,19 @@
 Precession J2000 -> J2015
-RA  +0.0000000000000000 -> +0.0033543649473764
-Dec -0.0000000000000000 -> +0.0014575063671504
-RA  +1.0000000000000000 -> +1.0014450289313686
-Dec -1.0000000000000000 -> -0.9992134064184917
-RA  +2.0000000000000000 -> +5.1478363700948195
-Dec -2.0000000000000000 -> -1.1409819639181964
-RA  +3.0000000000000000 -> +6.1449758360061262
-Dec -3.0000000000000000 -> -0.1401493826857086
-RA  +4.0000000000000000 -> +0.8630426367929015
-Dec -4.0000000000000000 -> +0.8593574646184613
-RA  +5.0000000000000000 -> +4.9986250865903390
-Dec -5.0000000000000000 -> +1.2835978054231891
-RA  +6.0000000000000000 -> +6.0032362075042789
-Dec -6.0000000000000000 -> +0.2845854258344847
+RA  +0.0000000000000000 -> +0.00335436494738
+Dec -0.0000000000000000 -> +0.00145750636715
+RA  +1.0000000000000000 -> +1.00144502893137
+Dec -1.0000000000000000 -> -0.99921340641849
+RA  +2.0000000000000000 -> +5.14783637009482
+Dec -2.0000000000000000 -> -1.14098196391820
+RA  +3.0000000000000000 -> +6.14497583600613
+Dec -3.0000000000000000 -> -0.14014938268571
+RA  +4.0000000000000000 -> +0.86304263679290
+Dec -4.0000000000000000 -> +0.85935746461846
+RA  +5.0000000000000000 -> +4.99862508659034
+Dec -5.0000000000000000 -> +1.28359780542319
+RA  +6.0000000000000000 -> +6.00323620750428
+Dec -6.0000000000000000 -> +0.28458542583448
 
 Pluto discontinuity when Chapront (1995) ends on 2247/10/1
 RA = 16:52:53.80
-RA = 11:52:36.32
+RA = 16:46:16.01

tests/test.c

@@ -10,8 +10,8 @@ int main() {
           ra = pra = i;
           dec = pdec = -i;
           precess(J2000, J2015, &pra, &pdec);
-          printf("RA  %+.16f -> %+.16f\n", ra, pra);
-          printf("Dec %+.16f -> %+.16f\n", dec, pdec);
+          printf("RA  %+.16f -> %+.14f\n", ra, pra);
+          printf("Dec %+.16f -> %+.14f\n", dec, pdec);
      }
 
      printf("\nPluto discontinuity when Chapront (1995) ends on 2247/10/1\n");
@@ -37,7 +37,8 @@ int main() {
      fs_sexa(out, radhr(o.s_gaera), 2, 360000);
      printf("RA = %s\n", out);
 
-/* From Elwood's email:
+/* From Elwood's email, this is how bad the discontinuity was before the
+   commit 139b2ea2 'Revert "Astronomical Almanac 2020 Pluto elements...':
 5/16/2247 00:00 UTC    4.1.0 RA 16:52:53.90  Dec -10:36:26.5
                        3.6.7 RA 16:52:53.90  Dec -10:36:26.5
 9/27/2248 00:00 UTC    4.1.0 RA 11:52:36.30  Dec 16:13:59.6

xephem.spec

@@ -1,5 +1,5 @@
 Name:		xephem
-Version:	4.1.0
+Version:	4.2.0
 Release:        1
 Summary:        XEphem is an interactive astronomy program for all UNIX platforms.
 License:	MIT