From f447358254eabcd074466b1b9b935c9e4423c9fe Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Mar 2010 01:05:42 +0000 Subject: ftcap doc update, own package (1mar10) git-svn-id: svn://tug.org/texlive/trunk@17275 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ftcap/ftcap.pdf | Bin 0 -> 217041 bytes Master/texmf-dist/doc/latex/ftcap/ftcap.tex | 128 +++++++++ Master/texmf-dist/tex/latex/ftcap/ftcap.sty | 75 +++++ Master/texmf-dist/tex/latex/ltxmisc/framed.sty | 352 ----------------------- Master/texmf-dist/tex/latex/ltxmisc/ftcap.sty | 75 ----- Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 + Master/tlpkg/tlpsrc/ftcap.tlpsrc | 0 8 files changed, 205 insertions(+), 428 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/ftcap/ftcap.pdf create mode 100644 Master/texmf-dist/doc/latex/ftcap/ftcap.tex create mode 100644 Master/texmf-dist/tex/latex/ftcap/ftcap.sty delete mode 100644 Master/texmf-dist/tex/latex/ltxmisc/framed.sty delete mode 100644 Master/texmf-dist/tex/latex/ltxmisc/ftcap.sty create mode 100644 Master/tlpkg/tlpsrc/ftcap.tlpsrc (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ftcap/ftcap.pdf b/Master/texmf-dist/doc/latex/ftcap/ftcap.pdf new file mode 100644 index 00000000000..c4f3e069b83 Binary files /dev/null and b/Master/texmf-dist/doc/latex/ftcap/ftcap.pdf differ diff --git a/Master/texmf-dist/doc/latex/ftcap/ftcap.tex b/Master/texmf-dist/doc/latex/ftcap/ftcap.tex new file mode 100644 index 00000000000..8dffc900b44 --- /dev/null +++ b/Master/texmf-dist/doc/latex/ftcap/ftcap.tex @@ -0,0 +1,128 @@ +\documentclass[german, american, parskip=half, pagesize=auto]{scrartcl} + +\usepackage{fixltx2e} +\usepackage{etex} +\usepackage{xspace} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage{babel} +\usepackage[svgnames]{xcolor} +\usepackage{listings} +\usepackage{microtype} +\usepackage{hyperref} + +\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\env}[1]{\texttt{#1}} + +\addtokomafont{title}{\rmfamily} + +\lstset{% + language=[LaTeX]TeX,% + columns=fullflexible,% + numbers=left,% + basicstyle=\ttfamily,% + keywordstyle=\color{Navy},% + commentstyle=\color{DimGray},% + numberstyle=\footnotesize\color{SlateGray}% +} + +\title{The \pkg{ftcap} package} +\author{Hans Friedrich Steffani\\\mail{hans.steffani@e-technik.tu-chemnitz.de}} +\date{1999/10/16} + + +\begin{document} + +\maketitle + +\begin{quote} + \footnotesize + Copyright \textcopyright\ 1999 Hans Friedrich Steffani + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\@. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING\@. If not, write to + the Free Software Foundation, Inc., 59 Temple Place~-- Suite 330, + Boston, MA 02111--1307, USA. +\end{quote} + + +\noindent +Lamport places the \verb|\caption| below tables and figures. That is ok +for figures but not for tables, as tables may be longer than one +page. In this case the reader has to search for the \verb|\caption| +until he finds it after a couple of pages. If you have the +\verb|\caption| at the top of the table there is no such problem. +And as the \verb|\caption| of a table should always be at the same place, +we have to place the \verb|\caption| \emph{always} at the top of +the table If you want \verb|\caption| above tabular, you cannot +use the normal \verb|\caption|, because the spaces above and below +\verb|\caption| are wrong. Some stys (e.\,g. \pkg{topcapt.sty}) recommend +to have a special makro like \verb|\topcaption| for captions above +an object. I prefer to have ONE caption and changing the spaces +whenever we are within a \env{table} environment. That's what this sty +does. + +\begin{otherlanguage}{german} + Lamport plaziert seine \verb|\caption| ueber Tabellen und Bildern. + Bei Bildern ist das ok. Bei mehrseitigen Tabellen muss man + allerdings nach der \verb|\caption| suchen, so dass es guenstiger + erscheint, die \verb|\caption| \emph{oberhalb} der Tabelle zu + setzen. Und das sollte natuerlich um der Einheitlichkeit willen + dann auch bei kuerzeren Tabellen so sein. + Wenn die \verb|\caption| bei Tabellen ueber der Tabelle, bei + Bildern aber daruntersteht, braucht man verschiedene Werte fuer + \verb|\abovecaptionskip| und \verb|\belowcaptionskip|. + Gelegentlich werden dazu zwei makros, \verb|\tablecaption| und + \verb|\figurecaption| oder auch \verb|\topcaption| vorgeschlagen, + aber das finde ich umstaendlich und fehleranfaellig. + \verb|\caption| ist \verb|\caption| und der Nutzer soll sich nicht + um Details kuemmern. Daher also: +\end{otherlanguage} + +\begin{lstlisting} +% from book.cls +%% \renewenvironment{figure} +%% {\@float{figure}} +%% {\end@float} + +%% \newenvironment{table} +%% {\@float{table}} +%% {\end@float} + +\newcommand{\@ldtable}{} +\let\@ldtable\table +\renewcommand{\table}{% + \setlength{\@tempdima}{\abovecaptionskip}% + \setlength{\abovecaptionskip}{\belowcaptionskip}% + \setlength{\belowcaptionskip}{\@tempdima}% + \@ldtable}% +\end{lstlisting} + + +\section*{List of Changes} + +\begin{otherlanguage}{german} + \begin{labeling}[\hspace{\labelsep}--]{Version: 1.4} + \item[Version: 1.4] Die optionalen Parameter von \env{table} sollten nun gehen + \item[Version: 1.3] Einige Versuche rueckgaengig gemacht + \item[Version: 1.2] Es heisst nun \verb|\ProvidesPackage{ftcap}| ohne \verb|sty|\\ + ausserdem stimmt das Datum + \item[Version: 1.1] + \end{labeling} +\end{otherlanguage} + + + +\end{document} diff --git a/Master/texmf-dist/tex/latex/ftcap/ftcap.sty b/Master/texmf-dist/tex/latex/ftcap/ftcap.sty new file mode 100644 index 00000000000..a9d190486f1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ftcap/ftcap.sty @@ -0,0 +1,75 @@ +% hans.steffani@e-technik.tu-chemnitz.de (Hans Friedrich Steffani) +% Copyright (C) 1999 Hans Friedrich Steffani + +% This program is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation; either version 2 of the License, or +% (at your option) any later version. + +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. + +% You should have received a copy of the GNU General Public License +% along with this program; see the file COPYING. If not, write to +% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +% Boston, MA 02111-1307, USA. + + + +% Version: 1.4 Die optionalen Parameter von table sollten nun gehen +% Version: 1.3 Einige Versuche rueckgaengig gemacht +% Version: 1.2 Es heisst nun \ProvidesPackage{ftcap} ohne sty +% ausserdem stimmt das Datum +% Version: 1.1 + + +\ProvidesPackage{ftcap}[1999/10/16 ..captionskip richtig setzen] + +% Lamport places the \caption below tables and figures. That is ok +% for figures but not for tables, as tables may be longer than one +% page. In this case the reader has to search for the \verb|\caption| +% until he finds it after a couple of pages. If you have the +% \verb|\caption| at the top of the table there is no such problem. +% And as the \caption of a table should always be at the same place, +% we have to place the \verb|\caption| \emph{always} at the top of +% the table If you want \verb|\caption| above tabular, you cannot +% use the normal \verb|\caption|, because the spaces above and below +% \verb|\caption| are wrong. Some stys (e.g. topcapt.sty) recommend +% to have a special makro like \verb|\topcaption| for captions above +% an object. I prefer to have ONE caption and changing the spaces +% whenever we are within a table environment. That's what this sty +% does. + +% Lamport plaziert seine \verb|\caption| ueber Tabellen und Bildern. +% Bei Bildern ist das ok. Bei mehrseitigen Tabellen muss man +% allerdings nach der \verb|\caption| suchen, so dass es guenstiger +% erscheint, die \verb|\caption| \emph{oberhalb} der Tabelle zu +% setzen. Und das sollte natuerlich um der Einheitlichkeit willen +% dann auch bei kuerzeren Tabellen so sein. +% Wenn die \verb|\caption| bei Tabellen ueber der Tabelle, bei +% Bildern aber daruntersteht, braucht man verschiedene Werte fuer +% \verb|\abovecaptionskip| und \verb|\belowcaptionskip|. +% Gelegentlich werden dazu zwei makros, \verb|\tablecaption und +% \verb|\figurecaption| oder auch \verb|\topcaption| vorgeschlagen, +% aber das finde ich umstaendlich und fehleranfaellig. +% \verb|\caption| ist \verb|\caption| und der Nutzer soll sich nicht +% um Details kuemmern. Daher also: + +% from book.cls +%% \renewenvironment{figure} +%% {\@float{figure}} +%% {\end@float} + +%% \newenvironment{table} +%% {\@float{table}} +%% {\end@float} + +\newcommand{\@ldtable}{} +\let\@ldtable\table +\renewcommand{\table}{% + \setlength{\@tempdima}{\abovecaptionskip}% + \setlength{\abovecaptionskip}{\belowcaptionskip}% + \setlength{\belowcaptionskip}{\@tempdima}% + \@ldtable}% diff --git a/Master/texmf-dist/tex/latex/ltxmisc/framed.sty b/Master/texmf-dist/tex/latex/ltxmisc/framed.sty deleted file mode 100644 index 82081cee07b..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/framed.sty +++ /dev/null @@ -1,352 +0,0 @@ -% framed.sty v 0.95 2007/10/04 -% Copyright (C) 1992-2007 by Donald Arseneau (asnd@triumf.ca) -% These macros may be freely transmitted, reproduced, or modified -% provided that this notice is left intact. -% -%====================== Begin Instructions ======================= -% -% framed.sty -% ~~~~~~~~~~ -% Create framed, shaded, or differently highlighted regions that can -% break across pages. The environments defined are -% framed -- ordinary frame box (\fbox) with edge at margin -% shaded -- shaded background (\colorbox) bleeding into margin -% snugshade -- similar -% leftbar -- thick vertical line in left margin -% to be used like -% \begin{framed} -% copious text -% \end{framed} -% -% But the more general purpose of this package is to facilitate the -% creation of environments that enable page breaking -% within arbitrary decorations using a simple new-environment definition -% incorporating \FrameCommand and -% \begin{MakeFramed}{settings} ... \end{MakeFramed} -% -% The "framed" environment uses "\fbox" as its "\FrameCommand" with -% the additional settings \fboxrule=\FrameRule and \fboxsep=\FrameSep. -% You can change these lengths (using \setlength) and you can change -% the definition of \FrameCommand to use much fancier boxes. -% -% In fact, the "shaded" environment just redefines \FrameCommand to be -% \colorbox{shadecolor} (and you have to define the color "shadecolor": -% \definecolor{shadecolor}...). -% -% A page break is allowed, and even encouraged, before the framed -% environment. If you want to attach some text (a box title) to the -% frame, then the text should be inserted by \FrameCommand. -% -% The contents of the framed regions are restricted: -% Floats, footnotes, marginpars and head-line entries will be lost. -% (Some of these may be handled in a later version.) -% This package will not work with the page breaking of multicol.sty, -% or other systems that perform column-balancing. -% -% The MakeFramed environment does the work. Its "settings" argument -% should contain any adjustments to the text width (applied to \hsize, -% and using the "\width" of the frame itself) as well as a "restore" -% command -- \@parboxrestore or \FrameRestore or something similar; -% as an example, the snugshade environment shows how to suppress excess -% spacing within the box, copying the code from minipage. -% -% Expert commands: -% \MakeFramed, \endMakeFramed: the "MakeFramed" environment -% \FrameCommand: command to draw the frame around its argument -% \FrameRestore: restore some text settings, but fewer than \@parboxrestore -% \FrameRule: length register; \fboxrule for default "framed". -% \FrameSep: length register; \fboxsep for default "framed". -% \FrameHeightAdjust: macro; height of frame above baseline at top of page -% -% This is still a `pre-production' version because I can think of many -% features/improvements that should be made. Nevertheless, starting -% with version 0.5 it should be bug-free. -% -% ToDo: -% Test more varieties of list -% Improve and correct documentation -% Propagation of \marks -% Handle footnotes (how??) floats (?) and marginpars. -% Stretchability modification. -%======================== End Instructions ======================== - -\ProvidesPackage{framed}[2007/10/04 v 0.95: - framed or shaded text with page breaks] - -\newenvironment{framed}% using default \FrameCommand - {\MakeFramed {\advance\hsize-\width \FrameRestore}}% - {\endMakeFramed} - -\newenvironment{shaded}{% - \def\FrameCommand{\fboxsep=\FrameSep \colorbox{shadecolor}}% - \MakeFramed {\FrameRestore}}% - {\endMakeFramed} - -\newenvironment{leftbar}{% - \def\FrameCommand{\vrule width 3pt \hspace{10pt}}% - \MakeFramed {\advance\hsize-\width \FrameRestore}}% - {\endMakeFramed} - -\newenvironment{snugshade}{% - \def\FrameCommand{\colorbox{shadecolor}}% - \MakeFramed {\FrameRestore\@setminipage}}% - {\par\unskip\endMakeFramed} - -\chardef\FrameRestore=\catcode`\| % for debug -\catcode`\|=\catcode`\% % (debug: insert space after backslash) - -\def\MakeFramed#1{\par - % measure added width and height; call result \width and \height - \fb@sizeofframe\FrameCommand - \let\width\fb@frw \let\height\fb@frh - % insert pre-penalties and skips - \begingroup - \skip@\lastskip - \if@nobreak\else - \penalty9999 % updates \page parameters - \ifdim\pagefilstretch=\z@ \ifdim\pagefillstretch=\z@ - % not infinitely stretchable, so encourage a page break here - \edef\@tempa{\the\skip@}% - \ifx\@tempa\zero@glue \penalty-30 - \else \vskip-\skip@ \penalty-30 \vskip\skip@ - \fi\fi\fi - \penalty\z@ - % Give a stretchy breakpoint that will always be taken in preference - % to the \penalty 9999 used to update page parameters. The cube root - % of 10000/100 indicates a multiplier of 0.21545, but the maximum - % calculated badness is really 8192, not 10000, so the multiplier - % is 0.2301. - \advance\skip@ \z@ plus-.5\baselineskip - \advance\skip@ \z@ plus-.231\height - \advance\skip@ \z@ plus-.231\skip@ - \advance\skip@ \z@ plus-.231\topsep - \vskip-\skip@ \penalty 1800 \vskip\skip@ - \fi - \addvspace{\topsep}% - \endgroup - % clear out pending page break - \penalty\@M \vskip 2\baselineskip \vskip\height - \penalty9999 \vskip -2\baselineskip \vskip-\height - \penalty9999 % updates \pagetotal -|\message{After clearout, \pagetotal=\the\pagetotal, \pagegoal=\the\pagegoal. }% - \fb@adjheight - \setbox\@tempboxa\vbox\bgroup - #1% Modifications to \hsize (can use \width and \height) - \textwidth\hsize \columnwidth\hsize -} - -\def\endMakeFramed{\par - \kern\z@ - \hrule\@width\hsize\@height\z@ - \penalty-100 % put depth into height - \egroup - % {\showoutput\showbox\@tempboxa}% - \begingroup - \fb@put@frame\FrameCommand\FirstFrameCommand - \endgroup -} - -% \fb@put@frame takes the contents of \@tempboxa and puts all, or a piece, -% of it on the page with a frame (\FrameCommand, \FirstFrameCommand, -% \MidFrameCommand, or \LastFrameCommand). It recurses until all of -% \@tempboxa has been used up. (\@tempboxa must have zero depth.) -% #1 = attempted framing command, if no split -% #2 = framing command if split -% First iteration: Try to fit with \FrameCommand. If it does not fit, -% split for \FirstFrameCommand. -% Later iteration: Try to fit with \LastFrameCommand. If it does not -% fit, split for \MidFrameCommand. -\def\fb@put@frame#1#2{\relax - \ifdim\pagegoal=\maxdimen \pagegoal\vsize \fi -| \message{=============== Entering putframe ====================^^J -| \pagegoal=\the\pagegoal, \pagetotal=\the\pagetotal. }% - \ifinner - \fb@putboxa#1% - \fb@afterframe - \else - \dimen@\pagegoal \advance\dimen@-\pagetotal % natural space left on page - \ifdim\dimen@<2\baselineskip % Too little room on page -| \message{Page has only \the\dimen@\space room left; eject. }% - \eject \fb@adjheight \fb@put@frame#1#2% - \else % there's appreciable room left on the page - \fb@sizeofframe#1% -| \message{\string\pagetotal=\the\pagetotal, -| \string\pagegoal=\the\pagegoal, -| \string\pagestretch=\the\pagestretch, -| \string\pageshrink=\the\pageshrink, -| \string\fb@frh=\fb@frh. \space} -| \message{Box of size \the\ht\@tempboxa\space + \fb@frh}% - \begingroup % temporarily set \dimen@ to be... - \advance\dimen@.8\pageshrink % maximum space available on page - \advance\dimen@-\fb@frh\relax % space available for frame's contents - \expandafter\endgroup - % expand \ifdim, then restore \dimen@ to real room left on page - \ifdim\dimen@>\ht\@tempboxa % whole box does fit -| \message{fits in \the\dimen@. }% - % Use vsplit anyway to capture the marks - % !!!???!!! MERGE THIS WITH THE else CLAUSE!!! - \fb@putboxa#1% - \fb@afterframe - \else % box must be split -| \message{must be split to fit in \the\dimen@. }% - % update frame measurement to use \FirstFrameCommand or \MidFrameCommand - \fb@sizeofframe#2% - \setbox\@tempboxa\vbox{% simulate frame and flexiblity of the page: - \vskip \fb@frh \@plus\pagestretch \@minus.8\pageshrink - \kern137sp\kern-137sp\penalty-30 - \unvbox\@tempboxa}% - \edef\fb@resto@set{\boxmaxdepth\the\boxmaxdepth - \splittopskip\the\splittopskip}% - \boxmaxdepth\z@ \splittopskip\z@ -| \message{Padded box of size \the\ht\@tempboxa\space split to \the\dimen@}% - % Split box here - \setbox\tw@\vsplit\@tempboxa to\dimen@ -| \toks99\expandafter{\splitfirstmark}% -| \toks98\expandafter{\splitbotmark}% -| \message{Marks are: \the\toks99, \the\toks98. }% - \setbox\tw@\vbox{\unvbox\tw@}% natural-sized -| \message{Natural height of split box is \the\ht\tw@, leaving -| \the\ht\@tempboxa\space remainder. }% - % If the split-to size > (\vsize-\topskip), then set box to full size - \begingroup - \advance\dimen@\topskip - \expandafter\endgroup - \ifdim\dimen@>\pagegoal -| \message{Frame is big -- Use up the full column. }% - \dimen@ii\pagegoal - \advance\dimen@ii -\topskip - \advance\dimen@ii \FrameHeightAdjust\relax - \else % suspect this is wrong: - % If the split-to size > feasible room_on_page, rebox it smaller. - \advance\dimen@.8\pageshrink - \ifdim\ht\tw@>\dimen@ -| \message{Box too tall; rebox it to \the\dimen@. }% - \dimen@ii\dimen@ - \else % use natural size - \dimen@ii\ht\tw@ - \fi - \fi - % Re-box contents to desired size \dimen@ii - \advance\dimen@ii -\fb@frh - \setbox\tw@\vbox to\dimen@ii \bgroup - % remove simulated frame and page flexibility: - \vskip -\fb@frh \@plus-\pagestretch \@minus-.8\pageshrink - \unvbox\tw@ \unpenalty\unpenalty - \ifdim\lastkern=-137sp % whole box went to next page -| \message{box split at beginning! }% - % need work here??? - \egroup \fb@resto@set \eject % (\vskip for frame size was discarded) - \fb@adjheight - \fb@put@frame#1#2% INSERTED ??? - \else % Got material split off at the head - \egroup \fb@resto@set - \ifvoid\@tempboxa % it all fit after all -| \message{box split at end! }% - \setbox\@tempboxa\box\tw@ - \fb@putboxa#1% - \fb@afterframe - \else % it really did split -| \message{box split as expected. Its reboxed height is \the\ht\tw@. }% - \ifdim\wd\tw@>\z@ - \wd\tw@\wd\@tempboxa - \centerline{#2{\box\tw@}}% ??? \centerline bad idea - \else -| \message{Zero width means likely blank. Don't frame it (guess)}% - \box\tw@ - \fi - \hrule \@height\z@ \@width\hsize - \eject - \fb@adjheight - \fb@put@frame\LastFrameCommand\MidFrameCommand - \fi\fi\fi\fi\fi -} - -\def\fb@putboxa#1{% - \ifvoid\@tempboxa - PackageWarning{framed}{Boxa is void -- discard it. }% - \else -| \message{Frame and place boxa. }% -| %{\showoutput\showbox\@tempboxa}% - \centerline{#1{\box\@tempboxa}}% - \fi -} - -\def\fb@afterframe{% - \nointerlineskip \null %{\showoutput \showlists} - \penalty-30 \vskip\topsep \relax -} - -% measure width and height added by frame (#1 = frame command) -% call results \fb@frw and \fb@frh -\newdimen\fb@frw -\newdimen\fb@frh -\def\fb@sizeofframe#1{\begingroup - \setbox\z@\vbox{\vskip-5in \hbox{\hskip-5in - #1{\hbox{\vrule \@height 4.7in \@depth.3in \@width 5in}}}% - \vskip\z@skip}% -| \message{Measuring frame addition for \string#1 in \@currenvir\space -| gives ht \the\ht\z@\space and wd \the\wd\z@. }% -%{\showoutput\showbox\z@}% - \global\fb@frw\wd\z@ \global\fb@frh\ht\z@ - \endgroup -} - -\def\fb@adjheight{% - \vbox to\FrameHeightAdjust{}% get proper baseline skip from above. - \penalty\@M \nointerlineskip - \vskip-\FrameHeightAdjust - \penalty\@M} % useful for tops of pages - -\edef\zero@glue{\the\z@skip} - -\catcode`\|=\FrameRestore - -% Provide configuration commands: -\providecommand\FrameCommand{% - \setlength\fboxrule{\FrameRule}\setlength\fboxsep{\FrameSep}% - \fbox} -\@ifundefined{FrameRule}{\newdimen\FrameRule \FrameRule=\fboxrule}{} -\@ifundefined{FrameSep} {\newdimen\FrameSep \FrameSep =3\fboxsep}{} -\providecommand\FirstFrameCommand{\FrameCommand} -\providecommand\MidFrameCommand{\FrameCommand} -\providecommand\LastFrameCommand{\FrameCommand} - -% Height of frame above first baseline when frame starts a page: -\providecommand\FrameHeightAdjust{6pt} - -% \FrameRestore has parts of \@parboxrestore, performing a similar but -% less complete restoration of a default layouy. See how it is used in the -% "settings" argument of \MakeFrame. Though not a parameter, \hsize -% should be set to the desired total line width available inside the -% frame before invoking \FrameRestore. -\def\FrameRestore{% - \let\if@nobreak\iffalse - \let\if@noskipsec\iffalse - \let\-\@dischyph - \let\'\@acci\let\`\@accii\let\=\@acciii - % \message{FrameRestore: - % \@totalleftmargin=\the \@totalleftmargin, - % \rightmargin=\the\rightmargin, - % \@listdepth=\the\@listdepth. }% - % Test if we are in a list (or list-like paragraph) - \ifnum \ifdim\@totalleftmargin>\z@ 1\fi - \ifdim\rightmargin>\z@ 1\fi - \ifnum\@listdepth>0 1\fi 0>\z@ - % \message{In a list: \linewidth=\the\linewidth, \@totalleftmargin=\the\@totalleftmargin, - % \parshape=\the\parshape, \columnwidth=\the\columnwidth, \hsize=\the\hsize, - % \labelwidth=\the\labelwidth. }% - \@setminipage % snug fit around the item - % Now try to propageate changes of width from \hsize to list parameters. - % This is deficient, but a more advanced way to indicate modification to text - % dimensions is not (yet) provided; in particular, no separate left/right - % adjustment. - \advance\linewidth-\columnwidth \advance\linewidth\hsize - \parshape\@ne \@totalleftmargin \linewidth - \else % Not in list - \linewidth=\hsize - %\message{No list, set \string\linewidth=\the\hsize. }% - \fi - \sloppy -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/ltxmisc/ftcap.sty b/Master/texmf-dist/tex/latex/ltxmisc/ftcap.sty deleted file mode 100644 index a9d190486f1..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/ftcap.sty +++ /dev/null @@ -1,75 +0,0 @@ -% hans.steffani@e-technik.tu-chemnitz.de (Hans Friedrich Steffani) -% Copyright (C) 1999 Hans Friedrich Steffani - -% This program is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. - -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. - -% You should have received a copy of the GNU General Public License -% along with this program; see the file COPYING. If not, write to -% the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. - - - -% Version: 1.4 Die optionalen Parameter von table sollten nun gehen -% Version: 1.3 Einige Versuche rueckgaengig gemacht -% Version: 1.2 Es heisst nun \ProvidesPackage{ftcap} ohne sty -% ausserdem stimmt das Datum -% Version: 1.1 - - -\ProvidesPackage{ftcap}[1999/10/16 ..captionskip richtig setzen] - -% Lamport places the \caption below tables and figures. That is ok -% for figures but not for tables, as tables may be longer than one -% page. In this case the reader has to search for the \verb|\caption| -% until he finds it after a couple of pages. If you have the -% \verb|\caption| at the top of the table there is no such problem. -% And as the \caption of a table should always be at the same place, -% we have to place the \verb|\caption| \emph{always} at the top of -% the table If you want \verb|\caption| above tabular, you cannot -% use the normal \verb|\caption|, because the spaces above and below -% \verb|\caption| are wrong. Some stys (e.g. topcapt.sty) recommend -% to have a special makro like \verb|\topcaption| for captions above -% an object. I prefer to have ONE caption and changing the spaces -% whenever we are within a table environment. That's what this sty -% does. - -% Lamport plaziert seine \verb|\caption| ueber Tabellen und Bildern. -% Bei Bildern ist das ok. Bei mehrseitigen Tabellen muss man -% allerdings nach der \verb|\caption| suchen, so dass es guenstiger -% erscheint, die \verb|\caption| \emph{oberhalb} der Tabelle zu -% setzen. Und das sollte natuerlich um der Einheitlichkeit willen -% dann auch bei kuerzeren Tabellen so sein. -% Wenn die \verb|\caption| bei Tabellen ueber der Tabelle, bei -% Bildern aber daruntersteht, braucht man verschiedene Werte fuer -% \verb|\abovecaptionskip| und \verb|\belowcaptionskip|. -% Gelegentlich werden dazu zwei makros, \verb|\tablecaption und -% \verb|\figurecaption| oder auch \verb|\topcaption| vorgeschlagen, -% aber das finde ich umstaendlich und fehleranfaellig. -% \verb|\caption| ist \verb|\caption| und der Nutzer soll sich nicht -% um Details kuemmern. Daher also: - -% from book.cls -%% \renewenvironment{figure} -%% {\@float{figure}} -%% {\end@float} - -%% \newenvironment{table} -%% {\@float{table}} -%% {\end@float} - -\newcommand{\@ldtable}{} -\let\@ldtable\table -\renewcommand{\table}{% - \setlength{\@tempdima}{\abovecaptionskip}% - \setlength{\abovecaptionskip}{\belowcaptionskip}% - \setlength{\belowcaptionskip}{\@tempdima}% - \@ldtable}% diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 6ff72888dee..0efa304c89c 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -130,7 +130,7 @@ my @TLP_working = qw( fouridx fourier fouriernc fp fpl fragmaster fragments framed frankenstein frcursive free-math-font-survey - frenchle fribrief frletter frontespizio ftnxtra + frenchle fribrief frletter frontespizio ftcap ftnxtra fullblck fullpict functan gaceta galois garrigues gastex gatech-thesis gb4e gcard gchords gcite gene-logic diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index c6505df0431..30f420fb1b6 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -237,6 +237,7 @@ depend formlett depend formular depend fragments depend frankenstein +depend ftcap depend ftnxtra depend fribrief depend fullblck diff --git a/Master/tlpkg/tlpsrc/ftcap.tlpsrc b/Master/tlpkg/tlpsrc/ftcap.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3