flowfram 1.10 (21aug07)

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

23 files changed, 705 insertions, 720 deletions

diff --git a/Master/texmf-dist/doc/latex/flowfram/CHANGES b/Master/texmf-dist/doc/latex/flowfram/CHANGES
index 98df6404a1c..32b1200bb6a 100644
--- a/Master/texmf-dist/doc/latex/flowfram/CHANGES
+++ b/Master/texmf-dist/doc/latex/flowfram/CHANGES
@@ -1,5 +1,19 @@
 flowfram change log
 
+1.10 :
+ * fixed license text
+ * made some long commands short
+ * updated the documentation to use glossaries package instead of
+   obsolete glossary package
+
+1.09 : added \ffcolumnseprule to be used instead of \columnseprule.
+Added dynamiccontents environment.
+
+1.08 : fixed bug in \@ff@getdim (causing undefined \c@dynamic).  Fixed
+bug that prevented hyperref's page number hyperlinks from working.
+Added convenience commands \getstaticbounds, \getflowbounds and
+\getdynamicbounds.
+
 1.07 : fixed bug causing extra pages at the end of the document
 
 1.06 : fixed bug causing slight right shift of frames
diff --git a/Master/texmf-dist/doc/latex/flowfram/README b/Master/texmf-dist/doc/latex/flowfram/README
index fd950895038..6a0e1555adc 100644
--- a/Master/texmf-dist/doc/latex/flowfram/README
+++ b/Master/texmf-dist/doc/latex/flowfram/README
@@ -1,41 +1,38 @@
-LaTeX Package : flowfram v 1.07

-

-Last Modified : 9th March 2007

-

-Author        : Nicola Talbot

-

-Files         : flowfram.dtx    - documented source file

-                flowfram.ins    - installation script

-		ffuserguide.pdf - user manual

-		ffuserguide.tex - source code for user manual

-                samples/        - directory containiing sample files

-

-Create frames for posters, brochures or magazines

-

-The flowfram package is designed to enable you to create

-frames in a document such that the contents of the 

-document environment flow from one frame to the next in the 

-order in which they were defined.  This is useful for creating 

-posters or magazines or any other form of document that does not

-conform to the standard one or two column layout.

-

-To extract the code do:

-

-latex flowfram.ins

-

-To extract the documented code do:

-

-latex flowfram.dtx

-makeindex -s gind.ist flowfram

-makeglos.pl flowfram

-latex flowfram.dtx

-latex flowfram.dtx

-

-(The documentation requires at least version 2.2 of the

-glossary package.)

-

-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.

-

-http://theoval.cmp.uea.ac.uk/~nlct/

-

+LaTeX Package : flowfram v 1.10
+
+Last Modified : 21st Aug 2007
+
+Author        : Nicola Talbot
+
+Files         : flowfram.dtx    - documented source file
+                flowfram.ins    - installation script
+		ffuserguide.pdf - user manual
+		ffuserguide.tex - source code for user manual
+                samples/        - directory containing sample files
+
+Create frames for posters, brochures or magazines
+
+The flowfram package is designed to enable you to create
+frames in a document such that the contents of the 
+document environment flow from one frame to the next in the 
+order in which they were defined.  This is useful for creating 
+posters or magazines or any other form of document that does not
+conform to the standard one or two column layout.
+
+To extract the code do:
+
+latex flowfram.ins
+
+To extract the documented code do:
+
+latex flowfram.dtx
+makeindex -s gind.ist flowfram
+makeindex -s flowfram.ist -o flowfram.sgi -t flowfram.slg flowfram.sgo
+latex flowfram.dtx
+latex flowfram.dtx
+
+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.
+
+http://theoval.cmp.uea.ac.uk/~nlct/
+
diff --git a/Master/texmf-dist/doc/latex/flowfram/brochure.pdf b/Master/texmf-dist/doc/latex/flowfram/brochure.pdf
new file mode 100644
index 00000000000..e6fad4b7b11
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/brochure.pdf
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/brochure.tex b/Master/texmf-dist/doc/latex/flowfram/brochure.tex
index f5f1fdedd18..f5f1fdedd18 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/brochure.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/brochure.tex
diff --git a/Master/texmf-dist/doc/latex/flowfram/egg.eps b/Master/texmf-dist/doc/latex/flowfram/egg.eps
new file mode 100644
index 00000000000..46bd52f5929
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/egg.eps
@@ -0,0 +1,129 @@
+%!PS-Adobe-1.0 EPSF-3.0
+%%BoundingBox: 0 766 71 842
+%%Creator: KDE 3.5.3-0.2.fc4 Red Hat
+%%CreationDate: Mon Aug 20 21:23:59 2007
+%%Orientation: Portrait
+%%Pages: 1
+%%DocumentFonts:
+
+%%EndComments
+%%BeginProlog
+% Prolog copyright 1994-2003 Trolltech. You may copy this prolog in any way
+% that is directly related to this document. For other use of this prolog,
+% see your licensing agreement for Qt.
+/d/def load def/D{bind d}bind d/d2{dup dup}D/B{0 d2}D/W{255 d2}D/ED{exch d}D
+/D0{0 ED}D/LT{lineto}D/MT{moveto}D/S{stroke}D/F{setfont}D/SW{setlinewidth}D
+/CP{closepath}D/RL{rlineto}D/NP{newpath}D/CM{currentmatrix}D/SM{setmatrix}D
+/TR{translate}D/SD{setdash}D/SC{aload pop setrgbcolor}D/CR{currentfile read
+pop}D/i{index}D/bs{bitshift}D/scs{setcolorspace}D/DB{dict dup begin}D/DE{end
+d}D/ie{ifelse}D/sp{astore pop}D/BSt 0 d/LWi 1 d/PSt 1 d/Cx 0 d/Cy 0 d/WFi
+false d/OMo false d/BCol[1 1 1]d/PCol[0 0 0]d/BkCol[1 1 1]d/BDArr[0.94 0.88
+0.63 0.50 0.37 0.12 0.06]d/defM matrix d/nS 0 d/GPS{PSt 1 ge PSt 5 le and{{
+LArr PSt 1 sub 2 mul get}{LArr PSt 2 mul 1 sub get}ie}{[]}ie}D/QS{PSt 0 ne{
+gsave LWi SW true GPS 0 SD S OMo PSt 1 ne and{BkCol SC false GPS dup 0 get
+SD S}if grestore}if}D/r28{{CR dup 32 gt{exit}if pop}loop 3{CR}repeat 0 4{7
+bs exch dup 128 gt{84 sub}if 42 sub 127 and add}repeat}D/rA 0 d/rL 0 d/rB{rL
+0 eq{/rA r28 d/rL 28 d}if dup rL gt{rA exch rL sub rL exch/rA 0 d/rL 0 d rB
+exch bs add}{dup rA 16#fffffff 3 -1 roll bs not and exch dup rL exch sub/rL
+ED neg rA exch bs/rA ED}ie}D/uc{/rL 0 d 0{dup 2 i length ge{exit}if 1 rB 1
+eq{3 rB dup 3 ge{1 add dup rB 1 i 5 ge{1 i 6 ge{1 i 7 ge{1 i 8 ge{128 add}if
+64 add}if 32 add}if 16 add}if 3 add exch pop}if 3 add exch 10 rB 1 add{dup 3
+i lt{dup}{2 i}ie 4 i 3 i 3 i sub 2 i getinterval 5 i 4 i 3 -1 roll
+putinterval dup 4 -1 roll add 3 1 roll 4 -1 roll exch sub dup 0 eq{exit}if 3
+1 roll}loop pop pop}{3 rB 1 add{2 copy 8 rB put 1 add}repeat}ie}loop pop}D
+/sl D0/QCIgray D0/QCIcolor D0/QCIindex D0/QCI{/colorimage where{pop false 3
+colorimage}{exec/QCIcolor ED/QCIgray QCIcolor length 3 idiv string d 0 1
+QCIcolor length 3 idiv 1 sub{/QCIindex ED/x QCIindex 3 mul d QCIgray
+QCIindex QCIcolor x get 0.30 mul QCIcolor x 1 add get 0.59 mul QCIcolor x 2
+add get 0.11 mul add add cvi put}for QCIgray image}ie}D/di{gsave TR 1 i 1 eq
+{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagemask BkCol SC
+imagemask}{pop false 3 1 roll imagemask}ie}{dup false ne{/languagelevel
+where{pop languagelevel 3 ge}{false}ie}{false}ie{/ma ED 8 eq{/dc[0 1]d
+/DeviceGray}{/dc[0 1 0 1 0 1]d/DeviceRGB}ie scs/im ED/mt ED/h ED/w ED/id 7
+DB/ImageType 1 d/Width w d/Height h d/ImageMatrix mt d/DataSource im d
+/BitsPerComponent 8 d/Decode dc d DE/md 7 DB/ImageType 1 d/Width w d/Height
+h d/ImageMatrix mt d/DataSource ma d/BitsPerComponent 1 d/Decode[0 1]d DE 4
+DB/ImageType 3 d/DataDict id d/MaskDict md d/InterleaveType 3 d end image}{
+pop 8 4 1 roll 8 eq{image}{QCI}ie}ie}ie grestore}d/BF{gsave BSt 1 eq{BCol SC
+WFi{fill}{eofill}ie}if BSt 2 ge BSt 8 le and{BDArr BSt 2 sub get/sc ED BCol{
+1. exch sub sc mul 1. exch sub}forall 3 array astore SC WFi{fill}{eofill}ie}
+if BSt 9 ge BSt 14 le and{WFi{clip}{eoclip}ie defM SM pathbbox 3 i 3 i TR 4
+2 roll 3 2 roll exch sub/h ED sub/w ED OMo{NP 0 0 MT 0 h RL w 0 RL 0 h neg
+RL CP BkCol SC fill}if BCol SC 0.3 SW NP BSt 9 eq BSt 11 eq or{0 4 h{dup 0
+exch MT w exch LT}for}if BSt 10 eq BSt 11 eq or{0 4 w{dup 0 MT h LT}for}if
+BSt 12 eq BSt 14 eq or{w h gt{0 6 w h add{dup 0 MT h sub h LT}for}{0 6 w h
+add{dup 0 exch MT w sub w exch LT}for}ie}if BSt 13 eq BSt 14 eq or{w h gt{0
+6 w h add{dup h MT h sub 0 LT}for}{0 6 w h add{dup w exch MT w sub 0 exch LT
+}for}ie}if S}if BSt 24 eq{}if grestore}D/mat matrix d/ang1 D0/ang2 D0/w D0/h
+D0/x D0/y D0/ARC{/ang2 ED/ang1 ED/h ED/w ED/y ED/x ED mat CM pop x w 2 div
+add y h 2 div add TR 1 h w div neg scale ang2 0 ge{0 0 w 2 div ang1 ang1
+ang2 add arc}{0 0 w 2 div ang1 ang1 ang2 add arcn}ie mat SM}D/C D0/P{NP MT
+0.5 0.5 rmoveto 0 -1 RL -1 0 RL 0 1 RL CP fill}D/M{/Cy ED/Cx ED}D/L{NP Cx Cy
+MT/Cy ED/Cx ED Cx Cy LT QS}D/DL{NP MT LT QS}D/HL{1 i DL}D/VL{2 i exch DL}D/R
+{/h ED/w ED/y ED/x ED NP x y MT 0 h RL w 0 RL 0 h neg RL CP BF QS}D/ACR{/h
+ED/w ED/y ED/x ED x y MT 0 h RL w 0 RL 0 h neg RL CP}D/xr D0/yr D0/rx D0/ry
+D0/rx2 D0/ry2 D0/RR{/yr ED/xr ED/h ED/w ED/y ED/x ED xr 0 le yr 0 le or{x y
+w h R}{xr 100 ge yr 100 ge or{x y w h E}{/rx xr w mul 200 div d/ry yr h mul
+200 div d/rx2 rx 2 mul d/ry2 ry 2 mul d NP x rx add y MT x y rx2 ry2 180 -90
+x y h add ry2 sub rx2 ry2 270 -90 x w add rx2 sub y h add ry2 sub rx2 ry2 0
+-90 x w add rx2 sub y rx2 ry2 90 -90 ARC ARC ARC ARC CP BF QS}ie}ie}D/E{/h
+ED/w ED/y ED/x ED mat CM pop x w 2 div add y h 2 div add TR 1 h w div scale
+NP 0 0 w 2 div 0 360 arc mat SM BF QS}D/A{16 div exch 16 div exch NP ARC QS}
+D/PIE{/ang2 ED/ang1 ED/h ED/w ED/y ED/x ED NP x w 2 div add y h 2 div add MT
+x y w h ang1 16 div ang2 16 div ARC CP BF QS}D/CH{16 div exch 16 div exch NP
+ARC CP BF QS}D/BZ{curveto QS}D/CRGB{255 div 3 1 roll 255 div 3 1 roll 255
+div 3 1 roll}D/BC{CRGB BkCol sp}D/BR{CRGB BCol sp/BSt ED}D/WB{1 W BR}D/NB{0
+B BR}D/PE{setlinejoin setlinecap CRGB PCol sp/LWi ED/PSt ED LWi 0 eq{0.25
+/LWi ED}if PCol SC}D/P1{1 0 5 2 roll 0 0 PE}D/ST{defM SM concat}D/MF{true
+exch true exch{exch pop exch pop dup 0 get dup findfont dup/FontName get 3
+-1 roll eq{exit}if}forall exch dup 1 get/fxscale ED 2 get/fslant ED exch
+/fencoding ED[fxscale 0 fslant 1 0 0]makefont fencoding false eq{}{dup
+maxlength dict begin{1 i/FID ne{def}{pop pop}ifelse}forall/Encoding
+fencoding d currentdict end}ie definefont pop}D/MFEmb{findfont dup length
+dict begin{1 i/FID ne{d}{pop pop}ifelse}forall/Encoding ED currentdict end
+definefont pop}D/DF{findfont/fs 3 -1 roll d[fs 0 0 fs -1 mul 0 0]makefont d}
+D/ty 0 d/Y{/ty ED}D/Tl{gsave SW NP 1 i exch MT 1 i 0 RL S grestore}D/XYT{ty
+MT/xyshow where{pop pop xyshow}{exch pop 1 i dup length 2 div exch
+stringwidth pop 3 -1 roll exch sub exch div exch 0 exch ashow}ie}D/AT{ty MT
+1 i dup length 2 div exch stringwidth pop 3 -1 roll exch sub exch div exch 0
+exch ashow}D/QI{/C save d pageinit/Cx 0 d/Cy 0 d/OMo false d}D/QP{C restore
+showpage}D/SPD{/setpagedevice where{1 DB 3 1 roll d end setpagedevice}{pop
+pop}ie}D/SV{BSt LWi PSt Cx Cy WFi OMo BCol PCol BkCol/nS nS 1 add d gsave}D
+/RS{nS 0 gt{grestore/BkCol ED/PCol ED/BCol ED/OMo ED/WFi ED/Cy ED/Cx ED/PSt
+ED/LWi ED/BSt ED/nS nS 1 sub d}if}D/CLSTART{/clipTmp matrix CM d defM SM NP}
+D/CLEND{clip NP clipTmp SM}D/CLO{grestore gsave defM SM}D
+
+/LArr[ [] [] [ 10.000 3.000 ] [ 3.000 10.000 ] [ 3.000 3.000 ] [ 3.000 3.000 ] [ 5.000 3.000 3.000 3.000 ] [ 3.000 5.000 3.000 3.000 ] [ 5.000 3.000 3.000 3.000 3.000 ] [ 3.000 5.000 3.000 3.000 3.000 3.000 ] ] d
+/pageinit {
+% 210*297mm (portrait)
+0 842 translate 1 -1 scale/defM matrix CM d } d
+%%EndProlog
+%%BeginSetup
+%%EndSetup
+%%Page: 1 1
+%%BeginPageSetup
+QI
+%%EndPageSetup
+[1 0 0 1 0 0]ST
+CLSTART
+0 0 71 76 ACR
+CLEND
+B P1
+NB
+W BC
+/sl 5396 string uc
+î½L*îçËDWçÓUÕ?ÇSÑç±ÈÀN°Þæݺ×ô;*ÎÉòçµ-M2ë±Y;L2*ËGU¹ðÂ:ÒSINÂL*JGóL¾òÕ3;.JÐQݽM
+¾Ê3BÀâÊCWLÆÔW=RÂ:*æDéòã¿2K*ÇÜíÄ6+ÊPá2àÒç>7;ËL.+VÚ;JðÊ6+<Qæ2Þ°PÄ*@=²Â=X*0ìÞßÏ
+.âØDù¯.¯ìºPÑK³éDÍË;.YÜ·C,îÛ²MÆÍIñ°.öCEMÆÇ=ñ°.BCEM2ÊBñ°.¾·çÄ:SÑäã2:³´Ä:±åäã2Z
+´íCàÃ7;-06ÚÀÁÁ7*SÑËØÎÁU,¶Ô;ÕVZÅĶI0åAîîAì5L¸Å¶Æ/Q:ï²/ð´Â-ÆÖ:MFP¿Ò6ïö;Ì=LXÃ*³
+íÄè,7ïJ1¾ãÊ4+VÜ6ܹC¸²-:·PÄ*ÇÍÕóóÃä¶Dé±Âé<*PÑK.¯è²ÈÄ*òѯ.KÍüä7¿üµëDÅL¾Ô·<à6*â
+Ê*;NäÊ÷@ÀúÍH+MÆòçõí2òI³èÕ5+RåÊ2QXøR:P-¾ôê5¯KĶ+ôÕ2;.Z1ÄÞPËÔòèÓéÈU¯Âù7öü7ï·êR
+ðÅÖ8MFSÁÙÄÆ@=XÅßKMNö2ù¯ÂùZÆÙ;ÐöÀWBL4CÖ*6Oí25:,%%
+d
+71 76[1 0 0 1 0 0]sl 8 false 0 0 di
+
+QP
+%%Trailer
+%%Pages: 1
+%%DocumentFonts:
+%%EOF
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/egg.png b/Master/texmf-dist/doc/latex/flowfram/egg.png
index f67b013c345..f67b013c345 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/egg.png
+++ b/Master/texmf-dist/doc/latex/flowfram/egg.png
diff --git a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.pdf
index b3f1667d486..f4665501a7d 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 8ff2f6c9d2b..e0bee6de93b 100644
--- a/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/ffuserguide.tex
@@ -14,7 +14,7 @@
             pdfauthor={Nicola Talbot},
             pdftitle={Creating Flow Frames for Posters, Brochures or Magazines using flowfram.sty},
             pdfkeywords={LaTeX;text frames;posters;brochures}]{hyperref}
