From b9e37e869e581a6e88d2add24560dc0fcb7e8e1b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 May 2014 23:15:16 +0000 Subject: flowfram (15may14) git-svn-id: svn://tug.org/texlive/trunk@34048 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/flowfram/flowfram.sty | 27 +++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty index 1671f879eda..d33883457ae 100644 --- a/Master/texmf-dist/tex/latex/flowfram/flowfram.sty +++ b/Master/texmf-dist/tex/latex/flowfram/flowfram.sty @@ -7,7 +7,7 @@ %% flowfram.dtx (with options: `flowfram.sty,package') %% %% flowfram.dtx -%% Copyright 2012 Nicola Talbot +%% Copyright 2014 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{flowfram}[2012/11/10 v1.14 (NLCT)] +\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval} \RequirePackage{graphics} @@ -1423,12 +1423,18 @@ \def\ff@shape{2}% }% {% - \ifx#1\relax - \def\ff@shape{0}% - \else - \PackageError{flowfram}{Unknown shape \string#1}{}% - \def\ff@shape{2}% - \fi + \ifdefequal{#1}{\Shapepar}% + {% + \def\ff@shape{2}% + }% + {% + \ifx#1\relax + \def\ff@shape{0}% + \else + \PackageError{flowfram}{Unknown shape \string#1}{}% + \def\ff@shape{2}% + \fi + }% }% }% } @@ -3352,7 +3358,10 @@ \expandafter\vsize\csname colheight\romannumeral#1\endcsname \global\@colht\vsize \global\@colroom\@colht - \global\linewidth\columnwidth + \ifnum\linewidth>\columnwidth + \global\linewidth\columnwidth + \fi + \global\textwidth\columnwidth \setmargin \fi \stepcounter{displayedframe}% -- cgit v1.2.3