summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/menukeys
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-28 22:13:41 +0000
committerKarl Berry <karl@freefriends.org>2013-05-28 22:13:41 +0000
commit87b2d1358e32a16c879c30fc456627b2659f03c2 (patch)
tree25e087d24d4bfec09b4a82a3761f0b37511eed4e /Master/texmf-dist/tex/latex/menukeys
parenta3c270d6e09eec0086bcb1905ad896d6ef4352f3 (diff)
menukeys (28may13)
git-svn-id: svn://tug.org/texlive/trunk@30786 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/menukeys')
-rw-r--r--Master/texmf-dist/tex/latex/menukeys/menukeys.sty21
1 files changed, 7 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index dd84a93d2c1..af3cc9bb5f1 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/11 v1.1b a package to format menus paths and shortcuts]
+ [2013/05/28 v1.1a a package to format menus paths and shortcuts]
\RequirePackage{xparse}
\RequirePackage{xstring}
\RequirePackage{etoolbox}
@@ -562,13 +562,6 @@
}
\edef\tw@default@input@sep{,}
\def\CurrentMenuElement{}
-\newcommand\tw@babel@french@fix{}
-\AtBeginDocument{%
- \@ifpackageloaded{babel}{%
- \providecommand{\NoAutoSpacing}{}%
- \let\tw@babel@french@fix\NoAutoSpacing%
- }{}%
-}
\begingroup
\lccode`\,=1
\lowercase{\endgroup
@@ -586,18 +579,18 @@
\csdef{tw@parse@menu@list@\expandafter\@gobble\string#1}##1{%
\iflastindris
\ifnum\indrisnr=\@ne
- \def\CurrentMenuElement{##1}%
+ \edef\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@single}%
\else
- \def\CurrentMenuElement{##1}%
+ \edef\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@last}%
\fi
\else
\ifnum\indrisnr=\@ne
- \def\CurrentMenuElement{##1}%
+ \edef\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@first}%
\else
- \def\CurrentMenuElement{##1}%
+ \edef\CurrentMenuElement{##1}%
\@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@mid}%
\fi
\fi
@@ -610,17 +603,17 @@
}{%
\edef\tw@menu@list{\unexpanded{##2}}\edef\tw@mk@tempa{\cpttrimspaces{##1}}%
}%
- {\tw@babel@french@fix\letcs{\tw@mk@tempb}{tw@parse@menu@list@\expandafter\@gobble\string#1}%
+ {\letcs{\tw@mk@tempb}{tw@parse@menu@list@\expandafter\@gobble\string#1}%
\cptexpanded{\indrisloop*[\tw@mk@tempa]}\tw@menu@list\tw@mk@tempb}%
\@nameuse{tw@style@#3@post}}%
}%
- \expandafter\cptrobustify\csname\expandafter\@gobble\string#1\endcsname
}%
}
\edef\cpt@parserlist{\cpt@parserlist\@backslashchar}
\NewDocumentCommand{\newmenumacro}{m O{\tw@default@input@sep} m}{%
\ifcsundef{\expandafter\@gobble\string#1}{%
\tw@define@menu@macro{#1}[#2]{#3}%
+ \expandafter\cptrobustify\csname\expandafter\@gobble\string#1\endcsname
}{
\tw@mk@error{Menu macro '\string#1' already defined!\MessageBreak
Use \string\renewmenustyle\space instead.}