shapes (19jul15)

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

9 files changed, 1064 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/metapost/shapes/README b/Master/texmf-dist/doc/metapost/shapes/README
new file mode 100644
index 00000000000..e85c1e69e22
--- /dev/null
+++ b/Master/texmf-dist/doc/metapost/shapes/README
@@ -0,0 +1,28 @@
++AMDG
+
+This document is copyright 11EE (2015) by Donald P. Goodman, and is
+released publicly under the LaTeX Project Public License.  The
+distribution and modification of this work is constrained by the
+conditions of that license.  See
+	http://www.latex-project.org/lppl.txt
+for the text of the license.  This document is released
+under version 1.3 of that license, and this work may be distributed
+or modified under the terms of that license or, at your option, any
+later version.
+
+This work has the LPPL maintenance status 'maintained'.
+
+The Current Maintainer of this work is Donald P. Goodman
+(dgoodmaniii@gmail.com).
+
+This work consists of the files shapes.dtx and shapes.ins,
+along with the generated files shapes.mp and shapes.pdf,
+along with this README.
+
+The shapes macros for Metapost provide regular polygons,
+their corresponding reentrant stars, and images
+demonstrating fractions.  These macros are quite
+configurable.
+
+v1.0, released on 18 July 2015:  initial release.  All basic
+functionality implemented.
diff --git a/Master/texmf-dist/doc/metapost/shapes/lppl.txt b/Master/texmf-dist/doc/metapost/shapes/lppl.txt
new file mode 100644
index 00000000000..22443139013
--- /dev/null
+++ b/Master/texmf-dist/doc/metapost/shapes/lppl.txt
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but 
+it is written in such a way that you can use it even if your work is 
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the 
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.  
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
diff --git a/Master/texmf-dist/doc/metapost/shapes/shapes.pdf b/Master/texmf-dist/doc/metapost/shapes/shapes.pdf
new file mode 100644
index 00000000000..adfac70ceaa
--- /dev/null
+++ b/Master/texmf-dist/doc/metapost/shapes/shapes.pdf
diff --git a/Master/texmf-dist/metapost/shapes/shapes.mp b/Master/texmf-dist/metapost/shapes/shapes.mp
new file mode 100644
index 00000000000..33b20ddd3d7
--- /dev/null
+++ b/Master/texmf-dist/metapost/shapes/shapes.mp
@@ -0,0 +1,147 @@
+%%
+%% This is file `shapes.mp',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% shapes.dtx  (with options: `package')
+%% This is a generated file.
+%% 
+%% This document is copyright 2015 by Donald P. Goodman, and is
+%% released publicly under the LaTeX Project Public License.  The
+%% distribution and modification of this work is constrained by the
+%% conditions of that license.  See
+%% http://www.latex-project.org/lppl.txt
+%% for the text of the license.  This document is released
+%% under version 1.3 of that license, and this work may be distributed
+%% or modified under the terms of that license or, at your option, any
+%% later version.
+%% 
+%% This work has the LPPL maintenance status 'maintained'.
+%% 
+%% The Current Maintainer of this work is Donald P. Goodman
+%% (dgoodmaniii@gmail.com).
+%% 
+%% This work consists of the files shapes.dtx and
+%% shapes.ins, along with the generated file shapes.mp
+%% and shapes.pdf, and the README.
+
+color fracfillcolor; fracfillcolor := red;
+pen fraccirclepen; fraccirclepen := pencircle scaled 1.5;
+pen fractionpen; fractionpen := pencircle scaled 1;
+def fraccirc(suffix x)(expr y) =
+radius := 1in;
+ticklen := radius/24;
+path circ; circ := fullcircle scaled radius;
+pair p[]; pair q[]; pair r[]; pair s[];
+p[0] := (0,0) shifted (0,radius/2);
+q[0] := p[0] shifted (0,ticklen);
+r[0] := p[0] shifted (0,-ticklen);
+s[0] := r[0];
+picture thefrac;
+picture addition;
+thefrac := image(pickup fraccirclepen; draw circ;);
+addition := image(pickup fractionpen; draw p[0]--q[0];);
+addto thefrac also addition;
+for i=1 upto 12:
+p[i] := p[i-1] rotatedaround ((0,0),-30);
+q[i] := q[i-1] rotatedaround ((0,0),-30);
+addition := image(pickup fractionpen; draw p[i]--q[i];);
+addto thefrac also addition;
+endfor;
+addition := image(pickup fractionpen; draw (0,0)--r[0];);
+addto thefrac also addition;
+pair t; pair q;
+addition := image(
+t = r[0] rotatedaround ((0,0),-((360/y)*x)/2);
+q = r[0] rotatedaround ((0,0),-((360/y)*x));
+fill r[0]--(0,0)--q..t..cycle withcolor fracfillcolor;
+draw r[0]--(0,0)--q..t..cycle;
+);
+addto thefrac also addition;
+for i=1 upto y:
+r[i] := r[i-1] rotatedaround ((0,0),-(360/y));
+s[i] := r[i-1] rotatedaround ((0,0),-(360/y)/2);
+addition := image(%
+pickup fractionpen;%
+draw (0,0)--r[i];
+draw r[i-1]..s[i]..r[i];
+);
+addto thefrac also addition;
+endfor;
+enddef;
+boolean modcircle; modcircle := true;
+pen modcirclepen; modcirclepen := pencircle scaled 1;
+pen modshapepen; modshapepen := pencircle scaled 1;
+def modstar(expr numpoints,numbers,numstar) =
+picture modfigure;
+if (modcircle = true):
+modfigure := image(draw fullcircle scaled 1in withpen modcirclepen;);
+else:
+modfigure := image();
+fi;
+pickup modshapepen;
+pair p[]; pair q[];
+picture addition;
+p[0] = (0,0.5in);
+q[0] = (0,0.6in);
+if (numbers = 1):
+addition := image(label("0",q[0]));
+addto modfigure also addition;
+fi
+for i=1 upto numpoints:
+p[i] = p[i-1] rotatedaround ((0,0),-(360/numpoints));
+q[i] = q[i-1] rotatedaround ((0,0),-(360/numpoints));
+if (numbers = 1):
+if (i <> numpoints):
+addition := image(label(decimal i,q[i]));
+addto modfigure also addition;
+fi
+fi
+endfor
+for i=0 upto numpoints:
+if (i < numstar):
+addition := image(%
+draw p[i]--p[i+numstar];
+draw p[i]--p[numpoints - numstar + i];
+);
+addto modfigure also addition;
+elseif (i >= (numstar*2)):
+addition := image(draw p[i-numstar]--p[i]);
+addto modfigure also addition;
+fi
+endfor
+addto modfigure also addition;
+enddef;
+def modfig(expr numpoints,numbers) =
+picture modfigure;
+if (modcircle = true):
+modfigure := image(draw fullcircle scaled 1in withpen modcirclepen);
+else:
+modfigure := image();
+fi
+pair p[]; pair q[];
+picture addition;
+pickup modshapepen;
+p[0] = (0,0.5in);
+q[0] = (0,0.6in);
+if (numbers = 1):
+addition := image(label("0",q[0]));
+addto modfigure also addition;
+fi
+for i=1 upto numpoints:
+p[i] = p[i-1] rotatedaround ((0,0),-(360/numpoints));
+q[i] = q[i-1] rotatedaround ((0,0),-(360/numpoints));
+addition := image(draw p[i-1]--p[i]);
+addto modfigure also addition;
+if (numbers = 1):
+if (i <> numpoints):
+addition := image(label(decimal i,q[i]));
+addto modfigure also addition;
+fi
+fi
+endfor;
+enddef;
+\endinput
+%%
+%% End of file `shapes.mp'.
diff --git a/Master/texmf-dist/source/metapost/shapes/shapes.dtx b/Master/texmf-dist/source/metapost/shapes/shapes.dtx
new file mode 100644
index 00000000000..ab1b14cfb28
--- /dev/null
+++ b/Master/texmf-dist/source/metapost/shapes/shapes.dtx
@@ -0,0 +1,402 @@
+% \iffalse
+% +AMDG  This document was begun on 1E June 11EE, the vigil
+% of the Nativity of St. John the Baptist, and it is humbly
+% dedicated to him and to the Immaculate Heart of Mary, for
+% their prayers, and to the Sacred Heart of Jesus, for His
+% mercy.
+% 
+% This document is copyright 2015 by Donald P. Goodman, and is
+% released publicly under the LaTeX Project Public License.  The
+% distribution and modification of this work is constrained by the
+% conditions of that license.  See
+% 	http://www.latex-project.org/lppl.txt
+% for the text of the license.  This document is released
+% under version 1.3 of that license, and this work may be distributed
+% or modified under the terms of that license or, at your option, any
+% later version.
+% 
+% This work has the LPPL maintenance status 'maintained'.
+% 
+% The Current Maintainer of this work is Donald P. Goodman
+% (dgoodmaniii@gmail.com).
+% 
+% This work consists of the files shapes.dtx and
+% shapes.ins, along with the generated file shapes.mp
+% and shapes.pdf, and the README.
+% \fi
+
+% \iffalse
+%<*driver>
+
+\documentclass{ltxdoc}
+\usepackage{docmfp}
+\usepackage{url}
+\usepackage[typeone]{dozenal}
+\usepackage{verbatim}
+\usepackage{mflogo}
+\usepackage[everymp={input shapes;},latex]{gmp}
+\usepackage{makeidx}
+\makeindex
+\long\def\demonstrate#1#2{%
+	\bigskip%
+	\hrule%
+	\hbox to\linewidth{%
+		\hbox to0.65\linewidth{%
+			\vbox to1.4in{\vfil#1\vfil}%
+		}\hbox to0.35\linewidth{%
+			\vbox to1.4in{\vfil#2\vfil}%
+		}%
+	}%
+	\hrule%
+	\bigskip%
+}
+
+\begin{document}
+\DocInput{shapes.dtx}
+\end{document}
+%</driver>
+% \fi
+% \title{The \texttt{shapes} Macros, v1.0}
+% \author{Donald P.\ Goodman III}
+% \date{\today}
+%
+% \maketitle
+% \begin{abstract}\noindent
+% The |shapes| macros for \MP\ provide regular polygons,
+% their corresponding reentrant stars, and images
+% demonstrating fractions.  These macros are quite
+% configurable.
+% \end{abstract}
+% 
+% \tableofcontents
+%
+% \section{Introduction}
+%
+% The |shapes| macros are not revolutionary, and in fact are
+% quite simple; however, I spent some time generalizing them
+% for a text I'm currently working on, and so I thought they
+% might be useful for the general populace.  They are
+% divided into two main groups:  regular polygons and their
+% corresponding reentrant star shapes; and fractionals,
+% circles divided into a certain number of parts with the
+% desired fraction filled in.
+%
+% This document was typeset in accordance with the
+% |docstrip| utility, which allows the automatic extraction
+% of code and documentation from the same document.
+%
+% \section{Prerequisites and Conventions}
+%
+% Some prerequesites for using this package are \MP\ itself
+% (obviously).  If you're using the package with \LaTeX, the
+% |gmp| package would probably be helpful; be sure to use
+% the |latex| package option.  
+% These should be packaged in any
+% reasonably modern \LaTeX\ system, such as \TeX Live or
+% Mik\TeX.
+%
+% This documentation assumes nothing about your personal
+% \TeX\ or \MP\ environment.  Con\TeX t and the various
+% forms of Lua\TeX\ have \MP\ built-in; with pdf\LaTeX, the
+% author's choice, one can use the |gmp| package to
+% include the source directly in one's document (that's
+% what's been done in this documentation) or develop a
+% simple script to compile them afterwards and include them
+% in the source via |\includegraphics| (probably the
+% quickest option, since compilation is done in advance).
+% Here, we simply post the plain vanilla \MP\ code, and let
+% you work out those details however you prefer.
+%
+% \section{The Shapes Macros}
+%
+% We begin with the simple shapes macros, which are about as
+% basic as they can be.
+%
+% All of these shapes default to
+% circles with a one inch diameter, so you can scaled them
+% with that kept in mind.
+%
+% The simplest case is with a regular
+% polygon, like so:
+%
+% \demonstrate{%
+%	\hbox{|modfig(6,0);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modfig(6,0); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% Of course, these drawn figures can be manipulated in the
+% usual ways:
+%
+% \demonstrate{%
+%	\hbox{|modfig(6,0);|}
+%	\hbox{|draw modfigure rotated (45) withcolor red;|}
+% }{%
+% 	\begin{mpost}
+%	modfig(6,0); draw modfigure rotated (45) withcolor red;
+%	\end{mpost}
+% }%
+%
+% The two arguments to |modfig| are simple:  the first tells
+% the number of sides desired, while the second means
+% \emph{no numbers are printed} if 0, and \emph{print
+% numbers} if 1:
+% 
+% \demonstrate{%
+%	\hbox{|modfig(8,1);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modfig(8,1); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% If you don't want the circle to be printed, simply tell
+% \MP\ with |modcircle := false;| and it will not print it:
+%
+% \demonstrate{%
+%	\hbox{|modcircle := false;|}
+%	\hbox{|modfig(8,1);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modcircle := false;
+%	modfig(8,1); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% |modcircle| defaults to |true|.
+%
+% Notice that |modfig| doesn't care if there's a circle or
+% not; if you want numbers on the vertices, it will print
+% them there.
+%
+% You can adjust the width of the lines by specifying
+% |modcirclepen| and |modshapepen|:
+%
+% \demonstrate{%
+%	\hbox{|modcirclepen := pencircle scaled 3;|}
+%	\hbox{|modshapepen := pencircle scaled 2;|}
+%	\hbox{|modfig(4,0);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modcirclepen := pencircle scaled 3;
+%	modshapepen := pencircle scaled 2;
+%	modfig(4,0); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% Both |modcirclepen| and |modshapepen| default to 
+% |pencircle scaled 1|.
+%
+% We can do essentially the same thing with reentrant star
+% figures with |modstar|.  Unlike |modfig|, |modstar| takes
+% \emph{three} arguments:  the number of vertices, whether
+% or not you want those vertices numbered, and how many
+% points you want to skip as you go around the circle.
+%
+% \demonstrate{%
+%	\hbox{|modstar(11,1,3);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modstar(11,1,3); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% Note that the third argument actually skips $n - 1$
+% points, not $n$ points.  But all the same parameters we
+% saw when looking at |modfig| will still work in the same
+% way:
+% 
+% \demonstrate{%
+%	\hbox{|modcirclepen := pencircle scaled 1;|}
+%	\hbox{|modshapepen := pencircle scaled 2;|}
+%	\hbox{|modstar(11,1,4);|}
+%	\hbox{|draw modfigure;|}
+% }{%
+% 	\begin{mpost}
+%	modcirclepen := pencircle scaled 1;
+%	modshapepen := pencircle scaled 2;
+%	modstar(11,1,4); draw modfigure;
+%	\end{mpost}
+% }%
+%
+% And that's about all there is to it.
+%
+% \section{Fraction Images}
+% \label{sect:fraimg}
+%
+% The following macros are useful for demonstrating the
+% nature and size of fractions in a visible way.  The name
+% of the game here is |fraccirc|, which takes two arguments:
+% the number of parts to be filled, and the number of parts
+% in the whole:
+%
+% \demonstrate{%
+%	\hbox{|fraccirc(7)(12);|}
+%	\hbox{|draw thefrac;|}
+% }{%
+% 	\begin{mpost}
+%	fraccirc(7)(12);
+%	draw thefrac;
+%	\end{mpost}
+% }
+%
+% Note that, due to the internal implementation, these two
+% arguments must each be enclosed in their own parentheses.
+%
+% We can adjust these things as appropriate.  For example,
+% we can fill with blue rather than red, and use thicker
+% lines:
+%
+% \demonstrate{%
+%	\hbox{|fracfillcolor := blue;|}
+%	\hbox{|fraccirclepen := pencircle scaled 1;|}
+%	\hbox{|fractionpen := pencircle scaled 2;|}
+%	\hbox{|fraccirc(4)(7);|}
+%	\hbox{|draw thefrac;|}
+% }{%
+% 	\begin{mpost}
+%	fracfillcolor := blue;
+% 	fraccirclepen := pencircle scaled 1;
+%	fractionpen := pencircle scaled 2;
+%	fraccirc(4)(7);
+%	draw thefrac;
+%	\end{mpost}
+% }
+%
+% As the above example suggests, |fracfillcolor| gives the
+% color with which the portion of the fraction should be
+% filled; it defaults to |red|.  |fraccirclepen| is the pen
+% used to draw the circle around the fraction; it defaults
+% to |pencircle scaled 1.5|.  Finally, |fractionpen| is the
+% pen used to draw the partition and the circle immediately
+% surrounding them; it defaults to |pencircle scaled 1|.
+%
+% \section{Implementation}
+% \label{sect:implem}
+%
+%    \begin{macrocode}
+color fracfillcolor; fracfillcolor := red;
+pen fraccirclepen; fraccirclepen := pencircle scaled 1.5;
+pen fractionpen; fractionpen := pencircle scaled 1;
+def fraccirc(suffix x)(expr y) =
+	radius := 1in;
+	ticklen := radius/24;
+	path circ; circ := fullcircle scaled radius;
+	pair p[]; pair q[]; pair r[]; pair s[];
+	p[0] := (0,0) shifted (0,radius/2);
+	q[0] := p[0] shifted (0,ticklen);
+	r[0] := p[0] shifted (0,-ticklen);
+	s[0] := r[0];
+	picture thefrac;
+	picture addition;
+	thefrac := image(pickup fraccirclepen; draw circ;);
+	addition := image(pickup fractionpen; draw p[0]--q[0];);
+	addto thefrac also addition;
+	for i=1 upto 12:
+		p[i] := p[i-1] rotatedaround ((0,0),-30);
+		q[i] := q[i-1] rotatedaround ((0,0),-30);
+		addition := image(pickup fractionpen; draw p[i]--q[i];);
+		addto thefrac also addition;
+	endfor;
+	addition := image(pickup fractionpen; draw (0,0)--r[0];);
+	addto thefrac also addition;
+	pair t; pair q;
+	addition := image(
+		t = r[0] rotatedaround ((0,0),-((360/y)*x)/2);
+		q = r[0] rotatedaround ((0,0),-((360/y)*x));
+		fill r[0]--(0,0)--q..t..cycle withcolor fracfillcolor;
+		draw r[0]--(0,0)--q..t..cycle;
+	);
+	addto thefrac also addition;
+	for i=1 upto y:
+		r[i] := r[i-1] rotatedaround ((0,0),-(360/y));
+		s[i] := r[i-1] rotatedaround ((0,0),-(360/y)/2);
+		addition := image(%
+			pickup fractionpen;%
+			draw (0,0)--r[i];
+			draw r[i-1]..s[i]..r[i];
+		);
+		addto thefrac also addition;
+	endfor;
+enddef;
+% put in the pens for the modular shapes
+boolean modcircle; modcircle := true;
+pen modcirclepen; modcirclepen := pencircle scaled 1;
+pen modshapepen; modshapepen := pencircle scaled 1;
+def modstar(expr numpoints,numbers,numstar) =
+	picture modfigure;
+	if (modcircle = true):
+		modfigure := image(draw fullcircle scaled 1in withpen modcirclepen;);
+	else:
+		modfigure := image();
+	fi;
+	pickup modshapepen;
+	pair p[]; pair q[];
+	picture addition;
+	p[0] = (0,0.5in);
+	q[0] = (0,0.6in);
+	if (numbers = 1):
+		addition := image(label("0",q[0]));
+		addto modfigure also addition;
+	fi
+	for i=1 upto numpoints:
+		p[i] = p[i-1] rotatedaround ((0,0),-(360/numpoints));
+		q[i] = q[i-1] rotatedaround ((0,0),-(360/numpoints));
+		if (numbers = 1):
+			if (i <> numpoints):
+				addition := image(label(decimal i,q[i]));
+				addto modfigure also addition;
+			fi
+		fi
+	endfor
+	for i=0 upto numpoints:
+		if (i < numstar):
+			addition := image(%
+				draw p[i]--p[i+numstar];
+				draw p[i]--p[numpoints - numstar + i];
+			);
+			addto modfigure also addition;
+		elseif (i >= (numstar*2)):
+			addition := image(draw p[i-numstar]--p[i]);
+			addto modfigure also addition;
+		fi
+	endfor
+	addto modfigure also addition;
+enddef;
+def modfig(expr numpoints,numbers) =
+	picture modfigure;
+	if (modcircle = true):
+		modfigure := image(draw fullcircle scaled 1in withpen modcirclepen);
+	else:
+		modfigure := image();
+	fi
+	pair p[]; pair q[];
+	picture addition;
+	pickup modshapepen;
+	p[0] = (0,0.5in);
+	q[0] = (0,0.6in);
+	if (numbers = 1):
+		addition := image(label("0",q[0]));
+		addto modfigure also addition;
+	fi
+	for i=1 upto numpoints:
+		p[i] = p[i-1] rotatedaround ((0,0),-(360/numpoints));
+		q[i] = q[i-1] rotatedaround ((0,0),-(360/numpoints));
+		addition := image(draw p[i-1]--p[i]);
+		addto modfigure also addition;
+		if (numbers = 1):
+			if (i <> numpoints):
+				addition := image(label(decimal i,q[i]));
+				addto modfigure also addition;
+			fi
+		fi
+	endfor;
+enddef;
+%    \end{macrocode}
diff --git a/Master/texmf-dist/source/metapost/shapes/shapes.ins b/Master/texmf-dist/source/metapost/shapes/shapes.ins
new file mode 100644
index 00000000000..d7c4a2f537d
--- /dev/null
+++ b/Master/texmf-dist/source/metapost/shapes/shapes.ins
@@ -0,0 +1,69 @@
+% +AMDG  This document was begun on 1E June 11EE, the vigil
+% of the Nativity of St. John the Baptist, and it is humbly
+% dedicated to him and to the Immaculate Heart of Mary, for
+% their prayers, and to the Sacred Heart of Jesus, for His
+% mercy.
+%
+% This document is copyright 2015 by Donald P. Goodman, and is
+% released publicly under the LaTeX Project Public License.  The
+% distribution and modification of this work is constrained by the
+% conditions of that license.  See
+% 	http://www.latex-project.org/lppl.txt
+% for the text of the license.  This document is released
+% under version 1.3 of that license, and this work may be distributed
+% or modified under the terms of that license or, at your option, any
+% later version.
+% 
+% This work has the LPPL maintenance status 'maintained'.
+% 
+% The Current Maintainer of this work is Donald P. Goodman
+% (dgoodmaniii@gmail.com).
+% 
+% This work consists of the files shapes.dtx and
+% shapes.ins, along with the generated file shapes.mp
+% and shapes.pdf, and the README.
+
+\def\batchfile{shapes.ins}
+\input docstrip.tex
+
+\preamble
+This is a generated file.
+
+This document is copyright 2015 by Donald P. Goodman, and is
+released publicly under the LaTeX Project Public License.  The
+distribution and modification of this work is constrained by the
+conditions of that license.  See
+	http://www.latex-project.org/lppl.txt
+for the text of the license.  This document is released
+under version 1.3 of that license, and this work may be distributed
+or modified under the terms of that license or, at your option, any
+later version.
+
+This work has the LPPL maintenance status 'maintained'.
+
+The Current Maintainer of this work is Donald P. Goodman
+(dgoodmaniii@gmail.com).
+
+This work consists of the files shapes.dtx and
+shapes.ins, along with the generated file shapes.mp
+and shapes.pdf, and the README.
+\endpreamble
+
+\keepsilent
+\generate{\file{shapes.mp}{\from{shapes.dtx}{package}}}
+
+\Msg{******************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following file into a directory searched by Metapost:}
+\Msg{*}
+\Msg{* \space\space shapes.mp}
+\Msg{*}
+\Msg{* To produce the documentation run the file shapes.dtx}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy Metaposting!}
+\Msg{******************************************************}
+
+\endbatchfile
+\endinput
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 455560adce0..775d6b7aa68 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -489,7 +489,7 @@ my @TLP_working = qw(
     serbian-apostrophe serbian-date-lat serbian-def-cyr serbian-lig
     sesamanuel setdeck setspace seuthesis
     sf298 sffms sfg
-    sfmath sgame shade shadethm shadow shadowtext shapepar
+    sfmath sgame shade shadethm shadow shadowtext shapepar shapes
     shdoc shipunov shorttoc
     show2e showcharinbox showdim showexpl showhyphens showlabels showtags
     shuffle
diff --git a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
index e225c5b7123..02e7acc77d2 100644
--- a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
@@ -36,6 +36,7 @@ depend mpgraphics
 depend piechartmp
 depend repere
 depend roex
+depend shapes
 depend slideshow
 depend splines
 depend suanpan
diff --git a/Master/tlpkg/tlpsrc/shapes.tlpsrc b/Master/tlpkg/tlpsrc/shapes.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/shapes.tlpsrc