feyn (3nov17)

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

51 files changed, 2016 insertions, 823 deletions

diff --git a/Master/texmf-dist/doc/fonts/feyn/LICENCE b/Master/texmf-dist/doc/fonts/feyn/LICENCE
index 3912109b5cd..0a12b692418 100644
--- a/Master/texmf-dist/doc/fonts/feyn/LICENCE
+++ b/Master/texmf-dist/doc/fonts/feyn/LICENCE
@@ -1,340 +1,25 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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) <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 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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) year 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.
+This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Master/texmf-dist/doc/fonts/feyn/README b/Master/texmf-dist/doc/fonts/feyn/README
index a0f7c96b9f1..4477b02799f 100644
--- a/Master/texmf-dist/doc/fonts/feyn/README
+++ b/Master/texmf-dist/doc/fonts/feyn/README
@@ -2,9 +2,9 @@
 Feyn: a Metafont for Feynman diagrams
 -------------------------------------
 
-Version 0.3.3.
+Version 0.4.1.
 
-This package is intended to produce relatively simple Feynman diagrams, for 
+This package is intended to produce relatively simple Feynman diagrams, for
 example within equations.
 
 This package differs from Thorsten Ohl's feynmf/feynmp package.
@@ -17,15 +17,11 @@ in a size matching the surrounding text size.
 
 The propagators and vertices which are implemented are those which
 seem to appear most often in non-figure displays (the practical
-definition of `appear most often' is `which I wanted' and `which people
-asked me for').  I have no current plans to extend the package
+definition of ‘appear most often’ is ‘which I wanted’ and ‘which people
+asked me for’).  I have no current plans to extend the package
 further, but I'm willing add other features if you can make a case for
-them, and they fit within the package's remit of 'diagrams for use in
-equations'.
-
-The package is on CTAN, and is included in TeXLive but not, as far as
-I'm aware, teTeX.  The arXiv started using TeXLive 2008 in summer
-2008 (I understand), so it should be available there from that date.
+them, and they fit within the package's remit of ‘diagrams for use in
+equations’.
 
 There is further documentation, plus numerous examples, in the package
 documentation (feyn.pdf).
@@ -37,16 +33,16 @@ Installation
 ------------
 
 Extract the package file from the distribution file using `latex
-feyn.ins'.  The resulting `feyn.sty' should be installed in the usual
+feyn.ins`.  The resulting `feyn.sty` should be installed in the usual
 location for style files -- that is, something like
-`texmf.local/tex/latex/feyn.sty'.  The Metafont source files `*.mf'
+`texmf.local/tex/latex/feyn.sty`.  The Metafont source files `*.mf`
 should be installed in a directory with a location such as
