From 7670c98e0e984d3d47aa53738b019269ce261efb Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 27 Mar 2026 13:09:57 -0400 Subject: [PATCH] Go over Mathics3 logo --- .gitignore | 3 +- mathics/__init__.py | 2 + mathics/doc/images.sh | 14 +- mathics/doc/images/README.md | 11 +- mathics/doc/images/logo-Mathics3-nodrop.svg | 72 +++++++++ mathics/doc/images/logo-Mathics3.svg | 109 +++++++++++++ mathics/doc/images/logo-heptatom-Mathics3.svg | 128 +++++++++++++++ mathics/doc/images/logo-text-nodrop.svg | 97 ----------- mathics/doc/images/logo-text.svg | 153 ------------------ mathics/doc/latex/.gitignore | 3 +- mathics/doc/latex/Makefile | 10 +- mathics/doc/latex/doc2latex.py | 2 + mathics/doc/latex/logo-heptatom.pdf | Bin 3589 -> 0 bytes mathics/doc/latex/logo-text-nodrop.pdf | Bin 3450 -> 0 bytes mathics/doc/latex/mathics3.tex | 10 +- 15 files changed, 345 insertions(+), 269 deletions(-) create mode 100644 mathics/doc/images/logo-Mathics3-nodrop.svg create mode 100644 mathics/doc/images/logo-Mathics3.svg create mode 100644 mathics/doc/images/logo-heptatom-Mathics3.svg delete mode 100644 mathics/doc/images/logo-text-nodrop.svg delete mode 100644 mathics/doc/images/logo-text.svg delete mode 100644 mathics/doc/latex/logo-heptatom.pdf delete mode 100644 mathics/doc/latex/logo-text-nodrop.pdf 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 @@ + + + + + + + + + + Mathics3 + + + 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 @@ + + + + + + + + + + + + + + + Mathics3 + + Mathics3 + + 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 @@ + + + +image/svg+xmlMathics3Mathics3 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 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - 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 f5952d3a5235042c2fd35936fc78bf6a8b8995b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3589 zcmdT`du$X%7)Q!OPp||77!e#Fl@{#n%)agxn?ieiP-$t?YXw9K+w1naaJ@bE_G%#p z5+6tuX*~#&um++ZL_-q;`Mp`Zd#Hn-HB6HM0^L;;PiBhO!W02UMx17Pk;_ z&*dt#23;*QTG13BVZ>w6A5at}81xROvb`ZAZo%dxq87EyS85umghyptBBQ#u2!kG` z8c!yu4u%$Y- zp}So_3qgfVZ{%gl7EaY$%tj@K*~~Z#y{3@B1`@I_|F7K?Zp1XXQADVic|KGC4&)*# z{M&YNtW~925X^DLlaP^2P3A-gaCF3UbM>wl2Nm?&ae3mYzIAm=ew;Ak%+A|J`G3kD zzWmMX-FF_Fdhzl*?T^gAe@}Vk?2*ehoSU`w*AMosSW!9V!^7V^fAHH?{-=zyzh_^% zvaR>!CuXLuezD-h$v?h4F&C+A3oFj9UOlcXaeYpmQBkZ!7PUktTdyxYUH@rb%l11a z^gsXh#n;9@zWM#gh4ag;bw~TvwY@yLuIQPkf9^MG)Th2-W&U&&#=?O=6^k>dco)Q(r@9Rd2KzH*Dfj8cI?%qeN1cN z16$_S?>w?%UOE5h+UeUC_j#dU^2PIIb(;&G-LhoJ9)*iCP5kH5>X^UKgNm@5K*qk2PD5l=*+P~ zxJhl$<57A#JhVDE6edG(=&;0vjF@4D6KVu%WS82*cG7jjY)I0J1$f0zf`Nc2LIEd! zK@9RTt;{!BAiSR_qA1F?O3rcVE_4)3*bSI6KOU7 zzu36cR9y^!d;I5&%o5_pR`w#R(?<{+mFPuo1~GQbd$B1UbSU~TJ{zNNia{M{=!xzQ znCOgbP>0670~QP>I0hN{`LF~JgpNIce`pUFXmnD5NVg{lLGW`R#OAj*a$bDz#9uF! z9(-fqrz>5spAtIZ-xD5ojCY{cs8dHO#j0`K=_8rr9?mJtJrEw}f9w#4#hUC12fyR1 za24k9VPR`~d;8|Gjf2;j>z?dw-qPc)MCOa><(4^)rVL1zNk=vGwu-jnD%9jm%0zEd zo@&Kt}F^$!~ql!Z~F8cVV^)UDEK z$I_lI$@s_XtVS_STp%z~w8isQ2)6~L-l{T7Ip(VBq6Xlf@my}>EDj3Vf@D^em5a3H+0%Htc34=2*7GTZ; z5BtKL55gL}0nvGZM)wK@um)$+SN^+msZ8JtfB+eU@rvCVhp2jhnnkpU&Mq3wW1aw$ zKm>{Bm0T>2z&OWilXPSXsg@cu7=RvY00TMPMhsFnF zDAn{qahHa92}(sb8j-;*-DsGk(*W|i^AVAU)a<&KmxB-mU1?YhrkzKi$M4QZ1U^ka z5(t2ax}L`qA#E=&DQPlznLsXd+Z#;ZD-c?6T|UcH^_XU|o<6M4)~KCn?o}HG#4~GW f*}N>?2w@9C?c_^Zs%bIL2t*cqSy{!ECBDA^W+%=5 diff --git a/mathics/doc/latex/logo-text-nodrop.pdf b/mathics/doc/latex/logo-text-nodrop.pdf deleted file mode 100644 index cc7c994863ab9ab99a03ea206a55945094a24b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3450 zcmai1dpwi-A6H3PB2E%fPvtK5Y_pk5G}q*k+)kJnW*fF?8^@(0*Olc~p*SwtS4>ow{=p3)0-P2iJi9*%aVq|=fWrb2w#^Yckeoz+CbH|TQbgKu;uTvOc%duzB-sl z@~^HP`XU|?S9r2%8GGXI2!rK$eQt2t(?rKk%=F}Oq5AFx56v%`1Mde3gYM(>5N;~%bfO7$9k z7P;~D{-@O7tTL`!`q3UO#|FE+$7^@Uj09^&*@PJyDig3%E>$ctRv$NDI!ex|9%&^e zqfHvBJHJE*xRQ_HXV%Lkol#?og&#`{D(5_z)-Av-OAzeuOR&9HvnB$B3S3prG~Q9& zgL|#69;HAT87tJPQb_N#ui9X8ZdlCCHmWT0Ac|k5Yv*cG)iW7;=XE%J9_h(c4K63+ zUoH%0y?C|cqF1kABF=AdNK6!e>DU}Lxw)@Vl|k6Ny27WrH8JD7oLq>1_bpyaadiA9a! zCS#GJ4Z_B*$EL^P4{NB)SF@2eZV$Ef4xN_M5LJ%jc~+6zWG%|=9=CMbeQrb+ zx{H{2g39%U#Od>|7Opx)iDMow?b0yzM{q$t% zi{}*wv0w2a>vAdS9IlVhh7>UTkNN&U%M#}cOmTXY z4|VpGJ<gy~-9ETpX8xO$?k%CO4jX^P8aJK=oQJSZI<2ltVVo`3r zN1igzjQi=X-L;*Xc4w=491-h0(=3i;cIQVmQko?K;?+BC8Itb!d)HnGp)3;{?%cI) zNGc;z+n<;yh${!{I*Edt-nNUys%wB364KjMJqgjVLNQ|7h-Nnq5-a1!fA1S`RVxkH z^PblJ{(axh?;-w>ODJhSQ zhJg>iI!_9n9zxMwRLP(^1M3=Z;Yh_MxCVS1* zv-L7LlumI>`qz2)BogPf3|?kfSu&9GM0QpPt1(`bd7=9c>a!^}%L7Bsm><@MJ3gu8 z7&33j($)8JNH3~In#V+h!^$iDaSoTez3kbI*3Q3&cly;wM5roy~-Cxn#W8?S@CiH#yN74G_SX37)9YHMx9VsGv|rfwy3(MJ!K;Vai5 zJ)b*65KbV*P;&#eq|eRGKcEG%b8Lo5#+AX{$0_yFM*3uo7=plp05zB{h{V`E}@(6So6Nfsm|R2 zHd{@5lye~!%-Egav|rf0x}YU`f^>69W=)eZU0r;fI>U2w$Q&;hZ}t6*>(4$hKHOcx zH&KU^UfNeSJZFuKfem|$q-$IDPQ2egI9wi~P}XbS^|-6n$eM3enaW>t(VFG1fa9ed zEnYijRu-Kkox&=-JvKhbavNF`?`!WjmKo+mz%v?32>V>VPMIH0@9R z!y~+rh#8cD(fA>o8=8BKKF_Bb$Z(dx){v%?lUI}Y=O3Ih9ypX%a9HP-9+2j5A#+sr z1G?RL9(P0kLD%}(AfxDwQMI)SrQP+zy9XRHH#&t|BcIDX<`op?J->aA_9m9vH0N~N z!#e-S9j)yxiEA?sof>+TlPhDpF88n^FE6-mDsB(=4eaYZYQto(xAP&>UpG_Ctqv)lfl zDEoK`Xz;ms; zBd2oAc|MdYEFm5H1b%B;dRb<9m50{Nei)JF^POrzZvv7gU}gddaWkYg2nrMgN7PRa zx5C=YLRc0KEQqlI1_lBET5tjg9RRoq4nP2KZvym$cpP*AJ)zHcKggec0JvjlAQ6Du z5lBQp2|%p)wIeWyG!|s~gC5!teJBKDdI;bKK_H-`t%cIn(bYx*NKgxn#-h=H`--6n zoyLMJnSg+7eq)vv40=%DFZq27w}Spi*#Sy|L7*`M1!28If54UiixEWpaWa9lOo_o1 zZ=$`0u>ky57Tli5qz5s)iA+Gy9Q$926r}%y@cvUIQ(z0XqWCbOVg!A#|CxJ`pypp3 zV1996$DsQJc|#Og)tf+J&;f)N0;2^2s$>=`kf{fUIt`&D1|g74@n&k#86-8el|UvC zfo9PefPuN0xj6`G>w+N04BEyZsDpx}U?ZS+5RzyRL_!h;osp2viiFNcEOZBL9cU0% zHiQXmQ8?%h@+sJu|L0c_6VlUx0$`wENZpm8fUl%Sq0>wSL!@e|hXj!bNC|~Np^+$1 z6Vz4#LA766qVr2jzV+0Ez#;_DNh`$)hKTunZ2lRx5C+i~1_D?Zl=t@qV9;n38t?_a zV@NClYPMhjw4WFn3q|{H3<3Qz{*8g)|6)jOUFfU*w;mFUg(l+P7z%;@B`%9Wpac*Z zEB}xjC}Bh>Wx=f2)9EZgQ24ijwxs#e0l{dj%o>wLV6avyL?J;eOi9V?pgHV6cZaBG 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