diff --git a/.gitignore b/.gitignore
index 039c83dc8..9c2fd80f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,8 @@ mathics/doc/tex/doc_tex_data.pcl
mathics/doc/tex/documentation.tex
mathics/doc/tex/images/
mathics/doc/tex/logo-heptatom.pdf
-mathics/doc/tex/logo-text-nodrop.pdf
+mathics/doc/tex/Mathics3-logo-nodrop.pdf
+mathics/doc/tex/Mathics3-logo.pdf
mathics/doc/tex/mathics-*.asy
mathics/doc/tex/mathics-*.dvi
mathics/doc/tex/mathics-*.dvi
diff --git a/mathics/__init__.py b/mathics/__init__.py
index 77f16f510..f88bc6a18 100644
--- a/mathics/__init__.py
+++ b/mathics/__init__.py
@@ -7,6 +7,7 @@
from mpmath import __version__ as mpmath_version
from numpy import __version__ as numpy_version
+from PIL import __version__ as PIL_version
from sympy import __version__ as sympy_version
from mathics.version import __version__
@@ -22,6 +23,7 @@
"numpy": numpy_version,
"python": platform.python_implementation() + " " + sys.version.split("\n")[0],
"sympy": sympy_version,
+ "PIL": PIL_version,
}
diff --git a/mathics/doc/images.sh b/mathics/doc/images.sh
index 761c3b3c8..724c1f225 100755
--- a/mathics/doc/images.sh
+++ b/mathics/doc/images.sh
@@ -8,24 +8,26 @@ bs=${BASH_SOURCE[0]}
mydir=$(dirname $bs)
cd $mydir
mydir=$(pwd)
+DOC_DIR=$(pwd)
if [[ -n $DOCTEST_LATEX_DATA_PCL ]]; then
LATEX_DIR=$(basename $DOCTEST_LATEX_DATA_PCL)
else
LATEX_DIR=${mydir}/latex
fi
-IMAGE_DIR=${LATEX_DIR}/images
+LATEX_IMAGE_DIR=${LATEX_DIR}/images
+DOC_IMAGE_DIR=${DOC_DIR}/documentation/images
-if [[ ! -d "$IMAGE_DIR" ]] ; then
- mkdir -p $IMAGE_DIR
+if [[ ! -d "$DOC_IMAGE_DIR" ]] ; then
+ mkdir -p $DOC_IMAGE_DIR
fi
for filename in $(find documentation/images/ -name "*.eps"); do
- pdf="${LATEX_DIR}/$(basename "$filename" .eps).pdf"
+ pdf="${DOC_IMAGE_DIR}/$(basename "$filename" .eps).pdf"
epstopdf "$filename"
- mv "$pdf" $IMAGE_DIR
+ mv "$pdf" $LATEX_IMAGE_DIR
done
-for filename in ${mydir}/images/logo-{heptatom,text-nodrop}.svg; do
+for filename in ${mydir}/images/logo-{heptatom,heptatom-Mathics3,Mathics3-nodrop}.svg; do
inkscape $filename --export-filename="latex/$(basename "$filename" .svg).pdf" --batch-process
done
diff --git a/mathics/doc/images/README.md b/mathics/doc/images/README.md
index 6e1ffa2bb..2641f4780 100644
--- a/mathics/doc/images/README.md
+++ b/mathics/doc/images/README.md
@@ -1 +1,10 @@
-The SVG files here, currently logos, are turned into PDFs which are used in the Mathics book (tutorial + reference manual).
+The SVG files here, currently logos, are turned into PDFs which are used in the Mathics3 book (tutorial + reference manual).
+
+The logo also appears in Mathics3-django and possibly other places outside of this repository.
+
+About the Logo...
+
+It uses the Times New Roman font. The "3" is italicized.
+There is a reflected image that is slanted about 30 per cent and has a gradient on the reflection.
+
+It was createed in inkscape, and can probably be edited that way.
diff --git a/mathics/doc/images/logo-Mathics3-nodrop.svg b/mathics/doc/images/logo-Mathics3-nodrop.svg
new file mode 100644
index 000000000..bad90711e
--- /dev/null
+++ b/mathics/doc/images/logo-Mathics3-nodrop.svg
@@ -0,0 +1,72 @@
+
+
+
+
diff --git a/mathics/doc/images/logo-Mathics3.svg b/mathics/doc/images/logo-Mathics3.svg
new file mode 100644
index 000000000..e0b429959
--- /dev/null
+++ b/mathics/doc/images/logo-Mathics3.svg
@@ -0,0 +1,109 @@
+
+
+
+
diff --git a/mathics/doc/images/logo-heptatom-Mathics3.svg b/mathics/doc/images/logo-heptatom-Mathics3.svg
new file mode 100644
index 000000000..cef33992d
--- /dev/null
+++ b/mathics/doc/images/logo-heptatom-Mathics3.svg
@@ -0,0 +1,128 @@
+
+
+
+
diff --git a/mathics/doc/images/logo-text-nodrop.svg b/mathics/doc/images/logo-text-nodrop.svg
deleted file mode 100644
index 9c197fbae..000000000
--- a/mathics/doc/images/logo-text-nodrop.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
diff --git a/mathics/doc/images/logo-text.svg b/mathics/doc/images/logo-text.svg
deleted file mode 100644
index 110b32c98..000000000
--- a/mathics/doc/images/logo-text.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
diff --git a/mathics/doc/latex/.gitignore b/mathics/doc/latex/.gitignore
index d676c72ac..4946ef739 100644
--- a/mathics/doc/latex/.gitignore
+++ b/mathics/doc/latex/.gitignore
@@ -5,7 +5,8 @@
/documentation.tex-before-sed
/images/
/logo-heptatom.pdf
-/logo-text-nodrop.pdf
+/Mathics3-logo.pdf
+/Mathics3-logo-nodrop.pdf
/mathics3-*.asy
/mathics3-*.dvi
/mathics3-*.dvi
diff --git a/mathics/doc/latex/Makefile b/mathics/doc/latex/Makefile
index cc0d5526c..87e7dbca1 100644
--- a/mathics/doc/latex/Makefile
+++ b/mathics/doc/latex/Makefile
@@ -37,15 +37,15 @@ mathics3-title.pdf:
mathics3.dvi: mathics3.tex documentation.tex
$(LATEXMK) -dvi -f --verbose mathics3
-#: Build main Mathcis3 PDF
-mathics3.pdf: mathics3.tex documentation.tex mathics3-title.pdf logo-text-nodrop.pdf logo-heptatom.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL) $(ASY_FILES)
+#: Build main Mathics3 PDF
+mathics3.pdf: mathics3.tex documentation.tex images/logo-heptatom-Mathics3.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL) $(ASY_FILES)
$(LATEXMK) --verbose -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics3
#: Rebuild all Aymptote PDF figures from .asy files
mathics3-asy-pdf: $(ASY_PDF_FILES)
#: Use this if latexmk des not work. It runx
-mathics3-xetex.pdf: mathics3.tex documentation.tex mathics3-title.pdf logo-text-nodrop.pdf logo-heptatom.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL)
+mathics3-xetex.pdf: mathics3.tex documentation.tex images/logo-heptatom-Mathics3.pdf logo-heptatom.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL)
xelatex -halt-on-error -recorder "mathics3.tex"
#: File containing version information
@@ -57,12 +57,12 @@ mathics3-test.pdf: mathics-test.tex testing.tex
$(LATEXMK) --verbose -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics3-test
#: Build main Mathcis3 PDF
-mathics3-???.pdf: mathics.tex documentation.tex mathics3-title.pdf logo-text-nodrop.pdf logo-heptatom.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL)
+mathics3-???.pdf: mathics.tex documentation.tex mathics3-title.pdf images/logo-heptatom-Mathics3.pdf version-info.tex $(DOCTEST_LATEX_DATA_PCL)
$(LATEXMK) --verbose -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics
#: Generate logos used in the titlepage
-logo-heptatom.pdf logo-text-nodrop.pdf:
+logo-heptatom-Mathics3.pdf:
(cd .. && $(BASH) ./images.sh)
#: The build of the documentation which is derived from docstrings in the Python code and doctest data
diff --git a/mathics/doc/latex/doc2latex.py b/mathics/doc/latex/doc2latex.py
index 480681505..fb7b2a16b 100755
--- a/mathics/doc/latex/doc2latex.py
+++ b/mathics/doc/latex/doc2latex.py
@@ -24,6 +24,7 @@
from mpmath import __version__ as mpmathVersion
from numpy import __version__ as NumPyVersion
+from PIL import __version__ as PILVersion
from sympy import __version__ as SymPyVersion
import mathics
@@ -81,6 +82,7 @@ def try_cmd(cmd_list: tuple, stdout_or_stderr: str) -> str:
"NumPyVersion": NumPyVersion,
"SymPyVersion": SymPyVersion,
"mpmathVersion": mpmathVersion,
+ "PILVersion": PILVersion,
}
for name, cmd, field in (
diff --git a/mathics/doc/latex/logo-heptatom.pdf b/mathics/doc/latex/logo-heptatom.pdf
deleted file mode 100644
index f5952d3a5..000000000
Binary files a/mathics/doc/latex/logo-heptatom.pdf and /dev/null differ
diff --git a/mathics/doc/latex/logo-text-nodrop.pdf b/mathics/doc/latex/logo-text-nodrop.pdf
deleted file mode 100644
index cc7c99486..000000000
Binary files a/mathics/doc/latex/logo-text-nodrop.pdf and /dev/null differ
diff --git a/mathics/doc/latex/mathics3.tex b/mathics/doc/latex/mathics3.tex
index 61d4bd459..c69cc6543 100644
--- a/mathics/doc/latex/mathics3.tex
+++ b/mathics/doc/latex/mathics3.tex
@@ -108,12 +108,12 @@
\definecolor{pythonstring}{rgb}{0,0.5,0}
\title{
- \includegraphics[height=0.1\linewidth]{mathics3-title.pdf}
+ \includegraphics[height=0.1\linewidth]{images/logo-heptatom-Mathics3.pdf}
\\[.5em]
- {\LARGE\color{subtitle}\textit{\textmd{A free, open-source alternative to Mathematica}}}
- \par\textmd{\Large Mathics3 Core Version \MathicsCoreVersion}
+ {\LARGE\color{subtitle}\textit{\textmd{A free, open-source alternative to Mathematica}}\/}{Large \textregistered{}}
+ \par\textmd{\Large Mathics\emph{3} Core Version \MathicsCoreVersion}
}
-\author{The Mathics3 Team}
+\author{The Mathics\emph{3} Team}
% Since we are using a XML input we have need to specify missed hyphenation
% in LaTeX sich as here:
@@ -342,7 +342,7 @@ \part*{Appendices}
\addcontentsline{toc}{chapter}{Colophon}
\begin{description}
- \item[Mathics3 Core] \hfill \MathicsCoreVersion
+ \item[Mathics\emph{3} Core] \hfill \MathicsCoreVersion
\item[Python] \hfill \\ \PythonVersion
\item[XeTeX] \hfill \\ \XeTeXVersion
\item[Asymptote] \hfill \\ \AsymptoteVersion