summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-04-11 22:29:36 +0000
committerKarl Berry <karl@freefriends.org>2012-04-11 22:29:36 +0000
commit61799e930e269a9cdaf27d0f47972752fb52064a (patch)
treebab295ddaec1e2393d71cf12443699ab7d55ba8d /Master
parent5142d55915543ee993196dd71977907cc11edf0a (diff)
menukeys (11apr12)
git-svn-id: svn://tug.org/texlive/trunk@25919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/menukeys/README4
-rw-r--r--Master/texmf-dist/doc/latex/menukeys/menukeys.pdfbin508644 -> 508798 bytes
-rw-r--r--Master/texmf-dist/source/latex/menukeys/menukeys.dtx17
-rw-r--r--Master/texmf-dist/tex/latex/menukeys/menukeys.sty10
4 files changed, 17 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/menukeys/README b/Master/texmf-dist/doc/latex/menukeys/README
index 579d47e3b62..f57885b1a58 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.1a
+LaTeX class: menukey v1.1b
-------------------------------------------------
Tobias Weh (www.tobias-weh.de)
-2012/04/05
+2012/04/11
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 718249fe4d6..75d902b7f80 100644
--- a/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
+++ b/Master/texmf-dist/doc/latex/menukeys/menukeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx
index 2e6d150fb43..7e6042c00dd 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/04/05 v1.1a a package to format menus paths and shortcuts]
+%<package> [2012/04/11 v1.1b a package to format menus paths and shortcuts]
%
%<*driver>
\documentclass{ltxdoc}
@@ -676,8 +676,9 @@
% Hello World!
% \end{document}
% \end{verbatim}
-% \item Since \menukeys uses \pkg{catoptions} it may causes some problems
-% with orther packages because of \pkg{catoptions} option handling.
+% \item \changes{v1.1b}{2012/04/11}{Loade \pkg{biblatex} before \menukeys}
+% Since \menukeys uses \pkg{catoptions} it may causes some problems
+% with other packages, e.g. \pkg{biblatex}, because of \pkg{catoptions}' option handling.
% I recommend to load \menukeys as a later package in your preamble.
% \item Because \TikZ has some problems with \pkg{babels}'s active characters
% in |french|, \menukeys tries to fix this by calling |\NoAutoSpacing|
@@ -1397,6 +1398,8 @@
% \end{macro}
% \begin{macro}{\tw@define@menu@macro}
% \changes{v1.1a}{2012/04/05}{Added \cs{tw@babel@french@fix}}
+% \changes{v1.1b}{2012/04/06}{Replaced \cs{edef} by \cs{def} to
+% pevent expansion problems}
% Now we set up the internal command to create new menu macros.
% The list parsing code was essentially provided by Ahmed Musa at
% \url{http://tex.stackexchange.com/a/44989/4918}. Thank you very much!
@@ -1418,18 +1421,18 @@
\csdef{tw@parse@menu@list@\expandafter\@gobble\string#1}##1{%
\iflastindris
\ifnum\indrisnr=\@ne
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@single}%
\else
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@last}%
\fi
\else
\ifnum\indrisnr=\@ne
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@first}%
\else
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@mid}%
\fi
\fi
diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index aec135e5dd9..dd84a93d2c1 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/04/05 v1.1a a package to format menus paths and shortcuts]
+ [2012/04/11 v1.1b a package to format menus paths and shortcuts]
\RequirePackage{xparse}
\RequirePackage{xstring}
\RequirePackage{etoolbox}
@@ -586,18 +586,18 @@
\csdef{tw@parse@menu@list@\expandafter\@gobble\string#1}##1{%
\iflastindris
\ifnum\indrisnr=\@ne
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@single}%
\else
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@last}%
\fi
\else
\ifnum\indrisnr=\@ne
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@first}%
\else
- \edef\CurrentMenuElement{##1}%
+ \def\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@mid}%
\fi
\fi