hrefhide 1.0f (29apr11)

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

4 files changed, 365 insertions, 503 deletions

diff --git a/Master/texmf-dist/source/latex/hrefhide/hrefhide.drv b/Master/texmf-dist/source/latex/hrefhide/hrefhide.drv
index f042cbdfd6a..09a2fab1a38 100644
--- a/Master/texmf-dist/source/latex/hrefhide/hrefhide.drv
+++ b/Master/texmf-dist/source/latex/hrefhide/hrefhide.drv
@@ -8,10 +8,13 @@
 %% 
 %% This is a generated file.
 %% 
-%% IMPORTANT NOTICE:
-%% The package takes options.
+%% Project: hrefhide
+%% Version: 2011/04/29 v1.0f
 %% 
-%% The usual disclaimers apply:
+%% Copyright (C) 2010, 2011 by
+%%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% 
+%% The usual disclaimer applys:
 %% If it doesn't work right that's your problem.
 %% (Nevertheless, send an e-mail to the maintainer
 %%  when you find an error in this package.)
@@ -28,33 +31,23 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
 %% 
 %% This work consists of the main source file hrefhide.dtx
 %% and the derived files
 %%    hrefhide.sty, hrefhide.pdf, hrefhide.ins, hrefhide.drv,
 %%    hrefhide-example.tex.
 %% 
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{hrefhide.drv}[2011/02/01 v1.0e%
-            Hiding hyperrefs when printing pdf files (HMM)]%
+\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\ProvidesFile{hrefhide.drv}%
+  [2011/04/29 v1.0f Hiding hyperrefs when printing pdf files (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2010/04/24]% v0.19
+\usepackage{holtxdoc}[2011/02/04]% v0.21
 %% hrefhide may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
 %% to the most recent version (if they are not already the most
 %% recent version).
-%% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages
-%% hypdoc, 2010/03/26, v1.9
-%% hyperref, 2010/03/30, v6.80u (latest: 2010/12/16, v6.81z)
-%% pdftexcmds, 2010/04/01, v0.9
-%% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7)
-%% hologo, 2010/04/24, v1.2
-%% array (latest: 2008/09/09, v2.4c)
-%% (or more recent versions) and does neither work with
-%% nor check for earlier versions!
 \hypersetup{%
  pdfsubject={Hiding hyperrefs when printing pdf files (HMM)},%
  pdfkeywords={LaTeX, hrefhide, hyperref, href, pdf, hide, print, Hans-Martin Muench},%
@@ -72,10 +65,8 @@
  pdfwindowui=true,%
  pdfnewwindow=true%
 }
-\setlength\hfuzz{1pt} % Ignore slight overfulls.
 \CodelineIndex
-\EnableCrossrefs
-\hyphenation{docu-ment}
+\hyphenation{printing docu-ment}
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \begin{document}
   \DocInput{hrefhide.dtx}%
diff --git a/Master/texmf-dist/source/latex/hrefhide/hrefhide.dtx b/Master/texmf-dist/source/latex/hrefhide/hrefhide.dtx
index 468381a2901..df52387a21d 100644
--- a/Master/texmf-dist/source/latex/hrefhide/hrefhide.dtx
+++ b/Master/texmf-dist/source/latex/hrefhide/hrefhide.dtx
@@ -1,12 +1,10 @@
 % \iffalse meta-comment
 %
-% hrefhide package
-% file version: v1.0e
-% file date:          2011/02/01
-% documentation date: 2011/02/01
+% File: hrefhide.dtx
+% Version: 2011/04/29 v1.0f
 %
-% Copyright (C) 2010, 2011 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
-% Portions of code copyrighted by other people as marked.
+% Copyright (C) 2010, 2011 by
+%    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -24,8 +22,13 @@
 %
 % This work consists of the main source file hrefhide.dtx
 % and the derived files
-%    hrefhide.sty, hrefhide.ins, hrefhide.drv,
-%    hrefhide-example.tex, hrefhide.pdf.
+%    hrefhide.sty, hrefhide.pdf, hrefhide.ins, hrefhide.drv,
+%    hrefhide-example.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/hrefhide/hrefhide.dtx
+%    CTAN:macros/latex/contrib/hrefhide/hrefhide.pdf
+%    CTAN:install/macros/latex/contrib/hrefhide.tds.zip
 %
 % Unpacking:
 %    (a) If hrefhide.ins is present:
@@ -56,8 +59,9 @@
 %       \PassOptionsToClass{a4paper}{article}
 %
 % Installation:
-%    ! First, please make sure that there is no old version of !
-%    ! hrefhide at some obsolete place in your system.         !
+%    ! When manually installing, please first make sure !
+%    ! that there is no old version of hrefhide at      !
+%    ! some obsolete place in your system.              !
 %    TDS:tex/latex/hrefhide/hrefhide.sty
 %    TDS:doc/latex/hrefhide/hrefhide.pdf
 %    TDS:doc/latex/hrefhide/hrefhide-example.tex
@@ -65,6 +69,8 @@
 %
 %<*ignore>
 \begingroup
+  \catcode123=1 %
+  \catcode125=2 %
   \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
@@ -74,13 +80,10 @@
 %</ignore>
 %<*install>
 \input docstrip.tex
-
-\obeyspaces
-\Msg{******************************************************}
-\Msg{* Installation                                       *}
-\Msg{* Package: hrefhide v1.0e 2011/02/01 LaTeX2e package *}
-\Msg{* Hiding hyperrefs when printing pdf files (HMM)     *}
-\Msg{******************************************************}
+\Msg{***********************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: hrefhide 2011/04/29 v1.0f Hiding hyperrefs when printing pdf files (HMM)}
+\Msg{***********************************************************************************}
 
 \keepsilent
 \askforoverwritefalse
@@ -90,10 +93,13 @@
 
 This is a generated file.
 
-IMPORTANT NOTICE:
-The package takes options.
+Project: hrefhide
+Version: 2011/04/29 v1.0f
 
-The usual disclaimers apply:
+Copyright (C) 2010, 2011 by
+    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+
+The usual disclaimer applys:
 If it doesn't work right that's your problem.
 (Nevertheless, send an e-mail to the maintainer
  when you find an error in this package.)
@@ -110,8 +116,7 @@ LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-The Current Maintainer of this work is H.-Martin Muench
-(Martin dot Muench at Uni-Bonn dot de).
+The Current Maintainer of this work is H.-Martin Muench.
 
 This work consists of the main source file hrefhide.dtx
 and the derived files
@@ -124,38 +129,37 @@ and the derived files
 \generate{%
   \file{hrefhide.ins}{\from{hrefhide.dtx}{install}}%
   \file{hrefhide.drv}{\from{hrefhide.dtx}{driver}}%
-  \file{ltxdoc.cfg}{\from{hrefhide.dtx}{ltxdoc}}%
   \usedir{tex/latex/hrefhide}%
   \file{hrefhide.sty}{\from{hrefhide.dtx}{package}}%
   \usedir{doc/latex/hrefhide}%
   \file{hrefhide-example.tex}{\from{hrefhide.dtx}{example}}%
 }
 
-\obeyspaces
-\Msg{**************************************************************}
-\Msg{*                                                            *}
-\Msg{* To finish the installation you have to move the following  *}
-\Msg{* file into a directory searched by TeX:                     *}
-\Msg{*                                                            *}
-\Msg{* hrefhide.sty                                               *}
-\Msg{*                                                            *}
-\Msg{* To produce the documentation run the file `hrefhide.dtx'   *}
-\Msg{* through (pdf)LaTeX, e.g.                                   *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*  makeindex -s gind.ist hrefhide.idx                        *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*  makeindex -s gind.ist hrefhide.idx                        *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*                                                            *}
-\Msg{* At least three runs are necessary e.g. to get the          *}
-\Msg{*  references right!                                         *}
-\Msg{*                                                            *}
-\Msg{* Happy TeXing!                                              *}
-\Msg{*                                                            *}
-\Msg{**************************************************************}
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     hrefhide.sty*}
+\Msg{*}
+\Msg{* To produce the documentation run the file `hrefhide.drv'}
+\Msg{* through (pdf)LaTeX, e.g.}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*  makeindex -s gind.ist hrefhide.idx}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*  makeindex -s gind.ist hrefhide.idx}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*}
+\Msg{* At least three runs are necessary e.g. to get the}
+\Msg{*  references right!}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
 
 \endbatchfile
