From 87b2d1358e32a16c879c30fc456627b2659f03c2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 May 2013 22:13:41 +0000 Subject: menukeys (28may13) git-svn-id: svn://tug.org/texlive/trunk@30786 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/menukeys/menukeys.dtx | 50 +++++++--------------- .../texmf-dist/source/latex/menukeys/menukeys.ins | 2 +- 2 files changed, 16 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/source/latex/menukeys') diff --git a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx index 7e6042c00dd..77f1cff5701 100644 --- a/Master/texmf-dist/source/latex/menukeys/menukeys.dtx +++ b/Master/texmf-dist/source/latex/menukeys/menukeys.dtx @@ -18,7 +18,7 @@ % \iffalse %\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] % %<*driver> \documentclass{ltxdoc} @@ -178,7 +178,7 @@ % % \fi % -% \CheckSum{890} +% \CheckSum{880} % % \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 @@ -676,14 +676,9 @@ % Hello World! % \end{document} % \end{verbatim} -% \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. +% \item Since \menukeys uses \pkg{catoptions} it may causes some problems +% with orther packages becaus 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. % @@ -1381,26 +1376,9 @@ \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} -% \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. +% \changes{v1.1a}{2013/05/28}{Fixed minor bug, that causes a warning about robustifying (issu \#23), by deleting the line to make the command robust.} +% Then 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} @@ -1421,18 +1399,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 @@ -1445,24 +1423,26 @@ }{% \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} % \end{macrocode} % \end{macro} % \subsubsection{User-level commands} -% \begin{macro}{\newmenumacro}\begin{macro}{\renewmenumacro} +% \begin{macro}{\newmenumacro} +% \changes{v1.1a}{2013/05/28}{Added a line to make a new macro robust.} +% \begin{macro}{\renewmenumacro} % \begin{macro}{\providemenumacro} % Now it's time to build the user-level commands % \begin{macrocode} \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.} diff --git a/Master/texmf-dist/source/latex/menukeys/menukeys.ins b/Master/texmf-dist/source/latex/menukeys/menukeys.ins index 095ab47f388..0f2b5e6207d 100644 --- a/Master/texmf-dist/source/latex/menukeys/menukeys.ins +++ b/Master/texmf-dist/source/latex/menukeys/menukeys.ins @@ -49,7 +49,7 @@ LaTeX version 1999/12/01 or later. \Msg{* menukeys.sty *} \Msg{* *} \Msg{* To produce the documentation run the file *} -\Msg{* menukeys.dtx through LaTeX. *} +\Msg{* menukeys.dtx through PDFLaTeX. *} \Msg{* *} \Msg{* Happy TeXing! *} \Msg{* *} -- cgit v1.2.3