summaryrefslogtreecommitdiff
path: root/graphics/pgf
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-01-10 03:01:21 +0000
committerNorbert Preining <norbert@preining.info>2023-01-10 03:01:21 +0000
commitdecba0e4470fd7bfe288f98ee709553fc13014b8 (patch)
tree781f266fc727864e1c9bb62f07c1069dc926fbec /graphics/pgf
parent61f8490e549cb7af263b9d903bc20d61ea37a2d7 (diff)
CTAN sync 202301100301
Diffstat (limited to 'graphics/pgf')
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/README.md24
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/input_pacotes.tex86
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_espelhos.tex20
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentes.tex16
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentesL.tex16
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.pdfbin1374364 -> 1379636 bytes
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens-PT.tex21
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.pdfbin1361992 -> 1364264 bytes
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/doc/tikz-mirror-lens.tex41
-rw-r--r--graphics/pgf/contrib/tikz-mirror-lens/tex/tikz-mirror-lens.sty22
10 files changed, 212 insertions, 34 deletions
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/README.md b/graphics/pgf/contrib/tikz-mirror-lens/README.md
index 76f190c84c..94b018c57c 100644
--- a/graphics/pgf/contrib/tikz-mirror-lens/README.md
+++ b/graphics/pgf/contrib/tikz-mirror-lens/README.md
@@ -1,7 +1,7 @@
-%% The LaTeX package tikz-mirror-lens - version 1.0.0 (2022-12-24)
+%% The LaTeX package tikz-mirror-lens - version 1.0.2 (2023-01-08)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2022 by FHZ
+%% Copyright (c) 2023 by FHZ
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -22,13 +22,17 @@ of the light rays reflected in mirror or through lenses.
Contents of the package
=======================
- 'README' this file
+ 'README' this file
'tikz-mirror-lens.cwl' Completion Word List for some editors
- 'tikz-mirror-lens.pdf' Documentation for tikz-mirror-lens
- 'tikz-mirror-lens-PT.pdf' Documentation for tikz-mirror-lens in Portuguese
- 'tikz-mirror-lens.sty' LaTeX package file (style file)
- 'tikz-mirror-lens.tex' Source code of the documentation (main file)
- 'tikz-mirror-lens-PT.tex' Source code of the documentation (main file) in Portuguese
+ 'tikz-mirror-lens.pdf' Documentation for tikz-mirror-lens
+ 'tikz-mirror-lens-PT.pdf' Documentation for tikz-mirror-lens in Portuguese
+ 'tikz-mirror-lens.sty' LaTeX package file (style file)
+ 'tikz-mirror-lens.tex' Source code of the documentation (main file)
+ 'tikz-mirror-lens-PT.tex' Source code of the documentation (main file) in Portuguese
+ 'input_pacotes' Packages and commands used to compile
+ 'input_tab_configuracoes_espelhos' Table data with mirrors's configurations
+ 'input_tab_configuracoes_lentes' Table data with lens' configurations
+ 'input_tab_configuracoes_lentesL' Table data with lens' configurations on the left
Installation
============
@@ -39,8 +43,10 @@ No .ins/.dtx preinstalation is required.
Version
============
1.0.0 (2022-12-24): Publication of the package.
+1.0.1 (2022-12-27): Small corrections on function argument input order in \mirrorRays and in \lensRays.
+1.0.2 (2023-01-08): Revised the English version and removed unnecessary semicolons (suggested by Denis Bitouzé).
Contact info
============
-Please, user the following email adress to contact the package maintainer:
+Please, use the following email adress to contact the package maintainer:
fernandozucatelli@yahoo.com.br
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/input_pacotes.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_pacotes.tex
new file mode 100644
index 0000000000..59f36f37c3
--- /dev/null
+++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_pacotes.tex
@@ -0,0 +1,86 @@
+% !TeX spellcheck = en_US
+% !TeX encoding = UTF-8
+% =============================
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[margin=2.5cm]{geometry}
+\usepackage{amsmath,adjustbox}
+\usepackage{animate}
+\usepackage[section]{placeins}
+\usepackage{tikz-mirror-lens}
+\usepackage{multicol}
+\usepackage{multirow}
+\usepackage{abstract}
+\usepackage{enumitem}
+\usepackage{csquotes}
+\usepackage{indentfirst}
+
+\usepackage[toc]{multitoc}
+
+% ========== FHZ packages
+%\usepackage{FHZ-listings-showexpl-style}
+%\usepackage{FHZ-tcolorbox}
+\usepackage[skins,listings,breakable,raster]{tcolorbox}
+% ----------------------------------------------------------
+%\usepackage{FHZ-textos}
+\newcommand{\TikZ}{Ti\textit{k}Z}
+% ----------------------------------------------------------
+
+% ----------------------------------------------------------
+% \usepackage{FHZ-formatacao-hf-headings_h_R_thepage}
+\usepackage{fancyhdr}
+\pagestyle{headings} % fancy, myheadings
+%\fancypagestyle{plain}{ % alteração de estilo pré-definido.
+% \fancyhf{} % clear all header and footer fields
+% \fancyhead[R]{\thepage} % except the right top corner
+% \renewcommand{\headrulewidth}{0pt} % remove line between header and main text
+%}
+% ----------------------------------------------------------
+
+% ----------------------------------------------------------
+% \usepackage{FHZ-formatacao-subcaption}
+\usepackage{graphicx}
+\usepackage{caption}
+\usepackage{subcaption}
+\usepackage{adjustbox}
+%\captionsetup{font=small,labelsep=period,textfont=bf,labelfont=bf,textformat=period}
+\captionsetup{font=small,textformat=period} % ,labelfont=bf,labelsep=period,textfont=bf
+\captionsetup[table]{position=top}
+\captionsetup[figure]{position=below}
+\captionsetup[subtable]{textfont={}, font=footnotesize}
+\captionsetup[subfigure]{textfont={}, font=footnotesize}
+% ==========
+
+% ----------------------------------------------------------
+%\usepackage{FHZ-capa-article}
+\newcommand{\FHZCapaArticleCabecalho}[3]{
+ \begin{center}
+ \Large{#1}
+
+ {#2}
+ \end{center}
+ \begin{center}
+ \Large
+ {#3}
+ \end{center}
+}
+% ----------------------------------------------------------
+
+\usepackage[colorlinks]{hyperref}
+
+\newtcolorbox{FHZmirroLensTcolorbox}{
+ enhanced, breakable,
+ colback=cyan!10!white,
+ colframe=blue!90!black,
+}
+
+% ========== Dados capa folha rosto ========== Igual entre versões PT e EN.
+\newcommand{\edicao}{1}
+\newcommand{\versao}{1.0.2}
+
+\newcommand{\Cidade}{\textbf{tikz-mirror-lens package}\\} %{Cidade --}
+\newcommand{\Estado}{\url{https://www.ctan.org/pkg/tikZ-mirror-lens}\\} %{Estado --}
+% ======================
+\newcommand{\AutorA}{\textbf{FHZ}}
+% ====================== Input_Folha_Rosto_Livro_Versao \ No newline at end of file
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_espelhos.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_espelhos.tex
new file mode 100644
index 0000000000..90a2d364c3
--- /dev/null
+++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_espelhos.tex
@@ -0,0 +1,20 @@
+% !TeX spellcheck = pt_BR
+% !TeX encoding = UTF-8
+% =============================
+
+\begin{tabular}{r cc|c}
+ & \multicolumn{3}{c}{coord} \\
+ & & No & Yes \\
+ \cline{2-4}
+ & {No} & & \\
+ \multirow{4}{*}{\rotatebox{90}{fixed mirror size}} & & \adjustbox{height=3cm}{\mirrorSphGauss[50]{2}{5.5}{2}{0.4}} \quad\quad\quad & \quad\quad \adjustbox{height=3cm}{\mirrorSphGaussCoord[50]{-2}{3.5}{2}{0.4}} \\
+ & & {\tiny \verb|\mirrorSphGauss[seta]{f}{p}{o}{epsilon}|} & {\tiny \verb|\mirrorSphGaussCoord[seta]{f}{p}{o}{epsilon}|} \\
+ \cline{2-4}
+ & {Yes} & & \\
+ & & \adjustbox{height=3cm}{\mirrorSphGaussFixed[50]{-2}{5.5}{2}{0.4}{4}{-3}{4.8}} & \adjustbox{height=3cm}{\mirrorSphGaussFixedCoord[50]{2}{3.5}{2}{0.4}{4}{0}{4.5}{(4.8,-1)}} \\
+ & & {\tiny \verb|\mirrorSphGaussFixed[seta]{f}{p}{o}{epsilon}{yM}{xL}{xR}|} & {\tiny \verb|\mirrorSphGaussFixedCoord[seta]{f}{p}{o}{epsilon}{yM}{xL}{xR}{Co}|}
+\end{tabular}
+
+
+
+
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentes.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentes.tex
new file mode 100644
index 0000000000..b5aa1247c1
--- /dev/null
+++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentes.tex
@@ -0,0 +1,16 @@
+% !TeX spellcheck = pt_BR
+% !TeX encoding = UTF-8
+% =============================
+
+\begin{tabular}{r cc|c}
+ & \multicolumn{3}{c}{coord} \\
+ & & No & Yes \\
+ \cline{2-4}
+ & {No} & & \\
+ \multirow{4}{*}{\rotatebox{90}{fixed mirror size}} & & \adjustbox{height=2.5cm}{\lensSphGauss[50]{2}{5.5}{2}{0.4}} \quad\quad\quad & \quad\quad \adjustbox{height=2.5cm}{\lensSphGaussCoord[50]{-2}{3.5}{2}{0.4}} \\
+ & & {\tiny \verb|\lensSphGauss[seta]{f}{p}{o}{epsilon}|} & {\tiny \verb|\lensSphGaussCoord[seta]{f}{p}{o}{epsilon}|} \\
+ \cline{2-4}
+ & {Yes} & & \\
+ & & \adjustbox{height=2.5cm}{\lensSphGaussFixed[50]{-2}{5.5}{2}{0.4}{2.5}{-2.5}{4.5}}\quad\quad\quad & \adjustbox{height=2.5cm}{\lensSphGaussFixedCoord[50]{2}{3.5}{2}{0.4}{3}{-3.5}{4.5}{(2,-1.7)}} \\
+ & & {\tiny \verb|\lensSphGaussFixed[seta]{f}{p}{o}{epsilon}{yM}{xL}{xR}|} & {\tiny \verb|\lensSphGaussFixedCoord[seta]{f}{p}{o}{epsilon}{yM}{xL}{xR}{Co}|}
+\end{tabular}
diff --git a/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentesL.tex b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentesL.tex
new file mode 100644
index 0000000000..cad4ffa135
--- /dev/null
+++ b/graphics/pgf/contrib/tikz-mirror-lens/doc/input_tab_configuracoes_lentesL.tex
@@ -0,0 +1,16 @@
+% !TeX spellcheck = pt_BR
+% !TeX encoding = UTF-8
+% =============================
+
+\begin{tabular}{r cc|c}
+ & \multicolumn{3}{c}{coord} \\
+ & & No & Yes \\
+ \cline{2-4}
+ & {No} & & \\
+ \multirow{4}{*}{\rotatebox{90}{fixed mirror size}} & & \adjustbox{height=2.5cm}{\lensSphGaussL[50]{2}{-5.5}{2}{0.4}} \quad\quad\quad & \quad\quad \adjustbox{height=2.5cm}{\lensSphGaussLCoord[50]{-2}{-3.5}{2}{0.4}} \\
+ & & {\tiny \verb|\lensSphGaussL[seta]{f}{p}{o}{epsilon}|} & {\tiny \verb|\lensSphGaussLCoord[seta]{f}{p}{o}{epsilon}|} \\
+ \cline{2-4}
+ & {Yes} & & \\
+ & & \adjustbox{height=2.5cm}{\lensSphGaussLFixed[50]{-2}{-5.5}{2}{0.4}{2.5}{-4}{3}} & \adjustbox{height=2.5cm}{\lensSphGaussLFixedCoord[50]{2}{-3.5}{2}{0.4}{2.8}{-3}{4.5}{(-5,-1.5)}} \\
+ & & {\tiny \verb|\lensSphGaussLFixed[seta]{f}{p}{o}{epsilon}{yM}{xL}{xR}|} & {\tiny \verb|\lensSphGaussLFixedCoord[seta]{f}{p}{o}\right epsilon}{yM}{xL}{xR}{Co}|}
+\end{tabular}
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
index cacfb83c97..7cb4c44a4d 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
Binary files differ
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 12a6066898..34931f3e6d 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
@@ -15,7 +15,7 @@
\begin{document}
% ========== Capas
-{\FHZCapaArticleCabecalho}
+\FHZCapaArticleCabecalho{\AutorA}{\Titulo}{{\Cidade} {\Estado} {\Pais}}
% ==========
\begin{abstract}
@@ -232,6 +232,20 @@ A \autoref{fig:covx} apresenta duas posições distintas do único caso de posic
\subsection{Animação}
+A sintaxe básica para inserir um objeto animado é
+\begin{FHZmirroLensTcolorbox}
+\begin{verbatim}
+%\usepackage{animate}
+\begin{animateinline}[poster=first, controls, palindrome, bb=-5 -5 50 50]{10}
+ \multiframe{100}{rx=0.5+0.05}{
+ \mirrorSphGaussFixed[50]{2}{6-\rx}{2}{0.4}{11}{-8.5}{12}
+ }
+\end{animateinline}
+\end{verbatim}
+\end{FHZmirroLensTcolorbox}
+
+Para mais detalhes, por favor, verifique o pacote \href{https://ctan.org/pkg/animate}{animate}.
+
\subsubsection{Côncavo}
A \autoref{fig:anim_mirror_conc} apresenta uma animação contendo o movimento de um objeto próximo de um espelho côncavo.
@@ -510,6 +524,8 @@ A \autoref{fig:equiv_dive} apresenta a equivalência entre os comandos que calcu
\subsection{Animação}
+A sintaxe básica é a mesma usada para o espelho trocando o comando de espelho pelo comando de lente.
+
\subsubsection{Convergente}
A \autoref{fig:anim_len_conv} apresenta uma animação contendo o movimento de um objeto próximo de uma lente convergente.
@@ -556,7 +572,7 @@ A seguir, encontram-se \textit{links} interessantes para outros pacotes com impl
\item \href{https://ctan.org/pkg/pst-mirror}{\textbf{CTAN} -- pst-mirror}
\item \href{https://ctan.org/pkg/simpleoptics}{\textbf{CTAN} -- simpleoptics}
- \item \href{https://youtu.be/efPZ5uSDeuI}{{\YouTube} -- The Organic Chemistry Tutor -- Spherical Mirrors \& The Mirror Equation - Geometric Optics}
+ \item \href{https://youtu.be/efPZ5uSDeuI}{\textbf{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}
@@ -571,6 +587,7 @@ A seguir, encontram-se \textit{links} interessantes para outros pacotes com impl
\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|.
+ \item[1.0.2 (2023-01-08):] Revisão da versão em inglês e remoção de ponto-e-vírgula desnecessário (sugerido por Denis Bitouzé).
\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
index 2aa9748b0f..62e2d97e69 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
Binary files differ
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 94d9d0a505..b0bd20b2e6 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
@@ -14,7 +14,7 @@
\begin{document}
% ========== Capas
-{\FHZCapaArticleCabecalho}
+\FHZCapaArticleCabecalho{\AutorA}{\Titulo}{{\Cidade} {\Estado} {\Pais}}
% ==========
\begin{abstract}
@@ -48,17 +48,17 @@ The main commands that create the mirror or lens diagrams based on the object's
\begin{itemize}
\item Mirrors
\begin{itemize}
- \item \verb|\mirrorSphGauss[setas]{f}{p}{o}{epsilon}|;
- \item \verb|\mirrorSphGaussCoord[setas]{f}{p}{o}{epsilon}|;
- \item \verb|\mirrorSphGaussFixed[setas]{f}{p}{o}{epsilon}{yM}{xL}{xR}|;
- \item \verb|\mirrorSphGaussFixedCoord[setas]{f}{p}{o}{epsilon}{yM}{xL}{xR}{(x_C,y_C)}|;
+ \item \verb|\mirrorSphGauss[arrows]{f}{p}{o}{epsilon}|;
+ \item \verb|\mirrorSphGaussCoord[arrows]{f}{p}{o}{epsilon}|;
+ \item \verb|\mirrorSphGaussFixed[arrows]{f}{p}{o}{epsilon}{yM}{xL}{xR}|;
+ \item \verb|\mirrorSphGaussFixedCoord[arrows]{f}{p}{o}{epsilon}{yM}{xL}{xR}{(x_C,y_C)}|;
\end{itemize}
\item Lenses
\begin{itemize}
- \item \verb|\lensSphGauss[setas]{f}{p}{o}{epsilon}|;
- \item \verb|\lensSphGaussCoord[setas]{f}{p}{o}{epsilon}|;
- \item \verb|\lensSphGaussFixed[setas]{f}{p}{o}{epsilon}{yM}{xL}{xR}|;
- \item \verb|\lensSphGaussFixedCoord[setas]{f}{p}{o}{epsilon}{yM}{xL}{xR}{(x_C,y_C)}|;
+ \item \verb|\lensSphGauss[arrows]{f}{p}{o}{epsilon}|;
+ \item \verb|\lensSphGaussCoord[arrows]{f}{p}{o}{epsilon}|;
+ \item \verb|\lensSphGaussFixed[arrows]{f}{p}{o}{epsilon}{yM}{xL}{xR}|;
+ \item \verb|\lensSphGaussFixedCoord[arrows]{f}{p}{o}{epsilon}{yM}{xL}{xR}{(x_C,y_C)}|;
\end{itemize}
\item Lenses with object on the left
\begin{itemize}
@@ -228,6 +228,20 @@ Figures from \ref{fig:conc01} to \ref{fig:conc05} present the 5 possible cases o
\subsection{Animation}
+The basic syntax to insert an animated object is
+\begin{FHZmirroLensTcolorbox}
+\begin{verbatim}
+%\usepackage{animate}
+\begin{animateinline}[poster=first, controls, palindrome, bb=-5 -5 50 50]{10}
+ \multiframe{100}{rx=0.5+0.05}{
+ \mirrorSphGaussFixed[50]{2}{6-\rx}{2}{0.4}{11}{-8.5}{12}
+ }
+\end{animateinline}
+\end{verbatim}
+\end{FHZmirroLensTcolorbox}
+
+For more details, please, check the \href{https://ctan.org/pkg/animate}{animate} package.
+
\subsubsection{Concave}
\autoref{fig:anim_mirror_conc} presents an animation containing the movement of an object close to a concave mirror.
@@ -338,9 +352,9 @@ The equations for the position $p^{\prime}$ and the height $i$ of the image from
\end{split}
\end{equation}
-\subsubsection{Objeto à esquerda}
+\subsubsection{Object on the left}
-Para o objeto à esquerda, a expressão de $p^{\prime}$ e $i$ são dadas por:
+For the object on the left, the expression for $p^{\prime}$ and $i$ are given by:
\begin{equation}
\begin{split}
\dfrac{1}{p^{\prime}} & = \dfrac{1}{p} + \dfrac{1}{f} \Rightarrow p^{\prime} = \dfrac{f p}{f + p}, \quad p \neq -f, \\
@@ -504,6 +518,8 @@ Figures from \ref{fig:conv01} to \ref{fig:conv05} present the 5 possible cases o
\subsection{Animation}
+The basic syntax is the same as that used for mirror by replacing the mirror command with the lens command.
+
\subsubsection{Convergent}
\autoref{fig:anim_len_conv} presents an animation containing the movement of an object close to a converging lens.
@@ -550,7 +566,7 @@ Below are interesting \textit{links} to other packages with optics implementatio
\item \href{https://ctan.org/pkg/pst-mirror}{\textbf{CTAN} -- pst-mirror}
\item \href{https://ctan.org/pkg/simpleoptics}{\textbf{CTAN} -- simpleoptics}
- \item \href{https://youtu.be/efPZ5uSDeuI}{{\YouTube} -- The Organic Chemistry Tutor -- Spherical Mirrors \& The Mirror Equation - Geometric Optics}
+ \item \href{https://youtu.be/efPZ5uSDeuI}{\textbf{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}
@@ -565,6 +581,7 @@ Below are interesting \textit{links} to other packages with optics implementatio
\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|.
+ \item[1.0.2 (2023-01-08):] Revised the English version and removed unnecessary semicolons (suggested by Denis Bitouzé).
\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 00301f6f8f..88afa44b63 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
@@ -3,7 +3,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]
+\ProvidesPackage{tikz-mirror-lens}[2023-01-08 Custom Package for drawing spherical mirrors and lens -- FHZ -- Version 1.0.2]
\RequirePackage{amsmath}
\RequirePackage{tikz}
@@ -65,9 +65,9 @@
\pp = 0;
\i = 0;
};
- };
+ }
% Mirror size, math as parameter
- \tikzmath{\ymirror = #5;};
+ \tikzmath{\ymirror = #5;}
}
\newcommand{\lensMath}[5]{
% f > 0 convergente, f < 0 divergente
@@ -83,9 +83,9 @@
\pp = 0;
\i = 0;
};
- };
+ }
% Lens size, math as parameter
- \tikzmath{\ymirror = #5;};
+ \tikzmath{\ymirror = #5;}
}
\newcommand{\lensMathL}[5]{
% f > 0 convergente, f < 0 divergente
@@ -101,9 +101,9 @@
\pp = 0;
\i = 0;
};
- };
+ }
% Lens size, math as parameter
- \tikzmath{\ymirror = #5;};
+ \tikzmath{\ymirror = #5;}
}
% *******************************************************
@@ -123,7 +123,7 @@
\draw[green] (#2,0) node[below left]{$p^{\prime}$} -- ++(0,#4) node[below left]{$i$};
};
};
- };
+ }
\end{scope}
}
\newcommand{\mirrorLensCoord}[6]{
@@ -182,7 +182,7 @@
\draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (#2,-#4);
};
};
- };
+ }
\end{scope}
}
% *******************************************************
@@ -230,7 +230,7 @@
\draw[arrDec={#1-10},violet,dotted] (O) -- (V) -- (-#2,-#4);
};
};
- };
+ }
\end{scope}
}
% *******************************************************
@@ -520,4 +520,4 @@
}
% *******************************************************
-\endinput \ No newline at end of file
+\endinput