summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-13 22:57:24 +0000
committerKarl Berry <karl@freefriends.org>2009-09-13 22:57:24 +0000
commit65ba9929b1e0745a4fc83154e7c8d226b6e9c1d6 (patch)
tree2c1f1b0de054e2e7a03a45156491d715b1fceb9f /Master
parent9ac8b08c93d6b47a5fef35454a531779fa6df983 (diff)
tabto-generic, not tabto
git-svn-id: svn://tug.org/texlive/trunk@15267 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/generic/tabto-generic/tabto.tex39
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check3
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds17
-rw-r--r--Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/tabto-generic.tlpsrc0
6 files changed, 51 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/generic/tabto-generic/tabto.tex b/Master/texmf-dist/tex/generic/tabto-generic/tabto.tex
new file mode 100644
index 00000000000..457bd9e4edc
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tabto-generic/tabto.tex
@@ -0,0 +1,39 @@
+%-------------- tabto.tex ------------
+% Donald Arseneau <asnd@triumf.ca>
+%
+% This software is contributed to the public domain.
+% See tabto.sty for more useful definitions for LaTeX.
+%
+% Tab to a position relative to the left margin in a paragraph:
+% some text \tabto{1in} more text, and \tabto 3in final text.
+% If the text on the line already goes past the desired position,
+% the tab starts a new line.
+% Note that braces are allowed, but not required.
+%
+
+\newdimen \scratchdim % or use \@tempdima in LaTeX
+\newdimen \scratchDIM % or use \@tempdimb in LaTeX
+
+% this preliminary mess is just TeX's awful way of reading a parameter
+% with or without braces.
+
+\def\tabto{\futurelet\nExt\tabtO}
+\def\tabtO{\ifx\nExt\bgroup\let\nExt\TabTo\else\let\nExt\tabtOO\fi\nExt}
+\def\tabtOO{\afterassignment\tabTOO\scratchDIM }
+\def\tabTOO{\TabTo\scratchDIM}
+
+\def\TabTo#1{\begingroup\leavevmode
+\ifinner\scratchdim=0pt\relax % in a \hbox, so ignore
+\else % unrestricted horizontal mode
+ \parfillskip=0pt plus 1fill % must swamp the -1fil glue
+ \hfil\null\penalty20 \hskip0ptplus-1fil
+ \hbox{\mathstrut\kern\hsize\kern-#1}\vadjust{\nobreak}\par
+ \scratchdim=\prevdepth
+ \prevdepth=-999pt % make sure I get an exact \baselineskip
+ \parskip=-999pt % but cancel the extra space
+ \advance\parskip-\baselineskip % cancel the \baselineskip
+ \advance\parskip-\scratchdim
+ \noindent
+\fi \hbox to#1{\vrule depth\scratchdim width0pt\hss}\endgroup
+\ignorespaces}
+
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index d0d88947ca1..69e79e26cfe 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -237,7 +237,8 @@ my @WorkingTLP = qw(
supertabular susy svgcolor svn svn-multi svn-prov svninfo
swebib syllogism syntax synproof syntrace synttree
t-angles t2 Tabbing
- tableaux tablenotes tablists tablor tabls tabto tabularcalc tabularew
+ tableaux tablenotes tablists tablor tabls tabto-generic
+ tabularcalc tabularew
tabulary tabvar talk
tamethebeast tdclock tdsfrmath
ted templates-fenn templates-sommer tengwarscript
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9d5d8e8d994..0c821e06c81 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -518,6 +518,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'svjour', "die 'skipping, license and packaging unclear'",
'symbolindex', "die 'skipping, requires binary'",
't2', "&MAKEt2",
+ 'tabto', "die 'skipping, use tabto-generic or tabto-ltx'",
'tamethebeast',"&MAKEtamethebeast",
'tamil-omega', "die 'skipping, supports nonfree ISM fonts'", #"&MAKEflatten",
'taylor', "die 'skipping, nonfree'",
@@ -793,13 +794,13 @@ $standardsourcefmt='latex';
'rsfs', 'plain',
'ruhyphen', 'generic',
'shapepar', 'generic',
- 'tabto', 'generic',
- 'texsis', 'texsis',
- 'tugboat-plain','plain',
- 'variations', 'generic',
- 'vaucanson-g', 'generic',
- 'vertex', 'plain',
- 'wasy2', 'plain',
+ 'tabto-generic', 'generic',
+ 'texsis', 'texsis',
+ 'tugboat-plain', 'plain',
+ 'variations', 'generic',
+ 'vaucanson-g', 'generic',
+ 'vertex', 'plain',
+ 'wasy2', 'plain',
'xepersian', 'xelatex',
'xetex-def', 'xelatex',
'xetexfontinfo', 'xetex',
@@ -951,6 +952,7 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'subfig', '\.sty|[^c]\.cfg', # omit ltxdoc.cfg, would be system-wide
'subfigure', '\.sty|[^c]\.cfg', # omit ltxdoc.cfg, would be system-wide
'syntax', 'syntax\.tex',
+ 'tabto-generic','tabto.tex',
'taylor', 'diagrams.tex',
'tex-ewd', 'dotnot.tex',
'texsis', '\.txs|TXS.*tex|texsis.tex',
@@ -1114,7 +1116,6 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'skaknew', 'fonts',
'splines', 'metapost',
'staves', 'fonts',
- 'tabto', 'generic',
'tamil-omega', 'omega',
'texcount', 'support',
'texdirflatten', 'support',
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
index 74559a590fc..3693c568310 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
@@ -23,6 +23,7 @@ depend multi
depend ofs
depend pdf-trans
depend shade
+depend tabto-generic
depend vrb
depend vtex
depend xlop
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index bb62edebfa7..c3ecf9a66ac 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -532,7 +532,6 @@ depend tableaux
depend tablenotes
depend tablists
depend tabls
-depend tabto
depend tabto-ltx
depend tabularcalc
depend tabularew
diff --git a/Master/tlpkg/tlpsrc/tabto-generic.tlpsrc b/Master/tlpkg/tlpsrc/tabto-generic.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/tabto-generic.tlpsrc