update shapepar.

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

6 files changed, 190 insertions, 88 deletions

diff --git a/Master/texmf-dist/doc/generic/shapepar/Canflagshape.def b/Master/texmf-dist/doc/generic/shapepar/Canflagshape.def
index 114014b60cc..1b76c6ea381 100644
--- a/Master/texmf-dist/doc/generic/shapepar/Canflagshape.def
+++ b/Master/texmf-dist/doc/generic/shapepar/Canflagshape.def
@@ -9,22 +9,22 @@
 {6.250} b{27.000} t{30.160}{3.680} b{37.000}\\
 {7.300} t{27.217}{1.654} t{29.600}{4.800} t{35.128}{1.654}\\
 {7.400} t{27.238}{1.812} j t{29.050}{5.900} j t{34.950}{1.812}\\
-{10.450} b{24.500} t{27.869}{8.262} b{39.500}\\
-{11.800} b{19.900} t{23.984}{1.768} t{28.148}{7.703} t{38.248}{1.768} b{44.100}\\
-{12.150} t{20.005}{2.651} t{23.850}{2.227} t{28.221}{7.559} t{37.923}{2.227} t{41.344}{2.651}\\
-{12.200} t{20.021}{3.029} j t{23.050}{3.073} t{28.231}{7.538} t{37.877}{3.073} j t{40.950}{3.029}\\
-{13.500} t{20.412}{6.917} t{28.500}{7.000} t{36.671}{6.917}\\
-{13.900} t{20.533}{7.167} j t{27.700}{8.600} j t{36.300}{7.167}\\
-{15.450} t{21.000}{22.000}\\
-{16.000} t{21.000}{22.000}\\
-{17.000} t{19.550}{24.900}\\
-{22.050} t{25.900}{12.200}\\
-{22.600} t{25.900}{12.200}\\
-{23.550} t{25.489}{5.961} s t{31.450}{1.100} s t{32.550}{5.961}\\
-{24.000} t{25.295}{2.980} t{31.600}{0.800} t{35.725}{2.980}\\
-{24.450} e{25.100} t{31.593}{0.815} e{38.900}\\
-{30.000} t{31.500}{1.000}\\
-{30.000} e{32.0}\\
+{10.45} b{24.500} t{27.869}{8.262} b{39.500}\\
+{11.80} b{19.900} t{23.984}{1.768} t{28.148}{7.703} t{38.248}{1.768} b{44.100}\\
+{12.15} t{20.005}{2.651} t{23.850}{2.227} t{28.221}{7.559} t{37.923}{2.227} t{41.344}{2.651}\\
+{12.20} t{20.021}{3.029} j t{23.050}{3.073} t{28.231}{7.538} t{37.877}{3.073} j t{40.950}{3.029}\\
+{13.50} t{20.412}{6.917} t{28.500}{7.000} t{36.671}{6.917}\\
+{13.90} t{20.533}{7.167} j t{27.700}{8.600} j t{36.300}{7.167}\\
+{15.45} t{21.000}{22.000}\\
+{16.00} t{21.000}{22.000}\\
+{17.00} t{19.550}{24.900}\\
+{22.05} t{25.900}{12.200}\\
+{22.60} t{25.900}{12.200}\\
+{23.55} t{25.489}{5.961} s t{31.450}{1.100} s t{32.550}{5.961}\\
+{24.00} t{25.295}{2.980} t{31.600}{0.800} t{35.725}{2.980}\\
+{24.45} e{25.100} t{31.593}{0.815} e{38.900}\\
+{30.00} t{31.500}{1.000}\\
+{30.00} e{32.0}\\
 %
 {0}b{48}\\
 {0}t{48}{16}\\
diff --git a/Master/texmf-dist/doc/generic/shapepar/README.shapepar b/Master/texmf-dist/doc/generic/shapepar/README.shapepar
index cb0322b03a1..4c95814282a 100644
--- a/Master/texmf-dist/doc/generic/shapepar/README.shapepar
+++ b/Master/texmf-dist/doc/generic/shapepar/README.shapepar
@@ -3,16 +3,20 @@ shapepar.sty  by Donald Arseneau.
 \shapepar: a macro to typeset paragraphs in a specific shape. The
 size is adjusted automatically so that the entire shape is filled
 with text. There can be no displayed math, and no "\vadjust"
