flowfram (15may14)

git-svn-id: svn://tug.org/texlive/trunk@34048 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 27 insertions, 16 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
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
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
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
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
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
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
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
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
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
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
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
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
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