menukeys 1.1 (27feb12)

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

4 files changed, 36 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/menukeys/README b/Master/texmf-dist/doc/latex/menukeys/README
index 1caba0a2f47..c7264c3bd23 100644
--- a/Master/texmf-dist/doc/latex/menukeys/README
+++ b/Master/texmf-dist/doc/latex/menukeys/README
@@ -1,7 +1,7 @@
-LaTeX class: menukey v1.0
+LaTeX class: menukey v1.1
 -------------------------------------------------
 Tobias Weh (www.tobias-weh.de)
-2012/02/23
+2012/02/27
 
 This package is design to format menu sequences,
 paths and keyboard shortcuts automatically.
diff --git a/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf b/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
index 5cc6790646c..1c1fef626ce 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 12889fe7584..cc6fddeaff0 100644
--- a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
+++ b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
@@ -18,7 +18,7 @@
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[2009/01/01]
 %<package>\ProvidesPackage{menukeys}
-%<package>  [2012/02/23 v1.0 a package to format menus paths and shortcuts]
+%<package>  [2012/02/27 v1.1 a package to format menus paths and shortcuts]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -116,6 +116,10 @@
            usage}\@esphack}
 \makeatother
 
+\addto\captionsenglish{%
+   \def\indexname{Macro index}
+   \def\glossaryname{Change history}
+}
 \IndexPrologue{
   \section{Macro index}
   Numbers written in bold face refer to the page where the corresponding entry is described;
@@ -193,6 +197,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \changes{v1.0}{2012/02/23}{Initial version}
+% \changes{v1.1}{2012/02/26}{Improved manual}
 %
 % \GetFileInfo{menukeys.sty}
 %
@@ -296,7 +301,7 @@
 %    to view the rulers is \keys{cmd + R}. Pressing these keys again
 %    will hide the rulers.
 %    
-%    The standard path for saving your document is \path{Macintosh HD/Users/
+%    The standard path for saving your document is \directory{Macintosh HD/Users/
 %    Your Name/Documents} but you can change it at \menu{Extras > Settings
 %    > Saving} by clicking \menu{Change save path}.
 % \end{verbatim}
@@ -308,7 +313,7 @@
 %    to view the rulers is \keys{cmd + R}. Pressing these keys again
 %    will hide the rulers.
 %    
-%    The standard path for saving your document is \path{Macintosh HD/Users/
+%    The standard path for saving your document is \directory{Macintosh HD/Users/
 %    Your Name/Documents} but you can change it at \menu{Extras > Settings
 %    > Saving} by clicking \menu{Change save path}.
 % 
@@ -361,7 +366,7 @@
 % \subsection{Basics}\label{basics}
 % \menukeys comes with three ``menu macros'' that parse and print lists. We have
 % \DM{\menu}|\menu|\marg{menu sequence}, with |>| as default input list separator,
-% \DM{\path}|\path|\marg{path and files} with |/| as default separator and
+% \DM{\directory}|\directory|\marg{path and files} with |/| as default separator and
 % \DM{\keys}|\keys|\marg{keystrokes} with |+| as default separator. You've seen
 % examples for all of them in section~\ref{intro}.
 % 
@@ -654,10 +659,26 @@
 % I apologise that there are no commands for the windows key
 % and the apple logo, but that would be a copyright infringement.
 % 
-% \subsection{Know issues and bugs}
+% \section{Known issues and bugs}
 % \begin{itemize}
 %    \item If you use the \pkg{inputenc} package \menukeys must be
 %       loaded after it. Otherwise some key macros get corrupted.
+%    \item \changes{v1.1}{2012/02/26}{Load \pkg{xcolor} before \menukeys.}
+%       \menukeys must be loaded after \pkg{xcolor}, if you load
+%       the latter with options. Otherwise you'll get an option clash
+%       Since \menukeys loads \pkg{xcolor} internally you may pass
+%       options as global options via |\documentclass|.
+%       \example Set \pkg{xcolor} to |cmyk| model:
+%       \begin{verbatim}
+%    \documentclass[cmyk]{article}
+%    \usepackage{menukeys}
+%    \begin{document}
+%       Hello World!
+%    \end{document}
+%    \end{verbatim}
+%    \item Since \menukeys uses \pkg{catoptions} it may causes some problems
+%        with orther packages becaus of \pkg{catoptions} option handling.
+%        I recommend to load \menukeys as a later package in your preamble.
 % \end{itemize}
 % If you find something to add to this list please send me an e-mail.
 %
@@ -1292,7 +1313,7 @@
           \setcounter{tw@hyphen@char@num}{255}%
        }{%
           \if@tw@hyphenatepaths@warnig%
-          \tw@mk@warning{The hypenatepaths styles will probably only\MessageBreak
+          \tw@mk@warning{The hyphenatepaths styles will probably only\MessageBreak
           work with T1 or OT1 encoding.}%
           \fi\global\@tw@hyphenatepaths@warnigfalse%
        }%
@@ -1446,11 +1467,13 @@
 %    \begin{macrocode}
 \iftw@mk@definemenumacros
 %    \end{macrocode}
-% \begin{macro}{\menu}\begin{macro}{\path}\begin{macro}{\keys}
+% \begin{macro}{\menu}\begin{macro}{\directory}%
+% \changes{v1.1}{2012/02/27}{Renamed \cmd{\path} to \cmd{\directory} becuase it crashes with \pkg{biblatex}}
+% \begin{macro}{\keys}
 % And then we define three basic macros.
 %    \begin{macrocode}
 \newmenumacro{\menu}[>]{menus}
-\newmenumacro{\path}[/]{paths}
+\newmenumacro{\directory}[/]{paths}
 \newmenumacro{\keys}[+]{roundedkeys}
 %    \end{macrocode}
 % \end{macro}\end{macro}\end{macro}
diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index 7004a4f8d26..386ce3110f2 100644
--- a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
+++ b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/01/01]
 \ProvidesPackage{menukeys}
-  [2012/02/23 v1.0 a package to format menus paths and shortcuts]
+  [2012/02/27 v1.1 a package to format menus paths and shortcuts]
 \RequirePackage{xparse}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -512,7 +512,7 @@
           \setcounter{tw@hyphen@char@num}{255}%
        }{%
           \if@tw@hyphenatepaths@warnig%
-          \tw@mk@warning{The hypenatepaths styles will probably only\MessageBreak
+          \tw@mk@warning{The hyphenatepaths styles will probably only\MessageBreak
           work with T1 or OT1 encoding.}%
           \fi\global\@tw@hyphenatepaths@warnigfalse%
        }%
@@ -633,7 +633,7 @@
 }
 \iftw@mk@definemenumacros
 \newmenumacro{\menu}[>]{menus}
-\newmenumacro{\path}[/]{paths}
+\newmenumacro{\directory}[/]{paths}
 \newmenumacro{\keys}[+]{roundedkeys}
 \fi
 \iftw@mk@definekeys