-
 %</install>
 %<*ignore>
 \fi
@@ -172,25 +176,16 @@ and the derived files
 %
 %    \begin{macrocode}
 %<*driver>
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{hrefhide.drv}[2011/02/01 v1.0e%
-            Hiding hyperrefs when printing pdf files (HMM)]%
+\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\ProvidesFile{hrefhide.drv}%
+  [2011/04/29 v1.0f Hiding hyperrefs when printing pdf files (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
-\usepackage{holtxdoc}[2010/04/24]% v0.19
+\usepackage{holtxdoc}[2011/02/04]% v0.21
 %% hrefhide may work with earlier versions of LaTeX2e and those
 %% class and package, but this was not tested.
 %% Please consider updating your LaTeX, class, and package
 %% to the most recent version (if they are not already the most
 %% recent version).
-%% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages
-%% hypdoc, 2010/03/26, v1.9
-%% hyperref, 2010/03/30, v6.80u (latest: 2010/12/16, v6.81z)
-%% pdftexcmds, 2010/04/01, v0.9
-%% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7)
-%% hologo, 2010/04/24, v1.2
-%% array (latest: 2008/09/09, v2.4c)
-%% (or more recent versions) and does neither work with
-%% nor check for earlier versions!
 \hypersetup{%
  pdfsubject={Hiding hyperrefs when printing pdf files (HMM)},%
  pdfkeywords={LaTeX, hrefhide, hyperref, href, pdf, hide, print, Hans-Martin Muench},%
@@ -208,14 +203,8 @@ and the derived files
  pdfwindowui=true,%
  pdfnewwindow=true%
 }
-\setlength\hfuzz{1pt} % Ignore slight overfulls.
 \CodelineIndex
-%\PageIndex           % instead of \CodelineIndex to get the page numbers
-\EnableCrossrefs
-%\DisableCrossrefs    % Say \DisableCrossrefs if index is ready.
-%\RecordChanges       % Gather update information.
-%\OnlyDescription     % Comment out for implementation details.
-\hyphenation{docu-ment}
+\hyphenation{printing docu-ment}
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \begin{document}
   \DocInput{hrefhide.dtx}%
@@ -223,76 +212,9 @@ and the derived files
 %</driver>
 %    \end{macrocode}
 %
-%    \begin{macrocode}
-%<*ltxdoc>
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{ltxdoc.cfg}[2011/02/01 v1.0b configuration file for hrefhide (HMM)]
-  %% Code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)],  %%
-  % copyrighted 2006, 2007 Heiko Oberdiek, part of project `latex-tds'.
-  % That file 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.3c or later is part of all distributions of LaTeX
-  % version 2005/12/01 or later.
-  % That work has the LPPL maintenance status `maintained'.
-  % The Current Maintainer of that work is Heiko Oberdiek.
-  %
-  \PassOptionsToClass{a4paper}{article}
-  \AtEndOfClass{%
-    \RequirePackage[numbered]{hypdoc}[2010/03/26]% v1.9
-    \pdfstringdefDisableCommands{%
-      \let\env\relax % longtable.dtx
-      \let\mytt\relax % tabularx.dtx
-    }%
-    \addtolength{\topmargin}{-10mm}%
-    \addtolength{\textheight}{20mm}%
-    % Depending on the page style, the head or foot area
-    % are put into the text area.
-    % Usually the page style is the default "plain".
-    % tools/verbatim.dtx uses "myheadings".
-    \def\string@plain{plain}%
-    \def\string@myheadings{myheadings}%
-    \def\current@pagestyle{plain}%
-    \let\ltxdoc@cfg@pagestyle\pagestyle
-    \def\pagestyle#1{%
-      \def\current@pagestyle{#1}%
-      \ltxdoc@cfg@pagestyle{#1}%
-    }%
-    \edef\ltxdoc@cfg@jobname{\jobname}%
-    \def\ltxdoc@cfg@longtable{longtable}%
-    \@onelevel@sanitize\ltxdoc@cfg@longtable
-    \ifx\ltxdoc@cfg@jobname\ltxdoc@cfg@longtable
-      \def\current@pagestyle{both}%
-    \fi
-    \let\ltxdoc@cfg@document\document
-    \def\document{%
-      \ifx\current@pagestyle\string@plain
-        \addtolength{\textheight}{\headheight}%
-        \addtolength{\textheight}{\headsep}%
-        \setlength{\headheight}{0pt}%
-        \setlength{\headsep}{0pt}%
-        \global\textheight\textheight
-        \global\headheight\headheight
-        \global\headsep\headsep
-      \fi
-      \ifx\current@pagestyle\string@myheadings
-        \addtolength{\textheight}{\footskip}%
-        \global\textheight\textheight
-      \fi
-      \ltxdoc@cfg@document
-    }%
-  %% End of code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)]  %%
-  %% Place additional code here.  %%
-  }
-
-%</ltxdoc>
-%    \end{macrocode}
-%
 % \fi
 %
-% \CheckSum{58}
+% \CheckSum{144}
 %
 % \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
@@ -305,7 +227,7 @@ and the derived files
 %   Minus         \-     Point         \.     Solidus       \/
 %   Colon         \:     Semicolon     \;     Less than     \<
 %   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash    \\
+%   Commercial at \@     Left bracket  \[     Backslash     \\
 %   Right bracket \]     Circumflex    \^     Underscore    \_
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
@@ -326,37 +248,29 @@ and the derived files
 %       \edef\x{\noexpand\DoNotIndex{\@backslashchar9}}%^^A
 %     }%^^A
 %   \expandafter\endgroup\x
-% \DoNotIndex{\documentclass,\usepackage,\hfuzz,\small,\tt,\begin,\end}
-% \DoNotIndex{\NeedsTeXFormat,\filedate,\fileversion,\DoNotIndex}
-% \DoNotIndex{\def,\edef,\divide,\advance,\multiply}
-% \DoNotIndex{\",\-,\,,\\,\hskip,\H,\ldots,\indent,\noindent,\textbackslash}
-% \DoNotIndex{\textbf,\textit,\textquotedblleft,\textquotedblright,\textsf,\texttt,\Large}
-% \DoNotIndex{\ifthenelse,\and,\equal,\whiledo,\if,\ifx,\ifnum,\else,\fi}
-% \DoNotIndex{\CodelineIndex,\EnableCrossrefs,\DisableCrossrefs}
-% \DoNotIndex{\DocInput,\AltMacroFont}
-% \DoNotIndex{\@ne,\tw@,\thr@@}
-% \DoNotIndex{\newpage,\pagebreak,\newline,\linebreak,\nolinebreak}
-% \DoNotIndex{\lipsum,\MessageBreak,\pageref,\protect}
-% \DoNotIndex{\kvoptions,\listfiles}
-% \DoNotIndex{\makeatother,\makeatletter}
-% \DoNotIndex{\RecordChanges,\OnlyDescription}
-% \DoNotIndex{\smallskip,\medskip,\bigskip,\space,\thinspace}
-% \DoNotIndex{\item,\footnote}
+%
+% \DoNotIndex{\\}
+% \DoNotIndex{\documentclass,\usepackage,\ProvidesPackage,\begin,\end}
+% \DoNotIndex{\NeedsTeXFormat,\DoNotIndex,\verb}
+% \DoNotIndex{\def,\edef,\gdef,\global}
+% \DoNotIndex{\ifx,\kvoptions,\listfiles,\mathord,\mathrm,\ProcessKeyvalOptions}
+% \DoNotIndex{\SetupKeyvalOptions}
+% \DoNotIndex{\bigskip,\space,\thinspace,\Large,\linebreak,\lipsum,\MessageBreak}
+% \DoNotIndex{\ldots,\indent,\noindent,\newline,\pagebreak,\pagenumbering}
+% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textquotedblleft,\textquotedblright}
 % \DoNotIndex{\plainTeX,\TeX,\LaTeX,\pdfLaTeX}
 % \DoNotIndex{\chapter,\section}
 %
