summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-15 23:15:16 +0000
committerKarl Berry <karl@freefriends.org>2014-05-15 23:15:16 +0000
commitb9e37e869e581a6e88d2add24560dc0fcb7e8e1b (patch)
tree4e66b68db87069e905a07dc6f44f7ca083322886
parent5163dadf8cc6f05bed4163095af39bf5a4c260ac (diff)
flowfram (15may14)
git-svn-id: svn://tug.org/texlive/trunk@34048 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/CHANGES7
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/README8
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdfbin298953 -> 299967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex28
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/flowfram.pdfbin524458 -> 525444 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdfbin163034 -> 163035 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdfbin101902 -> 101913 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdfbin47959 -> 48208 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdfbin52810 -> 52822 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdfbin136327 -> 136400 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdfbin91415 -> 91427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdfbin54583 -> 54582 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample.pdfbin100462 -> 100471 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdfbin151242 -> 151306 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdfbin142705 -> 139363 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdfbin46648 -> 46660 bytes
-rw-r--r--Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdfbin31645 -> 31646 bytes
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.dtx51
-rw-r--r--Master/texmf-dist/source/latex/flowfram/flowfram.ins4
-rw-r--r--Master/texmf-dist/tex/latex/flowfram/flowfram.sty27
20 files changed, 83 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/latex/flowfram/CHANGES b/Master/texmf-dist/doc/latex/flowfram/CHANGES
index 9b2069d7880..ec707b7e32e 100644
--- a/Master/texmf-dist/doc/latex/flowfram/CHANGES
+++ b/Master/texmf-dist/doc/latex/flowfram/CHANGES
@@ -1,5 +1,12 @@
flowfram change log
+1.15 (2014/05/15) :
+
+ * Now allows \Shapepar as a valid shape command
+
+ * Modified \@setcol so that it sets \linewidth as well as
+ \textwidth
+
1.14 (2012/11/10) :
* Now loads xkeyval rather than keyval
diff --git a/Master/texmf-dist/doc/latex/flowfram/README b/Master/texmf-dist/doc/latex/flowfram/README
index 6850d26118c..b70f2dab2fd 100644
--- a/Master/texmf-dist/doc/latex/flowfram/README
+++ b/Master/texmf-dist/doc/latex/flowfram/README
@@ -1,9 +1,11 @@
-LaTeX Package : flowfram v1.14
+LaTeX Package : flowfram v1.15
-Last Modified : 2012-11-10
+Last Modified : 2014-05-15
Author : Nicola Talbot
+Package FAQ : http://www.dickimaw-books.com/faqs/flowframfaq.html
+
Files : flowfram.dtx - documented source file
flowfram.ins - installation script
flowfram.perl - LaTeX2HTML style file (see below)
@@ -44,7 +46,7 @@ document. The resulting HTML document will not contain any HTML
frames unless other packages (such as frames.perl) are used.
This material is subject to the LaTeX Project Public License.
-See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
+See http://www.ctan.org/license/lppl1.3 for the details of that license.
http://www.dickimaw-books.com/
diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
index 49ef7001861..857342e77fd 100644
--- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
index 20059639d4d..9c903e9bc62 100644
--- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
@@ -364,9 +364,9 @@ backcolor=blue,textcolor=white,style=footstyle,pages=none}
\begin{document}\label{top}
\title{Creating Flow Frames for Posters, Brochures or
-Magazines using flowfram.sty version 1.14}
+Magazines using flowfram.sty version 1.15}
\author{Nicola L. C. Talbot}
-\date{2012-11-10}
+\date{2014-05-15}
% swap frames around for title page
\ffswapoddeven*{main}
@@ -1641,15 +1641,15 @@ non-rectangular \staticordynamic{}s (but not \glspl{flow}). Note
that the
\gls{bbox} will still appear as a rectangle despite the
\gls{frame}['s] shape setting. You may use either \TeX's
-\cmdname{parshape} command, or the \cmdname{shapepar}
-command defined in Donald~Arseneau's \sty{shapepar}
-package (if using \cmdname{shapepar}, remember to include
+\cmdname{parshape} command, or the
+\cmdname{shapepar}\slash\cmdname{Shapepar}
+commands defined in Donald~Arseneau's \sty{shapepar}
+package (if using \cmdname{shapepar} or \cmdname{Shapepar}, remember to include
the \sty{shapepar} package.)
-Note that it is better to use \cmdname{parshape} instead
-of \cmdname{shapepar} as the latter is more restrictive and
-requires more processing. However, \cmdname{shapepar} provides
-greater flexibility in the type of shape that can be used.
+The \cmdname{shapepar} or \cmdname{Shapepar} commands provide
+greater flexibility in the type of shape that can be used. However,
+be aware of the advice given in the \sty{shapepar} documentation.
\begin{description}
\item[\cmdname{parshape}]
With \cmdname{parshape} you can not have cut-outs in the middle,
@@ -1661,14 +1661,16 @@ the paragraph shape to extend beyond a single paragraph, and
to allow sectioning commands (but not \cmdname{chapter}
or \cmdname{part}).
-\item[\cmdname{shapepar}] With \cmdname{shapepar} you may
+\item[\cmdname{shapepar}/\cmdname{Shapepar}] With \cmdname{shapepar}
+or \cmdname{Shapepar} you may
have cut-outs, but you may not have any sectioning commands,
paragraph breaks, vertical spacing or mathematics. You can
simulate a paragraph break using \cmdname{simpar}, but this
is not recommended. The size of the shape depends on the
amount of text, so the shape will expand or contract as you
-add or delete text. See the \sty{shapepar} documentation for
-more details.
+add or delete text. In general, \cmdname{Shapepar} is better suited
+for use as a frame shape than \cmdname{shapepar}. See the
+\sty{shapepar} documentation for more details of these commands.
\end{description}
To restore a \gls*{frame} to its default rectangular setting use
@@ -1744,7 +1746,7 @@ E=mc^2
whilst retaining the shape.
\end{staticcontents*}
-The syntax for \cmdname{shapepar} is more complicated, see
+The syntax for \cmdname{shapepar} and \cmdname{Shapepar} is more complicated, see
the \sty{shapepar} documentation for more details. In general:\\[10pt]
\cmdname{shapepar}\{\meta{shape specs}\}\\[10pt]
The \sty{shapepar} package has four predefined shapes:
diff --git a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
index 67085cab743..e90d4686b5c 100644
--- a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
index 02743025742..58f7db5d42e 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-article.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
index f94e4e2451a..0c488945cbc 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-brochure.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
index bfbd33ee0d2..8a8e6f36def 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
index 792b51492a1..11d0791c531 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-news2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
index 4e8532796e9..923879c65ab 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-pages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
index 9097577037b..b775d2a2a87 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-poster.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
index 88dc5e0b92e..7976d73e07b 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample-rot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
index 4a47a3bedb5..faf96623b10 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
index f1798b9c6a6..8b51ba4614d 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
index 06633932a57..13a79e53fa1 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
index f22dd7c2af4..5702ae4e1d5 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sample3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
index 079ae70299e..1557570dfdd 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
+++ b/Master/texmf-dist/doc/latex/flowfram/samples/sampleRL.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
index 61890ddf0e7..37cbe1e0567 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.dtx
@@ -1,5 +1,5 @@
%\iffalse
-% flowfram.dtx generated using makedtx version 0.94b (c) Nicola Talbot
+% flowfram.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
% -macrocode "flowfram\.perl"
% -macrocode ".*\.tex"
@@ -13,7 +13,7 @@
% -doc "docstub.tex"
% -author "Nicola Talbot"
% flowfram
-% Created on 2012/11/10 22:19
+% Created on 2014/5/15 15:25
%\fi
%\iffalse
%<*package>
@@ -36,7 +36,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2012 Nicola Talbot, all rights reserved.
+% Copyright (C) 2014 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -44,7 +44,7 @@
\addtolength{\marginparwidth}{10pt}
\addtolength{\oddsidemargin}{20pt}
-\CheckSum{12608}
+\CheckSum{12619}
\PageIndex
\usepackage{url}
@@ -53,6 +53,8 @@ pdfauthor={Nicola L C Talbot},
pdftitle={Documented Source Code for flowfram.sty}]{hyperref}
\usepackage[style=altlist,toc,nonumberlist]{glossaries}
+\RecordChanges
+
\newglossary[slg]{secondary}{sgi}{sgo}{Glossary}
\renewcommand{\acronymtype}{secondary}
@@ -143,9 +145,9 @@ IDN}]{idl}{IDL}{identification label}
\end{document}
%</driver>
%\fi
-%\title{Documented Source Code for flowfram.sty v1.14}
+%\title{Documented Source Code for flowfram.sty v1.15}
%\author{Nicola L. C. Talbot}
-%\date{2012-11-10}
+%\date{2014-05-15}
%\maketitle
%
%This is the documented source code for the flowfram package.
@@ -169,7 +171,7 @@ IDN}]{idl}{IDL}{identification label}
% Declare package, and identify it as a \LaTeXe\ package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{flowfram}[2012/11/10 v1.14 (NLCT)]
+\ProvidesPackage{flowfram}[2014/05/15 v1.15 (NLCT)]
% \end{macrocode}
% Load packages needed by this package
% \begin{macrocode}
@@ -2464,12 +2466,21 @@ IDN}]{idl}{IDL}{identification label}
\def\ff@shape{2}%
}%
{%
- \ifx#1\relax
- \def\ff@shape{0}%
- \else
- \PackageError{flowfram}{Unknown shape \string#1}{}%
- \def\ff@shape{2}%
- \fi
+% \end{macrocode}
+%\changes{1.15}{2014-05-15}{added check for \cs{Shapepar}}
+% \begin{macrocode}
+ \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
+ }%
}%
}%
}
@@ -2569,7 +2580,7 @@ IDN}]{idl}{IDL}{identification label}
}%
\or
% \end{macrocode}
-% \ics{shapepar}:
+% \ics{shapepar} or \ics{Shapepar}:
% \begin{macrocode}
\edef\@sf@mpg{%
\noexpand
@@ -5427,7 +5438,17 @@ IDN}]{idl}{IDL}{identification label}
\expandafter\vsize\csname colheight\romannumeral#1\endcsname
\global\@colht\vsize
\global\@colroom\@colht
- \global\linewidth\columnwidth
+% \end{macrocode}
+% We may be inside an environment that has modified the line
+% width, such as one of the list environments so we can't just set
+% \cs{linewidth} to \cs{columnwidth}. Only modify \cs{linewidth} if
+% it's larger than the new column width.
+%\changes{1.15}{2014-05-15}{set \cs{linewidth} as well as \cs{textwidth}}
+%\begin{macrocode}
+ \ifnum\linewidth>\columnwidth
+ \global\linewidth\columnwidth
+ \fi
+ \global\textwidth\columnwidth
\setmargin
\fi
\stepcounter{displayedframe}%
diff --git a/Master/texmf-dist/source/latex/flowfram/flowfram.ins b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
index 999f48fe496..b8cbdfcfd26 100644
--- a/Master/texmf-dist/source/latex/flowfram/flowfram.ins
+++ b/Master/texmf-dist/source/latex/flowfram/flowfram.ins
@@ -1,10 +1,10 @@
-% flowfram.ins generated using makedtx version 0.94b 2012/11/10 22:19
+% flowfram.ins generated using makedtx version 1.1 2014/5/15 15:25
\input docstrip
\preamble
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
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}%