summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-04-18 03:02:36 +0000
committerNorbert Preining <norbert@preining.info>2023-04-18 03:02:36 +0000
commit80e82c6cd5fb165fa720a1ce3a25f357ea11b9fc (patch)
treef8978ec3fb998e446d63ff65719cc30189deeb5f /graphics
parent88aa9bb9a3222cf13820ae3b6f64ce48dcd003ea (diff)
CTAN sync 202304180302
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/quickreaction/README.txt6
-rw-r--r--graphics/pgf/contrib/quickreaction/quickreaction.pdfbin249110 -> 249125 bytes
-rw-r--r--graphics/pgf/contrib/quickreaction/quickreaction.sty16
-rw-r--r--graphics/pgf/contrib/quickreaction/quickreaction.tex38
-rw-r--r--graphics/pstricks/contrib/pstricks-add/Changes3
-rw-r--r--graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdfbin12448916 -> 12459825 bytes
-rw-r--r--graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex10
-rw-r--r--graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex37
8 files changed, 68 insertions, 42 deletions
diff --git a/graphics/pgf/contrib/quickreaction/README.txt b/graphics/pgf/contrib/quickreaction/README.txt
index 1433292d07..146a5d2c8c 100644
--- a/graphics/pgf/contrib/quickreaction/README.txt
+++ b/graphics/pgf/contrib/quickreaction/README.txt
@@ -1,8 +1,8 @@
quickreaction package
- v 1.02
- 2023/04/11
+ v 1.02.01
+ 2023/04/17
-Maintainer: Lambertini Francesco
+Maintainer: Francesco Lambertini
E-mail : kekko.francy@gmail.com
Licence : Released under the LaTeX Project Public License v1.3c or
later, see http://www.latex-project.org/lppl.txt
diff --git a/graphics/pgf/contrib/quickreaction/quickreaction.pdf b/graphics/pgf/contrib/quickreaction/quickreaction.pdf
index 47bed6e64f..0f8028a27f 100644
--- a/graphics/pgf/contrib/quickreaction/quickreaction.pdf
+++ b/graphics/pgf/contrib/quickreaction/quickreaction.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/quickreaction/quickreaction.sty b/graphics/pgf/contrib/quickreaction/quickreaction.sty
index 9aafdc199b..43227b382f 100644
--- a/graphics/pgf/contrib/quickreaction/quickreaction.sty
+++ b/graphics/pgf/contrib/quickreaction/quickreaction.sty
@@ -1,20 +1,22 @@
- %% Copyright 2023 Lambertini Francesco
+ %% Copyright 2023 Francesco Lambertini
%
% This work may be distributed and/or modified under the
- % conditions of the LaTeX Project Public License, either version 1.3
+ % conditions of the LaTeX Project Public License, either version 1.3c
% of this license or any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
- % and version 1.3 or later is part of all distributions of LaTeX
- % version 2023/04/11 or later.
+ % and version 1.3c or later is part of all distributions of LaTeX
+ % version 2023/04/17 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
- % The Current Maintainer of this work is Lambertini Francesco.
+ % The Current Maintainer of this work is Francesco Lambertini.
%
% This work consists of the files quickreaction.sty, quickreaction.tex and quickreaction.pdf.
+ %
+ % v1.02.01 2023/04/17
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{quickreaction}[2023/04/11]
+\ProvidesPackage{quickreaction}[2023/04/17]
\RequirePackage{tikz}
\RequirePackage{xparse}
@@ -81,8 +83,6 @@ bond style={line width=0.5pt}
\end{tikzpicture}%
}{}
-%\AddToHook{env/quickreaction/begin}{\catcode`\&\active}
-
\NewDocumentCommand{\quickarrow}{O{} O{}}{%
\newcommand{\argone}{#1}%
\newcommand{\argtwo}{#2}%
diff --git a/graphics/pgf/contrib/quickreaction/quickreaction.tex b/graphics/pgf/contrib/quickreaction/quickreaction.tex
index 1b5770b6cc..c9ce7cbb22 100644
--- a/graphics/pgf/contrib/quickreaction/quickreaction.tex
+++ b/graphics/pgf/contrib/quickreaction/quickreaction.tex
@@ -1,18 +1,20 @@
- %% Copyright 2023 Lambertini Francesco
+ %% Copyright 2023 Francesco Lambertini
%
% This work may be distributed and/or modified under the
- % conditions of the LaTeX Project Public License, either version 1.3
+ % conditions of the LaTeX Project Public License, either version 1.3c
% of this license or any later version.
% The latest version of this license is in
- % http://www.latex-project.org/lppl.txt
- % and version 1.3 or later is part of all distributions of LaTeX
- % version 2023/04/11 or later.
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3c or later is part of all distributions of LaTeX
+ % version 2023/04/17 or later.
%
% This work has the LPPL maintenance status `maintained'.
%
- % The Current Maintainer of this work is Lambertini Francesco.
+ % The Current Maintainer of this work is Francesco Lambertini.
%
% This work consists of the files quickreaction.sty, quickreaction.tex and quickreaction.pdf.
+ %
+ % v1.02.01 2023/04/17
\documentclass{scrarticle}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
@@ -38,7 +40,7 @@
%C1=COC=C1
\newcommand{\furan}{\chemfig{-[:180,,,,dbl={73}{73}]-[:252]O-[:324]-[:36,,,,dbl={73}{73}](-[:108])}}
%CC(=O)[Cl]
-\newcommand{\acetylclorhyde}{\chemfig{-[:90](=[:150]O)-[:30]Cl}}
+\newcommand{\acetylchloride}{\chemfig{-[:90](=[:150]O)-[:30]Cl}}
%CC(=O)C1=CC=CO1
\newcommand{\acetylfuran}{\chemfig{-[:294](=[:234]O)-[:354]-[:300,,,,dbl={73}{73}]-[:12]-[:84,,,,dbl={73}{73}]-[:156]O(-[:228])}}
%C(CC(=O)OCC)(=O)OCC
@@ -90,7 +92,7 @@ linkcolor=black,
\vspace{0.5cm}
-v1.02 \hspace{1cm} 2023/04/11
+v1.02.01 \hspace{1cm} 2023/04/17
\vspace{0.5cm}
@@ -98,7 +100,7 @@ Simple and fast way to typeset chemical reactions
\vspace{0.5cm}
-Lambertini Francesco
+Francesco Lambertini
\vspace{0.5cm}
@@ -196,21 +198,21 @@ It is common in chemistry to specify the order of multiple separate steps in a r
%C1=COC=C1
\newcommand{\furan}{\chemfig{-[:180,,,,dbl={73}{73}]-[:252]O-[:324]-[:36,,,,dbl={73}{73}](-[:108])}}
%CC(=O)[Cl]
-\newcommand{\acetylclorhyde}{\chemfig{-[:90](=[:150]O)-[:30]Cl}}
+\newcommand{\acetylchloride}{\chemfig{-[:90](=[:150]O)-[:30]Cl}}
%CC(=O)C1=CC=CO1
\newcommand{\acetylfuran}{\chemfig{-[:294](=[:234]O)-[:354]-[:300,,,,dbl={73}{73}]-[:12]-[:84,,,,dbl={73}{73}]-[:156]O(-[:228])}}
%Document
\begin{quickreaction}
-\furan \& + \& \acetylclorhyde \& \quickarrow[1) \chemfig{BF_3}][2)\chemfig{H_2O}] \& \acetylfuran \\
-furan \& \& acetylclorhyde \& \& 2-acetylfuran \\
+\furan \& + \& \acetylchloride \& \quickarrow[1) \chemfig{BF_3}][2)\chemfig{H_2O}] \& \acetylfuran \\
+furan \& \& acetyl chloride \& \& 2-acetylfuran \\
\end{quickreaction}
\end{lstlisting}
\begin{center}
\begin{quickreaction}
-\furan \& + \& \acetylclorhyde \& \quickarrow[1) \chemfig{BF_3}][2) \chemfig{H_2O}] \& \acetylfuran \\
-furan \& \& acetylclorhyde \& \& 2-acetylfuran \\
+\furan \& + \& \acetylchloride \& \quickarrow[1) \chemfig{BF_3}][2) \chemfig{H_2O}] \& \acetylfuran \\
+furan \& \& acetyl chloride \& \& 2-acetylfuran \\
\end{quickreaction}
\end{center}
@@ -218,15 +220,15 @@ Usually, when there are no steps, arrow labels above and below are centered but
\begin{lstlisting}
\begin{quickreaction}
-\furan \& + \& \acetylclorhyde \& \quickarrow[\parbox{1.2cm}{1) \chemfig{BF_3}}][\parbox{1.2cm}{2) \chemfig{H_2O}}] \& \acetylfuran \\
-|furan| \& \& |acetylclorhyde| \& \& |2-acetylfuran| \\
+\furan \& + \& \acetylchloride \& \quickarrow[\parbox{1.2cm}{1) \chemfig{BF_3}}][\parbox{1.2cm}{2) \chemfig{H_2O}}] \& \acetylfuran \\
+|furan| \& \& |acetyl chloride| \& \& |2-acetylfuran| \\
\end{quickreaction}
\end{lstlisting}
\begin{center}
\begin{quickreaction}
-\furan \& + \& \acetylclorhyde \& \quickarrow[\parbox{1.2cm}{1) \chemfig{BF_3}}][\parbox{1.2cm}{2) \chemfig{H_2O}}] \& \acetylfuran \\
-furan \& \& acetylclorhyde \& \& 2-acetylfuran \\
+\furan \& + \& \acetylchloride \& \quickarrow[\parbox{1.2cm}{1) \chemfig{BF_3}}][\parbox{1.2cm}{2) \chemfig{H_2O}}] \& \acetylfuran \\
+furan \& \& acetyl chloride \& \& 2-acetylfuran \\
\end{quickreaction}
\end{center}
diff --git a/graphics/pstricks/contrib/pstricks-add/Changes b/graphics/pstricks/contrib/pstricks-add/Changes
index aab0b20fe3..12da3933fb 100644
--- a/graphics/pstricks/contrib/pstricks-add/Changes
+++ b/graphics/pstricks/contrib/pstricks-add/Changes
@@ -1,4 +1,4 @@
-%% $Id: Changes 656 2022-11-21 08:41:43Z herbert $
+%% $Id: Changes 705 2023-04-17 18:32:58Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -14,6 +14,7 @@ pstricks-add.sty ----------- (hv)
pstricks-add.tex ----------- (hv)
+ v 3.94 2023-04-17 - use L3 for floating point on LaTeX level
v 3.93 2022-11-21 - modifies documentation
fix for \psOlypicRings
v 3.92 2021-12-25 - added \psColorLine
diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
index 17450fd892..aa6a853289 100644
--- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
+++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
index e36c8d3b20..b12623a7ac 100644
--- a/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
+++ b/graphics/pstricks/contrib/pstricks-add/doc/pstricks-add-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 656 2022-11-21 08:41:43Z herbert $
+%% $Id: pstricks-add-doc.tex 705 2023-04-17 18:32:58Z herbert $
%\RequirePackage{pdfmanagement-testphase}
%\DeclareDocumentMetadata{}
%
@@ -145,7 +145,7 @@ Timothy Van Zandt
\begin{BDef}
\Lcs{psGetSlope}\coord1\coord2\Lcs{\Larga{macro}}\\
-\Lcs{psGetDistance}\coord1\coord2\Lcs{\Larga{macro}}
+\Lcs{psGetDistance}\OptArg{\Larga{decimals}}\coord1\coord2\Lcs{\Larga{macro}}
\end{BDef}
\begin{LTXexample}[width=4cm]
@@ -159,6 +159,12 @@ Timothy Van Zandt
%\psGetDistance(-2111,-12)(3,1)\DVal ==> Overflow!
\end{LTXexample}
+\begin{LTXexample}[width=4cm]
+\psGetDistance(-2,1)(3,-1.5)\DVal \DVal\\
+\psGetDistance[5](-2,1)(3,-1.5)\DVal \DVal\\
+\psGetDistance[3](-2,1)(3,-1.5)\DVal \DVal\\
+\psGetDistance[1](-2,1)(3,-1.5)\DVal \DVal
+\end{LTXexample}
\clearpage
diff --git a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
index 2b0344422d..e0f7996574 100644
--- a/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
+++ b/graphics/pstricks/contrib/pstricks-add/tex/pstricks-add.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add.tex 656 2022-11-21 08:41:43Z herbert $
+%% $Id: pstricks-add.tex 705 2023-04-17 18:32:58Z herbert $
%%
%% This is file `pstricks-add.tex',
%%
@@ -31,8 +31,8 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\PSTmathLoaded\endinput\else \input pst-math \fi
%
-\def\fileversion{3.93}
-\def\filedate{2022/11/21}
+\def\fileversion{3.94}
+\def\filedate{2023/04/17}
\let\pstricksaddFV\fileversion
\message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)}
%
@@ -50,13 +50,30 @@
\advance\pst@dimn by -#4pt
\pst@divide{\pst@dimn}{\pst@dimm}#5}
%
-\def\psGetDistance(#1,#2)(#3,#4)#5{% 4 values without a dimen! #5 is a macro
- \pst@dimm=#1pt%
- \advance\pst@dimm by -#3pt%
- \pst@dimn=#2pt%
- \advance\pst@dimn by -#4pt
- \pst@pyth\pst@dimm\pst@dimn\pst@dimo
- \edef#5{\strip@pt\pst@dimo}
+\def\psGetDistance{\@ifnextchar[\psGetDistance@i{\psGetDistance@ii}}
+\def\psGetDistance@i[#1](#2,#3)(#4,#5)#6{% 4 values without a dimen! #6 is a macro
+ \if@pstLaTeX
+ \edef#6{\pscalculate{round(sqrt((#4-#2)^2+(#5-#3)^2),#1)}}%
+ \else
+ \pst@dimm=#1pt
+ \advance\pst@dimm by -#3pt
+ \pst@dimn=#2pt
+ \advance\pst@dimn by -#4pt
+ \pst@pyth\pst@dimm\pst@dimn\pst@dimo
+ \edef#5{\strip@pt\pst@dimo}%
+ \fi
+}%
+\def\psGetDistance@ii(#1,#2)(#3,#4)#5{% 4 values without a dimen! #6 is a macro
+ \if@pstLaTeX
+ \edef#5{\pscalculate{sqrt((#3-#1)^2+(#4-#2)^2)}}%
+ \else
+ \pst@dimm=#1pt
+ \advance\pst@dimm by -#3pt
+ \pst@dimn=#2pt
+ \advance\pst@dimn by -#4pt
+ \pst@pyth\pst@dimm\pst@dimn\pst@dimo
+ \edef#5{\strip@pt\pst@dimo}%
+ \fi
}%
%--------------------------------------- small stuff -------------------------------
\define@boolkey[psset]{pstricks-add}[Pst@]{CMYK}[true]{}