-\usepackage[style=altlist,toc,number=none]{glossary}[2006/07/20]
+\usepackage[style=altlist,toc,nonumberlist]{glossaries}
 \usepackage{pgf}
 \usepackage[norotate,ttbnotitle,ttbnum]{flowfram}
 \usepackage{shapepar}
@@ -24,71 +24,83 @@
 \newcommand{\env}[1]{\textsf{#1}\index{#1@\textsf{#1} environment}}
 \newcommand{\cmdname}[1]{\texttt{\symbol{92}#1}\index{#1@\texttt{\symbol{92}#1}}}
 \newcommand{\meta}[1]{\textnormal{\textless\textit{#1}\textgreater}}
+\newcommand{\marg}[1]{\texttt{\char`\{#1\char`\}}}
+\newcommand{\oarg}[1]{\texttt{[#1]}}
 \newcommand{\appname}[1]{\texttt{#1}\index{#1@\texttt{#1}}}
 \newcommand{\pkgopt}[1]{\textsf{#1}\index{#1@\textsf{#1} option}}
 \newcommand{\key}[1]{#1\index{frame settings!#1}}
 
 % Glossary Stuff
 
-\storeglosentry{typeblock}{name=typeblock,description={The 
+\newglossaryentry{typeblock}{name=typeblock,description={The 
 area of the page where the main body of the text goes.
 The width and height of this area are given by 
 \protect\cmdname{textwidth} and \protect\cmdname{textheight}}}
 
-\storeglosentry{flow}{name=flow frame,description={The frames in 
+\newglossaryentry{flow}{name=flow frame,description={The frames in 
 a document such that the contents of the \protect\env{document}
 environment flow from one frame to the next in the order 
 that they were defined. There must be at least one flow frame on
-every page.}}
+every page}}
 
-\storeglosentry{static}{name=static frame,description={Frames
+\newglossaryentry{static}{name=static frame,description={Frames
 in which text is fixed in place.  The contents are fixed until
-explicitly changed.}}
+explicitly changed}}
 
-\storeglosentry{dynamic}{name=dynamic frame,description={Frames
+\newglossaryentry{dynamic}{name=dynamic frame,description={Frames
 in which text is fixed in place, but the contents are re-typeset
-after each page.}}
+after each page}}
 
-\newcommand*{\staticordynamic}{\useGlosentry{static}{static} or \gls{dynamic}}
+\newcommand*{\staticordynamic}{\glslink{static}{static} or 
+\glslink{dynamic}{dynamic} frame}
 
-\storeglosentry{frame}{name=frame,description={A rectangular
+\newglossaryentry{frame}{name=frame,description={A rectangular
 area of the page in which text can be placed (not to be
 confused with a frame making command). There are three types:
-flow, static and dynamic.}}
+flow, static and dynamic}}
 
-\storeglosentry{fcmd}{name=frame making command,description={A
+\newglossaryentry{fcmd}{name=frame making command,description={A
 \LaTeX\ command which places some kind of border around its
-argument. For example: \protect\cmdname{fbox}.}}
+argument. For example: \protect\cmdname{fbox}}}
 
-\storeglosentry{pglist}{name=page list,description={A list of
+\newglossaryentry{pglist}{name=page list,description={A list of
 pages. This can either be a single keyword: \texttt{all},
 \texttt{odd}, \texttt{even} or \texttt{none}, or it can
 be a comma-separated list of individual page numbers or
 page ranges. For example: \texttt{\textless3,5,7-11,\textgreater15}
 indicates pages 1,2,5,7,8,9,10,11 and all pages after page 15.
 Note that these numbers refer to the actual value of the
-page counter, not the absolute physical page number.}}
+page counter, not the absolute physical page number}}
 
-\storeglosentry{pgrange}{name=page range,description={Page
+\newglossaryentry{pgrange}{name=page range,description={Page
 ranges can be closed, e.g.\ \texttt{5-10}, or open, e.g.
-\texttt{\textless7} or \texttt{\textgreater9}.}}
+\texttt{\textless7} or \texttt{\textgreater9}}}
 
-\storeglosentry{bbox}{name=bounding box,description={The smallest
-possible rectangle that completely encompasses the object.}}
+\newglossaryentry{bbox}{name=bounding box,
+plural=bounding boxes,
+description={The smallest
+possible rectangle that completely encompasses the object}}
 
-\newacronym{IDN}{identification number}{description={A unique
+\newglossaryentry{idn}{name={identification number (IDN)},
+text={IDN},first={identification number (IDN)},
+plural={IDNs},firstplural={identification numbers (IDNs)},
+description={A unique
 number assigned to each frame, which you can use to identify
 the frame when modifying its appearance. Example: if you
 have defined 3 flow frames, 2 static frames and 1 dynamic
 frame, the flow frames will have IDNs 1, 2 and 3, the static
 frames will have IDNs 1 and 2, and the dynamic frame will
-have IDN 1.}}
+have IDN 1}}
 
-\newacronym{IDL}{identification label}{description={A unique
+\newglossaryentry{idl}{name={identification label (IDL)},
+text={IDL},first={identification label (IDL)},
+plural={IDLs},firstplural={identification labels (IDLs)},
+description={A unique
 label which can be assigned to a frame, enabling you to
-refer to the frame by label instead of by its IDN.}}
+refer to the frame by label instead of by its 
+IDN}}
 
-\makeglossary
+\makeglossaries
 \makeindex
 
 % Page layout stuff
@@ -229,7 +241,7 @@ backcolor=blue,textcolor=white,style=footstyle,pages=none}
 \setflowframe*{oddcol1,oddcol2}{pages=odd}
 \setflowframe*{evencol1,evencol2}{pages=even}
 \clearpage
-\mbox{}\framebreak
+\mbox{}\framebreak\phantomsection
 \setflowframe*{main}{pages=none}
 \setdynamiccontents*{chaphead}{\DFschapterstyle{\indexname}}
 \addcontentsline{toc}{chapter}{\indexname}
@@ -250,9 +262,9 @@ backcolor=blue,textcolor=white,style=footstyle,pages=none}
 \dfswapoddeven*{chaphead}
 
 \title{Creating Flow Frames for Posters, Brochures or 
-Magazines using flowfram.sty v 1.07}
+Magazines using flowfram.sty v 1.10}
 \author{Nicola L. C. Talbot}
-\date{9th March 2007}
+\date{21 August 2007}
 \pagenumbering{alph}
 \maketitle
 
@@ -289,7 +301,7 @@ United Kingdom\\
 \pagenumbering{arabic}
 
 The \sty{flowfram} package is a \LaTeXe\ package designed to 
-enable you to create text \gls{frame}s in a document such that 
+enable you to create text \glspl{frame} in a document such that 
 the contents of the \env{document} environment flow from one 
 \gls{frame} to the next in the order that they were defined.  
 This is useful for creating posters
@@ -297,7 +309,7 @@ or magazines or any other form of document that does not
 conform to the standard one or two column layout.
 
 The \sty{flowfram} package provides three types of \gls{frame}:
-\gls{flow}s, \gls{static}s and \gls{dynamic}s with dimensions and 
+\glspl{flow}, \glspl{static} and \glspl{dynamic} with dimensions and 
 positions specified by the 
 user\footnote{Can I have arbitrary shaped frames? See 
 \autoref{sec:parshape}}.
@@ -310,15 +322,15 @@ unless otherwise stated, all co-ordinates are relative to the
 bottom left hand corner of the \gls{typeblock}. If you have
 a two-sided document, the absolute position of the \gls{typeblock}
 may vary depending on the values of \cmdname{oddsidemargin}
-and \cmdname{evensidemargin}, and all the \gls{frame}s will shift
+and \cmdname{evensidemargin}, and all the \glspl{frame} will shift
 accordingly unless otherwise indicated.
 
 Since floats (such as figures and tables) can only go in 
-\gls{flow}s, this package provides
+\glspl{flow}, this package provides
 the additional environments:
 \env{staticfigure} and 
-\env{statictable} which can be used in \gls{static}s
-and \gls{dynamic}s. Unlike their \env{figure} and
+\env{statictable} which can be used in \glspl{static}
+and \glspl{dynamic}. Unlike their \env{figure} and
 \env{table} counterparts, they are fixed in place, and
 so do not take an optional placement specifier. The 
 \cmdname{caption} and \cmdname{label} commands can 
@@ -328,7 +340,7 @@ usual, but it is recommended that you \cmdname{protect} the
 being multiply defined.
 
 The standard \env{figure} and \env{table} commands will 
-behave as usual in the \gls{flow}s, but their starred versions,
+behave as usual in the \glspl{flow}, but their starred versions,
 \env{figure*} and \env{table*} behave no differently
 from \env{figure} and \env{table}\footnote{This is because
 of the arbitrary layout of the flow frames.}.
@@ -349,13 +361,13 @@ each \gls{frame} defined.  At the bottom right of each
 \gls{bbox} (except for the \gls{bbox} denoting the 
 \gls{typeblock}), a marker will be shown in the form:
 [\meta{T}:\meta{idn};\meta{idl}], where \meta{T} is a single
-letter denoting the \gls{frame} type, \meta{idn} is the \IDN\
-for the \gls{frame} and \meta{idl} is the \IDL\ for that
+letter denoting the \gls{frame} type, \meta{idn} is the \gls{idn}\
+for the \gls{frame} and \meta{idl} is the \gls{idl}\ for that
 \gls{frame}. Values of \meta{T} are: \texttt{F} (\gls{flow}),
 \texttt{S} (\gls{static}) or \texttt{D} (\gls{dynamic}).
 Markers of the form: [M:\meta{idn}] indicate that the
 \gls{bbox} is the area taken up by the margin for \gls{flow}
-with \IDN\ \meta{idn}. Note that even if a \gls{frame}
+with \gls{idn}\ \meta{idn}. Note that even if a \gls{frame}
 has been rotated, the \gls{bbox} will not be rotated.
 
 If you want to show or hide specific types of bounding
@@ -379,11 +391,11 @@ for the margins.
 
 \item
 \cmdname{showframebboxtrue} Display the \gls{bbox}
-for the \gls{frame}s.
+for the \glspl{frame}.
 
 \item
 \cmdname{showframebboxfalse} Do not display the \gls{bbox}
-for the \gls{frame}s.
+for the \glspl{frame}.
 
 \end{itemize}
 
@@ -404,21 +416,21 @@ the pale background colour you were hoping for.)
 The material on each page is placed in the following order:
 \begin{enumerate}
 \item Each \gls{static} defined for that page in ascending
-order of \IDN.
+order of \gls{idn}.
 
 \item Each \gls{flow} defined for that page in ascending
-order of \IDN.
+order of \gls{idn}.
 
 \item Each \gls{dynamic} defined for that page in ascending
-order of \IDN.
+order of \gls{idn}.
 
-\item \useGlosentry{bbox}{Bounding boxes} if the \texttt{draft}
+\item \Glspl{bbox} if the \texttt{draft}
 package option has been used.
 \end{enumerate}
 
 This ordering can be used to determine if you want something
 to overlay or underlay everything else on the page.
-Note that the \gls{frame}s do not interact with each other. If
+Note that the \glspl{frame} do not interact with each other. If
 you have two or more overlapping frames, the text in each 
 \gls{frame} will not attempt to wrap around the other 
 frames, but will simply overwrite 
@@ -435,12 +447,12 @@ one \gls{frame} to the next in order of definition. Each
 \gls{flow} has an associated width, height, 
 position on the page, and optionally a border. To define
 a new \gls{flow} use:\\[10pt]
-\cmdname{newflowframe}\verb/[/\meta{page list}\verb+]{+%
-\meta{width}\verb/}{/%
-\meta{height}\verb/}{/%
-\meta{x}\verb/}{/%
-\meta{y}\verb/}[/%
-\meta{label}\verb/]/\\[10pt]
+\cmdname{newflowframe}\oarg{\meta{page list}}%%
+\marg{\meta{width}}%
+\marg{\meta{height}}%
+\marg{\meta{x}}%
+\marg{\meta{y}}%
+\oarg{\meta{label}}\\[10pt]
 where \meta{width} is the width of the \gls{frame}, \meta{height}
 is the height of the \gls{frame}, (\meta{x},\meta{y}) is the
 position of the bottom left hand corner of the \gls{frame}
@@ -454,7 +466,7 @@ list of pages for which this \gls{frame} is defined.
 A \gls{pglist} can either be specified by the keywords: 
 \texttt{all}, \texttt{odd}, \texttt{even} or \texttt{none}, or 
 by a comma-separated list of either individual page numbers or 
-\useGlosentry{pgrange}{page ranges}. If \meta{page list} is
+\glspl{pgrange}. If \meta{page list} is
 omitted, \texttt{all} is assumed.  
 A \gls{pgrange} can be a closed
 range (e.g.\ \verb+2-8+) or an open range (e.g.\ 
@@ -467,12 +479,12 @@ so if you have a page~i and a page~1, they
 will both have the same layout (unless you change the
 page range setting somewhere between the two pages).
 
-Each \gls{frame} has its own unique \IDN, 
+Each \gls{frame} has its own unique \gls{idn}, 
 corresponding to the order in which it was defined. So the first 
-\gls{flow} to be defined has the \IDN~1, 
-the second has \IDN~2, and so on. This number can then
+\gls{flow} to be defined has the \gls{idn}~1, 
+the second has \gls{idn}~2, and so on. This number can then
 be used to identify the \gls{frame} when you want to modify its
-settings. Alternatively, you can assign a unique \IDL\ to the 
+settings. Alternatively, you can assign a unique \gls{idl}\ to the 
 \gls{frame} using the final optional argument \meta{label}.
 
 By default, the \gls{flow} will not have a border, but the 
@@ -480,7 +492,7 @@ starred form, \cmdname{newflowframe*},
 will place a plain border around the \gls{flow}.
 
 Note that if the document continues beyond the last
-defined \gls{flow} (for example, the \gls{flow}s have only
+defined \gls{flow} (for example, the \glspl{flow} have only
 been defined on pages~1 to~10, but the document contains 11 
 pages) then a single \gls{flow} will be defined, 
 emulating one column mode for all subsequent pages.
@@ -502,7 +514,7 @@ You can force text to move immediately to the next defined
 The first two work in an analogous way to the way they
 work in standard two column mode. The latter, 
 \cmdname{framebreak}, is required
-when a paragraph spans two \useGlosentry{flow}{flow frames}
+when a paragraph spans two \glspl{flow}
 of different widths, as \TeX's output routine does not 
 adjust to the new value of \cmdname{hsize} until the last 
 paragraph of the previous \gls{frame} has ended. As a 
@@ -510,8 +522,7 @@ result, the end of the paragraph at the beginning of the new
 \gls{flow} retains the width of the previous \gls{flow}.
 
 If you want to start a new page, rather than simply move to the 
-next \gls{frame}, use the command \cmdname{finishthispage}
-or \cmdname{clearpage}, 
+next \gls{frame}, use the command \cmdname{clearpage}, 
 or for two-sided documents, to start on the next odd page
 do \cmdname{cleardoublepage}.
 
@@ -529,16 +540,16 @@ example, to make a company logo appear in the same place on every
 page.
 
 As from version 1.03 it is now possible to have
-\gls{static}s with non-rectangular contents, see
+\glspl{static} with non-rectangular contents, see
 \autoref{sec:parshape} for further details.
 
 A new \gls{static} is defined using the command:\\[10pt]
-\cmdname{newstaticframe}\verb/[/\meta{page list}\verb+]{+%
-\meta{width}\verb/}{/%
-\meta{height}\verb/}{/%
-\meta{x}\verb/}{/%
-\meta{y}\verb/}[/%
-\meta{label}\verb/]/\\[10pt]
+\cmdname{newstaticframe}\oarg{\meta{page list}}%
+\marg{\meta{width}}%
+\marg{\meta{height}}%
+\marg{\meta{x}}%
+\marg{\meta{y}}%
+\oarg{\meta{label}}\\[10pt]
 where, as with \cmdname{newflowframe}, \meta{width} is the width of 
 the \gls{static}, \meta{height} is the height of the \gls{static},
 (\meta{x},\meta{y}) is the position of the bottom left hand 
@@ -546,11 +557,11 @@ corner of the \gls{static} relative to the bottom left hand
 corner of the \gls{typeblock}. The first optional argument,
 \meta{page list}, indicates the \gls{pglist} for which this
 \gls{static} should appear, and the final optional argument,
-\meta{label} is a unique textual \IDL\ which you can use to
+\meta{label} is a unique textual \gls{idl}\ which you can use to
 identify this \gls{static}.  If no label is specified, you
-can refer to this \gls{static} by its unique \IDN.
-The first \gls{static} defined has \IDN~1, the second
-has \IDN~2, and so on.
+can refer to this \gls{static} by its unique \gls{idn}.
+The first \gls{static} defined has \gls{idn}~1, the second
+has \gls{idn}~2, and so on.
 
 As with \cmdname{newflowframe}, there is a starred version 
 \cmdname{newstaticframe*} which will place a border around that 
@@ -558,49 +569,52 @@ As with \cmdname{newflowframe}, there is a starred version
 
 To set the contents of a particular \gls{static}, you can
 either use the \env{staticcontents} environment:\\[10pt]
-\verb/\begin{staticcontents}{/\meta{IDN}\verb+}+\\
+\verb/\begin{staticcontents}/\marg{\meta{IDN}}\\
 \meta{contents}\\
 \verb/\end{staticcontents}/\\[10pt]
-where \meta{IDN} is the unique \IDN\ associated with
+where \meta{IDN} is the unique \gls{idn}\ associated with
 that \gls{static} and \meta{contents} is the contents of the
 \gls{static}, or you can use the 
 command:\\[10pt]
-\cmdname{setstaticcontents}\verb/{/\meta{IDN}\verb+}{+\meta{contents}\verb!}!\\[10pt]
+\cmdname{setstaticcontents}\marg{\meta{IDN}}\marg{\meta{contents}}\\[10pt]
 which will do the same thing.
 
 There are starred versions available for both the environment
 and the command to enable you to identify the \gls{static}
-by its associated \IDL\ rather than its \IDN
+by its associated \gls{idl}\ rather than its \gls{idn}
 :\\[10pt]
-\verb/\begin{staticcontents*}{/\meta{IDL}\verb+}+\\
+\verb/\begin{staticcontents*}/\marg{\meta{IDL}}\\
 \meta{contents}\\
 \verb/\end{staticcontents*}/\\[10pt]
 or the equivalent:\\[10pt]
-\cmdname{setstaticcontents*}\verb/{/\meta{IDL}\verb+}{+\meta{contents}\verb!}!
+\cmdname{setstaticcontents*}\marg{\meta{IDL}}\marg{\meta{contents}}
 
 \section{Dynamic Frames}
 
 A \gls{dynamic} is similar to a \gls{static}, but its contents
 are re-typeset on each page. (A \gls{static} stores its 
 contents in a savebox, whereas a \gls{dynamic} stores its
-contents in a macro).
+contents in a macro\footnote{which means that you can have
+verbatim text in the body of the \env{staticcontents} environment
+but not in the body of the \env{dynamiccontents} environment
+(see page~\pageref{pg:verb})}).
 
 As from version 1.03 it is now possible to have
-\gls{dynamic}s with non-rectangular contents, see
+\glspl{dynamic} with non-rectangular contents, see
 \autoref{sec:parshape} for further details.
 
 To create a new \gls{dynamic}, use the command:\\[10pt]
-\cmdname{newdynamicframe}\verb/[/\meta{page list}\verb+]{+%
-\meta{width}\verb/}{/%
-\meta{height}\verb/}{/%
-\meta{x}\verb/}{/%
-\meta{y}\verb/}[/%
-\meta{label}\verb/]/\\[10pt]
+\cmdname{newdynamicframe}\oarg{\meta{page list}}%
+\marg{\meta{width}}%
+\marg{\meta{height}}%
+\marg{\meta{x}}%
+\marg{\meta{y}}%
+\oarg{\meta{label}}\\[10pt]
 The parameters are exactly the same as for \cmdname{newflowframe}
 and \cmdname{newstaticframe}.
-Again, each \gls{dynamic} has an associated unique \IDN,
+Again, each \gls{dynamic} has an associated unique \gls{idn},
 starting from 1 for the first \gls{dynamic} defined, and
-a unique \IDL\ can also be set using the final optional
+a unique \gls{idl}\ can also be set using the final optional
 argument \meta{label}.
 
 As with the other \gls{frame} types, there is also a starred 
@@ -617,35 +631,41 @@ position for the even pages is set using \cmdname{setdynamicframe}
 defined in \autoref{sec:modattr}).
 
 The contents of a \gls{dynamic} are set using the command:\\[10pt]
-\cmdname{setdynamiccontents}\verb/{/\meta{id}\verb+}{+\meta{contents}\verb'}'\\[10pt]
-where \meta{id} is the unique \IDN\ associated with that
+\cmdname{setdynamiccontents}\marg{\meta{id}}\marg{\meta{contents}}\\[10pt]
+where \meta{id} is the unique \gls{idn}\ associated with that
 \gls{dynamic}, and \meta{contents} is the contents of the
-\gls{dynamic}. Alternatively, if you have assigned an \IDL, 
+\gls{dynamic}. Alternatively, if you have assigned an \gls{idl}, 
 \meta{label}, to the \gls{dynamic}, you can use the starred 
 version:\\[10pt]
-\cmdname{setdynamiccontents*}\verb/{/\meta{label}\verb+}{+\meta{contents}\verb'}'\\[10pt]
-There is no environment equivalent.
+\cmdname{setdynamiccontents*}\marg{\meta{label}}\marg{\meta{contents}}\\[10pt]
+As from version 1.09, the contents can also be set using the 
+\env{dynamiccontents} environment:\\[10pt]
+\verb|\begin{dynamiccontents}|\marg{\meta{id}}\\[10pt]
+or the \env{dynamiccontents*} environment:\\[10pt]
+\verb|\begin{dynamiccontents*}|\marg{label}\\[10pt]
+\label{pg:verb}Note that you can not use verbatim text within the 
+\env{dynamiccontents} or \env{dynamiccontents*} environments.
 
 You can additionally append text to a \gls{dynamic} using
 either:\\[10pt]
-\cmdname{appenddynamiccontents}\verb/{/\meta{id}\verb+}{+\meta{contents}\verb'}'\\[10pt]
+\cmdname{appenddynamiccontents}\marg{\meta{id}}\marg{\meta{contents}}\\[10pt]
 or:\\[10pt]
-\cmdname{appenddynamiccontents*}\verb/{/\meta{label}\verb+}{+\meta{contents}\verb'}'\\[10pt]
+\cmdname{appenddynamiccontents*}\marg{\meta{label}}\marg{\meta{contents}}\\[10pt]
 
 You can make the chapter titles (if \cmdname{chapter} is defined)
 appear in a dynamic frame using the command
-\cmdname{dfchaphead}\verb"{"\meta{IDN}\verb"}"
-where \meta{IDN} is the \IDN\ of the dynamic frame. There is
+\cmdname{dfchaphead}\marg{\meta{IDN}}
+where \meta{IDN} is the \gls{idn}\ of the dynamic frame. There is
 also a starred version of this command if you want to
-use the \IDL\ instead of the \IDN. For example, in this 
+use the \gls{idl}\ instead of the \gls{idn}. For example, in this 
 document, I used the command:
 \begin{verbatim}
 \dfchaphead*{chaphead}
 \end{verbatim}
 
-The headers and footers can be turned into \gls{dynamic}s
+The headers and footers can be turned into \glspl{dynamic}
 using the command \cmdname{makedfheaderfooter}. This will
-create two \gls{dynamic}s with \IDL{}s \texttt{header} and
+create two \glspl{dynamic} with \glspl{idl} \texttt{header} and
 \texttt{footer}.  The page style will be used as usual, but
 you can then move or resize the header and footer using
 \cmdname{setdynamicframe} (described next).
@@ -653,7 +673,7 @@ you can then move or resize the header and footer using
 \section{Determining the Location of the Typeblock}
 \label{sec:typeblockloc}
 
-As mentioned above, when you create new \useGlosentry{frame}{frames},
+As mentioned above, when you create new \glspl{frame},
 you must specify their location relative to the \gls{typeblock}, but
 what if you want to position a \gls{frame} a set distance from the
 edge of the paper? The \sty{flowfram} package provides the following
@@ -661,33 +681,33 @@ commands that compute the distance from the \gls{typeblock} to the
 paper boundary:
 
 \begin{itemize}
-\item \cmdname{computeleftedgeodd}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computeleftedgeodd}\marg{\meta{length}}
 
 Compute the position of the left edge of the (odd) page, relative to
 the left side of the \gls{typeblock}, and store the result in 
 \cmdname{length}.
 
-\item \cmdname{computeleftedgeeven}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computeleftedgeeven}\marg{\meta{length}}
 
 As above, but for even pages.
 
-\item \cmdname{computetopedge}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computetopedge}\marg{\meta{length}}
 
 Compute the top edge of the page, relative to the bottom of the
 \gls{typeblock}, and store the result in \meta{length}.
 
-\item \cmdname{computebottomedge}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computebottomedge}\marg{\meta{length}}
 
 Compute the bottom edge of the page, relative to the bottom of the
 \gls{typeblock}, and store the result in \meta{length}
 
-\item \cmdname{computerightedgeodd}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computerightedgeodd}\marg{\meta{length}}
 
 Compute the position of the right edge of the (odd) page, relative to
 the left side of the \gls{typeblock}, and store the result in 
 \cmdname{length}.
 
-\item \cmdname{computerightedgeeven}\verb"{"\meta{length}\verb"}"
+\item \cmdname{computerightedgeeven}\marg{\meta{length}}
 
 As above, but for even pages.
 \end{itemize}
@@ -715,49 +735,48 @@ assumes odd and even pages have the same margins):
 \chapter{Modifying Frame Attributes}
 \label{sec:modattr}
 
-Once you have defined the \useGlosentry{flow}{flow frames},
-\useGlosentry{static}{static frames} and 
-\useGlosentry{dynamic}{dynamic frames}, their attributes
-can be changed. The three types of \gls{frame} mostly have the 
-same set of attributes, but some are specific to a certain type.
+Once you have defined the \glspl{flow}, \glspl{static} and
+\glspl{dynamic}, their attributes can be changed. The three types of
+\gls{frame} mostly have the same set of attributes, but some are
+specific to a certain type.
 \\[10pt]
-\useGlosentry{flow}{Flow frame} attributes are modified using 
+\Gls{flow} attributes are modified using 
 either the command:\\[10pt]
-\cmdname{setflowframe}\verb/{/\meta{idn list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
+\cmdname{setflowframe}\marg{\meta{idn list}}\marg{\meta{key-val list}}\\[10pt]
 or the starred version:\\[10pt]
-\cmdname{setflowframe*}\verb/{/\meta{label list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
-or the attributes for all \useGlosentry{flow}{flow frames} can be
+\cmdname{setflowframe*}\marg{\meta{label list}}\marg{\meta{key-val list}}\\[10pt]
+or the attributes for all \glspl{flow} can be
 set using:\\[10pt]
-\cmdname{setallflowframes}\verb+{+\meta{key-val list}\verb!}!
+\cmdname{setallflowframes}\marg{\meta{key-val list}}
 \\[10pt]
-\useGlosentry{static}{Static frame} attributes are modified 
+\Gls{static} attributes are modified 
 using either the command:\\[10pt]
-\cmdname{setstaticframe}\verb/{/\meta{idn list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
+\cmdname{setstaticframe}\marg{\meta{idn list}}\marg{\meta{key-val list}}\\[10pt]
 or the starred version:\\[10pt]
-\cmdname{setstaticframe*}\verb/{/\meta{label list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
-or the attributes for all \useGlosentry{static}{static frames} 
+\cmdname{setstaticframe*}\marg{\meta{label list}}\marg{\meta{key-val list}}\\[10pt]
+or the attributes for all \glspl{static} 
 can be set using:\\[10pt]
-\cmdname{setallstaticframes}\verb+{+\meta{key-val list}\verb!}!
+\cmdname{setallstaticframes}\marg{\meta{key-val list}}
 \\[10pt]
-\useGlosentry{dynamic}{Dynamic frame} attributes are modified 
+\Gls{dynamic} attributes are modified 
 using either the command:\\[10pt]
-\cmdname{setdynamicframe}\verb/{/\meta{idn list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
+\cmdname{setdynamicframe}\marg{\meta{idn list}}\marg{\meta{key-val list}}\\[10pt]
 or the starred version:\\[10pt]
-\cmdname{setdynamicframe*}\verb/{/\meta{label list}\verb+}{+\meta{key-val list}\verb!}!\\[10pt]
-or the attributes for all \useGlosentry{dynamic}{dynamic frames} 
+\cmdname{setdynamicframe*}\marg{\meta{label list}}\marg{\meta{key-val list}}\\[10pt]
+or the attributes for all \glspl{dynamic} 
 can be set using:\\[10pt]
-\cmdname{setalldynamicframes}\verb+{+\meta{key-val list}\verb!}!
+\cmdname{setalldynamicframes}\marg{\meta{key-val list}}
 \\[10pt]
 In each of the above, \meta{idn list} can either be one of the
 keywords: \texttt{all}, \texttt{odd} or \texttt{even} (indicating
-all \useGlosentry{frame}{frames} of that type, 
-\useGlosentry{frame}{frames} of that type whose \IDN\
-is odd or \useGlosentry{frame}{frames} of that type whose \IDN\ 
+all \glspl{frame} of that type, 
+\glspl{frame} of that type whose \gls{idn}
+is odd or \glspl{frame} of that type whose \gls{idn}
 is even), or it can be a comma-separated list of ID numbers, or 
-\IDN\ ranges.
+\gls{idn} ranges.
 
 For the starred versions, \meta{label list} should be
-a comma-separated list of \IDL{}s. Note that you can 
+a comma-separated list of \glspl{idl}. Note that you can 
 not use the above keywords, or have ranges with the 
 starred versions.
 
@@ -790,12 +809,12 @@ containing the document text and chapter headings, respectively,
 on even pages.
 
 You can swap the odd and even values using the commands:
-\cmdname{ffswapoddeven}\verb"{"\meta{IDN}\verb"}" (for 
-\gls{flow}s) \cmdname{sfswapoddeven}\verb"{"\meta{IDN}\verb"}"
-(for \gls{static}s) or 
-\cmdname{dfswapoddeven}\verb"{"\meta{IDN}\verb"}". These
+\cmdname{ffswapoddeven}\marg{\meta{IDN}} (for 
+\glspl{flow}) \cmdname{sfswapoddeven}\marg{\meta{IDN}}
+(for \glspl{static}) or 
+\cmdname{dfswapoddeven}\marg{\meta{IDN}}. These
 commands all have starred versions which take the frame's
-\IDL\ instead of its \IDN.
+\gls{idl}\ instead of its \gls{idn}.
 
 \item[\key{eveny}=\meta{length}] The y-coordinate of the 
 \gls{frame} for all even pages on which it is defined, but only if
@@ -812,13 +831,13 @@ if the document is two-sided.
 \item[\key{valign}=\meta{pos}] Change the vertical alignment
 of material inside a \staticordynamic. The value \meta{pos}
 may be one of: \texttt{c}, \texttt{t} or \texttt{b}.
-The default for \gls{static}s is \texttt{c}, the default
-for \gls{dynamic}s is \texttt{t}.
-This key is not available for \gls{flow}s.
+The default for \glspl{static} is \texttt{c}, the default
+for \glspl{dynamic} is \texttt{t}.
+This key is not available for \glspl{flow}.
 
 \item[\key{label}=\meta{text}] Assign an IDL to the \gls{frame}.
 (If you do not specify a label when you first define a \gls{frame}
-it will be given a label identical to its \IDN.) This key is
+it will be given a label identical to its \gls{idn}.) This key is
 provided to allow the user to label frames that have been 
 generated by certain predefined layout commands described
 in \autoref{sec:layouts}.
@@ -849,12 +868,12 @@ user-defined border.  This is the distance from the outer
 edge of the left hand border to the left edge of the
 \gls{bbox} of the text inside the border.  The \sty{flowfram}
 package is able to compute the border for the following
-known \gls{fcmd}s: \cmdname{fbox}, \cmdname{ovalbox},
+known \glspl{fcmd}: \cmdname{fbox}, \cmdname{ovalbox},
 \cmdname{Ovalbox}, \cmdname{doublebox} and \cmdname{shadowbox}. 
 For all other borders, the offset is assumed to be
 $-$\cmdname{flowframesep}$-$\cmdname{flowframerule}.
-If you define your own \useGlosentry{fcmd}{frame} 
-\useGlosentry{fcmd}{making} \useGlosentry{fcmd}{command}, 
+If you define your own \glslink{fcmd}{frame} 
+\glslink{fcmd}{making} \glslink{fcmd}{command}, 
 you may need to 
 specify the offset explicitly, or the flow/static/dynamic frames 
 may end up shifted to the right or left.
@@ -895,14 +914,14 @@ only extends as far as the \gls{bbox}, not the border.
 If you want it to extend as far as the border, you
 will need to define your own border type (see above).
 
-\item[\key{pages}=\meta{page list}] The \useGlosentry{pglist}{list of 
+\item[\key{pages}=\meta{page list}] The \glslink{pglist}{list of 
 pages} for which the \gls{frame}
 should appear. This can either have the values: \texttt{all},
 \texttt{even}, \texttt{odd} or \texttt{none} (the latter 
 removes the \gls{frame} from that point on---useful if you
 have multiple pages with the same number), or it can be a 
 comma-separated list of single pages, or 
-\useGlosentry{pgrange}{page ranges}.
+\glspl{pgrange}.
 For example:
 \begin{verbatim}
 \setdynamicframe{1}{pages=1,5,8-10}
@@ -912,7 +931,7 @@ For example:
 the \gls{flow} that its corresponding margin should go on. This
 can take the values \texttt{left}, \texttt{right}, 
 \texttt{inner} or \texttt{outer}. This setting is only available
-for \gls{flow}s.
+for \glspl{flow}.
 
 \item[\key{clear}=\meta{boolean}] 
 If this value is set, the static or dynamic frame will be 
@@ -922,7 +941,7 @@ occurrence of \cmdname{setstaticcontents} or the
 \env{staticcontents} environment, or the 
 \cmdname{setdynamiccontents}, depending on the frame type.
 This value is not set by default. This setting is not 
-available for \gls{flow}s.
+available for \glspl{flow}.
 
 For example, to prevent the chapter heading reappearing on
 every page, I have used the command:
@@ -945,7 +964,7 @@ for example:
 \end{verbatim}
 which will make the text for all the dynamic frames come out in 
 bold.  To unset a style, do \verb/style=none/.
-This setting is only available for \gls{dynamic}s.
+This setting is only available for \glspl{dynamic}.
 
 \item[\key{angle}=\meta{n}]  Rotate the contents of the
 \gls{frame} by \meta{n} degrees (new to 
@@ -963,7 +982,7 @@ details.
 \label{sec:parshape}
 
 As from version 1.03, it is now possible to specify 
-non-rectangular \staticordynamic{}s (but not \gls{flow}s).  Note 
+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 
@@ -1096,49 +1115,72 @@ The \sty{flowfram} package currently does not support any other
 paragraph shape making commands. Any other commands would
 have to be used explicitly within the contents of the frame.
 
+\section{Determining the Dimensions and Locations of Frames}
+
+It is possible to determine the dimensions and locations
+of a \gls{frame} using one of the following commands:
+
+\begin{itemize}
+\item \cmdname{getstaticbounds}\marg{\meta{IDN}}
+\item \cmdname{getstaticbounds*}\marg{\meta{IDL}}
+\item \cmdname{getflowbounds}\marg{\meta{IDN}}
+\item \cmdname{getflowbounds*}\marg{\meta{IDL}}
+\item \cmdname{getdynamicbounds}\marg{\meta{IDN}}
+\item \cmdname{getdynamicbounds*}\marg{\meta{IDL}}
+\end{itemize}
+
+For each command, the starred version takes an \gls{idl}\ as the
+argument, and the unstarred version takes an \gls{idn}\ as the
+argument.  Each command stores the relevant information in the
+lengths \cmdname{ffareawidth}, \cmdname{ffareaheight},
+\cmdname{ffareax} and \cmdname{ffareay}
+
 \chapter{Predefined Layouts}
 \label{sec:layouts}
 
 The \sty{flowfram} package has a number of commands which 
-create \gls{frame}s in a predefined layout. These commands
+create \glspl{frame} in a predefined layout. These commands
 may only be used in the preamble.
 
 \section{Column Styles}
 
 The standard \LaTeX\ commands \cmdname{onecolumn} and
 \cmdname{twocolumn} are redefined to create one or two
-\gls{flow}s that fill the entire \gls{typeblock} separated
+\glspl{flow} that fill the entire \gls{typeblock} separated
 from each other (in the case of \cmdname{twocolumn}) by a
 gap of width \cmdname{columnsep}. The height of these
-\gls{flow}s may not be exactly as high as the \gls{typeblock},
+\glspl{flow} may not be exactly as high as the \gls{typeblock},
 as their height is adjusted to make them an integer
 multiple of \cmdname{baselineskip}. You can switch off this
 automatic adjustment using the command: \cmdname{ffvadjustfalse}.
 
 The \cmdname{onecolumn} and \cmdname{twocolumn} commands
 also take an optional argument which is the \gls{pglist}
-for which those \gls{flow}s are defined. In addition
+for which those \glspl{flow} are defined. In addition
 to \cmdname{onecolumn} and \cmdname{twocolumn}, the 
 following commands are also defined:
 
 \begin{itemize}
-\item \cmdname{Ncolumn}\verb"["\meta{pages}\verb"]{"\meta{n}\verb"}"
+\item \cmdname{Ncolumn}\oarg{\meta{pages}}\marg{\meta{n}}
 
-Create \meta{n} column \gls{flow}s each separated by a 
+Create \meta{n} column \glspl{flow} each separated by a 
 distance of \cmdname{columnsep}.
 
-\item \cmdname{onecolumninarea}\verb"["\meta{pages}\verb"]{"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{onecolumninarea}\oarg{\meta{pages}}%
+\marg{\meta{width}}\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
 This creates a single \gls{flow} to fill the given area,
 adjusting the height so that it is an integer multiple of
 \cmdname{baselineskip}.
 
-\item \cmdname{twocolumninarea}\verb"["\meta{pages}\verb"]{"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{twocolumninarea}\oarg{\meta{pages}}%
+\marg{\meta{width}}\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
-This creates two column \gls{flow}s separated by a distance
+This creates two column \glspl{flow} separated by a distance
 of \cmdname{columnsep} filling the entire area specified.
 
-\item \cmdname{Ncolumninarea}\verb"["\meta{pages}\verb"]{"\meta{n}\verb"}{"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{Ncolumninarea}\oarg{\meta{pages}}\marg{\meta{n}}%
+\marg{\meta{width}}\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
 A more general form of \cmdname{twocolumninarea} making 
 \meta{n} frames instead of two.
@@ -1146,17 +1188,17 @@ A more general form of \cmdname{twocolumninarea} making
 
 \section{Column Styles with an Additional Frame}
 
-As well as the column style of \gls{flow}s defined 
+As well as the column style of \glspl{flow} defined 
 above, it is also possible to define
 \meta{n} columns with an additional frame spanning either 
 above or below them. There will be a vertical gap of 
-approximately\footnote{It may not be exact, as the \gls{flow}s
+approximately\footnote{It may not be exact, as the \glspl{flow}
 are adjusted so that their height is an integer multiple
 of \cmdname{baselineskip}, which may increase the gap.} 
 \cmdname{vcolumnsep} between the columns
 and the extra frame. In each of the following definitions,
 the argument \meta{pages} is the \gls{pglist} for which
-the \gls{frame}s are defined, \meta{n} is the number of
+the \glspl{frame} are defined, \meta{n} is the number of
 columns required, \meta{type} is the type of frame to go
 above or below the columns (this may be one of: \texttt{flow},
 \texttt{static} or \texttt{dynamic}). The area in which the
@@ -1169,40 +1211,47 @@ The height of the additional frame at the top or bottom of
 the columns is given by \meta{H}.
 
 \begin{itemize}
-\item \cmdname{onecolumntopinarea}\verb"["\meta{pages}\verb"]{"\meta{type}\verb"}{"\meta{H}\verb"}"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{onecolumntopinarea}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}\marg{\meta{width}}%
+\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
 One \gls{flow} with a \meta{type} frame above it, filling
 the area specified.
 
-\item \cmdname{twocolumntopinarea}\verb"["\meta{pages}\verb"]{"\meta{type}\verb"}{"\meta{H}\verb"}"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{twocolumntopinarea}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}\marg{\meta{width}}%
+\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
-Two column style \gls{flow}s with a \meta{type} frame above
+Two column style \glspl{flow} with a \meta{type} frame above
 them, filling the area specified.
 
-\item \cmdname{Ncolumntopinarea}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{n}\verb"}{"\meta{H}\verb"}"%
-\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"%
-\meta{y}\verb"}"
+\item \cmdname{Ncolumntopinarea}\oarg{\meta{pages}}\marg{\meta{type}}%
+\marg{\meta{n}}\marg{\meta{H}}\marg{\meta{width}}\marg{\meta{height}}%
+\marg{\meta{x}}\marg{\meta{y}}
 
-\meta{n} column style \gls{flow}s with a \meta{type} frame 
+\meta{n} column style \glspl{flow} with a \meta{type} frame 
 above them, filling the area specified.
 
-\item \cmdname{onecolumnbottominarea}\verb"["\meta{pages}\verb"]{"\meta{type}\verb"}{"\meta{H}\verb"}"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{onecolumnbottominarea}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}\marg{\meta{width}}%
+\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
 One \gls{flow} with a \meta{type} frame underneath it, filling
 the area specified.
 
-\item \cmdname{twocolumnbottominarea}\verb"["\meta{pages}\verb"]{"\meta{type}\verb"}{"\meta{H}\verb"}"\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"\meta{y}\verb"}"
+\item \cmdname{twocolumnbottominarea}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}\marg{\meta{width}}%
+\marg{\meta{height}}\marg{\meta{x}}\marg{\meta{y}}
 
-Two column style \gls{flow}s with a \meta{type} frame below 
+Two column style \glspl{flow} with a \meta{type} frame below 
 them, filling the area specified.
 
-\item \cmdname{Ncolumnbottominarea}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{n}\verb"}{"\meta{H}\verb"}"%
-\meta{width}\verb"}{"\meta{height}\verb"}{"\meta{x}\verb"}{"%
-\meta{y}\verb"}"
+\item \cmdname{Ncolumnbottominarea}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{n}}\marg{\meta{H}}%
+\marg{\meta{width}}\marg{\meta{height}}\marg{\meta{x}}%
+\marg{\meta{y}}
 
-\meta{n} column style \gls{flow}s with a \meta{type} frame 
+\meta{n} column style \glspl{flow} with a \meta{type} frame 
 below them, filling the area specified.
 
 \end{itemize}
@@ -1210,38 +1259,38 @@ below them, filling the area specified.
 The following commands are special cases of the above:
 
 \begin{itemize}
-\item \cmdname{onecolumntop}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{onecolumntop}\oarg{\meta{pages}}\marg{\meta{type}}%
+\marg{\meta{H}}
 
 As \cmdname{onecolumntopinarea} where the area is the entire
 \gls{typeblock}.
 
-\item \cmdname{twocolumntop}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{twocolumntop}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}
 
 As \cmdname{twocolumntopinarea} where the area is the entire
 \gls{typeblock}.
 
-\item \cmdname{Ncolumntop}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{n}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{Ncolumntop}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{n}}\marg{\meta{H}}
 
 As \cmdname{Ncolumntopinarea} where the area is the entire
 \gls{typeblock}.
 
-\item \cmdname{onecolumnbottom}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{onecolumnbottom}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}
 
 As \cmdname{onecolumnbottominarea} where the area is the entire
 \gls{typeblock}.
 
-\item \cmdname{twocolumnbottom}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{twocolumnbottom}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{H}}
 
 As \cmdname{twocolumnbottominarea} where the area is the entire
 \gls{typeblock}.
 
-\item \cmdname{Ncolumnbottom}\verb"["\meta{pages}\verb"]{"%
-\meta{type}\verb"}{"\meta{n}\verb"}{"\meta{H}\verb"}"
+\item \cmdname{Ncolumnbottom}\oarg{\meta{pages}}%
+\marg{\meta{type}}\marg{\meta{n}}\marg{\meta{H}}
 
 As \cmdname{Ncolumnbottominarea} where the area is the entire
 \gls{typeblock}.
@@ -1250,23 +1299,23 @@ As \cmdname{Ncolumnbottominarea} where the area is the entire
 
 \section{Backdrop Effects}
 
-\useGlosentry{static}{Static frames} can be used to produce a 
+\Glspl{static} can be used to produce a 
 backdrop. There are a number of commands which create
-\gls{static}s that can be used as a backdrop. In the
+\glspl{static} that can be used as a backdrop. In the
 following definitions, \meta{pages} is the \gls{pglist} for
-which those \gls{static}s are defined (all is the default). 
+which those \glspl{static} are defined (all is the default). 
 For the vertical strips:
 \meta{xoffset} is the amount by which the frames should be
 shifted horizontally (0pt by default), \meta{W1} is the width of the first frame,
-with colour specified by \meta{C1} and \IDL\ \meta{L1},
+with colour specified by \meta{C1} and \gls{idl}\ \meta{L1},
 and so on up to \meta{Wn} the width of the \meta{n}th frame
-with colour specified by \meta{Cn} and \IDL\ \meta{Ln}.
+with colour specified by \meta{Cn} and \gls{idl}\ \meta{Ln}.
 For the vertical strips:
 \meta{yoffset} is the amount by which the frames should be
 shifted vertically (0pt by default), \meta{H1} is the height of the first frame,
-with colour specified by \meta{C1} and \IDL\ \meta{L1},
+with colour specified by \meta{C1} and \gls{idl}\ \meta{L1},
 and so on up to \meta{Hn} the height of the \meta{n}th frame
-with colour specified by \meta{Cn} and \IDL\ \meta{Ln}.
+with colour specified by \meta{Cn} and \gls{idl}\ \meta{Ln}.
 
 \textbf{NOTE:} unlike the earlier commands, these commands
 are all relative to the actual page, not the \gls{typeblock}.
@@ -1282,30 +1331,34 @@ e.g.\ \verb"{[rgb]{1,0,1}}" not \verb"[rgb]{1,0,1}".
 \subsection{Vertical stripe effects}
 
 \begin{itemize}
-\item \cmdname{vtwotone}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{W2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{vtwotone}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{W1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{W2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
 Create a two tone vertical strip effect. (This command was
 used to create the coloured background on the title page
 of this document.)
 
-\item \cmdname{vNtone}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{n}\verb"}{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
-\ldots\verb"{"\meta{Wn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\item \cmdname{vNtone}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{n}}\marg{\meta{W1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\ldots\marg{\meta{Wn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
-Similar to \cmdname{vtwotone} but with \meta{n} \gls{static}s 
+Similar to \cmdname{vtwotone} but with \meta{n} \glspl{static} 
 instead of two.
 
-\item \cmdname{vtwotonebottom}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{H}\verb"}{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{W2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{vtwotonebottom}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{H}}\marg{\meta{W1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{W2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
-Similar to \cmdname{vtwotone} but the \gls{static}s are only
+Similar to \cmdname{vtwotone} but the \glspl{static} are only
 \meta{H} high, instead of the entire height of the page.
 The frames are aligned along the bottom edge of the page.
 
-\item \cmdname{vtwotonetop}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{H}\verb"}{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{W2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{vtwotonetop}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{H}}\marg{\meta{W1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{W2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
-Similar to \cmdname{vtwotone} but the \gls{static}s are only
+Similar to \cmdname{vtwotone} but the \glspl{static} are only
 \meta{H} high, instead of the entire height of the page.
 The frames are aligned along the top edge of the page.
 (This command was used to create the border effect along
@@ -1313,16 +1366,20 @@ the top of every page in this document. Two \cmdname{vtwotonetop}
 commands were used, one for the even pages, and the other
 for the odd pages.)
 
-\item \cmdname{vNtonebottom}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{H}\verb"}{"\meta{n}\verb"}{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
+\item \cmdname{vNtonebottom}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{H}}\marg{\meta{n}}\marg{\meta{W1}}\marg{\meta{C1}}%
+\marg{\meta{L1}}%
 \ldots\linebreak
-\verb"{"\meta{Wn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\marg{\meta{Wn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
 More general version of \cmdname{vtwotonebottom} but for
 \meta{n} frames.
 
-\item \cmdname{vNtonetop}\verb"["\meta{pages}\verb"]["\meta{xoffset}\verb"]{"\meta{H}\verb"}{"\meta{n}\verb"}{"\meta{W1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
+\item \cmdname{vNtonetop}\oarg{\meta{pages}}\oarg{\meta{xoffset}}%
+\marg{\meta{H}}\marg{\meta{n}}\marg{\meta{W1}}\marg{\meta{C1}}%
+\marg{\meta{L1}}%
 \ldots\linebreak
-\verb"{"\meta{Wn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\marg{\meta{Wn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
 More general version of \cmdname{vtwotonetop} but for
 \meta{n} frames.
@@ -1332,48 +1389,51 @@ More general version of \cmdname{vtwotonetop} but for
 \subsection{Horizontal stripe effect}
 
 \begin{itemize}
-\item \cmdname{htwotone}\verb"["\meta{pages}\verb"]["\meta{yoffset}\verb"]{"\meta{H1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{H2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{htwotone}\oarg{\meta{pages}}\oarg{\meta{yoffset}}%
+\marg{\meta{H1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{H2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
 Create a two tone horizontal strip effect.
 
-\item \cmdname{hNtone}\verb"["\meta{pages}\verb"]["\meta{yoffset}\verb"]{"\meta{n}\verb"}{"\meta{H1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
+\item \cmdname{hNtone}\oarg{\meta{pages}}\oarg{\meta{yoffset}}%
+\marg{\meta{n}}\marg{\meta{H1}}\marg{\meta{C1}}\marg{\meta{L1}}%
 \ldots\linebreak
-\verb"{"\meta{Hn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\marg{\meta{Hn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
-Similar to \cmdname{htwotone} but with \meta{n} \gls{static}s 
+Similar to \cmdname{htwotone} but with \meta{n} \glspl{static} 
 instead of two.
 
-\item \cmdname{htwotoneleft}\verb"["\meta{pages}\verb"]["\meta{yoffset}\verb"]{"\meta{W}\verb"}{"\meta{H1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{H2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{htwotoneleft}\oarg{\meta{pages}}\oarg{\meta{yoffset}}%
+\marg{\meta{W}}\marg{\meta{H1}}\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{H2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
-Similar to \cmdname{htwotone} but the \gls{static}s are only
+Similar to \cmdname{htwotone} but the \glspl{static} are only
 \meta{W} wide, instead of the entire width of the page.
 The frames are aligned along the left edge of the page.
 
-\item \cmdname{htwotoneright}\verb"["\meta{pages}\verb"]["%
-\meta{yoffset}\verb"]{"\meta{W}\verb"}{"\meta{H1}\verb"}{"%
-\meta{C1}\verb"}{"\meta{L1}%
-\verb"}{"\meta{H2}\verb"}{"\meta{C2}\verb"}{"\meta{L2}\verb"}"
+\item \cmdname{htwotoneright}\oarg{\meta{pages}}%
+\oarg{\meta{yoffset}}\marg{\meta{W}}\marg{\meta{H1}}%
+\marg{\meta{C1}}\marg{\meta{L1}}%
+\marg{\meta{H2}}\marg{\meta{C2}}\marg{\meta{L2}}
 
-Similar to \cmdname{htwotone} but the \gls{static}s are only
+Similar to \cmdname{htwotone} but the \glspl{static} are only
 \meta{W} wide, instead of the entire width of the page.
 The frames are aligned along the right edge of the page.
 
-\item \cmdname{hNtoneleft}\verb"["\meta{pages}\verb"]["%
-\meta{yoffset}\verb"]{"\meta{W}\verb"}{"\meta{n}\verb"}{"%
-\meta{H1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
+\item \cmdname{hNtoneleft}\oarg{\meta{pages}}%
+\oarg{\meta{yoffset}}\marg{\meta{W}}\marg{\meta{n}}%
+\marg{\meta{H1}}\marg{\meta{C1}}\marg{\meta{L1}}%
 \ldots\linebreak
-\verb"{"\meta{Hn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\marg{\meta{Hn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
 More general version of \cmdname{htwotoneleft} but for
 \meta{n} frames.
 
-\item \cmdname{hNtoneright}\verb"["\meta{pages}\verb"]["%
-\meta{yoffset}\verb"]{"\meta{W}\verb"}{"\meta{n}\verb"}{"%
-\meta{H1}\verb"}{"\meta{C1}\verb"}{"\meta{L1}\verb"}"%
+\item \cmdname{hNtoneright}\oarg{\meta{pages}}%
+\oarg{\meta{yoffset}}\marg{\meta{W}}\marg{\meta{n}}%
+\marg{\meta{H1}}\marg{\meta{C1}}\marg{\meta{L1}}%
 \ldots\linebreak
-\verb"{"\meta{Hn}\verb"}{"\meta{Cn}\verb"}{"\meta{Ln}\verb"}"
+\marg{\meta{Hn}}\marg{\meta{Cn}}\marg{\meta{Ln}}
 
 More general version of \cmdname{htwotoneright} but for
 \meta{n} frames.
@@ -1383,25 +1443,25 @@ More general version of \cmdname{htwotoneright} but for
 \subsection{Background Frame}
 
 To make a single \gls{static} covering the entire page, use:
-\cmdname{makebackgroundframe}\verb"["\meta{pages}\verb"]["\meta{IDL}\verb"]". Note that this \gls{static} should be created
-before any other \gls{static} as it will obscure all other
-\gls{static}s created before it if it is given a background
-colour.
+\cmdname{makebackgroundframe}\oarg{\meta{pages}}\oarg{\meta{IDL}}.
+Note that this \gls{static} should be created before any other
+\gls{static} as it will obscure all other \glspl{static} created before
+it if it is given a background colour.
 
 \subsection{Vertical and Horizontal Rules}
 
 You can create vertical or horizontal rules between two
-\gls{frame}s using the commands:
+\glspl{frame} using the commands:
 
 \begin{itemize}
 
-\item \cmdname{insertvrule}\verb"["\meta{y top}\verb"]["%
-\meta{y bottom}\verb"]{"\meta{T1}\verb"}{"\meta{IDN1}\verb"}{"%
-\meta{T2}\verb"}{"\meta{IDN2}\verb"}"
+\item \cmdname{insertvrule}\oarg{\meta{y top}}"%
+\oarg{\meta{y bottom}}\marg{\meta{T1}}\marg{\meta{IDN1}}%
+\marg{\meta{T2}}\marg{\meta{IDN2}}
 
 This creates a new \gls{static} which fits between \meta{T1}
-\gls{frame} with \IDN\ \meta{IDN1} and \meta{T2} \gls{frame}
-with \IDN\ \meta{IDN2}, and places a vertical rule in it
+\gls{frame} with \gls{idn}\ \meta{IDN1} and \meta{T2} \gls{frame}
+with \gls{idn}\ \meta{IDN2}, and places a vertical rule in it
 extending from the highest point of the highest frame to
 the lowest point of the lowest frame. The first optional
 argument \meta{y top} (default 0pt) extends the rule by that 
@@ -1409,15 +1469,17 @@ much above the highest point, and the second optional argument
 \meta{y bottom} (default 0pt) extends the rule by that much 
 below the lowest point. If either of the optional arguments
 are negative, the rule will be shortened instead of extended.
-The width of the rule is given by \cmdname{columnseprule}.
+The width of the rule is given by \cmdname{ffcolumnseprule}.
+\textbf{Note} that this has changed as from version 1.09: versions
+prior to 1.09 used \cmdname{columnseprule}.
 
-\item \cmdname{inserthrule}\verb"["\meta{x left}\verb"]["%
-\meta{x right}\verb"]{"\meta{T1}\verb"}{"\meta{IDN1}\verb"}{"%
-\meta{T2}\verb"}{"\meta{IDN2}\verb"}"
+\item \cmdname{inserthrule}\oarg{\meta{x left}}%
+\oarg{\meta{x right}}\marg{\meta{T1}}\marg{\meta{IDN1}}%
+\marg{\meta{T2}}\marg{\meta{IDN2}}
 
 This creates a new \gls{static} which fits between \meta{T1}
-\gls{frame} with \IDN\ \meta{IDN1} and \meta{T2} \gls{frame}
-with \IDN\ \meta{IDN2}, and places a horizontal rule in it
+\gls{frame} with \gls{idn}\ \meta{IDN1} and \meta{T2} \gls{frame}
+with \gls{idn}\ \meta{IDN2}, and places a horizontal rule in it
 extending from the leftmost point of the left frame to
 the rightmost point of the right frame. The first optional
 argument \meta{x left} (default 0pt) extends the rule by that 
@@ -1425,13 +1487,13 @@ much before the leftmost point, and the second optional argument
 \meta{x right} (default 0pt) extends the rule by that much 
 beyond the rightmost point. If either of the optional arguments
 are negative, the rule will be shortened instead of extended.
-The height of the rule is given by \cmdname{columnseprule}.
+The height of the rule is given by \cmdname{ffcolumnseprule}.
 
 \end{itemize}
 
-The default value for \cmdname{columnseprule} is 2pt.
+The default value for \cmdname{ffcolumnseprule} is 2pt.
 Both of the above commands have starred versions which allow
-you to identify the \gls{frame} by \IDL\ instead of \IDN.
+you to identify the \gls{frame} by \gls{idl}\ instead of \gls{idn}.
 The \gls{frame} types, \meta{T1} and \meta{T2} can be one of
 the following keywords: \texttt{flow}, \texttt{static}
 or \texttt{dynamic}.
@@ -1455,8 +1517,8 @@ title---default), \pkgopt{ttbnotitle} (don't show the title),
 If you want thumbtabs in your document, you need to use
 the command
 \begin{center}
-\cmdname{makethumbtabs}\verb"["\meta{y 
-offset}\verb"]{"\meta{height}\verb"}["\meta{section type}\verb"}"
+\cmdname{makethumbtabs}\oarg{\meta{y offset}}\marg{\meta{height}}%
+\oarg{\meta{section type}}
 \end{center} 
 in the document
 preamble. By default, the topmost thumbtab is level with the
@@ -1497,15 +1559,16 @@ correct place when the link has been rotated, so this may
 also cause a problem.
 
 The thumbtab attributes can be changed using 
-\cmdname{setthumbtab}\verb"{"\meta{n}\verb"}{"\meta{key value
-list}\verb"}", where \meta{n} is the thumbtab number starting
+\cmdname{setthumbtab}\marg{\meta{n}}\marg{\meta{key value
+list}}, where \meta{n} is the thumbtab number starting
 from 1 (for the top thumbtab) to \verb"\value{maxthumbtabs}"
 (for the bottom thumbtab). Note that these numbers are not
-related to the \gls{frame} \IDN{}s.
+related to the \gls{frame} \glspl{idn}.
 
 To just change the settings for the thumbtab index, use
-\cmdname{setthumbtabindex}\verb"{"\meta{n}\verb"}{"\meta{key value list}\verb"}". The \meta{key value list} for both these
-commands is the same as that for \cmdname{setdynamicframe}.
+\cmdname{setthumbtabindex}\marg{\meta{n}}\marg{\meta{key value list}}.
+The \meta{key value list} for both these commands is the same as that
+for \cmdname{setdynamicframe}.
 
 By default, the thumbtabs have a grey background. In this
 document, I have used:
@@ -1536,21 +1599,21 @@ with the hyperref package.
 In this document, after each chapter heading, there is a
 mini table of contents for that chapter. To enable minitocs,
 use the command 
-\cmdname{enableminitoc}\verb"["\meta{section type}\verb"]".
+\cmdname{enableminitoc}\oarg{\meta{section type}}.
 The default \meta{section type} is the same as the thumbtabs.
 
 If you want the minitocs to appear in a \gls{dynamic}, you
-can use \cmdname{appenddfminitoc}\verb"{"\meta{IDN}\verb"}"
-where \meta{IDN} is the \IDN\ of the appropriate \gls{dynamic}.
+can use \cmdname{appenddfminitoc}\marg{\meta{IDN}}
+where \meta{IDN} is the \gls{idn}\ of the appropriate \gls{dynamic}.
 There is also a starred version available if you want to 
-use the \IDL\ instead of the \IDN.
+use the \gls{idl}\ instead of the \gls{idn}.
 
 For example, in this document I have used the command:
 \begin{verbatim}
 \appenddfminitoc*{chaphead}
 \end{verbatim}
 in the preamble, which has appended the minitocs to the
-\gls{dynamic} with \IDL\ \texttt{chaphead}.
+\gls{dynamic} with \gls{idl}\ \texttt{chaphead}.
 
 The style of the minitoc text is given by the command
 \cmdname{minitocstyle} which takes one argument, the contents
@@ -1609,8 +1672,8 @@ its border, for the standard border types.
 
 \item \cmdname{flowframerule}
 This is the width of the \gls{frame}'s border, if using
-a border given by a \useGlosentry{fcmd}{frame}
-\useGlosentry{fcmd}{making command} that uses \cmdname{fboxsep}
+a border given by a \glslink{fcmd}{frame}
+\glslink{fcmd}{making command} that uses \cmdname{fboxsep}
 to set its border width (e.g.\ \cmdname{fbox}).
 
 \item \cmdname{sdfparindent}
@@ -1630,17 +1693,22 @@ when using \cmdname{Ncolumn} or \cmdname{Ncolumnhead} etc
 
 \chapter{Troubleshooting}
 
+For an up-to-date list of frequently asked questions, see
+\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/}.
+If you have a query that is not addressed here, please try there
+before contacting me.
+
 \section{General Queries}
 
 \begin{enumerate}
-\item If all my \gls{flow}s are only defined on, say, 
+\item If all my \glspl{flow} are only defined on, say, 
 pages 1-10, what happens if I then add some extra text so that
 the document exceeds 10 pages?
 
 The output routine will create a new \gls{flow} the size 
 of the \gls{typeblock}, and use that.
 
-\item Can I use the formatted page number in \gls{pglist}s?
+\item Can I use the formatted page number in \glspl{pglist}?
 
 No.
 
@@ -1649,7 +1717,7 @@ No.
 When the output routine finishes with one \gls{flow}
 it looks for the next \gls{flow} defined on that page,
 if there are none left, it then searches through the \gls{pglist}
-of all the defined \gls{flow}s to see if the next page 
+of all the defined \glspl{flow} to see if the next page 
 lies in that range, if there are none defined on that page,
 it ships out that page, and tries the next page. 
 This gives rise to two problems:
@@ -1678,7 +1746,7 @@ using the \key{shape} key (see \autoref{sec:parshape}).
 Note that the \gls{bbox} will still appear as a rectangle with
 the dimensions of the given \gls{frame} which may not correspond
 to the assigned shape.
-This function is not available for \gls{flow}s.
+This function is not available for \glspl{flow}.
 
 \item Why has the text from my \gls{flow} appeared in a
 \gls{static} or \gls{dynamic}?
@@ -1687,7 +1755,7 @@ Assuming you haven't inadvertently set that text as the contents
 of the \staticordynamic, the frames are most likely 
 overlapping (see \autoref{sec:stacking}).
 In an attempt to clarify what's going on, suppose you have 
-defined a \gls{static}, a \gls{dynamic} and two \gls{flow}s. The 
+defined a \gls{static}, a \gls{dynamic} and two \glspl{flow}. The 
 following is an approximate\footnote{The pedantic may point out 
 that \TeX\ may make several attempts to fill in the flow frames 
 depending on penalties and so on.} analogy: \TeX\ has a sheet of 
@@ -1697,7 +1765,7 @@ rectangle denoting the \gls{typeblock}.  The paper is put to one
 side for now.  \TeX\ also has four rectangular sheets
 of transparent paper. The first (which I shall call sheet~1)
 represents the \gls{static}, the next two (which I shall call
-sheets~2 and~3) represent the \gls{flow}s, and the last one
+sheets~2 and~3) represent the \glspl{flow}, and the last one
 (which I shall call sheet~4) represents the \gls{dynamic}.
 \TeX\ starts work on filling sheet~2 with the document text.
 Once it has put as much text on that sheet as it considers 
@@ -1728,7 +1796,7 @@ overfull hbox that's causing the text to poke out the side of the
 
 \item Why do I get lots of overfull hbox messages?
 
-Probably because you have narrow \gls{frame}s.
+Probably because you have narrow \glspl{frame}.
 
 \item What happens if I use a command or environment
 that switches to two-column mode (e.g. \env{theindex})?
@@ -1746,21 +1814,27 @@ Use the \key{valign} key in  \cmdname{setstaticframe} or
 \cmdname{setdynamicframe} (new to version 1.03).
 
 \item\label{itm:absval} How do I compute the distance from the edge
-of the page instead of the typeblock?
+of the page instead of the \gls{typeblock}?
 
 See \autoref{sec:typeblockloc}.
+
+\item Is there a GUI I can use to make it easier to create the
+\glspl{frame}?
+
+Yes, JpgfDraw which can be downloaded from:
+\url{http://theoval.cmp.uea.ac.uk/~nlct/jpgfdraw/}
 \end{enumerate}
 
 \section{Unexpected Output}
 
 \begin{enumerate}
-\item The lines at the beginning of my \gls{flow}s are the
+\item The lines at the beginning of my \glspl{flow} are the
 wrong width.
 
-This is a problem that will occur if you have \gls{flow}s
+This is a problem that will occur if you have \glspl{flow}
 with different widths, as the change in \cmdname{hsize}
 does not come into effect until a paragraph break. So if
-you have a paragraph that spans two \gls{flow}s, the end
+you have a paragraph that spans two \glspl{flow}, the end
 of the paragraph at the beginning of the second \gls{flow}
 will retain the width it had at the start of the 
 paragraph at the bottom of the previous \gls{flow}. You can
@@ -1768,7 +1842,7 @@ fix the problem by inserting \cmdname{framebreak} at the
 point where the \gls{frame} break occurs 
 (see \autoref{sec:framebreak}).
 
-\item My \gls{frame}s shift to the right when I add a border.
+\item My \glspl{frame} shift to the right when I add a border.
 
 This may occur if you use a border that is not recognised
 by the \sty{flowfram} package. You will need to set the
@@ -1792,12 +1866,12 @@ to:
 
 \item I don't have any output.
 
-All your \gls{flow}s are empty. \TeX\ doesn't put the
+All your \glspl{flow} are empty. \TeX\ doesn't put the
 frames onto the page until it has finished putting text
-into the \gls{flow}s. So if there is no text to go in the
-\gls{flow}s it won't output the page. If you only want the
-\gls{static}s or \gls{dynamic}s filled in, and nothing 
-outside of them, just do \verb|\mbox{}\finishthispage|. 
+into the \glspl{flow}. So if there is no text to go in the
+\glspl{flow} it won't output the page. If you only want the
+\glspl{static} or \glspl{dynamic} filled in, and nothing 
+outside of them, just do \verb|\mbox{}\clearpage|. 
 This will put
 an invisible something with zero area into your
 \gls{flow}, but it's enough to convince \TeX\ that the
@@ -1813,17 +1887,17 @@ See the previous answer.
 The paragraph indentation in \staticordynamic{}s is governed
 by the length \cmdname{sdfparindent} which is set to 0pt by
 default. To make the indentation the same as that used by 
-\gls{flow}s place the following in the preamble:
+\glspl{flow} place the following in the preamble:
 \begin{verbatim}
 \setlength{\sdfparindent}{\parindent}
 \end{verbatim}
 
 \item My section numbering is in the wrong order
 
-Remember that the contents of the \gls{dynamic}s are not set
+Remember that the contents of the \glspl{dynamic} are not set
 until the page is shipped out, and the contents will be set
-in the order of \IDN, so if you have any sectioning commands
-occuring within \gls{dynamic}s, they may not be set in the same
+in the order of \gls{idn}, so if you have any sectioning commands
+occuring within \glspl{dynamic}, they may not be set in the same
 order as they are in your input file.
 
 \item The contents of my \staticordynamic\ have shifted
@@ -1845,7 +1919,7 @@ This specifies a line with overall length
 \item \verb/Illegal unit of measure (pt inserted)/
 
 All lengths must have units. Remember to include the
-units when defining new \gls{frame}s. The following
+units when defining new \glspl{frame}. The following
 keys require lengths: \texttt{width}, \texttt{height},
 \texttt{x}, \texttt{y} and \texttt{offset}\footnote{%
 \texttt{offset} can also have the value \texttt{compute}}.
@@ -1856,11 +1930,11 @@ keys require lengths: \texttt{width}, \texttt{height},
 possible causes:
 
 \begin{enumerate}
-\item You have used an \IDL\ instead of an \IDN. If you
+\item You have used an \gls{idl}\ instead of an \gls{idn}. If you
 want to refer to a frame by its label, you need to remember
 to use the starred versions of the 
 \verb/\set/\meta{type}\verb/frame/ commands, or when setting
-the contents of \gls{static}s or \gls{dynamic}s.
+the contents of \glspl{static} or \glspl{dynamic}.
 
 \item When specifying page lists, you have mixed keywords
 with page ranges. For example: \texttt{1,even} is invalid.
@@ -1868,19 +1942,19 @@ with page ranges. For example: \texttt{1,even} is invalid.
 
 \item \verb/Flow frame IDL '/\meta{label}\verb+' already defined+
 
-All \useacronym[s]{IDL} within each \gls{frame} type must be
+All \glspl{idl} within each \gls{frame} type must be
 unique. There are similar error messages for duplicate 
-\useacronym[s]{IDL} for \gls{static}s and \gls{dynamic}s.
+\glspl{idl} for \glspl{static} and \glspl{dynamic}.
 
 \item \verb/Can't find flow frame id/
 
-You have specified a non-existent \gls{flow} \IDL. There are
-similar error messages for \gls{static}s and \gls{dynamic}s.
+You have specified a non-existent \gls{flow} \gls{idl}. There are
+similar error messages for \glspl{static} and \glspl{dynamic}.
 Check to make sure you have spelt the label correctly, and
 check you are using the correct \gls{frame} type command.
-(For example, if a \gls{static} has the \IDL\ \texttt{mylabel},
+(For example, if a \gls{static} has the \gls{idl}\ \texttt{mylabel},
 and you attempt to do 
-\verb/\setflowframe*{mylabel}{/\meta{options}\verb/}/, 
+\cmdname{setflowframe*}\marg{mylabel}\marg{\meta{options}}, 
 then you will get this error, because \texttt{mylabel} refers
 to a \gls{static} not a \gls{flow}.)
 
@@ -1895,11 +1969,11 @@ The \texttt{clear} key is only available for \staticordynamic{}s.
 
 \item \verb/Key 'style' not available/
 
-The \texttt{style} key is only available for \gls{dynamic}s.
+The \texttt{style} key is only available for \glspl{dynamic}.
 
 \item \verb/Key 'margin' not available/
 
-The \texttt{margin} key is only available for \gls{flow}s.
+The \texttt{margin} key is only available for \glspl{flow}.
 
 \item \verb/Key 'shape' not available/
 
@@ -1932,6 +2006,18 @@ wrong with the toc (table of contents), ttb (thumbtab)
 or aux (auxiliary) files in the previous run. Try deleting
 them, and try again.
 
+\item \verb/No room for a new \skip/
+
+You have exceeded \TeX's 256 register limit. Use the \sty{etex}
+package.
+
+\item I get \verb|\verb illegal in command argument| when using
+verbatim text inside the \env{dynamiccontents} environment.
+
+You can not use verbatim text inside either the starred or
+unstarred version of the \env{dynamiccontents} environment.
+(See page~\pageref{pg:verb}.)
+
 \end{enumerate}
 \disablethumbtabs
 
@@ -1942,5 +2028,5 @@ them, and try again.
 % have a backcover:
 \setdynamicframe*{footer}{pages=none}
 \setstaticframe*{lastbackleft,lastbackright}{pages=even}
-\mbox{}\finishthispage
+\mbox{}\clearpage
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf b/Master/texmf-dist/doc/latex/flowfram/flowfram.pdf
index e2996344b57..328dd68d149 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/news.pdf b/Master/texmf-dist/doc/latex/flowfram/news.pdf
new file mode 100644
index 00000000000..f1a3740b4b8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/news.pdf
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/news.tex b/Master/texmf-dist/doc/latex/flowfram/news.tex
index bb2d8192f5a..c958b3c5284 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/news.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/news.tex
@@ -76,7 +76,7 @@
 \newstaticframe[1]{\rightW}{\rightH}{\rightX}{\rightY}[egg]
 
 % set contents
-\setstaticcontents*{egg}{\includegraphics{egg}}
+\setstaticcontents*{egg}{\includegraphics[scale=0.75]{egg}}
 
 % middle heading
 
@@ -110,7 +110,7 @@
 \newstaticframe[1]{0.8in}{0.8in}{0pt}{0pt}[sheep]
 
 % set contents
-\setstaticcontents*{sheep}{\includegraphics{sheep}}
+\setstaticcontents*{sheep}{\includegraphics[scale=0.75]{sheep}}
 
 \onecolumn[>1] % for any text that falls off the last page
 
diff --git a/Master/texmf-dist/doc/latex/flowfram/news2.pdf b/Master/texmf-dist/doc/latex/flowfram/news2.pdf
new file mode 100644
index 00000000000..0e8231046c7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/news2.pdf
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/news2.tex b/Master/texmf-dist/doc/latex/flowfram/news2.tex
index c5e404241d9..aef7680ff5c 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/news2.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/news2.tex
@@ -61,14 +61,14 @@
 
 \addtolength{\rightY}{\leftY}
 \addtolength{\rightY}{73mm}
-\setlength{\rightW}{1.1in}
+\setlength{\rightW}{0.9in}
 \setlength{\rightH}{1.5in}
 \setlength{\rightX}{\textwidth}
 \addtolength{\rightX}{-\rightW}
 \newstaticframe[1]{\rightW}{\rightH}{\rightX}{\rightY}[egg]
 
 % set contents
-\setstaticcontents*{egg}{\includegraphics[scale=2]{egg}}
+\setstaticcontents*{egg}{\includegraphics[scale=0.9]{egg}}
 
 % Right hand static frame
 
@@ -127,7 +127,7 @@
 \newstaticframe[1]{1.6in}{1.6in}{0pt}{0pt}[sheep]
 
 % set contents
-\setstaticcontents*{sheep}{\includegraphics[scale=2]{sheep}}
+\setstaticcontents*{sheep}{\includegraphics[scale=1.2]{sheep}}
 
 \setcounter{secnumdepth}{0}
 \setlength{\sdfparindent}{\parindent}
diff --git a/Master/texmf-dist/doc/latex/flowfram/poster.pdf b/Master/texmf-dist/doc/latex/flowfram/poster.pdf
new file mode 100644
index 00000000000..b7013ebfd58
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/poster.pdf
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/poster.tex b/Master/texmf-dist/doc/latex/flowfram/poster.tex
index 05fe2131f7d..05fe2131f7d 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/poster.tex
+++ b/Master/texmf-dist/doc/latex/flowfram/poster.tex
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/brochure.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/brochure.pdf
deleted file mode 100644
index f02e4cb97b4..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/brochure.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/egg.eps b/Master/texmf-dist/doc/latex/flowfram/samples/egg.eps
deleted file mode 100644
index 24ee44758dc..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/egg.eps
+++ /dev/null
@@ -1,200 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: egg.eps
-%%CreationDate: Sun Nov 20 16:24:31 2005
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 65 69
-%%EndComments
-%%BeginProlog
-% Use own dictionary to avoid conflicts
-10 dict begin
-%%EndProlog
-%%Page: 1 1
-% Translate for offset
-14.173228346456694 14.173228346456694 translate
-% Translate to begin of first scanline
-0 53.993250843644546 translate
-49.993750781152357 -53.993250843644546 scale
-% Image geometry
-50 54 8
-% Transformation matrix
-[ 50 0 0 54 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 50 string def
-/gstr 50 string def
-/bstr 50 string def
-{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop}
-true 3
-%%BeginData:         2935 ASCII Bytes
-colorimage
-li.4V^W#I%`P:d,s*t~>
-li.4RW0sloRAf?:s*t~>
-li.4FCF0o:->VE(s*t~>
-mJd4\](u%#](YUmJ,~>
-mJd4ZReaMqRe6(KJ,~>
-mJd4T7emr'7dfaFJ,~>
-mf*=HnFuVWnDWm:J,~>
-mf*=@[J.65[Ft'LJ,~>
-mf*=+)>>$M)8u%EJ,~>
-n,ECEoC`1@nc++~>
-n,EC;o==qOnc++~>
-n,EC$o,7VBnc++~>
-nG`LTnb)tLo)F4~>
-nG`LPn[\_ao)F4~>
-nG`LDnJVD_o)F4~>
-nG`L1nb)t)o)F4~>
-nG`KYn[\^jo)F4~>
-nG`J5nJVBPo)F4~>
-nc&U,n+Hb!oDa=~>
-nc&Tmn%&M&oDa=~>
-nc&T7mhu1OoDa=~>
-o)J%Lo`'F~>
-o)A^^mCE;io`'F~>
-o)A^Xm2>umo`'F~>
-o)A^)mIgOpo`'F~>
-o)A]gmCE:ro`'F~>
-o)A]*m2>t?o`'F~>
-oD\ghlh1>Wp&BO~>
-oD\gglad)op&BO~>
-oD\gflP]d#p&BO~>
-oD\g@lh1>/p&BO~>
-oD\g5lad)=p&BO~>
-oD\fklP]c(p&BO~>
-oD\g%lh1=ip&BO~>
-oD\fXlad(`p&BO~>
-oD\eSlP]aep&BO~>
-o`"pjqt:"#qt:"#p\"UdpA]X~>
-o`"pjqmlb8qmlb8pUUA(pA]X~>
-o`"piq\fG8q\fG8pDO&1pA]X~>
-o`"pUl1P,ApA]X~>
-o`"pPl+-lUpA]X~>
-o`"pAko'QPpA]X~>
-o`"p9l1P,%pA]X~>
-o`"p+l+-l0pA]X~>
-o`"oXko'PgpA]X~>
-o`"p(l1P+ipA]X~>
-o`"ocl+-khpA]X~>
-o`"nqko'P+pA]X~>
-o`"p)l1P+jpA]X~>
-o`"oXl+-k]pA]X~>
-o`"nIko'OXpA]X~>
-o`"p:l1P,&pA]X~>
-o`"o_l+-kdpA]X~>
-o`"n4ko'OCpA]X~>
-o`"pNl1P,:pA]X~>
-o`"oml+-krpA]X~>
-o`"n/ko'O>pA]X~>
-o`"p^l1P,JpA]X~>
-o`"p#l+-l(pA]X~>
-o`"n/ko'O>pA]X~>
-o`"p^l1P,JpA]X~>
-o`"p#l+-l(pA]X~>
-o`"n/ko'O>pA]X~>
-o`"pNrV$7%q=ah!q=XgJpA]X~>
-o`"omrOW":q7?S6q76R-pA]X~>
-o`"n/r>P\:q&986q&05NpA]X~>
-o`"p:r:]jqq"FLorVqB~>
-o`"o_r4;V1pq$8/rVqB~>
-o`"n4r#5;1p_rr/rVqB~>
-q>^=&lLsr_rr7K~>
-q>^="lFQ]trr7K~>
-q>^<ml5KBtrr7K~>
-r;ZL%lh9u^!<7Q~>
-r;ZL!lal`s!<7Q~>
-r;ZKllPfEs!<7Q~>
-s8V^%lh9r]J,~>
-s8V^!lal]rJ,~>
-s8V]llPfBrJ,~>
-!<;X$lLsl]J,~>
-!<;WulFQWrJ,~>
-!<;Wkl5K<rJ,~>
-o+1*Z!<2orq[\2~>
-o*afo!<2orq[7o~>
-o)\(o!<)iqqZ23~>
-pCI6&!4qLi!4r%,r=8o.J,~>
-pC$s"!1<)`!1<W_r<iW*J,~>
-pAt6m!']]e!'^8Zr;couJ,~>
-q@EH&!7gE/!7gcBJ,~>
-q@!0"!6XW=!6Y!7J,~>
-q>pHm!3>E(!3>emJ,~>
-!<<$/p\t6llh1>Wqu6Zqr;V9~>
-!<<$+p\t6klad)oqu6Zqr;V9~>
-!<<$!p\t6jlP]d#qu6Zqr;V9~>
-o)A^)mIgOpo`'F~>
-o)A]gmCE:ro`'F~>
-o)A]*m2>t?o`'F~>
-o)J%Lo`'F~>
-o)A^^mCE;io`'F~>
-o)A^Xm2>umo`'F~>
-nc&U,n+Hb!oDa=~>
-nc&Tmn%&M&oDa=~>
-nc&T7mhu1OoDa=~>
-nG`L1nb)t)o)F4~>
-nG`KYn[\^jo)F4~>
-nG`J5nJVBPo)F4~>
-nG`LTnb)tLo)F4~>
-nG`LPn[\_ao)F4~>
-nG`LDnJVD_o)F4~>
-n,ECEoC`1@nc++~>
-n,EC;o==qOnc++~>
-n,EC$o,7VBnc++~>
-mf37sqY'n!!9*GIJ,~>
-mf37oqRZY6!86lAJ,~>
-mf37eqAT>6!6"C,J,~>
-n,N:rr:^%!nGe"~>
-n,N:nr4;e6nGe"~>
-n,N:dr#5J6nGe"~>
-n,N:r"M_q?l,EQ2nGe"~>
-n,N:n"K7`mYaPCsnGe"~>
-n,N:d"D]>%)(,7^nGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;Z[*nGe"~>
-n,N:nr;Z[&nGe"~>
-n,N:dr;ZZqnGe"~>
-n,N:rr;ZX)nc++~>
-n,N:nr;ZX%nc++~>
-n,N:dr;ZWpnc++~>
-nc/Frr;ZL%p&BO~>
-nc/Fnr;ZL!p&BO~>
-nc/Fdr;ZKlp&BO~>
-oDeRrr;ZI$pA]X~>
-oDeRnr;ZHupA]X~>
-oDeRdr;ZHkpA]X~>
-o`+Xrr;ZI$pA]X~>
-o`+Xnr;ZHupA]X~>
-o`+Xdr;ZHkpA]X~>
-p&FasqZ$:#pA]X~>
-p&FaoqZ$9tpA]X~>
-p&FaeqZ$9jpA]X~>
-p&Fdtp]((#p&BO~>
-p&Fdpp]('tp&BO~>
-p&Fdfp]('jp&BO~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/news.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/news.pdf
deleted file mode 100644
index 2a9dd9cc99d..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/news.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/news2.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/news2.pdf
deleted file mode 100644
index 22223c09857..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/news2.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/poster.pdf b/Master/texmf-dist/doc/latex/flowfram/samples/poster.pdf
deleted file mode 100644
index f17725bcfea..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/poster.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sheep.eps b/Master/texmf-dist/doc/latex/flowfram/samples/sheep.eps
deleted file mode 100644
index 117bf0c58a2..00000000000
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sheep.eps
+++ /dev/null
@@ -1,176 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: GIMP PostScript file plugin V 1.17 by Peter Kirchgessner
-%%Title: sheep.eps
-%%CreationDate: Mon Nov 21 11:14:35 2005
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%Pages: 1
-%%BoundingBox: 14 14 56 48
-%%EndComments
-%%BeginProlog
-% Use own dictionary to avoid conflicts
-10 dict begin
-%%EndProlog
-%%Page: 1 1
-% Translate for offset
-14.173228346456694 14.173228346456694 translate
-% Translate to begin of first scanline
-0 33.115503665490088 translate
-41.754330708661421 -33.115503665490088 scale
-% Image geometry
-58 46 8
-% Transformation matrix
-[ 58 0 0 46 0 0 ]
-% Strings to hold RGB-samples per scanline
-/rstr 58 string def
-/gstr 58 string def
-/bstr 58 string def
-{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop}
-{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop}
-true 3
-%%BeginData:         7356 ASCII Bytes
-colorimage
-a8^Y~>
-a8^Y~>
-a8^Y~>
-g&D3SrVQKgrqc]oq#>j~>
-g&D*PrVZKmqu-<iJ,~>
-g&D3Sr;$0`rqQQlq#>j~>
-g&D3SrVQKgrqc]oq#>j~>
-g&D*PrVZKmqu-<iJ,~>
-g&D3Sr;$0`rqQQlq#>j~>
-li7"ao`#-pr;??_o()eM"SDKdqu-ElJ,~>
-li7"ao`#F#r;?<]naZ);nFQDNqYg<kJ,~>
-li7"ao`#F#qtp'VmHs6+m-jTBq>C-iJ,~>
-pAb$hs8Dcks8DoqrVZ`lqm-UeiSinboCMeVrVcbH~>
-pAb*jrVcZlrql`nqY^Hmq>7/ugtgfGlLONArVc]pJ,~>
-pAY-lr;HZnr;6Kis8;iorVQZiqi_?8eC<45mdBiIr;HYG~>
-q>^Hns8;oo!;c]j"Shfgq"Xd]s7lWi#5\/kq"*e9rNcgPb0&)ckihX8qu-PF~>
-q>UQrrVcZnqZQckq"XU_p]1'dp&Ojdq#:'kp[RG0rMg1A`5KgMjlQ%/qYgGE~>
-q>Uj%rVcWiq>'g[p@e1YpAX[aoD\@^pAFXeo^:\srK@Pn['[KihVR\rq>L>D~>
-q>^Hns8;oo!;c]j"Shfgq"Xd]s7lWi#5\/kq"*e9rNcgPb0&)ckihX8qu-PF~>
-q>UQrrVcZnqZQckq"XU_p]1'dp&Ojdq#:'kp[RG0rMg1A`5KgMjlQ%/qYgGE~>
-q>Uj%rVcWiq>'g[p@e1YpAX[aoD\@^pAFXeo^:\srK@Pn['[KihVR\rq>L>D~>
-qu?]q#Q4JrqY9aVo`"C`naGr7qsOm]nac8CoCMJ8gt_k7rj`9Kak>A4p%A7^s*t~>
-qu?]q%fH5$q=sUSo'u5=n*TN/qsFFPs7-*Z"7G:'f_qiLYm7bUe^`jTo_\XfJ,~>
-qu?]p%f?,!q"F7Jn*TK.lfmZsroj@G$L6sEmI0K2l/'\0rK@SXS=HC]b0&]5nbW7bJ,~>
-r;RB.r;?Edq"4+Emd06&kiLjbir7p9ireE+l0834"QnLbcG9Fcrj3$@^!+^YnF65Ps8RT~>
-r;RK0r;?Ecp[dn@m-3]qk2P=WhVI&Frnn1DjQ>UgkNCmXaN1pkWrB%+XgQ0gh!XV*rr<"K~>
-r;RK0qtp0]p$h>1k2YFXhqH`8e^W."rmq8,h;I5ji<7o[]"4d<PQ$dRQ_Cmte*6,jrr<"K~>
-r;RB.r;?Edq"4+Emd06&kiLjbir7p9ireE+l0834"QnLbcG9Fcrj3$@^!+^YnF65Ps8RT~>
-r;RK0r;?Ecp[dn@m-3]qk2P=WhVI&Frnn1DjQ>UgkNCmXaN1pkWrB%+XgQ0gh!XV*rr<"K~>
-r;RK0qtp0]p$h>1k2YFXhqH`8e^W."rmq8,h;I5ji<7o[]"4d<PQ$dRQ_Cmte*6,jrr<"K~>
-rVmK/r;-9ao()22j5](Rg=k0/ebmnreI1!^gt^cDhqQSt`4>cO$FI:[_q+,<p\k-lJ,~>
-rVmN0r;-9`nF5c*i8EDDe^`*pd*DX8%aNGJdad"&g=tB6c+Ufqql1"(YIqNrkiha=s8RT~>
-rVmN/qtTsYm-Nijf@SKsb0%`A_nl>f%`-*%`lZNOd*^7b^T=N+qi_AORB!:+iSjD+s8RT~>
-rVmN/qtKjTlg*Tdf%/6obKIuH`l7qq'#hl1aNMlSdF-IiahY^$['R(=rj)p=^:r"Vjn/KMrdX~>
-rVmN.qY'XPl07*XdF$.Y`5KO.^qTf]'#),q_SsU;bg"DT_mm4ZX/`0"ri-:,[^OB=iq**IrdX~>
-rVmN.q=O=Gj5\b9`PoO$['[*AYH7`('!/7=Z*h0S^;%FqZDFCcP`q:2rf[YSUSGNWg[P+>rdX~>
-s8W,u&cDFpo'>8nf[%X[_na%%]tD#U])TAN]t_G$`Q-$<_nEam[/709[(O&tjQ,q0rr.E~>
-s8W,u&c;@nn`eoee&fGB]XbM\[C!==ZN%6>[CEi\^;.Ou]=#&MX8An'XL,@ViSjA)rr.E~>
-s8W,t&c24gmGlaIa1JR[WhuSfTq@tUSI_<aT:r'[WN<;,XJqneR?[T4$'h0V]%G['qYpJE~>
-s8W,u&cDFpo'>8nf[%X[_na%%]tD#U])TAN]t_G$`Q-$<_nEam[/709[(O&tjQ,q0rr.E~>
-s8W,u&c;@nn`eoee&fGB]XbM\[C!==ZN%6>[CEi\^;.Ou]=#&MX8An'XL,@ViSjA)rr.E~>
-s8W,t&c24gmGlaIa1JR[WhuSfTq@tUSI_<aT:r'[WN<;,XJqneR?[T4$'h0V]%G['qYpJE~>
-s8W,t%/]bdmc<'Sc,76.]"%aKs0_s9[/RK4[KF%N]"J$UrNcR5[']e<$+7L]dH9Taqu6SF~>
-s8W,s&c21em,?IDa1SgfZEUO9Y-"i(XT,C*Y-5.:[/RK3WWK<'X8T%)XL>R\j5]e/rr.E~>
-s8W,s'D_4^kLmu!\#H'pSXPt7R$X/*Q2[*LQNW\ESXlGQU&C/VQB[X4P6mPMUV5I<nbW7aJ,~>
-s8W,s!;ZGss0_p8qm?=.r3ZL4"1PeM\,EW7\@&aCZjF7]`S'PAp\b$iJ,~>
-s8W,s!;QAis/u=%ri?!tr2]k"rNH1"!jA`.rMp7/^:r+\kk=rRrdX~>
-s8W,r!;H;Qs-NePrK[DIrKI2E#*kOAR@9S4rK@;OQBqN7$C.']XNBG[o_\XeJ,~>
-s8W,s!;ZGss0_p8qm?=.r3ZL4"1PeM\,EW7\@&aCZjF7]`S'PAp\b$iJ,~>
-s8W,s!;QAis/u=%ri?!tr2]k"rNH1"!jA`.rMp7/^:r+\kk=rRrdX~>
-s8W,r!;H;Qs-NePrK[DIrKI2E#*kOAR@9S4rK@;OQBqN7$C.']XNBG[o_\XeJ,~>
-"TSK!r:p)os0Md4rj;@)s0Vd5!4;^2&A,Nb\[JrQ][5$dnaZGRs8RT~>
-"TSK!r:g#es/Q."ri>^ls/Q7'Xf\]'WXuMBZEUL7WjKsmiU?72rVunJ~>
-"TSJuqt0]Js-*MIrfm)>s-3MK!1!MH&>,PcS!]S,TY8%klg+<Cs8RT~>
-"TSJuqtBils0V=&rj;^5s0Vg7&\Gls_o0F/^s:s!n+c\Urr<"K~>
-"TSJuqt9cbs/Y[is/Z.#s/Z1&&[T$\]Y1qh\B*O`mJ$APrr<"K~>
-"TSJtqXaNHs-3&;s-+@cQBmf$R$aJBWMuqsW27&Te`l_uqYpNpJ,~>
-%fcP*qt9@9imbuf]XG2Sn[&5%rj<?H\[fGoc-=_hfA,NXnFuhWrr2qJ~>
-%fcP)qXj+2hp9'P[&pC0nZ)Shri?^6YctUOa2cKSe(E^Kme6PTrr2qJ~>
-%fcP(q=3Uuf#"SmT9ke,nWX!;!1!PL&XSuVUTV,:_8jU@h!+(qqYL0is*t~>
-%fcP*qt9@9imbuf]XG2Sn[&5%rj<?H\[fGoc-=_hfA,NXnFuhWrr2qJ~>
-%fcP)qXj+2hp9'P[&pC0nZ)Shri?^6YctUOa2cKSe(E^Kme6PTrr2qJ~>
-%fcP(q=3Uuf#"SmT9ke,nWX!;!1!PL&XSuVUTV,:_8jU@h!+(qqYL0is*t~>
-%fcP)qXs77iR>fd]=,)Rn[&5%s0WHI\%B8gb15&!k2u%%q"Xddrr)kI~>
-%fcP(q=O"0hTimNZ`^@0nZ)Shs/Zg7YHtRH`6clbj5]Fqp\4Ubrr)kI~>
-%fcM&q!mIre\J>jT9tk-nWX!;'U=uMQ^OG:VmO@Zd+d=9me$/Krr2lrJ,~>
-%fcP*qt9@8iR>fd]XG2So<\A%s0W?F\@fJlcIpn3mHsN?rVcTmJ,~>
-%fcM(qXj+1hTimN[&pC0o;__hs/Z^4YI([LaOSi"lg+-:rVcTmJ,~>
-%fcM'q=3Rse\SDkT9ke,o99-;&XAZJQ^XS?Wk$6nf]D5_pAFjbs*t~>
-%fcP*qt9@8iR>fd]XG2So<\A%s0W?F\@fJlcIpn3mHsN?rVcTmJ,~>
-%fcM(qXj+1hTimN[&pC0o;__hs/Z^4YI([LaOSi"lg+-:rVcTmJ,~>
-%fcM'q=3Rse\SDkT9ke,o99-;&XAZJQ^XS?Wk$6nf]D5_pAFjbs*t~>
-%fcP*qtBF;j425l]XG2Spp9k)rj2U2%(3RV]>W%Nh!":up\XacJ,~>
-%fcP*qt9:5i6]<V[&pC0po=4lri5su%'6V<Zb=N6f]DVlpA=XbJ,~>
-%fcM'q=<\"f>FhsTU1n-plk]As-3SKrf[kWQ'IZ&T:`0rc->,3m.C,Ks*t~>
-%0->(qtKUBk1Il#^UO'Hs0Ma4s0W'>[C*BKZa9V;$amRW`6d>rl1=NAr:p;B~>
-%0->(qtBI<j4)#c\$#S.s/Q+"s/c4%"0AQ'Wr8t+XKo.FbLtS3naZAOq#>j~>
-%0-;%q=Nt,gW6b/Um_(Ds-!eSQ'R`&QBmf#PEYs0$^R?SX1cj*i9p%+qtU2A~>
-%fcP+r:ojIl.s_5`4WRgr3lX5"1G\K\Gj#>\$c.@%(!@R]>`4Vi9U%-q>L*gJ,~>
-&-)Y+qtT^Dk1Rr$]sOuHXo>L%XTku5Yd(F:YPkR&Wsl#0Za7Bjgt_/coD/=Zs*t~>
-&-)V)qY'=6hp/pKXIkoKQi<?[Q^3r(R@B\9S"#h3rg!MJ%$R!KSuocVe)Tocp\agdJ,~>
-%fcP+r:ojIl.s_5`4WRgr3lX5"1G\K\Gj#>\$c.@%(!@R]>`4Vi9U%-q>L*gJ,~>
-&-)Y+qtT^Dk1Rr$]sOuHXo>L%XTku5Yd(F:YPkR&Wsl#0Za7Bjgt_/coD/=Zs*t~>
-&-)V)qY'=6hp/pKXIkoKQi<?[Q^3r(R@B\9S"#h3rg!MJ%$R!KSuocVe)Tocp\agdJ,~>
-&-)Y,r;-*Smc2sPc,@B3^&,GC]tXK]s1]5\]"#8Z[^NTR^V@nAj5]P#pA=g`s*t~>
-&-)Y,r;$!Om,-=Ba1\sk[JR<=[C<ZU\[]/WZEUR9riHR3\$s9&hr!bmp%nU]s*t~>
-&-)Y+qtKXDkL[er\?)L%U&L_aT,ODuV5:&bUnO?JR[BG.QC=VFZc1PJk48*=r:p;B~>
-s8W,t%/]hkoBbGpf[7mcaN+;"s2P/]b5TTaaqMe3^V@Io]=bnu`mNT*kjnNDqu-<iJ,~>
-s8W,t$i9Vfn`eoee'#\J_>D"K_SlGms25Sc]!o/VZa7$K^qe.GjlQ"+p\Xpas*t~>
-s8W,s$i0J`mc2jJaM"sfYktU)Z*aM<s0Mp3W2-5_rgsRoYHPXbhVRVlp%eO\s*t~>
-s8W,u')_V"p@@P8j5&DA!7UuKe^i='rRq5%'@P1Kb/hTBa32lXg>qYgp%eF]rqQMD~>
-s8W,u')_Rup$h51i7ZZ2!7(WFd*^7irmV_6dF$4[`5KL,^VIe3bgtb=lh'uIr;HEjJ,~>
-s8W,u'DqRroBbMtf[%[]!5\^9_o9U8aSs<]`=p"t['[*@Y-54H^<>0kk4/3?qu-<iJ,~>
-s8W,u')_V"p@@P8j5&DA!7UuKe^i='rRq5%'@P1Kb/hTBa32lXg>qYgp%eF]rqQMD~>
-s8W,u')_Rup$h51i7ZZ2!7(WFd*^7irmV_6dF$4[`5KL,^VIe3bgtb=lh'uIr;HEjJ,~>
-s8W,u'DqRroBbMtf[%[]!5\^9_o9U8aSs<]`=p"t['[*@Y-54H^<>0kk4/3?qu-<iJ,~>
-rVmQ0qt^']oCMD8k2l['!!)'?jQ5S(k5XKTi8!#=ec5^#!8cSnm.9iDqtp?ds*t~>
-rVmQ0qt^'\o()/2j5U-s!!(s9iSrqtj8\$Mgt1'*d/X0n!8?/cl1+<<qYL-as*t~>
-rVnDGqY0aUmdB8sgY2_Z!!(X'f\50:gtUK6e'5tT`;fnU!79*Gj6l@.q>'s_s*t~>
-rVmE-rVQKgq"XRRnaQVJ!!)Ken,W%YnGhkgm-3WniW&u<!9iY6o(VnTr;?Qgs*t~>
-rVnDIrVQKfp\4@Nn*^8D!!)ESmdKZ6n*]N-lK7*chZ*Z5!9N>.nb2\Pr;?Nfs*t~>
-rVmB,r;-9bp%@nClg"Q7!!*#_!UB%NlMouZjP\eIec5^#!8cSpmI^&Gqtp?ds*t~>
-rVmE-rVQKgq"XRRnaQVJ!!)Ken,W%YnGhkgm-3WniW&u<!9iY6o(VnTr;?Qgs*t~>
-rVnDIrVQKfp\4@Nn*^8D!!)ESmdKZ6n*]N-lK7*chZ*Z5!9N>.nb2\Pr;?Nfs*t~>
-rVmB,r;-9bp%@nClg"Q7!!*#_!UB%NlMouZjP\eIec5^#!8cSpmI^&Gqtp?ds*t~>
-r;R9+rVcZkqtg-_pAjme!;HKfrqR9&p@e.Ln*fWD!:9dVnauVQqY^<jpA]X~>
-r;R?-rVcZjqYBp[p&Oac!;?0]rV.*#p%@qGmHs3>!:'XRn+6;Lq>C3ipA]X~>
-r;S5Fr;?Hfq=jUToDnF^!;#jTp@n:So^_SAm-3cs!!)-]lg+'5q"Xaar:^/@~>
-q>Uj%rVcZlqtgBi!!)oqr"]2.r;HNiq=s[Wo`,!b!;Q?bqu$Bjo`'F~>
-q>UQrrVcZnqZ[&s!!)lmqu-F*rVHBcp\"4O!!)Wkp\4L[r;?Ncs*t~>
-q>UQrr;?HkqAfS2!!)ikqYU3fqu$9cp@RqHnGiRZ!;,pXq>:'eo`'F~>
-q#C6j"9AE$!<2ips8N&rs8*0"!!)iqqtp<irr2NhJ,~>
-q#C6j"9AE$!<2ips8N&rs7uur!!)iqqtp<jrU^&>~>
-q#C?mrqus"r;ZisqZ$Tps82il$MXT$p]1-cqu$EkoDa=~>
-q#C6j"9AE$!<2ips8N&rs8*0"!!)iqqtp<irr2NhJ,~>
-q#C6j"9AE$!<2ips8N&rs7uur!!)iqqtp<jrU^&>~>
-q#C?mrqus"r;ZisqZ$Tps82il$MXT$p]1-cqu$EkoDa=~>
-o)Adlrr<&ls8W''r;Zir!<)lqnGe"~>
-o)Adlrr<&ls8Mus!!3#urr)?dJ,~>
-o)Adlrr<&ls8W$&qu?`p!;ucnnGe"~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)Adlrr<&is8N'"rrDHdJ,~>
-o)A^js8E#is8N'"rrDHdJ,~>
-o)A^js8E#is8N'"rrDHdJ,~>
-o)A^js8E#is8N'"rrDHdJ,~>
-o)A[in,NCf!<<#un,In~>
-o)A[in,NCf!<<#un,In~>
-o)A[in,NCf!<<#un,In~>
-o)J^inGiIfm/MS~>
-o)J^inGiIfm/MS~>
-o)J^inGiIfm/MS~>
-o)J^inGiIfm/MS~>
-o)J^inGiIfm/MS~>
-o)J^inGiIfm/MS~>
-%%EndData
-showpage
-%%Trailer
-end
-%%EOF
diff --git a/Master/texmf-dist/doc/latex/flowfram/sheep.eps b/Master/texmf-dist/doc/latex/flowfram/sheep.eps
new file mode 100644
index 00000000000..525aec2992e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/flowfram/sheep.eps
@@ -0,0 +1,135 @@
+%!PS-Adobe-1.0 EPSF-3.0
+%%BoundingBox: 0 796 58 842
+%%Creator: KDE 3.5.3-0.2.fc4 Red Hat
+%%CreationDate: Mon Aug 20 21:24:28 2007
+%%Orientation: Portrait
+%%Pages: 1
+%%DocumentFonts:
+
+%%EndComments
+%%BeginProlog
+% Prolog copyright 1994-2003 Trolltech. You may copy this prolog in any way
+% that is directly related to this document. For other use of this prolog,
+% see your licensing agreement for Qt.
+/d/def load def/D{bind d}bind d/d2{dup dup}D/B{0 d2}D/W{255 d2}D/ED{exch d}D
+/D0{0 ED}D/LT{lineto}D/MT{moveto}D/S{stroke}D/F{setfont}D/SW{setlinewidth}D
+/CP{closepath}D/RL{rlineto}D/NP{newpath}D/CM{currentmatrix}D/SM{setmatrix}D
+/TR{translate}D/SD{setdash}D/SC{aload pop setrgbcolor}D/CR{currentfile read
+pop}D/i{index}D/bs{bitshift}D/scs{setcolorspace}D/DB{dict dup begin}D/DE{end
+d}D/ie{ifelse}D/sp{astore pop}D/BSt 0 d/LWi 1 d/PSt 1 d/Cx 0 d/Cy 0 d/WFi
+false d/OMo false d/BCol[1 1 1]d/PCol[0 0 0]d/BkCol[1 1 1]d/BDArr[0.94 0.88
+0.63 0.50 0.37 0.12 0.06]d/defM matrix d/nS 0 d/GPS{PSt 1 ge PSt 5 le and{{
+LArr PSt 1 sub 2 mul get}{LArr PSt 2 mul 1 sub get}ie}{[]}ie}D/QS{PSt 0 ne{
+gsave LWi SW true GPS 0 SD S OMo PSt 1 ne and{BkCol SC false GPS dup 0 get
+SD S}if grestore}if}D/r28{{CR dup 32 gt{exit}if pop}loop 3{CR}repeat 0 4{7
+bs exch dup 128 gt{84 sub}if 42 sub 127 and add}repeat}D/rA 0 d/rL 0 d/rB{rL
+0 eq{/rA r28 d/rL 28 d}if dup rL gt{rA exch rL sub rL exch/rA 0 d/rL 0 d rB
+exch bs add}{dup rA 16#fffffff 3 -1 roll bs not and exch dup rL exch sub/rL
+ED neg rA exch bs/rA ED}ie}D/uc{/rL 0 d 0{dup 2 i length ge{exit}if 1 rB 1
+eq{3 rB dup 3 ge{1 add dup rB 1 i 5 ge{1 i 6 ge{1 i 7 ge{1 i 8 ge{128 add}if
+64 add}if 32 add}if 16 add}if 3 add exch pop}if 3 add exch 10 rB 1 add{dup 3
+i lt{dup}{2 i}ie 4 i 3 i 3 i sub 2 i getinterval 5 i 4 i 3 -1 roll
+putinterval dup 4 -1 roll add 3 1 roll 4 -1 roll exch sub dup 0 eq{exit}if 3
+1 roll}loop pop pop}{3 rB 1 add{2 copy 8 rB put 1 add}repeat}ie}loop pop}D
+/sl D0/QCIgray D0/QCIcolor D0/QCIindex D0/QCI{/colorimage where{pop false 3
+colorimage}{exec/QCIcolor ED/QCIgray QCIcolor length 3 idiv string d 0 1
+QCIcolor length 3 idiv 1 sub{/QCIindex ED/x QCIindex 3 mul d QCIgray
+QCIindex QCIcolor x get 0.30 mul QCIcolor x 1 add get 0.59 mul QCIcolor x 2
+add get 0.11 mul add add cvi put}for QCIgray image}ie}D/di{gsave TR 1 i 1 eq
+{false eq{pop true 3 1 roll 4 i 4 i false 4 i 4 i imagemask BkCol SC
+imagemask}{pop false 3 1 roll imagemask}ie}{dup false ne{/languagelevel
+where{pop languagelevel 3 ge}{false}ie}{false}ie{/ma ED 8 eq{/dc[0 1]d
+/DeviceGray}{/dc[0 1 0 1 0 1]d/DeviceRGB}ie scs/im ED/mt ED/h ED/w ED/id 7
+DB/ImageType 1 d/Width w d/Height h d/ImageMatrix mt d/DataSource im d
+/BitsPerComponent 8 d/Decode dc d DE/md 7 DB/ImageType 1 d/Width w d/Height
+h d/ImageMatrix mt d/DataSource ma d/BitsPerComponent 1 d/Decode[0 1]d DE 4
+DB/ImageType 3 d/DataDict id d/MaskDict md d/InterleaveType 3 d end image}{
+pop 8 4 1 roll 8 eq{image}{QCI}ie}ie}ie grestore}d/BF{gsave BSt 1 eq{BCol SC
+WFi{fill}{eofill}ie}if BSt 2 ge BSt 8 le and{BDArr BSt 2 sub get/sc ED BCol{
+1. exch sub sc mul 1. exch sub}forall 3 array astore SC WFi{fill}{eofill}ie}
+if BSt 9 ge BSt 14 le and{WFi{clip}{eoclip}ie defM SM pathbbox 3 i 3 i TR 4
+2 roll 3 2 roll exch sub/h ED sub/w ED OMo{NP 0 0 MT 0 h RL w 0 RL 0 h neg
+RL CP BkCol SC fill}if BCol SC 0.3 SW NP BSt 9 eq BSt 11 eq or{0 4 h{dup 0
+exch MT w exch LT}for}if BSt 10 eq BSt 11 eq or{0 4 w{dup 0 MT h LT}for}if
+BSt 12 eq BSt 14 eq or{w h gt{0 6 w h add{dup 0 MT h sub h LT}for}{0 6 w h
+add{dup 0 exch MT w sub w exch LT}for}ie}if BSt 13 eq BSt 14 eq or{w h gt{0
+6 w h add{dup h MT h sub 0 LT}for}{0 6 w h add{dup w exch MT w sub 0 exch LT
+}for}ie}if S}if BSt 24 eq{}if grestore}D/mat matrix d/ang1 D0/ang2 D0/w D0/h
+D0/x D0/y D0/ARC{/ang2 ED/ang1 ED/h ED/w ED/y ED/x ED mat CM pop x w 2 div
+add y h 2 div add TR 1 h w div neg scale ang2 0 ge{0 0 w 2 div ang1 ang1
+ang2 add arc}{0 0 w 2 div ang1 ang1 ang2 add arcn}ie mat SM}D/C D0/P{NP MT
+0.5 0.5 rmoveto 0 -1 RL -1 0 RL 0 1 RL CP fill}D/M{/Cy ED/Cx ED}D/L{NP Cx Cy
+MT/Cy ED/Cx ED Cx Cy LT QS}D/DL{NP MT LT QS}D/HL{1 i DL}D/VL{2 i exch DL}D/R
+{/h ED/w ED/y ED/x ED NP x y MT 0 h RL w 0 RL 0 h neg RL CP BF QS}D/ACR{/h
+ED/w ED/y ED/x ED x y MT 0 h RL w 0 RL 0 h neg RL CP}D/xr D0/yr D0/rx D0/ry
+D0/rx2 D0/ry2 D0/RR{/yr ED/xr ED/h ED/w ED/y ED/x ED xr 0 le yr 0 le or{x y
+w h R}{xr 100 ge yr 100 ge or{x y w h E}{/rx xr w mul 200 div d/ry yr h mul
+200 div d/rx2 rx 2 mul d/ry2 ry 2 mul d NP x rx add y MT x y rx2 ry2 180 -90
+x y h add ry2 sub rx2 ry2 270 -90 x w add rx2 sub y h add ry2 sub rx2 ry2 0
+-90 x w add rx2 sub y rx2 ry2 90 -90 ARC ARC ARC ARC CP BF QS}ie}ie}D/E{/h
+ED/w ED/y ED/x ED mat CM pop x w 2 div add y h 2 div add TR 1 h w div scale
+NP 0 0 w 2 div 0 360 arc mat SM BF QS}D/A{16 div exch 16 div exch NP ARC QS}
+D/PIE{/ang2 ED/ang1 ED/h ED/w ED/y ED/x ED NP x w 2 div add y h 2 div add MT
+x y w h ang1 16 div ang2 16 div ARC CP BF QS}D/CH{16 div exch 16 div exch NP
+ARC CP BF QS}D/BZ{curveto QS}D/CRGB{255 div 3 1 roll 255 div 3 1 roll 255
+div 3 1 roll}D/BC{CRGB BkCol sp}D/BR{CRGB BCol sp/BSt ED}D/WB{1 W BR}D/NB{0
+B BR}D/PE{setlinejoin setlinecap CRGB PCol sp/LWi ED/PSt ED LWi 0 eq{0.25
+/LWi ED}if PCol SC}D/P1{1 0 5 2 roll 0 0 PE}D/ST{defM SM concat}D/MF{true
+exch true exch{exch pop exch pop dup 0 get dup findfont dup/FontName get 3
+-1 roll eq{exit}if}forall exch dup 1 get/fxscale ED 2 get/fslant ED exch
+/fencoding ED[fxscale 0 fslant 1 0 0]makefont fencoding false eq{}{dup
+maxlength dict begin{1 i/FID ne{def}{pop pop}ifelse}forall/Encoding
+fencoding d currentdict end}ie definefont pop}D/MFEmb{findfont dup length
+dict begin{1 i/FID ne{d}{pop pop}ifelse}forall/Encoding ED currentdict end
+definefont pop}D/DF{findfont/fs 3 -1 roll d[fs 0 0 fs -1 mul 0 0]makefont d}
+D/ty 0 d/Y{/ty ED}D/Tl{gsave SW NP 1 i exch MT 1 i 0 RL S grestore}D/XYT{ty
+MT/xyshow where{pop pop xyshow}{exch pop 1 i dup length 2 div exch
+stringwidth pop 3 -1 roll exch sub exch div exch 0 exch ashow}ie}D/AT{ty MT
+1 i dup length 2 div exch stringwidth pop 3 -1 roll exch sub exch div exch 0
+exch ashow}D/QI{/C save d pageinit/Cx 0 d/Cy 0 d/OMo false d}D/QP{C restore
+showpage}D/SPD{/setpagedevice where{1 DB 3 1 roll d end setpagedevice}{pop
+pop}ie}D/SV{BSt LWi PSt Cx Cy WFi OMo BCol PCol BkCol/nS nS 1 add d gsave}D
+/RS{nS 0 gt{grestore/BkCol ED/PCol ED/BCol ED/OMo ED/WFi ED/Cy ED/Cx ED/PSt
+ED/LWi ED/BSt ED/nS nS 1 sub d}if}D/CLSTART{/clipTmp matrix CM d defM SM NP}
+D/CLEND{clip NP clipTmp SM}D/CLO{grestore gsave defM SM}D
+
+/LArr[ [] [] [ 10.000 3.000 ] [ 3.000 10.000 ] [ 3.000 3.000 ] [ 3.000 3.000 ] [ 5.000 3.000 3.000 3.000 ] [ 3.000 5.000 3.000 3.000 ] [ 5.000 3.000 3.000 3.000 3.000 ] [ 3.000 5.000 3.000 3.000 3.000 3.000 ] ] d
+/pageinit {
+% 210*297mm (portrait)
+0 842 translate 1 -1 scale/defM matrix CM d } d
+%%EndProlog
+%%BeginSetup
+%%EndSetup
+%%Page: 1 1
+%%BeginPageSetup
+QI
+%%EndPageSetup
+[1 0 0 1 0 0]ST
+CLSTART
+0 0 58 46 ACR
+CLEND
+B P1
+NB
+W BC
+/sl 2668 string uc
+îý´+*öA*V¹8º¼ùðãÁAYܺÆIAHÚñ/×Y³+¾ýüûÙ¶óðãíÍÞMêüûùñÍ+*ù-*=+Á+NH¸ò=1¼¶ïàÉYI½Xü
+¯¹êJ8P7¾ûÞÊî6ñìG¹õ/**üâP¾*GÍGùâ¿É?U´ëßÕYMAôëIÑ-åI½¼øð×±ÕXÏI½XÚ¶ï;Dü¹öîßÃ=Å8Û
+UÅ8ÛöêÇ=é»JGʳëàýÁ1ýʸÔ:1ÀIý¶4Õ̺öîݱݼëLÅ8û÷*JF¾ÝÌGÙ´ëØYµP»ùÈ»:1X³éÜ»MUÕìü
+7F.î¶óè½å8Gøðâضïß½ýô»**¼¶ïâÇEµìº×7ÔUµéR-*ÎÚ,éX@XFû=¶*ù-FúõíÒ=9HÚÕXVÙ´WزáÀÄ
+*ZëÙ¹õô7ÅJ¹éÔG·¶Þ?Ö´°ïàãÝ:ÐWâ¿ÙåÌÛöéÕ5õó³éÈ?Ù³éÔVÍ*¾²/Eø:*ÎâîP8LUÌÖê/X0ý>DFç
+¾ÀÀæ-*ÙÜ+ÞH¾+=ÙµíéÅÀ²3·*÷ÍWßç/F×·9ìØÓèØÉA5½ð·¯·CãßZÂÆÓEÈäõìÓE÷õíìñÁú1Ê=ð:Zã
+HõëÉôÛÑÚMž<èùöïÖKÆGÞ+êI3íëâ+Æ»°´µñÞÙÈ?Uµïæϳ-ï+ù<½ü±±ËTUFêسùP¼ûضÐXÛú¹OÜÅF
+æîßM9HÚ´,·2¹2Wß»=åÌûÚº÷1Qí÷Ù1YÚöéÃ5Ý×ç=A¸ÁÀ;NÚõðê×ÏÉAý2·T8ú¼÷åÍåܺ·YJE0÷ÀWMC
+PüXòßâ+´üûÙ¸÷õÖ°5·2µ7U´ÝYݼFÔº,ÞçÐOÙ´WÛ¸óÈÙµÁÌéGLÆâîæ;1ÞüGñʸ¾úóñØøðàÃ1ýW*:Á
+5A*6ÊÅH¶ØµýüÛFù÷ñ¯·Añ:¾ìëÉÕXÛöêÕYM*Í+*2G**X1*ÖæÏEQ8ÉλùüWÚ·ñ;C¯½ýOÔ6ë-ùUÆ-ݽ
+Ý»÷ð×UAìÃ-ö7*¾îàÃ5ïâá*¶ï¿Ið¸òÎ.,JÙô¶Q;Iý3ÖÜù?åI½¼ùðßÁ1¾Û-*ÞGºöîÁ,:ºóèÓM9»**
+L=ê÷ñèãÝóÏËâß+é÷ûôë-Z9**ù>½üû+*Þ¼îÅÉõìÛ¸**Ò-JîßѽX?åðß*î1*JBÞÇO¾úß1K3*JVL@µR
+.Z*ü-*î>=L=Ð÷ÄÛãßÆJÊJXµæ.·¶÷.·ä߯PÚìÂñ·¶V.ç×Kà·*
+d
+58 46[1 0 0 1 0 0]sl 8 false 0 0 di
+
+QP
+%%Trailer
+%%Pages: 1
+%%DocumentFonts:
+%%EOF
diff --git a/Master/texmf-dist/doc/latex/flowfram/samples/sheep.png b/Master/texmf-dist/doc/latex/flowfram/sheep.png
index d7cb3517613..d7cb3517613 100644
--- a/Master/texmf-dist/doc/latex/flowfram/samples/sheep.png
+++ b/Master/texmf-dist/doc/latex/flowfram/sheep.png