-material (no "\vspace").  These macros work for both LaTeX and plain
+material (no "\vspace").  These macros work for both LaTeX and Plain
 TeX.  For LaTeX, specify \usepackage{shapepar}, or for Plain,
 \input shapepar.sty.
 
 Contents: 
 
-README.shapepar  this file
-shapepar.sty     macro definitions (for LaTeX or Plain TeX)
-shapepar.ltx     manual for shapepar (run latex shapepar.ltx)
-Canflagshape.def Canadian flag shape definition
-TeXshape.def     \TeX\ shape definition
-candleshape.def  burning candle shape definition (Timothy C. Burt)
-proshap.py       shape generator by Manuel Gutierrez Algaba
+README.shapepar    this file
+shapepar.sty       macro definitions (for LaTeX or Plain TeX)
+shapepar.ltx       manual for shapepar (run latex shapepar.ltx)
+shapepar.pdf       the processed manual
+Canflagshape.def   Canadian flag shape definition
+TeXshape.def       TeX shape definition
+candleshape.def    burning candle shape definition (Timothy C. Burt)
+dropshape.def      rain drop shapes
+triangleshapes.def triangles
+proshap.py         shape generator by Manuel Gutierrez Algaba
+
diff --git a/Master/texmf-dist/doc/generic/shapepar/dropshape.def b/Master/texmf-dist/doc/generic/shapepar/dropshape.def
new file mode 100644
index 00000000000..3694fdc6d41
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/shapepar/dropshape.def
@@ -0,0 +1,41 @@
+% from Gerhard A. Bachmaier (gerhard.bachmaier@meduni-graz.at)
+%
+% drops in two orientations
+%
+% version June 21th, 2006
+
+\def\dropshape{%
+{0.0}%
+{0.0}b{0}\\%
+{0.00}t{0}{0}
+{0.550}t{-0.433}{0.866}\\%
+{0.671}t{-0.483}{0.966}\\%
+{0.800}t{-0.500}{1.000}\\%
+{0.929}t{-0.483}{0.966}\\%
+{1.050}t{-0.433}{0.866}\\%
+{1.154}t{-0.354}{0.707}\\%
+{1.233}t{-0.250}{0.500}\\%
+{1.283}t{-0.129}{0.259}\\%
+{1.3}e{0}
+}
+\def\droppar#1{\Shapepar\dropshape #1\par}
+
+
+\def\dropupshape{%
+{0.0}%
+{0.0}b{0}\\%
+{0.017}t{-0.129}{0.259}\\%
+{0.067}t{-0.250}{0.500}\\%
+{0.146}t{-0.354}{0.707}\\%
+{0.250}t{-0.433}{0.866}\\%
+{0.371}t{-0.483}{0.966}\\%
+{0.500}t{-0.500}{1.000}\\%
+{0.629}t{-0.483}{0.966}\\%
+{0.750}t{-0.433}{0.866}\\%
+{1.3}t{0}{0}\\%
+{1.3}e{0}
+}
+\def\dropuppar#1{\Shapepar\dropupshape #1\par}
+
+\endinput
+
diff --git a/Master/texmf-dist/doc/generic/shapepar/shapepar.ltx b/Master/texmf-dist/doc/generic/shapepar/shapepar.ltx
index a583ad0d4a5..59919d795e6 100644
--- a/Master/texmf-dist/doc/generic/shapepar/shapepar.ltx
+++ b/Master/texmf-dist/doc/generic/shapepar/shapepar.ltx
@@ -1,14 +1,14 @@
 % shapepar.ltx   Manual for shapepar.sty
 %
-% Version 2.0  (Dec 2002)
+% Version 2.1  (September 2006)
 %
-% Copyright (c) 1993,2002    Donald Arseneau
+% Copyright (c) 1993,2002,2006    Donald Arseneau
 % These definitions may be freely transmitted, reproduced, or modified
 % provided that any modifications are clearly identified and this notice
 % is left intact.
 %
 
-\documentclass[draft]{article}
+\documentclass{article}
 \usepackage{shapepar}
 
 
@@ -18,6 +18,8 @@
 \renewcommand{\floatpagefraction}{.66}
 \renewcommand{\dbltopfraction}{.66} 
 \renewcommand{\dblfloatpagefraction}{.66}
+
+\sloppy
 \raggedbottom
 \addtolength{\topskip}{0pt plus 8pt}
 
