menukeys (23jul13)

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

1 files changed, 9 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index af3cc9bb5f1..460bec1d1b0 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}
-  [2013/05/28 v1.1a a package to format menus paths and shortcuts]
+  [2013/07/23 v1.2 a package to format menus paths and shortcuts]
 \RequirePackage{xparse}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -579,23 +579,24 @@
       \csdef{tw@parse@menu@list@\expandafter\@gobble\string#1}##1{%
          \iflastindris
             \ifnum\indrisnr=\@ne
-                \edef\CurrentMenuElement{##1}%
+                \protected@edef\CurrentMenuElement{##1}%
                 \@nameuse{tw@style@#3@single}%
             \else
-                \edef\CurrentMenuElement{##1}%
+                \protected@edef\CurrentMenuElement{##1}%
                 \@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@last}%
             \fi
          \else
             \ifnum\indrisnr=\@ne
-               \edef\CurrentMenuElement{##1}%
+               \protected@edef\CurrentMenuElement{##1}%
                \@nameuse{tw@style@#3@first}%
             \else
-               \edef\CurrentMenuElement{##1}%
+               \protected@edef\CurrentMenuElement{##1}%
                \@nameuse{tw@style@#3@sep}\@nameuse{tw@style@#3@mid}%
             \fi
          \fi
       }%
       \expandafter\newcommand\csname\expandafter\@gobble\string#1\endcsname[2][#2]{%
+         \leavevmode%
          {\def\tw@current@color@theme{\csname tw@style@#3@color@theme\endcsname}%
          \@nameuse{tw@style@#3@pre}%
          \tw@mk@test@input@sep{##1}{%
@@ -676,6 +677,7 @@
       \IfStrEq{symbols}{\tw@mk@mackeys}{#2}{}%
    }%
 }
+\normalsize
 \tw@make@key@box{shift}{%
    \begin{tikzpicture}[yshift=-0.1ex,baseline={(0,0)},semithick]
       \draw (0.3ex,0) -- (1.1ex,0) -- (1.1ex,1.2ex) -- %
@@ -767,6 +769,8 @@
 \tw@make@key@macro*{\cmd}
 
 \providecommand*{\Space}{\expandonce{\rule{3em}{0pt}}}
+\newcommand{\spacename}{Space}
+\providecommand*{\SPACE}{\expandonce{\rule{2em}{0pt}\spacename\rule{2em}{0pt}}}
 
 \tw@make@key@box{return@mac}{%
    \begin{tikzpicture}[semithick]