diff options
author | Karl Berry <karl@freefriends.org> | 2012-04-05 23:47:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-04-05 23:47:53 +0000 |
commit | fc0f83d1c7df80092f547288f40fdf310475a457 (patch) | |
tree | 425bc229f7280bf448356350c101a6ed1d678064 | |
parent | bdcb6ceed3b857a10b23bd190103a34e57b51289 (diff) |
menukeys (5apr12)
git-svn-id: svn://tug.org/texlive/trunk@25862 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/menukeys/README | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/menukeys/menukeys.pdf | bin | 506782 -> 508644 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/menukeys/menukeys.dtx | 30 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/menukeys/menukeys.sty | 11 |
4 files changed, 36 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/menukeys/README b/Master/texmf-dist/doc/latex/menukeys/README index c7264c3bd23..579d47e3b62 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.1 +LaTeX class: menukey v1.1a ------------------------------------------------- Tobias Weh (www.tobias-weh.de) -2012/02/27 +2012/04/05 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 Binary files differindex 1c1fef626ce..718249fe4d6 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 cc6fddeaff0..2e6d150fb43 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/27 v1.1 a package to format menus paths and shortcuts] +%<package> [2012/04/05 v1.1a a package to format menus paths and shortcuts] % %<*driver> \documentclass{ltxdoc} @@ -178,7 +178,7 @@ %</driver> % \fi % -% \CheckSum{880} +% \CheckSum{890} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -677,8 +677,12 @@ % \end{document} % \end{verbatim} % \item Since \menukeys uses \pkg{catoptions} it may causes some problems -% with orther packages becaus of \pkg{catoptions} option handling. +% with orther packages 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| +% if you use |french|. This is a quick work-around so please contact me +% in case any of problems. % \end{itemize} % If you find something to add to this list please send me an e-mail. % @@ -1376,8 +1380,24 @@ \def\CurrentMenuElement{} % \end{macrocode} % \end{macro} +% \begin{macro}{\tw@babel@french@fix} +% \changes{v1.1a}{2012/04/05}{Defining \cs{tw@babel@french@fix} to keep \TikZ working +% if the document is in \pkg{babel}'s french.} +% Because \TikZ crashes when \pkg{babel} is loaded with the |french| +% option we provide a work-around. +% \begin{macrocode} +\newcommand\tw@babel@french@fix{} +\AtBeginDocument{% + \@ifpackageloaded{babel}{% + \providecommand{\NoAutoSpacing}{}% + \let\tw@babel@french@fix\NoAutoSpacing% + }{}% +} +% \end{macrocode} +% \end{macro} % \begin{macro}{\tw@define@menu@macro} -% Then we set up the internal command to create new menu macros. +% \changes{v1.1a}{2012/04/05}{Added \cs{tw@babel@french@fix}} +% 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! % \begin{macrocode} @@ -1422,7 +1442,7 @@ }{% \edef\tw@menu@list{\unexpanded{##2}}\edef\tw@mk@tempa{\cpttrimspaces{##1}}% }% - {\letcs{\tw@mk@tempb}{tw@parse@menu@list@\expandafter\@gobble\string#1}% + {\tw@babel@french@fix\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}}% }% diff --git a/Master/texmf-dist/tex/latex/menukeys/menukeys.sty b/Master/texmf-dist/tex/latex/menukeys/menukeys.sty index 386ce3110f2..aec135e5dd9 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/27 v1.1 a package to format menus paths and shortcuts] + [2012/04/05 v1.1a a package to format menus paths and shortcuts] \RequirePackage{xparse} \RequirePackage{xstring} \RequirePackage{etoolbox} @@ -562,6 +562,13 @@ } \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 @@ -603,7 +610,7 @@ }{% \edef\tw@menu@list{\unexpanded{##2}}\edef\tw@mk@tempa{\cpttrimspaces{##1}}% }% - {\letcs{\tw@mk@tempb}{tw@parse@menu@list@\expandafter\@gobble\string#1}% + {\tw@babel@french@fix\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}}% }% |