axodraw2[.sty] (7feb18)

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

11 files changed, 1009 insertions, 165 deletions

diff --git a/Master/texmf-dist/doc/latex/axodraw2/AUTHORS b/Master/texmf-dist/doc/latex/axodraw2/AUTHORS
new file mode 100644
index 00000000000..6751044a870
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/AUTHORS
@@ -0,0 +1,2 @@
+John Collins (jcc8 at psu dot edu)
+Jos Vermaseren (t68 at nikhef dot nl) 
diff --git a/Master/texmf-dist/doc/latex/axodraw2/COPYING b/Master/texmf-dist/doc/latex/axodraw2/COPYING
new file mode 100644
index 00000000000..94a9ed024d3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Master/texmf-dist/doc/latex/axodraw2/ChangeLog b/Master/texmf-dist/doc/latex/axodraw2/ChangeLog
new file mode 100644
index 00000000000..1ee4ef9582b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/ChangeLog
@@ -0,0 +1,17 @@
+2016/06/02
+	Release on CTAN:
+	axodraw2 [v. 2.1.0b 2016/06/02]
+	axohelp [v. 1.0 2016/05/23]
+
+2018/01/20
+	axohelp has standard options (-h, --help, -v, --version)
+	Change verbose option to -V instead of -v
+	Include files for autoconf and automake
+2018/01/31
+	Updated manual to include information on status of axodraw2 and
+ 	axohelp in MiKTeX.
+	Compiled axohelp on Windows 10 and updated axohelp.exe.
+	Checked package works with MiKTeX on Windows 10 by compiling
+	manual.
+2018/02/04
+	Minor corrections in manual.
diff --git a/Master/texmf-dist/doc/latex/axodraw2/INSTALL b/Master/texmf-dist/doc/latex/axodraw2/INSTALL
new file mode 100644
index 00000000000..2778aad9acc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/INSTALL
@@ -0,0 +1,57 @@
+MANUAL INSTALLATION of axohelp v. 1.1 and axodraw2
+==================================================
+
+
+
+A. Fully Manual Installation
+----------------------------
+
+   Note: if you do not wish to use axodraw2 with pdflatex, xelatex, or
+         lualatex, but will only use it with latex, then only the
+         first step is needed.
+
+  1.  Copy axodraw2.sty to a suitable directory for LaTeX style files.
+
+  2.  Compile the axohelp program by a command line like
+
+          gcc -o axohelp -Wall -O3 axohelp.c
+
+      (The exact details of the command line depend on your operating
+      system and which compiler you have installed for the C
+      language.)
+
+  3.  Move axohelp to a suitable directory for executables.
+
+  4.  (Optional) Copy axodraw2-man.pdf to a suitable directory for
+                 LaTex package documentation.
+
+  5.  (Optional) Copy axohelp.1 to a suitable directory for man pages.
+  
+
+B. Using autoconf etc:
+---------------------
+
+   You can also make axohelp using the GNU utilities autoconf,
+   automake and autoreconf (if these are installed).  Doing this is
+   enormous overkill for a program like axohelp with a single source
+   file and with no need to make adjustments dependent on the
+   operating system etc. Even so, we provide the files necessary for
+   the use of autoconf and automake, since these are needed when the
+   axodraw2 package is incorporated into TeXLive (which has an
+   enormous automated build process).  So here are the instructions
+   for building with autoconf and automake.  For these, it is assumed
+   that the GNU utilities autoconf, automake and autoreconf are
+   installed:
+
+   As in Fully Manual Installation, but replace step 2 by
+
+  2'. Run
+
+      autoreconf --install
+     ./configure
+     make
+     make check
+
+     The last line runs a test to ensure axohelp is running
+     correctly.
+
diff --git a/Master/texmf-dist/doc/latex/axodraw2/NEWS b/Master/texmf-dist/doc/latex/axodraw2/NEWS
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/NEWS
diff --git a/Master/texmf-dist/doc/latex/axodraw2/README b/Master/texmf-dist/doc/latex/axodraw2/README
index 1a0bc97dd79..e8fd3cf6a84 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/README
+++ b/Master/texmf-dist/doc/latex/axodraw2/README
@@ -30,7 +30,7 @@ The files in the distribution are:
 Authors, copyright, license
 ---------------------------
 
-(C) 1994-2016 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
+(C) 1994-2018 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
 (t68 at nikhef dot nl) 
 
 Axodraw2 is free software: you can redistribute it and/or modify it
