From ba9472aebfed07843bc4faa00c7b96bc86194691 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 4 Oct 2006 08:43:01 +0000 Subject: Fix ctan2tds for pgf installation comment powerdot-doc-vn in tpm-ctan-check, it always breaks Update of the following packages: labelcas pstricks-add sectionbox ltxmisc frenchle flowfram verse emulateapj pst-pdf poemscol babelbib dk-bib breakurl screenplay ncctools xkeyval bibleref muthesis pst-labo pgf ncclatex active-conf xcolor commath lineno dottex makeplo git-svn-id: svn://tug.org/texlive/trunk@2240 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ncctools/nccfloats.sty | 68 ++++++++++++++-------- 1 file changed, 44 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ncctools/nccfloats.sty') diff --git a/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty b/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty index 0f32a39859e..039bf65aa9a 100644 --- a/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty +++ b/Master/texmf-dist/tex/latex/ncctools/nccfloats.sty @@ -20,23 +20,32 @@ %% For the copying and distribution conditions of the source files, %% see the README file distributed with the ncctools bundle. %% -%% File: nccfloats.dtx Copyright (C) 2002--2004 by Alexander I. Rozhenko +%% File: nccfloats.dtx Copyright (C) 2002--2006 by Alexander I. Rozhenko %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nccfloats} - [2004/12/05 v1.1 More Float Management (NCC)] + [2006/01/07 v1.2 More Float Management (NCC)] \RequirePackage{nccboxes}[2002/03/20] -\newcommand*{\FloatStyle}[1]{\def\NCC@fltstyle{#1}} +\newcommand*{\FloatStyle}[2][]{% + \expandafter\def\csname NCC@fltstyle@#1\endcsname{#2}} \@onlypreamble\FloatStyle -\newcommand{\minifig}{\begingroup\def\@captype{figure}\NCC@minifloat} -\newcommand{\minitabl}{\begingroup\def\@captype{table}\NCC@minifloat} +\def\NCC@setfltstyle#1{% + \edef\@tempa{NCC@fltstyle@#1\@captype}% + \@ifundefined{\@tempa}{\NCC@fltstyle@}{\csname\@tempa\endcsname}% +} +\g@addto@macro\@floatboxreset{\NCC@setfltstyle{}} +\newcommand\normalfloatstyle{% + \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip + \parfillskip\@flushglue \let\\\@normalcr + \reset@font \normalsize +} \newcommand*\NCC@minifloat[1][c]{% \@ifnextchar[{\NCC@mflt{#1}}{\NCC@@mflt{#1}\relax[s]}} \def\NCC@mflt#1[#2]{% \@ifnextchar[{\NCC@@mflt{#1}{#2}}{\NCC@mflt{#1}{#2}[#1]}} \long\def\NCC@@mflt#1#2[#3]#4#5{% - \@iiiminipage{#1}{#2}[#3]{#4}\normalfont - \NCC@fltstyle #5\endminipage\endgroup + \@iiiminipage{#1}{#2}[#3]{#4}\normalfloatstyle + \NCC@setfltstyle{mini}#5\endminipage\endgroup } \def\NCC@pair#1#2#3#4{\setlength\@tempdimc{#3}% \@ifstar{\NCC@pair@{#2}{#4}}{\NCC@pair@{#1}{#4}}} @@ -45,10 +54,7 @@ \@ifnextchar({\NCC@pair@@@}{\NCC@@pair()()}} \def\NCC@pair@@@(#1){\@ifnextchar({\NCC@@pair(#1)}{\NCC@@pair(#1)()}} \def\NCC@@pair(#1)(#2){\@tempa{#1}{#2}} -\def\NCC@setwidth#1#2{% - \afterassignment\NCC@setwidth@#1#2\unitlength\relax -} -\def\NCC@setwidth@#1\relax{} +\def\NCC@setwidth#1#2{\@defaultunits#1#2\unitlength\relax\@nnil} \def\NCC@wcalc#1#2{% \if!#1!\@tempdima .5\linewidth \advance\@tempdima -.5\@tempdimc \else \NCC@setwidth\@tempdima{#1}% @@ -68,8 +74,6 @@ \expandafter\@secondoftwo \fi } -\newcommand{\sidefig}{\NCC@sidemfloat{\minifig}} -\newcommand{\sidetabl}{\NCC@sidemfloat{\minitabl}} \def\NCC@sidemfloat#1{% \NCC@smfltleftfalse \if@twocolumn \else @@ -115,29 +119,45 @@ \@tempdima\ht\@tempboxa \advance\@tempdima -\ht\strutbox \noindent \raise-\@tempdima\box\@tempboxa } -\newcommand{\fig}{\NCC@float{figure}} -\newcommand{\tabl}{\NCC@float{table}} -\def\NCC@float#1{\@ifstar{\NCC@flt{#1*}}{\NCC@flt{#1}}} -\def\NCC@flt#1{\@ifnextchar[{\NCC@flt@{#1}}{\NCC@flt@{#1}[ht]}} -\def\NCC@flt@#1[#2]{\begin{#1}[#2]\centering +\def\NCC@float#1#2{\@ifstar{\NCC@flt{#1*}{#2}}{\NCC@flt{#1}{#2}}} +\def\NCC@flt#1#2{\@ifnextchar[{\NCC@flt@{#1}}{\NCC@flt@{#1}[#2]}} +\def\NCC@flt@#1[#2]{\begin{#1}[#2]\normalfloatstyle\centering \@ifnextchar({\NCC@@flt{#1}}{\NCC@@flt{#1}()}} \long\def\NCC@@flt#1(#2)#3{% \if!#2!\@tempdima\linewidth \else \NCC@setwidth\@tempdima{#2}\fi \begingroup\NCC@minifloat[c]\@tempdima{#3}% \end{#1}% } -\newcommand{\figs}{\NCC@floats{figure}b} -\newcommand{\tabls}{\NCC@floats{table}t} -\def\NCC@floats#1#2{% - \NCC@pair{\NCC@@flts{#1}{#2}}{\NCC@@flts{#1*}{#2}}{1em}{ht}} +\def\NCC@floats#1#2#3{% + \NCC@pair{\NCC@@flts{#1}{#2}}{\NCC@@flts{#1*}{#2}}{1em}{#3}} \long\def\NCC@@flts#1#2#3#4#5#6#7{% - \begin{#1}[#3]\NCC@wcalc{#4}{#5}% + \begin{#1}[#3]\normalfloatstyle\NCC@wcalc{#4}{#5}% \begingroup\NCC@minifloat[#2]\@tempdima{#6}% \nobreak\hskip\@tempdimc \begingroup\NCC@minifloat[#2]\@tempdimb{#7}% \end{#1}% } -\FloatStyle{\footnotesize\centering} +\newcommand*\newminifloat[4]{% + \edef\@tempa{% + \noexpand\newcommand\expandafter\noexpand\csname mini#1\endcsname{% + \noexpand\begingroup\noexpand\def\noexpand\@captype{#2}% + \noexpand\NCC@minifloat}% + \noexpand\newcommand\expandafter\noexpand\csname side#1\endcsname{% + \noexpand\NCC@sidemfloat{% + \expandafter\noexpand\csname mini#1\endcsname}}% + \noexpand\newcommand\expandafter\noexpand\csname #1\endcsname{% + \noexpand\NCC@float{#2}{#3}}% + \noexpand\newcommand\expandafter\noexpand\csname #1s\endcsname{% + \noexpand\NCC@floats{#2}{#4}{#3}}% + }% + \@tempa +} +\@onlypreamble\newminifloat +\newminifloat{fig}{figure}{ht}{b} +\newminifloat{tabl}{table}{ht}{t} +\FloatStyle{} +\FloatStyle[minifigure]{\footnotesize\centering} +\FloatStyle[minitable]{\footnotesize\centering} \endinput %% %% End of file `nccfloats.sty'. -- cgit v1.2.3