menukeys (21sep13)

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

1 files changed, 74 insertions, 74 deletions

diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
index 460bec1d1b0..c0e8660d801 100644
--- a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
+++ b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2012 by Tobias Weh
+%% Copyright (C) 2013 by Tobias Weh
 %%                       www.tobias-weh.de
 %% 
 %% This file may be distributed and/or modified under the
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/01/01]
 \ProvidesPackage{menukeys}
-  [2013/07/23 v1.2 a package to format menus paths and shortcuts]
+  [2013/07/23 v1.2a a package to format menus paths and shortcuts]
 \RequirePackage{xparse}
 \RequirePackage{xstring}
 \RequirePackage{etoolbox}
@@ -134,17 +134,17 @@
       \csdef{tw@style@#2@last}{#4}%
    }{%
       \csdef{tw@style@#2@single}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@first}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@mid}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@last}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
    }%
 }
 \DeclareDocumentCommand{\tw@declare@sytle@extra@args}{%
@@ -166,17 +166,17 @@
       \csdef{tw@style@#2@last}{#7}%
    }{%
       \csdef{tw@style@#2@single}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#8]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#8]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@first}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@mid}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#6]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#6]{\strut\CurrentMenuElement};}}%
       \csdef{tw@style@#2@last}{%
-         \tikz[baseline=(tw@node.base)]%
-         \node(tw@node)[#7]{\strut\CurrentMenuElement};}%
+         \tikz[baseline=(tw@node.base)]{%
+         \node(tw@node)[#7]{\strut\CurrentMenuElement};}}%
    }%
    \tw@declare@sytle@extra@args%
 }
@@ -279,20 +279,20 @@
                \csdef{tw@style@#2@#3}{#4}%
             }{%
             \csdef{tw@style@#2@#3}{%
-               \tikz[baseline=(tw@node.base)]%
-               \node(tw@node)[#4]{\strut\CurrentMenuElement};}%
+               \tikz[baseline=(tw@node.base)]{%
+               \node(tw@node)[#4]{\strut\CurrentMenuElement};}}%
             }%
          }%
       }{\tw@mk@error{No element '#3'. Possible values are\MessageBreak
         single, first, middle, last, pre, post or sep.}}%
    }%
 }
-\tikzstyle{tw@set@tikz@colors}=[%
+\tikzset{tw@set@tikz@colors/.style={%
    draw=\usemenucolor{br},
    fill=\usemenucolor{bg},
    text=\usemenucolor{txt},
-]
-\tikzstyle{tw@menus@base}=[%
+}}
+\tikzset{tw@menus@base/.style={%
    tw@set@tikz@colors,
    rounded corners=0.15ex,
    inner sep=0pt,
@@ -304,26 +304,26 @@
    signal,
    signal to=nowhere,
    signal pointer angle=110,
-]
+}}
 \tw@declare@style*{menus}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@menus@base,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }[\hspace{-0.2em}\hspace{0em plus 0.1em minus 0.05em}]%
 {%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@menus@base,signal from=west,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@menus@base,signal from=west,]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@menus@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@menus@base]{\strut\CurrentMenuElement};}%
 }{gray}
 
-\tikzstyle{tw@roundedmenus@base}=[%
+\tikzset{tw@roundedmenus@base/.style={%
    tw@set@tikz@colors,
    rounded corners=0.3ex,
    inner sep=0pt,
@@ -335,26 +335,26 @@
    signal,
    signal to=nowhere,
    signal pointer angle=110,
-]
+}}
 \tw@declare@style*{roundedmenus}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@roundedmenus@base,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }[\hspace{-0.2em}\hspace{0em plus 0.1em minus 0.05em}]%
 {%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@roundedmenus@base,signal from=west,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@roundedmenus@base,signal from=west,]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@roundedmenus@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@roundedmenus@base]{\strut\CurrentMenuElement};}%
 }{gray}
 
-\tikzstyle{tw@angularmenus@base}=[%
+\tikzset{tw@angularmenus@base/.style={%
    tw@set@tikz@colors,
    inner sep=0pt,
    inner xsep=2pt,
@@ -365,26 +365,26 @@
    signal,
    signal to=nowhere,
    signal pointer angle=110,
-]
+}}
 \tw@declare@style*{angularmenus}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@angularmenus@base,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }[\hspace{-0.2em}\hspace{0em plus 0.1em minus 0.05em}]%
 {%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@angularmenus@base,signal from=west,signal to=east]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
       \node(tw@node)[tw@angularmenus@base,signal from=west,]%
-      {\strut\CurrentMenuElement};%
+      {\strut\CurrentMenuElement};}%
 }{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@angularmenus@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@angularmenus@base]{\strut\CurrentMenuElement};}%
 }{gray}
 