-% \title{The \textsf{hrefhide} package\footnote{This file%
-%        has version number v1.0e, last%
-%        revised 2011/02/01, documentation dated 2011/02/01.}}
-% \author{H.-Martin M\"{u}nch\\
-% (\texttt{Martin dot Muench at Uni-Bonn dot de})}
-% \date{2011/02/01}
+% \title{The \xpackage{hrefhide} package}
+% \date{2011/04/29 v1.0f}
+% \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
 %
 % \begin{abstract}
-%  This package allows to \textquotedblleft hide\textquotedblright\ some
-%  (hyperlinked) text when printing the document while keeping the layout.
+%  This \LaTeX\ package allows to \textquotedblleft hide\textquotedblright\ some
+%  (hyperlinked) text when printing the document while keeping the layout and
+%  to simulate switching \texttt{ocgcolor} of \xpackage{hyperref} package on and off.
 % \end{abstract}
 %
 % \bigskip
@@ -369,9 +283,9 @@ and the derived files
 %
 % \bigskip
 %
-% \noindent Save per page about $200\unit{ml}$ water,
+% \noindent {\color{green} Save per page about $200\unit{ml}$ water,
 % $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:\\
-% Therefore please print only if this is really necessary.
+% Therefore please print only if this is really necessary.}
 %
 % \newpage
 %
@@ -382,14 +296,17 @@ and the derived files
 % \section{Introduction}
 %
 % \indent This package provides the command
-% \texttt{\textbackslash hrefdisplayonly} (instead of
-% \texttt{\textbackslash href}). While the (hyperlinked) text
+% |\hrefdisplayonly| (additionally to |\href| of the \xpackage{hyperref}
+% package by \textsc{Heiko Oberdiek}). While the (hyperlinked) text
 % appears like an ordinary \texttt{\textbackslash href} in the
 % compiled \xext{pdf}-file, the same text will be
 % \textquotedblleft hidden\textquotedblright\ when printing the text.
 % It is not really invisible, but just has the same colour as the background
 % (default: |white|). Therefore the layout is not changed when printing
-% the document.
+% the document.\\
+% Further the commands |\hycon| and |\hycoff| (|hy|per-|c|olour-|on|/|off|)
+% can be used to \emph{simulate} switching option |ocgcolorlinks| of
+% \xpackage{hyperref} package on and off.
 %
 % \bigskip
 % \noindent \textbf{Trademarks} appear throughout this
@@ -406,28 +323,35 @@ and the derived files
 % \begin{quote}
 %   |\usepackage[<|\textit{options}|>]{hrefhide}|
 % \end{quote}
-% \noindent in the preamble of your \LaTeXe\ source file
-% \textbf{after} the \texttt{hyperref} package of Heiko Oberdiek.
-% For a link, which shall not be printed, use
-% \texttt{\textbackslash hrefdisplayonly} instead of
-% \texttt{\textbackslash href}. This might be practical
+% \noindent in the preamble of your \LaTeXe\ source file \textbf{after}
+% the \xpackage{hyperref} package. For a link, which shall not be printed,
+% use |\hrefdisplayonly| instead of |\href|. This might be practical
 % for example for internal links, which make no sense in a printed
 % version (\textquotedblleft Klick here\textquotedblright\ does
-% not work with real paper).
+% not work with real paper).\\
+% |\hypersetup{ocgcolorlinks=true}| and |\hypersetup{ocgcolorlinks=false}|
+% may work - or they may not. (|ocgcolorlinks| is a decision to be made
+% in the preamble and performes changes which cannot easily be reverted.)
+% But it is possible to use |ocgcolorlinks| while letting the links
+% \emph{appear} as if |ocgcolorlinks=false| was choosen. Therefore this
+% package provides the command |\hycoff| (and |\hycon| to switch back to
+% default |ocgcolorlinks=true| behaviour). Note that |ocgcolorlinks=true|
+% really is enabled, therefore all limitation of this apply
+% (e.\,g. no breaks in links).
 %
 % \subsection{Options}
 % \DescribeMacro{options}
-% \indent The \textsf{hrefhide} package takes the following options:
+% \indent The \xpackage{hrefhide} package takes the following options:
 %
 % \subsubsection{linktextcolour\label{sss:linktextcolour}}
 % \DescribeMacro{linktextcolour}
 % \indent The option \texttt{linktextcolour} takes the colour of
-% the text of the link. The default is \texttt{black}.
+% the text of the links. The default is \texttt{black}.
 %
 % \subsubsection{backgroundcolour\label{sss:backgroundcolour}}
 % \DescribeMacro{backgroundcolour}
 % \indent The option \texttt{backgroundcolour} takes the colour of
-% the background of the link. The default is \texttt{white}.
+% the background of the links. The default is \texttt{white}.
 %
 % \subsubsection{pdfborder\label{sss:pdfborder}}
 % \DescribeMacro{pdfborder}
@@ -437,18 +361,18 @@ and the derived files
 %
 % \section{Alternatives\label{sec:Alternatives}}
 %
-% \DescribeMacro{(ocg)colorlinks}
-% If option \texttt{(ocg)colorlinks} (of the \textsf{hyperref} package)
-% is already used in your document, do \textbf{NOT} use this
-% \textsf{hrefhide} package! For a link to be
-% \textquotedblleft hidden\textquotedblright , just say
+% \DescribeMacro{ocgcolorlinks}
+% If option \texttt{ocgcolorlinks} (of the \xpackage{hyperref} package)
+% is already used in your document (i.\,e. you \emph{want} coloured links),
+% do \textbf{NOT} use this \xpackage{hrefhide} package to hide links!
+% For a link to be \textquotedblleft hidden\textquotedblright , just say
 % \begin{verbatim}
 %   {\color{white} \href{...}{...}}
 % \end{verbatim}
 % (and replace \texttt{white} with the background colour).\\
 %
-% For hiding text, which does not contain links, the \textsf{pdfcomment}
-% package of Josef Kleber should be noted.
+% For hiding text, which does not contain links, the \xpackage{pdfcomment}
+% package by \textsc{Josef Kleber} should be noted.
 %
 % \bigskip
 %
@@ -457,16 +381,17 @@ and the derived files
 %  OK, send an e-mail to me with the name, location at \CTAN{},
 %  and a short notice, and I will probably include it here.)\\
 %
-% \newpage
+% \bigskip
 %
 % \section{Example}
 %
 %    \begin{macrocode}
 %<*example>
-\documentclass[british]{article}
+\documentclass[british]{article}[2007/10/19]% v1.4h
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{lipsum}[2005/01/26]% v1.0
-\usepackage[ocgcolorlinks]{hyperref}[2010/12/16]% v6.81z
+\usepackage{lipsum}[2011/04/14]% v1.2
+\usepackage[ocgcolorlinks,bookmarks=false,bookmarksopen=false]{hyperref}[2011/04/17]% v6.82g
+% Bookmarks are not needed here, but are possible, of course.
 \hypersetup{extension=pdf,%
  plainpages=false,%
  pdfpagelabels=true,%
@@ -477,10 +402,9 @@ and the derived files
  pdfsubject={Example for the hrefhide package},%
  pdfkeywords={LaTeX, hrefhide, Hans-Martin Muench},%
  pdfview=Fit,pdfstartview=Fit,%
- pdfpagelayout=SinglePage,%
- bookmarksopen=true%
+ pdfpagelayout=SinglePage%
 }
