diff options
author | Norbert Preining <norbert@preining.info> | 2022-12-28 03:01:37 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-12-28 03:01:37 +0000 |
commit | c593cd7fcc1d6af28601f82bf0354a13eca3ff93 (patch) | |
tree | a5dd863995adf7f9090c66b45a3aa95c31b54f4c /graphics/pgf | |
parent | 9dfeafbb128537c1633d77071d8cc9b9f8c5a800 (diff) |
CTAN sync 202212280301
Diffstat (limited to 'graphics/pgf')
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/README.md | 4 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdf | bin | 1374037 -> 1374364 bytes | |||
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex | 10 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdf | bin | 1361649 -> 1361992 bytes | |||
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex | 5 | ||||
-rw-r--r-- | graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty | 59 |
6 files changed, 39 insertions, 39 deletions
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/README.md b/graphics/pgf/contrib/tikz-mirror-lens/README.md index c71332863c..76f190c84c 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/README.md +++ b/graphics/pgf/contrib/tikz-mirror-lens/README.md @@ -40,3 +40,7 @@ Version ============ 1.0.0 (2022-12-24): Publication of the package. +Contact info +============ +Please, user the following email adress to contact the package maintainer: + fernandozucatelli@yahoo.com.br diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdf b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdf Binary files differindex 7a10685d4d..cacfb83c97 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdf +++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdf diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex index 9d977fd7be..12a6066898 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex +++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex @@ -143,7 +143,7 @@ Os seguintes comandos desenham as principais componentes do diagrama, \begin{itemize} \item desenho do espelho: \verb|\mirrorBase{f}{yM}{xL}{xR}|; \item desenho dos pontos notáveis: \verb|\mirrorPts{v}{f}{c}}|; - \item desenho dos raios notáveis: \verb|\mirrorRays{p}{pp}{o}{i}|. + \item desenho dos raios notáveis: \verb|\mirrorRays[setas]{p}{pp}{o}{i}|. \end{itemize} Os seguintes comandos são os mesmos para os espelhos e para as lentes, e são responsáveis por, @@ -393,7 +393,7 @@ Os seguintes comandos desenham as principais componentes do diagrama, \begin{itemize} \item desenho da lente: \verb|\lensBase{f}{yM}{xL}{xR}|; \item desenho dos pontos notáveis: \verb|\lensPts{v}{f}{a}|; - \item desenho dos raios notáveis: \verb|\lensRays{p}{pp}{o}{i}|. + \item desenho dos raios notáveis: \verb|\lensRays[seta]{p}{pp}{o}{i}|. \end{itemize} \subsection{Exemplos de cada caso possível das lentes} @@ -559,14 +559,9 @@ A seguir, encontram-se \textit{links} interessantes para outros pacotes com impl \item \href{https://youtu.be/efPZ5uSDeuI}{{\YouTube} -- The Organic Chemistry Tutor -- Spherical Mirrors \& The Mirror Equation - Geometric Optics} \item \href{http://hyperphysics.phy-astr.gsu.edu/hbase/geoopt/mireq.html}{hyperphysics -- Spherical Mirror Equation} - \item \href{http://hyperphysics.phy-astr.gsu.edu/hbase/geoopt/lenseq.html}{hyperphysics -- lenseq} \item \href{https://www.plymouth.ac.uk/uploads/production/document/path/3/3754/PlymouthUniversity_MathsandStats_outreach_lenses.pdf}{plymouth -- lenses} \item \href{https://www.khanacademy.org/science/in-in-class10th-physics/in-in-10th-physics-light-reflection-refraction/in-in-lens-formula-magnification/v/lens-formula}{khanacademy -- lens formula} - % https://brasilescola.uol.com.br/fisica/espelhos-esfericos.htm - % https://mundoeducacao.uol.com.br/fisica/lentes-esfericas.htm - % https://www.todamateria.com.br/lentes-esfericas/ - % https://pt.wikipedia.org/wiki/Lente \end{enumerate} \end{FHZmirroLensTcolorbox} @@ -575,6 +570,7 @@ A seguir, encontram-se \textit{links} interessantes para outros pacotes com impl \begin{FHZmirroLensTcolorbox} \begin{enumerate}[leftmargin=3.5cm] \item[1.0.0 (2022-12-24):] Criação do pacote. + \item[1.0.1 (2022-12-27):] Pequenas correção na entrada dos argumentos das funções em \verb|\mirrorRays| e em \verb|\lensRays|. \end{enumerate} \end{FHZmirroLensTcolorbox} diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdf b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdf Binary files differindex bf794f1b8f..2aa9748b0f 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdf +++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdf diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex index 13e39dc610..94d9d0a505 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex +++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex @@ -142,7 +142,7 @@ The following commands draw the main components of the diagram, \begin{itemize} \item mirror drawing: \verb|\mirrorBase{f}{yM}{xL}{xR}|; \item notable points drawing: \verb|\mirrorPts{v}{f}{c}}|; - \item notable rays drawing: \verb|\mirrorRays{p}{pp}{o}{i}|. + \item notable rays drawing: \verb|\mirrorRays[arrows]{p}{pp}{o}{i}|. \end{itemize} The following commands are the same for mirrors and lenses, and are responsible for, @@ -387,7 +387,7 @@ The following commands draw the main components of the diagram, \begin{itemize} \item lens design: \verb|\lensBase{f}{yM}{xL}{xR}|; \item notable points drawing: \verb|\lensPts{v}{f}{a}|; - \item notable ray drawing: \verb|\lensRays{p}{pp}{o}{i}|. + \item notable ray drawing: \verb|\lensRays[arrows]{p}{pp}{o}{i}|. \end{itemize} \subsection{Examples of each possible lens case} @@ -564,6 +564,7 @@ Below are interesting \textit{links} to other packages with optics implementatio \begin{FHZmirroLensTcolorbox} \begin{enumerate}[leftmargin=3.5cm] \item[1.0.0 (2022-12-24):] Package creation. + \item[1.0.1 (2022-12-27):] Small corrections on function argument input order in \verb|\mirrorRays| and in \verb|\lensRays|. \end{enumerate} \end{FHZmirroLensTcolorbox} diff --git a/graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty b/graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty index cac1f21c2d..00301f6f8f 100644 --- a/graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty +++ b/graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty @@ -5,6 +5,7 @@ \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{tikz-mirror-lens}[2022-12-25 Custom Package for drawing spherical mirrors and lens -- FHZ -- Version 1.0.0] +\RequirePackage{amsmath} \RequirePackage{tikz} \usetikzlibrary{calc} \usetikzlibrary{math} @@ -144,7 +145,7 @@ % Summary of commands % \mirrorBase{f}{ymirror}{minEixoX}{maxEixoX} % \mirrorPts{v}{f}{c} -% \mirrorRays{p}{pp}{o}{i} +% \mirrorRays[arrow]{p}{pp}{o}{i} % ======================================================= \newcommand{\mirrorBase}[4]{ \begin{scope} @@ -166,19 +167,19 @@ \fill (#3,0) coordinate(C) circle(0.05) node[below]{$c$}; \end{scope} } -\newcommand{\mirrorRays}[4]{ +\newcommand{\mirrorRays}[5][60]{ \begin{scope}[thick,extended line=25pt] \tikzmath{ - if (#2 != 0) then { + if (#3 != 0) then { { - \draw[arrDec={#1},cyan] (#1,#3) -- (0,#3) -- (F) -- (#2,#4); - \draw[arrDec={#1-10},magenta] (O) -- (F) -- (0,#4) -- (#2,#4); - \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#2,#4); + \draw[arrDec={#1},cyan] (#2,#4) -- (0,#4) -- (F) -- (#3,#5); + \draw[arrDec={#1-10},magenta] (O) -- (F) -- (0,#5) -- (#3,#5); + \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#3,#5); }; } else { { - \draw[arrDec={#1},cyan] (#1,#3) -- (0,#3) -- (F); - \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#1,-#3); + \draw[arrDec={#1},cyan] (#2,#4) -- (0,#4) -- (F); + \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#2,-#4); }; }; }; @@ -192,7 +193,7 @@ % Summary of commands % \lensBase{f}{ymirror}{minEixoX}{maxEixoX} % \lensPts{v}{f}{a} -% \lensRays{p}{pp}{o}{i} +% \lensRays[arrows]{p}{pp}{o}{i} % ======================================================= \newcommand{\lensBase}[4]{ \begin{scope} @@ -214,19 +215,19 @@ \fill (-#3,0) coordinate(Ci) circle(0.05) node[below]{$A_i$}; \end{scope} } -\newcommand{\lensRays}[4]{ +\newcommand{\lensRays}[5][60]{ \begin{scope}[thick,extended line=25pt] \tikzmath{ - if (\pp != 0) then { + if (#3 != 0) then { { - \draw[arrDec={#1},cyan] (\p,\o) -- (0,\o) -- (Fi) -- (\pp,\i); - \draw[arrDec={#1-10},magenta] (O) -- (F) -- (0,\i) -- (\pp,\i); - \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (\pp,\i); + \draw[arrDec={#1},cyan] (#2,#4) -- (0,#4) -- (Fi) -- (#3,#5); + \draw[arrDec={#1-10},magenta] (O) -- (F) -- (0,#5) -- (#3,#5); + \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#3,#5); }; } else { { - \draw[arrDec={#1},cyan] (\p,\o) -- (0,\o) -- (Fi); - \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (-\p,-\o); + \draw[arrDec={#1},cyan] (#2,#4) -- (0,#4) -- (Fi); + \draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (-#2,-#4); }; }; }; @@ -256,7 +257,7 @@ \mirrorBase{\f}{\ymirror}{{min(\v,\pp,\c)}}{{max(\c+0.5,\p,\pp)}} \mirrorPts{\v}{\f}{\c} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \mirrorRays{\p}{\pp}{\o}{\i} + \mirrorRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\mirrorSphGaussCoord}[5][60]{ @@ -278,7 +279,7 @@ \mirrorBase{\f}{\ymirror}{{min(\v,\pp,\c)}}{{max(\c+0.5,\p,\pp)}} \mirrorPts{\v}{\f}{\c} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \mirrorRays{\p}{\pp}{\o}{\i} + \mirrorRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{({max(\c+0.5,\p,\pp)+1},-1)} \end{tikzpicture} } @@ -301,7 +302,7 @@ \mirrorBase{\f}{\ymirror}{#7}{#8} \mirrorPts{\v}{\f}{\c} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \mirrorRays{\p}{\pp}{\o}{\i} + \mirrorRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\mirrorSphGaussFixedCoord}[9][60]{ @@ -323,7 +324,7 @@ \mirrorBase{\f}{\ymirror}{#7}{#8} \mirrorPts{\v}{\f}{\c} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \mirrorRays{\p}{\pp}{\o}{\i} + \mirrorRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{#9} \end{tikzpicture} } @@ -351,8 +352,7 @@ \lensBase{\f}{\ymirror}{{min(\v,\pp,\a)}}{{max(\a+0.5,\p,\pp)}} \lensPts{\v}{\f}{\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} - %\mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{{max(\a+0.5,\p,\pp)}+1} + \lensRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\lensSphGaussCoord}[5][60]{ @@ -374,7 +374,7 @@ \lensBase{\f}{\ymirror}{{min(\v,\pp,\a)}}{{max(\a+0.5,\p,\pp)}} \lensPts{\v}{\f}{\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{({max(\a+0.5,\p,\pp)+1},-1)} \end{tikzpicture} } @@ -397,7 +397,7 @@ \lensBase{\f}{\ymirror}{#7}{#8} \lensPts{\v}{\f}{\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\lensSphGaussFixedCoord}[9][60]{ @@ -419,7 +419,7 @@ \lensBase{\f}{\ymirror}{#7}{#8} \lensPts{\v}{\f}{\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{#9} \end{tikzpicture} } @@ -447,8 +447,7 @@ \lensBase{\f}{\ymirror}{{min(\v,\p,\pp,\a,-\a)}}{{max(\v,\p,\pp,\a,-\a)}} \lensPts{\v}{-\f}{-\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} - %\mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{{max(\a+0.5,\p,\pp)}+1} + \lensRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\lensSphGaussLCoord}[5][60]{ @@ -470,7 +469,7 @@ \lensBase{\f}{\ymirror}{{min(\v,\p,\pp,\a,-\a)}}{{max(\v,\p,\pp,\a,-\a)}} \lensPts{\v}{-\f}{-\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{({max(\v,\p,\pp,\a,-\a)},-1)} \end{tikzpicture} } @@ -493,7 +492,7 @@ \lensBase{\f}{\ymirror}{#7}{#8} \lensPts{\v}{-\f}{-\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \end{tikzpicture} } \newcommand{\lensSphGaussLFixedCoord}[9][60]{ @@ -515,7 +514,7 @@ \lensBase{\f}{\ymirror}{#7}{#8} \lensPts{\v}{-\f}{-\a} \mirrorLensObjIma{\p}{\pp}{\o}{\i} - \lensRays{\p}{\pp}{\o}{\i} + \lensRays[#1]{\p}{\pp}{\o}{\i} \mirrorLensCoord{\p}{\pp}{\o}{\i}{\f}{#9} \end{tikzpicture} } |