@@ -74,7 +76,7 @@
 
 \title{shapepar.sty}
 \author{Donald Arseneau\\ Vancouver, Canada\\ asnd@triumf.ca}
-\date{v 2.0 \ Dec 2002}
+\date{v 2.1 \ September 2006}
 
 \begin{document}
 
@@ -123,7 +125,7 @@ intended for cards, invitations etc., not for whole books!  Although
 short paragraphs process much faster, only long paragraphs accurately
 fill complex shapes.
 
-These macros work for both \LaTeX\ and plain \TeX.  For \LaTeX, specify
+These macros work for both \LaTeX\ and Plain \TeX.  For \LaTeX, specify
 "\usepackage""{shapepar}", or for Plain, "\input" "shapepar.sty".
 
 The command "\shapepar" should be used at the beginning of a paragraph,
@@ -262,8 +264,8 @@ will usually be needed to position a shaped paragraph precisely.
 
 \section{Shapes}
 
-There are some shapes predefined in shapepar.sty (square, circle,
-circle-with-hole, diamond, heart, star and hex-nut) which are used as
+There are some shapes predefined in shapepar.sty (square, rectangle, circle,
+circle-with-hole, diamond, heart, star, hexagon and hex-nut) which are used as
 examples in the instructions below. Each of these shapes is stored in
 a macro, and there is a command to use that shape:
 \begin{flushleft}