-\tikzstyle{tw@roundedkeys@base}=[%
+\tikzset{tw@roundedkeys@base/.style={%
    tw@set@tikz@colors,
    rounded corners=0.3ex,
    inner sep=0pt,
@@ -393,17 +393,17 @@
    text depth=0.7ex,
    minimum width=1.5em,
    font=\relsize{-1}\sffamily,
-]
+}}
 \tw@declare@style@simple*{roundedkeys}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@roundedkeys@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@roundedkeys@base]{\strut\CurrentMenuElement};}%
 }[%
    \hspace{0.1em plus 0.1em minus 0.05em}%
    \raisebox{0.25ex}{\sffamily\footnotesize+}%
    \hspace{0.1em plus 0.1em minus 0.05em}%
 ]{gray}
 
-\tikzstyle{tw@shadowedroundedkeys@base}=[%
+\tikzset{tw@shadowedroundedkeys@base/.style={%
    tw@set@tikz@colors,
    rounded corners=0.3ex,
    inner sep=0pt,
@@ -416,17 +416,17 @@
       shadow xshift=.2ex, shadow yshift=-.15ex,
       fill=black,
    },
-]
+}}
 \tw@declare@style@simple*{shadowedroundedkeys}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@shadowedroundedkeys@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@shadowedroundedkeys@base]{\strut\CurrentMenuElement};}%
 }[%
    \hspace{0.2ex}\hspace{0.1em plus 0.1em minus 0.05em}%
    \raisebox{0.25ex}{\sffamily\footnotesize+}%
    \hspace{0.1em plus 0.1em minus 0.05em}%
 ][\hspace{0.2ex}]{gray}
 
-\tikzstyle{tw@angularkeys@base}=[%
+\tikzset{tw@angularkeys@base/.style={%
    tw@set@tikz@colors,
    inner sep=0pt,
    inner xsep=2pt,
@@ -434,17 +434,17 @@
    text depth=0.7ex,
    minimum width=1.5em,
    font=\relsize{-1}\sffamily,
-]
+}}
 \tw@declare@style@simple*{angularkeys}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@angularkeys@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@angularkeys@base]{\strut\CurrentMenuElement};}%
 }[%
    \hspace{0.1em plus 0.1em minus 0.05em}%
    \raisebox{0.25ex}{\sffamily\footnotesize+}%
    \hspace{0.1em plus 0.1em minus 0.05em}%
 ]{gray}
 
-\tikzstyle{tw@shadowedangularkeys@base}=[%
+\tikzset{tw@shadowedangularkeys@base/.style={%
    tw@set@tikz@colors,
    inner sep=0pt,
    inner xsep=2pt,
@@ -456,23 +456,23 @@
       shadow xshift=.2ex, shadow yshift=-.15ex,
       fill=black,
    },
-]
+}}
 \tw@declare@style@simple*{shadowedangularkeys}{%
-   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]%
-      \node(tw@node)[tw@shadowedangularkeys@base]{\strut\CurrentMenuElement};%
+   \tikz[baseline={($(tw@node.base)+(0,-0.2ex)$)}]{%
+      \node(tw@node)[tw@shadowedangularkeys@base]{\strut\CurrentMenuElement};}%
 }[%
    \hspace{0.2ex}\hspace{0.1em plus 0.1em minus 0.05em}%
    \raisebox{0.25ex}{\sffamily\footnotesize+}%
    \hspace{0.1em plus 0.1em minus 0.05em}%
 ][\hspace{0.2ex}]{gray}
 
-\tikzstyle{tw@typewriterkeys@base}=[%
+\tikzset{tw@typewriterkeys@base/.style={%
    tw@set@tikz@colors,
    shape=circle,
    minimum size=2ex,
    inner sep=0.5pt, outer sep=1pt,
    font=\ttfamily\relsize{-1},
-]
+}}
 \tw@declare@style@simple*{typewriterkeys}{%
    \def\tw@typewriterkeys@curr@elem{%
       \maxsizebox*{2ex}{2ex}{\CurrentMenuElement}%
@@ -494,8 +494,8 @@
 }[%
    \hspace{0.2em plus 0.1em}%
    \raisebox{0.08ex}{%
-      \tikz\fill[\usemenucolor{txt}] (0,0) -- (0.5ex,0.5ex)%
-                -- (0,1ex) -- cycle;%
+      \tikz{\fill[\usemenucolor{txt}] (0,0) -- (0.5ex,0.5ex)%
+                -- (0,1ex) -- cycle;}%
    }%
    \hspace{0.2em plus 0.1em}%
 ]{blacknwhite}
@@ -522,8 +522,8 @@
 }[%
    \hspace{0.2em plus 0.1em}%
    \raisebox{0.08ex}{%
-      \tikz\fill[\usemenucolor{txt}] (0,0) -- (0.5ex,0.5ex)%
-                -- (0,1ex) -- cycle;%
+      \tikz{\fill[\usemenucolor{txt}] (0,0) -- (0.5ex,0.5ex)%
+                -- (0,1ex) -- cycle;}%
    }%
    \hspace{0.2em plus 0.1em}%
 ]{blacknwhite}