-`texmf.local/fonts/source/feyn/' (on a system which has the command,
-`kpsepath mf' will indicate the possibilities here, but these
+`texmf.local/fonts/source/feyn/` (on a system which has the command,
+`kpsepath mf` will indicate the possibilities here, but these
 typically include the current directory).  That should be all you need
 to do as regards the installation of the fonts -- if your TeX setup is
 installed correctly, then the usual font-generation commands (such as
-`mktexpk' for example) should work as normal, and they should be
+`mktexpk` for example) should work as normal, and they should be
 invoked by default when you LaTeX the feyn.dtx file.
 
 You should be able to find generic instructions for installing LaTeX files at
@@ -56,12 +52,11 @@ http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
 Licence
 -------
 
-This software is copyright, 1991, 2001, 2002, 2005, 2008, Norman Gray.  It is
-released under the terms of the GNU General Public Licence.  See the
-copyright declaration at the top of file feyn.dtx, and the file
-LICENCE for the licence conditions.
+This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
 
+It is distributed under the terms of the 2-clause BSD Licence;
+see the file LICENCE for details.
 
 
-Norman Gray, <norman@astro.gla.ac.uk>
+Norman Gray  
 http://nxg.me.uk
diff --git a/Master/texmf-dist/doc/fonts/feyn/VERSION b/Master/texmf-dist/doc/fonts/feyn/VERSION
index 7b6fb77e6c8..9b1b241646e 100644
--- a/Master/texmf-dist/doc/fonts/feyn/VERSION
+++ b/Master/texmf-dist/doc/fonts/feyn/VERSION
@@ -1 +1 @@
-feyn-0.3.3
+feyn-0.4.1
diff --git a/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf b/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf
index 730098a76b8..0ef358242a5 100644
--- a/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf
+++ b/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf
diff --git a/Master/texmf-dist/doc/fonts/feyn/exercise-font.tex b/Master/texmf-dist/doc/fonts/feyn/exercise-font.tex
index 5b5b13499c8..928d1cd7f64 100644
--- a/Master/texmf-dist/doc/fonts/feyn/exercise-font.tex
+++ b/Master/texmf-dist/doc/fonts/feyn/exercise-font.tex
@@ -2,16 +2,26 @@
 
 \usepackage{feyn}
 
+\expandafter\ifx\csname useextended\endcsname\relax
+  \let\ff\feyn
+  \let\dd\Diagram
+\else
+  \let\ff\FEYN
+  \let\dd\DIAGRAM
+\fi
+
 \makeatletter
 \def\refptcirc{\lower\feyn@maxis \hbox to 0pt{\hss$\circ$\hss}}
 \makeatother
 \let\\\cr
 
+\parindent=0pt
+
 \begin{document}
 
 Alphabetically:
 
-\halign{#\hfil\quad&$\refptcirc\feyn{#}$\cr
+\halign{#\hfil\quad&$\refptcirc\ff{#}$\cr
 a & a \\
 b & b \\
 c & c \\
@@ -40,12 +50,23 @@ y & y \\
 z & z \\
 }
 
+\vskip 2cm
+
+\newdimen\feynmod
+\makeatletter
+\feynmod=\feyn@module
+Dimensions: 
+Feyn module: \the\feyn@module,
+math-axis: \the\feyn@maxis.
+\makeatother
+
 \newpage
 
 With ligatures:
 \def\T{\tracingmacros=2 \tracingcommands=2 }
 
-\halign{&#\hfil\quad&$\refptcirc\feyn{#}$\qquad \cr
+\halign{&\vrule width 0pt height 1\feynmod #\hfil\quad&$\refptcirc\ff{#}$\qquad \cr
+a & a & aA & aA & aV & aV\\
 f & f      & fA & fA      & fV & \momentum{fV}{pk} \\
 fu & fu    & fuA & fuA    & fuV & \momentum{fuV}{pk} \\
 fd & fd    & fdA & fdA    & fdV & \momentum{fdV}{pk} \\
@@ -54,6 +75,7 @@ fl & fl    & flA & flA    & flV & \momentum{flV}{pk} \\
 flu & flu  & fluA & fluA  & fluV & \momentum{fluV}{pk} \\
 flS& flS   & flSA & flSA  & flSV & \momentum{flSV}{pk} \\
 flSu& flSu   & flSuA & flSuA  & flSuV & \momentum{flSuV}{pk} \\
+flo & flo    & floA & floA    & floV & \momentum{floV}{pk} \\
 fs & |fs| \\
 fs0 & |fs0| \\
 g & g      & gA & gA      & gV & \momentum{gV}{pk} \\
@@ -74,6 +96,8 @@ h & h    & hA & hA    & hV & \momentum{hV}{pk} \\
 hu & hu    & huA & huA    & huV & \momentum{huV}{pk} \\
 hd & hd    & hdA & hdA    & hdV & \momentum{hdV}{pk} \\
 hs & hs     & hs & \momentum{hs}{pk} \\
+hl & hl & hlA & hlA & hlV & \momentum{hlV}{pk} \\
+hlu & hlu & hluA & hluA & hluV & \momentum{hluV}{pk} \\
 x & x     & x & \momentum{x}{pk} \\
 p & p     & P & \momentum{P}{pk} \\
 c & c     & c & \momentum{c}{pk} \\
@@ -82,55 +106,77 @@ a & a     & A & A \\
 
 \newpage
 
-\def\twice#1{#1 & #1 \\}
+\def\twice#1{#1 & #1 }
 
-\halign{&#\hfil\quad&$\refptcirc\feyn{#}$\qquad\cr
-\twice{fs f gl gv f fs}
-\twice{fs f glA gv f fs}
-\twice{fs fA glA gvV f fs}
-\twice{fs fA g1A gvV g2V fA fs}
-\twice{msmAglgvmsxf}
+\halign{&#\hfil\quad&$\refptcirc\ff{#}$\qquad\cr
+\twice{fs f gl gv f fs}&vertical gluon doesn't meet -- OK\\
+\twice{fs f glA gv f fs}\\
+\twice{fs fA glA gvV f fs}\\
+\twice{fs fA g1A gvV g2V fA fs}&vertical gluon meets\\
+\twice{msmA g1gvg2 msxf}&and here\\
 }
 
 \vskip10ex
 
-Annotations:
+\textbf{More complicated diagrams}
+
+Fermion, gluon and ghost loop:
+\[
+\Diagram{\hline&fl flu \\
+\hline
+fsf g1 f&f g2 ffs \\
+\hline}
+\quad
+\Diagram{\hline&gl glu\\
+fsf g1 f&f g2 ffs \\}
+\quad
+\Diagram{\hline&hlA hluV \\
+fsf g1 f&f g2 ffs \\}
+\]
+
+\textbf{Annotations:}
 
-a: $\feyn{!f1\momentum{fA}2}$
+a: $\ff{!f1\momentum{fA}2}$ (arrow rightward)
 
-b: $\feyn{f !{gluV}k f}$
+b: $\ff{f !{gluV}k f}$ (arrow leftward)
 \vskip 10ex
 
-c: $\feyn{f !{g1A}1 \momentum{g2V}2 \momentum{g3A}3 \momentum{g4V}4 f}$
+c: $\ff{f !{g1A}1 \momentum{g2V}2 \momentum{g3A}3 \momentum{g4V}4 f}$
+(arrows are  1=right, 2=left, 3=right, 4=left)
 \vskip 10ex
 
-d: $\feyn{\momentum{gl}a\momentum{gluV}b}$
+d: $\ff{\momentum{gl}a\momentum{gluV}b}$
+(arrow leftwards)
 \vskip 10ex
 
-e: $\feyn{fs f \momentum{flA}{pk} \momentum{fluV}{pk} f fs}$
+e: $\ff{fs f \momentum{flA}{pk} \momentum{fluV}{pk} f fs}$
+(arrows right then left)
 \vskip 10ex
 
-f: $\feyn{fs f \momentum{flSA}{pk} \momentum{flSuV}{pk} f fs}$
+f: $\ff{fs f \momentum{flSA}{pk} \momentum{flSuV}{pk} f fs}$
+\vskip 10ex
+
+g: $\ff{fflof\momentum{floV}{p}f\momentum{floA}{p}f}$
 
-%error: $\feyn{\momentum{x}x}$
+%error: $\ff{\momentum{x}x}$
 
 \newpage
 
 Vertex Feynman diagram:
 \[
-\Diagram{\vertexlabel^a \\
+\dd{\vertexlabel^a \\
   fd \\
 & g\vertexlabel_{\mu,c} \\
 \vertexlabel_b fu \\
 }
 =
-\Diagram{\vertexlabel^a \\
+\dd{\vertexlabel^a \\
   fdA \\
 & gA\vertexlabel_{\mu,c} \\
 \vertexlabel_b fuV \\
 }
 =
-\Diagram{\momentum{fdA}a\\
+\dd{\momentum{fdA}a\\
    & \vertexlabel_{\gamma_\mu} \momentum{gA}{\mu,c} \\
 \momentum{fuV}b
 }
@@ -138,23 +184,36 @@ Vertex Feynman diagram:
 ig\gamma_\mu (T^c)_{ab}
 \]
 
+Use of the `belowl' macro:
+\[
+\feyn{fd \belowl{fu} g
+  +
+  fA guA \belowl{fdA}
+}
+=
+\FEYN{fd \belowl{fu} g
+  +
+  fA guA \belowl{fdA}
+}
+\]
+
 Two-loop diagram:
 \[
-\feyn{ff gl ff}
+\ff{ff gl ff}
 \to
-\feyn{ff\bigbosonloopA\smallbosonloopV ff}
+\ff{ff\bigbosonloopA\smallbosonloopV ff}
 =
-\feyn{!{fA}p f!{glBV}k !{glSA}l a\vertexlabel_{p+k-l} ff}
+\ff{!{fA}p f!{glBV}k !{glSA}l a\vertexlabel_{p+k-l} ff}
 \]
 
 Bremsstrahlung:
 \[
-  \Diagram{        & x \\
+  \dd{        & x \\
                    & ![ulft]{gvV}{q=p'+k-p}   & !{guA}k \\
            ![bot]{fA}p & ![bot]{fA}{p'+k} & ![lrt]{fA}{p'} \\
         }
         +
-  \Diagram{    & !{guA}k \\
+  \dd{    & !{guA}k \\
            !{fA}p & fs ![bot]{fA}{p-k} & !{fA}{p'} \\
                &         & ![lrt]{gvA}{q=p'+k-p} \\
                &         & x\\
@@ -165,14 +224,14 @@ OPE:
 \def\bracket#1{\langle #1 \rangle}
 \begin{eqnarray*}
 -i\Sigma_{\mathrm{ope}} &=&
-     \left[\feyn{faf + fsfglffs 
+     \left[\ff{faf + fsfglffs 
                  + \cdots} \right] 1 \\
      && \quad{}+ 
-           \left[ \feyn{ fxfs0glfs0xf 
+           \left[ \ff{ fxfs0glfs0xf 
                   + \cdots} \right]
          \bracket{\overline\psi M \psi} \\
      && \quad{}+ \left[
-         \Diagram{   &x  &x  \\
+         \dd{   &x  &x  \\
                      &gv &gv \\
                   fs &fs &fs \\} + \cdots
          \right]
@@ -181,15 +240,13 @@ OPE:
 
 Complete vertex:
 \begin{eqnarray*}
-\feyn{fcf} &=& \feyn{faf + fpf + fpfpf + \cdots} \\
-    &=& \sum_{n=0}^\infty \feyn{fA ( pfA)}^n \\
-    &=& \feyn{\frac{fA}{1-(pfA)}}.
+\ff{fcf} &=& \ff{faf + fpf + fpfpf + \cdots} \\
+    &=& \sum_{n=0}^\infty \ff{fA ( pfA)}^n \\
+    &=& \ff{\frac{fA}{1-(pfA)}}.
 \end{eqnarray*}
 
-
-
 \iffalse
-\halign{&#\hfil\quad&$\refptcirc\feyn{#}$ \cr
+\halign{&#\hfil\quad&$\refptcirc\ff{#}$ \cr
 a & a \\
 c & c \\
 f & f \\
diff --git a/Master/texmf-dist/doc/fonts/feyn/feyn.html b/Master/texmf-dist/doc/fonts/feyn/feyn.html
new file mode 100644
index 00000000000..64d26c31cd1
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/feyn.html
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding='utf-8'?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Feyn font</title>
+<link href="http://nxg.me.uk" rev="author"/>
+<link type="text/css" rel="stylesheet" href="style.css"/>
+</head>
+
+<body>
+<h1>Feyn font</h1>
+<div class="abstract">
+<p>A package of fonts for displaying Feynman diagrams.</p>
+<p>Version 0.4.1, 2017 November 03.</p>
+<p>Persistent URL: <code style='font-size: larger;'>http://purl.org/nxg/dist/feyn</code></p>
+</div>
+
+
+<p>This package is intended to produce relatively simple Feynman diagrams,
+primarily for use within equations.</p>
+
+<p><img class="smallimage" src="sample-two-loop.png" alt="Two-loop diagram"
+/>This package differs from Thorsten Ohl’s
+<code>feynmf/feynmp</code> package (at <a href="https://ctan.org/pkg/feynmf">CTAN</a>,
+or see the
+<a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawFeyn" >TeX FAQ</a>).
+FeynMP works by creating Metafont or MetaPost figures using a
+preprocessor.  It’s more general than this package, but is at its best
+when creating relatively large diagrams, for figures.  In contrast,
+the present system consists of a carefully-designed font with which
+you can easily write simple diagrams, within equations or within text, in a
+size matching the surrounding text size.</p>
+
+<p><img class="smallimage" src="sample-massive.png" alt="Massive fermions"
+/>The propagators and vertices which are implemented are those which
+seem to appear most often in non-figure displays (the practical
+definition of ‘appear most often’ is ‘which I wanted’ and ‘which people
+asked me for’).  I have no current plans to extend the package
+further, but I’m willing add other features if you can make a case for
+them.</p>
+
+<p>There is further documentation, plus numerous examples, in the
+<a href="feyn.pdf" >package documentation</a>.</p>
+
+<p><strong>[By the way, I have little idea of how many people actually
+use this package.  If you do use it, I’d be most grateful if you could
+drop me a line just to say so]</strong></p>
+
+<h2>Licence</h2>
+
+<p>This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray..
+It is distributed under the terms of the <a href='LICENCE'>2-clause BSD Licence</a>.</p>
+
+<h2>History</h2>
+
+<dl>
+
+<!-- @RELEASENOTES@ -->
+<dt><span class='attention'>Version 0.4.1, 2017 November 3</span></dt>
+<dd><p>The package is now licensed under the terms of the 2-clause BSD licence.</p>
+<p>The only other changes from v0.4b2 are mild documentation adjustments
+(sorry for the long delay between 0.4b2 and 0.4).</p>
+<p>Version 0.4 was not widely released.</p></dd>
+
+<dt>Version 0.4b3, 2013 April 12</dt>
+<dd><ul>
+<li>Changed <code>\below</code> to <code>\belowl</code>, and added
+companion <code>\belowr</code>.</li>
+<li>Documentation updates</li>
+</ul></dd>
+
+<dt>Version 0.4b2, 2011 April 9</dt>
+<dd><p><img class="smallimage" src="sample-phi4.png" alt="Vertex"/> As
+for version 0.4b1, but with the addition of <code>aV</code> for a
+backward arrow (rarely used, but included for consistency; thanks to
+Thomas Pruschke for the suggestion).  Also added: <code>flo</code> for
+the closed fermion loop, for phi^4 theory (plus <code>floV</code> and
+<code>floA</code> for completeness; thanks to Hoang Nghia Nguyen for the suggestion;
+the font should <em>now</em> be able to produce all scalar theory
+diagrams).</p></dd>
+
+<dt>Version 0.4b1, 2010 January 23</dt>
+<dd><p>Addition of the extended-size `feynx' fonts, and the <code>\FEYN</code> macro
+(thanks to Luciano Pandola for the suggestion).</p>
+<p>Adjustments to the sizing of half-loops
+(the half-loops are now squashed, though the quarter-loops aren't).
+Added ghost loops; we can now do all the diagrams of 2-loop QCD.
+The quarter-loop gluons now taper at both ends, so that two quarter-loops
+are no longer the same as one half-loop.</p></dd>
+
+
+<dt>...</dt>
+<dd><a href='release-notes.html'>Earlier release notes</a> are available</dd>
+
+</dl>
+
+<h2>Download and installation</h2>
+
+<p>The nominal distribution point for the Feyn package is CTAN,
+under <a href="https://ctan.org/pkg/feyn">fonts/feyn</a>.</p>
+
+<p>The feyn package is included in the
+<a href='http://www.tug.org/texlive/'>TeXLive distribution</a>, so
+you may have it on your machine already.  If not, or if you need a
+more up-to-date version, read on.</p>
+
+<p>Since the package is on CTAN, it should be easily installed and
+updated using the tools which support this in your TeX distribution.
+For TeXLive, that's <a href='https://www.tug.org/texlive/tlmgr.html'>tlmgr</a>,
+and for MikTeX see the
+<a href='https://docs.miktex.org/faq/maintenance.html'>maintenance
+section of the manual</a>.</p>
+
+<h3>Doing the installation by hand</h3>
+
+<p>...how thoroughly old-skool of you!</p>
+
+<ol>
+<li>Download either
+<a href="feyn-0.4.1.tar.gz" >feyn-0.4.1.tar.gz</a>
+or
+<a href="feyn-0.4.1.zip" >feyn-0.4.1.zip</a>
+and unpack it.</li>
+
+<li>Run LaTeX on the file <code>feyn.ins</code> – this will unpack the
+style file <code>feyn.sty</code> amongst other files.  Place this
+‘somewhere where TeX can find it’.  Similarly, place the
+<code>.mf</code> files somewhere where the font-generation mechanism
+for your platform can find them.  For example, in the TeXLive
+distribution, the feyn <code>*.mf</code> files appear in the directory
+<code>/usr/local/texlive/2008/texmf-dist/fonts/source/public/feyn/</code>
+and the <code>feyn.sty</code> file in
+<code>/usr/local/texlive/2008/texmf-dist/tex/latex/feyn/feyn.sty</code>,
+so that if I were installing them ‘privately’, I would put them in
+<code>/usr/local/texlive/texmf-local/fonts/source/local/feyn/</code>
+and
+<code>/usr/local/texlive/texmf-local/tex/latex/feyn/feyn.sty</code>.
+With the teTeX and TeXLive Unix distributions, the output of
+<code>kpsepath mf</code> shows the list of places where TeX will look
+for Metafont source files.  The font files <em>should</em> be
+generated on the fly when you first refer to them.  See also the
+relevant discussion in the TeX FAQ about <a
+href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-wlcf'
+>‘where LaTeX can find them’</a>.</li>
+
+<li>Run LaTeX on the file <code>feyn.dtx</code> to obtain the
+documentation, which is prebuilt in <code><a href="feyn.pdf"
+>feyn.pdf</a></code> (this should
+generate the font files as a side-effect).</li>
+</ol>
+
+<p>You should be able to find generic instructions for installing LaTeX files at
+<a href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings' >the TeX FAQ</a>.</p>
+
+
+
+<div class="signature">
+<a href="http://nxg.me.uk" >Norman Gray</a><br/>
+2017 November 03
+</div>
+
+</body>
+</html>
+
+
+<!-- Local Variables: -->
+<!-- mode: nxml -->
+<!-- End: -->
diff --git a/Master/texmf-dist/doc/fonts/feyn/feyn.pdf b/Master/texmf-dist/doc/fonts/feyn/feyn.pdf
index e474e21ed46..adc1240b727 100644
--- a/Master/texmf-dist/doc/fonts/feyn/feyn.pdf
+++ b/Master/texmf-dist/doc/fonts/feyn/feyn.pdf
diff --git a/Master/texmf-dist/doc/fonts/feyn/overheads.pdf b/Master/texmf-dist/doc/fonts/feyn/overheads.pdf
index 6c23aec04a8..bd3a412975b 100644
--- a/Master/texmf-dist/doc/fonts/feyn/overheads.pdf
+++ b/Master/texmf-dist/doc/fonts/feyn/overheads.pdf
diff --git a/Master/texmf-dist/doc/fonts/feyn/overheads.tex b/Master/texmf-dist/doc/fonts/feyn/overheads.tex
index 61fe82cc3cb..fb4823391a7 100644
--- a/Master/texmf-dist/doc/fonts/feyn/overheads.tex
+++ b/Master/texmf-dist/doc/fonts/feyn/overheads.tex
@@ -6,7 +6,7 @@
 
 \title{Feynman diagrams}
 \author{Norman Gray\\University of Glasgow}
-\date{v0.3.3, 2009 October 8}
+\date{v0.4.1, 2017 November 03}
 
 %\parindent0pt
 
diff --git a/Master/texmf-dist/doc/fonts/feyn/release-notes.html b/Master/texmf-dist/doc/fonts/feyn/release-notes.html
new file mode 100644
index 00000000000..3b0a380f722
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/release-notes.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding='utf-8'?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>The Feyn font – release notes</title>
+<link href="http://nxg.me.uk" rev="author"/>
+<link type="text/css" rel="stylesheet" href="style.css"/>
+<style type='text/css'>
+dd ul { padding: 0pt; margin: 0pt; }
+</style>
+</head>
+
+<body>
+<h1>The Feyn font – release notes</h1>
+
+<dl>
+<!-- @CURRENT@ -->
+<dt><span class='attention'>Version 0.4.1, 2017 November 3</span></dt>
+<dd><p>The package is now licensed under the terms of the 2-clause BSD licence.</p>
+<p>The only other changes from v0.4b2 are mild documentation adjustments
+(sorry for the long delay between 0.4b2 and 0.4).</p>
+<p>Version 0.4 was not widely released.</p></dd>
+
+<dt>Version 0.4b3, 2013 April 12</dt>
+<dd><ul>
+<li>Changed <code>\below</code> to <code>\belowl</code>, and added
+companion <code>\belowr</code>.</li>
+<li>Documentation updates</li>
+</ul></dd>
+
+<dt>Version 0.4b2, 2011 April 9</dt>
+<dd><p><img class="smallimage" src="sample-phi4.png" alt="Vertex"/> As
+for version 0.4b1, but with the addition of <code>aV</code> for a
+backward arrow (rarely used, but included for consistency; thanks to
+Thomas Pruschke for the suggestion).  Also added: <code>flo</code> for
+the closed fermion loop, for phi^4 theory (plus <code>floV</code> and
+<code>floA</code> for completeness; thanks to Hoang Nghia Nguyen for the suggestion;
+the font should <em>now</em> be able to produce all scalar theory
+diagrams).</p></dd>
+
+<dt>Version 0.4b1, 2010 January 23</dt>
+<dd><p>Addition of the extended-size `feynx' fonts, and the <code>\FEYN</code> macro
+(thanks to Luciano Pandola for the suggestion).</p>
+<p>Adjustments to the sizing of half-loops
+(the half-loops are now squashed, though the quarter-loops aren't).
+Added ghost loops; we can now do all the diagrams of 2-loop QCD.
+The quarter-loop gluons now taper at both ends, so that two quarter-loops
+are no longer the same as one half-loop.</p></dd>
+
+<!-- @ENDCURRENT@ -->
+
+<dt>Version 0.3.3, 2009 October 8</dt>
+<dd>Minor documentation improvements.</dd>
+
+<dt>Version 0.3.2, 2009 August 5</dt>
+<dd>Minor documentation improvements – no functional difference from 0.3.1</dd>
+
+<dt>Version 0.3.1, 2008 February 29</dt>
+<dd>No changes from 0.3b3</dd>
+
+<dt>Version 0.3b3, 2008 January 30</dt>
+<dd>This time it works properly, with the ‘globalbang’ mechanism fixed
+(thanks again to Bryan Chen’s patience).</dd>
+
+<dt>Version 0.3b2, 2008 January 27</dt>
+<dd>Now works properly with amsmath package, as long as it’s loaded
+second (and the <code>{no,}globalbang</code> options have been added to force
+behaviour when necessary).  Thanks to Bryan Chen for the bugreport.</dd>
+
+<dt>Version 0.3b1, 2008 January 17</dt>
+<dd>Added small fermion loops (including inverted, and arrowed); added
+a variant of the proper vertex which is all-black rather than hatched
+(both these suggestions from Bryan Chen).  Some documentation improvements.</dd>
+
+<dt>Version 0.2-2, 2005 December 2</dt>
+<dd><img class="smallimage" src="sample-two-loop-annotated.png" alt="Vertex"
+/>It turned out that the <code>.dtx</code> documentation wasn’t
+generated properly when called in the not-terribly-useful
+<code>\AlsoImplementation</code> mode; fixed, and that mode is no
+longer the default.</dd>
+
+<dt>Version 0.2-1, 2005 December 2</dt>
+<dd>Doh!  The new files <code>feyn18.mf</code>, <code>feyn24.mf</code>
+and their textsize counterparts were not included in the 0.2
+distribution; thanks to Purnendu Chakraborty from the Saha Institute
+for discovering this.  This release also includes fixed gluon loop
+characters: they were all 1 module high before, but now have the
+correct sizes.</dd>
+
+<dt>Version 0.2, 2005 March 24</dt>
+
+<dd>Substantial restructuring.  Most particularly, (almost) all of the
+propagators now have versions with arrows integrated into the
+character, and each of the characters has an ‘annotation point’
+defined, and accessed using the <code>\momentum</code> macro, or the
+‘!’ abbreviation.  This makes the ‘a’ character (the arrow) largely
+redundant and the <code>\vertexlabel</code> macro rather less
+important.</dd>
+
+<dt>Version 0.1, 1991, 1994, 2001</dt>
+<dd><img class="smallimage" src="sample-vertex.png" alt="Vertex"
+/>Initial version.  The font was first produced in 1991 or so,
+first released in 1994, and tidied up and more carefully re-released
+as version 0.1 in 2001.</dd>
+</dl>
+
+</body>
+</html>
diff --git a/Master/texmf-dist/doc/fonts/feyn/sample-massive.png b/Master/texmf-dist/doc/fonts/feyn/sample-massive.png
new file mode 100644
index 00000000000..815d432cb79
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/sample-massive.png
diff --git a/Master/texmf-dist/doc/fonts/feyn/sample-phi4.png b/Master/texmf-dist/doc/fonts/feyn/sample-phi4.png
new file mode 100644
index 00000000000..713ea241bda
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/sample-phi4.png
diff --git a/Master/texmf-dist/doc/fonts/feyn/sample-two-loop-annotated.png b/Master/texmf-dist/doc/fonts/feyn/sample-two-loop-annotated.png
new file mode 100644
index 00000000000..1ec01333fdc
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/sample-two-loop-annotated.png
diff --git a/Master/texmf-dist/doc/fonts/feyn/sample-two-loop.png b/Master/texmf-dist/doc/fonts/feyn/sample-two-loop.png
new file mode 100644
index 00000000000..b84b3d875e2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/sample-two-loop.png
diff --git a/Master/texmf-dist/doc/fonts/feyn/sample-vertex.png b/Master/texmf-dist/doc/fonts/feyn/sample-vertex.png
new file mode 100644
index 00000000000..3fd6f6af6ca
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/sample-vertex.png
diff --git a/Master/texmf-dist/doc/fonts/feyn/style.css b/Master/texmf-dist/doc/fonts/feyn/style.css
new file mode 100644
index 00000000000..f0a3150cca2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/feyn/style.css
@@ -0,0 +1,268 @@
+body {
+  color: #333;
+  background: white;
+  margin-left: +30%;
+  width: 50%;            /* body is 50% of screen width */
+  padding: 0.5em;        /* this will make a difference if I decide to
+  			    have the background a different colour */
+  /* I can't decide on font: Optima's always nice, but Gill looks
+     agreeably intense.  Helvetica's a decent fallback. */
+  font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif;
+  /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */
+  /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */
+  /* I seem to have used 11pt at some point in the past, but this
+     is far too big -- did I ever have a reason for that, or is it
+     just due to browser changes? */
+  font-size: 10pt;
+  line-height: 150%;
+}
+
+/* adapt to wider screens */
+@media screen and (min-width: 700pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;
+    }
+}
+
+/* The following appears not to work in Safari or Chrome
+   -- don't know why, yet.
+@media print {
+    @page :right {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 10%;
+            width: 60%;
+            margin-right: 30%;
+            color: #d33;
+        }
+    }
+    @page :left {
+        size: auto;
+        body {
+            margin-top: 2cm;
+            margin-bottom: 3cm;
+            margin-left: 30%;
+            width: 60%;
+            margin-right: 10%;
+            color: #33d;
+        }
+    }
+}
+*/
+
+div.topsidebar {
+    float: right;
+    width: 50%;                 /* ...of the body width (ie, 50% x 50% of screen) */
+    font-size: smaller;
+    margin-left: 1em;
+    padding-left: 1em;
+    border-left: solid thin #AAA;
+}
+
+/* On wider screens, move the sidebar out to the right hand side */
+/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */
+@media screen and (min-width: 700pt) and (max-width: 850pt) {
+    body {
+        margin-left: 210pt;
+        width: 350pt;           /* 50% of 700pt */
+        margin-right: auto;
+    }
+    div.topsidebar {
+        position: absolute;
+        /* I feel this size should be 595pt (350 + 210 + 0.05*700),
+           but that's clearly not right -- I don't think I understand what the -5%
+           in the h1 spec below is actually 5% of! */
+        left: 570pt;
+        width: auto;
+        margin-left: 0pt;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge.
+   When the screen is 850pt wide (expanding from the @media case above),
+   the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
+@media screen and (min-width: 850pt) {
+    body {
+        margin-right: 290pt;    /* 290 = 850-(210+350) */
+        width: 350pt;
+        margin-left: auto;      /* ...takes up the slack */
+    }
+    div.topsidebar {
+        position: absolute;
+        width: 290pt;           /* same 290pt as above */
+        left: auto;
+        right: 0%;
+        padding-left: 0pt;
+        border: none;
+    }
+}
+
+
+code, pre {
+  font-family: Monaco, fixed;
+  font-size: 9pt;
+}
+
+a { text-decoration: none; }
+a:link { color: #66C; }
+a:visited { color: #669; }
+a[href]:hover { background: #EEE; }
+
+div.abstract {
+  font-style: oblique;
+  text-align: left;
+}
+div.abstract em { font-style: normal; }
+div.abstract code {
+  font-style: normal;
+  font-size: 80%;
+}
+
+/* a span/div style for attracting attention */
+.attention {
+  color: #822;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #822;
+  font-weight: 100;             /* few fonts have ultra-light weights */
+  line-height: 100%;            /* no need to spread out titles */
+}
+
+h1 {
+  margin-left: -40%;
+  margin-right: -5%;
+  padding: 0.5em;
+  border: solid thin #666;
+  text-align: right;
+}
+
+h2 {
+  margin-left: -40%;
+  margin-right: -5%;
+  padding: 0.2em;
+  border-top: solid thin #666;
+  clear: both;
+}
+
+h2.appendices {
+  margin-top: 10ex;
+  border-top: double medium #666;
+}
+
+h3 {
+  margin-left: -30%;
+  float: left;
+  width: 25%;
+  display: block;
+  text-align: right;
+  vertical-align: bottom;
+  padding-top: 0pt;
+  padding-right: 0.5em;
+  margin-top: 0pt;
+  line-height: 120%;
+}
+
+/*
+h4 {
+  color: #C66;
+}
+*/
+
+pre, table { background: #dde; }
+
+pre {
+  padding: 1em;
+  line-height: 130%;
+}
+
+table {
+  font-size: smaller;
+}
+td {
+  padding: 0.5ex;
+}
+
+Q:before { content: "“"; }
+Q:after  { content: "”"; }
+
+img.smallimage {
+  float: right;
+  margin: 24pt;
+  margin-right: -30%;
+}
+
+div.signature {
+  margin-left: -40%;
+  margin-right: -5%;
+  margin-top: 4ex;
+  text-align: right;
+  border: solid thin #666;
+  padding: 0.3em;
+  clear: both;
+}
+
+/* ============================================================
+ * Some other curiosities of my one-time formatting for web pages
+ */
+.doc-history {
+  font-size: xx-small;
+  background: #eee;
+  line-height: 100%;
+}
+
+div.subtoc, div.subsubtoc { display: none; }
+
+/* ============================================================
+ * Special formatting for ToC
+ */
+
+/*
+  If there's significant amount of text in front of the first subsection,
+  then the following are good to put in the per-document stylesheet:
+  width: 25%;
+  float: right;
+*/
+div#toc {
+  color: #888;
+  padding: 0;
+  font-size: smaller;
+  text-align: right;
+}
+div#toc a:link { color: #888; }
+div#toc > ul {
+  padding: 0pt;
+  margin: 0pt;
+  list-style: none;
+}
+div#toc li {
+  padding: 0pt;
+  display: inline-block;
+}
+div#toc li:before {
+  content: "§ ";
+  margin-left: 1em;
+}
+/* the following elements aren't currently generated by structure.lx */
+div#toc li ul {
+  padding-left: 1em;
+  margin-left: 0;
+  font-style: italic;
+  display: inline;
+}
+div#toc li ul:before {
+  content: "( ";
+}
+div#toc li ul:after {
+  content: " ) ";
+}
+div#toc li li {
+  padding-left: 0pt;
+}
+div#toc li li:after {
+  content: "; ";
+}
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
index deb0b6fb302..60a64f4d012 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
@@ -1,9 +1,9 @@
-%   This is the metafont for the feynfont font, release 0.3.3, 2009 October 8
+%   This is the metafont for the feynfont font, release 0.4.1, 2017 November 03
 %
-%   Copyright 1991, 1994, 2001, 2002, 2005, 2008, Norman Gray.
+%   Copyright 1991, 1994, 2001, 2002, 2005, 2008-10, Norman Gray.
 %   See the file LICENCE for licence details.
 %
-%   Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+%   Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 %
 %
 %
@@ -28,7 +28,15 @@ pickup pencircle scaled linewidth;
 diagram_pen := savepen;
 
 % general definitions
-phangle := 75;
+phangle := 75;                  % photon angle
+
+squash := 0.75;                 % the amount by which some loops are squashed
+
+% The caller must set the following parameters to values such as these
+%boson_wiggles := 4;             %this must be an even number
+%boson_wiggles_loop_small := 4;
+%boson_wiggles_loop_normal := 6;
+%boson_wiggles_loop_large := 8;
 
 
 %   All the character positions between 0 and hex"7F"
@@ -52,7 +60,7 @@ string  donecharerror;
 donecharerror := "Duplicate character";
 extra_beginchar := extra_beginchar & "if known donechar[charcode]: errmessage donecharerror; fi donechar[charcode] := 1;";
 
-path charpath;  
+path charpath, charpathb;
   
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -77,9 +85,25 @@ enddef;
 
 threechars ("f", "fermion",
   path_fermion(2module#, 0), 0.5, 2module#, 0, 0,
-  (0,0.1module), "top");
+    (0,0.1module), "top");
 
-beginchar ("k", module#, 0, 0);
+begingroup                      % make closed fermion loop, for phi^4 theory
+  clearxy;
+  save height;
+  height# := 2module#;
+  define_pixels(height);
+  z2 = (0, height);             %top of loop
+  y1 = y3 = 2y2/3;
+  x1+x3 = 0;
+  x1-x3 = 2height/3;
+  charpath := origin .. z1 .. z2 .. z3 .. origin;
+  threechars ("k", "fermion loop",
+      charpath shifted (0,a), 2,
+      0, 2module#, 0,
+      0, "top");
+endgroup;    
+
+beginchar (hex"21", module#, 0, 0);
   "short fermion";
   pen;
   draw path_fermion(module#, 0);
@@ -102,7 +126,7 @@ threechars ("d", "downward fermion",
   path_fermion(2module#, -45), 0.5,
     2module#*(cosd -45), 2module#*(abs sind -45), 0,
     0, "urt");
-
+  
 threechars ("b", "vertically upward fermion",
   path_fermion(2module#, 90), 0.5,
     2module#*(cosd 90), 2module#*(abs sind 90), 0,
@@ -133,7 +157,7 @@ beginchar(byte"m"-hex"60", 2module#, 0, 0); "l-arrowed massive fermion";
 endchar;
 
 charpath := path_fermion(module#, 0);
-beginchar(hex"0B", module#, 0, 0); "short massive fermion";
+beginchar(hex"23", module#, 0, 0); "short massive fermion";
   pen;
   draw charpath shifted (0,linewidth);
   draw charpath shifted (0,-linewidth);
@@ -149,17 +173,16 @@ begingroup
   x2-x0 = 2(x1-x0) = width;
   x1 = 0;
   y0 = y2 = 0;
-  y1 = 1.6module;
-  %charpath := z0{dir 60} .. {dir -60}z2;
+  y1 = 2squash*module;
   charpath := z0 .. z1 .. z2;
 
   threechars("l", "fermion loop",
     charpath shifted (0,a), 1,
-    0, module#+a#, 0,
+    0, 2squash*module#+a#, 0,
     0, "top");
   threechars("n", "fermion loop, inverted",
     charpath yscaled -1 shifted (0,a), 1,
-    0, module#+a#, 0,
+    0, a#, 0,
     0, "bot");
   threechars("o", "fermion loop, small",
     charpath scaled 0.66667 shifted (0,0.66667a), 1,
@@ -182,6 +205,41 @@ def path_boson (expr scale_sharp, ang, taper) =
     save scale;
     clearxy;
     scale := hround(scale_sharp*hppp);
+    x1 = 0;
+    x99 = scale*(cosd ang);
+    if ang > 0 :                % slopes upward
+      y1 = a;
+      y99 = scale*(abs sind ang) + a;
+    else :
+      y1 = scale*(abs sind ang) + a;
+      y99 = a;
+    fi
+    for i = 3 upto boson_wiggles:
+      z[i] - z[i-1] = z2-z1;
+    endfor
+    z99 - z[boson_wiggles] = z2-z1;
+    def ::(expr b) = {dir (ang+b)} looselink {dir (ang-b)} enddef;
+
+    z1 ::(phangle)z2
+    for i = 3 step 2 until boson_wiggles:
+      ::(-phangle) z[i] ::(phangle)z[i+1]
+    endfor
+    if taper <> 0 :
+      {dir (ang-phangle)} .. tension 1 and 0.8 .. {dir (ang+phangle/2)}
+    else :
+      ::(-phangle)
+    fi
+    z99
+  endgroup
+enddef;
+
+% the following is a simpler version of the above, without the
+% boson_wiggles, to document what it's supposed to be doing
+def path_boson_orig (expr scale_sharp, ang, taper) =
+  begingroup
+    save scale;
+    clearxy;
+    scale := hround(scale_sharp*hppp);
     x1 = 0; x5 = scale*(cosd ang);
     if ang > 0 :                % slopes upward
       y1 = a;
@@ -204,37 +262,40 @@ def path_boson (expr scale_sharp, ang, taper) =
 enddef;
 
 threechars ("g", "gluon",
-  path_boson(2module#, 0, 0), 2,
+  path_boson(2module#, 0, 0), boson_wiggles/2,
   2module#, 0, 0,
   (0, 0.2module), "top");
 threechars ("u", "upward gluon",
-  path_boson(2module#, 45, 0), 2,
+  path_boson(2module#, 45, 0), boson_wiggles/2,
   2module#*(cosd 45), 2module#*(abs sind 45), 0,
   0, "ulft");
 threechars ("v", "downward gluon",
-  path_boson(2module#, -45, 0), 2,
+  path_boson(2module#, -45, 0), boson_wiggles/2,
   2module#*(cosd -45), 2module#*(abs sind -45), 0,
   0, "urt");
-threechars (oct"175",
+threechars (hex"7D",
   "vertical gluon",
-  path_boson(2module#, 90, 1), 2,
+  path_boson(2module#, 90, 1), boson_wiggles/2,
   0, 2module#, 0,
   0, "urt");
 
-
 % plus or minus phangle, depending on whether n is odd or even
 def pm_angle(expr n) =
   if odd n: -1 else: 1 fi*phangle
 enddef;
 
-% a gluon quarter loop:
+% a gluon quarter loop, in the upper-right quadrant:
 %   wid:    radius of loop in modules
 %   nopts:  number of points
 %   inv:    if 1, the loop goes from the axis to the top;
 %           if 0, from the top down to the axis
 %   negang: if 1, negate the photon angle (so it wiggles oppositely);
 %           if 0, don't
-%   taper:  if 1, the line tapers as it approaches the axis
+%   taper:  if 1 or 3, the line tapers as it approaches the axis
+%           if 2 or 3, the line tapers as it approaches the top
+%           if 0, the line does not taper
+% (I can't help feeling this macro has become more complicated than it
+% really need be...)
 def path_quadloop (expr wid, nopts, inv, negang, taper) =
   begingroup
     save halfwidth, myangle;
@@ -242,16 +303,21 @@ def path_quadloop (expr wid, nopts, inv, negang, taper) =
     halfwidth# := wid*module#;
     define_pixels(halfwidth);
     myangle = if negang <> 0: -phangle else: phangle fi;
-    z0 = (halfwidth, 0);
+    z0 = (halfwidth, 0);        % z0 is on the axis
     for x = 1 upto nopts:
       z[x] = z0 rotated (x*90/nopts);
     endfor
     if inv = 0:
       def ::(expr p,ang) = p{p rotated(-90-ang)} looselink enddef;
-      for x=nopts downto 2:
+      if (taper = 2) or (taper = 3):
+        z[nopts]{dir(0-myangle/2)} .. tension 0.8 and 1 .. 
+      else:
+        ::(z[nopts], pm_angle(nopts+negang))
+      fi
+      for x=nopts-1 downto 2:
         ::(z[x], pm_angle(x+negang))
       endfor
-      if taper <> 0:
+      if (taper = 1) or (taper = 3):
         z[1]{z[1] rotated(-90+myangle)} .. tension 1 and 0.8 .. {dir -(90+myangle/2)}
       else:
         ::(z[1], pm_angle(1+negang))
@@ -259,47 +325,67 @@ def path_quadloop (expr wid, nopts, inv, negang, taper) =
       z0
     else:
       def ::(expr p,ang) = looselink {p rotated (90+ang)}p enddef;
-      if taper <> 0:
+      if (taper = 1) or (taper = 3):
         z0 {dir (90+myangle/2)} .. tension 0.8 and 1 .. z[1]{z[1] rotated(90-myangle)}
       else:
         z0{dir (90+myangle)}
         ::(z[1], pm_angle(1+negang))
       fi
-      for x=1 upto nopts:
+      for x=1 upto nopts-1:
         ::(z[x], pm_angle(x+negang))
       endfor
+      if (taper = 2) or (taper = 3):
+        .. tension 0.8 and 1 .. {z[nopts] rotated (90+myangle/2)}z[nopts]
+      else:
+        ::(z[nopts], pm_angle(nopts+negang))
+      fi
     fi
   endgroup
 enddef;
 
+% next_odd: evaluate to the next odd number greater than or equal to n
+def next_odd(expr n) =
+  (2*floor(n/2)+1)
+enddef;
 
 threechars ("q", "gluon, quadrant 1",
-  path_quadloop(2, 6, 1, 0, 1) xscaled -1 shifted (0,a), 4,
-    0, 2module#+a#, 0,
+  path_quadloop(2, boson_wiggles_loop_normal, 1, 0, 3) xscaled -1 shifted (0,a),
+    next_odd(2boson_wiggles_loop_normal/3),
+    0, 2module#, 0, % height is 2module#, not 2module#+a#, so that
+                    % they line up OK in \Diagram
     0, "ulft");
 threechars ("r", "gluon, quadrant 2",
-  path_quadloop(2, 6, 0, 0, 1) shifted (0,a), 3,
-    0, 2module#+a#, 0,
+  path_quadloop(2, boson_wiggles_loop_normal, 0, 0, 3) shifted (0,a),
+    next_odd(boson_wiggles_loop_normal/2),
+    0, 2module#, 0,
     0, "urt");
 threechars ("s", "gluon, quadrant 3",
-  path_quadloop(2, 6, 0, 1, 1) yscaled -1 shifted (0,a), 3,
+  path_quadloop(2, boson_wiggles_loop_normal, 0, 1, 3) yscaled -1 shifted (0,a),
+    next_odd(boson_wiggles_loop_normal/2),
     0, a#, a#-2module#,
     0, "lrt");
 threechars ("t", "gluon, quadrant 4",
-  path_quadloop(2, 6, 1, 1, 1) scaled -1 shifted (0,a), 4,
+  path_quadloop(2, boson_wiggles_loop_normal, 1, 1, 3) scaled -1 shifted (0,a),
+    next_odd(2boson_wiggles_loop_normal/3),
     0, a#, a#-2module#,
     0, "llft");
+  
 % The two loops following have the annotation off-centre, to keep
 % it clear of the wiggles.  Would it look better being "top" and "bot"
 % again, but with a non-zero offset in the second-last argument?
+% These two are vertically squashed so that they take up less than 2
+% modules vertically, which means in turn that {gl glu} can sit in a
+% two-loop diagram without crashing into the baseline.
 threechars ("y",  "gluon half loop",
-  ((path_quadloop(2, 6, 1, 0, 0) xscaled -1)
-    .. path_quadloop(2, 6, 0, 0, 0)) shifted (0,a), 7,
-  0, 2module#+a#, 0,
+  ((path_quadloop(2, boson_wiggles_loop_normal, 1, 0, 1) xscaled -1)
+    .. path_quadloop(2, boson_wiggles_loop_normal, 0, 0, 1)) yscaled squash shifted (0,a),
+  boson_wiggles_loop_normal+1,
+  0, 2squash*module#+a#, 0,
   0, "urt");
 threechars ("z",  "gluon half loop, inverted",
-  ((path_quadloop(2, 6, 1, 1, 0) scaled -1)
-    .. (path_quadloop(2, 6, 0, 1, 0) yscaled -1)) shifted (0,a), 7,
+  ((path_quadloop(2, boson_wiggles_loop_normal, 1, 1, 1) scaled -1)
+    .. (path_quadloop(2, boson_wiggles_loop_normal, 0, 1, 1) yscaled -1)) yscaled squash shifted (0,a),
+  boson_wiggles_loop_normal+1,
   0, a#, a#-2module#,
   0, "llft");
 
@@ -307,22 +393,49 @@ threechars ("z",  "gluon half loop, inverted",
 % That's OK -- they can still be accessed by ligatures.
 % 7b='{', 7c='|'
 threechars (hex"7B", "large gluon half loop",
-  ((path_quadloop(2.66667, 8, 1, 0, 0) xscaled -1)
-    .. path_quadloop(2.66667, 8, 0, 0, 0)) shifted (0,a), 9,
+  ((path_quadloop(2.66667, boson_wiggles_loop_large, 1, 0, 1) xscaled -1)
+    .. path_quadloop(2.66667, boson_wiggles_loop_large, 0, 0, 1)) shifted (0,a),
+  1.5boson_wiggles_loop_large,
   0, 2.66667module#+a#, 0,
   0, "urt");
 threechars (hex"7C", "small gluon half loop",
-  ((path_quadloop(1.3333, 4, 1, 0, 0) xscaled -1)
-    .. path_quadloop(1.3333, 4, 0, 0, 0)) shifted (0,a), 6,
+  ((path_quadloop(1.3333, boson_wiggles_loop_small, 1, 0, 1) xscaled -1)
+    .. path_quadloop(1.3333, boson_wiggles_loop_small, 0, 0, 1)) shifted (0,a),
+  1.5boson_wiggles_loop_small,
   0, 1.3333module#+a#, 0,
   0, "llft");
-  
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Ghosts
 
+ghost_points = 2(boson_wiggles + 1); % should be at least 8?
 def draw_ghost(expr a, b, apos) =
   begingroup
+    % pattern for ghost_points=10: "-_--_--_--_-"
+    clearxy;
+    z1 = a; z[ghost_points] = b;
+    z2-z1 = z[ghost_points]-z[ghost_points-1];
+    for i = 2 step 2 until (ghost_points-1):
+      z2-z1 = z[i+1]-z[i];
+    endfor
+    z4-z3 = 2(z2-z1);
+    for i = 5 step 2 until (ghost_points-2):
+      z4-z3 = z[i+1]-z[i];
+    endfor
+    pen;
+    draw z1--z2; draw z[ghost_points-1]--z[ghost_points];
+    for i = 3 step 2 until (ghost_points-2):
+      draw z[i]--z[i+1];
+    endfor
+    annotate_at(0.5[z1,z[ghost_points]], apos);
+  endgroup
+enddef;
+% the following is a simpler version of the above, without the
+% ghost_points parameter, to document what it's supposed to be doing
+def draw_ghost_orig(expr a, b, apos) =
+  begingroup
     clearxy;
-    %z1 = (0,a); z10 = (2module,a);
     z1 = a;  z10 = b;
     z4-z3 = 2(z2-z1);
     z4-z3 = z6-z5 = z8-z7;
@@ -381,7 +494,54 @@ beginchar (byte"j"-hex"60", 2module#*(cosd 45), 2module#*(sind 45), 0);
   drawarrow (littlearrow, .5[(0,a), (w,h+a)], -45+180);
 endchar;
 
-beginchar ("K", module#, 0, 0);			"short ghost";
+% ghost loops
+begingroup
+  clearxy; clearit;             % clear current picture
+  picture ghostloop;
+  pair refpt, arrowpoint;
+  refpt := (-2module, 0);
+  for i=0 upto 23:
+    z[i] = refpt rotated -(i/24*180) yscaled squash shifted (0,a);
+  endfor
+  arrowpoint := z[12];
+  transform below;
+  below := identity rotatedaround ((0,a), 180);
+  pen;
+  for i=0 step 2 until 22:
+    draw z[i]--z[i+1];
+  endfor
+  ghostloop := currentpicture; clearit;
+  beginchar (hex"7E", 0, 2squash*module#+a#, 0); "ghost loop";
+    addto currentpicture also ghostloop;
+    annotate_at(arrowpoint, "top");
+  endchar;
+  beginchar (hex"7E"-hex"20", 0, 2squash*module#+a#, 0); "r-arrowed ghost loop";
+    addto currentpicture also ghostloop;
+    drawarrow(littlearrow, arrowpoint, 0);
+    annotate_at(arrowpoint, "top");
+  endchar;
+  beginchar (hex"7E"-hex"60", 0, 2squash*module#+a#, 0); "l-arrowed ghost loop";
+    addto currentpicture also ghostloop;
+    drawarrow(littlearrow, arrowpoint, 180);
+    annotate_at(arrowpoint, "top");
+  endchar;
+  beginchar (hex"7F", 0, a#, 0); "ghost loop, inverted";
+    addto currentpicture also ghostloop transformed below;
+    annotate_at(arrowpoint transformed below, "top");
+  endchar;
+  beginchar (hex"7F"-hex"20", 0, a#, 0); "r-arrowed ghost loop, inverted";
+    addto currentpicture also ghostloop transformed below;
+    drawarrow(littlearrow, arrowpoint transformed below, 0);
+    annotate_at(arrowpoint transformed below, "top");
+  endchar;
+  beginchar (hex"7F"-hex"60", 0, a#, 0); "l-arrowed ghost loop, inverted";
+    addto currentpicture also ghostloop transformed below;
+    drawarrow(littlearrow, arrowpoint transformed below, 180);
+    annotate_at(arrowpoint transformed below, "top");
+  endchar;
+endgroup;
+
+beginchar (hex"22", module#, 0, 0);			"short ghost";
   pen;
   z1 = (0,a);  z6 = (w,a);
   z4-z3 = 2(z2-z1);
@@ -390,6 +550,9 @@ beginchar ("K", module#, 0, 0);			"short ghost";
   annotate_at(0.5[z3,z4], "top")
 endchar;
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Odds and sods
 
 beginchar (hex"60", 2module#, 0, 0);
   "spacer";
@@ -441,6 +604,7 @@ endchar;
 % Other symbols
 
 garrow("a", 0, 1);
+garrow(hex"03", 180, 1);
 
 beginchar ("p", 2blobr#, blobr# + a#, blobr# - a#);
   pen;						"proper vertex";
@@ -487,11 +651,11 @@ beginchar ("x", 0, a#, -a#); "counterterm";
   annotate_at(0.5[z1,z3] shifted (0,a), "top");
 endchar;
 
-beginchar (hex"7F", module#, a#, 0);		"space block";
+beginchar (hex"20", module#, a#, 0);		"space block";
   pen;
+  message "spacer: width=" & decimal w & ", height=" & decimal h;
   draw origin--(w,h);
   draw (0,h)--(w,0);
-  % nothing
 endchar;
 
 
@@ -504,21 +668,25 @@ endfor
 
 
 %   Construct the ligature tables.
+ligtable "a" : % arrow
+  "A" =: "a",     % right-arrow, for symmetry
+  "V" =: hex"03"; % left-arrow
+
 ligtable "f" :	% fermion
 "A" =: "F",	% right-arrowed
 "V" =: hex"06",	% left-arrowed
 "u" =: "e",	% upward
 "d" =: "d",	% downward
 "v" =: "b",	% vertical
-"s" =: "k",	% short
+"s" =: hex"21",	% short
 "l" =: "l",     % loop
 "0" =: hex"60";	% spacer
-  
-ligtable "e" :	% downward fermion, fd
+
+ligtable "e" :	% upward fermion, fe
 "A" =: "E",	% arrowed
 "V" =: hex"05";
   
-ligtable "d" :	% upward fermion, fu
+ligtable "d" :	% downward fermion, fd
 "A" =: "D",
 "V" =: hex"04";
   
@@ -526,11 +694,16 @@ ligtable "b" :	% vertical fermion, fv
 "A" =: "B",
 "V" =: hex"02";
 
-ligtable "k" :	% short fermion
+ligtable hex"21" :	% short fermion
 "0" =: hex"40";	% short spacer
 
+ligtable "k" :  % fermion closed loop
+"A" =: "K",   % arrowed
+"V" =: hex"0b";
+
 ligtable "l" :  % fermion loop
 "u" =: "n",     % upside down
+"o" =: "k",     % closed loop (for scalar theory)
 "S" =: "o",     % small
 "A" =: "L",
 "V" =: hex"0C";
@@ -550,7 +723,7 @@ ligtable "g" :	% gluon
 ligtable "m" :	% massive fermion
 "A" =: "M",
 "V" =: hex"0D",
-"s" =: hex"0B";
+"s" =: hex"23";
 
 ligtable "n" :  % inverted fermion
 "A" =: "N",
@@ -617,7 +790,17 @@ ligtable "h" :	% ghost
 "V" =: hex"08",
 "u" =: "i",	% upward
 "d" =: "j",	% downward
-"s" =: "K";	% short
+"s" =: hex"22",	% short
+"l" =: hex"7E"; % ghost loop
+
+ligtable hex"7E" : % ghost loop
+"A" =: hex"5E",    % r-arrowed
+"V" =: hex"1E",    % l-arrowed
+"u" =: hex"7F";    % upside down
+
+ligtable hex"7F" : % ghost loop inverted
+"A" =: hex"5F",    % r-arrowed
+"V" =: hex"1F";    % l-arrowed
 
 ligtable "i" :	% upward ghost
 "A" =: "I",
@@ -626,5 +809,3 @@ ligtable "i" :	% upward ghost
 ligtable "j" :	% downward ghost
 "A" =: "J",
 "V" =: hex"0A";
-
-
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf
index 9e126cf1f07..46b81eb0489 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 10pt display size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 10pt display size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 10pt#;
 
@@ -22,6 +22,12 @@ blobr# := 6.5pt#;		% radius of blobs and crosses
 
 on_math_axis := 1;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf
index bdfd63d040a..14a593cd5ad 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 11pt display size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 11pt display size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 11pt#;
 
@@ -22,6 +22,12 @@ blobr# := 7pt#;			% radius of blobs and crosses
 
 on_math_axis := 1;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf
index 1edf0bf33bd..eb8ea8864ec 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 12pt display size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 12pt display size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 12pt#;
 
@@ -22,6 +22,12 @@ blobr# := 7.5pt#;		% radius of blobs and crosses
 
 on_math_axis := 1;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf
index a89dee06730..360e822304e 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 18pt display size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 18pt display size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 18pt#;
 
@@ -22,6 +22,12 @@ blobr# := 10pt#;		% radius of blobs and crosses
 
 on_math_axis := 1;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
index 029e55274d8..fae595c9748 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
@@ -1,9 +1,9 @@
-% Feynman diagram font, 24pt display size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 24pt display size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
-font_identifier "FEYN"; font_size 10pt#;
+font_identifier "FEYN"; font_size 24pt#;
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
@@ -22,6 +22,12 @@ blobr# := 20pt#;		% radius of blobs and crosses
 
 on_math_axis := 1;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf b/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf
index 3511d1bb4a0..c99ac3a8885 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Macros to support feyn.mf
-% Release 0.3.3, 2009 October 8
+% Release 0.4.1, 2017 November 03
 
 
 def looselink = ..tension 0.75.. enddef;
@@ -16,8 +16,7 @@ def dirlooselink(expr point,rtn) =
 % Draw three related characters, one plain, one with an right-pointing
 % arrow, and one with a left-pointing one, at basechar, basechar-0x20 and
 % basechar-0x60.
-def threechars(expr basechar, name, cp, apoint, wsharp, hsharp, dsharp,
-    anudge, apos) =
+def threechars(expr basechar, name, cp, apoint, wsharp, hsharp, dsharp, anudge, apos) =
   % basechar : the charcode of the character in the lowercase range
   % name     : the name of the character
   % cp       : the path to be drawn
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf
index 33afee2d8a8..08a0db7b798 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 10pt text size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 10pt text size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 10pt#;
 
@@ -22,6 +22,12 @@ blobr# := 3.5pt#;		% radius of blobs and crosses
 
 on_math_axis := 0;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf
index 35fb120d542..7280b4f6331 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 11pt text size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 11pt text size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 11pt#;
 
@@ -22,6 +22,12 @@ blobr# := 3.5pt#;		% radius of blobs and crosses
 
 on_math_axis := 0;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf
index 7a93770391d..1abf5cbe87d 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 12pt text size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 12pt text size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 12pt#;
 
@@ -22,6 +22,12 @@ blobr# := 4pt#;			% radius of blobs and crosses
 
 on_math_axis := 0;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf
index 552862fb6aa..5798fe7c92a 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 18pt text size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 18pt text size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 18pt#;
 
@@ -22,6 +22,12 @@ blobr# := 7pt#;			% radius of blobs and crosses
 
 on_math_axis := 0;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf
index 56297781d12..9933f42804d 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 24pt text size, release 0.3.3, 2009 October 8.
+% Feynman diagram font, 24pt text size, release 0.4.1, 2017 November 03.
 %
-% Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 
 font_identifier "FEYN"; font_size 24pt#;
 
@@ -22,6 +22,12 @@ blobr# := 11pt#;		% radius of blobs and crosses
 
 on_math_axis := 0;
 
+% Boson wiggles
+boson_wiggles := 4;             %this must be an even number
+boson_wiggles_loop_small := 4;
+boson_wiggles_loop_normal := 6;
+boson_wiggles_loop_large := 8;
+
 % We want the roman digits from the corresponding cmr font, and that's
 % all.  Therefore, we don't want to obey the `generate' command in
 % cmr??.mf.  To do this, we read in cmbase, and then set generate to
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynx10.mf b/Master/texmf-dist/fonts/source/public/feyn/feynx10.mf
new file mode 100644
index 00000000000..2cfbe3d94d6
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynx10.mf
@@ -0,0 +1,47 @@
+% Feynman diagram font, 10pt extended size, release 0.4.1, 2017 November 03.
+%
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
+
+font_identifier "FEYNX"; font_size 10pt#;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% First the base size
+
+module# := 17.5pt#;             % 175% of 10pt
+
+% phfudge is ... what?!
+phfudge# := 0pt#;		% must be, for \Diagram macro
+
+linewidth# := 0.75pt#;		% pen width
+thinlinewidth# := 0.5pt#;	% thin pen
+bigarrow# := 6pt#;		% size of arrows
+littlearrow# := 4pt#;
+blobr# := 6.5pt#;		% radius of blobs and crosses
+
+on_math_axis := 1;
+
+% Boson wiggles
+boson_wiggles := 8;             %this must be an even number
+boson_wiggles_loop_small := 6;
+boson_wiggles_loop_normal := 8;
+boson_wiggles_loop_large := 12;
+
+% We want the roman digits from the corresponding cmr font, and that's
+% all.  Therefore, we don't want to obey the `generate' command in
+% cmr??.mf.  To do this, we read in cmbase, and then set generate to
+% gobble its argument. 
+def gobble primary g=enddef;	% gobbles its argument
+input cmbase;			% Read it explicitly, rather than
+				% implicitly within cmr10
+let generate=gobble;
+input cmr10;			% ...but miss out the `generate roman'
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% To business....
+
+input feyn;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynx11.mf b/Master/texmf-dist/fonts/source/public/feyn/feynx11.mf
new file mode 100644
index 00000000000..4e789fea9da
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynx11.mf
@@ -0,0 +1,47 @@
+% Feynman diagram font, 11pt extended size, release 0.4.1, 2017 November 03.
+%
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
+
+font_identifier "FEYNX"; font_size 11pt#;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% First the base size
+
+module# := 19.25pt#;            % 175% of 11pt
+
+% phfudge is ... what?!
+phfudge# := 0pt#;		% must be, for \Diagram macro
+
+linewidth# := 0.85pt#;		% pen width
+thinlinewidth# := 0.55pt#;	% thin pen
+bigarrow# := 6.5pt#;		% size of arrows
+littlearrow# := 4.5pt#;
+blobr# := 7pt#;			% radius of blobs and crosses
+
+on_math_axis := 1;
+
+% Boson wiggles
+boson_wiggles := 8;             %this must be an even number
+boson_wiggles_loop_small := 6;
+boson_wiggles_loop_normal := 8;
+boson_wiggles_loop_large := 12;
+
+% We want the roman digits from the corresponding cmr font, and that's
+% all.  Therefore, we don't want to obey the `generate' command in
+% cmr??.mf.  To do this, we read in cmbase, and then set generate to
+% gobble its argument. 
+def gobble primary g=enddef;	% gobbles its argument
+input cmbase;			% Read it explicitly, rather than
+				% implicitly within cmr10
+let generate=gobble;
+input cmr11;			% ...but miss out the `generate roman'
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% To business....
+
+input feyn;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynx12.mf b/Master/texmf-dist/fonts/source/public/feyn/feynx12.mf
new file mode 100644
index 00000000000..ff77747b945
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynx12.mf
@@ -0,0 +1,47 @@
+% Feynman diagram font, 12pt extended size, release 0.4.1, 2017 November 03.
+%
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
+
+font_identifier "FEYNX"; font_size 12pt#;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% First the base size
+
+module# := 21pt#;               % 175% * 12pt
+
+% phfudge is ... what?!
+phfudge# := 0pt#;		% must be, for \Diagram macro
+
+linewidth# := 0.9pt#;		% pen width
+thinlinewidth# := 0.6pt#;	% thin pen
+bigarrow# := 7pt#;		% size of arrows
+littlearrow# := 5pt#;
+blobr# := 7.5pt#;		% radius of blobs and crosses
+
+on_math_axis := 1;
+
+% Boson wiggles
+boson_wiggles := 8;             %this must be an even number
+boson_wiggles_loop_small := 6;
+boson_wiggles_loop_normal := 8;
+boson_wiggles_loop_large := 12;
+
+% We want the roman digits from the corresponding cmr font, and that's
+% all.  Therefore, we don't want to obey the `generate' command in
+% cmr??.mf.  To do this, we read in cmbase, and then set generate to
+% gobble its argument. 
+def gobble primary g=enddef;	% gobbles its argument
+input cmbase;			% Read it explicitly, rather than
+				% implicitly within cmr10
+let generate=gobble;
+input cmr12;			% ...but miss out the `generate roman'
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% To business....
+
+input feyn;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynx18.mf b/Master/texmf-dist/fonts/source/public/feyn/feynx18.mf
new file mode 100644
index 00000000000..ae282a3d226
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynx18.mf
@@ -0,0 +1,47 @@
+% Feynman diagram font, 18pt extended size, release 0.4.1, 2017 November 03.
+%
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
+
+font_identifier "FEYNX"; font_size 18pt#;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% First the base size
+
+module# := 31.5pt#;             % 175% of 18pt
+
+% phfudge is ... what?!
+phfudge# := 0pt#;		% must be, for \Diagram macro
+
+linewidth# := 1.5pt#;		% pen width
+thinlinewidth# := 0.75pt#;	% thin pen
+bigarrow# := 9pt#;		% size of arrows
+littlearrow# := 6pt#;
+blobr# := 10pt#;		% radius of blobs and crosses
+
+on_math_axis := 1;
+
+% Boson wiggles
+boson_wiggles := 8;             %this must be an even number
+boson_wiggles_loop_small := 6;
+boson_wiggles_loop_normal := 8;
+boson_wiggles_loop_large := 12;
+
+% We want the roman digits from the corresponding cmr font, and that's
+% all.  Therefore, we don't want to obey the `generate' command in
+% cmr??.mf.  To do this, we read in cmbase, and then set generate to
+% gobble its argument. 
+def gobble primary g=enddef;	% gobbles its argument
+input cmbase;			% Read it explicitly, rather than
+				% implicitly within cmr10
+let generate=gobble;
+input cmr10;			% ...but miss out the `generate roman'
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% To business....
+
+input feyn;
+
+end
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynx24.mf b/Master/texmf-dist/fonts/source/public/feyn/feynx24.mf
new file mode 100644
index 00000000000..4279e99113a
--- /dev/null
+++ b/Master/texmf-dist/fonts/source/public/feyn/feynx24.mf
@@ -0,0 +1,47 @@
+% Feynman diagram font, 24pt extended size, release 0.4.1, 2017 November 03.
+%
+% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+% Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
+
+font_identifier "FEYNX"; font_size 24pt#;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% First the base size
+
+module# := 42pt#;               % 175% of 24pt
+
+% phfudge is ... what?!
+phfudge# := 0pt#;		% must be, for \Diagram macro
+
+linewidth# := 2.25pt#;		% pen width
+thinlinewidth# := 1.5pt#;	% thin pen
+bigarrow# := 9pt#;		% size of arrows
+littlearrow# := 12pt#;
+blobr# := 20pt#;		% radius of blobs and crosses
+
+on_math_axis := 1;
+
+% Boson wiggles
+boson_wiggles := 8;             %this must be an even number
+boson_wiggles_loop_small := 6;
+boson_wiggles_loop_normal := 8;
+boson_wiggles_loop_large := 12;
+
+% We want the roman digits from the corresponding cmr font, and that's
+% all.  Therefore, we don't want to obey the `generate' command in
+% cmr??.mf.  To do this, we read in cmbase, and then set generate to
+% gobble its argument. 
+def gobble primary g=enddef;	% gobbles its argument
+input cmbase;			% Read it explicitly, rather than
+				% implicitly within cmr10
+let generate=gobble;
+input cmr10;			% ...but miss out the `generate roman'
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% To business....
+
+input feyn;
+
+end
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyn10.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyn10.tfm
index 82fbb4df304..1fdc725ded5 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyn10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyn10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyn11.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyn11.tfm
index bfab28717c5..a135a0c0490 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyn11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyn11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyn12.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyn12.tfm
index 8d87349bb62..13647953bbf 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyn12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyn12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyn18.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyn18.tfm
index ae00d91679c..1cc750c2642 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyn18.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyn18.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyn24.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyn24.tfm
index 680bbcc289b..616dea5f88f 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyn24.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyn24.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext10.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext10.tfm
index eddcc234f4b..fec7430f713 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext11.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext11.tfm
index d338e85de49..05827578a76 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext11.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext12.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext12.tfm
index 272bec6c56c..60bfdb75d25 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext12.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext18.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext18.tfm
index 1c72be73553..d9b0792dad8 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext18.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext18.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext24.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext24.tfm
index 518356e9bdc..b12fa300bf0 100644
--- a/Master/texmf-dist/fonts/tfm/public/feyn/feyntext24.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feyntext24.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feynx10.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feynx10.tfm
new file mode 100644
index 00000000000..c9e252e2a21
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feynx10.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feynx11.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feynx11.tfm
new file mode 100644
index 00000000000..da28715c255
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feynx11.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feynx12.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feynx12.tfm
new file mode 100644
index 00000000000..bea3809e7e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feynx12.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feynx18.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feynx18.tfm
new file mode 100644
index 00000000000..127e4808d9e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feynx18.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/feyn/feynx24.tfm b/Master/texmf-dist/fonts/tfm/public/feyn/feynx24.tfm
new file mode 100644
index 00000000000..cc6699a7d0e
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/feyn/feynx24.tfm
diff --git a/Master/texmf-dist/source/fonts/feyn/feyn.drv b/Master/texmf-dist/source/fonts/feyn/feyn.drv
index 0c14888b338..a68740fc247 100644
--- a/Master/texmf-dist/source/fonts/feyn/feyn.drv
+++ b/Master/texmf-dist/source/fonts/feyn/feyn.drv
@@ -6,33 +6,15 @@
 %%
 %% feyn.dtx  (with options: `driver')
 %% Feyn: package to manage the font feyn10
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, 2009 Norman Gray.
-%%
-%% 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-%%
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
-%% Department of Physics and Astronomy, University of Glasgow, UK
-%%
-%% See the file LICENCE for a copy of the GPL.
-%% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
-%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+%% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+%% It is distributed under the terms of the 2-clause BSD Licence;
+%% see the file LICENCE for details.
+%% VCS Info: Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 \documentclass{ltxdoc}
 \usepackage{feyn}
 \title{The feyn font}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
-\date{Version 0.3.3, 2009 October 8}
+\date{Version 0.4.1, 2017 November 03}
 \newcommand\Lopt[1]{\textsf {#1}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
diff --git a/Master/texmf-dist/source/fonts/feyn/feyn.dtx b/Master/texmf-dist/source/fonts/feyn/feyn.dtx
index 0ccffc9d72e..cb371f90193 100644
--- a/Master/texmf-dist/source/fonts/feyn/feyn.dtx
+++ b/Master/texmf-dist/source/fonts/feyn/feyn.dtx
@@ -1,39 +1,21 @@
 % \iffalse
 % This is feyn.dtx, which manages the use of the feyn Metafont
 %
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, 2009 Norman Gray. 
-%% 
-%% 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-%% 
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
-%% Department of Physics and Astronomy, University of Glasgow, UK
-%%
-%% See the file LICENCE for a copy of the GPL.
-%% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
-%
-%<+package|driver>%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+%% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+%% It is distributed under the terms of the 2-clause BSD Licence;
+%% see the file LICENCE for details.
+%
+%<+package|driver>%% VCS Info: Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 %<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{feyn}[2009/10/08 \space0.3.3\space textpos]
-%<+package>\typeout{Package: `feyn' 0.3.3\space<2009/10/08 >}
+%<+package>\ProvidesPackage{feyn}[2017/11/03 0.4.1]
+%<+package>\typeout{Package: `feyn' 0.4.1 <2017/11/03>}
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{feyn}
 \title{The feyn font}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
-\date{Version 0.3.3, 2009 October 8}
+\date{Version 0.4.1, 2017 November 03}
 \newcommand\Lopt[1]{\textsf {#1}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
@@ -41,10 +23,10 @@
 %% \url macro (url.sty does this better)
 \def\setpathdots{\discretionary{.}{}{.}}
 \def\setpathslash{\discretionary{/}{}{/}}
-{\catcode`\.=\active 
- \catcode`\/=\active 
+{\catcode`\.=\active
+ \catcode`\/=\active
   \gdef\pathcats{%
-    \catcode`\%=12      \catcode`\~=12 
+    \catcode`\%=12      \catcode`\~=12
     \catcode`\.=\active  \let.\setpathdots
     \catcode`\/=\active \let/\setpathslash
     \catcode`\#=12      \catcode`\_=12}%
@@ -81,18 +63,21 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %
+% \CheckSum{680}
 %
 %
 %
 %
-% 
 % \newcommand{\pslash}{p\llap{/\kern-0.3pt}}
-% \newcommand{\feynx}{\textsl{feyn}}
+% \newcommand{\feynx}{\pstyle{feyn}}
 % \newcommand{\metafont}{Metafont}
-% 
-% 
-% This describes the font \feynx, which can be used to produce relatively
-% simple Feynman diagrams within equations in a \LaTeX\ document.
+%
+%
+%
+% This document describes the font \feynx, which can be used to produce relatively
+% simple Feynman diagrams within equations in a \LaTeX\ document.  The
+% package and font aims to be capable of producing all of the diagrams
+% of one- and two-loop QED and QCD, plus $\phi^4$ theory.
 %
 % The other Feynman diagram package which exists is Thorsten Ohl's
 % \textsl{feynmf}/\textsl{feynmp} package.  That
@@ -100,10 +85,10 @@
 % It's more general than this package, but is at its best when
 % creating relatively large diagrams, for figures.
 % In contrast, the present system consists of a carefully-designed font
-% with which you can write simple diagrams, within equations or within text,
+% with which you can easily write simple diagrams, within equations or within text,
 % in a size matching the surrounding text size.
 %
-% \iffalse
+% \iftrue
 % \textbf{Contents:}
 % \def\numberline#1{\space\emph{\S#1}~}
 % \def\contentsline#1#2#3{#2,~p#3;}
@@ -112,17 +97,18 @@
 %
 % \subsection*{Status}
 %
-% The propagators and vertices which are implemented are those which
-% seem to appear most often in non-figure displays (the practical
-% definition of `appear most often' is `which I wanted' or `which
+% The propagators and vertices which are implemented are those of one-
+% and two-loop QED and QCD, plus $\phi^4$ theory, plus a few extras
+% which commonly appear in non-figure displays (the practical
+% definition of `commonly appear is `which I wanted' or `which
 % people asked me for').  I'd be delighted to add others which folk
 % feel would be useful, as long as they're still in the rather simple
-% scope of the font..
+% scope of the font.
 %
-% 
+% \newpage
 % \section{Description}
 %
-% You use the font by including the package \texttt{feyn.sty}, as in 
+% You use the font by including the package \texttt{feyn.sty}, as in
 % \begin{verbatim}
 % \usepackage{feyn}
 % \end{verbatim}
@@ -136,7 +122,7 @@
 % very arcane reason, then you can force the global or local declaration
 % of~`!' using the \Lopt{globalbang} and \Lopt{noglobalbang} options
 % to the \texttt{$\backslash$usepackage\{feyn\}} command.}
-% 
+%
 % \makeatletter
 % \def\refptcirc{\lower\feyn@maxis \hbox to 0pt{\hss$\circ$\hss}}
 % \makeatother
@@ -146,14 +132,16 @@
 %     \hfil\quad & $#$\hfil\quad & # \hfil\qquad && # \cr
 % \omit Character & \omit  & Name & Width & Height & Depth \cr
 % \noalign{\smallskip\hrule\smallskip}
-% f & f &	    fermion$^{\dag}$	
+% f & f &	    fermion$^{\dag}$
 %	& 2 & 0 & 0 \cr \tableskip
 % fs & fs &   short fermion
 %	& 1 & 0 & 0 \cr \tableskip
 % fl & fl &   fermion loop$^{\dag\ddag}$
-%	& 0 & 1 & 0 \cr \tableskip
+%	& 0 & $2-$ & 0 \cr \tableskip
 % flS & flS &  fermion loop (small)$^{\dag\ddag}$
 %       & 0 & 1 & 0 \cr \tableskip
+% flo & flo &   fermion loop (for $\phi^4$ theory)$^{\dag}$
+%       & 0 & 2 & 0 \cr \tableskip
 % fu & fu &   upward fermion$^\dag$ (45$^\circ$)
 %	& $\sqrt2$ & $\sqrt2$ & 0 \cr \tableskip
 % fd & fd &   downward fermion$^\dag$
@@ -167,7 +155,7 @@
 % g & g &	    gluon/photon$^{\dag}$
 %	& 2 & 0 & 0 \cr \tableskip
 % gl & gl &   gluon loop$^{\dag\ddag}$
-%	& 0 & 2 & 0 \cr \tableskip
+%	& 0 & $2-$ & 0 \cr \tableskip
 % glB & glB & gluon loop (big)$^{\dag}$
 %	& 0 & 2.67 & 0 \cr \tableskip
 % glS & glS & gluon loop (small)$^{\dag}$
@@ -186,24 +174,30 @@
 %	& 2 & 0 & 0 \cr \tableskip
 % ms & ms &   short massive fermion
 %	& 1 & 0 & 0 \cr \tableskip
-% h & h &	    ghost
+% h & h &	    ghost$^{\dag}$
 %	& 2 & 0 & 0 \cr \tableskip
 % hs & hs &   short ghost
 %	& 1 & 0 & 0 \cr \tableskip
-% hu & hu &   upward ghost (45$^\circ$)
+% hu & hu &   upward ghost$^{\dag}$ (45$^\circ$)
 %	& $\sqrt2$ & $\sqrt2$ & 0 \cr \tableskip
-% hd & hd &   downward ghost
+% hd & hd &   downward ghost$^{\dag}$
 %	& $\sqrt2$ & $\sqrt2$ & 0 \cr \tableskip
+% hl & hl &   ghost loop$^{\dag\ddag}$
+%         & 0 & $2-$ & 0 \cr\tableskip
 % x & x &	    counterterm vertex & 0 & $a$ & $-a$ \cr \tableskip
 % p & p &	    proper vertex	& - & - & - \cr \tableskip
 % P & P &	    proper vertex (variant)	& - & - & - \cr \tableskip
 % c & c &	    complete vertex	& - & - & - \cr \tableskip
-% a & a &	    arrow		& 0 & 0 & 0 \cr
+% a & a &	    arrow$^\dag$	& 0 & 0 & 0 \cr
 % }
-% \caption{\label{chars} The characters in font \feynx.  Characters
+% \caption{\label{chars} The characters in font \feynx, and their
+% reference points, marked with circles.  Characters
 % marked~$\dag$ have arrowed variants indicated with~`A' and~`V' suffixes;
 % and characters marked~$\ddag$ have an upside-down variant
-% indicated with a `u' suffix.  The `u' must come before the `A' or `V'.}
+% indicated with a `u' suffix.  The `u' must come before the `A' or
+% `V'. Character `a' has an `arrowed variant' in the sense that `aV'
+% produces a backward arrow. A length of `$2-$' indicates a length
+% slightly less than two units, for aesthetic reasons.}
 % \end{table}
 %
 % The characters in the font are shown in table~\ref{chars}.
@@ -226,24 +220,49 @@
 % upside-down variant, thus `flu' is an upside-down variant of the
 % fermion loop, and `fluV' an arrowed variant.
 %
+% Note that the fermion, gluon and ghost half-loop characters are
+% slightly shorter than the height you might expect.  These characters
+% are deliberately slightly squashed partly because that makes them
+% look slightly better (in my opinion!) in a one-loop self-energy
+% diagram, but also so that the `gl glu' or `fl flu' loop in a
+% two-loop diagram looks better.  The loop formed by the pair of `g1
+% g2' is the size you might expect.  See section~\ref{s:examples} below
+% for some illustrations of this.
+%
 % The unnassigned positions in the \feynx\ font are filled
 % with an obviously wrong dummy character, so that |$\feyn{A}$|, for example,
 % produces $\feyn{fs0Afs0}$.
-% 
+%
+% If you were to print out a font table, you would discover that many
+% of the glyphs in the font can be obtained using single
+% characters, rather than the ligatures mentioned in the table.  Do
+% not be tempted to use this as a shortcut, since the assignment of
+% glyphs to character positions may be changed without warning from release to
+% release, as long as the ligature maps remain valid.
+%
 % The file \file{feyn.sty} additionally defines a number of macros,
 % described here.
 % \begin{description}
 % \item[\cs{feyn}] Selects the diagram font.  This must be used
 %     within math mode.  \cs{Feyn} selects the text-mode diagram font.
 % \item[\cs{momentum}\{ch\}\{text\}] sets the character
-%     ch, which may be a ligature, and puts the given text at the recommended
+%     `ch', which may be a ligature, and puts the given text at the recommended
 %     annotation position for that character.  |\momentum[pos]{ch}{text}|
 %     is the same, except that the optional argument indicates the
 %     position relative to the annotation position.  It must be one of
-%     `top', `urt', `lrt', `bot', `llft' or `ulft'.  See below for
-%     examples.  This is rarely used as such, since the |\feyn| and |\Feyn|
+%     `top', `urt', `lrt', `bot', `llft' or `ulft'.  This is rarely
+%     used as such, since the |\feyn| and |\Feyn|
 %     commands make~`!' a temporarily active character, and define it
-%     to be |\momentum|.
+%     to be |\momentum|.  See section~\ref{s:examples} for
+%     examples and further discussion.
+% \item[\cs{belowl\{\}}] A common pattern in diagrams is to have a pair
+%     of incoming or outgoing propagators.  If the lower one of this
+%     pair is enclosed within |\belowl{...}|, then it is set so that it
+%     occupies zero horizontal space, and moved leftwards and
+%     downwards, to fit under the upper of the pair of propagators.
+%     The command |\belowr{...}| is the same, except that the argument
+%     is moved rightwards.
+%     See examples below.
 % \item[\cs{Diagram\{\}}] This is for building more complicated diagrams.  It
 %     takes one argument, which is like the contents of an \texttt{\{array\}}
 %     environment---a series of formulae separated by \&'s and \verb-\\-.  See
@@ -265,11 +284,13 @@
 %     than being the strut itself.
 % \item[\cs{annotate\{x\}\{y\}\{text\}}] Puts the \emph{text}, between dollars,
 %     in a zero width box at offset~$(x,y)$ modules from the position of the
-%     |\annotate| command (which is generally the first command(s) after 
+%     |\annotate| command (which is generally the first command(s) after
 %     entering math-mode).  Because the \emph{text} is in math-mode, anything
-%     that is not maths should be in an |\mbox|.
+%     that is not maths should be in an |\mbox|.  You will probably
+%     use this only rarely, as the |\momentum| command supports most
+%     of the annotation you will need.
 % \end{description}
-% 
+%
 % The \feynx\ font is modular, in the sense that all the
 % dimensions are in terms of a module of 10pt, and all sizes given
 % below are in units of modules.  As well as 10pt, the font has
@@ -279,8 +300,8 @@
 % seems to be appropriate for the sizes required, but the author would
 % welcome comments on this.  The distribution
 % contains a sample file using the 18pt \feynx\ font in a
-% \texttt{foiltex} document.  
-% 
+% \texttt{foiltex} document.
+%
 % You draw a diagram by going into math-mode (between \$\dots\$), and selecting
 % the diagrams font by the font-changing command \verb-\feyn{}-
 % (exactly as you might use \verb-\mathrm- in math-mode). With a couple of
@@ -294,12 +315,28 @@
 % both display size and text size, with the text-size version invoked
 % by |\Feyn{...}|, so that |\feyn{fglf}| gives $\feyn{fglf}$ and
 % |\Feyn{fglf}| gives $\Feyn{fglf}$.  The displaystyle characters
-% are all on the math-axis, the textstyle ones are on the text line. 
-% 
-% \section{Examples}
+% are all on the math-axis, the textstyle ones are on the text line.
+%
+% The display and text sizes of diagrams (that is, as produced by
+% |\feyn| and |\Feyn| respectively) are intended to be used
+% within equations, and they are sized accordingly.  When diagrams
+% have significantly complicated annotation, however, this size can
+% look unhelpfully cramped, and it is for this case that there is an
+% `extended' set of diagram characters, which are approximately double
+% the size, and are available, in |\displaystyle| only, with the
+% |\FEYN| and |\DIAGRAM| macros.  These are used exactly like the
+% |\feyn| and |\Diagram| macros.  Note
+% that the line width, the module used by the (rare) |\annotate| command, and the math
+% axis, do not change from the sizes they have for the |\feyn|
+% command.  That is, this font is \emph{not} the appropriate one to
+% use if you simply want a larger font size -- in that case, simply
+% increase the \LaTeX\ font size and the \feynx\ font will change in
+% size accordingly.  See below for an example of the use of |\FEYN|.
+%
+% \subsection{More complicated diagrams}
 %
 % \newdimen\halftextwidth
-% \halftextwidth=\textwidth 
+% \halftextwidth=\textwidth
 %   \advance\halftextwidth by -\tabcolsep
 %   \advance\halftextwidth by -\arrayrulewidth
 %   \divide\halftextwidth by 2
@@ -316,6 +353,78 @@
 % \newenvironment{examplerhs}{\begin{minipage}[t]{\halftextwidth}}
 %                            {\\ \end{minipage}}
 %
+%
+% The \feynx\ font is designed so that simple diagrams are simple to
+% produce, and are as far as possible writable as a single line of
+% characters.  There are a couple of more complicated diagrams which
+% are drawable without too much effort.
+%
+% A common pattern in diagrams is to have a pair
+% of incoming or outgoing propagators.  If the lower one of this
+% pair is enclosed within |\belowl{...}|, then it is set so that it
+% occupies zero horizontal space, and moved leftwards and
+% downwards, to fit under the upper of the pair of propagators.  For
+% example the sequence |\feyn{f gu \belowl{fd}}| would put the downward
+% fermion directly below the upward gauge boson.  See below for this
+% and other examples.
+%
+% The second way of composing more complicated diagrams is to use the
+% |\Diagram| macro.  This allows you to lay out a diagram in an
+% array-like environment, each cell of which is set within a
+% |\feyn{...}| macro.  On the right is the same diagram drawn with
+% lines indicating the boundaries between the cells.
+% \begin{codeexample}
+% \begin{verbatim}
+%   \Diagram{   & x \\
+%            fs & gv f & gu \\
+%               &      & fd }
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+%   \Diagram{   & x \\
+%            fs & gv f & gu \\
+%               &      & fd }
+%   \qquad\left(\quad
+%   \makeatletter
+%   \Diagram{          &\vrule x    &\vrule height \feyn@maxis \\
+%            \hline fs &\vrule gv f &\vrule height \feyn@module gu \\
+%            \hline    &\vrule height 0.7\feyn@module &\vrule fd \\
+%            \iffalse \hline    &\vrule height \feyn@module &\vrule\fi
+%            }
+%   \quad\right)
+% $\end{examplerhs}
+% \end{codeexample}
+%
+% The |\Diagram| and |\DIAGRAM| macros take an optional argument of
+% either `centre' or `bottom': with `centre', the diagram is centred
+% on the math axis, with `bottom' the reference point of the diagram
+% is the reference point of the bottom-most row of the array.  The
+% default is `centre'.
+%
+% Before the introduction of the |\belowl| macro in \feynx~v0.4, this
+% was the only way to produce this pair of angled propagators one on
+% top of the other.  With |\belowl|, however, an alternative way of
+% producing this diagram is as shown below.
+% \begin{codeexample}
+% \begin{verbatim}
+% \feyn{fs
+%   \Diagram[bottom]{x\\gv}
+%   f gu\belowl{fd}}
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \feyn{fs
+%   \Diagram[bottom]{x\\gv}
+%   f gu\belowl{fd}}
+% $\end{examplerhs}
+% \end{codeexample}
+%
+% Diagrams much more complicated than this are probably better dealt
+% with using Thorsten Ohl's \textsl{feynmf/feynmp} package.
+%
+% \section{Examples}
+% \label{s:examples}
+%
 % A simple propagator:
 % \begin{codeexample}
 % \begin{verbatim}
@@ -333,7 +442,7 @@
 %     \frac{i\delta^{ab}}{\pslash-m_0}
 % $\end{examplerhs}
 % \end{codeexample}
-% 
+%
 % The |\Diagram| command lays out its arguments as an array.
 % \begin{codeexample}
 % \begin{verbatim}
@@ -342,8 +451,7 @@
 %      & g\vertexlabel_{\mu,c} \\
 %    \vertexlabel_b fu\\
 %    }
-%  = \displaystyle
-%    ig\gamma_\mu (T^c)_{ab}
+%  = ig\gamma_\mu (T^c)_{ab}
 % \end{verbatim}
 % \Becomes
 % \begin{examplerhs}$
@@ -352,11 +460,22 @@
 % 		    & g\vertexlabel_{\mu,c} \\
 % 		\vertexlabel_b fu\\
 % 	    }
-%     = \displaystyle
-% 	ig\gamma_\mu (T^c)_{ab}
+%     = ig\gamma_\mu (T^c)_{ab}
+% $\end{examplerhs}
+% \end{codeexample}
+% The |\Diagram| is here necessary only for the vertex labels.
+% Without those, it would be as simple as:
+% \begin{codeexample}
+% \begin{verbatim}
+% \feyn{fd \belowl{fu} g
+%   = ig\gamma_\mu (T^c)_{ab}}
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \feyn{fd \belowl{fu} g} = ig\gamma_\mu (T^c)_{ab}
 % $\end{examplerhs}
 % \end{codeexample}
-% 
+%
 % An assortment of two-loop diagrams:
 % \begin{codeexample}
 % \begin{verbatim}
@@ -368,12 +487,45 @@
 % This is a ``short-fermion fermion gluon-loop fermion
 % gluon-loop-upsidedown fermion short-fermion''.
 %
+% We can include vertical gluons:
 % \begin{codeexample}
 % \begin{verbatim}
-% \feyn{ms mA gl gv ms x f}
+% \feyn{ms mA g1 gv g2 ms x f}
 % \end{verbatim}
 % \Becomes
-% $\feyn{ms mA gl gv ms x f}$
+% $\feyn{ms mA g1 gv g2 ms x f}$
+% \end{codeexample}
+% Note, in this example, that the gluon loop is formed by a pair of
+% `g1 g2' characters.  This is because the `gl' half-loop character is
+% deliberately slightly squashed, and wouldn't meet the vertical gluon
+% properly.  The half-loop character is squashed (as are
+% the fermion and ghost half-loops) partly because it looks
+% slightly better in a one-loop self-energy diagram, but also so that
+% the `gl glu' two-gluon loop in a two-loop diagram looks better:
+% \begin{codeexample}
+% \begin{verbatim}
+% \Diagram{&gl glu\\
+%  fsf g1 f&f g2 ffs \\}
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \Diagram{&gl glu\\
+% fsf g1 f&f g2 ffs \\}
+% $\end{examplerhs}
+% \end{codeexample}
+% The diagrams for `hl hlu' or `flA fluV', for example, are very similar.
+%
+% The |\momentum| command (more usually called with simply the~`!'
+% character) allows you to annotate a propagator with a momentum or a
+% particle label.  For example
+% \begin{codeexample}
+% \begin{verbatim}
+% \feyn{fA + !{fA}{p} + ![bot]{fA}{p}}
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \feyn{fA + !{fA}{p} + ![bot]{fA}{p}}
+% $\end{examplerhs}
 % \end{codeexample}
 %
 % \begin{codeexample}
@@ -406,14 +558,17 @@
 % $\end{examplerhs}
 % \end{codeexample}
 %
-% \newenvironment{bigdisplay}
-%    {\newline
+% \newenvironment{bigdisplay}[1]
+%    {\endgraf
+%     \penalty 50 \vskip 0.5\baselineskip plus 0.5\textheight
+%     \vbox\bgroup
+%     #1\endgraf \smallskip
 %     \vbox{\hrule\hbox to \textwidth{\vrule height 1.5ex\hfil\vrule}}%
 %     \parskip0pt}
-%    {\vbox{\hbox to \textwidth{\vrule height 1.5ex \hfil\vrule}\hrule}}
+%    {\vbox{\hbox to \textwidth{\vrule height 1.5ex \hfil\vrule}\hrule}
+%     \egroup}
 %
-% Bremsstrahlung:
-% \begin{bigdisplay}
+% \begin{bigdisplay}{Bremsstrahlung:}
 % \begin{verbatim}
 % \[
 %   \Diagram{        & x \\
@@ -443,6 +598,44 @@
 % \]
 % \end{bigdisplay}
 %
+% \begin{bigdisplay}{And now the same, with
+% \texttt{\textbackslash belowl} and \texttt{\textbackslash belowr}:}
+% \begin{verbatim}
+% \[
+% \def\stack#1#2{\Diagram[bottom]{#1\\#2}}
+% \feyn{
+%   !{fA}p
+%     \stack{x}{![ulft]{gvV}{q=p'+k-p}}
+%     ![bot]{fA}{p'+k}
+%     \stack{!{guA}k}{![lrt]{fA}{p'}}
+%   +
+%   !{fA}p
+%     \belowr{![llft]{gdA}k} !{fA}{p-k}
+%     fs
+%     \stack x{!{gvV}{q=p'+k-p}} !{fA}{p'}}
+% \]
+% \end{verbatim}
+% \hrule
+% \[
+% \def\stack#1#2{\Diagram[bottom]{#1\\#2}}
+% \feyn{
+%   !{fA}p
+%     \stack{x}{![ulft]{gvV}{q=p'+k-p}}
+%     ![bot]{fA}{p'+k}
+%     \stack{!{guA}k}{![lrt]{fA}{p'}}
+%   +
+%   !{fA}p
+%     \belowr{![llft]{gdA}k} !{fA}{p-k}
+%     fs
+%     \stack x{!{gvV}{q=p'+k-p}} !{fA}{p'}}
+% \]
+% \end{bigdisplay}
+%
+% The |\stack| macro isn't defined by the \feynx\ package, but
+% it is useful enough that you might want to define it as one of your
+% own macros.
+%
+% \iffalse
 % We can also have diagrams in the text, like~$\Feyn{fsfglffs}$, and we can
 % annotate the diagrams
 % \begin{codeexample}
@@ -461,41 +654,79 @@
 % $\end{examplerhs}
 % \end{codeexample}
 % This is a ``short-massive massive gluon-loop gluon-vertical
-% short-massive counterterm fermion''. 
-% 
-% The expression for the heavy-fermion self-energy in the \textsc{ope} is:
-% \begin{bigdisplay}
+% short-massive counterterm fermion''.
+% \fi
+%
+% \begin{bigdisplay}{The expression for the heavy-fermion self-energy in the \textsc{ope} is:}
 % \begin{verbatim}
 % \def\bracket#1{\langle #1 \rangle}
+% \def\stack#1#2{\Diagram[bottom]{#1\\#2}}
 % \begin{eqnarray*}
 % -i\Sigma_{\rm ope} &=&
-%     \left[ \feyn{faf + fsfglffs + \cdots} \right] 1 
+%     \left[ \feyn{faf + fsfglffs + \cdots} \right] 1
 %               \feynstrut{1}{1}\strut \\
 %     && \quad{}+ \left[ \feyn{ fxfs0glfs0xf + \cdots} \right]
 %         \bracket{\overline\psi M \psi} \\
-%     && \quad{}+ \left[ \Diagram{   &x  &x  \\
-%                                    &gv &gv \\
-%                                 fs &fs &fs \\} + \cdots \right]
+%     && \quad{}+ \left[
+%                   \feyn{fs \stack x{gv} fs \stack x{gv} fs} + \cdots
+%                 \right]
 %         \bracket{G_{\mu\nu}^a G_{\mu\nu}^a}\\
 % \end{eqnarray*}
 % \end{verbatim}
 % \hrule
 % \def\bracket#1{\langle #1 \rangle}
+% \def\stack#1#2{\Diagram[bottom]{#1\\#2}}
 % \begin{eqnarray*}
 % -i\Sigma_{\rm ope} &=&
 %     \left[ \feyn{faf + fsfglffs + \cdots} \right] 1
 %               \feynstrut{1}{1}\strut \\
 %     && \quad{}+ \left[ \feyn{ fxfs0glfs0xf + \cdots} \right]
 %         \bracket{\overline\psi M \psi} \\
-%     && \quad{}+ \left[ \Diagram{   &x  &x  \\
-%                                    &gv &gv \\
-%                                 fs &fs &fs \\} + \cdots \right]
+%     && \quad{}+ \left[
+%                   \feyn{fs \stack x{gv} fs \stack x{gv} fs} + \cdots
+%                 \right]
 %         \bracket{G_{\mu\nu}^a G_{\mu\nu}^a}\\
 % \end{eqnarray*}
 % \end{bigdisplay}
 %
-% The Feynman Rules are as follows:
-% \begin{bigdisplay}
+% Now for two examples using |\FEYN|:
+% \begin{codeexample}
+% \begin{verbatim}
+% \feyn{f gu \belowl{fd}}
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \feyn{f gu \belowl{fd}}
+% $\end{examplerhs}
+% \end{codeexample}
+% \begin{codeexample}
+% \begin{verbatim}
+% \FEYN{
+%    !{fA}s !{gu}{W^-_\mu}
+%      \belowl{!{fdA}u}
+% }
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \FEYN{
+%    !{fA}s !{gu}{W^-_\mu} \belowl{!{fdA}u}
+% }
+% $\end{examplerhs}
+% \end{codeexample}
+% \begin{codeexample}
+% \begin{verbatim}
+% \DIAGRAM{
+%    !{fA}s &!{gu}{W^-_\mu}\\
+%           & !{fdA}u
+% }
+% \end{verbatim}
+% \Becomes
+% \begin{examplerhs}$
+% \DIAGRAM{!{fA}s &!{gu}{W^-_\mu}\\ & !{fdA}u}
+% $\end{examplerhs}
+% \end{codeexample}
+%
+% \begin{bigdisplay}{The Feynman Rules are as follows:}
 % \begin{verbatim}
 % \def\arraystretch{3} \arraycolsep=0.2cm
 % \[ \begin{array}{rcl}
@@ -521,7 +752,7 @@
 %         } % 3-gluon vertex
 %     &=& \displaystyle
 % 	-g f^{abc} (
-% 	g_{\beta\gamma}  (q-r)_\alpha + 
+% 	g_{\beta\gamma}  (q-r)_\alpha +
 % 	g_{\gamma\alpha} (r-p)_\beta +
 % 	g_{\alpha\beta}  (p-q)_\gamma
 % 	) \\
@@ -539,7 +770,9 @@
 %           ghost\par}}
 % \end{array} \]
 % \end{verbatim}
-% \hrule
+% \end{bigdisplay}
+%
+% \begin{bigdisplay}{\dots giving:}
 % \def\arraystretch{3} \arraycolsep=0.2cm
 % \[ \begin{array}{rcl}
 %     \feyn{\vertexlabel^a !{fA}p \vertexlabel^b}
@@ -564,7 +797,7 @@
 %         }
 %     &=& \displaystyle
 % 	-g f^{abc} (
-% 	g_{\beta\gamma}  (q-r)_\alpha + 
+% 	g_{\beta\gamma}  (q-r)_\alpha +
 % 	g_{\gamma\alpha} (r-p)_\beta +
 % 	g_{\alpha\beta}  (p-q)_\gamma
 % 	) \\
@@ -583,8 +816,8 @@
 % \end{array} \]
 % \end{bigdisplay}
 %
-% The diagrams can also appear as parts of equations:
-% \begin{bigdisplay}
+% \begin{bigdisplay}{The diagrams can very naturally appear as parts of equations
+% (as is perhaps by now obvious):}
 % \begin{verbatim}
 % \begin{eqnarray}
 % \feyn{fcf} &=& \feyn{faf + fpf + fpfpf + \cdots} \\
@@ -602,11 +835,28 @@
 %
 % \section{Installation}
 %
-% You should be able to find generic instructions for installing
+% The nominal distribution point for the Feyn package is CTAN,
+% under \texttt{fonts/feyn}\footnote{\url{https://ctan.org/pkg/feyn}}.
+%
+% The feyn package is included in the TeXLive distribution\footnote{\url{http://www.tug.org/texlive/}}, so
+% you may have it on your machine already.  If not, or if you need a
+% more up-to-date version, read on.
+%
+% Since the package is on CTAN, it should be easily installed and
+% updated using the tools which support this in your TeX distribution.
+% For TeXLive, that's
+% `tlmgr'\footnote{\url{https://www.tug.org/texlive/tlmgr.html}}, and
+% for MikTeX see the maintenance section of the
+% manual\footnote{\url{https://docs.miktex.org/faq/maintenance.html}}.
+%
+% \subsection{Installing by hand}
+%
+% If, for some reason, you need to install the package by hand, then
+% you should be able to find generic instructions for installing
 % \LaTeX\ files at
-% \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings}.  
-% 
-% If you have not done so already, you need to extract the package
+% \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings}.
+%
+% In brief: If you have not done so already, you need to extract the package
 % file from the distribution file using |latex feyn.ins|.  The
 % resulting \file{feyn.sty} should be installed in the usual location
 % for style files -- that is, something like
@@ -619,8 +869,8 @@
 % and these will usually be invoked by default when \LaTeX\ or
 % pdf\LaTeX\ is run.
 %
-% If you are using a \TeX\ system based on TeXLive or teTeX (which is true of most Unix
-% installations, and most MacOS\,X installations), then you can
+% If you are using a \TeX\ system based on TeXLive (which is true of most Unix
+% installations, and most macOS installations), then you can
 % determine the style-file and \metafont\ search paths using the commands
 % \begin{verbatim}
 % % kpsepath tex
@@ -631,14 +881,41 @@
 % and you can confirm that the files are findable with the commands
 % \texttt{kpsewhich feyn.sty} and \texttt{kpsewhich feyn10.mf}.
 %
-% Users of other systems will have similar mechanisms
-% for finding and confirming the search paths (and if anyone wishes to
-% send me details, I can add the details to this document).
+% \section{Licence}
+%
+% The following is the text of the BSD 2-clause licence.
+%
+% All rights reserved.
+%
+% Redistribution and use in source and binary forms, with or without
+% modification, are permitted provided that the following conditions are
+% met:
+%
+% 1. Redistributions of source code must retain the above copyright
+% notice, this list of conditions and the following disclaimer.
+%
+% 2. Redistributions in binary form must reproduce the above copyright
+% notice, this list of conditions and the following disclaimer in the
+% documentation and/or other materials provided with the distribution.
+%
+% This software is provided by the copyright holders and contributors
+% ``as is'' and any express or implied warranties, including, but not
+% limited to, the implied warranties of merchantability and fitness for
+% a particular purpose are disclaimed. in no event shall the copyright
+% holder or contributors be liable for any direct, indirect, incidental,
+% special, exemplary, or consequential damages (including, but not
+% limited to, procurement of substitute goods or services; loss of use,
+% data, or profits; or business interruption) however caused and on any
+% theory of liability, whether in contract, strict liability, or tort
+% (including negligence or otherwise) arising in any way out of the use
+% of this software, even if advised of the possibility of such damage.
+%
 %
 % \subsection*{Acknowledgements}
 %
-% Thanks to Purnendu Chakraborty, Fabio Correa, and Bryan Chen for
-% suggestions and testing at various times.
+% Thanks to Purnendu Chakraborty, Fabio Correa, Bryan Chen, Hoang
+% Nghia Nguyen and Luciano Pandola for
+% suggestions and testing (and encouragement) at various times.
 %
 %
 % \StopEventually{}
@@ -673,7 +950,7 @@
 % Declare the feyn math font family.  The |\skewchar| for this font
 % (see the \TeX book, p431) can be set to zero, since it's a
 % completely upright maths font (the least of its peculiarities).  We
-% don't have the font in much of a range of sizes. 
+% don't have the font in much of a range of sizes.
 %    \begin{macrocode}
 \DeclareFontFamily{OMS}{feyn}{\skewchar\font'000}
 \DeclareFontShape{OMS}{feyn}{m}{n}{%
@@ -698,6 +975,19 @@
 	}{}
 %    \end{macrocode}
 %
+% Finally, do the same for the extended-size fonts, declaring the
+% feynx math font family.
+%    \begin{macrocode}
+\DeclareFontFamily{OMS}{feynx}{\skewchar\font'000}
+\DeclareFontShape{OMS}{feynx}{m}{n}{%
+	<-10.5>feynx10%
+	<10.5-11.5>feynx11%
+	<11.5-15>feynx12%
+        <15-21>feynx18%
+        <21->feynx24%
+	}{}
+%    \end{macrocode}
+%
 % XXX It would be nice to arrange things so that superscripts in
 % the feyn font were drawn from cmmi7, or something.  The original
 % feyn.sty arranged this with |\scriptfont\diagramfam=\ninmi|, but
@@ -711,6 +1001,8 @@
 \DeclareSymbolFontAlphabet{\feyn@alphabet}{feynman}
 \DeclareSymbolFont{textfeynman}{OMS}{textfeyn}{m}{n}
 \DeclareSymbolFontAlphabet{\Feyn@alphabet}{textfeynman}
+\DeclareSymbolFont{feynmanextended}{OMS}{feynx}{m}{n}
+\DeclareSymbolFontAlphabet{\FEYN@alphabet}{feynmanextended}
 %    \end{macrocode}
 %
 % Now use these font-setting commands, defining |\feyn| and |\Feyn| to
@@ -730,6 +1022,9 @@
   \def\Feyn{\begingroup
     \let!\momentum              % ...or \Feyn
     \Feyn@}
+  \def\FEYN{\begingroup
+    \let!\momentum              % ...or \FEYN
+    \FEYN@}
 \else
   {\catcode`\!=\active          % only make ! active within \feyn
     \gdef\feyn{%
@@ -741,10 +1036,19 @@
       \begingroup  % ends in \Feyn@
       \catcode`\!=\active
       \let!=\momentum
-      \Feyn@}}
+      \Feyn@}
+    \gdef\FEYN{%
+      \begingroup  % ends in \FEYN@
+      \catcode`\!=\active
+      \let!=\momentum
+      \FEYN@}}
 \fi
-\def\feyn@#1{\feyn@alphabet{#1}\endgroup}
-\def\Feyn@#1{\Feyn@alphabet{#1}\endgroup}
+\def\feyn@#1{\let\feyn@mfmodule\feyn@mfbasemodule
+  \feyn@alphabet{#1}\endgroup}
+\def\Feyn@#1{\let\feyn@mfmodule\feyn@mfbasemodule
+  \Feyn@alphabet{#1}\endgroup}
+\def\FEYN@#1{\let\feyn@mfmodule\feyn@mfextendedmodule
+  \FEYN@alphabet{#1}\endgroup}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -758,7 +1062,7 @@
 % NFSS).  I confess I don't \emph{really} understand the ins and outs
 % of this, but this route is robust and not wrong.
 %
-% The character |"7F| in the feyn font is blank, but has width 
+% The character |"20| in the feyn font is a dummy charcter, with width
 % |module#| and height |a#| (using the dimensions of the font
 % file).  Use this to set the |\feyn@module| and |\feyn@maxis|.  Note
 % that the `module' used in this package file is twice the module used
@@ -766,27 +1070,36 @@
 % \begin{macro}{\feyn@module}
 % \begin{macro}{\feyn@maxis}
 %    \begin{macrocode}
-\DeclareMathSymbol{\FeynSpaceChar}{\mathord}{feynman}{"7F}
+\DeclareMathSymbol{\FeynSpaceChar}{\mathord}{feynman}{"20}
 \setbox0=\hbox{$\FeynSpaceChar$}
-\newdimen\feyn@mfmodule \feyn@mfmodule=\wd0
+\newdimen\feyn@mfbasemodule \feyn@mfbasemodule=\wd0
 \newdimen\feyn@module   \feyn@module=2\wd0
 \newdimen\feyn@maxis    \feyn@maxis=\ht0
+\DeclareMathSymbol{\FeynxSpaceChar}{\mathord}{feynmanextended}{"20}
+\setbox0=\hbox{$\FeynxSpaceChar$}
+\newdimen\feyn@mfextendedmodule \feyn@mfextendedmodule=\wd0
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \begin{macro}{\Diagram}
 % Define the |\Diagram| macro, which lays out a semi-complicated
-% diagram in 2-d.
+% diagram in 2-d.  The macro takes an optional argument which can be
+% either |[bottom]| or |[centre]|
 %    \begin{macrocode}
 {\catcode`\!=\active
   \gdef\Diagram{%
     \begingroup  % ends in \Diagram@
     \catcode`\!=\active
     \let!\momentum
-    \Diagram@}}
-\def\Diagram@#1{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
-    \halign{&$\displaystyle\feyn{##}$\cr #1\crcr}}}%
+    % \Diagram@
+    \@ifnextchar[\Diagram@{\Diagram@[centre]}%]
+  }}
+\let\Diagram@pos@centre\vcenter
+\let\Diagram@pos@center\vcenter     %for Webster fans
+\let\Diagram@pos@bottom\relax
+\def\Diagram@[#1]#2{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
+    \halign{&$\displaystyle\feyn{##}$\cr #2\crcr}}}%
 %    \end{macrocode}
 % At this point, |\box0| has zero depth.  It must be an hbox, because
 % we're fiddling with its height within a enclosing |\vbox|.  See the
@@ -798,11 +1111,30 @@
 %    \begin{macrocode}
     \@tempdima=\ht0
     \advance\@tempdima by 2\feyn@maxis \ht0=\@tempdima
-    \vcenter{\box0}%
+    % no error checking -- unrecognised placement specifiers just expand to \relax
+    \csname Diagram@pos@#1\endcsname{\box0}%
     \endgroup}% end group begun in \Diagram
 %    \end{macrocode}
 % \end{macro}
 %
+% Define |\DIAGRAM| identically, except for using |\FEYN| rather than |\feyn|.
+%    \begin{macrocode}
+{\catcode`\!=\active
+  \gdef\DIAGRAM{%
+    \begingroup  % ends in \Diagram@
+    \catcode`\!=\active
+    \let!\momentum
+    % \DIAGRAM@
+    \@ifnextchar[\DIAGRAM@{\DIAGRAM@[centre]}%]
+  }}
+\def\DIAGRAM@[#1]#2{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
+    \halign{&$\displaystyle\FEYN{##}$\cr #2\crcr}}}%
+    \@tempdima=\ht0
+    \advance\@tempdima by 2\feyn@maxis \ht0=\@tempdima
+    \csname Diagram@pos@#1\endcsname{\box0}%
+    \endgroup}% end group begun in \Diagram
+%    \end{macrocode}
+%
 % \begin{macro}{\maxis}
 % Raise the argument to the math axis.
 %    \begin{macrocode}
@@ -810,6 +1142,64 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \iffalse
+% I feel that something like the following is surely somehow useful,
+% but the spacing doesn't quite work out with what I've got here.
+% \def\fstack#1{\vbox{\baselineskip=0pt \@fstack#1,,}}
+% \def\@fstack#1,{%
+%   \def\@tempa{#1}%
+%   \ifx\@tempa\@empty
+%     \let\@next\relax
+%   \else
+%     \hbox{$\feyn{#1}$}%
+%     \let\@next\@fstack
+%   \fi
+%   \@next
+% }
+% \[
+%   \feyn{fsfg1\fstack{f0 gl,f0 glu,gv,ff}g2ffs \showlists}
+% \]
+% \fi
+%
+% \begin{macro}{\belowl}
+% The argument of the |\belowl| macro is a string of characters in the
+% \feynx\ font.  They are set in a box, and then moved so that the box
+% takes up zero horizontal width, and is moved downwards by its height
+% -- that is, it is moved diagonally downwards and leftwards.  It
+% means that the bottom half of a pair of incoming or outgoing
+% propagators can be set immediately belowl the upper half, without
+% having to use the |\Diagram| macro.
+%    \begin{macrocode}
+\def\belowl#1{%
+  \ifdim\feyn@mfmodule=\feyn@mfbasemodule
+    \let\@next\feyn
+  \else
+    \let\@next\FEYN
+  \fi
+  \setbox0\hbox{$\@next{#1}$}%
+  \hskip-\wd0 \lower\ht0\box0
+}
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\belowr}
+% The |\belowr| macro is almost exactly the same, except that the
+% argument is shifted rightwards, which is sometimes more natural to
+% express.
+%    \begin{macrocode}
+\def\belowr#1{%
+  \ifdim\feyn@mfmodule=\feyn@mfbasemodule
+    \let\@next\feyn
+  \else
+    \let\@next\FEYN
+  \fi
+  \setbox0\hbox{$\@next{#1}$}%
+  \@tempdima=\wd0
+  \lower\ht0\box0
+  \hskip-\@tempdima
+}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\momentum}
 % Manages annotation of characters.  |\momentum{ch}{text}| sets the character
 % ch, which may be a ligature, and puts the given text at the recommended
@@ -820,11 +1210,12 @@
 %
 % First, some support macros.
 %
-% |\feyn@nudge| is a small amount 
+% |\feyn@nudge| is a small amount
 % which is added to the annotation positions, to keep them clear of the
 % point they're annotating.
 %    \begin{macrocode}
-\newdimen\feyn@nudge \feyn@nudge=\feyn@mfmodule \divide\feyn@nudge by 3
+\newdimen\feyn@nudge
+  \feyn@nudge=\feyn@mfbasemodule \divide\feyn@nudge by 3
 %    \end{macrocode}
 %
 % The various |\feyn@pos@<x>| macros position their third argument
@@ -881,9 +1272,9 @@
         \hbox to 0pt{\hss$\scriptstyle #3$\hskip\feyn@nudge}\hss}}%
     \ht1=0pt \dp1=0pt \box1}
 %    \end{macrocode}
-%        
+%
 % Now include the definitions of the annotation positions, as extracted
-% from the Metafont file.  These define macros |\feyn@ann@#1|, 
+% from the Metafont file.  These define macros |\feyn@ann@#1|,
 % where argument |#1| is a given character (or ligature) at the
 % position |(#2,#3)|, using  the various |\feyn@pos@<x>| macros.  The
 % |<x>| is either the value of argument |#4|, or the contents of
@@ -901,84 +1292,93 @@
 %    \begin{macrocode}
 % @FEYNANNOTATIONS@
 % commands generated by parse-ligtables...
-\feyn@annotation{f}{0.99974}{0.35}{top}% "f"
-\feyn@annotation{fA}{0.99974}{0.35}{top}% "F"
-\feyn@annotation{fV}{0.99974}{0.35}{top}% 6
-\feyn@annotation{fu}{0.70692}{0.95692}{ulft}% "e"
-\feyn@annotation{fuA}{0.70692}{0.95692}{ulft}% "E"
-\feyn@annotation{fuV}{0.70692}{0.95692}{ulft}% 5
-\feyn@annotation{fd}{0.70692}{0.95692}{urt}% "d"
-\feyn@annotation{fdA}{0.70692}{0.95692}{urt}% "D"
-\feyn@annotation{fdV}{0.70692}{0.95692}{urt}% 4
-\feyn@annotation{fv}{0}{1.24974}{urt}% "b"
-\feyn@annotation{fvA}{0}{1.24974}{urt}% "B"
-\feyn@annotation{fvV}{0}{1.24974}{urt}% 2
-\feyn@annotation{m}{0.99974}{0.32802}{top}% "m"
-\feyn@annotation{mA}{0.99974}{0.32802}{top}% "M"
-\feyn@annotation{mV}{0.99974}{0.32802}{top}% 13
-\feyn@annotation{ms}{0.49986}{0.32802}{top}% 11
-\feyn@annotation{fl}{0}{1.85}{top}% "l"
-\feyn@annotation{flA}{0}{1.85}{top}% "L"
-\feyn@annotation{flV}{0}{1.85}{top}% 12
-\feyn@annotation{flu}{0}{-1.35}{bot}% "n"
-\feyn@annotation{fluA}{0}{-1.35}{bot}% "N"
-\feyn@annotation{fluV}{0}{-1.35}{bot}% 14
-\feyn@annotation{flS}{0}{1.23335}{top}% "o"
-\feyn@annotation{flSA}{0}{1.23335}{top}% "O"
-\feyn@annotation{flSV}{0}{1.23335}{top}% 15
-\feyn@annotation{flSu}{0}{-0.90001}{bot}% "w"
-\feyn@annotation{flSuA}{0}{-0.90001}{bot}% "W"
-\feyn@annotation{flSuV}{0}{-0.90001}{bot}% 23
-\feyn@annotation{g}{0.99974}{0.45}{top}% "g"
-\feyn@annotation{gA}{0.99974}{0.45}{top}% "G"
-\feyn@annotation{gV}{0.99974}{0.45}{top}% 7
-\feyn@annotation{gu}{0.70692}{0.95692}{ulft}% "u"
-\feyn@annotation{guA}{0.70692}{0.95692}{ulft}% "U"
-\feyn@annotation{guV}{0.70692}{0.95692}{ulft}% 21
-\feyn@annotation{gd}{0.70692}{0.95692}{urt}% "v"
-\feyn@annotation{gdA}{0.70692}{0.95692}{urt}% "V"
-\feyn@annotation{gdV}{0.70692}{0.95692}{urt}% 22
-\feyn@annotation{gv}{0}{1.24974}{urt}% "}"
-\feyn@annotation{gvA}{0}{1.24974}{urt}% "]"
-\feyn@annotation{gvV}{0}{1.24974}{urt}% 29
-\feyn@annotation{g1}{-1.41422}{1.66422}{ulft}% "q"
-\feyn@annotation{g1A}{-1.41422}{1.66422}{ulft}% "Q"
-\feyn@annotation{g1V}{-1.41422}{1.66422}{ulft}% 17
-\feyn@annotation{g2}{1.41422}{1.66422}{urt}% "r"
-\feyn@annotation{g2A}{1.41422}{1.66422}{urt}% "R"
-\feyn@annotation{g2V}{1.41422}{1.66422}{urt}% 18
-\feyn@annotation{g3}{1.41422}{-1.16422}{lrt}% "s"
-\feyn@annotation{g3A}{1.41422}{-1.16422}{lrt}% "S"
-\feyn@annotation{g3V}{1.41422}{-1.16422}{lrt}% 19
-\feyn@annotation{g4}{-1.41422}{-1.16422}{llft}% "t"
-\feyn@annotation{g4A}{-1.41422}{-1.16422}{llft}% "T"
-\feyn@annotation{g4V}{-1.41422}{-1.16422}{llft}% 20
-\feyn@annotation{gl}{0}{2.25}{urt}% "y"
-\feyn@annotation{glA}{0}{2.25}{urt}% "Y"
-\feyn@annotation{glV}{0}{2.25}{urt}% 25
-\feyn@annotation{glu}{0}{-1.75}{llft}% "z"
-\feyn@annotation{gluA}{0}{-1.75}{llft}% "Z"
-\feyn@annotation{gluV}{0}{-1.75}{llft}% 26
-\feyn@annotation{glB}{0}{2.91667}{urt}% "{"
-\feyn@annotation{glBA}{0}{2.91667}{urt}% "["
-\feyn@annotation{glBV}{0}{2.91667}{urt}% 27
-\feyn@annotation{glS}{0}{1.5833}{llft}% "|"
-\feyn@annotation{glSA}{0}{1.5833}{llft}% "\"
-\feyn@annotation{glSV}{0}{1.5833}{llft}% 28
-\feyn@annotation{h}{0.99974}{0.25}{top}% "h"
-\feyn@annotation{hA}{0.99974}{0.25}{top}% "H"
-\feyn@annotation{hV}{0.99974}{0.25}{top}% 8
-\feyn@annotation{hu}{0.70464}{0.95464}{ulft}% "i"
-\feyn@annotation{huA}{0.70464}{0.95464}{ulft}% "I"
-\feyn@annotation{huV}{0.70464}{0.95464}{ulft}% 9
-\feyn@annotation{hd}{0.70464}{0.95464}{urt}% "j"
-\feyn@annotation{hdA}{0.70464}{0.95464}{urt}% "J"
-\feyn@annotation{hdV}{0.70464}{0.95464}{urt}% 10
-\feyn@annotation{hs}{0.49986}{0.25}{top}% "K"
-\feyn@annotation{c}{0.65044}{0.90044}{top}% "c"
-\feyn@annotation{p}{0.65}{0.9}{top}% "p"
-\feyn@annotation{P}{0.65044}{0.90044}{top}% "P"
-\feyn@annotation{x}{0}{0.55641}{top}% "x"
+\feyn@annotation{f}{0.99974}{0.35}{top}% 102 = "f"
+\feyn@annotation{fA}{0.99974}{0.35}{top}% 70 = "F"
+\feyn@annotation{fV}{0.99974}{0.35}{top}% 6 = 6
+\feyn@annotation{flo}{0}{2.25}{top}% 107 = "k"
+\feyn@annotation{floA}{0}{2.25}{top}% 75 = "K"
+\feyn@annotation{floV}{0}{2.25}{top}% 11 = 11
+\feyn@annotation{fu}{0.70692}{0.95692}{ulft}% 101 = "e"
+\feyn@annotation{fuA}{0.70692}{0.95692}{ulft}% 69 = "E"
+\feyn@annotation{fuV}{0.70692}{0.95692}{ulft}% 5 = 5
+\feyn@annotation{fd}{0.70692}{0.95692}{urt}% 100 = "d"
+\feyn@annotation{fdA}{0.70692}{0.95692}{urt}% 68 = "D"
+\feyn@annotation{fdV}{0.70692}{0.95692}{urt}% 4 = 4
+\feyn@annotation{fv}{0}{1.24974}{urt}% 98 = "b"
+\feyn@annotation{fvA}{0}{1.24974}{urt}% 66 = "B"
+\feyn@annotation{fvV}{0}{1.24974}{urt}% 2 = 2
+\feyn@annotation{m}{0.99974}{0.32802}{top}% 109 = "m"
+\feyn@annotation{mA}{0.99974}{0.32802}{top}% 77 = "M"
+\feyn@annotation{mV}{0.99974}{0.32802}{top}% 13 = 13
+\feyn@annotation{ms}{0.49986}{0.32802}{top}% 35 = "#"
+\feyn@annotation{fl}{0}{1.75}{top}% 108 = "l"
+\feyn@annotation{flA}{0}{1.75}{top}% 76 = "L"
+\feyn@annotation{flV}{0}{1.75}{top}% 12 = 12
+\feyn@annotation{flu}{0}{-1.25}{bot}% 110 = "n"
+\feyn@annotation{fluA}{0}{-1.25}{bot}% 78 = "N"
+\feyn@annotation{fluV}{0}{-1.25}{bot}% 14 = 14
+\feyn@annotation{flS}{0}{1.16667}{top}% 111 = "o"
+\feyn@annotation{flSA}{0}{1.16667}{top}% 79 = "O"
+\feyn@annotation{flSV}{0}{1.16667}{top}% 15 = 15
+\feyn@annotation{flSu}{0}{-0.83334}{bot}% 119 = "w"
+\feyn@annotation{flSuA}{0}{-0.83334}{bot}% 87 = "W"
+\feyn@annotation{flSuV}{0}{-0.83334}{bot}% 23 = 23
+\feyn@annotation{g}{0.99974}{0.45}{top}% 103 = "g"
+\feyn@annotation{gA}{0.99974}{0.45}{top}% 71 = "G"
+\feyn@annotation{gV}{0.99974}{0.45}{top}% 7 = 7
+\feyn@annotation{gu}{0.70692}{0.95692}{ulft}% 117 = "u"
+\feyn@annotation{guA}{0.70692}{0.95692}{ulft}% 85 = "U"
+\feyn@annotation{guV}{0.70692}{0.95692}{ulft}% 21 = 21
+\feyn@annotation{gd}{0.70692}{0.95692}{urt}% 118 = "v"
+\feyn@annotation{gdA}{0.70692}{0.95692}{urt}% 86 = "V"
+\feyn@annotation{gdV}{0.70692}{0.95692}{urt}% 22 = 22
+\feyn@annotation{gv}{0}{1.24974}{urt}% 125 = "}"
+\feyn@annotation{gvA}{0}{1.24974}{urt}% 93 = "]"
+\feyn@annotation{gvV}{0}{1.24974}{urt}% 29 = 29
+\feyn@annotation{g1}{-1}{1.98206}{ulft}% 113 = "q"
+\feyn@annotation{g1A}{-1}{1.98206}{ulft}% 81 = "Q"
+\feyn@annotation{g1V}{-1}{1.98206}{ulft}% 17 = 17
+\feyn@annotation{g2}{1.41422}{1.66422}{urt}% 114 = "r"
+\feyn@annotation{g2A}{1.41422}{1.66422}{urt}% 82 = "R"
+\feyn@annotation{g2V}{1.41422}{1.66422}{urt}% 18 = 18
+\feyn@annotation{g3}{1.41422}{-1.16422}{lrt}% 115 = "s"
+\feyn@annotation{g3A}{1.41422}{-1.16422}{lrt}% 83 = "S"
+\feyn@annotation{g3V}{1.41422}{-1.16422}{lrt}% 19 = 19
+\feyn@annotation{g4}{-1}{-1.48206}{llft}% 116 = "t"
+\feyn@annotation{g4A}{-1}{-1.48206}{llft}% 84 = "T"
+\feyn@annotation{g4V}{-1}{-1.48206}{llft}% 20 = 20
+\feyn@annotation{gl}{0}{1.75}{urt}% 121 = "y"
+\feyn@annotation{glA}{0}{1.75}{urt}% 89 = "Y"
+\feyn@annotation{glV}{0}{1.75}{urt}% 25 = 25
+\feyn@annotation{glu}{0}{-1.25}{llft}% 122 = "z"
+\feyn@annotation{gluA}{0}{-1.25}{llft}% 90 = "Z"
+\feyn@annotation{gluV}{0}{-1.25}{llft}% 26 = 26
+\feyn@annotation{glB}{1.02051}{2.71367}{urt}% 123 = "{"
+\feyn@annotation{glBA}{1.02051}{2.71367}{urt}% 91 = "["
+\feyn@annotation{glBV}{1.02051}{2.71367}{urt}% 27 = 27
+\feyn@annotation{glS}{0}{1.5833}{llft}% 124 = "|"
+\feyn@annotation{glSA}{0}{1.5833}{llft}% 92 = "\"
+\feyn@annotation{glSV}{0}{1.5833}{llft}% 28 = 28
+\feyn@annotation{h}{0.99974}{0.25}{top}% 104 = "h"
+\feyn@annotation{hA}{0.99974}{0.25}{top}% 72 = "H"
+\feyn@annotation{hV}{0.99974}{0.25}{top}% 8 = 8
+\feyn@annotation{hu}{0.70464}{0.95464}{ulft}% 105 = "i"
+\feyn@annotation{huA}{0.70464}{0.95464}{ulft}% 73 = "I"
+\feyn@annotation{huV}{0.70464}{0.95464}{ulft}% 9 = 9
+\feyn@annotation{hd}{0.70464}{0.95464}{urt}% 106 = "j"
+\feyn@annotation{hdA}{0.70464}{0.95464}{urt}% 74 = "J"
+\feyn@annotation{hdV}{0.70464}{0.95464}{urt}% 10 = 10
+\feyn@annotation{hl}{0}{1.75}{top}% 126 = "~"
+\feyn@annotation{hlA}{0}{1.75}{top}% 94 = "^"
+\feyn@annotation{hlV}{0}{1.75}{top}% 30 = 30
+\feyn@annotation{hlu}{0}{-1.25}{top}% 127 = 127
+\feyn@annotation{hluA}{0}{-1.25}{top}% 95 = "_"
+\feyn@annotation{hluV}{0}{-1.25}{top}% 31 = 31
+\feyn@annotation{hs}{0.49986}{0.25}{top}% 34 = """
+\feyn@annotation{c}{0.65044}{0.90044}{top}% 99 = "c"
+\feyn@annotation{p}{0.65}{0.9}{top}% 112 = "p"
+\feyn@annotation{P}{0.65044}{0.90044}{top}% 80 = "P"
+\feyn@annotation{x}{0}{0.55641}{top}% 120 = "x"
 %    \end{macrocode}
 %
 %
diff --git a/Master/texmf-dist/tex/latex/feyn/feyn.sty b/Master/texmf-dist/tex/latex/feyn/feyn.sty
index a6ad5c45b3f..5014ff38f0f 100644
--- a/Master/texmf-dist/tex/latex/feyn/feyn.sty
+++ b/Master/texmf-dist/tex/latex/feyn/feyn.sty
@@ -6,31 +6,13 @@
 %%
 %% feyn.dtx  (with options: `package')
 %% Feyn: package to manage the font feyn10
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, 2009 Norman Gray.
-%%
-%% 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-%%
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
-%% Department of Physics and Astronomy, University of Glasgow, UK
-%%
-%% See the file LICENCE for a copy of the GPL.
-%% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
-%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+%% This software is copyright 1991, 1994, 2001-2, 2005, 2008-17, Norman Gray.
+%% It is distributed under the terms of the 2-clause BSD Licence;
+%% see the file LICENCE for details.
+%% VCS Info: Mercurial revision 558acb5f2e14, 2017-11-03 14:43 +0000, tag 0.4.1 + 0
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{feyn}[2009/10/08 \space0.3.3\space textpos]
-\typeout{Package: `feyn' 0.3.3\space<2009/10/08 >}
+\ProvidesPackage{feyn}[2017/11/03 0.4.1]
+\typeout{Package: `feyn' 0.4.1 <2017/11/03>}
 %% \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
@@ -67,10 +49,20 @@
         <15-21>feyntext18%
         <21->feyntext24%
 }{}
+\DeclareFontFamily{OMS}{feynx}{\skewchar\font'000}
+\DeclareFontShape{OMS}{feynx}{m}{n}{%
+<-10.5>feynx10%
+<10.5-11.5>feynx11%
+<11.5-15>feynx12%
+        <15-21>feynx18%
+        <21->feynx24%
+}{}
 \DeclareSymbolFont{feynman}{OMS}{feyn}{m}{n}
 \DeclareSymbolFontAlphabet{\feyn@alphabet}{feynman}
 \DeclareSymbolFont{textfeynman}{OMS}{textfeyn}{m}{n}
 \DeclareSymbolFontAlphabet{\Feyn@alphabet}{textfeynman}
+\DeclareSymbolFont{feynmanextended}{OMS}{feynx}{m}{n}
+\DeclareSymbolFontAlphabet{\FEYN@alphabet}{feynmanextended}
 \ifFeyn@globalbang
   \catcode`\!=\active
   \def!{\char`\!}               % ! produces this character everywhere
@@ -80,6 +72,9 @@
   \def\Feyn{\begingroup
     \let!\momentum              % ...or \Feyn
     \Feyn@}
+  \def\FEYN{\begingroup
+    \let!\momentum              % ...or \FEYN
+    \FEYN@}
 \else
   {\catcode`\!=\active          % only make ! active within \feyn
     \gdef\feyn{%
@@ -91,29 +86,82 @@
       \begingroup  % ends in \Feyn@
       \catcode`\!=\active
       \let!=\momentum
-      \Feyn@}}
+      \Feyn@}
+    \gdef\FEYN{%
+      \begingroup  % ends in \FEYN@
+      \catcode`\!=\active
+      \let!=\momentum
+      \FEYN@}}
 \fi
-\def\feyn@#1{\feyn@alphabet{#1}\endgroup}
-\def\Feyn@#1{\Feyn@alphabet{#1}\endgroup}
-\DeclareMathSymbol{\FeynSpaceChar}{\mathord}{feynman}{"7F}
+\def\feyn@#1{\let\feyn@mfmodule\feyn@mfbasemodule
+  \feyn@alphabet{#1}\endgroup}
+\def\Feyn@#1{\let\feyn@mfmodule\feyn@mfbasemodule
+  \Feyn@alphabet{#1}\endgroup}
+\def\FEYN@#1{\let\feyn@mfmodule\feyn@mfextendedmodule
+  \FEYN@alphabet{#1}\endgroup}
+\DeclareMathSymbol{\FeynSpaceChar}{\mathord}{feynman}{"20}
 \setbox0=\hbox{$\FeynSpaceChar$}
-\newdimen\feyn@mfmodule \feyn@mfmodule=\wd0
+\newdimen\feyn@mfbasemodule \feyn@mfbasemodule=\wd0
 \newdimen\feyn@module   \feyn@module=2\wd0
 \newdimen\feyn@maxis    \feyn@maxis=\ht0
+\DeclareMathSymbol{\FeynxSpaceChar}{\mathord}{feynmanextended}{"20}
+\setbox0=\hbox{$\FeynxSpaceChar$}
+\newdimen\feyn@mfextendedmodule \feyn@mfextendedmodule=\wd0
 {\catcode`\!=\active
   \gdef\Diagram{%
     \begingroup  % ends in \Diagram@
     \catcode`\!=\active
     \let!\momentum
-    \Diagram@}}
-\def\Diagram@#1{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
-    \halign{&$\displaystyle\feyn{##}$\cr #1\crcr}}}%
+    % \Diagram@
+    \@ifnextchar[\Diagram@{\Diagram@[centre]}%]
+  }}
+\let\Diagram@pos@centre\vcenter
+\let\Diagram@pos@center\vcenter     %for Webster fans
+\let\Diagram@pos@bottom\relax
+\def\Diagram@[#1]#2{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
+    \halign{&$\displaystyle\feyn{##}$\cr #2\crcr}}}%
     \@tempdima=\ht0
     \advance\@tempdima by 2\feyn@maxis \ht0=\@tempdima
-    \vcenter{\box0}%
+    % no error checking -- unrecognised placement specifiers just expand to \relax
+    \csname Diagram@pos@#1\endcsname{\box0}%
+    \endgroup}% end group begun in \Diagram
+{\catcode`\!=\active
+  \gdef\DIAGRAM{%
+    \begingroup  % ends in \Diagram@
+    \catcode`\!=\active
+    \let!\momentum
+    % \DIAGRAM@
+    \@ifnextchar[\DIAGRAM@{\DIAGRAM@[centre]}%]
+  }}
+\def\DIAGRAM@[#1]#2{\setbox0=\hbox{\vbox{\offinterlineskip \let\\\cr
+    \halign{&$\displaystyle\FEYN{##}$\cr #2\crcr}}}%
+    \@tempdima=\ht0
+    \advance\@tempdima by 2\feyn@maxis \ht0=\@tempdima
+    \csname Diagram@pos@#1\endcsname{\box0}%
     \endgroup}% end group begun in \Diagram
 \def\maxis#1{\raise\feyn@maxis \hbox{$#1$}}
-\newdimen\feyn@nudge \feyn@nudge=\feyn@mfmodule \divide\feyn@nudge by 3
+\def\belowl#1{%
+  \ifdim\feyn@mfmodule=\feyn@mfbasemodule
+    \let\@next\feyn
+  \else
+    \let\@next\FEYN
+  \fi
+  \setbox0\hbox{$\@next{#1}$}%
+  \hskip-\wd0 \lower\ht0\box0
+}
+\def\belowr#1{%
+  \ifdim\feyn@mfmodule=\feyn@mfbasemodule
+    \let\@next\feyn
+  \else
+    \let\@next\FEYN
+  \fi
+  \setbox0\hbox{$\@next{#1}$}%
+  \@tempdima=\wd0
+  \lower\ht0\box0
+  \hskip-\@tempdima
+}
+\newdimen\feyn@nudge
+  \feyn@nudge=\feyn@mfbasemodule \divide\feyn@nudge by 3
 \def\feyn@pos@top#1#2#3{% top
     \leavevmode
     \@tempdima=#2\feyn@mfmodule \advance\@tempdima\feyn@nudge
@@ -166,84 +214,93 @@
         \csname feyn@pos@\ifx\@tempa\@empty #4\else\@tempa\fi\endcsname
             {#2}{#3}{##1}%
     #1}}
-\feyn@annotation{f}{0.99974}{0.35}{top}% "f"
-\feyn@annotation{fA}{0.99974}{0.35}{top}% "F"
-\feyn@annotation{fV}{0.99974}{0.35}{top}% 6
-\feyn@annotation{fu}{0.70692}{0.95692}{ulft}% "e"
-\feyn@annotation{fuA}{0.70692}{0.95692}{ulft}% "E"
-\feyn@annotation{fuV}{0.70692}{0.95692}{ulft}% 5
-\feyn@annotation{fd}{0.70692}{0.95692}{urt}% "d"
-\feyn@annotation{fdA}{0.70692}{0.95692}{urt}% "D"
-\feyn@annotation{fdV}{0.70692}{0.95692}{urt}% 4
-\feyn@annotation{fv}{0}{1.24974}{urt}% "b"
-\feyn@annotation{fvA}{0}{1.24974}{urt}% "B"
-\feyn@annotation{fvV}{0}{1.24974}{urt}% 2
-\feyn@annotation{m}{0.99974}{0.32802}{top}% "m"
-\feyn@annotation{mA}{0.99974}{0.32802}{top}% "M"
-\feyn@annotation{mV}{0.99974}{0.32802}{top}% 13
-\feyn@annotation{ms}{0.49986}{0.32802}{top}% 11
-\feyn@annotation{fl}{0}{1.85}{top}% "l"
-\feyn@annotation{flA}{0}{1.85}{top}% "L"
-\feyn@annotation{flV}{0}{1.85}{top}% 12
-\feyn@annotation{flu}{0}{-1.35}{bot}% "n"
-\feyn@annotation{fluA}{0}{-1.35}{bot}% "N"
-\feyn@annotation{fluV}{0}{-1.35}{bot}% 14
-\feyn@annotation{flS}{0}{1.23335}{top}% "o"
-\feyn@annotation{flSA}{0}{1.23335}{top}% "O"
-\feyn@annotation{flSV}{0}{1.23335}{top}% 15
-\feyn@annotation{flSu}{0}{-0.90001}{bot}% "w"
-\feyn@annotation{flSuA}{0}{-0.90001}{bot}% "W"
-\feyn@annotation{flSuV}{0}{-0.90001}{bot}% 23
-\feyn@annotation{g}{0.99974}{0.45}{top}% "g"
-\feyn@annotation{gA}{0.99974}{0.45}{top}% "G"
-\feyn@annotation{gV}{0.99974}{0.45}{top}% 7
-\feyn@annotation{gu}{0.70692}{0.95692}{ulft}% "u"
-\feyn@annotation{guA}{0.70692}{0.95692}{ulft}% "U"
-\feyn@annotation{guV}{0.70692}{0.95692}{ulft}% 21
-\feyn@annotation{gd}{0.70692}{0.95692}{urt}% "v"
-\feyn@annotation{gdA}{0.70692}{0.95692}{urt}% "V"
-\feyn@annotation{gdV}{0.70692}{0.95692}{urt}% 22
-\feyn@annotation{gv}{0}{1.24974}{urt}% "}"
-\feyn@annotation{gvA}{0}{1.24974}{urt}% "]"
-\feyn@annotation{gvV}{0}{1.24974}{urt}% 29
-\feyn@annotation{g1}{-1.41422}{1.66422}{ulft}% "q"
-\feyn@annotation{g1A}{-1.41422}{1.66422}{ulft}% "Q"
-\feyn@annotation{g1V}{-1.41422}{1.66422}{ulft}% 17
-\feyn@annotation{g2}{1.41422}{1.66422}{urt}% "r"
-\feyn@annotation{g2A}{1.41422}{1.66422}{urt}% "R"
-\feyn@annotation{g2V}{1.41422}{1.66422}{urt}% 18
-\feyn@annotation{g3}{1.41422}{-1.16422}{lrt}% "s"
-\feyn@annotation{g3A}{1.41422}{-1.16422}{lrt}% "S"
-\feyn@annotation{g3V}{1.41422}{-1.16422}{lrt}% 19
-\feyn@annotation{g4}{-1.41422}{-1.16422}{llft}% "t"
-\feyn@annotation{g4A}{-1.41422}{-1.16422}{llft}% "T"
-\feyn@annotation{g4V}{-1.41422}{-1.16422}{llft}% 20
-\feyn@annotation{gl}{0}{2.25}{urt}% "y"
-\feyn@annotation{glA}{0}{2.25}{urt}% "Y"
-\feyn@annotation{glV}{0}{2.25}{urt}% 25
-\feyn@annotation{glu}{0}{-1.75}{llft}% "z"
-\feyn@annotation{gluA}{0}{-1.75}{llft}% "Z"
-\feyn@annotation{gluV}{0}{-1.75}{llft}% 26
-\feyn@annotation{glB}{0}{2.91667}{urt}% "{"
-\feyn@annotation{glBA}{0}{2.91667}{urt}% "["
-\feyn@annotation{glBV}{0}{2.91667}{urt}% 27
-\feyn@annotation{glS}{0}{1.5833}{llft}% "|"
-\feyn@annotation{glSA}{0}{1.5833}{llft}% "\"
-\feyn@annotation{glSV}{0}{1.5833}{llft}% 28
-\feyn@annotation{h}{0.99974}{0.25}{top}% "h"
-\feyn@annotation{hA}{0.99974}{0.25}{top}% "H"
-\feyn@annotation{hV}{0.99974}{0.25}{top}% 8
-\feyn@annotation{hu}{0.70464}{0.95464}{ulft}% "i"
-\feyn@annotation{huA}{0.70464}{0.95464}{ulft}% "I"
-\feyn@annotation{huV}{0.70464}{0.95464}{ulft}% 9
-\feyn@annotation{hd}{0.70464}{0.95464}{urt}% "j"
-\feyn@annotation{hdA}{0.70464}{0.95464}{urt}% "J"
-\feyn@annotation{hdV}{0.70464}{0.95464}{urt}% 10
-\feyn@annotation{hs}{0.49986}{0.25}{top}% "K"
-\feyn@annotation{c}{0.65044}{0.90044}{top}% "c"
-\feyn@annotation{p}{0.65}{0.9}{top}% "p"
-\feyn@annotation{P}{0.65044}{0.90044}{top}% "P"
-\feyn@annotation{x}{0}{0.55641}{top}% "x"
+\feyn@annotation{f}{0.99974}{0.35}{top}% 102 = "f"
+\feyn@annotation{fA}{0.99974}{0.35}{top}% 70 = "F"
+\feyn@annotation{fV}{0.99974}{0.35}{top}% 6 = 6
+\feyn@annotation{flo}{0}{2.25}{top}% 107 = "k"
+\feyn@annotation{floA}{0}{2.25}{top}% 75 = "K"
+\feyn@annotation{floV}{0}{2.25}{top}% 11 = 11
+\feyn@annotation{fu}{0.70692}{0.95692}{ulft}% 101 = "e"
+\feyn@annotation{fuA}{0.70692}{0.95692}{ulft}% 69 = "E"
+\feyn@annotation{fuV}{0.70692}{0.95692}{ulft}% 5 = 5
+\feyn@annotation{fd}{0.70692}{0.95692}{urt}% 100 = "d"
+\feyn@annotation{fdA}{0.70692}{0.95692}{urt}% 68 = "D"
+\feyn@annotation{fdV}{0.70692}{0.95692}{urt}% 4 = 4
+\feyn@annotation{fv}{0}{1.24974}{urt}% 98 = "b"
+\feyn@annotation{fvA}{0}{1.24974}{urt}% 66 = "B"
+\feyn@annotation{fvV}{0}{1.24974}{urt}% 2 = 2
+\feyn@annotation{m}{0.99974}{0.32802}{top}% 109 = "m"
+\feyn@annotation{mA}{0.99974}{0.32802}{top}% 77 = "M"
+\feyn@annotation{mV}{0.99974}{0.32802}{top}% 13 = 13
+\feyn@annotation{ms}{0.49986}{0.32802}{top}% 35 = "#"
+\feyn@annotation{fl}{0}{1.75}{top}% 108 = "l"
+\feyn@annotation{flA}{0}{1.75}{top}% 76 = "L"
+\feyn@annotation{flV}{0}{1.75}{top}% 12 = 12
+\feyn@annotation{flu}{0}{-1.25}{bot}% 110 = "n"
+\feyn@annotation{fluA}{0}{-1.25}{bot}% 78 = "N"
+\feyn@annotation{fluV}{0}{-1.25}{bot}% 14 = 14
+\feyn@annotation{flS}{0}{1.16667}{top}% 111 = "o"
+\feyn@annotation{flSA}{0}{1.16667}{top}% 79 = "O"
+\feyn@annotation{flSV}{0}{1.16667}{top}% 15 = 15
+\feyn@annotation{flSu}{0}{-0.83334}{bot}% 119 = "w"
+\feyn@annotation{flSuA}{0}{-0.83334}{bot}% 87 = "W"
+\feyn@annotation{flSuV}{0}{-0.83334}{bot}% 23 = 23
+\feyn@annotation{g}{0.99974}{0.45}{top}% 103 = "g"
+\feyn@annotation{gA}{0.99974}{0.45}{top}% 71 = "G"
+\feyn@annotation{gV}{0.99974}{0.45}{top}% 7 = 7
+\feyn@annotation{gu}{0.70692}{0.95692}{ulft}% 117 = "u"
+\feyn@annotation{guA}{0.70692}{0.95692}{ulft}% 85 = "U"
+\feyn@annotation{guV}{0.70692}{0.95692}{ulft}% 21 = 21
+\feyn@annotation{gd}{0.70692}{0.95692}{urt}% 118 = "v"
+\feyn@annotation{gdA}{0.70692}{0.95692}{urt}% 86 = "V"
+\feyn@annotation{gdV}{0.70692}{0.95692}{urt}% 22 = 22
+\feyn@annotation{gv}{0}{1.24974}{urt}% 125 = "}"
+\feyn@annotation{gvA}{0}{1.24974}{urt}% 93 = "]"
+\feyn@annotation{gvV}{0}{1.24974}{urt}% 29 = 29
+\feyn@annotation{g1}{-1}{1.98206}{ulft}% 113 = "q"
+\feyn@annotation{g1A}{-1}{1.98206}{ulft}% 81 = "Q"
+\feyn@annotation{g1V}{-1}{1.98206}{ulft}% 17 = 17
+\feyn@annotation{g2}{1.41422}{1.66422}{urt}% 114 = "r"
+\feyn@annotation{g2A}{1.41422}{1.66422}{urt}% 82 = "R"
+\feyn@annotation{g2V}{1.41422}{1.66422}{urt}% 18 = 18
+\feyn@annotation{g3}{1.41422}{-1.16422}{lrt}% 115 = "s"
+\feyn@annotation{g3A}{1.41422}{-1.16422}{lrt}% 83 = "S"
+\feyn@annotation{g3V}{1.41422}{-1.16422}{lrt}% 19 = 19
+\feyn@annotation{g4}{-1}{-1.48206}{llft}% 116 = "t"
+\feyn@annotation{g4A}{-1}{-1.48206}{llft}% 84 = "T"
+\feyn@annotation{g4V}{-1}{-1.48206}{llft}% 20 = 20
+\feyn@annotation{gl}{0}{1.75}{urt}% 121 = "y"
+\feyn@annotation{glA}{0}{1.75}{urt}% 89 = "Y"
+\feyn@annotation{glV}{0}{1.75}{urt}% 25 = 25
+\feyn@annotation{glu}{0}{-1.25}{llft}% 122 = "z"
+\feyn@annotation{gluA}{0}{-1.25}{llft}% 90 = "Z"
+\feyn@annotation{gluV}{0}{-1.25}{llft}% 26 = 26
+\feyn@annotation{glB}{1.02051}{2.71367}{urt}% 123 = "{"
+\feyn@annotation{glBA}{1.02051}{2.71367}{urt}% 91 = "["
+\feyn@annotation{glBV}{1.02051}{2.71367}{urt}% 27 = 27
+\feyn@annotation{glS}{0}{1.5833}{llft}% 124 = "|"
+\feyn@annotation{glSA}{0}{1.5833}{llft}% 92 = "\"
+\feyn@annotation{glSV}{0}{1.5833}{llft}% 28 = 28
+\feyn@annotation{h}{0.99974}{0.25}{top}% 104 = "h"
+\feyn@annotation{hA}{0.99974}{0.25}{top}% 72 = "H"
+\feyn@annotation{hV}{0.99974}{0.25}{top}% 8 = 8
+\feyn@annotation{hu}{0.70464}{0.95464}{ulft}% 105 = "i"
+\feyn@annotation{huA}{0.70464}{0.95464}{ulft}% 73 = "I"
+\feyn@annotation{huV}{0.70464}{0.95464}{ulft}% 9 = 9
+\feyn@annotation{hd}{0.70464}{0.95464}{urt}% 106 = "j"
+\feyn@annotation{hdA}{0.70464}{0.95464}{urt}% 74 = "J"
+\feyn@annotation{hdV}{0.70464}{0.95464}{urt}% 10 = 10
+\feyn@annotation{hl}{0}{1.75}{top}% 126 = "~"
+\feyn@annotation{hlA}{0}{1.75}{top}% 94 = "^"
+\feyn@annotation{hlV}{0}{1.75}{top}% 30 = 30
+\feyn@annotation{hlu}{0}{-1.25}{top}% 127 = 127
+\feyn@annotation{hluA}{0}{-1.25}{top}% 95 = "_"
+\feyn@annotation{hluV}{0}{-1.25}{top}% 31 = 31
+\feyn@annotation{hs}{0.49986}{0.25}{top}% 34 = """
+\feyn@annotation{c}{0.65044}{0.90044}{top}% 99 = "c"
+\feyn@annotation{p}{0.65}{0.9}{top}% 112 = "p"
+\feyn@annotation{P}{0.65044}{0.90044}{top}% 80 = "P"
+\feyn@annotation{x}{0}{0.55641}{top}% 120 = "x"
 \def\momentum{\@ifnextchar[\momentum@{\momentum@[]}}
 \def\momentum@[#1]#2#3{%
   \def\@tempa{#1}