diff --git a/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE b/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE
new file mode 100644
index 00000000000..2de2ba3a721
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE
@@ -0,0 +1,7 @@
+The following files have been removed in the TeX Live installation of
+the current package, typically due to duplication, lack of space, or
+missing source code.  You can find these files on CTAN at
+	http://mirror.ctan.org/graphics/axodraw2
+If questions or concerns, email tex-live@tug.org.
+
+	axohelp.exe
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
index 4294ea3b14d..4415408d491 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
+++ b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
index 03569ef2a77..346ac8cd97c 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
+++ b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
@@ -10,7 +10,7 @@
 
 % How to typeset filenames and program names: Use \file and \program
 %  to allow stylistic changes.
-% Basic definition of \file would bes \def\file#1{\texttt{#1}}, but
+% Basic definition of \file would be \def\file#1{\texttt{#1}}, but
 % that would not allow line breaks in long names.  So define it by
 % \DeclareUrlCommand from url package.  (We can't use \url itself,
 % because that provokes hyperref into making a hyperlink.)
@@ -34,6 +34,9 @@
 }
 
 
+\hyphenation{Jaxo-Draw}
+
+
 \begin{document}
 
 %% ?? To get settings useful to test compatibility of axodraw2 with
@@ -57,7 +60,7 @@ Nikhef 2015-025
 \vspace{20mm}
 
 \begin{center}
-{\LARGE\bf\sc Axodraw Version 2}
+{\LARGE\bf\sc Manual for Axodraw Version 2}
 \end{center}
 \vspace{5mm}
 \begin{center}
@@ -73,13 +76,15 @@ University Park, Pennsylvania 16802, USA} \\
 Science Park 105, 1098 XG Amsterdam, The Netherlands} \\
 \texttt{t68 at nikhef dot nl} \\
 \vspace{1.0cm}
-(3 June 2016)
+(31 January 2018)
 \end{center}
 \vspace{5mm}
 
 \begin{abstract}
-We present version two of the \LaTeX{} graphical style file Axodraw. 
-It has a number of new drawing primitives and many extra options, and 
+This is the reference manual for version two of the \LaTeX{} graphical
+style file Axodraw.  
+Relative to version one,
+it has a number of new drawing primitives and many extra options, and 
 it can now work with \program{pdflatex} to directly produce
 output in PDF file format (but with the aid of an auxiliary program).
 \end{abstract}
@@ -97,38 +102,36 @@ output in PDF file format (but with the aid of an auxiliary program).
 \label{sec:intro}
 
 This is the documentation for axodraw2, a \LaTeX{} package for drawing
-Feynman graphs (and other simple graphics).  This version is a
+Feynman graphs (and other simple graphics).  This is version 2 and a
 substantial update of the original axodraw package \cite{axodraw1},
-which was released
-in 1994, and which has become rather popular in the preparation of articles in
-elementary-particle physics.  One of its advantages is that its
-drawing primitives are included in the .tex document, in a
-human-writable form. (This also allows convenient production of
-axodraw figures by other software, e.g., Jaxodraw
-\cite{jaxodraw1,jaxodraw2}.)
-This is in distinction to methods that
-use a separate program to create graphics files that are read in
-during the processing of the \LaTeX{} file.  The objects needed in
-Feynman graphs are often difficult to draw at high quality with
-conventional computer graphics software.
+which was released in 1994, and which has become rather popular in the
+preparation of articles in elementary-particle physics.  One of its
+advantages is that its drawing primitives are included in the
+\file{.tex} document, in a human-writable form. (This also allows
+convenient production of axodraw figures by other software, e.g.,
+Jaxodraw \cite{jaxodraw1,jaxodraw2}.)  This is in distinction to
+methods that use a separate program to create graphics files that are
+read in during the processing of the \LaTeX{} file.  The objects
+needed in Feynman graphs are often difficult to draw at high quality
+with conventional computer graphics software.
 
 The original axodraw package has hardly been modified since its
 introduction.  The new version addresses several later needs.  A
 detailed list of the changes is given in Sec.\ \ref{sec:changes}.
 
 One change arises from the fact that \TeX{} (and hence \LaTeX{})
-themselves do not possess sufficiently useful methods of drawing
+itself does not possess sufficiently useful methods of drawing
 complicated graphics, so that the drawing of the graphics is actually
-done inserting suitable code in the final output file (postscript or
-pdf).  The original axodraw worked only with the
-\program{latex}-\program{dvips} processing chain to put the diagrams in
-the final postscript file.\footnote{A pdf file can be produced from
-  the postscript file by a program like \program{ps2pdf}.}  Now we also
-have in common use the \program{pdflatex} (and \program{lualatex} and
-\program{xelatex}) programs that directly produce pdf.  The new version
-of axodraw works with \program{pdflatex}, \program{lualatex}, and
-\program{xelatex}, as well as with the \program{latex}-\program{dvips}
-method.
+done by inserting suitable code in the final output file (postscript
+or pdf).  The original axodraw worked only with the
+\program{latex}-\program{dvips} processing chain to put the diagrams
+in the final postscript file.\footnote{A pdf file can be produced from
+  the postscript file by a program like \program{ps2pdf}.}  Now we
+also have in common use the \program{pdflatex} (and \program{lualatex}
+and \program{xelatex}) programs that directly produce pdf.  The new
+version of axodraw works with \program{pdflatex}, \program{lualatex},
+and \program{xelatex}, as well as with the
+\program{latex}-\program{dvips} method.
 
 Furthermore, more kinds of graphical object and greater flexibility in
 their properties have been found useful for Feynman graphs.  The new
