menukeys (8aug16)

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

4 files changed, 67 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf b/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
index 1f448b3c344..74800cd1cb5 100644
--- a/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
+++ b/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
diff --git a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
index b30432b35b7..02a3c5904fe 100644
--- a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
+++ b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
@@ -1,11 +1,11 @@
 % \iffalse meta-comment
 % 
-% Copyright (c) 2013 by Tobias Weh
+% Copyright (c) 2016 by Tobias Weh
 %                       www.tobias-weh.de
 % 
 % This file may be distributed and/or modified under the 
 % conditions of the LaTeX Project Public License, either 
-% version 1.2 of this license or (at your option) any later 
+% 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 
@@ -18,7 +18,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2009/01/01]
 %<package>\ProvidesPackage{menukeys}
-%<package>  [2016/04/18 v1.4 -- A package to format menus, paths and shortcuts]
+%<package>  [2016/08/08 v1.5 -- A package to format menus, paths and shortcuts]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -394,6 +394,9 @@
 %       value is |symbols|.
 %    \item [os:] You can specify the OS \DO{os} by saying |os=mac| or |os=win|. This will cause
 %       some key macros to be rendered differently. The default value is |mac|.
+%    \item [hyperrefcolorlinks:] Use this if you want \pkg{hyperref}'s \DO{hyperrefcolorlinks}
+%       colored links, since you can't use the \pkg{hyperref} option \opt{colorlinks} directly
+%       (see sec.~\ref{sec:issues} and~\ref{sec:hyperref-colorlinks}).
 % \end{description}
 % 
 % \section{Usage}
@@ -732,7 +735,7 @@
 % I apologize that there are no commands for the windows key
 % and the apple logo, but that would be a copyright infringement.
 % 
-% \section{Known issues and bugs}
+% \section{Known issues and bugs}\label{sec:issues}
 % \begin{itemize}
 %    \item If you use the \pkg{inputenc} package \menukeys must be
 %       loaded after it. Otherwise some key macros get corrupted.
@@ -749,8 +752,13 @@
 %       Hello World!
 %    \end{document}
 %    \end{verbatim}
+%   \item Using \pkg{hyperref} with the \opt{colorlinks} options causes
+%      an option clash. If you want colored links please load \pkg{hyperref}
+%      \emph{without} this option and load \pkg{menukeys} with \opt{hyperrefcolorlinks}.
 % \end{itemize}
-% If you find something to add to this list please send me an e-mail.
+%
+% If you find something to add to this list please send me an e-mail or report a
+% bug on GitHub (\url{https://github.com/tweh/menukeys}).
 %
 % \StopEventually{\clearpage\PrintChanges\PrintIndex}
 %
@@ -827,6 +835,7 @@
 }
 \DeclareBoolOption[true]{definemenumacros}
 \DeclareBoolOption[true]{definekeys}
+\DeclareBoolOption[false]{hyperrefcolorlinks}
 \DeclareStringOption[mac]{os}
 \DeclareStringOption[symbols]{mackeys}
 \ProcessKeyvalOptions{tw@mk}\relax
@@ -843,6 +852,36 @@
 }
 %    \end{macrocode}
 %
