From 936a1e47ebfa9fa848749ff1365ed253ea520142 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 27 May 2013 01:50:10 +0000 Subject: tabto update 5/27 (since 2006) git-svn-id: svn://tug.org/texlive/trunk@30710 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tabto-ltx/tabto.sty | 92 ++++++++++++++++++------- 1 file changed, 68 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/tabto-ltx/tabto.sty b/Master/texmf-dist/tex/latex/tabto-ltx/tabto.sty index 1bc952fadd0..d7b70de1173 100644 --- a/Master/texmf-dist/tex/latex/tabto-ltx/tabto.sty +++ b/Master/texmf-dist/tex/latex/tabto-ltx/tabto.sty @@ -1,27 +1,27 @@ % tabto.sty % -% version 1.0 (May 2006) +% version 1.3 (Mar 2013) % % Tabbing to fixed positions in a paragraph. % -% Copyright 2006 by Donald Arseneau, -% Vancouver, Canada (asnd@triumf.ca) +% Copyright 2006,2009,2012,2013 by +% Donald Arseneau, Vancouver, Canada (asnd@triumf.ca) % Permission to use, distribute and modify this software is granted % under the conditions of the LaTeX Project Public License, either % version 1.3 or (at your option) any later version. The license is % found at http://www.latex-project.org/lppl.txt, and is part of all % recent distributions of LaTeX. % -% This work has the LPPL maintenance status `maintained'. +% This work has the LPPL maintenance status `maintained' (by author). % % Two new text positioning commands are defined: \tabto and \tab. % % \tabto{} -% Tab to a position relative to the left margin in a paragraph -% (any indentation due to a list is part of the `margin' in this -% context). If the text on the line already goes past the desired +% Tab to a position relative to the left margin in a paragraph (any +% indentation due to a list or \leftskip is part of the `margin' in +% this context). If the text on the line already goes past the desired % position, the tab starts a new line and moves to the requested -% horizontal position. +% horizontal position. % % \tabto*{} % Similar to \tabto, except it will perform backspacing, and over- @@ -29,13 +29,26 @@ % longer than the specified length (i.e., no linebreak is produced). % Line-breaks are suppressed immediately after \tabto or \tabto*. % +% The length register "\CurrentLineWidth" will report the width +% of the existing text on the line, and it may be used in the +% argument (using calc.sty, for example). Also, there +% is "\TabPrevPos" which gives the "\CurrentLineWidth" from the +% previous tab command, and can be used to return to that position +% if no line breaks have occurred in between. +% % \tab % Tab to the next tab-stop chosen from a list of tab positions, in % the traditional style of typewriters. A \tab will always move % to the next tab stop (or the next line), even if it is already -% exactly at a tab stop. Thus, "\tab\tab" skips a position. A -% linebreak is permitted immediately following a \tab, in case the -% ensuing text does not fit well in the remaining space. +% exactly at a tab stop. Thus, "\tab" at the beginning of a line, +% or "\tab\tab" elsewhere skips a position. A linebreak is permitted +% immediately following a \tab, in case the ensuing text does not +% fit well in the remaining space. +% +% If you do not want to skip positions, use "\tabto{\NextTabStop}" +% instead of "\tab". This is particularly useful when you want to +% use \tab in some other command, but do not want to skip a column +% for the first item. % % The tab-stop positions are declared using either \TabPositions % or \NumTabs: @@ -51,16 +64,29 @@ % declares tab-stops at 0pt and 0.5\linewidth, the same as % \TabPositions{0pt, 0.5\linewidth} or \TabPositions{0.5\linewidth} % +% After these declarations, the list of tab positions is saved in +% \TabStopList, and the next tab position, relative to the current +% position, is given by \NextTabStop. You do not normally need +% to access them, but they are available. +% +% Problems: +% +% Tall objects after a tab stop may overlap the line above, rather +% than forcing a greater separation between lines. + +\ProvidesPackage{tabto}[2013/03/25 \space v 1.3 \space + Another tabbing mechanism]\relax \newdimen\CurrentLineWidth +\let\TabPrevPos\z@ \newcommand\tabto[1]{% \leavevmode \begingroup \def\@tempa{*}\def\@tempb{#1}% - \ifx\@tempa\@tempb + \ifx\@tempa\@tempb % \tab* \endgroup - \TTo@overlaptrue + \TTo@overlaptrue % ... set a flag and re-issue \tabto to get argument \expandafter\tabto \else \ifinner % in a \hbox, so ignore @@ -75,19 +101,29 @@ \belowdisplayskip\z@skip \belowdisplayshortskip\z@skip \halign{##\cr\noalign{% % get the width of the line above - \ifdim\predisplaysize<\z@ - \CurrentLineWidth\z@ + \ifdim\predisplaysize=\maxdimen %\message{Mixed R and L, so say the line is full. }% + \CurrentLineWidth\linewidth \else - \CurrentLineWidth\predisplaysize - % Correct the 2em offset, but avoid error when -\maxdimen - \advance\CurrentLineWidth -2em - \advance\CurrentLineWidth -\displayindent - \advance\CurrentLineWidth -\leftskip - \fi + \ifdim\predisplaysize=-\maxdimen + % \message{Not in a paragraph, so call the line empty. }% + \CurrentLineWidth\z@ + \else + \ifnum\TTo@Direction<\z@ + \CurrentLineWidth\linewidth \advance\CurrentLineWidth\predisplaysize + \else + \CurrentLineWidth\predisplaysize + \fi + % Correct the 2em offset + \advance\CurrentLineWidth -2em + \advance\CurrentLineWidth -\displayindent + \advance\CurrentLineWidth -\leftskip + \fi\fi + \ifdim\CurrentLineWidth<\z@ \CurrentLineWidth\z@\fi % Enshrine the tab-to position; #1 might reference \CurrentLineWidth \@tempdimb=#1\relax - %\message{*** Tab to \the\@tempdimb, previous width - % is \the\CurrentLineWidth. ***}% + %\message{*** Tab to \the\@tempdimb, previous width is \the\CurrentLineWidth. ***}% + % Save width for possible return use + \xdef\TabPrevPos{\the\CurrentLineWidth}% % Build the action to perform \protected@xdef\TTo@action{% \vrule\@width\z@\@depth\the\prevdepth @@ -98,6 +134,7 @@ \protect\nobreak \protect\hskip\the\@tempdimb\relax }% + %\message{\string\TTo@action: \meaning \TTo@action. }% % get back to the baseline, regardless of its depth. \vskip-\prevdepth \prevdepth-99\p@ @@ -107,7 +144,7 @@ % Don't count the display as lines in the paragraph \count@\prevgraf \advance\count@-4 \prevgraf\count@ \TTo@action -%% \penalty\@m % to allow a penalized line break + %% \penalty\@m % to allow a penalized line break \fi \endgroup \TTo@overlapfalse @@ -158,3 +195,10 @@ \TabPositions{\parindent,.5\linewidth} \newif\ifTTo@overlap \TTo@overlapfalse + +\@ifundefined{predisplaydirection}{ + \let\TTo@Direction\predisplaysize + \let\predisplaydirection\@undefined +}{ + \let\TTo@Direction\predisplaydirection +} -- cgit v1.2.3