summaryrefslogtreecommitdiff
path: root/graphics/pgf/contrib/simpleoptics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-08 03:01:40 +0000
committerNorbert Preining <norbert@preining.info>2019-09-08 03:01:40 +0000
commitdce09de80c37afccb6addb25d0c7d40367059ece (patch)
tree1e4dd6a67e521ca0bc733231afc3c071a69812d9 /graphics/pgf/contrib/simpleoptics
parent7345b8683c7cbeaedf53e992fda0b3fa6141084e (diff)
CTAN sync 201909080301
Diffstat (limited to 'graphics/pgf/contrib/simpleoptics')
-rw-r--r--graphics/pgf/contrib/simpleoptics/simpleoptics.pdfbin96199 -> 96164 bytes
-rw-r--r--graphics/pgf/contrib/simpleoptics/simpleoptics.sty61
-rw-r--r--graphics/pgf/contrib/simpleoptics/simpleoptics.tex4
3 files changed, 30 insertions, 35 deletions
diff --git a/graphics/pgf/contrib/simpleoptics/simpleoptics.pdf b/graphics/pgf/contrib/simpleoptics/simpleoptics.pdf
index 474564b3aa..a027313302 100644
--- a/graphics/pgf/contrib/simpleoptics/simpleoptics.pdf
+++ b/graphics/pgf/contrib/simpleoptics/simpleoptics.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/simpleoptics/simpleoptics.sty b/graphics/pgf/contrib/simpleoptics/simpleoptics.sty
index 6d24a6d266..4620f5ab69 100644
--- a/graphics/pgf/contrib/simpleoptics/simpleoptics.sty
+++ b/graphics/pgf/contrib/simpleoptics/simpleoptics.sty
@@ -2,9 +2,13 @@
%%License: LPPL 1.3c
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{simpleoptics}[2019/09/05 v1.0.0 Simple Optics Package]
+\ProvidesPackage{simpleoptics}[2019/09/07 v1.1.1 Simple Optics Package]
\RequirePackage{tikz}
+\newcommand{\straightline}[4]{
+\draw (#1, #2) -- (#3, #4);
+}
+
%\mirror{x}{y}{focal length}{height}
\newcommand{\mirror}[4]{
@@ -13,15 +17,14 @@
\pgfmathsetmacro{\mirrorY}{#2}
\pgfmathsetmacro{\mirrorRadius}{2*#3}
- \pgfmathsetmacro{\mirrorHeight}{\mirrorY + #4}
+ \pgfmathsetmacro{\mirrorHeight}{#4}
\pgfmathsetmacro{\startAngle}{asin(\mirrorHeight/\mirrorRadius)}
- \draw
- (\mirrorX,\mirrorHeight) arc[start angle=180-\startAngle,delta angle=2*\startAngle,radius=\mirrorRadius]
-
- ;
+ \begin{scope}[yshift=\mirrorY cm]
+ \draw (\mirrorX,\mirrorHeight) arc[start angle=180-\startAngle,delta angle=2*\startAngle,radius=\mirrorRadius];
+ \end{scope}
}
%\lens{x}{y}{focal length}{height}{thickness}
@@ -39,13 +42,11 @@
\mirror{\lensXleft}{\lensY}{\lensRadius}{\lensHeight}
\mirror{\lensXright}{\lensY}{-\lensRadius}{\lensHeight}
-
- \draw
-
- (\lensXleft,\lensHeight) -- (\lensXright,\lensHeight)
- (\lensXright,-\lensHeight) -- (\lensXleft,-\lensHeight)
-
- ;
+
+ \begin{scope}[yshift=\lensY cm]
+ \straightline{\lensXleft}{\lensHeight}{\lensXright}{\lensHeight}
+ \straightline{\lensXright}{-\lensHeight}{\lensXleft}{-\lensHeight}
+ \end{scope}
}
%\biconvexlens{x}{y}{focal length}{height}{thickness}
@@ -72,12 +73,10 @@
\mirror{\lensXleft}{\lensY}{\lensRadius}{\lensHeight}
\mirror{\lensXright}{\lensY}{\lensRadius}{\lensHeight}
- \draw
-
- (\lensXleft,\lensHeight) -- (\lensXright,\lensHeight)
- (\lensXright,-\lensHeight) -- (\lensXleft,-\lensHeight)
-
- ;
+ \begin{scope}[yshift=\lensY cm]
+ \straightline{\lensXleft}{\lensHeight}{\lensXright}{\lensHeight}
+ \straightline{\lensXright}{-\lensHeight}{\lensXleft}{-\lensHeight}
+ \end{scope}
}
%\convexconcavelens{x}{y}{focal length}{height}{thickness}
@@ -98,13 +97,11 @@
\mirror{\lensXleft}{\lensY}{\lensRadius}{\lensHeight}
- \draw
-
- (\lensXleft,\lensHeight) -- (\lensXright,\lensHeight)
- (\lensXright,-\lensHeight) -- (\lensXleft,-\lensHeight)
- (\lensXright,\lensHeight) -- (\lensXright,-\lensHeight)
-
- ;
+ \begin{scope}[yshift=\lensY cm]
+ \straightline{\lensXleft}{\lensHeight}{\lensXright}{\lensHeight}
+ \straightline{\lensXright}{-\lensHeight}{\lensXleft}{-\lensHeight}
+ \straightline{\lensXright}{\lensHeight}{\lensXright}{-\lensHeight}
+ \end{scope}
}
%\leftplanoconvexlens{x}{y}{focal length}{height}{thickness}
@@ -120,13 +117,11 @@
\mirror{\lensXright}{\lensY}{-\lensRadius}{\lensHeight}
- \draw
-
- (\lensXleft,\lensHeight) -- (\lensXright,\lensHeight)
- (\lensXright,-\lensHeight) -- (\lensXleft,-\lensHeight)
- (\lensXleft,\lensHeight) -- (\lensXleft,-\lensHeight)
-
- ;
+ \begin{scope}[yshift=\lensY cm]
+ \straightline{\lensXleft}{\lensHeight}{\lensXright}{\lensHeight}
+ \straightline{\lensXright}{-\lensHeight}{\lensXleft}{-\lensHeight}
+ \straightline{\lensXleft}{\lensHeight}{\lensXleft}{-\lensHeight}
+ \end{scope}
}
%\rightplanoconcavelens{x}{y}{focal length}{height}{thickness}
diff --git a/graphics/pgf/contrib/simpleoptics/simpleoptics.tex b/graphics/pgf/contrib/simpleoptics/simpleoptics.tex
index 1ed5ecfe45..b56c7c0661 100644
--- a/graphics/pgf/contrib/simpleoptics/simpleoptics.tex
+++ b/graphics/pgf/contrib/simpleoptics/simpleoptics.tex
@@ -20,8 +20,8 @@
\vspace*{\fill}
\begin{center}
{\Huge Simple Optics Documentation}\\[0.5cm]
-{\Large Version: 1.0.0}\\[0.4cm]
-{\Large Date: $5^{th}$ of September 2019}\\[0.2cm]
+{\Large Version: 1.1.1}\\[0.4cm]
+{\Large Date: $7^{th}$ of September 2019}\\[0.2cm]
{\small Author: Justin Cawood}
\end{center}
\vspace*{\fill}