@@ -144,14 +147,14 @@ colors, with much better compatibility with modern packages used to
 set colors in the normal \LaTeX{} part of a document.
 
 Since some of the changes (especially in the internal coding)
-introduce potential incompatibilities with the original version of
-axodraw, the new version of the style file is given a new name
-\file{axodraw2.sty}.  Then the many legacy documents (e.g., on
+introduce incompatibilities (Sec.\ \ref{sec:compat}) with the original
+version of axodraw, the new version of the style file is given a new
+name \file{axodraw2.sty}.  Then the many legacy documents (e.g., on
 \url{http://arxiv.org}) that use the old axodraw will continue to use
 the old version, and will therefore continue to be compilable without
-any need for any possible changes in the source document, and with unchanged
-output.  Even so, as regards the coding of diagrams, there are very
-few backwardly incompatible changes in axodraw2.
+any need for any possible changes in the source document, and with
+unchanged output.  Even so, as regards the coding of diagrams, there
+are very few backwardly incompatible changes in axodraw2.
 
 The software is available under the GNU General Public License
 \cite{GPL} version 3.
@@ -179,11 +182,11 @@ axodraw2, has the following main changes:
 \item Axodraw2 works both when pdf output is produced directly using
   the programs \program{pdflatex}, \program{lualatex}, and
   \program{xelatex}, as well as when a postscript file is produced by
-  the latex--dvips method.  The old version only worked when
-  postscript output was produced.  However, an auxiliary program is
-  needed when using \program{pdflatex}, \program{lualatex}, or
-  \program{xelatex}.  See Sec.\ \ref{sec:doc.compile} for how this is
-  done.
+  the \program{latex}--\program{dvips} method.  The old version only
+  worked when postscript output was produced.  However, an auxiliary
+  program is needed when using \program{pdflatex}, \program{lualatex},
+  or \program{xelatex}.  See Sec.\ \ref{sec:doc.compile} for how this
+  is done.
 
 \item In the original axodraw, a diagram is coded inside a
   \verb+picture+ environment of \LaTeX.  Now, a specialized
@@ -202,9 +205,9 @@ axodraw2, has the following main changes:
 \item Substantial improvements have been made in the treatment of
   color.  When named colors are used, axodraw2's use of color is
   generally compatible with that of the modern, \LaTeX-standard
-  \file{color.sty} package.  It also provides all the macros that were
-  defined in v.\ 1 of axodraw, including those of the \file{colordvi.sty}
-  package used by v.\ 1.
+  \file{color.sty} package.  It also provides all the color-setting
+  macros that were defined in v.\ 1 of axodraw, including those of the
+  \file{colordvi.sty} package used by v.\ 1.
 
 \item The various types of line can now be produced as double lines,
   e.g.,
@@ -245,7 +248,7 @@ axodraw2, has the following main changes:
 
 \item Since there are now many more possibilities to specify the
   properties of a line, optional arguments to the main line drawing
-  commands can be used to specify them in a keyword style.  
+  commands can be used to specify properties in a keyword style.  
 
 \item A new macro named \verb+\Arc+ is introduced.  With the aid of
   optional arguments, this unifies the behavior of various arc-drawing
@@ -256,7 +259,7 @@ axodraw2, has the following main changes:
   macro retained as a synonym.
 
 \item The behavior of arcs is changed to what we think is more natural
-  behavior when the specified opening is outside the natural range.
+  behavior when the specified opening angle is outside the natural range.
 
 \item What we call macros for drawing objects with postscript text are
   now implemented within \LaTeX{} instead of relying on instructions
@@ -273,19 +276,19 @@ axodraw2, has the following main changes:
 
 \item The macros originally specified as \verb+\B2Text+,
   \verb+\G2Text+, and \verb+\C2Text+ are now named \verb+\BTwoText+,
-  \verb+\GTwoText+, and \verb+\CTwoText+.  The intent of the
-    original code was to define macros with names \verb+\B2Text+, etc.
-    However in normal \TeX, macro names of more than one character
-    must only contain letters, unlike typical programming languages
-    that also allow digits.  So the rules for \TeX{} macro names mean
-    that in defining, for example \verb+\def\B2Text(#1,#2)#3#4{...}+,
-    the original version of axodraw actually defined a macro named
-    named \verb+\B+, obligatorially followed by \verb+2Text+.  This
-    caused a conflict if the user wished to define a macro \verb+\B+.
-    If it is desired to retain the old behavior, then the following
-    should be placed in the preamble of the .tex file, then the
-    axodraw2 package should be invoked in the source document with the
-    \texttt{v1compatible} option:
+  \verb+\GTwoText+, and \verb+\CTwoText+.  The intent of the original
+  code was to define macros with names \verb+\B2Text+, etc.  However
+  in \TeX, under normal circumstances, macro names of more than one
+  character must only contain letters, unlike typical programming
+  languages that also allow digits.  So the rules for \TeX{} macro
+  names mean that in defining, for example
+  \verb+\def\B2Text(#1,#2)#3#4{...}+, the original version of axodraw
+  actually defined a macro named named \verb+\B+, obligatorially
+  followed by \verb+2Text+.  This caused a conflict if the user wished
+  to define a macro \verb+\B+.  If it is desired to retain the old
+  behavior, then the following should be placed in the preamble of the
+  \file{.tex} file, then the axodraw2 package should be invoked in the
+  source document with the \texttt{v1compatible} option:
     \begin{verbatim}
           \usepackage[v1compatible]{axodraw2}
     \end{verbatim}
@@ -295,28 +298,29 @@ axodraw2, has the following main changes:
 \subsection{Changes relative to axodraw4j distributed with JaxoDraw}
 \label{sec:changes.wrt.4j}
 
-The JaxoDraw program \cite{jaxodraw2} is distributed with a
-version of axodraw called axodraw4j.  As of July 2014, this was
-effectively a predecessor of axodraw2, but without the possibility of
-working with \program{pdflatex}.  (The suffix ``4j'' is intended to mean ``for
-JaxoDraw''.)
+The JaxoDraw program \cite{jaxodraw2} is distributed with a version of
+axodraw called axodraw4j.  At the time of writing (July 2016), this
+was effectively a predecessor of axodraw2, but without the possibility
+of working with \program{pdflatex}.  (The suffix ``4j'' is intended to
+mean ``for JaxoDraw''.)
 
 The changes in axodraw2 relative to the version of axodraw4j dated
-2008/11/19 are the following subset of those listed in Sec.\
+2011/03/22 are the following subset of those listed in Sec.\
 \ref{sec:changes.wrt.1}:
 \begin{itemize}
-\item Correction of the oval-drawing bug.
 \item The ability to work with \program{pdflatex}, \program{lualatex},
   and  \program{xelatex}.
-\item The improvements in the handling of color.
+\item The improvements in the handling of color and fonts.
 \item The double and arrow options for B\'ezier lines.
 \item The dash option for gluons and photons.
 \item Color option for all lines.
 \item Correction of inconsistency of length unit between \TeX{} and
   postscript. 
 \item Better drawing of double gluons and photons.
-\item The gluon circle, polygon, rotated box, \verb+\ECirc+,
-  \verb+\EBoxc+, and the \verb+\AxoGrid+ macros
+\item Addition of the macros for making gluon circles, polygons, and rotated
+  boxes.
+\item Addition of the macros
+  \verb+\ECirc+, \verb+\EBoxc+, and \verb+\AxoGrid+.
 \item A series of ``LongArrow'' macros for drawing lines with the
   arrow at the end.  The same effect could only be achieved in
   axodraw4j with arrowpos=1 option to the basic line-drawing
@@ -335,18 +339,22 @@ The changes in axodraw2 relative to the version of axodraw4j dated
 
 %---------------
 \subsection{Backward compatibility, etc}
+\label{sec:compat}
 
 The official user interface of axodraw2 is backward-compatible with
 versions 1 and 4j, with the exception of the issue mentioned above
-about the commands that have the signatures \verb+\B2Text+,
-\verb+\G2Text+, and \verb+\C2Text+.  There are some minor changes in
-the objects that are drawn, mostly concerning the exact dimensions of
-default arrows and the scaling of the sizes of text objects.  The
-scoping of color changes is significantly different, but improved.
+about the commands that had the signatures \verb+\B2Text+,
+\verb+\G2Text+, and \verb+\C2Text+ in the old version.
+
+As to behavior, there are some minor changes in the objects that are
+drawn, mostly concerning the exact dimensions of default arrows. The
+scaling of the sizes of text objects is changed.  The scoping of color
+changes is substantially changed, but improved.
 
 The old axodraw only used the tools available in \LaTeX{} in the early
-1990s.  The new version needs a more modern installation.  It has been
-extensively tested with TeXLive 2011 and 2016.
+1990s.  The new version needs a more modern installation.
+Installations for which axodraw2 has been tested include TeXLive 2011
+and 2016.
 
 We have tested backwards compatibility by compiling the version 1
 manual with axodraw2; only a trivially modified preamble was needed.
@@ -355,19 +363,29 @@ which has a large number
 of JaxoDraw figures (processed automatically to pieces of axodraw code
 imported into the document); only changes in the preamble were needed.
 
-Axodraw2 uses the following \LaTeX{} packages: \program{keyval},
-\program{ifthen}, \program{graphicx}, \program{color}, \program{ifxetex}. 
-It defines its own set of 73 named colors --- Sec.\ \ref{sec:colors}
---- which are the same as the 68 defined as dvips-defined names in the
-color package, plus 5 more.
-
-In addition axodraw2 provides an \verb+axopicture+ environment
-inside of which axodraw2's graphics are coded and drawn.  In the old
-axodraw, \LaTeX's \verb+picture+ environment was used instead.  We
-recommend the use of \verb+axopicture+ environment in axodraw2, and
-that is the only method we document.  However, old diagrams coded with
+In addition, axodraw2 provides an \verb+axopicture+ environment inside
+of which axodraw2's graphics are coded and drawn.  In the old axodraw,
+\LaTeX's \verb+picture+ environment was used instead.  In axodraw2, we
+recommend only the use of \verb+axopicture+ environment, and that is
+the only method we document.  However, old diagrams coded with
 \verb+picture+ environment continue to work.
 
+Some possible compatibility issues could arise because the old and new
+versions load a different set of external packages.  The old version
+loaded the packages \file{epsf.sty} and \file{colordvi.sty}, and so
+macros defined by these packages were available.  The new version does
+not load these now essentially-obsolete packages; so they should be
+loaded from the document if they happen to be needed.  But the new
+version does define some macros for setting colors that correspond to
+those in \file{colordvi.sty}; these are defined using facilities from
+the standard \LaTeX{} \file{color.sty} package.  Axodraw2 loads the
+following \LaTeX{} packages: \program{keyval}, \program{ifthen},
+\program{graphicx}, \program{color}, \program{ifxetex}.  It defines
+its own set of 73 named colors which are the 68 dvips-defined names
+(as coded in \file{colordvi.sty} and used in axodraw v.\ 1), plus 5
+more.
+
+
 
 %=========================
 \section{Installation}
@@ -376,31 +394,47 @@ that is the only method we document.  However, old diagrams coded with
 %---------------
 \subsection{Installation from standard \TeX{} distribution}
 
-At the moment that this document was written, axodraw2 was not part of any
-standard \TeX{} distribution.
+At the moment that this document was updated (January 2018), axodraw2
+was part of both the main \TeX{} distributions, TeXLive and MiKTeX.
+The easiest way to install axodraw2 is therefore from the package
+manager of your \TeX{} distribution.  (There is one complication
+concerning the \program{axohelp} program --- see below.)
+
+You can also obtain axodraw2 from CTAN at
+\url{http://ctan.org/pkg/axodraw2}, and install it manually, following
+the instructions in Sec.\ \ref{sec:manual.install} below.
 
-It is on CTAN at \url{http://ctan.org/tex-archive/graphics/axodraw2},
-so that it should eventually be part of the standard distributions
-(TeXLive and MiKTeX).  After that, axodraw2 will either be installed
-by default or can be installed by using the package manager of the
-\TeX{} distribution. When available, this will be the easiest method
-of installation.
+\paragraph{\program{axohelp} in TeXLive}
+In TeXLive 2017, a binary executable for the \program{axohelp} was not
+provided, even though the rest of the axodraw2 package was provided.
+Thus you could use axodraw2 with the \program{latex} but not with
+\program{pdflatex} unless you compiled and installed the program
+\program{axohelp} yourself following the instructions below.  This is
+planned to be changed in TeXLive 2018, when \program{axohelp} should
+be provided as part of the distribution when the package axodraw2 is
+installed from the package manager.
+
+\paragraph{\program{axohelp} in MiKTeX}
+The axodraw2 package including an executable \program{axohelp.exe} was
+provided by MiKTeX when this was checked in January 2018.
 
 
 
 %---------------
 \subsection{Manual installation}
+\label{sec:manual.install}
 
 %For a manual installation, the minimum that needs to be done is to put
-For a manual installation, what needs to be done is to put
-the file \file{axodraw2.sty} in a place where it will be found by
-the \program{latex} program.  If you wish to use axodraw2 with
-\program{pdflatex}, you will also need to compile the \program{axohelp}
-program and put it in an appropriate directory.  Documentation can
-also be installed if you want.
+For a manual installation, what needs to be done is to put the file
+\file{axodraw2.sty} in a place where it will be found by the
+\program{latex} program.  If you wish to use axodraw2 with
+\program{pdflatex}, you will also need to compile the
+\program{axohelp} program --- see Sec.\ \ref{sec:axohelp} --- and put
+it in an appropriate directory.  Documentation can also be installed
+if you want.
 
 %--
-\subsubsection{Style file texttt{axodraw2.sty}}
+\subsubsection{Style file \protect\file{axodraw2.sty}}
 
 If you merely want to try out axodraw2, just put the file
 \file{axodraw2.sty} in the same directory as the \file{.tex}
@@ -415,11 +449,18 @@ as is usual, under the directory \file{/usr/local/texlive}.  Then an
 appropriate place for axodraw2 is in a directory
 \file{/usr/local/texlive/texmf-local/tex/latex/axodraw2}.  You will
 need to run the \program{texhash} program in this last case.  For such
-a system-wide installation, you will probably have to do these
+a system-wide installation, you may have to do these
 operations as an administrative user (e.g., root), possibly
 supplemented by running the relevant commands with the \program{sudo}
 program.
 
+But note that if you later install the axodraw2 package from the
+package manager of you \TeX{} distribution, it's a good idea to delete
+the files you installed manually.  Otherwise when you use axodraw2 in
+a document, then the wrong version of \file{axodraw2.sty} may get
+used.  This is a particularly important issue after possible future
+updates to axodraw2 get installed by the package manager.
+
 %--
 \subsubsection{Helper program \program{axohelp}}
 \label{sec:axohelp}
@@ -444,7 +485,8 @@ instead of \program{cc}.
 
 For Microsoft Windows, if you do not have a C compiler available, you
 can use the Windows binary \file{axohelp.exe} we have provided.  It
-should work with Windows 7 or higher.
+was compiled on Windows 10, and should work with at least that version
+of Windows.
 
 In any case once you have the executable (named \program{axohelp} on
 unix-like systems, or \program{axohelp.exe} on a Microsoft system), put
@@ -556,8 +598,8 @@ use a large enough magnification, or to use an actual print out.
 
 \emph{Note about sending a document to others}: If for example, you
 submit an article to arXiv.org, it is likely that their automated
-system for processing the file will not run axohelp. So together with
-the tex file, you one should also submit the .ax2 file.
+system for processing the file will not run \program{axohelp}. So together with
+the tex file, you one should also submit the \file{.ax2} file.
 
 
 %-----------------------
@@ -693,10 +735,8 @@ auxiliary program, \program{axohelp}, as in
    pdflatex example
 \end{verbatim}
 What happens is that during a run of \program{pdflatex}, axodraw2
-%writes a file \file{example.ax1} with specifications of its
 writes a file \file{example.ax1} containing specifications of its
 graphical objects.  Then running \program{axohelp} reads the
-%\file{example.ax1} file, computes the necessary pdf code to draw the
 \file{example.ax1} file, computes the necessary pdf code to draw the
 objects, and writes the results to \file{example.ax2}.  The next run
 of \program{pdflatex} reads \file{example.ax2} and uses it to put the
@@ -5006,95 +5046,95 @@ axodraw2.
 
 \appendix
 
-\section{The axohelp program: Information for developers}
+\section{The \program{axohelp} program: Information for developers}
 \label{sec:axohelp.devel}
 
-This appendix provides some details on how the axohelp program works.
+This appendix provides some details on how the \program{axohelp} program works.
 Most of the information is only relevant to people who wish to modify
-or extend axodraw2 and therefore may need to modify axohelp as well.
+or extend axodraw2 and therefore may need to modify \program{axohelp} as well.
 
-The reason for axohelp's existence is that axodraw needs to perform
+The reason for \program{axohelp}'s existence is that axodraw needs to perform
 substantial geometric calculations.  When axodraw is used with
 pdflatex to produce pdf output directly, suitable calculational
 facilities are not available, neither within the PDF language nor
 within \LaTeX{} itself.  Therefore when axodraw is used under
-pdflatex, we use our program axohelp to perform the calculations.
+pdflatex, we use our program \program{axohelp} to perform the calculations.
 
-The mode of operation is as follows.  Let us assume that the .tex file
-being compiled by the pdflatex program is called paper.tex.  When one
-issues the command
+The mode of operation is as follows.  Let us assume that the
+\file{.tex} file being compiled by the \program{pdflatex} program is
+called \file{paper.tex}.  When one issues the command
 \begin{verbatim}
   pdflatex paper
 \end{verbatim}
 the reaction of the system is of course to translate all \TeX{}
 related objects into a PDF file. Most (but not all) axodraw objects
-need non-trivial calculations and hence their
-specifications are placed inside a file called paper.ax1. At the end
-of the processing \program{pdflatex} will place a message on the screen
-that mentions that the user should run the command
+need non-trivial calculations and hence their specifications are
+placed inside a file called \file{paper.ax1}. At the end of the
+processing \program{pdflatex} will place a message on the screen that
+mentions that the user should run the command
 \begin{verbatim}
   axohelp paper
 \end{verbatim}
 for the processing of this graphical information. In principle it is
-possible to arrange for axohelp to be invoked automatically from
+possible to arrange for \program{axohelp} to be invoked automatically from
 within pdflatex.  But for this to be done, the running of general
 external commands from pdflatex would have to be enabled.  That is a
 security risk, and is therefore normally disabled by default for
 pdflatex.
 
-When run, axohelp reads the file paper.ax1, processes the contents,
-and produces a file paper.ax2. For each axodraw object, it contains
-both the code to be placed in the pdf file, and a copy of the
-corresponding specification that was in paper.ax1.
-
-When pdflatex is run again, it sees that the file paper.ax2 is present
-and reads it in to give essentially an array of objects, one for each
-processed axodraw object.  Then during the processing of the document,
-whenever axodraw runs into an axodraw object in need of external
-calculation, it determines whether an exactly corresponding
-specification was present in the file paper.ax2. If not, it means that
-the graphical information in the file paper.tex has changed since the
-last run of axohelp and the graphics information is invalidated. In
-that case, at the end of the program the message to run axohelp will
-be printed again. But if instead there is an exact match between an
-axodraw object in the current paper.tex and its specification in
-paper.ax2, then the corresponding pdf code will be placed in the PDF
-file. If all axodraw commands have a proper match in the paper.ax2
-file, there will be no message in the paper.log file and on the screen
-about rerunning axohelp; then the PDF file should contain the correct
-information for drawing the axodraw objects (at least if there are no
-\TeX{} errors).
-
-In a sense the situation with axohelp is no different from the use of
+When run, \program{axohelp} reads the file \file{paper.ax1}, processes the
+contents, and produces a file \file{paper.ax2}. For each axodraw
+object, it contains both the code to be placed in the pdf file, and a
+copy of the corresponding specification that was in \file{paper.ax1}.
+
+When pdflatex is run again, it sees that the file \file{paper.ax2} is
+present and reads it in to give essentially an array of objects, one
+for each processed axodraw object.  Then during the processing of the
+document, whenever axodraw runs into an axodraw object in need of
+external calculation, it determines whether an exactly corresponding
+specification was present in the file \file{paper.ax2}. If not, it
+means that the graphical information in the file \file{paper.tex} has
+changed since the last run of \program{axohelp} and the graphics information is
+invalidated. In that case, at the end of the program the message to
+run \program{axohelp} will be printed again. But if instead there is an exact
+match between an axodraw object in the current \file{paper.tex} and
+its specification in \file{paper.ax2}, then the corresponding pdf code
+will be placed in the PDF file. If all axodraw commands have a proper
+match in the \file{paper.ax2} file, there will be no message in the
+paper.log file and on the screen about rerunning \program{axohelp}; then the PDF
+file should contain the correct information for drawing the axodraw
+objects (at least if there are no \TeX{} errors).
+
+In a sense the situation with \program{axohelp} is no different from the use of
 makeindex when one prepares a document that contains an index. In that
 case one also has to run \LaTeX{} once to prepare a file for the
 makeindex program, then run this program which prepares another file
 and finally run \LaTeX{} again. Note that if you submit a paper to
 arXiv.org, it is likely that their automated system for processing the
-file will not run axohelp. So together with paper.tex, you one should
-also submit the .ax2 file.
+file will not run \program{axohelp}. So together with \file{paper.tex}, you one
+should also submit the \file{.ax2} file.
 
-The complete source of the axohelp program can be found in the file 
-axohelp.c. This file contains a bit less than 4000 lines of C code but
-should translate
-without problems with any C compiler --- see Sec.\ \ref{sec:axohelp}
-for an appropriate command line on typical Unix-like systems.
+The complete source of the \program{axohelp} program can be found in the file
+\file{axohelp.c}. This file contains a bit less than 4000 lines of C
+code but should translate without problems with any C compiler --- see
+Sec.\ \ref{sec:axohelp} for an appropriate command line on typical
+Unix-like systems.
 
-The axohelp program functions as follows:
+The \program{axohelp} program functions as follows:
 \begin{enumerate}
-\item The .ax1 file is located, space is allocated for it and the complete 
-file is read and closed again.
+\item The \file{.ax1} file is located, space is allocated for it and
+  the complete file is read and closed again.
 \item The input is analysed and split in individual object
   specifications, of which a list is made.
 \item The list of object specifications is processed one by
   one. Before the processing of each object specification, the system
   is brought to a default state to avoid that there is a memory of the
   previous object. 
-\item In the .ax2 file, for each object is written both the
+\item In the \file{.ax2} file, for each object is written both the
   corresponding pdf code and a copy of the specification of the object
-  as was earlier read from the .ax1 file.  Before the output for an
-  object is written to the .ax2 file it is optimized a bit to avoid
-  superfluous spaces and linefeeds.
+  as was earlier read from the \file{.ax1} file.  Before the output
+  for an object is written to the \file{.ax2} file it is optimized a
+  bit to avoid superfluous spaces and linefeeds.
 \end{enumerate}
 
 Processing an object from the input involves finding the proper routine for 
@@ -5109,7 +5149,7 @@ Finally the array is optimized and written to file.
 A user who would like to extend the system with new objects should
 take the above structure into account. There is an array that gives
 the correspondence between axodraw object names and the corresponding
-routine in axohelp.  For each object, this array also gives the number
+routine in \program{axohelp}.  For each object, this array also gives the number
 of parameters and whether the stroking or non-stroking color space
 should be used. 
 
@@ -5121,11 +5161,11 @@ section named ``PDF utilities''. This is important from the viewpoint
 of future action. When new graphical languages will be introduced and
 it will be needed to modify axodraw2 such that it can produce code for
 those languages, it should be much easier if code in the supporting
-axohelp program needs to be changed in as few places as possible.
+\program{axohelp} program needs to be changed in as few places as possible.
 They form a set of graphics primitives used by other subroutines.
 Some of these subroutines in the ``PDF utilities'' section of
-axohelp.c have names similar to operators in the postscript language
-that perform the same function.
+\file{axohelp.c} have names similar to operators in the postscript
+language that perform the same function.
 
 %--#] Appendix :
 %>>#[ bibliography :
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axohelp.1 b/Master/texmf-dist/doc/latex/axodraw2/axohelp.1
new file mode 100644
index 00000000000..47f62fd5ff8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/axodraw2/axohelp.1
@@ -0,0 +1,48 @@
+.TH "axohelp" "1.1" "22 Jan 2018" ""
+.SH NAME
+axohelp - helper program for use of LaTeX package axodraw2 with
+pdflatex. 
+.SH SYNOPSIS
+.B axohelp [options] [filename]
+.SH DESCRIPTION
+Axohelp is a program used with the axodraw2, which is a LaTeX package
+for drawing Feynman graphs (and some other simple graphics) in LaTeX
+documents.
+
+When the axodraw2 package is used with pdflatex (or lualatex or
+xelatex) it creates a file with extension .ax1.  This contains
+specifications of the graphics elements.  Axohelp converts this to a
+file with extension ax2 that contains the necessary pdf code.
+The .ax2 file is read by pdflatex (etc) on its next run, and the
+contents of the .ax2 file are used in the final .pdf output file to
+draw the desired graphics.
+
+The files processed are specified as follows: When the filename on the
+command line is of the form file.ax1, then the input file is file.ax1
+and the output file is file.ax2. If the filename on the command line
+does not have extension .ax1, then this extension is appended.
+
+
+.SH OPTIONS
+Options can be introduced by single or double hyphen characters. The
+possible options are:
+
+.TP
+.B -h, --help
+Gives usage information
+
+.TP
+.B -v, --version
+Gives version information
+
+.TP
+.B -V
+NOT CURRENTLY IMPLEMENTED: Give information on each function used.
+
+.SH AUTHOR
+Current version, by John Collins (username jcc8 at node psu.edu) and
+Jos Vermaseren (username t68 at nikhef dot nl).
+
+The released version can be obtained from CTAN:
+<http://www.ctan.org/pkg/axodraw2/>, and an author's website
+<https://www.nikhef.nl/~form/maindir/others/axodraw2/axodraw2.html>.
diff --git a/Master/texmf-dist/doc/latex/axodraw2/example.tex b/Master/texmf-dist/doc/latex/axodraw2/example.tex
index 3f87fb80185..c2b6bf8779b 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/example.tex
+++ b/Master/texmf-dist/doc/latex/axodraw2/example.tex
@@ -7,9 +7,8 @@ Example of Feynman graph made by axodraw2:
     \SetColor{Red}
     \Arc[arrow](100,50)(40,0,180)
     \Text(100,100)[]{$\alpha P_1 + \beta P_2 + k_\perp$}
-    \SetColor{Green}
+    \SetColor{Black}
     \Arc[arrow](100,50)(40,180,360)
-    \SetColor{Blue}
     \Gluon(0,50)(60,50){5}{4}
     \Vertex(60,50){2} 
     \Gluon(140,50)(200,50){5}{4}