@@ -275,18 +277,23 @@ a macro, and there is a command to use that shape:
 "\diamondshape" & "\diamondpar" & Rhomboid `diamond' ($\diamondsuit$)\\
 "\heartshape" & "\heartpar" & Heart (symbolic shape $\heartsuit$)\\
 "\starshape"  & "\starpar"  & Five-point star\\
-"\nutshape"   & "\nutpar"   & Nut for bolt (hexagon with circular hole)
+"\hexagonshape"&"\hexagonpar"& Hexagon\\
+"\nutshape"   & "\nutpar"   & Nut for bolt (hexagon with circular hole)\\
+\multicolumn{2}{l}{"\rectangleshape"\texttt{\string{<height>\string}\string{<width>\string}}} &
+    Rectangle shapes
 \end{tabular}
 \end{flushleft}
 For example, "\heartpar{"<text>"}" performs
 "\shapepar" "{\heartshape}" <text>"\ \ $""\heartsuit""$""\par"
-(ending the text with a heart symbol).
+(ending the text with a heart symbol). 
 
 More shape definitions are provided in separate files named
 $*$shape.def.  Look on your disk to be sure, but the
 list should include:
 \begin{flushleft}
 \begin{tabular}{ll}
+dropshape    & Rain drop\\
+triangleshapes & Triangles in different orientations\\
 candleshape  & A burning candle\\
 TeXshape     & The \TeX\ logo\\
 Canflagshape & The Canadian flag
@@ -299,55 +306,6 @@ Please contribute your shapes!
 Although defining shapes by hand can be difficult, there are
 programs to aid you.
 
-\subsection{proshap.py by Man\-uel Gu\-ti\-er\-rez Al\-ga\-ba}
-\gdef\bassshape{{9.4}{0}b{9.4}
-\\{0}t{7.6}{6.8}
-\\{0.8}t{5.2}{11.6}
-\\{1.6}t{4.4}{13.2}
-\\{2.4}t{4.0}{14.0}
-\\{3.2}t{3.6}{4.933333}st{8.533333}{4.933333}st{13.46666}{4.933333}
-\\{4.0}t{3.6}{2.4}t{9.6}{2.8}t{16.4}{2.4}
-\\{6.4}t{3.6}{2.0}t{10.0}{2.0}t{16.8}{2.0}
-\\{8.8}t{3.6}{2.4}t{9.6}{1.4}st{11.0}{1.4}t{16.4}{2.0}
-\\{11.2}t{3.6}{3.4}jt{7.0}{3.4}t{11.6}{3.4}jt{15.0}{3.4}
-\\{12.8}t{4.0}{6.0}t{12.0}{6.0}
-\\{14.4}t{4.4}{5.2}t{12.4}{5.2}
-\\{16.0}t{4.8}{6.0}jt{10.8}{6.0}
-\\{16.8}t{5.2}{5.6}st{10.8}{5.6}
-\\{17.6}t{5.6}{0.8}t{14.8}{1.2}
-\\{19.2}t{6.0}{2.4}t{12.0}{3.6}
-\\{20.8}t{6.4}{4.4}jt{10.8}{4.4}
-\\{22.4}e{9.4}}
-
-
-\shapepar\bassshape
-proshap.py (ver 1.1) is a python script written by Man\-uel
-Gu\-ti\-er\-rez Al\-ga\-ba to produce shape definitions from rough
-`ascii art'.  There is no instruction manual, so here are Donald
-Arseneau's observations. There is not much of a user interface; look
-in proshap.py (which is a plain text file) and see how the various
-`test' shapes are defined (note the triple-double quotes).  Choose
-one of them, or add a new one, then change the line `test = test3' to select
-the desired picture.  Execute `python proshap.py' which will output a
-definition of "\bassshape" to the screen and to the file `result.tex'.
-The goul\-ish face you see here is the test3 shape.  You should be
-aware that the characters in the ascii input are treated as square,
-even though they are taller than they are wide, so the output shape
-specification will be taller and thinner than the input text.  There
-also seems to be a problem with all `bottoms': flat bottoms of text
-blocks and of holes are expanded downwards to end at a point.  Compare
-this face to the original face in proshap.py.  Warning: These
-instructions and observations are probably wrong; the author does not
-program in python so can't even read the code properly.  For now, look
-for proshap.py bundled with shapepar.sty.
-
-\vspace{0pt plus 5cm}
-\penalty 0
-\vspace{0pt plus -5cm}
-\vspace{5cm}
-\penalty 9999
-\vspace{-5cm}
-
 \subsection{ShapePatch by Christian Gollwitzer}
 
 \def\faceshape{%
@@ -444,12 +402,10 @@ convert it to a shapepar shape definition, either by manually running
 fig2dev (a component of transfig), or by choosing `Export/Shape' in
 Xfig.  Its odd name is indicative of its implementation: it is an
 upgrade or `patch' to both the Xfig program and the transfig tool-set.
-ShapePatch can be found on \textsc{ctan} under
-"graphics/""trans""fig-shape""patch", and includes instructions
+ShapePatch is included with transfig, or can be found on \textsc{ctan} under
+"graphics/""trans""fig-shape""patch", which includes instructions
 (\textsc{readme}) and sample shapes besides the patch itself.  This
-smiley face is one of the sample shapes.  In the future, the
-ShapePatch utility will be included in transfig, so there will be no
-need to install the patch.  Besides enabling a graphical utility
+smiley face is one of the sample shapes.  Besides enabling a graphical utility
 (Xfig) to produce shapepar specifications, the ShapePatch upgrade
 opens up great libraries of existing Fig clip-art to be used for
 paragraph shapes.  For example, a Canadian flag taken from the Xfig
@@ -457,8 +413,64 @@ flag library is one of the examples provided with ShapePatch, for
 comparison with the hand-coded one bundled with shapepar.sty. (I
 prefer my own version because there is an error in the maple leaf
 shape on the Xfig flag library version.  The error is not the fault of
-ShapePatch, but ShapePatch faithfully reproduces the faulty shape.)
+ShapePatch, but ShapePatch faithfully reproduces the faulty shape!)
+
+
+\vspace{0pt plus 5cm}
+\penalty 0
+\vspace{0pt plus -5cm}
+\vspace{5cm}
+\penalty 9999
+\vspace{-5cm}
 
+\subsection{proshap.py by Man\-uel Gu\-ti\-er\-rez Al\-ga\-ba}
+\gdef\bassshape{{9.4}{0}b{9.4}
+\\{0}t{7.6}{6.8}
+\\{0.8}t{5.2}{11.6}
+\\{1.6}t{4.4}{13.2}
+\\{2.4}t{4.0}{14.0}
+\\{3.2}t{3.6}{4.933333}st{8.533333}{4.933333}st{13.46666}{4.933333}
+\\{4.0}t{3.6}{2.4}t{9.6}{2.8}t{16.4}{2.4}
+\\{6.4}t{3.6}{2.0}t{10.0}{2.0}t{16.8}{2.0}
+\\{8.8}t{3.6}{2.4}t{9.6}{1.4}st{11.0}{1.4}t{16.4}{2.0}
+\\{11.2}t{3.6}{3.4}jt{7.0}{3.4}t{11.6}{3.4}jt{15.0}{3.4}
+\\{12.8}t{4.0}{6.0}t{12.0}{6.0}
+\\{14.4}t{4.4}{5.2}t{12.4}{5.2}
+\\{16.0}t{4.8}{6.0}jt{10.8}{6.0}
+\\{16.8}t{5.2}{5.6}st{10.8}{5.6}
+\\{17.6}t{5.6}{0.8}t{14.8}{1.2}
+\\{19.2}t{6.0}{2.4}t{12.0}{3.6}
+\\{20.8}t{6.4}{4.4}jt{10.8}{4.4}
+\\{22.4}e{9.4}}
+
+
+\shapepar\bassshape
+proshap.py (ver 1.1) is a python script written by Man\-uel
+Gu\-ti\-er\-rez Al\-ga\-ba to produce shape definitions from rough
+`ascii art'.  There is no instruction manual, so here are Donald
+Arseneau's observations. There is not much of a user interface; look
+in proshap.py (which is a plain text file) and see how the various
+`test' shapes are defined (note the triple-double quotes).  Choose
+one of them, or add a new one, then change the line `test = test3' to select
+the desired picture.  Execute `python proshap.py' which will output a
+definition of "\bassshape" to the screen and to the file `result.tex'.
+The goul\-ish face you see here is the test3 shape.  You should be
+aware that the characters in the ascii input are treated as square,
+even though they are taller than they are wide, so the output shape
+specification will be taller and thinner than the input text.  There
+also seems to be a problem with all `bottoms': flat bottoms of text
+blocks and of holes are expanded downwards to end at a point.  Compare
+this face to the original face in proshap.py.  Warning: These
+instructions and observations are probably wrong; the author does not
+program in python so can't even read the code properly.  For now, look
+for proshap.py bundled with shapepar.sty.
+
+\vspace{0pt plus 5cm}
+\penalty 0
+\vspace{0pt plus -5cm}
+\vspace{5cm}
+\penalty 9999
+\vspace{-5cm}
 
 
 
diff --git a/Master/texmf-dist/doc/generic/shapepar/shapepar.pdf b/Master/texmf-dist/doc/generic/shapepar/shapepar.pdf
index 9af7d855079..a04ab9b774f 100644
--- a/Master/texmf-dist/doc/generic/shapepar/shapepar.pdf
+++ b/Master/texmf-dist/doc/generic/shapepar/shapepar.pdf
diff --git a/Master/texmf-dist/doc/generic/shapepar/triangleshapes.def b/Master/texmf-dist/doc/generic/shapepar/triangleshapes.def
new file mode 100644
index 00000000000..914b9f9f1a6
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/shapepar/triangleshapes.def
@@ -0,0 +1,45 @@
+% from Gerhard A. Bachmaier (gerhard.bachmaier@meduni-graz.at)
+%
+% triangle shapes in four orientaions:
+% triangleup, triangledown, triangleright, triangleleft.
+%  version June 21th, 2006
+
+\def\triangleupshape{%
+{0}%
+{0}b{0}\\%
+{8.66}t{-5}{10}\\%
+{17.32}t{-10}{20}\\%
+{17.32}e{0}%
+}
+\def\triangleuppar#1{\Shapepar\triangleupshape $\bigtriangleup$ \ignorespaces #1\par}
+
+\def\triangledownshape{%
+{0}%
+{0}b{0}\\%
+{0}t{-10}{20}\\%
+{8.66}t{-5}{10}\\%
+{17.32}e{0}%
+}
+\def\triangledownpar#1{\Shapepar\triangledownshape #1\unskip\ $\bigtriangledown$\par}
+
+\def\triangleleftshape{%
+{0}%
+{0}b{8.66}\\%
+{0}t{8.66}{0}\\%
+{10}t{-8.66}{17.32}\\%
+{20}t{8.66}{0}\\%
+{20}e{8.66}%
+}
+\def\triangleleftpar#1{\Shapepar\triangleleftshape 
+  $\triangleleft$ \ignorespaces #1\unskip\ $\triangleleft$\par}
+
+\def\trianglerightshape{%
+{0}%
+{0}b{-8.66}\\%
+{0}t{-8.66}{0}\\%
+{10}t{-8.66}{17.32}\\%
+{20}t{-8.66}{0}\\%
+{20}e{-8.66}%
+}
+\def\trianglerightpar#1{\Shapepar\trianglerightshape 
+   $\triangleright$ \ignorespaces #1\unskip\ $\triangleright$\par}