feynmf update, fixing perl syntax error (Norbert 2 Jun 2008 11:01:37)

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

7 files changed, 221 insertions, 595 deletions

diff --git a/Master/texmf-dist/source/latex/feynmf/Announce b/Master/texmf-dist/source/latex/feynmf/Announce
deleted file mode 100644
index a8247733629..00000000000
--- a/Master/texmf-dist/source/latex/feynmf/Announce
+++ /dev/null
@@ -1,31 +0,0 @@
-To: ctan-ann@shsu.edu,
-    feynmf-announce@crunch.ikp.physik.th-darmstadt.de
-Subject: [LaTeX/Metafont] Feynman diagrams: FeynMF v1.08 released
-
-This announces version 1.08 of feynmf, a combined LaTeX and Metafont
-(or Metapost) package for easy drawing of professional quality Feynman
-(and maybe other) diagrams.
-
-Version 1.08 is mainly a bug fix release and offers a driver script as
-the only new feature.  The driver script is still experimental and I
-will be grateful for portability suggestions (it has been developed with
-teTeX under Linux).
-
-This software will show up through the magic of mirroring at the CTAN
-host near you.
-
-Enjoy,
--Thorsten
-
-NEWS for Version 1.08
-
-    *  Improved very short gluon and photon propagators by relaxing
-    overly aggressive rounding.
-
-    *  New (still experimental) `feynmf' script automating the
-    invocation of Metafont (requires perl(1)).
-
-/// Thorsten Ohl, TH Darmstadt, Schlossgartenstr. 9, D-64289 Darmstadt, Germany
-//////////////// net: ohl@crunch.ikp.physik.th-darmstadt.de, ohl@gnu.ai.mit.edu
-/// voice: +49-6151-16-3116, secretary: +49-6151-16-2072, fax: +49-6151-16-2421
-
diff --git a/Master/texmf-dist/source/latex/feynmf/COPYING b/Master/texmf-dist/source/latex/feynmf/COPYING
deleted file mode 100644
index e77696ae8dd..00000000000
--- a/Master/texmf-dist/source/latex/feynmf/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-this service 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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
-		     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
-convey 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) 19yy  <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 2 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, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.
diff --git a/Master/texmf-dist/source/latex/feynmf/README b/Master/texmf-dist/source/latex/feynmf/README
deleted file mode 100644
index 611dbfad520..00000000000
--- a/Master/texmf-dist/source/latex/feynmf/README
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id: README,v 1.30 1996/12/02 01:38:45 ohl Exp $
-########################################################################
-
-    This is feynmf, a combined LaTeX/Metafont package for easy drawing
-    of professional quality Feynman diagrams.  feynmf lays out most
-    diagrams satisfactorily from the structure of the graph without
-    any need for manual intervention.  Nevertheless all the power of
-    Metafont is available for more obscure cases.  See the
-    documentation for appetizers, examples and more details.
-
-    A preformatted manual (`manual.ps.gz') is provided to wet your
-    appetite with numerous examples.
-
-    Anyway, you are invited to share, use, abuse, and improve it, see
-    the file COPYING for details.
-
-    Enjoy,
-    -Thorsten
-
-########################################################################
-
-   Installation:
-
-   You need a recent LaTeX (LaTeX2e, as of December 1994 is
-   sufficient) to use feynmf,  docstrip.tex to install it and doc.sty
-   to typeset the documentation.  If it is not already on your system,
-   you can get all this (and much more) from your nearest CTAN host.
-
-   To install, either use the Makefile or use the installation file
-   feynmf.ins:
-
-     $ latex feynmf.ins
-
-   then you can typeset the documentation by
-
-     $ latex fmfman.drv
-     $ mf '\mode:=laserjet; input fmfsamp1'
-     $ mf '\mode:=laserjet; input fmfsamp2'
-     $ mf '\mode:=laserjet; input fmfsamp3'
-     $ mf '\mode:=laserjet; input fmfsamp4'
-     $ latex fmfman.drv
-     $ makeindex -s gind.ist -o fmfman.ind fmfman.idx
-     $ makeindex -s gglo.ist -o fmfman.gls fmfman.glo
-     $ latex fmfman.drv
-
-   or by using the Makefile (`make man').  That's it.
-
-   There is also a simple example `template.tex' that you can use as
-   a template for your own creations.  To typeset, either use the
-   feynmf script
-
-     $ feynmf template
-
-   or run Metafont manually
-
-     $ latex template
-     $ mf '\mode:=localfont; input fmftempl'
-     $ latex template
-
-   Finally, there is another installation file for LaTeX 2.09 compatible
-   versions: feynmf209.ins.  This file has to be processed _in addition_
-   to feynmf.ins!
-
-########################################################################
-
-WARNING:
-
-    If LaTeX fails with `Unknown graphics extension: 3', you have a
-    slightly out-of-date graphics.sty file (LaTeX will have issued a
-    warning in this case).  There has been a change to the user
-    interface, which makes it very hard to support both versions.
-    Sorry.  I have chosen to support the current one, which will
-    hopefully be stable.
-
-    You can work around this by either getting a more recent graphics
-    package from CTAN (macros/latex/packages/graphics) or by using
-    epsf.sty instead (`\let\includegraphics\epsffile\input epsf.sty').
-    [You can also ignore it and get the preformatted manual.  But you
-    will not be able to use the MetaPost version in this case.]
-
-########################################################################
-
-    Comments, bug reports and improvements are welcome at:
-
-        Thorsten.Ohl@Physik.TH-Darmstadt.de
-        (aka: ohl@crunch.ikp.physik.th-darmstadt.de)
-
-    New versions can be found in:
-
-        crunch.ikp.physik.th-darmstadt.de:/pub/ohl/feynmf
-
-    or at CTAN:
-
-        {ftp.shsu.edu,ftp.tex.ac.uk,ftp.dante.de}:
-          ... macros/latex/contrib/supported/feynmf
-
-    There are two mailing lists
-
-        feynmf-announce@crunch.ikp.physik.th-darmstadt.de
-        feynmf-bugs@crunch.ikp.physik.th-darmstadt.de
-
-    both are open for subscription.  The former should be very low
-    volume and carry only important announcements.  The latter can
-    serve as a more general discussion forum.
-
-    To subscribe, send mail to
-
-        majordomo@crunch.ikp.physik.th-darmstadt.de
-
-    and NOT to the lists itself.  The following commands (on a line in
-    the body of the mail, not in the subject) are useful: `subscribe
-    feynmf-announce', `unsubscribe feynmf-bugs', `help', etc.
-
-########################################################################
-
-NEWS for Version 1.08
-
-    *  Improved very short gluon and photon propagators by relaxing
-    overly aggressive rounding.
-
-    *  New (still experimental) `feynmf' script automating the
-    invocation of Metafont (requires perl(1)).
-
-NEWS for Version 1.07
-
-    *  Switch off I/O during the first pass in AMS-LaTeX equation
-    environments.  This avoids a nasty race condition (thanks to Axel
-    Thimm for reporting this bug).  A beneficial side effect is that
-    it saves us 50% processing time in these cases.
-
-NEWS for Version 1.06
-
-    *  New abstraction: polygons.  Useful for complex vertices in
-    non-perturbative diagrams.
-
-    *  New commands: \fmfpoly, \fmfpolyn and \fmfrpolyn, implementing
-    polygons.
-
-    *  New option `rubout' for crossing propagators.
-
-    *  Some common typos are detected are appropriate warning messages
-    are issued.
-
-    *  New options `errorstop', `scroll', `nonstop' and `batch' for
-    specifying the desired interactionmode.
-
-    *  Work around an obscure babel/german/feynmf three way
-    destructive interference.
-
-NEWS for Version 1.05
-
-    *  FeynMF now coexists with french.sty and other packages that
-    change the \catcode of ``:''.
-
-    *  Fixed a bug introduced in version 1.03, which could cause
-    problems with font loading.  Unfortunately, the fix has to give up
-    some compatibility with earlier versions.  Sources for version
-    1.02 and earlier which used \noexpand in labels have to upgraded
-    or the option `pre-1.03' has to be used.  Sorry.
-
-NEWS for Version 1.04
-
-    *  Finally, \fmffixed{(dx,whatever)}{v1,v2} and
-    \fmffixed{(whatever,dy)}{v1,v2} do what you would expect them
-    to.  \fmffixedx and \fmffixedy are new synonyms for those.
-
-NEWS for Version 1.03
-
-    *  It is no longer necessary to protect TeX command sequences with
-    \noexpand.  Old files using \noexpand will continue to work.
-
-NEWS for Version 1.02
-
-    *  Read the .tfm file before writing the .mf file destructively.
-    This should allow a transparent two pass processing if MakeTeXTFM
-    is enabled.  Thanks to Thomas Esser <te@informatik.uni-hannover.de> 
-    for the suggestion.
-
-NEWS for Version 1.01
-
-    * new decoration shapes for vertices by popular demand: `cross'
-    (also `triacross', `pentacross' and `hexacross').
-
-    * fixed a rounding bug in cut-off ends (noticeable as a spurious
-    thin diagonal line at the left end of double lines).
-
-    * The maximum size for shaded and hatched areas has been doubled
-    by removing an obsolete speedup hack that was not used anymore.
-
-    * In an unrelated move, shading and hatching has been
-    reimplemented in a much more general fashion.  Now arbitray
-    tilings can be specified as argument to `decoration.filled='.  The
-    old style numerical arguments continue to work, but should be
-    replaced by `empty', `full', `shaded', and `hatched' in new
-    documents.
-
-########################################################################
-# Local Variables:
-# mode:indented-text
-# End:
diff --git a/Master/texmf-dist/source/latex/feynmf/feynmf.pl b/Master/texmf-dist/source/latex/feynmf/feynmf.pl
index b753be17b54..d56a054587c 100644
--- a/Master/texmf-dist/source/latex/feynmf/feynmf.pl
+++ b/Master/texmf-dist/source/latex/feynmf/feynmf.pl
@@ -373,7 +373,7 @@ sub run_mf {
 			maybe_run "$gftopk_prog $gf" if $gftopk_prog;
 		    }
 		}
-		close (<LOG>);
+		close (LOG);
 	    }
 	}
     }
diff --git a/Master/texmf-dist/source/latex/feynmf/fmfman.drv b/Master/texmf-dist/source/latex/feynmf/fmfman.drv
new file mode 100644
index 00000000000..6d286d7e230
--- /dev/null
+++ b/Master/texmf-dist/source/latex/feynmf/fmfman.drv
@@ -0,0 +1,110 @@
+%%
+%% This is file `fmfman.drv',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% feynmf.dtx  (with options: `driver,manual')
+%% 
+%% Copyright (C) 1989, 1990, 1992-1995 by Thorsten.Ohl@Physik.TH-Darmstadt.de
+%% 
+%% This file is NOT the source for feynmf, because almost all comments
+%% have been stripped from it.  It is NOT the preferred form of feynmf
+%% for making modifications to it.
+%% 
+%% Therefore you can NOT redistribute and/or modify THIS file.  You can
+%% however redistribute the complete source (feynmf.dtx and feynmf.ins)
+%% and/or modify it under the terms of the GNU General Public License as
+%% published by  the Free Software Foundation; either version 2, or (at
+%% your option) any later version.
+%% 
+%% As a special exception, you can redistribute parts of this file for
+%% the electronic distribution of scientific papers, provided that you
+%% include a short note pointing to the complete source.
+%% 
+%% Feynmf 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, write to the Free Software
+%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% \CheckSum{924}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\documentclass[a4paper]{article}
+\usepackage{doc}
+\IfFileExists{mflogo.sty}%
+  {\usepackage{mflogo}%
+   \def\FMF{\texttt{feyn}\textlogo{MF}}}%
+  {\def\MF{\textsf{META}\-\textsf{FONT}}%
+   \def\MP{\textsf{META}\-\textsf{POST}}%
+   \def\FMF{\texttt{feyn}\textsf{MF}}}
+\usepackage{graphics}[1994/12/15]
+\usepackage{feynmf}
+\font\manfnt=manfnt
+\def\dangerousbend/{{\manfnt\char"7F}}
+\def\dubious{\begin{itemize}\item[\dangerousbend/]}
+\def\enddubious{\end{itemize}}
+\def\examples#1{%
+  \begin{list}{}%
+   {\setlength{\leftmargin}{#1}%
+    \addtolength{\leftmargin}{\marginparsep}%
+    \addtolength{\leftmargin}{-\marginparwidth}%
+    \setlength{\rightmargin}{0mm}%
+    \setlength{\itemindent}{\parindent}%
+    \setlength{\listparindent}{\parindent}}%
+    \item}
+\def\endexamples{\end{list}}
+\def\marginexample#1{\marginpar{\hbox to\marginparwidth{#1\hss}}}
+\parindent0pt
+\def\manindex#1{\SortIndex{#1}{#1}}
+\OnlyDescription
+\EnableCrossrefs
+\RecordChanges
+\CodelineIndex
+\DoNotIndex{\def,\gdef,\long,\let,\begin,\end,\if,\ifx,\else,\fi}
+\DoNotIndex{\immediate,\write,\newwrite,\openout,\closeout,\typeout}
+\DoNotIndex{\font,\nullfont,\jobname,\documentclass}
+\DoNotIndex{\batchmode,\errorstopmode,\char,\catcode,\ }
+\DoNotIndex{\CodelineIndex,\DocInput,\DoNotIndex,\EnableCrossrefs}
+\DoNotIndex{\filedate,\filename,\fileversion,\logo,\manfnt}
+\DoNotIndex{\NeedsTeXFormat,\ProvidesPackage,\RecordChanges,\space}
+\DoNotIndex{\usepackage,\wlog,\@gobble,\@ifundefined,\@namedef,\@spaces}
+\DoNotIndex{\begingroup,\csname,\edef,\endcsname,\expandafter,\hbox}
+\DoNotIndex{\hskip,\ifeof,\ignorespaces,\item,\leavevmode,\loop,\makebox}
+\DoNotIndex{\newcounter,\newif,\newread,\openin,\par,\parindent,\put}
+\DoNotIndex{\read,\relax,\repeat,\setcounter,\stepcounter,\the}
+\DoNotIndex{\value,\vbox,\vskip}
+\DoNotIndex{\@tempa,\@tempb,\advance,\bf,\bfseries,\closein}
+\DoNotIndex{\CurrentOption,\DeclareOption,\documentstyle,\em,\emph}
+\DoNotIndex{\endgroup,\epsilon,\global,\hfuzz,\input,\it,\LaTeX,\LaTeXe}
+\DoNotIndex{\macrocode,\meaning,\OnlyDescription,\PassOptionsToPackage}
+\DoNotIndex{\ProcessOptions,\RequirePackage,\sf,\string,\textbf,\textit}
+\DoNotIndex{\textsf,\texttt,\tt,\unitlength}
+\let\origmacrocode\macrocode
+\def\macrocode{\hfuzz 5em\origmacrocode}
+\begin{document}
+  \DocInput{feynmf.dtx}
+\end{document}
+\endinput
+%%
+%% End of file `fmfman.drv'.
diff --git a/Master/texmf-dist/source/latex/feynmf/fmfmanps.drv b/Master/texmf-dist/source/latex/feynmf/fmfmanps.drv
new file mode 100644
index 00000000000..3f397a5e664
--- /dev/null
+++ b/Master/texmf-dist/source/latex/feynmf/fmfmanps.drv
@@ -0,0 +1,110 @@
+%%
+%% This is file `fmfmanps.drv',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% feynmf.dtx  (with options: `driver,manual,mp')
+%% 
+%% Copyright (C) 1989, 1990, 1992-1995 by Thorsten.Ohl@Physik.TH-Darmstadt.de
+%% 
+%% This file is NOT the source for feynmf, because almost all comments
+%% have been stripped from it.  It is NOT the preferred form of feynmf
+%% for making modifications to it.
+%% 
+%% Therefore you can NOT redistribute and/or modify THIS file.  You can
+%% however redistribute the complete source (feynmf.dtx and feynmf.ins)
+%% and/or modify it under the terms of the GNU General Public License as
+%% published by  the Free Software Foundation; either version 2, or (at
+%% your option) any later version.
+%% 
+%% As a special exception, you can redistribute parts of this file for
+%% the electronic distribution of scientific papers, provided that you
+%% include a short note pointing to the complete source.
+%% 
+%% Feynmf 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, write to the Free Software
+%% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% \CheckSum{924}
+%% \CharacterTable
+%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%%   Digits        \0\1\2\3\4\5\6\7\8\9
+%%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%%   Dollar        \$     Percent       \%     Ampersand     \&
+%%   Acute accent  \'     Left paren    \(     Right paren   \)
+%%   Asterisk      \*     Plus          \+     Comma         \,
+%%   Minus         \-     Point         \.     Solidus       \/
+%%   Colon         \:     Semicolon     \;     Less than     \<
+%%   Equals        \=     Greater than  \>     Question mark \?
+%%   Commercial at \@     Left bracket  \[     Backslash     \\
+%%   Right bracket \]     Circumflex    \^     Underscore    \_
+%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%%   Right brace   \}     Tilde         \~}
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\documentclass[a4paper]{article}
+\usepackage{doc}
+\IfFileExists{mflogo.sty}%
+  {\usepackage{mflogo}%
+   \def\FMF{\texttt{feyn}\textlogo{MF}}}%
+  {\def\MF{\textsf{META}\-\textsf{FONT}}%
+   \def\MP{\textsf{META}\-\textsf{POST}}%
+   \def\FMF{\texttt{feyn}\textsf{MF}}}
+\usepackage{graphics}[1994/12/15]
+\usepackage{feynmp}
+\font\manfnt=manfnt
+\def\dangerousbend/{{\manfnt\char"7F}}
+\def\dubious{\begin{itemize}\item[\dangerousbend/]}
+\def\enddubious{\end{itemize}}
+\def\examples#1{%
+  \begin{list}{}%
+   {\setlength{\leftmargin}{#1}%
+    \addtolength{\leftmargin}{\marginparsep}%
+    \addtolength{\leftmargin}{-\marginparwidth}%
+    \setlength{\rightmargin}{0mm}%
+    \setlength{\itemindent}{\parindent}%
+    \setlength{\listparindent}{\parindent}}%
+    \item}
+\def\endexamples{\end{list}}
+\def\marginexample#1{\marginpar{\hbox to\marginparwidth{#1\hss}}}
+\parindent0pt
+\def\manindex#1{\SortIndex{#1}{#1}}
+\OnlyDescription
+\EnableCrossrefs
+\RecordChanges
+\CodelineIndex
+\DoNotIndex{\def,\gdef,\long,\let,\begin,\end,\if,\ifx,\else,\fi}
+\DoNotIndex{\immediate,\write,\newwrite,\openout,\closeout,\typeout}
+\DoNotIndex{\font,\nullfont,\jobname,\documentclass}
+\DoNotIndex{\batchmode,\errorstopmode,\char,\catcode,\ }
+\DoNotIndex{\CodelineIndex,\DocInput,\DoNotIndex,\EnableCrossrefs}
+\DoNotIndex{\filedate,\filename,\fileversion,\logo,\manfnt}
+\DoNotIndex{\NeedsTeXFormat,\ProvidesPackage,\RecordChanges,\space}
+\DoNotIndex{\usepackage,\wlog,\@gobble,\@ifundefined,\@namedef,\@spaces}
+\DoNotIndex{\begingroup,\csname,\edef,\endcsname,\expandafter,\hbox}
+\DoNotIndex{\hskip,\ifeof,\ignorespaces,\item,\leavevmode,\loop,\makebox}
+\DoNotIndex{\newcounter,\newif,\newread,\openin,\par,\parindent,\put}
+\DoNotIndex{\read,\relax,\repeat,\setcounter,\stepcounter,\the}
+\DoNotIndex{\value,\vbox,\vskip}
+\DoNotIndex{\@tempa,\@tempb,\advance,\bf,\bfseries,\closein}
+\DoNotIndex{\CurrentOption,\DeclareOption,\documentstyle,\em,\emph}
+\DoNotIndex{\endgroup,\epsilon,\global,\hfuzz,\input,\it,\LaTeX,\LaTeXe}
+\DoNotIndex{\macrocode,\meaning,\OnlyDescription,\PassOptionsToPackage}
+\DoNotIndex{\ProcessOptions,\RequirePackage,\sf,\string,\textbf,\textit}
+\DoNotIndex{\textsf,\texttt,\tt,\unitlength}
+\let\origmacrocode\macrocode
+\def\macrocode{\hfuzz 5em\origmacrocode}
+\begin{document}
+  \DocInput{feynmf.dtx}
+\end{document}
+\endinput
+%%
+%% End of file `fmfmanps.drv'.
diff --git a/Master/texmf-dist/source/latex/feynmf/template.tex b/Master/texmf-dist/source/latex/feynmf/template.tex
deleted file mode 100644
index 5fa885aaa2f..00000000000
--- a/Master/texmf-dist/source/latex/feynmf/template.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-% template.tex -- trivial FeynMF example
-% $Id: template.tex,v 1.1 1996/12/02 01:38:45 ohl Exp $
-% To typeset, either use the feynmf script
-%   $ feynmf template
-% or run Metafont manually
-%   $ latex template
-%   $ mf '\mode:=localfont; input fmftempl'
-%   $ latex template
-\documentclass{article}
-\usepackage{feynmf}%%%{feynmp}
-\unitlength=1mm
-\begin{document}
-\begin{fmffile}{fmftempl}
-\begin{fmfchar*}(40,25)
-  \fmfleft{em,ep} \fmflabel{$e^+$}{ep} \fmflabel{$e^-$}{em}
-  \fmf{fermion}{em,Zee,ep}
-  \fmf{photon,label=$\gamma,,Z$}{Zee,Zff}
-  \fmf{fermion}{fb,Zff,f}
-  \fmfright{fb,f} \fmflabel{$\bar f'$}{fb} \fmflabel{$f$}{f}
-  \fmfdot{Zee,Zff}
-\end{fmfchar*}
-\end{fmffile}
-\end{document}
-