-\usepackage[linktextcolour=black,backgroundcolour=white,pdfborder={0 0 1}]{hrefhide}[2011/02/01]% v1.0e
+\usepackage[linktextcolour=black,backgroundcolour=white,pdfborder={0 0 1}]{hrefhide}[2011/04/29]% v1.0f
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \listfiles
 \begin{document}
@@ -488,7 +412,7 @@ and the derived files
 \section*{Example for hrefhide}
 
 This example demonstrates the use of package\newline
-\textsf{hrefhide}, v1.0e as of 2011/02/01 (HMM).\newline
+\textsf{hrefhide}, v1.0f as of 2011/04/29 (HMM).\newline
 The used options were \texttt{linktextcolour=black},
 \texttt{backgroundcolour=white}, and \texttt{pdfborder={0 0 1}}
 (the default ones).\newline
@@ -549,9 +473,22 @@ duis dolore te feugait nulla facilisi.\newline
 
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit,
 vestibulum ut, placerat ac, adipiscing vitae, felis. Curabitur dictum gravida
-mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a, magna.
+mauris. Nam arcu libero, nonummy eget, consectetuer id, vulputate a,
+magna.\newline
+
+Switching to coloured links with \verb|\hycon|:\newline
+\hycon
+\href{\#RefX}{X} and also
+\href{http://www.ctan.org/pkg/hrefhide}{http://www.ctan.org/pkg/hrefhide}.
+
+Switching off the coloured links with \verb|\hycoff| again:\newline
+\hycoff
+\href{\#RefY}{Y} and also
+\href{http://www.ctan.org/tex-archive/macros/latex/contrib/hrefhide}{%
+http://www.ctan.org/tex-archive/macros/latex/contrib/hrefhide}.
 
 \pagebreak
+
 {\Large \textbf{Targets}}\\
 Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam
 nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat
@@ -592,8 +529,7 @@ nisl ut aliquip ex ea commodo consequat.
 %
 % \newpage
 %
-% \StopEventually{
-% }
+% \StopEventually{}
 %
 % \section{The implementation}
 %
@@ -605,49 +541,51 @@ nisl ut aliquip ex ea commodo consequat.
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{hrefhide}[2011/02/01 v1.0e
+\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\ProvidesPackage{hrefhide}[2011/04/29 v1.0f
             Hiding hyperrefs when printing pdf files (HMM)]%
 
 %    \end{macrocode}
 %
-% A short description of the \textsf{hrefhide} package:
+% A short description of the \xpackage{hrefhide} package:
 %
 %    \begin{macrocode}
 %% Allows to "hide" hyperlinked text in a pdf file when printing
 %% ("Klick here" does not work on real paper)
-%% by providing the command \hrefdisplayonly.
+%% by providing the command \hrefdisplayonly
+%% and allows simulating to switch on/off ocgcolourlinks
+%% of the hyperref package by Heiko Oberdiek.
 
 %    \end{macrocode}
 %
-% We need the \textsf{color} package of David~P. Carlisle
+% We need the \xpackage{xcolor} package by \textsc{Dr.~Uwe Kern}
 % (see subsection~\ref{ss:Downloads}):
 %
 %    \begin{macrocode}
-\RequirePackage{color}[2005/11/14]% v1.0j, from the graphics bundle
+\RequirePackage{xcolor}[2007/01/21]% v2.11
 %    \end{macrocode}
 %
-% the \textsf{hyperref} package of Heiko Oberdiek
+% the \xpackage{hyperref} package by \textsc{Heiko Oberdiek}
 % (see subsection~\ref{ss:Downloads}):
 %
 %    \begin{macrocode}
-\RequirePackage{hyperref}[2010/12/16]% v6.81z
+\RequirePackage[ocgcolorlinks]{hyperref}[2011/04/17]% v6.82g
 %    \end{macrocode}
 %
-% and the \textsf{kvoptions} package, also of Heiko Oberdiek
+% and the \xpackage{kvoptions} package, also by \textsc{Heiko Oberdiek}
 % (see subsection~\ref{ss:Downloads}):
 %
 %    \begin{macrocode}
-\RequirePackage{kvoptions}[2010/02/22]% v3.7
+\RequirePackage{kvoptions}[2010/12/23]% v3.10
 %    \end{macrocode}
 %
-% A last information for the user(s):
+% A last information for the user:
 %
 %    \begin{macrocode}
-%% hrefhide may work with earlier versions of those packages,
-%% but this was not tested. Please consider updating your packages
-%% to the most recent version (if they are not already the most
-%% recent version).
+%% hrefhide may work with earlier versions of LaTeX and those
+%% packages, but this was not tested. Please consider updating
+%% your LaTeX and packages to the most recent version
+%% (if they are not already the most recent version).
 
 %    \end{macrocode}
 % \indent See subsection~\ref{ss:Downloads} about how to get them.\\
@@ -662,6 +600,9 @@ nisl ut aliquip ex ea commodo consequat.
 
 \ProcessKeyvalOptions*
 
+\gdef\hrefhide@status@ON{ON}
+\gdef\hrefhide@status@OFF{OFF}
+
 %    \end{macrocode}
 %
 % The new commands are defined:
@@ -669,58 +610,106 @@ nisl ut aliquip ex ea commodo consequat.
 % \begin{macro}{\hycon}
 %    \begin{macrocode}
 \newcommand{\hycon}{%
-  \relax%
-  }
+\ifx\hrefhide@status\hrefhide@status@OFF%
+\@ifundefined{@anchorbordercolor}{%
+\hypersetup{anchorcolor=\hrefhide@anchorbordercolor}%
+}{%
+\definecolor{hyanchorbordercolor}{rgb}{\@anchorbordercolor}%
+\hypersetup{anchorcolor=hyanchorbordercolor}%
+}%
+%    \end{macrocode}
+%
+% because there is no \texttt{anchorborder(color)} in \xpackage{hyperref} as of
+% 2011/04/17, v6.82g.
+%
+%    \begin{macrocode}
+\definecolor{hycitebordercolor}{rgb}{\@citebordercolor}%
+\hypersetup{citecolor=hycitebordercolor}%
+\definecolor{hyfilebordercolor}{rgb}{\@filebordercolor}%
+\hypersetup{filecolor=hyfilebordercolor}%
+\definecolor{hylinkbordercolor}{rgb}{\@linkbordercolor}%
+\hypersetup{linkcolor=hylinkbordercolor}%
+\definecolor{hymenubordercolor}{rgb}{\@menubordercolor}%
+\hypersetup{menucolor=hymenubordercolor}%
+\definecolor{hyrunbordercolor}{rgb}{\@runbordercolor}%
+\hypersetup{runcolor=hyrunbordercolor}%
+\definecolor{hyurlbordercolor}{rgb}{\@urlbordercolor}%
+\hypersetup{urlcolor=hyurlbordercolor}%
+\hypersetup{pdfborder=0 0 0}%
+\gdef\hrefhide@status{ON}%
+\PackageInfo{hrefhide}{OCG-link colouring ON\MessageBreak}%
+\else%
+\PackageWarning{hrefhide}{\string\hycon\space called when OCG-link colouring was not OFF \MessageBreak%
+- nothing done}%
+\fi%
+}
 
 %    \end{macrocode}
 %
-% At the time beeing, |\hycon| does not do anything,
-% but in case something would be needed to be done before
-% the writing of the link
-% (\textquotedblleft \textbf{hy}perlink \textbf{c}olouring \textbf{on}\textquotedblright),
-% which should be \textquotedblleft hidden\textquotedblright ,
-% this would be the place.\\
+% If link colouring is already |ON|, nothing is done. Otherwise
+% |\hycon| looks for the colour of the border of a link type and
+% sets the colour of the text of that lik type to that colour.\\
 % \end{macro}
 %
 % \begin{macro}{\hycoff}
 % \indent This package on the one hand uses the \texttt{ocgcolor} option
-% of the \textsf{hyperref} package, but on the other hand
+% of the \xpackage{hyperref} package, but on the other hand
 % does not really want coloured links (see \ref{sec:Alternatives}).
-% Thus we kind of turn it off:
+% Thus we simulate to turn it off:
 %
 %    \begin{macrocode}
 \newcommand{\hycoff}{%
+\ifx\hrefhide@status\hrefhide@status@ON%
+\@ifundefined{@anchorbordercolor}{%
+\global\edef\hrefhide@anchorbordercolor{\@anchorcolor}%
+}{%
+\hypersetup{anchorbordercolor=\@anchorcolor}%
+}%
 %    \end{macrocode}
 %
-% It would be easier if one could just switch \texttt{ocgcolor} on
-% and off with |\hypersetup{ocgcolor=true}| and
-% |\hypersetup{ocgcolor=false}|, but the option \texttt{ocgcolor}
-% of the \textsf{hyperref} package can only be used in the preamble
-% of the document when calling the \textsf{hyperref} package.
-% So we use it, but set the colour of the text of the link(s),
-%
-%    \begin{macrocode}
-  \hypersetup{linkcolor=\hrefhide@linktextcolour}%
-%    \end{macrocode}
-%
-% \noindent e.\,g. \texttt{black}, which is possible also inside
-% the main body of the document.\\
-% We redefine the border around the linked text,
+% because there is no \texttt{anchorborder(color)} in \xpackage{hyperref} as of
+% 2011/04/17, v6.82g.
 %
 %    \begin{macrocode}
-  \def\@pdfborder{\hrefhide@pdfborder}%
+\hypersetup{anchorcolor=\hrefhide@linktextcolour}%
+\hypersetup{citebordercolor=\@citecolor}%
+\hypersetup{citecolor=\hrefhide@linktextcolour}%
+\hypersetup{filebordercolor=\@filecolor}%
+\hypersetup{filecolor=\hrefhide@linktextcolour}%
+\hypersetup{linkbordercolor=\@linkcolor}%
+\hypersetup{linkcolor=\hrefhide@linktextcolour}%
+\hypersetup{menubordercolor=\@menucolor}%
+\hypersetup{menucolor=\hrefhide@linktextcolour}%
+\hypersetup{runbordercolor=\@runcolor}%
+\hypersetup{runcolor=\hrefhide@linktextcolour}%
+\hypersetup{urlbordercolor=\@urlcolor}%
+\hypersetup{urlcolor=\hrefhide@linktextcolour}%
+\hypersetup{pdfborder=\hrefhide@pdfborder}%
+\gdef\hrefhide@status{OFF}%
 %    \end{macrocode}
 %
-% \noindent which would be |{0 0 0}| with normal \texttt{ocgcolor} option,
-% i.\,e. there would be no frame at all.\\
+% If link colouring is already |OFF|, nothing is done. Otherwise
+% the colour of the respective border is set to the colour of the text
+% of the link type, setting the colour of the text of the link type to
+% |\hrefhide@linktextcolour| (default: black) and the link border again to
+% |\hrefhide@pdfborder| (default: rectangle with $1\unit{pt}$ line
+% thickness).\\
 % While link colouring is really ON, we thus emulate the behaviour
 % of link colouring OFF, therefore we give this message:
 %
 %    \begin{macrocode}
-  \Hy@Info{Link coloring OFF (sort of; hrefhide package)}%
-  }
+\PackageInfo{hrefhide}{OCG-link colouring OFF (sort of; hrefhide package)\MessageBreak}%
+\else%
+\PackageWarning{hrefhide}{\string\hycoff\space called when OCG-link colouring was not ON \MessageBreak%
+- nothing done}%
+\fi%
+}
 
 %    \end{macrocode}
+%
+% Nevertheless, all restrictions of |ocgcolorlinks|, e.\,g. no links breaking
+% over lines, still prevail!
+%
 % \end{macro}
 %
 % \begin{macro}{\hrefdisplayonly}
@@ -728,32 +717,13 @@ nisl ut aliquip ex ea commodo consequat.
 %
 %    \begin{macrocode}
 \newcommand{\hrefdisplayonly}[2]{%
-  \hycon%
-%    \end{macrocode}
-%
-% \noindent (for whatever should be done before giving the link),\\
-% giving the link with text in |linkcolor|,
-% i.\,e. |\hrefhide@linktextcolour|, when displayed, and
-% in |\hrefhide@backgroundcolour|, when printed:
-%
-%    \begin{macrocode}
-  {\color{\hrefhide@backgroundcolour} \href{#1}{#2}}%
-%    \end{macrocode}
-%
-% \noindent and afterwards we turn \textbf{hy}perlink \textbf{c}olouring \textbf{off}
-%
-%    \begin{macrocode}
-  \hycoff%
-%    \end{macrocode}
-%
-% \noindent which is not really necessary with this version of the package,
-% because it is \textbf{off} in the whole document,
-% but let us just take no risk here.
-%
-%    \begin{macrocode}
-  }
+{\color{\hrefhide@backgroundcolour}\href{#1}{#2}}%
+}
 
 %    \end{macrocode}
+%
+% \noindent which just sets the colour of the link to |\hrefhide@backgroundcolour|
+% for printing, thereby turning it \textquotedblleft invisible\textquotedblright.
 % \end{macro}
 %
 % \begin{macro}{\AtBeginDocument}
@@ -761,16 +731,19 @@ nisl ut aliquip ex ea commodo consequat.
 \AtBeginDocument{%
 %    \end{macrocode}
 %
-% \indent |\AtBeginDocument| it is checked whether
-% the \textsf{hyperref} package was loaded with option
-% \texttt{ocgcolorlinks}. This \textsf{hrefhide} package needs the
-% \textsf{hyperref} package with option \texttt{ocgcolorlinks}.
-% If package and/or option is missing, the appropriate error
-% message is given.
+% \indent |\AtBeginDocument| it is checked whether the \xpackage{hyperref} package
+% was loaded with option \texttt{ocgcolorlinks}. (\xpackage{hrefhide} calls it
+% with option |ocgcolorlinks| (i.\,e. |=true|), but in the preamble it would
+% be possible to really turn it off again by |\hypersetup{ocgcolorlinks=false}|.
+% This \xpackage{hrefhide} package needs the \xpackage{hyperref} package with option
+% \texttt{ocgcolorlinks}. If package and/or option are/is missing, the appropriate
+% error message is given.
 %
 %    \begin{macrocode}
-  \ifHy@ocgcolorlinks \relax%
+  \ifHy@ocgcolorlinks%
+    \gdef\hrefhide@status{ON}%
   \else%
+    \gdef\hrefhide@status{OFF}%
     \PackageError{hrefhide}{hyperref package missing option ocgcolorlinks}{%
       The package hrefhide needs the hyperref package\MessageBreak%
       with option ocgcolorlinks.\MessageBreak%
@@ -785,7 +758,7 @@ nisl ut aliquip ex ea commodo consequat.
 %
 %    \begin{macrocode}
   \def\hrefhide@driver{hpdftex}%
-  \ifx\Hy@driver\hrefhide@driver \relax%
+  \ifx\Hy@driver\hrefhide@driver% \relax
   \else%
 %    \end{macrocode}
 %
@@ -795,9 +768,9 @@ nisl ut aliquip ex ea commodo consequat.
 %    \begin{macrocode}
     \PackageError{hrefhide}{Producing not a pdf file}{%
       The package hrefhide only works for a pdf file,\MessageBreak%
-      but driver \Hy@driver\space instead of \hrefhide@driver\space  was found.\MessageBreak%
+      but driver \Hy@driver\space instead of \hrefhide@driver\space was found.\MessageBreak%
       Use pdfLaTeX to compile your document.\MessageBreak%
-      (No large harm was done, but the respective\MessageBreak%
+      (Probably no large harm was done, but the respective\MessageBreak%
        link text will neither be hidden when printing.)\MessageBreak%
       }%
   \fi%
@@ -818,109 +791,96 @@ nisl ut aliquip ex ea commodo consequat.
 %</package>
 %    \end{macrocode}
 %
-% \newpage
+% \bigskip
 %
 % \section{Installation}
 %
 % \begin{center}
-%  {\large \textbf{First, please make sure that there is no old version of}}
-%  {\large \textbf{\textsf{hrefhide}\ at some obsolete place in your system!}}
+%  {\large \textbf{When manually installing, please first make sure\\}}
+%  {\large \textbf{that there is no old version of \xpackage{hrefhide}\\}}
+%  {\large \textbf{at some obsolete place in your system!}}
 % \end{center}
 %
 % \subsection{Downloads\label{ss:Downloads}}
 %
-% Everything is available on \CTAN{}, \url{http://www.ctan.org/tex-archive/},
+% Everything is available at \CTAN{}, \url{http://www.ctan.org/tex-archive/},
 % but may need additional packages themselves.\\
 %
 % \DescribeMacro{hrefhide.dtx}
 % For unpacking the |hrefhide.dtx| file and constructing the documentation it is required:
 % \begin{description}
-% \item[-] \TeX Format \LaTeXe, 1994/06/01, v2$\varepsilon $: \CTAN{}
+% \item[-] \TeX Format \LaTeXe: \url{http://www.CTAN.org/}
 %
-% \item[-] document class \textsf{ltxdoc}, 2007/11/11, v2.0u,\\
+% \item[-] document class \xpackage{ltxdoc}, 2007/11/11, v2.0u,\\
 %           \CTAN{macros/latex/base/ltxdoc.dtx}
 %
-% \item[-] package \textsf{holtxdoc}, 2010/04/24, v0.19,\\
+% \item[-] package \xpackage{holtxdoc}, 2011/02/04, v0.21,\\
 %           \CTAN{macros/latex/contrib/oberdiek/holtxdoc.dtx}
 %
-% \item[-] package \textsf{hypdoc}, 2010/03/26, v1.9,\\
+% \item[-] package \xpackage{hypdoc}, 2010/03/26, v1.9,\\
 %           \CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx}
 % \end{description}
 %
 % \DescribeMacro{hrefhide.sty}
-% The |hrefhide.sty| for \LaTeXe\ (i.\,e. all documents using
-% the \textsf{hrefhide} package) requires:
+% The \texttt{hrefhide.sty} for \LaTeXe\ (i.\,e. all documents using
+% the \xpackage{hrefhide} package) requires:
 % \begin{description}
-% \item[-] \TeX Format \LaTeXe, 1994/06/01, v2$\varepsilon $, \CTAN{}
+% \item[-] \TeX Format \LaTeXe, \url{http://www.CTAN.org/}
 %
-% \item[-] package \textsf{color}, 2005/11/14, v1.0j, from the \textsf{graphics}-bundle,\\
-%           \CTAN{macros/required/graphics/color.dtx}
+% \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11,\\
+%           \CTAN{/macros/latex/contrib/xcolor/xcolor.dtx}
 %
-% \item[-] package \textsf{hyperref}, 2010/12/16, v6.81z,\\
+% \item[-] package \xpackage{hyperref}, 2011/04/17, v6.82g,\\
 %           \CTAN{macros/latex/contrib/hyperref/hyperref.dtx}
 %
-% \item[-] package \textsf{kvoptions}, 2010/02/22, v3.7,\\
+% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10,\\
 %           \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}
 % \end{description}
 %
 % \DescribeMacro{hrefhide-example.tex}
-% The |hrefhide-example.tex| requires the same files as all
-% documents using the \textsf{hrefhide} package, and additionally:
+% The \texttt{hrefhide-example.tex} requires the same files as all
+% documents using the \xpackage{hrefhide} package, and additionally:
 % \begin{description}
-% \item[-] class \textsf{article}, 2007/10/19, v1.4h, from \textsf{classes.dtx}:\\
+% \item[-] class \xpackage{article}, 2007/10/19, v1.4h, from \xpackage{classes.dtx}:\\
 %           \CTAN{macros/latex/base/classes.dtx}
 %
-% \item[-] package \textsf{lipsum}, 2005/01/26, v1.0,\\
+% \item[-] package \xpackage{lipsum}, 2011/04/14, v1.2,\\
 %           \CTAN{macros/latex/contrib/lipsum/lipsum.dtx}
 %
-% \item[-] package \textsf{hrefhide}, 2010/07/29, v1.0e,\\
+% \item[-] package \xpackage{hrefhide}, 2011/04/29, v1.0f,\\
 %           \CTAN{macros/latex/contrib/hrefhide/hrefhide.dtx}\\
 %   (Well, it is the example file for this package, and because you are reading the
-%    documentation for the \textsf{hrefhide} package, it can be assumed that you already
+%    documentation for the \xpackage{hrefhide} package, it can be assumed that you already
 %    have some version of it -- is it the current one?)
 % \end{description}
 %
 % \DescribeMacro{hyperref}
 % As possible alternative in section \ref{sec:Alternatives} there is listed
 % \begin{description}
-% \item[-] package \textsf{hyperref}, 2010/12/16, v6.81z,\\
+% \item[-] package \xpackage{hyperref}, 2011/04/17, v6.82g,\\
 %           \CTAN{macros/latex/contrib/hyperref/}
 %   with option \texttt{ocgcolorlinks} and\\
 %   |{\color{white} \href{...}{...}}|.
 %
-% \item[-] package \textsf{pdfcomment}, 2010/12/11, v2.1,\\
+% \item[-] package \xpackage{pdfcomment}, 2010/12/11, v2.1,\\
 %           \CTAN{macros/latex/contrib/pdfcomment/}\\
-%           for text \textbf{without} references
+%           for text \textbf{outside} of links
 % \end{description}
 %
-% \pagebreak
-%
 % \DescribeMacro{Oberdiek}
 % \DescribeMacro{holtxdoc}
 % \DescribeMacro{hyperref}
 % \DescribeMacro{kvoptions}
-% All packages of Heiko Oberdiek's bundle `oberdiek'
-% (especially \textsf{holtxdoc} and \textsf{kvoptions})
+% All packages of \textsc{Heiko Oberdiek's} bundle `oberdiek'
+% (especially \xpackage{holtxdoc} and \xpackage{kvoptions})
 % are also available in a TDS compliant ZIP archive:\\
 % \CTAN{install/macros/latex/contrib/oberdiek.tds.zip}.\\
-% \textbf{Warning}: holtxdoc, 2010/04/24 v0.19, requires the packages
-% \begin{description}
-% \item[-] hypdoc,     2010/03/26, v1.9
-% \item[-] hyperref,   2010/03/30, v6.80u (latest: 2010/12/16, v6.81z)
-% \item[-] pdftexcmds, 2010/04/01, v0.9
-% \item[-] ltxcmds,    2010/03/09, v1.4   (latest: 2010/04/26, v1.7)
-% \item[-] hologo,     2010/04/24, v1.2
-% \item[-] array                          (latest: 2008/09/09, v2.4c)
-% \end{description}
-% (or more recent versions) and does neither work with
-% nor check for earlier versions!\\
-% (It is probably best to download\\
-% \CTAN{install/macros/latex/contrib/oberdiek.tds.zip}\\
-% and use this, because the packages in there should be both
-% recent and compatible.)\\
+% It is probably best to download and use this, because the packages in there
+% are quite probably both recent and compatible among themselves.\\
 %
 % \DescribeMacro{M\"{u}nch}
-% A list of my packages can be found at \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}.\\
+% A hyperlinked list of my (other) packages can be found at
+% \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}.\\
 %
 % \subsection{Package, unpacking TDS}
 %
@@ -939,8 +899,6 @@ nisl ut aliquip ex ea commodo consequat.
 % \begin{tabular}{ll}
 % hrefhide.ins & The installation file.\\
 % hrefhide.drv & The driver to generate the documentation.\\
-% ltxdoc.cfg & The \LaTeX\ documentation configuration file,\\
-%            & also for generating the documentation.\\
 % hrefhide.sty & The \xext{sty}le file.\\
 % hrefhide-example.tex & The example file.%
 % \end{tabular}
@@ -949,9 +907,9 @@ nisl ut aliquip ex ea commodo consequat.
 %
 % \noindent For required other packages, see the preceding subsection.
 %
-% \paragraph{Unpacking.} The \xext{dtx} file is a self-extracting
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
-% \xext{dtx} through \plainTeX:
+% \xfile{.dtx} through \plainTeX:
 % \begin{quote}
 %   \verb|tex hrefhide.dtx|
 % \end{quote}
@@ -1043,7 +1001,7 @@ nisl ut aliquip ex ea commodo consequat.
 % \subsection{Some details for the interested}
 %
 % \paragraph{Unpacking with \LaTeX.}
-% The \xext{dtx} chooses its action depending on the format:
+% The \xfile{.dtx} chooses its action depending on the format:
 % \begin{description}
 % \item[\plainTeX:] Run \docstrip\ and extract the files.
 % \item[\LaTeX:] Generate the documentation.
@@ -1058,9 +1016,9 @@ nisl ut aliquip ex ea commodo consequat.
 % of your shell.
 %
 % \paragraph{Generating the documentation.\label{GenDoc}}
-% You can use both the \xext{dtx} or the \xext{drv} to generate
-% the documentation. The process can be configured by the
-% configuration file \xfile{ltxdoc.cfg}. For instance, put the following
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by a
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
 % line into this file, if you want to have A4 as paper format:
 % \begin{quote}
 %   \verb|\PassOptionsToClass{a4paper}{article}|
@@ -1084,19 +1042,19 @@ nisl ut aliquip ex ea commodo consequat.
 % The example file, \textsf{hrefhide-example.tex}, can be compiled via\\
 % \indent |pdflatex hrefhide-example.tex|\\
 % (but \textbf{not} |latex hrefhide-example.tex|!)\\
-% and will need two compiler runs to get
-% all references right.
+% and will need two compiler runs to get all references right.
 %
 % \section{Acknowledgements}
 %
-% I would like to thank Heiko Oberdiek
+% I would like to thank \textsc{Heiko Oberdiek}
 % (heiko dot oberdiek at googlemail dot com) for providing
-% the \textsf{hyperref} as well as a~lot~(!) of other useful packages
+% the \xpackage{hyperref} as well as a~lot~(!) of other useful packages
 % (from which I also got everything I know about creating a file in
 % \xext{dtx} format, ok, say it: copying),
 % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex}
 % newsgroups for their help in all things \TeX.
 %
+% \bigskip
 % \phantomsection
 % \begin{History}\label{History}
 %   \begin{Version}{2010/02/18 v0.1}
@@ -1105,7 +1063,7 @@ nisl ut aliquip ex ea commodo consequat.
 %             \url{http://groups.google.com/group/comp.text.tex/msg/80d9eebf2837d7a3?dmode=source}.
 %   \end{Version}
 %   \begin{Version}{2010/06/01 v1.0(a)}
-%     \item First version of the \textsf{hrefhide} package.
+%     \item First version of the \xpackage{hrefhide} package.
 %   \end{Version}
 %   \begin{Version}{2010/06/03 v1.0b}
 %     \item Example adapted to other examples of mine.
@@ -1114,18 +1072,19 @@ nisl ut aliquip ex ea commodo consequat.
 %     \item Several changes in the documentation and the Readme file.
 %   \end{Version}
 %   \begin{Version}{2010/06/24 v1.0c}
-%     \item \textsf{pdfcomment} package listed as alternative for text \textbf{without} links.
-%     \item \textsf{holtxdoc} warning in \xfile{drv} updated.
+%     \item \xpackage{pdfcomment} package listed as alternative for text \textbf{outside}
+%             of hyperlinks.
+%     \item \xpackage{holtxdoc} warning in \xfile{drv} updated.
 %     \item Corrected the location of the package at CTAN.\\
-%             (In this version \xfile{TDS} was still missing due to packaging error.)
-%     \item Updated reference to other package: \textsf{hyperref}.
+%             (In that version \xfile{TDS} was still missing due to packaging error.)
+%     \item Updated reference to other package: \xpackage{hyperref}.
 %     \item Added a list of my other packages.
 %   \end{Version}
 %   \begin{Version}{2010/07/29 v1.0d}
 %     \item Corrected given url of \texttt{hrefhide.tds.zip} and other urls.
-%     \item Included a url for the newsgroup post (in history).
-%     \item Changed the \textsf{undolabl} package description.
-%     \item There is a new version of the used \textsf{hyperref} package: 2010/06/18,~v6.81g.
+%     \item Included a url for the newsgroup post (in History).
+%     \item Changed the \xpackage{undolabl} package description.
+%     \item New version of the used \xpackage{hyperref} package: 2010/06/18,~v6.81g.
 %     \item Included a |\CheckSum|.
 %     \item Minor details.
 %   \end{Version}
@@ -1133,18 +1092,33 @@ nisl ut aliquip ex ea commodo consequat.
 %     \item Changed the |\unit| definition (got rid of an old |\rm|).
 %     \item Moved the package from \texttt{.../latex/muench/hrefhide/...} to\\
 %             \texttt{.../latex/hrefhide/...}.\\
-%             (Please make sure that any old versions of the \textsf{lastpage} package
+%             (Please make sure that any old versions of the \xpackage{hrefhide} package
 %              are porperly uninstalled from your system.)
 %     \item Replaced the list of my packages with a link to a web page list of those,
 %             which has the advantage of showing the recent versions of all those packages.
-%     \item Updated to version 2010/12/16 v6.81z of the \textsf{hyperref} package.
-%     \item A new version (2010/12/11 v2.1) of the \textsf{pdfcomment} package is available.
+%     \item Updated to version 2010/12/16 v6.81z of the \xpackage{hyperref} package.
+%     \item A new version (2010/12/11 v2.1) of the \xpackage{pdfcomment} package is available.
 %     \item Minor details.
 %   \end{Version}
+%   \begin{Version}{2011/04/29 v1.0f}
+%     \item There is a new version of the used \xpackage{lipsum} package: 2011/04/14,~v1.2.
+%     \item The \xpackage{holtxdoc} package was fixed (recent: 2011/02/04, v0.21), therefore
+%             the warning in \xfile{drv} could be removed. -- Adapted the style of this
+%             documentation to new \textsc{Oberdiek} \xfile{dtx} style.
+%     \item Removed the \textsf{ltxdoc.cfg} file for the documentation.
+%     \item There is a new version of the used \xpackage{hyperref} package: 2011/04/17,~v6.82g.
+%     \item There is a new version of the used \xpackage{kvoptions} package: 2010/12/23,~v3.10.
+%     \item Bug fix: The previouse versions only hide links of type
+%             \textquotedblleft link\textquotedblright. Now the types citation, page reference,
+%             URL, local file reference, and \textquotedblleft other links\textquotedblright-type
+%             are \textquotedblleft hidden\textquotedblright.
+%     \item With |\hycon| and |\hycoff| it is now possible to \emph{simulate} the switching
+%              on/off of~|ocgcolorlinks| in the document.
+%     \item Instead of \xpackage{color} now the \xpackage{xcolor} package is used.
+%     \item A lot of details.
+%   \end{Version}
 % \end{History}
 %
-% % \PrintChanges
-%
 % \bigskip
 %
 % When you find a mistake or have a suggestion for an improvement of this package,
diff --git a/Master/texmf-dist/source/latex/hrefhide/hrefhide.ins b/Master/texmf-dist/source/latex/hrefhide/hrefhide.ins
index cba5139fc97..75c07ed099f 100644
--- a/Master/texmf-dist/source/latex/hrefhide/hrefhide.ins
+++ b/Master/texmf-dist/source/latex/hrefhide/hrefhide.ins
@@ -8,10 +8,13 @@
 %% 
 %% This is a generated file.
 %% 
-%% IMPORTANT NOTICE:
-%% The package takes options.
+%% Project: hrefhide
+%% Version: 2011/04/29 v1.0f
 %% 
-%% The usual disclaimers apply:
+%% Copyright (C) 2010, 2011 by
+%%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% 
+%% The usual disclaimer applys:
 %% If it doesn't work right that's your problem.
 %% (Nevertheless, send an e-mail to the maintainer
 %%  when you find an error in this package.)
@@ -28,8 +31,7 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
 %% 
 %% This work consists of the main source file hrefhide.dtx
 %% and the derived files
@@ -37,13 +39,10 @@
 %%    hrefhide-example.tex.
 %% 
 \input docstrip.tex
-
-\obeyspaces
-\Msg{******************************************************}
-\Msg{* Installation                                       *}
-\Msg{* Package: hrefhide v1.0e 2011/02/01 LaTeX2e package *}
-\Msg{* Hiding hyperrefs when printing pdf files (HMM)     *}
-\Msg{******************************************************}
+\Msg{***********************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: hrefhide 2011/04/29 v1.0f Hiding hyperrefs when printing pdf files (HMM)}
+\Msg{***********************************************************************************}
 
 \keepsilent
 \askforoverwritefalse
@@ -53,10 +52,13 @@
 
 This is a generated file.
 
-IMPORTANT NOTICE:
-The package takes options.
+Project: hrefhide
+Version: 2011/04/29 v1.0f
 
-The usual disclaimers apply:
+Copyright (C) 2010, 2011 by
+    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+
+The usual disclaimer applys:
 If it doesn't work right that's your problem.
 (Nevertheless, send an e-mail to the maintainer
  when you find an error in this package.)
@@ -73,8 +75,7 @@ LaTeX version 2005/12/01 or later.
 
 This work has the LPPL maintenance status "maintained".
 
-The Current Maintainer of this work is H.-Martin Muench
-(Martin dot Muench at Uni-Bonn dot de).
+The Current Maintainer of this work is H.-Martin Muench.
 
 This work consists of the main source file hrefhide.dtx
 and the derived files
@@ -87,38 +88,37 @@ and the derived files
 \generate{%
   \file{hrefhide.ins}{\from{hrefhide.dtx}{install}}%
   \file{hrefhide.drv}{\from{hrefhide.dtx}{driver}}%
-  \file{ltxdoc.cfg}{\from{hrefhide.dtx}{ltxdoc}}%
   \usedir{tex/latex/hrefhide}%
   \file{hrefhide.sty}{\from{hrefhide.dtx}{package}}%
   \usedir{doc/latex/hrefhide}%
   \file{hrefhide-example.tex}{\from{hrefhide.dtx}{example}}%
 }
 
-\obeyspaces
-\Msg{**************************************************************}
-\Msg{*                                                            *}
-\Msg{* To finish the installation you have to move the following  *}
-\Msg{* file into a directory searched by TeX:                     *}
-\Msg{*                                                            *}
-\Msg{* hrefhide.sty                                               *}
-\Msg{*                                                            *}
-\Msg{* To produce the documentation run the file `hrefhide.dtx'   *}
-\Msg{* through (pdf)LaTeX, e.g.                                   *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*  makeindex -s gind.ist hrefhide.idx                        *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*  makeindex -s gind.ist hrefhide.idx                        *}
-\Msg{*  pdflatex hrefhide.dtx                                     *}
-\Msg{*                                                            *}
-\Msg{* At least three runs are necessary e.g. to get the          *}
-\Msg{*  references right!                                         *}
-\Msg{*                                                            *}
-\Msg{* Happy TeXing!                                              *}
-\Msg{*                                                            *}
-\Msg{**************************************************************}
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     hrefhide.sty*}
+\Msg{*}
+\Msg{* To produce the documentation run the file `hrefhide.drv'}
+\Msg{* through (pdf)LaTeX, e.g.}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*  makeindex -s gind.ist hrefhide.idx}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*  makeindex -s gind.ist hrefhide.idx}
+\Msg{*  pdflatex hrefhide.drv}
+\Msg{*}
+\Msg{* At least three runs are necessary e.g. to get the}
+\Msg{*  references right!}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
 
 \endbatchfile
-
 \endinput
 %%
 %% End of file `hrefhide.ins'.
diff --git a/Master/texmf-dist/source/latex/hrefhide/ltxdoc.cfg b/Master/texmf-dist/source/latex/hrefhide/ltxdoc.cfg
deleted file mode 100644
index 7a3422bfdd6..00000000000
--- a/Master/texmf-dist/source/latex/hrefhide/ltxdoc.cfg
+++ /dev/null
@@ -1,103 +0,0 @@
-%%
-%% This is file `ltxdoc.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% hrefhide.dtx  (with options: `ltxdoc')
-%% 
-%% This is a generated file.
-%% 
-%% IMPORTANT NOTICE:
-%% The package takes options.
-%% 
-%% The usual disclaimers apply:
-%% If it doesn't work right that's your problem.
-%% (Nevertheless, send an e-mail to the maintainer
-%%  when you find an error in this package.)
-%% 
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.3c of this license or (at your option) any later
-%% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
-%% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
-%% and version 1.3c 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 H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
-%% 
-%% This work consists of the main source file hrefhide.dtx
-%% and the derived files
-%%    hrefhide.sty, hrefhide.pdf, hrefhide.ins, hrefhide.drv,
-%%    hrefhide-example.tex.
-%% 
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{ltxdoc.cfg}[2011/02/01 v1.0b configuration file for hrefhide (HMM)]
-  %% Code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)],  %%
-  % copyrighted 2006, 2007 Heiko Oberdiek, part of project `latex-tds'.
-  % That file 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.3c or later is part of all distributions of LaTeX
-  % version 2005/12/01 or later.
-  % That work has the LPPL maintenance status `maintained'.
-  % The Current Maintainer of that work is Heiko Oberdiek.
-  %
-  \PassOptionsToClass{a4paper}{article}
-  \AtEndOfClass{%
-    \RequirePackage[numbered]{hypdoc}[2010/03/26]% v1.9
-    \pdfstringdefDisableCommands{%
-      \let\env\relax % longtable.dtx
-      \let\mytt\relax % tabularx.dtx
-    }%
-    \addtolength{\topmargin}{-10mm}%
-    \addtolength{\textheight}{20mm}%
-    % Depending on the page style, the head or foot area
-    % are put into the text area.
-    % Usually the page style is the default "plain".
-    % tools/verbatim.dtx uses "myheadings".
-    \def\string@plain{plain}%
-    \def\string@myheadings{myheadings}%
-    \def\current@pagestyle{plain}%
-    \let\ltxdoc@cfg@pagestyle\pagestyle
-    \def\pagestyle#1{%
-      \def\current@pagestyle{#1}%
-      \ltxdoc@cfg@pagestyle{#1}%
-    }%
-    \edef\ltxdoc@cfg@jobname{\jobname}%
-    \def\ltxdoc@cfg@longtable{longtable}%
-    \@onelevel@sanitize\ltxdoc@cfg@longtable
-    \ifx\ltxdoc@cfg@jobname\ltxdoc@cfg@longtable
-      \def\current@pagestyle{both}%
-    \fi
-    \let\ltxdoc@cfg@document\document
-    \def\document{%
-      \ifx\current@pagestyle\string@plain
-        \addtolength{\textheight}{\headheight}%
-        \addtolength{\textheight}{\headsep}%
-        \setlength{\headheight}{0pt}%
-        \setlength{\headsep}{0pt}%
-        \global\textheight\textheight
-        \global\headheight\headheight
-        \global\headsep\headsep
-      \fi
-      \ifx\current@pagestyle\string@myheadings
-        \addtolength{\textheight}{\footskip}%
-        \global\textheight\textheight
-      \fi
-      \ltxdoc@cfg@document
-    }%
-  %% End of code from original ltxdoc.cfg [2007/01/08 latex-tds: ltxdoc.cls configuration (HO)]  %%
-  %% Place additional code here.  %%
-  }
-
-\endinput
-%%
-%% End of file `ltxdoc.cfg'.