From dc27dfcd77b6a8654d149e1821c03289d7aa359a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 May 2019 21:17:53 +0000 Subject: grabbox (8may19) git-svn-id: svn://tug.org/texlive/trunk@51052 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/grabbox/grabbox.sty | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/grabbox') diff --git a/Master/texmf-dist/tex/latex/grabbox/grabbox.sty b/Master/texmf-dist/tex/latex/grabbox/grabbox.sty index e5ab5339c60..72da0c9ce26 100644 --- a/Master/texmf-dist/tex/latex/grabbox/grabbox.sty +++ b/Master/texmf-dist/tex/latex/grabbox/grabbox.sty @@ -13,7 +13,7 @@ %% See http://www.latex-project.org/lppl.txt %% -------------------------------------------------------------- %% -%% Copyright (C) 2018 Jonathan P. Spratte +%% Copyright (C) 2018-2019 Jonathan P. Spratte %% %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this license or @@ -29,8 +29,8 @@ %% and the derived files grabbox.pdf and %% grabbox.sty. %% -\newcommand*\grabbox@date{2018-12-29} -\newcommand*\grabbox@version{1.3} +\newcommand*\grabbox@date{2019-05-08} +\newcommand*\grabbox@version{1.4} \ProvidesPackage{grabbox} [% \grabbox@date\space v\grabbox@version\space utilities to get an argument as @@ -50,8 +50,6 @@ {% \grabbox@def#1##1{\def#2{##1}\grabbox@opt#3#4}% } -\long\def\grabbox@afterelsefi#1\else#2\fi{\fi#1} -\long\def\grabbox@afterfi#1\fi{\fi#1} \grabbox@def\grabbox@opt#1#2% {% \@ifnextchar[ @@ -77,19 +75,6 @@ {% \ifhmode\unskip\fi } -\grabbox@def\grabbox@unpack - {% - \begingroup - \edef\grabbox@test{\grabbox@type}% - \expandafter\ifx\grabbox@test\hbox - \endgroup - \grabbox@afterelsefi\unhbox - \else - \endgroup - \grabbox@afterfi\unvbox - \fi - \grabbox@name - } \grabbox@def\grabbox {% \@ifstar @@ -108,6 +93,21 @@ \afterassignment\grabbox@intermediate \setbox\grabbox@name\grabbox@type } +\grabbox@def\@grabbox + {% + \@ifstar + {\@grabbox@spaces@true\@grabbox@a} + {\@grabbox@spaces@false\@grabbox@a}% + } +\grabbox@ldef\@grabbox@a#1#2#3#4#5% + {% + \def\grabbox@into@prepre{#1}% + \def\grabbox@name {#2}% + \def\grabbox@into@pre {#3}% + \def\grabbox@type {#4}% + \def\grabbox@into@post {#5}% + \grabbox@d + } \grabbox@def\grabbox@intermediate {% \grabbox@into@prepre -- cgit v1.2.3