+% \subsection{Workarounds}
+% Some workarounds to ``slove'' some incompatibilities:
+% \subsubsection{\pkg{hyperref}'s \opt{colorlinks} option}\label{sec:hyperref-colorlinks}
+% \changes{v1.5}{2016/08/08}{New option \opt{hyperrefcolorlinks}}
+% Since the \opt{colorlinks} option of \pkg{hyperref} loads \pkg{color} (with
+% some kind of |\AtBeginDocument|) it results in an option clas due to the
+% changes made by \pkg{catoptions}. Thus one can't use \opt{colorlinks}. Here we
+% provide the code to activate colored links without the extra loading of
+% \pkg{color}.
+%    \begin{macrocode}
+\iftw@mk@hyperrefcolorlinks
+   \Hy@AtBeginDocument{%  (hyperref.sty, line 4790)
+       \def\@pdfborder{0 0 0}% (hyperref.sty, line 4806...)
+       \let\@pdfborderstyle\@empty
+%       \ifHy@typexml% <--------------+
+%       \else%                        | This part
+%         \Hy@CatcodeWrapper{%        | bust be
+%           \RequirePackage{color}%   | omitted
+%         }%                          |
+%       \fi% <------------------------+
+       \def\Hy@colorlink#1{%
+         \begingroup
+         \HyColor@UseColor#1%
+       }%
+       \def\Hy@endcolorlink{\endgroup}%
+       \Hy@Info{Link coloring ON}%
+   }
+\fi
+%    \end{macrocode}
+%
 % \subsection{Color themes}
 % \subsubsection{Internal commands}
 % \begin{macro}{\tw@make@color@theme}
diff --git a/Master/texmf-dist/source/latex/menukeys/menukeys.ins b/Master/texmf-dist/source/latex/menukeys/menukeys.ins
index dbf772589cb..79a6792f6fb 100644
--- a/Master/texmf-dist/source/latex/menukeys/menukeys.ins
+++ b/Master/texmf-dist/source/latex/menukeys/menukeys.ins
@@ -1,10 +1,10 @@
 %% 
-%% Copyright (C) 2013 by Tobias Weh
-%%                       www.tobias-weh.de
+%% Copyright (C) 2016 by Tobias Weh
+%%                       www.tobiw.de/en
 %% 
 %% This file may be distributed and/or modified under the 
 %% conditions of the LaTeX Project Public License, either 
-%% version 1.2 of this license or (at your option) any later 
+%% 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 
@@ -22,12 +22,12 @@
 
 This is a generated file.
 
-Copyright (C) 2013 by Tobias Weh
-                      www.tobias-weh.de
+Copyright (C) 2016 by Tobias Weh
+                      www.tobiw.de/en
 
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
-version 1.2 of this license or (at your option) any later
+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
diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index 3ff8a03bf00..732d1409961 100644
--- a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
+++ b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
@@ -8,12 +8,12 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2013 by Tobias Weh
-%%                       www.tobias-weh.de
+%% Copyright (C) 2016 by Tobias Weh
+%%                       www.tobiw.de/en
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.2 of this license or (at your option) any later
+%% 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
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/01/01]
 \ProvidesPackage{menukeys}
-  [2016/04/18 v1.4 -- A package to format menus, paths and shortcuts]
+  [2016/08/08 v1.5 -- A package to format menus, paths and shortcuts]
 \RequirePackage{xparse}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -55,6 +55,7 @@
 }
 \DeclareBoolOption[true]{definemenumacros}
 \DeclareBoolOption[true]{definekeys}
+\DeclareBoolOption[false]{hyperrefcolorlinks}
 \DeclareStringOption[mac]{os}
 \DeclareStringOption[symbols]{mackeys}
 \ProcessKeyvalOptions{tw@mk}\relax
@@ -66,6 +67,18 @@
    \tw@mk@error{Unknown value for option 'mackeys'\MessageBreak
    Possible values are 'symbols' or 'text'.}%
 }
+\iftw@mk@hyperrefcolorlinks
+   \Hy@AtBeginDocument{%  (hyperref.sty, line 4790)
+       \def\@pdfborder{0 0 0}% (hyperref.sty, line 4806...)
+       \let\@pdfborderstyle\@empty
+       \def\Hy@colorlink#1{%
+         \begingroup
+         \HyColor@UseColor#1%
+       }%
+       \def\Hy@endcolorlink{\endgroup}%
+       \Hy@Info{Link coloring ON}%
+   }
+\fi
 \newcommand*{\tw@make@color@theme}[8]{%
    \definecolor{tw@color@theme@#1@bg}{#2}{#3}%
    \definecolor{tw@color@theme@#1@br}{#2}{#4}%