overpic (8oct17)

git-svn-id: svn://tug.org/texlive/trunk@45500 c570f23f-e606-0410-a88d-b1316a301751

16 files changed, 596 insertions, 507 deletions

diff --git a/Master/texmf-dist/doc/latex/overpic/README b/Master/texmf-dist/doc/latex/overpic/README
deleted file mode 100644
index e6c5eb3c94f..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/README
+++ /dev/null
@@ -1,28 +0,0 @@
-
-This small LaTeX package defines the overpic environment which is
-a combination between a picture environment and an includegraphics
-command (defined in graphicx). The resulting picture environment has
-the same dimension as the included eps graphic. Now it is easy possible
-to put any LaTeX output above the graphic on defined positions. A grid
-to aid is also possible.
-
-This directory contains the following files:
-
-README       - This file.
-README.de    - The same in german.
-overpic.sty  - The definition of overpic. Required graphicx.sty and epic.sty.
-opic-rel.tex
-and
-opic-abs.tex - Two demos that shows all the features. You need the eps graphic 
-               file golfer.ps. This file is part of ghostscript´s  examples 
-	       directory.      
-               
-Please send comments and suggestions to niepraschk@ptb.de
-
-Happy TeXing...
-
-                                  Rolf Niepraschk, 11/97
-				  
-
-				  
-                                                 
diff --git a/Master/texmf-dist/doc/latex/overpic/README.de b/Master/texmf-dist/doc/latex/overpic/README.de
deleted file mode 100644
index 1df5b3e5ad7..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/README.de
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Dieses kleine LaTeX-Paket definiert die overpic-Umgebung, welche eine
-Kombination von picture-Umgebung und includegraphics-Befehl ist. Die
-resultierende picture-Umgebung hat dieselbe Groesse wie die eingefuegte Grafik.
-Jetzt ist es einfach moeglich beliebige LaTeX-Ausgaben auf das Bild zu
-positionieren. Ein Gitter kann zur Hilfe verwendet werden.
-
-Das Verzeichnis enthaelt:
-
-README.de    - Diese Datei.
-README       - Das gleiche in englisch.
-overpic.sty  - Die Definition von overpic. Benoetigt graphicx.sty und epic.sty.
-opic-rel.tex
-und
-opic-abs.tex - Zwei Testdateien, die alle Moeglichkeiten zeigen. Die Grafikdatei
-               golfer.ps wird benoetigt. Sie ist in ghostscripts examples-Ver-
-	       zeichnis enthalten.
-	       
-Kommentare und Vorschlaege bitte an niepraschk@ptb.de schicken.
-
-Happy TeXing...
-
-                                  Rolf Niepraschk, 11/97       
diff --git a/Master/texmf-dist/doc/latex/overpic/README.de.md b/Master/texmf-dist/doc/latex/overpic/README.de.md
new file mode 100644
index 00000000000..f932af2005b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/overpic/README.de.md
@@ -0,0 +1,20 @@
+overpic – Kombination von LaTeX-Anweisungen über eingefügte Grafiken
+====================================================================
+
+Die overpic-Umgebung ist eine Kombination der picture-Umgebung mit anderen
+LaTeX-Objekten wie Grafiken oder Tabellen. Die resultierende picture-Umgebung
+hat dieselben Abmessungen wie das darunterliegende Objekt. LaTeX-Anweisungen
+können an beliebigen Positionen platziert werden; eine Gitternetz zur
+besseren Orientierung kann angezeigt werden.
+
+Empfohlene TDS-Orte:
+```
+  overpic.sty:                          tex/latex/overpic
+  README.md, README.de.md, overpic.pdf: doc/latex/overpic
+``` 
+
+Kommentare und Vorschläge bitte an Rolf.Niepraschk@gmx.de schicken.
+
+Happy TeXing...
+
+                                  Rolf Niepraschk, 2017/10/08
diff --git a/Master/texmf-dist/doc/latex/overpic/README.md b/Master/texmf-dist/doc/latex/overpic/README.md
new file mode 100644
index 00000000000..a61c0ff8f58
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/overpic/README.md
@@ -0,0 +1,25 @@
+overpic – Combine LaTeX commands over included graphics
+=======================================================
+
+The overpic environment is a combination between the LaTeX picture
+environment and another LaTeX object like an image used with the
+command \cmd{\includegraphics} of graphicx or a tabular. The
+resulting picture environment has the same dimensions as the included
+object. LaTeX commands can be placed on the object at any position;
+setting a grid for the orientation is possible.
+
+Recommended TDS locations:
+```
+  overpic.sty:                          tex/latex/overpic
+  README.md, README.de.md, overpic.pdf: doc/latex/overpic
+```
+For general installation advice, see
+http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages
+
+The overpic package is also on CTAN:[macros/latex/contrib/overpic](http://www.ctan.org/pkg/overpic)
+
+Send comments to Rolf.Niepraschk@gmx.de
+
+Happy TeXing...
+
+                                  Rolf Niepraschk, 2017/10/08
diff --git a/Master/texmf-dist/doc/latex/overpic/opic-abs.pdf b/Master/texmf-dist/doc/latex/overpic/opic-abs.pdf
deleted file mode 100644
index dc70cf45a22..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/opic-abs.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/overpic/opic-abs.tex b/Master/texmf-dist/doc/latex/overpic/opic-abs.tex
deleted file mode 100644
index ff0c0fe8088..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/opic-abs.tex
+++ /dev/null
@@ -1,101 +0,0 @@
-
-% opic-abs.tex
-
-\documentclass[10pt,a4paper]{article}
-%\documentclass[10pt,letterpaper]{article}
-\usepackage[abs]{overpic}
-
-\setlength\parindent{0pt}\setlength\unitlength{1mm}
-
-\newlength\Li \newlength\Lii 
-\setlength\Li{55mm} \setlength\Lii{80mm} 
-
-\setlength\topmargin{-1in}
-\setlength\headheight{0pt}
-\setlength\headsep\headheight
-\setlength\textheight\paperheight
-\addtolength\textheight{-2\footskip}
-\setlength\textwidth{150mm}
-\setlength\oddsidemargin\paperwidth
-\addtolength\oddsidemargin{-\textwidth}
-\setlength\oddsidemargin{.5\oddsidemargin}
-\addtolength\oddsidemargin{-1in}
-\setlength\evensidemargin\oddsidemargin
-
-\newcommand\HFILL{\hspace*{\fill}}
-\newcommand\VFILL{\vspace*{\fill}}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\VFILL
-
-\section*{\centering The \texttt{overpic} environment with
-  absolute positioning\footnote{Version 0.5, Rolf Niepraschk, 
-  11/97, file: \texttt{overpic.sty}}}
-
-\HFILL
-\begin{minipage}{\Li}
-  \includegraphics[scale=.25]{golfer.ps}
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  Insert before:
-  \begin{verbatim}
-\usepackage[abs]{overpic}
-...
-\setlength\unitlength{1mm}
-and/or local option unit=...
-  \end{verbatim}    
-  The  original graphic from \textsc{GhostScript}:
-  \begin{verbatim}
-\includegraphics[scale=.25]{golfer.ps}
-  \end{verbatim}  
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\HFILL
-\begin{minipage}{\Li}
-  \begin{overpic}[scale=.25,grid,tics=5]{golfer.ps}
-  \end{overpic}  
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  A grid for orientation:%  
-  \begin{verbatim}
-\begin{overpic}[scale=.25,grid,tics=5]%
-      {golfer.ps}
-\end{overpic}
-  \end{verbatim}  
-  (default for \texttt{tics} is 10)  
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\HFILL
-\begin{minipage}{\Li}
-  \begin{overpic}[scale=.25,unit=1mm]{golfer.ps}
-    \put(3,28){\huge \LaTeX}
-    \put(34,5){\includegraphics[scale=.07]%
-        {golfer.ps}}
-  \end{overpic}  
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  Positioning the \LaTeX\ output with \verb#\put# commands:  
-  \begin{verbatim}
-\begin{overpic}[scale=.25,unit=1mm]%
-      {golfer.ps}
-  \put(3,28){\huge \LaTeX}
-  \put(34,5){\includegraphics[scale=.07]%
-      {golfer.ps}}
-\end{overpic}
-  \end{verbatim}
-  (default for \texttt{unit} is \verb#\unitlength#)  
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/overpic/opic-rel.pdf b/Master/texmf-dist/doc/latex/overpic/opic-rel.pdf
deleted file mode 100644
index df19f88948a..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/opic-rel.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/overpic/opic-rel.tex b/Master/texmf-dist/doc/latex/overpic/opic-rel.tex
deleted file mode 100644
index e8201191397..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/opic-rel.tex
+++ /dev/null
@@ -1,101 +0,0 @@
-
-% opic-rel.tex 
-
-\documentclass[10pt,a4paper]{article}
-%\documentclass[10pt,letterpaper]{article}
-\usepackage{overpic}
-
-\setlength\parindent{0pt}
-
-\newlength\Li \newlength\Lii 
-\setlength\Li{55mm} \setlength\Lii{80mm} 
-
-\setlength\topmargin{-1in}
-\setlength\headheight{0pt}
-\setlength\headsep\headheight
-\setlength\textheight\paperheight
-\addtolength\textheight{-2\footskip}
-\setlength\textwidth{150mm}
-\setlength\oddsidemargin\paperwidth
-\addtolength\oddsidemargin{-\textwidth}
-\setlength\oddsidemargin{.5\oddsidemargin}
-\addtolength\oddsidemargin{-1in}
-\setlength\evensidemargin\oddsidemargin
-
-\newcommand\HFILL{\hspace*{\fill}}
-\newcommand\VFILL{\vspace*{\fill}}
-
-\pagestyle{empty}
-
-\begin{document}
-
-\VFILL
-
-\section*{\centering The \texttt{overpic} environment with 
-  relative positioning\footnote{Version 0.5, Rolf Niepraschk, 
-  11/97, file: \texttt{overpic.sty}}}
-
-\HFILL
-\begin{minipage}{\Li}
-  \includegraphics[scale=.25]{golfer.ps}
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  Insert before:
-  \begin{verbatim}
-\usepackage[percent]{overpic} 
-(default) or
-\usepackage[permil]{overpic} 
-  \end{verbatim}      
-  The  original graphic from \textsc{GhostScript}:
-  \begin{verbatim}
-\includegraphics[scale=.25]{golfer.ps}
-  \end{verbatim}  
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\HFILL
-\begin{minipage}{\Li}
-  \begin{overpic}[scale=.25,grid,tics=10]{golfer.ps}
-  \end{overpic}  
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  A grid for orientation:%  
-  \begin{verbatim}
-\begin{overpic}[scale=.25,grid,tics=10]%
-      {golfer.ps}
-\end{overpic}
-  \end{verbatim} 
-  (default for \texttt{tics} is 10 for `\texttt{percent}' and 100 for 
-   `\texttt{permil}')   
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\HFILL
-\begin{minipage}{\Li}
-  \begin{overpic}[scale=.25]{golfer.ps}
-    \put(5,45){\huge \LaTeX}
-    \put(55,10){\includegraphics[scale=.07]%
-        {golfer.ps}}
-  \end{overpic}  
-\end{minipage}\qquad
-\begin{minipage}{\Lii}
-  Positioning the \LaTeX\ output with \verb#\put# commands:  
-  \begin{verbatim}
-\begin{overpic}[scale=.25]{golfer.ps}
-  \put(5,45){\huge \LaTeX}
-  \put(55,10){\includegraphics[scale=.07]%
-      {golfer.ps}}
-\end{overpic}
-  \end{verbatim}  
-  (\verb#\unitlength# is internally set to 1/100 or 1/1000 of the length of
-   the picture's longer side)
-\end{minipage}
-\HFILL
-
-\VFILL
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.pdf b/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.pdf
deleted file mode 100644
index 3657f0bb685..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.tex b/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.tex
deleted file mode 100644
index 271fcd0362b..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/overpic-readme-de.tex
+++ /dev/null
@@ -1,78 +0,0 @@
-\documentclass[german, pagesize=auto, fontsize=12pt, parskip=half, DIV=11]{scrartcl}
-
-\usepackage{fixltx2e}
-\usepackage{etex}
-\usepackage{xspace}
-\usepackage{lmodern}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{babel}
-\usepackage[utf8]{inputenc}
-\usepackage{microtype}
-\usepackage{hyperref}
-
-\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
-\newcommand*{\pkg}[1]{\textsf{#1}}
-\newcommand*{\env}[1]{\texttt{#1}}
-\newsavebox{\tempbox}
-
-\addtokomafont{title}{\rmfamily}
-
-\title{Das Paket \pkg{overpic}\thanks{Dieses Handbuch bezieht sich auf \pkg{overpic}~v0.52 vom~4.~Juli~1999.}}
-\author{Rolf Niepraschk\thanks{\mail{niepraschk@ptb.de}}}
-\date{4.~Juli~1999}
-
-
-\begin{document}
-
-\maketitle
-
-\noindent
-
-\begin{quote}
-  \footnotesize
-  Copyright  1999 Rolf Niepraschk, \mail{niepraschk@ptb.de}\\
-  This program can be redistributed and/or modified under the terms
-  of the \LaTeX\ Project Public License Distributed from CTAN
-  archives in directory \href{http://ctan.org/macros/latex/base/lppl.txt}{\texttt{macros/latex/base\slash lppl.txt}}; either
-  version~1 of the License, or any later version.
-\end{quote}
-
-Dieses kleine \LaTeX-Paket definiert die \env{overpic}-Umgebung, welche eine
-Kombination von \env{picture}-Umgebung und \env{includegraphics}-Befehl ist. Die
-resultierende \env{picture}-Umgebung hat dieselbe Groesse wie die eingefuegte Grafik.
-Jetzt ist es einfach moeglich beliebige \LaTeX-Ausgaben auf das Bild zu
-positionieren. Ein Gitter kann zur Hilfe verwendet werden.
-
-\begin{lrbox}{\tempbox}
-  \begin{tabular}[b]{@{}l@{}}
-    \texttt{opic-rel.tex} \\
-    und                   \\
-    \texttt{opic-abs.tex}
-  \end{tabular}
-\end{lrbox}
-
-Das Verzeichnis enthaelt:
-%
-\begin{labeling}[\hspace{\labelsep}--]{\usebox{\tempbox}}
-\item[\texttt{README.de}] Diese Datei.
-\item[\texttt{README}] Das gleiche in englisch.
-\item[\texttt{overpic.sty}] Die Definition von \env{overpic}. Benoetigt \pkg{graphicx.sty} und \pkg{epic.sty}.
-\item[\usebox{\tempbox}] Zwei Testdateien, die alle Moeglichkeiten zeigen. Die Grafikdatei \texttt{golfer.ps} wird benoetigt. Sie ist in \textsc{ghostscript}s \texttt{examples}-Verzeichnis enthalten.
-\end{labeling}
-               
-Kommentare und Vorschlaege bitte an \mail{niepraschk@ptb.de} schicken.
-
-Happy \TeX ing\ldots
-
-\enlargethispage{\baselineskip}
-
-
-\minisec{Liste der Änderungen:}
-
-\begin{labeling}[\hspace{\labelsep}--]{v0.52, 1999/07/04}
-  \item[v0.51, 1999/03/02] New (LPPL) license
-  \item[v0.52, 1999/07/04] Correction of wrong height calculation (if $\mathrm{depth} \ne 0$)
-\end{labeling}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic-readme.pdf b/Master/texmf-dist/doc/latex/overpic/overpic-readme.pdf
deleted file mode 100644
index 3d808ce9b5f..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/overpic-readme.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic-readme.tex b/Master/texmf-dist/doc/latex/overpic/overpic-readme.tex
deleted file mode 100644
index c3a8f4735b9..00000000000
--- a/Master/texmf-dist/doc/latex/overpic/overpic-readme.tex
+++ /dev/null
@@ -1,75 +0,0 @@
-\documentclass[pagesize=auto, fontsize=12pt, parskip=half, DIV=11]{scrartcl}
-
-\usepackage{fixltx2e}
-\usepackage{etex}
-\usepackage{xspace}
-\usepackage{lmodern}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{microtype}
-\usepackage{hyperref}
-
-\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
-\newcommand*{\pkg}[1]{\textsf{#1}}
-\newcommand*{\env}[1]{\texttt{#1}}
-\newsavebox{\tempbox}
-
-\addtokomafont{title}{\rmfamily}
-
-\title{The \pkg{overpic} package\thanks{This manual corresponds to \pkg{overpic}~v0.52, dated~1999/07/04.}}
-\author{Rolf Niepraschk\thanks{\mail{niepraschk@ptb.de}}}
-\date{1999/07/04}
-
-
-\begin{document}
-
-\maketitle
-
-\noindent
-
-\begin{quote}
-  \footnotesize
-  Copyright  1999 Rolf Niepraschk, \mail{niepraschk@ptb.de}\\
-  This program can be redistributed and/or modified under the terms
-  of the \LaTeX\ Project Public License Distributed from CTAN
-  archives in directory \href{http://ctan.org/macros/latex/base/lppl.txt}{\texttt{macros/latex/base\slash lppl.txt}}; either
-  version~1 of the License, or any later version.
-\end{quote}
-
-This small \LaTeX\ package defines the \env{overpic} environment which is
-a combination between a \env{picture} environment and an \env{includegraphics}
-command (defined in \pkg{graphicx}). The resulting \env{picture} environment has
-the same dimension as the included \textsc{eps} graphic. Now it is easy possible
-to put any \LaTeX\ output above the graphic on defined positions. A grid
-to aid is also possible.
-
-\begin{lrbox}{\tempbox}
-  \begin{tabular}[b]{@{}l@{}}
-    \texttt{opic-rel.tex} \\
-    and                   \\
-    \texttt{opic-abs.tex}
-  \end{tabular}
-\end{lrbox}
-
-This directory contains the following files:
-%
-\begin{labeling}[\hspace{\labelsep}--]{\usebox{\tempbox}}
-\item[\texttt{README}] This file.
-\item[\texttt{README.de}] The same in german.
-\item[\texttt{overpic.sty}] The definition of \env{overpic}. Required \env{graphicx.sty} and \env{epic.sty}.
-\item[\usebox{\tempbox}] Two demos that shows all the features. You need the \textsc{eps} graphic file \texttt{golfer.ps}. This file is part of \textsc{ghostscript}'s  \texttt{examples} directory.
-\end{labeling}
-               
-Please send comments and suggestions to \mail{niepraschk@ptb.de}.
-
-Happy \TeX ing\ldots
-
-
-\minisec{Changes:}
-
-\begin{labeling}[\hspace{\labelsep}--]{v0.52, 1999/07/04}
-  \item[v0.51, 1999/03/02] New (LPPL) license
-  \item[v0.52, 1999/07/04] Correction of wrong height calculation (if $\mathrm{depth} \ne 0$)
-\end{labeling}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/overpic/overpic.pdf b/Master/texmf-dist/doc/latex/overpic/overpic.pdf
new file mode 100644
index 00000000000..6593d88554e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/overpic/overpic.pdf
diff --git a/Master/texmf-dist/source/latex/overpic/overpic.dtx b/Master/texmf-dist/source/latex/overpic/overpic.dtx
new file mode 100644
index 00000000000..aaa2ffde7a0
--- /dev/null
+++ b/Master/texmf-dist/source/latex/overpic/overpic.dtx
@@ -0,0 +1,389 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2017 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+% ---------------------------------------------------------------------------
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) 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 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Rolf Niepraschk.
+%
+% This work consists of the files overpic.dtx and overpic.ins
+% and the derived filebase overpic.sty.
+%
+%<*package>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{overpic}[2017/10/06 1.0 picture overlays]
+%</package>
+%
+%<*driver>
+\ProvidesFile{overpic.dtx}
+\documentclass{ltxdoc}
+\usepackage{overpic,pict2e,xcolor}
+\usepackage{lmodern}
+\usepackage{listings}
+\setlength\parindent{0pt}
+\newlength\myparskip
+\setlength\myparskip{.6em plus 0.1em minus 0.1em}
+\setlength\parskip{\myparskip}
+\lstset{%
+  language=[AlLaTeX]TeX,
+  gobble=2,
+  keywordstyle=\bfseries,
+  commentstyle=\small\ttfamily,
+  basicstyle=\small\ttfamily,
+  basewidth=0.55em,
+  backgroundcolor=\color{black!10},
+  keepspaces,
+  numbers=none,
+  aboveskip=\myparskip,
+  belowskip=\myparskip,
+  framesep=\fboxsep,
+  frame=single
+}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+  \DocInput{overpic.dtx}
+  \PrintChanges
+  \PrintIndex
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{174}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+%
+% \changes{0.60}{2014/06/16}{Converted to .dtx}
+% \changes{1.0}{2017/10/06}{mostly rewritten}
+%
+% \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
+% \DoNotIndex{\providecommand,\def,\edef,\let,\gdef,\xdef,\global,\newtoks}
+% \DoNotIndex{\usebox,\sbox,\relax,\@viipt,\@viiipt,\count@,\dimexpr,\newif}
+% \DoNotIndex{\RequirePackage,\DeclareOption,\ProcessOptions,\ExecuteOptions}
+% \DoNotIndex{\PassOptionsToPackage,\endinput,\lowercase}
+% \DoNotIndex{\input,\InputIfFileExists}
+% \DoNotIndex{\@ifdefinable,\@ifundefined,\@percentchar}
+% \DoNotIndex{\AtBeginDocument,\AtEndOfPackage}
+% \DoNotIndex{\PackageError,\PackageWarning,\PackageWarningNoLine,\PackageInfo}
+% \DoNotIndex{\MessageBreak,\typeout}
+% \DoNotIndex{\z@,\z@skip,\p@,\@ne,\tw@,\thr@@,\@iv,\@m,\strip@pt}
+% \DoNotIndex{\the,\if,\else,\or,\fi,\ifnum,\ifdim,\ifcase,\ifodd}
+% \DoNotIndex{\advance,\multiply,\divide}
+% \DoNotIndex{\@tfor,\do,\@ehc,\@tempcnta,\@tempcntb}
+% \DoNotIndex{\csname,\endcsname,\begingroup,\endgroup}
+% \DoNotIndex{\expandafter,\afterassignment,\noexpand}
+%
+% \providecommand*{\url}{\texttt}
+% \GetFileInfo{overpic.sty}
+% \title{The \textsf{overpic} package}
+% \author{Rolf Niepraschk \\ (\url{Rolf.Niepraschk@gmx.de)}}
+% \date{Version~\fileversion~--~\filedate}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% The overpic environment is a combination between the \LaTeX\ picture
+% environment and another \LaTeX\ object like an image used with the
+% command \cmd{\includegraphics} of graphicx or a tabular. The
+% resulting picture environment has the same dimensions as the included
+% object. \LaTeX\ commands can be placed on the object at any position;
+% setting a grid for the orientation is possible.
+%
+% \section{Usage}
+%
+% Put |\usepackage[|\meta{options}|]{overpic}| in the preamble of the document.
+% The following package options are available: 
+% \begin{itemize}
+%   \item |abs|: Absolute positioning in multiples of \cmd{\unitlength}.
+%   \item |percent|: Relative positioning; the longer dimension has
+%     value 100. The \cmd{\unitlength} will be calculated accordingly. This
+%     is the default mode.
+%   \item |permil|: Relative positioning; the longer dimension has
+%     value 1000. The \cmd{\unitlength} will be calculated accordingly.
+% \end{itemize}
+% Other options will be tranfered to package |graphicx|. 
+%
+% \DescribeEnv{overpic}
+% |\begin{overpic}[|\meta{options}|]{|\meta{filename}|}| \meta{picture code}
+%  |\end{overpic}| \par
+% Sets the graphic \meta{filename} and puts the \meta{picture code} on the
+% top of the graphic. The picture code can be any \TeX\ code inclusive other
+% graphics.
+%
+% The following options are possible:
+% \begin{itemize}
+%   \item |abs|, |percent|, |permil|: The same as the package
+%     options (true or false).
+%   \item |rel|: Other value as base for relative positioning
+%     (e.g. 10000)
+%   \item |grid|: Drawing a grid for better orientation (true or false,
+%     default: false).
+%   \item |tics|: The distance of the grid tics (default: 10).
+%   \item |unit|: Sets \cmd{\unitlength} (any \TeX\ dimension, only
+%     effective in abs mode).
+% \end{itemize}
+% \DescribeEnv{Overpic}
+% |\begin{Overpic}[|\meta{options}|]{|\meta{\TeX\ code}|}|
+%  \meta{picture code} |\end{Overpic}| \par
+%  Similar to environment |overpic| but instead of a graphic any
+%  \TeX\ code (e.g. a tabular) is set as basement of the following picture
+%  overlay.
+%
+% \DescribeMacro\setOverpic
+% \cmd{\setOverpic}|{|\meta{options}|}| \par
+% Sets new default values.
+%
+% \section{Examples}
+%
+% The graphic (\texttt{golfer.eps}) in the following examples is
+% part of the program \texttt{ghostscript} and must be accesible to \TeX{}.
+% To use the command \cmd{\color} the package |xcolor| (or |color|) must
+% be loaded.
+%
+% \subsection{Environment ``overpic'' (absolute positioning)}
+%
+% \begin{lstlisting}
+% \begin{overpic}[abs,unit=1mm,scale=.25,grid]{golfer.eps}
+%   \put(3,27){\color{blue}\huge\LaTeX}
+% \end{overpic}
+% \end{lstlisting}
+% \par\medskip\pagebreak[3]
+% \begin{overpic}[abs,unit=1mm,scale=.25,grid]{golfer.eps}
+%   \put(3,27){\color{blue}\huge\LaTeX}
+% \end{overpic}
+%
+% \subsection{Environment ``overpic'' (relative positioning)}
+%
+% The longer dimension is defined as 100\%. \pagebreak[3]
+%
+% \begin{lstlisting}
+% \begin{overpic}[scale=.25,percent,grid]{golfer.eps}
+%   \put(5,45){\color{blue}\huge\LaTeX}
+%   \put(55,10){\color{red}%
+%     \frame{\includegraphics[scale=.07]{golfer.eps}}}
+% \end{overpic}
+% \end{lstlisting}
+% \par\medskip\pagebreak[3]
+% \begin{overpic}[scale=.25,percent,grid]{golfer.eps}
+%   \put(5,45){\color{blue}\huge\LaTeX}
+%   \put(55,10){\color{red}%
+%     \frame{\includegraphics[scale=.07]{golfer.eps}}}
+% \end{overpic}
+%  
+% \subsection{Environment ``Overpic'' (absolute positioning)}
+%
+% To use the picture command \cmd{\polygon} the package |pict2e| must
+% be loaded.
+%
+% \begin{lstlisting}
+% \begin{Overpic}[abs,unit=1mm,grid=true,tics=5]{%
+%   \begin{tabular}{*{8}{p{8mm}}}
+%   H  &    &    &    &    &    &    & He\\
+%   Li & Be & B  & C  & N  & O  & F  & Ne\\
+%   Na & Mg & Al & Si & P  & S  & Cl & Ar\\
+%   K  & Ca & Ga & Ge & As & Se & Br & Kr\\
+%   Rb & Sr & In & Sn & Sb & Te & I  & Xe\\
+%   Cs & Ba & Tl & Pb & Bi & Po & At & Rn\\
+%   Fr & Ra & 112&    & 114&    &    &\\
+%   \end{tabular}}%
+%   \linethickness{0.5mm} \color{blue}%
+%   \put(0,0){\polygon(0,30)(10,30)(10,21.5)(44,21.5)(44,13.5)%
+%     (22,13.5)(22,4.5)(0,4.5)}
+% \end{Overpic}  
+% \end{lstlisting}
+% \par\medskip\pagebreak[3]
+% \begin{Overpic}[abs,unit=1mm,grid=true,tics=5]{%
+%   \begin{tabular}{*{8}{p{8mm}}}
+%   H  &    &    &    &    &    &    & He\\
+%   Li & Be & B  & C  & N  & O  & F  & Ne\\
+%   Na & Mg & Al & Si & P  & S  & Cl & Ar\\
+%   K  & Ca & Ga & Ge & As & Se & Br & Kr\\
+%   Rb & Sr & In & Sn & Sb & Te & I  & Xe\\
+%   Cs & Ba & Tl & Pb & Bi & Po & At & Rn\\
+%   Fr & Ra & 112&    & 114&    &    &\\
+%   \end{tabular}}%
+%   \linethickness{0.5mm} \color{blue}%
+%   \put(0,0){\polygon(0,30)(10,30)(10,21.5)(44,21.5)(44,13.5)%
+%     (22,13.5)(22,4.5)(0,4.5)}
+% \end{Overpic} 
+%
+% \StopEventually{}
+%
+% \section{Implementation}
+%
+% \iffalse
+%<*package>
+% \fi
+%    \begin{macrocode}
+\RequirePackage{graphicx,epic}
+%    \end{macrocode}
+%
+% \begin{macro}{\OVP@scale}
+% Reference value for rel mode, "100" (percent) and "1000" (permil)
+%    \begin{macrocode}
+\newcommand*\OVP@scale{\z@}
+%    \end{macrocode}
+% \end{macro}
+% All the keys. 
+%    \begin{macrocode}
+\define@key{Gin}{rel}{%
+  \def\OVP@scale{#1}%
+  \ifnum\OVP@scale>\z@
+    \let\OVP@calc\OVP@calc@rel
+  \else
+    \PackageError{overpic}{Invalid number for option `rel'}\@ehc
+  \fi
+}
+\define@key{Gin}{percent}[]{%
+  \setkeys{Gin}{rel=100}%
+}
+\define@key{Gin}{permil}[]{%
+  \setkeys{Gin}{rel=\@m}%
+}
+\define@key{Gin}{abs}[]{%
+  \let\OVP@calc\OVP@calc@abs
+}
+\newif\ifGin@grid
+\define@key{Gin}{grid}[true]{\lowercase{\Gin@boolkey{#1}}{grid}}
+\define@key{Gin}{tics}{\count@=#1}
+\define@key{Gin}{unit}{\unitlength=\dimexpr#1\relax}
+%    \end{macrocode}
+% \begin{macro}{\OVP@calc@abs}
+% Some calculations in abs mode. \cmd{\@tempcnta} is the normalized width
+% and \cmd{\@tempcntb} is the normalized height. \cmd{\count@} is the
+% tics value.
+%    \begin{macrocode}
+\newcommand*\OVP@calc@abs{%
+  \divide\@tempcnta by \unitlength
+  \divide\@tempcntb by \unitlength
+  \ifnum\count@=\z@\count@=10\fi
+}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\OVP@calc@rel}
+% Some calculations in rel mode. The bigger value of width or height
+% is the base.
+% \changes{1.0}{2017/10/06}{Suggested by \mbox{Heiko Oberdiek}}
+%    \begin{macrocode}
+\newcommand*\OVP@calc@rel{%
+  \ifnum\@tempcnta>\@tempcntb
+    \divide\@tempcnta by \OVP@scale
+    \unitlength=\@tempcnta sp %
+    \@tempcnta=\OVP@scale
+    \divide\@tempcntb by \unitlength
+  \else
+    \divide\@tempcntb by \OVP@scale
+    \unitlength=\@tempcntb sp %
+    \@tempcntb=\OVP@scale
+    \divide\@tempcnta by \unitlength
+  \fi
+  \ifnum\count@=\z@
+    \count@=\OVP@scale
+    \divide\count@ by 10 %
+  \fi
+}
+%    \end{macrocode}
+% \end{macro}
+% The package options set the defaults.
+%    \begin{macrocode}
+\DeclareOption{percent}{\setkeys{Gin}{rel=100}}
+\DeclareOption{permil}{\setkeys{Gin}{rel=\@m}}
+\DeclareOption{abs}{\setkeys{Gin}{abs}}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
+\ExecuteOptions{percent}
+\ProcessOptions
+%    \end{macrocode}
+%
+% \begin{environment}{overpic}
+% Box 0 gets a graphic.
+%    \begin{macrocode}
+\newenvironment{overpic}[2][]{%
+  \sbox\z@{\includegraphics[#1]{#2}}%
+%    \end{macrocode}
+% reset the graphics parameter
+%    \begin{macrocode}
+  \let\Gin@outer@scalex\relax
+  \let\Gin@outer@scaley\relax
+  \let\Gin@angle\relax
+  \let\Gin@ewidth\Gin@exclamation
+  \let\Gin@eheight\Gin@ewidth
+  \def\Gin@scalex{1}%
+  \let\Gin@scaley\Gin@exclamation
+  \OVP@picture{#1}%
+}{\endpicture}
+%    \end{macrocode}
+% \end{environment}
+% \begin{environment}{Overpic}
+% \changes{1.0}{2017/10/06}{Suggested by \mbox{Herbert Vo\ss}}
+% Box 0 gets any \TeX\ code.
+%    \begin{macrocode}
+\newenvironment{Overpic}[2][]{%
+  \sbox\z@{#2}%
+  \OVP@picture{#1}%
+}{\endpicture}
+%    \end{macrocode}
+% \end{environment}
+% \begin{macro}{\OVP@picture}
+% Put box 0 and an optionally grid at the lower left corner of a
+% picture environment. 
+%    \begin{macrocode}
+\newcommand*\OVP@picture[1]{%
+  \settodepth{\@tempcnta}{\usebox\z@}%
+  \settoheight{\@tempcntb}{\usebox\z@}%
+  \advance\@tempcntb\@tempcnta
+  \settowidth{\@tempcnta}{\usebox\z@}%
+  \count@=\z@ \Gin@gridfalse
+  \setkeys{Gin}{#1}%
+  \OVP@calc
+  \picture(\@tempcnta,\@tempcntb)%
+    \put(0,0){\makebox(0,0)[bl]{\usebox\z@}}%
+    \ifGin@grid
+      \put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont
+        \grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}%
+    \fi
+}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\setOverpic}
+% Sets new defaults.
+%    \begin{macrocode}
+\newcommand*\setOverpic[1]{%
+  \setkeys{Gin}{#1}%
+}
+%    \end{macrocode}
+% \end{macro}
+%    \begin{macrocode}
+\endinput
+%    \end{macrocode}
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/overpic/overpic.ins b/Master/texmf-dist/source/latex/overpic/overpic.ins
new file mode 100644
index 00000000000..30fdda1081e
--- /dev/null
+++ b/Master/texmf-dist/source/latex/overpic/overpic.ins
@@ -0,0 +1,59 @@
+%% Copyright (C) 2014 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) 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 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Rolf Niepraschk.
+%%
+%% This work consists of the files overpic.dtx and overpic.ins
+%% and the derived filebase overpic.sty.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/overpic}
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 1997-2016 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+--------------------------------------------------------------------------
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) 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 2005/12/01 or later.
+
+\endpreamble 
+
+\askforoverwritefalse
+
+\generate{\file{overpic.sty}{\from{overpic.dtx}{package}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX:                    *}
+\Msg{*                                                           *}
+\Msg{*     overpic.sty                                           *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation run the file overpic.dtx     *}
+\Msg{* through LaTeX.                                            *}
+\Msg{*                                                           *}
+\Msg{* Happy TeXing!                                             *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/overpic/overpic.sty b/Master/texmf-dist/tex/latex/overpic/overpic.sty
index 59cc29ad622..7be39328b51 100644
--- a/Master/texmf-dist/tex/latex/overpic/overpic.sty
+++ b/Master/texmf-dist/tex/latex/overpic/overpic.sty
@@ -1,107 +1,109 @@
-
-% overpic.sty 
-
-% Copyright  1999-2010 Rolf Niepraschk, Rolf.Niepraschk@gmx.de
-% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version. 
-
-%  \changes{v0.53}{2010/09/13}{reset the graphics parameter}
-%  \changes{v0.51}{1999/03/02}{New (LPPL) license}
-%  \changes{v0.52}{1999/07/04}{Correction of wrong height calculation 
-%                              (if depth != 0)}
-
-
-\def\fileversion{v0.53}
-\def\filedate{2010/09/13}% 
-
-\ProvidesPackage{overpic}
-    [\filedate\space\fileversion\space\space Overwriting graphics]  
-                  
-\NeedsTeXFormat{LaTeX2e}
-
-\typeout{Package: overpic \fileversion\space <\filedate> (RN)}
-
-\newcommand\OVP@scale{}
-
-\DeclareOption{percent}{\renewcommand\OVP@scale{100}}
-\DeclareOption{permil}{\renewcommand\OVP@scale{\@m}}
-\DeclareOption{abs}{\renewcommand\OVP@scale{\z@}}
-
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
-
-\ExecuteOptions{percent}
-
-\ProcessOptions
-
+%%
+%% This is file `overpic.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% overpic.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 1997-2016 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) 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 2005/12/01 or later.
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{overpic}[2017/10/06 1.0 picture overlays]
 \RequirePackage{graphicx,epic}
-
-\newif\ifGin@grid 
-
+\newcommand*\OVP@scale{\z@}
+\define@key{Gin}{rel}{%
+  \def\OVP@scale{#1}%
+  \ifnum\OVP@scale>\z@
+    \let\OVP@calc\OVP@calc@rel
+  \else
+    \PackageError{overpic}{Invalid number for option `rel'}\@ehc
+  \fi
+}
+\define@key{Gin}{percent}[]{%
+  \setkeys{Gin}{rel=100}%
+}
+\define@key{Gin}{permil}[]{%
+  \setkeys{Gin}{rel=\@m}%
+}
+\define@key{Gin}{abs}[]{%
+  \let\OVP@calc\OVP@calc@abs
+}
+\newif\ifGin@grid
 \define@key{Gin}{grid}[true]{\lowercase{\Gin@boolkey{#1}}{grid}}
 \define@key{Gin}{tics}{\count@=#1}
-\define@key{Gin}{unit}{\setlength{\@tempdima}{#1}}
-
-\ifnum\OVP@scale>\z@%
-  \ifnum\OVP@scale=\@m%
-    \typeout{overpic: relative positioning in permil}% 
-  \else%
-    \typeout{overpic: relative positioning in percent}% 
-  \fi%  
-  \newcommand\OVP@calc{%  
-    \ifnum\@tempcnta>\@tempcntb%
-      \divide\@tempcnta by \OVP@scale%
-      \setlength\unitlength{\@tempcnta sp}% 
-      \@tempcnta=\OVP@scale%
-      \divide\@tempcntb by \unitlength%
-    \else%
-      \divide\@tempcntb by \OVP@scale%
-      \setlength\unitlength{\@tempcntb sp}%  
-      \@tempcntb=\OVP@scale%
-      \divide\@tempcnta by \unitlength%
-    \fi%
-    \ifnum\count@=\z@% 
-      \count@=\OVP@scale\divide\count@ by 10 %
-    \fi%
-  }%  
-\else%           
-  \typeout{overpic: absolute positioning in \unitlength}%
-  \newcommand\OVP@calc{%
-    \setlength{\unitlength}{\@tempdima}%
-    \divide\@tempcnta by \unitlength%
-    \divide\@tempcntb by \unitlength% 
-    \ifnum\count@=\z@\count@=10\fi%  
-  }%  
-\fi%  
- 
+\define@key{Gin}{unit}{\unitlength=\dimexpr#1\relax}
+\newcommand*\OVP@calc@abs{%
+  \divide\@tempcnta by \unitlength
+  \divide\@tempcntb by \unitlength
+  \ifnum\count@=\z@\count@=10\fi
+}
+\newcommand*\OVP@calc@rel{%
+  \ifnum\@tempcnta>\@tempcntb
+    \divide\@tempcnta by \OVP@scale
+    \unitlength=\@tempcnta sp %
+    \@tempcnta=\OVP@scale
+    \divide\@tempcntb by \unitlength
+  \else
+    \divide\@tempcntb by \OVP@scale
+    \unitlength=\@tempcntb sp %
+    \@tempcntb=\OVP@scale
+    \divide\@tempcnta by \unitlength
+  \fi
+  \ifnum\count@=\z@
+    \count@=\OVP@scale
+    \divide\count@ by 10 %
+  \fi
+}
+\DeclareOption{percent}{\setkeys{Gin}{rel=100}}
+\DeclareOption{permil}{\setkeys{Gin}{rel=\@m}}
+\DeclareOption{abs}{\setkeys{Gin}{abs}}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}}
+\ExecuteOptions{percent}
+\ProcessOptions
 \newenvironment{overpic}[2][]{%
-  \sbox{\z@}{\includegraphics[#1]{#2}}%
-  \settodepth{\@tempcnta}{\usebox{\z@}}%
-  \settoheight{\@tempcntb}{\usebox{\z@}}%
-  \advance\@tempcntb\@tempcnta%
-  \settowidth{\@tempcnta}{\usebox{\z@}}%
-  \setlength{\@tempdima}{\unitlength}%
-  \count@=\z@\Gin@gridfalse\setkeys{Gin}{#1}% 
-%
-  \OVP@calc%
-%  
-  \begin{picture}(\@tempcnta,\@tempcntb)%
-    \put(0,0){\makebox(0,0)[bl]{\usebox{\z@}}}%
-    \ifGin@grid%
-      \put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont%
+  \sbox\z@{\includegraphics[#1]{#2}}%
+  \let\Gin@outer@scalex\relax
+  \let\Gin@outer@scaley\relax
+  \let\Gin@angle\relax
+  \let\Gin@ewidth\Gin@exclamation
+  \let\Gin@eheight\Gin@ewidth
+  \def\Gin@scalex{1}%
+  \let\Gin@scaley\Gin@exclamation
+  \OVP@picture{#1}%
+}{\endpicture}
+\newenvironment{Overpic}[2][]{%
+  \sbox\z@{#2}%
+  \OVP@picture{#1}%
+}{\endpicture}
+\newcommand*\OVP@picture[1]{%
+  \settodepth{\@tempcnta}{\usebox\z@}%
+  \settoheight{\@tempcntb}{\usebox\z@}%
+  \advance\@tempcntb\@tempcnta
+  \settowidth{\@tempcnta}{\usebox\z@}%
+  \count@=\z@ \Gin@gridfalse
+  \setkeys{Gin}{#1}%
+  \OVP@calc
+  \picture(\@tempcnta,\@tempcntb)%
+    \put(0,0){\makebox(0,0)[bl]{\usebox\z@}}%
+    \ifGin@grid
+      \put(0,0){\normalfont\fontsize\@viipt\@viiipt\selectfont
         \grid(\@tempcnta,\@tempcntb)(\count@,\count@)[0,0]}%
-    \fi%  
-    % reset the graphics parameter
-    \let\Gin@outer@scalex\relax
-    \let\Gin@outer@scaley\relax
-    \let\Gin@angle\relax
-    \let\Gin@ewidth\Gin@exclamation
-    \let\Gin@eheight\Gin@ewidth
-    \def\Gin@scalex{1}
-    \let\Gin@scaley\Gin@exclamation
-}{% 
-  \end{picture}%
-}% 
-
+    \fi
+}
+\newcommand*\setOverpic[1]{%
+  \setkeys{Gin}{#1}%
+}
 \endinput
+%%
+%% End of file `overpic.sty'.