diff options
| -rwxr-xr-x | Build/tools/tpm-ctan-check | 158 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/cellspace/README | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/cellspace/cellspace.pdf | bin | 0 -> 469567 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/cellspace/cellspace.tex | 501 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/cellspace/cellspace.sty | 157 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/arev.tpm | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/cellspace.tpm | 26 | ||||
| -rw-r--r-- | Master/texmf/lists/cellspace | 8 | ||||
| -rw-r--r-- | Master/texmf/tpm/collection-latexextra.tpm | 1 |
9 files changed, 788 insertions, 81 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check index 55d652208d3..54ec4759a0d 100755 --- a/Build/tools/tpm-ctan-check +++ b/Build/tools/tpm-ctan-check @@ -20,86 +20,86 @@ sub main $OPT{"verbose"} = 0; # xx but for now, just check the few packages we have worked with. - @ARGV = ( - "12many", "ESIEEcv", "GuIT", "HA-prosper", "IEEEconf", "IEEEtran", - "MemoirChapStyles", "SIstyle", "SIunits", "Tabbing", "Type1fonts", - "a0poster", "aastex", "abbr", "abc", "abstract", -#"abstyles", not updated, but too old to matter - "accfonts", "acronym", "algorithm2e", "algorithms", - "amsldoc-it", "amsthdoc-it", "apacite", "arabtex", - "archaic", "arev", "armenian", "ascii", "aurical", - "babel", "babelbib", "beamer-tut-pt", "beebe", "betababel", - "bezos", "bghyphen", "bibhtml", - "bibleref", "blacklettert1", "booklet", "boxhandler", - "breakurl", "bytefield" , - "caption", "carlisle", "cbcoptic", "changebar", "chappg", - "chemcompounds", "circ", "cjhebrew", "clock", "colortbl", "commath", - "complexity", "comprehensive", "computational-complexity", - "cooltooltips", - "csquotes", "cursolatex", "curve", "curves", - "dateiliste", "datetime", "devanagr", "dk-bib", "doipubmed", "dottex", - "draftwatermark", "dtxtut", - "ednotes", "elpres", "emulateapj", "endfloat", "endheads", "enumitem", - "etaremune", "esint", - "esint-type1", "ethiop", "europecv", "everypage", "exercise", - "exteps", "extpfeil", - "faktor", "featpost", "fixme", "flagderiv", "flippdf", "floatflt", - "floatrow", "flowfram", - "fltpoint", "fmtcount", "fncychap", "fontspec", "formular", - "fourier", "free-math-font-survey", "frenchle", - "galois", "genmisc", "glossary", "gnuplottex", "gost", "graphics", - "graphicx-psmin", - "hrlatex", "hyphen-base", "hyphen-basque", "hyphen-german", - "hyphen-greek", "hyphen-norwegian", "hyphen-ukenglish", - "hyphen-usorbian", - "ibygrk", "ifxetex", "iopart-num", - "jneurosci", "juramisc", - "koma-script", - "l2picfaq", "l2tabu-english", - "labelcas", "ledmac", "lewis", "lfb", "lh", "lineno", "listings", - "lshort-bulgarian", "lshort-dutch", "lshort-english", - "lshort-finnish", "lshort-french", "lshort-german", - "lshort-italian", "lshort-japanese", "lshort-korean", - "lshort-mongolian", "lshort-polish", "lshort-portuguese", -#"lshort-russian", # only zip files on CTAN - "lshort-slovak", "lshort-spanish", - "lshort-thai", "lshort-ukrainian", "lshort-vietnamese", - "ltabptch", "ltxmisc", -#"malayalam", # missing C sources on CTAN, wrote author 5jun05. -#"mathspic", # inside pictex, later - "makecell", "makeplot", "mathdots", "mathmode", "mcaption", - "memoir", "metauml", "mfpic", - "mhchem", "minitoc", "microtype", "minitoc", "mla-paper", - "moderncv", "movie15", "muthesis", -#"mpattern", # not up-to-date on CTAN, wrote author 28may05. - "nag", "ncclatex", "ncctools", "newlfm", "noitcrul", - "nomencl", "nomentbl", "ntheorem-vn", "numprint", - "oberdiek", "octavo", - "pauldoc", "pdf-trans", "pdfcprot", "pdftex-def", "perception", - "perltex", "pgf", "pictex", "placeins", -#"plnfss", # only a zip file on CTAN - "polynom", "poemscol", "powerdot", "powerdot-doc-vn", - "ppr-prv", "preview", "proof", "pstricks", "pstricks-add", - "pst-3d", "pst-barcode", "pst-blur", "pst-eucl", "pst-func", - "pst-labo", "pst-lens", "pst-osci", "pst-pdf", "pst-pdgr", "pst-slpe", - "qtree", - "randbild", "robustcommand", - "sciposter", "sectionbox", "sectsty", "semantic", - "seminar", "semioneside", - "setspace", "sf298", "showexpl", "sides", "skaknew", - "sort-by-letters", "sparklines", "spotcolor", "stellenb", - "sttools", "struktex", "subfig", "sudoku", "svn-multi", "svninfo", - "t-angles", "tabulary", "tabvar", "talk", "tamethebeast", "tex-refs", - "texmate", "texshade", - "textcase", "textpos", "thesis-titlepage-fhac", "thumbpdf", - "titlesec", "tokenizer", "totpages", "trajan", "tugboat", - "twoup", "typedref", - "velthuis", "verse", "vhistory", "visualfaq", "volumes", - "wordlike", "wrapfig", - "xifthen", "xltxtra", "xypic-tut-pt", - "york-thesis", - "xcolor", "xkeyval" + @ARGV = qw( + 12many ESIEEcv GuIT HA-prosper IEEEconf IEEEtran + MemoirChapStyles SIstyle SIunits Tabbing Type1fonts + a0poster aastex abbr abc abstract + accfonts acronym algorithm2e algorithms + amsldoc-it amsthdoc-it apacite arabtex + archaic arev armenian ascii aurical + babel babelbib beamer-tut-pt beebe betababel + bezos bghyphen bibhtml + bibleref blacklettert1 booklet boxhandler + breakurl bytefield + caption carlisle cbcoptic cellspace changebar chappg + chemcompounds circ cjhebrew clock colortbl commath + complexity comprehensive computational-complexity + cooltooltips + csquotes cursolatex curve curves + dateiliste datetime devanagr dk-bib doipubmed dottex + draftwatermark dtxtut + ednotes elpres emulateapj endfloat endheads enumitem + etaremune esint + esint-type1 ethiop europecv everypage exercise + exteps extpfeil + faktor featpost fixme flagderiv flippdf floatflt + floatrow flowfram + fltpoint fmtcount fncychap fontspec formular + fourier free-math-font-survey frenchle + galois genmisc glossary gnuplottex gost graphics + graphicx-psmin + hrlatex hyphen-base hyphen-basque hyphen-german + hyphen-greek hyphen-norwegian hyphen-ukenglish + hyphen-usorbian + ibygrk ifxetex iopart-num + jneurosci juramisc + koma-script + l2picfaq l2tabu-english + labelcas ledmac lewis lfb lh lineno listings + lshort-bulgarian lshort-dutch lshort-english + lshort-finnish lshort-french lshort-german + lshort-italian lshort-japanese lshort-korean + lshort-mongolian lshort-polish lshort-portuguese + lshort-slovak lshort-spanish + lshort-thai lshort-ukrainian lshort-vietnamese + ltabptch ltxmisc + makecell makeplot mathdots mathmode mcaption + memoir metauml mfpic + mhchem minitoc microtype minitoc mla-paper + moderncv movie15 muthesis + nag ncclatex ncctools newlfm noitcrul + nomencl nomentbl ntheorem-vn numprint + oberdiek octavo + pauldoc pdf-trans pdfcprot pdftex-def perception + perltex pgf pictex placeins + polynom poemscol powerdot powerdot-doc-vn + ppr-prv preview proof pstricks pstricks-add + pst-3d pst-barcode pst-blur pst-eucl pst-func + pst-labo pst-lens pst-osci pst-pdf pst-pdgr pst-slpe + qtree + randbild robustcommand + sciposter sectionbox sectsty semantic + seminar semioneside + setspace sf298 showexpl sides skaknew + sort-by-letters sparklines spotcolor stellenb + sttools struktex subfig sudoku svn-multi svninfo + t-angles tabulary tabvar talk tamethebeast tex-refs + texmate texshade + textcase textpos thesis-titlepage-fhac thumbpdf + titlesec tokenizer totpages trajan tugboat + twoup typedref + velthuis verse vhistory visualfaq volumes + wordlike wrapfig + xifthen xltxtra xypic-tut-pt + york-thesis + xcolor xkeyval ); +#abstyles not updated but too old to matter +#lshort-russian # only zip files on CTAN +#malayalam # missing C sources on CTAN wrote author 5jun05. +#mathspic # inside pictex later +#mpattern # not up-to-date on CTAN wrote author 28may05. +#plnfss # only a zip file on CTAN } my $errcount = 0; diff --git a/Master/texmf-dist/doc/latex/cellspace/README b/Master/texmf-dist/doc/latex/cellspace/README new file mode 100644 index 00000000000..3a0f0ff47b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellspace/README @@ -0,0 +1,14 @@ +% (C) 2006 Josselin Noirel +% +% Package cellspace: Ensuring a minimal spacing of table cells. +% +% This material is subject to the LaTeX Project Public License. See +% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html . + +This package is intended to allow automatic spacing out of +the lines of an array. People often complain about text touching the +\hline of a tabular when it is too high or too deep. For example (with +the amsmath package) a \dfrac{1}{2} surrounded by \hlines touches the +horizontal rules. This package provides a modifier S to usual column +types (l, c, r, p, m, and b) that ensures a minimal spacing between rules +and cells of an array. diff --git a/Master/texmf-dist/doc/latex/cellspace/cellspace.pdf b/Master/texmf-dist/doc/latex/cellspace/cellspace.pdf Binary files differnew file mode 100644 index 00000000000..b783f21e292 --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellspace/cellspace.pdf diff --git a/Master/texmf-dist/doc/latex/cellspace/cellspace.tex b/Master/texmf-dist/doc/latex/cellspace/cellspace.tex new file mode 100644 index 00000000000..1fb49022071 --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellspace/cellspace.tex @@ -0,0 +1,501 @@ +% (C) 2006 Josselin Noirel +% +% Package cellspace: Ensuring a minimal spacing of table cells. +% +% This material is subject to the LaTeX Project Public License. See +% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html . +% +\def \tempa $#1 #2 #3 #4 #5 #6 #7 ${% + \def \filedate {#4}% + \def \fileversion {v#3}% +} +\tempa $Id: cellspace.tex,v 1.2 2006/03/13 19:28:10 noirel Exp $ +\ProvidesFile{cellspace}% + [\filedate \space \fileversion \space cellspace documentation (JN)] +\pdfoutput = 1 +\documentclass[12pt]{ltxdoc} + +\usepackage{ifpdf} +\ifpdf + \PassOptionsToPackage{pdftex}{geometry} +\else + \PassOptionsToPackage{dvips}{geometry} +\fi +\usepackage[ascii]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{amsmath} +\usepackage{textcomp} +\usepackage{lmodern} +\usepackage{microtype} +\usepackage[a4paper, margin = 1.3in]{geometry} +\usepackage{cellspace} +\usepackage{booktabs} +\usepackage{tabularx} +\usepackage{moreverb} +\usepackage{floatrow} + \floatsetup{margins = centering} +\usepackage{algorithmic} +\usepackage[british]{babel} + +% ----------------------------------------------------------------- + +\newcommand*{\compare}[2]{% + \par \begingroup \trivlist \item \centering +%% \parbox[t]{0.5\linewidth}{#1}% +%% \parbox[t]{0.5\linewidth}{#2}% + \vskip-\baselineskip + \makebox[0pt]{% + \mbox{#1}% + \quad + \mbox{#2}% + } + \endtrivlist \endgroup \par +} +\renewcommand*{\meta}[1]{\textnormal{\textlangle \emph{#1}\textrangle}} +\newcommand*{\pack}{\textsf} +\newcommand*{\tex}[1]{\texttt{#1}} +\renewcommand*{\cmd}[1]{\tex{\textbackslash #1}} +\makeatletter +\newenvironment*{showexample}{% + \par \vskip-\baselineskip + \bgroup \obeylines + \@showexample +}{% + \endverbatimwrite + \endgroup + \begingroup + \footnotesize + \samepage + \verbatimtabinput{cellspace.tmp}% + \endgroup + \nobreak \@nobreaktrue \vskip-\baselineskip \vskip\z@skip + \begingroup \@nameuse{\@showexampleenv}% + \small + \input{cellspace.tmp}% + \@nameuse{end\@showexampleenv}\endgroup + \par \bigbreak + \@endparenv +} +\newcommand*{\@showexample}[1][center]{% + \egroup + \def \@showexampleenv {#1}% + \begingroup + \verbatimwrite{cellspace.tmp}% +} +\makeatother + +% ----------------------------------------------------------------- + +\setlength{\cellspacetoplimit}{2pt} +\setlength{\cellspacebottomlimit}{2pt} +\setcounter{secnumdepth}{0} +\addparagraphcolumntypes{X} + +% ----------------------------------------------------------------- + +\GetFileInfo{cellspace.sty} + +\title {The \pack{cellspace} package} +\author {Josselin Noirel} +\date {\filedate---\fileversion} + +\begin{document} + +\maketitle + +\begin{abstract} + This package is intended to allow automatic spacing out of the lines of + an array. People often complain about text touching the \cmd{hline} of + a tabular when it is too high or too deep. For example (with the + \pack{amsmath} package) with \tex{\textbackslash dfrac\{1\}\{2\}} + surrounded by \cmd{hline}s. This package provides a modifier \tex{S} to + usual column types (\tex{l}, \tex{c}, \tex{r}, \tex{p}, \tex{m}, + and~\tex{b}) that ensures a minimal spacing between rules and cells of + an array. +\end{abstract} + +\section {Introduction} + +The mechanism used by \LaTeX{} to build tables---using struts---has an +important consequence: the cells of a table that extend too much tend to +touch horizontal rules. First example: +% +\begin{showexample} +\begin{tabular}{cc} + \hline + \itshape Bond & + \itshape Distance ($\mathrm{\mathring{A}})$ \\ + \hline + C--C & $1.53$ \\ + C--H & $1.10$ \\ + \hline +\end{tabular} +\end{showexample} +% +Second example: +% +\begin{showexample} +\begin{tabular}{c} + \hline + \itshape Formula \\ + \hline + $\displaystyle + e = 1 + \frac{1}{2} + \frac{1}{6} + \cdots + + \frac{1}{k!} + \cdots $ \\ + $\displaystyle + \pi = 4 \left( 1 - \frac{1}{3} + \frac{1}{5} + \cdots + + \frac{(-1)^k}{2 k + 1} + + \cdots \right)$ \\ + \hline +\end{tabular} +\end{showexample} +% +The classical workarounds \cmd{\textbackslash}\oarg{dimen} and +\cmd{noalign}\tex{\{}\cmd{vspace}\marg{dimen}\tex{\}} are not very powerful +and need fine tuning. + +\section{How to solve this?} + +The \pack{cellspace} loads several packages to carry out its job: +\pack{array}, \pack{ifthen}, and~\pack{calc}. It redefines several +internals, still not too many (\cmd{@startpbox} and \cmd{@endpbox}). By +default, the tables will behave as usual. To improve the spacing of your +tables, you must change the table preamble and prepend \tex{S} to the +column types \tex{l}, \tex{c}, \tex{r}. The same holds for the paragraph +columns \tex{p}, \tex{m}, and~\tex{b}, except that they must be surrounded +by an extra pair of braces. For instance, the default behaviour of a +table beginning with +% +\begin{verbatim} +\begin{tabular}{l l l p{3cm}} +\end{verbatim} +% +should be changed into +% +\begin{verbatim} +\begin{tabular}{Sl Sl Sl S{p{3cm}}} +\end{verbatim} + +The \pack{cellspace} has two parameters governing the spacing of the +cells. The dimension \cmd{cellspacetoplimit} is the minimal spacing +required between the actual text the cell is made up of and the top of the +cell (where \cmd{hline}s may appear), if the spacing is less than this +threshold, a space of \cmd{cellspacetoplimit} is added, otherwise nothing +is done. Conversely, at the bottom the dimension +\cmd{cellspacebottomlimit} is the minimal space required between the +bottom of the cell and the text itself. This parameters can be changed in +the document preamble using \cmd{setlength}. Together with +\pack{booktabs}, the results look rather good. \pack{cellspace} may work +with other column types (defined through \cmd{newcolumntype} for +instance); it will assume by default that an unknown column is a LR-mode +column. Otherwise you have to tell \pack{cellspace} something like +% +\begin{verbatim} +\addparagraphcolumntypes{X} +\end{verbatim} +% +(The previous example is needed to make \pack{tabularx} work with +\pack{cellspace}.) + +The following examples use a setting of $2\,\mathrm{pt}$ for both top and +bottom space limits. +% +\compare{% + \begin{tabular}[t]{cc} + \hline + \itshape Bond & + \itshape Distance ($\mathrm{\mathring{A}})$ \\ + \hline + C--C & $1.53$ \\ + C--H & $1.10$ \\ + \hline + \end{tabular} +}{% + \begin{tabular}[t]{Sc Sc} + \hline + \itshape Bond & + \itshape Distance ($\mathrm{\mathring{A}})$ \\ + \hline + C--C & $1.53$ \\ + C--H & $1.10$ \\ + \hline + \end{tabular} +} +% +Some space is added at the top the first row because it doesn't fulfil +the condition imposed by the package. Similarly some space is added at +the below the first row. It has to be noticed that no space +is added however in other rows because they are far enough from the cell +separations. + +\compare{% + \begin{tabular}[t]{c} + \hline + \itshape Formula \\ + \hline + $\displaystyle + e = 1 + \frac{1}{2} + \frac{1}{6} + \cdots + + \frac{1}{k!} + \cdots $ \\ + $\displaystyle + \pi = 4 \left( 1 - \frac{1}{3} + \frac{1}{5} + \cdots + + \frac{(-1)^k}{2 k + 1} + + \cdots \right)$ \\ + \hline + \end{tabular} +}{% + \begin{tabular}[t]{Sc} + \hline + \itshape Formula \\ + \hline + $\displaystyle + e = 1 + \frac{1}{2} + \frac{1}{6} + \cdots + + \frac{1}{k!} + \cdots $ \\ + $\displaystyle + \pi = 4 \left( 1 - \frac{1}{3} + \frac{1}{5} + \cdots + + \frac{(-1)^k}{2 k + 1} + + \cdots \right)$ \\ + \hline + \end{tabular} +} +% +Here it can be immediately remarked that the `Formula' row has the same +height in both examples. Only the formula lines are affected. The best +layout is obtained with \pack{booktabs}: +% +\compare{% + \begin{tabular}[t]{@{} c @{}} + \toprule + \itshape Formula \\ + \midrule + $\displaystyle + e = 1 + \frac{1}{2} + \frac{1}{6} + \cdots + + \frac{1}{k!} + \cdots $ \\ + $\displaystyle + \pi = 4 \left( 1 - \frac{1}{3} + \frac{1}{5} + \cdots + + \frac{(-1)^k}{2 k + 1} + + \cdots \right)$ \\ + \bottomrule + \end{tabular} +}{% + \begin{tabular}[t]{@{} Sc @{}} + \toprule + \itshape Formula \\ + \midrule + $\displaystyle + e = 1 + \frac{1}{2} + \frac{1}{6} + \cdots + + \frac{1}{k!} + \cdots $ \\ + $\displaystyle + \pi = 4 \left( 1 - \frac{1}{3} + \frac{1}{5} + \cdots + + \frac{(-1)^k}{2 k + 1} + + \cdots \right)$ \\ + \bottomrule + \end{tabular} +} + + +The following example shows that how it works with paragraph columns. +% +\compare{% + \begin{tabular}[t]{p{5cm}} + \hline + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular} +}{% + \begin{tabular}[t]{S{p{5cm}}} + \hline + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular} +} + +\section{Bugs and limitations} + +This package hasn't been heavily tested, so there may be plenty of bugs. +As usual, bugs will certainly arise in complicated situations because +tables can become very complicated (for instance, this package hasn't been +designed with nested tables into mind). In simple cases however, it should +work nicely. The package loads \pack{array} ensuring a peaceful +collaboration with each other. Other packages of special interest haven't +been tested: \pack{tabularx}\footnote{A one minute test seems to indicate + that it works provided \pack{tabularx} is loaded after \pack{cellspace}. + The example on this page illustrates this. A thirty second test +indicates that \pack{cellspace} works correctly with \pack{longtable} as +long as only LR-mode columns are concerned.} and \pack{longtable} in +particular. +% +\begin{trivlist}\item +\begin{tabularx}{\linewidth}{l SX} + \hline + A & B B B B B B B B \\ + A A & B B B B B B B B + B B B B B B B B \\ + A A A A & $\dfrac{1}{2}$B B B B B B B B + B B B B B B B B + B B B B B B B B + B B B B B B B B$\dfrac{1}{2}$ \\ + \hline +\end{tabularx} +\end{trivlist} + +\pack{tabls}\footnote{Thanks to Jim Hefferon for pointing this out.} is a +package that does a similar job than \pack{cellspace}. +The differences are: \pack{tabls} affects a whole table while +\pack{cellspace} affects only the columns on which applies the modifier +\tex{S}. Each cell affected by \pack{cellspace} is affected in the same +way: there must be enough space above ($>\cmd{cellspacetoplimit}$) and +below the text ($>\cmd{cellspacebottomlimit}$), even if no \cmd{hline} is +present. In the other hand, \pack{tabls} ensures a minimal distance using +one threshold parameter \cmd{tablinesep} applying between rows not +separated by a rule and using a systematic spacer \cmd{arraylinesep} when +there is a rule (whereas \pack{cellspace} can leave a cell as is if the +distance to the rule is big enough). As a last point, \pack{tabls}, as +far as I can see, cannot work with \pack{array}. + +\end{document} + +Old documentation: + + + DOCUMENTATION + + Abstract - This package is intended to allow automatic spacing out of + the lines of an array. People often complain about text touching the + \hline of a tabular when it is too high or too deep. For example (with + the amsmath package) a \dfrac{1}{2} surrounded by \hlines touches the + horizontal rules. Spacing out can be achieved through two mechanims + + 1. The optional argument of \\[<dimen>] but <dimen> is not necessarily + added it simply ensures that the distance between two rows will be at + least the normal depth (\dp\@arstrutbox) plus <dimen>. It a cell is + deeper than this value, no spacing is actually done; furthermore even + if some spacing occurs it is not computed according the actual depth, + needing a fine tuning by hand by the user. + + 2. \noalign{\vspace{<dimen>}} that presents the drawback of breaking out + the vertical rules (even though, admittedly, vertical rules are often + overused). Another disadvantage is that it spaces out everytime even + when no spacing is needed. Again, the user has to intervene by hand + and check it out before taking any decision. + + We believe a better solution can be easily provided through a modifier + of normal column types: S (for spacing of course). A column l would be + now be declared Sl, c becomes Sc, r becomes Sr. Special care is needed + for paragraph columns: p{<dimen>} becomes S{p{<dimen>}}, etc. + + What happens is that if the text inside the column has a height that + makes it too close from the top of the cell (more precisely closer than + \cellspacetoplimit) then the height of the cell is increased of + \cellspacetoplimit. Conversely, if the depth of a cell makes it too + close of the bottom of the cell (more precisely closer than + \cellspacebottomlimit), then \cellspacebottomlimit is added to the + actual depth to ensure a minimal spacing. The values of + \cellspace{top,bottom}limit can be changed by + + \setlength{\cellspacetoplimit}{<dimen>} + \setlength{\cellspacebottomlimit}{<dimen>} + + Actually the modifier S acts very differently depending on if it is + working on a LR mode column (l, c, and r) or on a paragraph column + (p{<dimen>}, m{<dimen>}, and b{<dimen>}). If you declare a new column + type and use S with it, S will assume that it is a LR mode column. For + a paragraph column type, use in the preamble + + \addparagraphcolumntypes{<paragraph types>} + + Example file + + \documentclass{article} + + \usepackage{cellspace} + \usepackage{booktabs} + + \begin{document} + + \begin{tabular}[t]{l} + \hline + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular}\quad + \begin{tabular}[t]{Sl} + \hline + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular} + + \vspace*{\stretch{1}} + + \begin{tabular}[t]{l} + \toprule + $\displaystyle \frac{1}{2}$ \\ + \bottomrule + \end{tabular}\quad + \begin{tabular}[t]{Sl} + \toprule + $\displaystyle \frac{1}{2}$ \\ + \bottomrule + \end{tabular} + + \vspace*{\stretch{1}} + + \begin{tabular}[t]{p{5cm}} + \hline + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular}\quad + \begin{tabular}[t]{S{p{5cm}}} + \hline + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \hline + \end{tabular} + + \vspace*{\stretch{1}} + + \begin{tabular}[t]{p{5cm}} + \toprule + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \bottomrule + \end{tabular}\quad + \begin{tabular}[t]{S{p{5cm}}} + \toprule + $\displaystyle \frac{1}{2}$ + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + A A A A A A A A A A A A A A + $\displaystyle \frac{1}{2}$ \\ + \bottomrule + \end{tabular} + + \end{document} diff --git a/Master/texmf-dist/tex/latex/cellspace/cellspace.sty b/Master/texmf-dist/tex/latex/cellspace/cellspace.sty new file mode 100644 index 00000000000..0da49c33eca --- /dev/null +++ b/Master/texmf-dist/tex/latex/cellspace/cellspace.sty @@ -0,0 +1,157 @@ +% (C) 2006 Josselin Noirel +% +% Package cellspace: Ensuring a minimal spacing of table cells. +% +% This material is subject to the LaTeX Project Public License. See +% http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html . +% +\def \@tempa $#1 #2 #3 #4 #5 #6 #7 ${% + \def \filedate {#4}% + \def \fileversion {v#3}% +} +\@tempa $Id: cellspace.sty,v 1.5 2006/03/13 19:28:10 noirel Exp $ + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{cellspace}% + [\filedate \space \fileversion \space Spacing table cells (JN)] + +\RequirePackage{ifthen} % \newboolean, \ifthenelse +\RequirePackage{array} % \newcolumntype, \@{start,end}pbox +\RequirePackage{calc} % \setlength{<dimen>}{<expression>} + +% 2. Check the definitions of \@startpbox and \@endpbox +% from array.sty + +\CheckCommand*{\@startpbox}[1]{% + \bgroup + \setlength\hsize{#1}% + \@arrayparboxrestore + \everypar{% + \vrule \@height \ht\@arstrutbox \@width \z@ + \everypar{}% + }% +} + +\CheckCommand*{\@endpbox}{\@finalstrut\@arstrutbox \egroup\hfil} + +% 3. Declare registers and other variables + +\newboolean{cellspace@lr} % Is it a LR column type ? +\newboolean{cellspace@} % Is it a paragraph column that needs to be + % spaced out? + +\@ifdefinable \cellspacetoplimit {\newdimen \cellspacetoplimit} +\@ifdefinable \cellspacebottomlimit {\newdimen \cellspacebottomlimit} +\@ifdefinable \cellspace@firstht {\newdimen \cellspace@firstht} % Global +\@ifdefinable \cellspace@lastdp {\newdimen \cellspace@lastdp} % Global + +\setlength{\cellspacetoplimit}{1pt} +\setlength{\cellspacebottomlimit}{1pt} + +% 4. Redefinitions + +\renewcommand*{\@startpbox}[1]{% + \bgroup + \setbox \@tempboxa = \vtop \bgroup + \color@begingroup + \setlength{\hsize}{#1}% + \@arrayparboxrestore + % We need to test \ifcellspace@ within the \everypar + % because it is still not set correctly + \everypar{% + \unless \ifcellspace@ + \vrule \@height \ht\@arstrutbox \@width \z@ + \fi + \everypar{}% + }% +} + +\renewcommand*{\@endpbox}{% + \unless \ifcellspace@ + \@finalstrut \@arstrutbox + \fi + \par + % Save the depth of the last line + \global \cellspace@lastdp = \prevdepth + \color@endgroup + % \ifcellspace@ is only locally true, so we need to expand it before + % \egroup stops it action + \expandafter + \egroup + \ifcellspace@ + % Save the height of the first line + \global \cellspace@firstht = \ht\@tempboxa + \setbox \@tempboxa = \vbox {% + \setlength{\@tempdima}{\ht\@arstrutbox - \cellspace@firstht}% + \ifthenelse{\lengthtest{\@tempdima<\cellspacetoplimit}}{% + \setlength{\@tempdima}{\cellspace@firstht + \cellspacetoplimit}% + }{% + \setlength{\@tempdima}{\ht\@arstrutbox}% + }% + \hbox{\vrule height \@tempdima width 0pt depth 0pt }% + \nointerlineskip + \vskip-\cellspace@firstht + \unvbox \@tempboxa + \setlength{\@tempdima}{\dp\@arstrutbox - \cellspace@lastdp}% + \ifthenelse{\lengthtest{\@tempdima<\cellspacebottomlimit}}{% + \setlength{\@tempdima}{\cellspace@lastdp + \cellspacebottomlimit}% + }{% + \setlength{\@tempdima}{\dp\@arstrutbox}% + }% + \vskip-\cellspace@lastdp + \nointerlineskip + \hbox{\vrule height 0pt depth \@tempdima width 0pt }% + }% + \fi + \unvbox \@tempboxa + \egroup + \hfil +} + +\let \@@startpbox = \@startpbox +\let \@@endpbox = \@endpbox + +% 5. Defining a prefix + +\newcolumntype{S}[1]{>{\bcolumn #1\@nil}#1<{\ecolumn}} + +\newcommand*{\bcolumn}{} +\def \bcolumn #1#2\@nil {% + \cellspace@lrtrue + \@expandtwoargs \in@{#1}{\cellspace@parcoltypes}% + \ifin@ + \cellspace@lrfalse + \fi + \ifcellspace@lr + \begingroup \lrbox {\@tempboxa}% + \else + \setboolean{cellspace@}{true}% + \fi +} + +\newcommand*{\ecolumn}{% + \ifcellspace@lr + \endlrbox \endgroup + \setlength{\@tempdima}{\ht\@arstrutbox - \ht\@tempboxa}% + \ifthenelse{\lengthtest{\@tempdima<\cellspacetoplimit}}{% + \setlength{\@tempdima}{\ht\@tempboxa + \cellspacetoplimit}% + \ht\@tempboxa = \@tempdima + }{}% + \setlength{\@tempdima}{\dp\@arstrutbox - \dp\@tempboxa}% + \ifthenelse{\lengthtest{\@tempdima<\cellspacebottomlimit}}{% + \setlength{\@tempdima}{\dp\@tempboxa + \cellspacebottomlimit}% + \dp\@tempboxa = \@tempdima + }{}% + \usebox{\@tempboxa}% + \fi +} + +\newcommand*{\cellspace@parcoltypes}{pmb} + +\newcommand*{\addparagraphcolumntypes}[1]{% + \edef \cellspace@parcoltypes {\cellspace@parcoltypes #1}% +} + +\@onlypreamble \addparagraphcolumntypes + +\endinput diff --git a/Master/texmf-dist/tpm/arev.tpm b/Master/texmf-dist/tpm/arev.tpm index 624b2a46585..6b8eca4c5f2 100644 --- a/Master/texmf-dist/tpm/arev.tpm +++ b/Master/texmf-dist/tpm/arev.tpm @@ -9,9 +9,9 @@ <TPM:Title>The arev package.</TPM:Title> <TPM:Description></TPM:Description> <TPM:Author></TPM:Author> - <TPM:Size>2774698</TPM:Size> + <TPM:Size>2414523</TPM:Size> <TPM:Build/> - <TPM:RunFiles size="1483287"> + <TPM:RunFiles size="1483142"> texmf-dist/fonts/afm/public/arev/ArevSans-Bold.afm texmf-dist/fonts/afm/public/arev/ArevSans-BoldOblique.afm texmf-dist/fonts/afm/public/arev/ArevSans-Oblique.afm diff --git a/Master/texmf-dist/tpm/cellspace.tpm b/Master/texmf-dist/tpm/cellspace.tpm new file mode 100644 index 00000000000..0accc222734 --- /dev/null +++ b/Master/texmf-dist/tpm/cellspace.tpm @@ -0,0 +1,26 @@ +<!DOCTYPE rdf:RDF SYSTEM "../../support/tpm.dtd"> +<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:TPM="http://texlive.dante.de/"> + <rdf:Description about="http://texlive.dante.de/texlive/Package/cellspace.zip"> + <TPM:Name>cellspace</TPM:Name> + <TPM:Type>Package</TPM:Type> + <TPM:Date>2006/03/13 19:30:00</TPM:Date> + <TPM:Version></TPM:Version> + <TPM:Creator>karl</TPM:Creator> + <TPM:Title>The cellspace package.</TPM:Title> + <TPM:Description></TPM:Description> + <TPM:Author></TPM:Author> + <TPM:Size>490958</TPM:Size> + <TPM:Build/> + <TPM:RunFiles size="5546"> +texmf-dist/tex/latex/cellspace/cellspace.sty +texmf-dist/tpm/cellspace.tpm + </TPM:RunFiles> + <TPM:DocFiles size="486349"> +texmf-dist/doc/latex/cellspace/README +texmf-dist/doc/latex/cellspace/cellspace.pdf +texmf-dist/doc/latex/cellspace/cellspace.tex + </TPM:DocFiles> + <TPM:Provides>Package/cellspace</TPM:Provides> + </rdf:Description> +</rdf:RDF> + diff --git a/Master/texmf/lists/cellspace b/Master/texmf/lists/cellspace new file mode 100644 index 00000000000..601544e770b --- /dev/null +++ b/Master/texmf/lists/cellspace @@ -0,0 +1,8 @@ +texmf-dist/doc/latex/cellspace/README +texmf-dist/doc/latex/cellspace/cellspace.pdf +texmf-dist/doc/latex/cellspace/cellspace.tex + +texmf-dist/tex/latex/cellspace/cellspace.sty +texmf-dist/tpm/cellspace.tpm + +texmf/lists/cellspace diff --git a/Master/texmf/tpm/collection-latexextra.tpm b/Master/texmf/tpm/collection-latexextra.tpm index 9974ad9f292..c93886030a6 100644 --- a/Master/texmf/tpm/collection-latexextra.tpm +++ b/Master/texmf/tpm/collection-latexextra.tpm @@ -63,6 +63,7 @@ A large collection of add-on packages for LaTeX. <TPM:Package name="cd"/> <TPM:Package name="cd-cover"/> <TPM:Package name="cdpbundl"/> + <TPM:Package name="cellspace"/> <TPM:Package name="changebar"/> <TPM:Package name="chappg"/> <TPM:Package name="chapterfolder"/> |