feyn update (8oct09)

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

22 files changed, 113 insertions, 106 deletions

diff --git a/Master/texmf-dist/doc/fonts/feyn/README b/Master/texmf-dist/doc/fonts/feyn/README
index c89364e185e..a0f7c96b9f1 100644
--- a/Master/texmf-dist/doc/fonts/feyn/README
+++ b/Master/texmf-dist/doc/fonts/feyn/README
@@ -2,28 +2,33 @@
 Feyn: a Metafont for Feynman diagrams
 -------------------------------------
 
-Version 0.3.1.
-
-This describes the font `feyn', which can be used to produce relatively
-simple Feynman diagrams within equations in a LaTeX document.
-
-The other Feynman diagram package which exists is Thorsten Ohl's
-`feynmf/feynmp' package.  That 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 write simple diagrams,
-within equations or within text, in a size matching the surrounding
-text size.
-
-
-Status
-------
-
-The font, and this associated style file, should be regarded as
-beta software at present.  The propagators and vertices which are
-implemented are those which _I_ needed.  I'd be delighted to
-add more if folk feel they would be useful.
+Version 0.3.3.
+
+This package is intended to produce relatively simple Feynman diagrams, for 
+example within equations.
+
+This package differs from Thorsten Ohl's feynmf/feynmp package.
+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.
+
+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, 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.
+
+There is further documentation, plus numerous examples, in the package
+documentation (feyn.pdf).
 
 See the package's home page on the web: http://purl.org/nxg/dist/feyn
 
diff --git a/Master/texmf-dist/doc/fonts/feyn/VERSION b/Master/texmf-dist/doc/fonts/feyn/VERSION
index 7b769f18749..7b6fb77e6c8 100644
--- a/Master/texmf-dist/doc/fonts/feyn/VERSION
+++ b/Master/texmf-dist/doc/fonts/feyn/VERSION
@@ -1 +1 @@
-feyn-0.3.1
+feyn-0.3.3
diff --git a/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf b/Master/texmf-dist/doc/fonts/feyn/exercise-font.pdf
index c1cd0954b46..730098a76b8 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/feyn.pdf b/Master/texmf-dist/doc/fonts/feyn/feyn.pdf
index 84fef75d064..e474e21ed46 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 ba8836904d9..6c23aec04a8 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 2feb8e6bfa1..61fe82cc3cb 100644
--- a/Master/texmf-dist/doc/fonts/feyn/overheads.tex
+++ b/Master/texmf-dist/doc/fonts/feyn/overheads.tex
@@ -1,30 +1,28 @@
-\documentclass[Screen4to3]{foils}
-%\documentclass[25pt,Screen4to3]{foils}
-% Don't use landscape option with Screen4to3 -- it swaps back to portrait
-
-% size options, 17, 20 (default), 25, 30
-
-\usepackage{times,feyn}
-
+\documentclass{beamer}
+% Quick example of overheads, using the sample beamer description at 
+% http://www.miwie.org/presentations/presentations.html#beamer
 
+\usepackage{feyn}
 
 \title{Feynman diagrams}
 \author{Norman Gray\\University of Glasgow}
-\date{2005 March 10}
+\date{v0.3.3, 2009 October 8}
 
-\parindent0pt
+%\parindent0pt
 
 \begin{document}
 
-\maketitle
+\frame{\titlepage}
 
-\foilhead{A diagram}
-
-Here is a text diagram $\Feyn{fglf}$, displayed
+\section{A diagram}
+\frame
+{
+Here is a text diagram $\Feyn{fglf}$, and a displayed one:
 \[
-2\times \feyn{2 !{fA}pf glB glS ff +
-    \Diagram{hd \\ &g\\hu}}
-=\frac{\delta^{ab}}{p^2}
+     \Diagram{\vertexlabel^a \\ fd \\ & g\vertexlabel_{\mu,c} \\
+          \vertexlabel_b fu\\}
+     = \displaystyle
+ 	ig\gamma_\mu (t^c)_{ab}
 \]
-
+}
 \end{document}
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
index 01477d5d467..deb0b6fb302 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn.mf
@@ -1,16 +1,16 @@
-%   This is the metafont for the feynfont font, release 0.3.1, 2008 February 29
+%   This is the metafont for the feynfont font, release 0.3.3, 2009 October 8
 %
 %   Copyright 1991, 1994, 2001, 2002, 2005, 2008, Norman Gray.
 %   See the file LICENCE for licence details.
 %
+%   Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
+%
 %
 %
 %   When I look at the property list of the generated TFM (using
 %   tftopl) it starts with `(FAMILY CMR)': but this isn't in the cmr
 %   family.  I can't find anything in cmbase.mf which would cause
 %   this.  Perhaps I need to read the Metafont Book more closely.
-%
-%   $Id: feyn.mf,v 1.17 2008/02/29 21:26:27 norman Exp $
 
 
 mode_setup; font_setup;
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn10.mf
index be25771202d..9e126cf1f07 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.1, 2008 February 29.
+% Feynman diagram font, 10pt display size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyn10.mf,v 1.9 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 10pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn11.mf
index 034b3811b56..bdfd63d040a 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.1, 2008 February 29.
+% Feynman diagram font, 11pt display size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyn11.mf,v 1.6 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 11pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn12.mf
index 3b4e6c55faf..1edf0bf33bd 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.1, 2008 February 29.
+% Feynman diagram font, 12pt display size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyn12.mf,v 1.7 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 12pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn18.mf
index f0ae91e3c01..a89dee06730 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.1, 2008 February 29.
+% Feynman diagram font, 18pt display size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyn18.mf,v 1.2 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 18pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf b/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
index 41e2bf3e98e..029e55274d8 100644
--- a/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
+++ b/Master/texmf-dist/fonts/source/public/feyn/feyn24.mf
@@ -1,7 +1,7 @@
-% Feynman diagram font, 24pt display size, release 0.3.1, 2008 February 29.
+% Feynman diagram font, 24pt display size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyn24.mf,v 1.2 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 10pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf b/Master/texmf-dist/fonts/source/public/feyn/feynmac.mf
index e6df38b25d5..3511d1bb4a0 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.1, 2008 February 29
+% Release 0.3.3, 2009 October 8
 
 
 def looselink = ..tension 0.75.. enddef;
@@ -116,9 +116,9 @@ def errorchar (expr ht) =
     numeric rad,npetals,ilowest;
     pair cent;
     cent=(0,2ht/3);		% centre of the flower
-    rad=ht/5;			% radius of the inner points
+    rad=ht/6;			% radius of the inner points
     npetals=5;			% number of petals
-    pickup pencircle scaled (thinlinewidth#); % thin line
+    pickup pencircle scaled (thinlinewidth); % thin line
     z0 = cent shifted (rad,0);
     for i=1 upto npetals-1:
       z[i] = z0 rotatedabout (cent, i*360/npetals);
@@ -134,7 +134,7 @@ def errorchar (expr ht) =
     endfor
     draw z[ilowest]{dir (ilowest*360/npetals)}..origin;
     pair leafend;
-    xpart(leafend) = 2rad; % want something like currentpicture.rt;
+    xpart(leafend) = 3rad; % want something like currentpicture.rt;
     ypart(leafend) = 2y[ilowest]/3;
     draw origin{dir 60} .. leafend;
     draw leafend .. {dir 180}origin;
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext10.mf
index d5dfc642d38..33afee2d8a8 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.1, 2008 February 29.
+% Feynman diagram font, 10pt text size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyntext10.mf,v 1.5 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 10pt#;
 
@@ -15,7 +15,7 @@ module# := 5pt#;
 phfudge# := 0pt#;		% must be, for \Diagram macro
 
 linewidth# := 0.5pt#;		% pen width
-thinlinewidth# := 0.4pt#;	% thin pen
+thinlinewidth# := 0.3pt#;	% thin pen
 bigarrow# := 4pt#;		% size of arrows
 littlearrow# := 3pt#;
 blobr# := 3.5pt#;		% radius of blobs and crosses
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext11.mf
index 24740299fdc..35fb120d542 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.1, 2008 February 29.
+% Feynman diagram font, 11pt text size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyntext11.mf,v 1.5 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 11pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext12.mf
index e2553c3dee8..7a93770391d 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.1, 2008 February 29.
+% Feynman diagram font, 12pt text size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyntext12.mf,v 1.6 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 12pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext18.mf
index f1187a16f86..552862fb6aa 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.1, 2008 February 29.
+% Feynman diagram font, 18pt text size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyntext18.mf,v 1.2 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 18pt#;
 
diff --git a/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf b/Master/texmf-dist/fonts/source/public/feyn/feyntext24.mf
index 342b38d8ef2..56297781d12 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.1, 2008 February 29.
+% Feynman diagram font, 24pt text size, release 0.3.3, 2009 October 8.
 %
 % Copyright 1991, 1994, 2001, Norman Gray <norman@astro.gla.ac.uk>
-% $Id: feyntext24.mf,v 1.2 2008/02/29 21:26:27 norman Exp $
+% Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 
 font_identifier "FEYN"; font_size 24pt#;
 
diff --git a/Master/texmf-dist/source/fonts/feyn/feyn.drv b/Master/texmf-dist/source/fonts/feyn/feyn.drv
index 556251201b7..0c14888b338 100644
--- a/Master/texmf-dist/source/fonts/feyn/feyn.drv
+++ b/Master/texmf-dist/source/fonts/feyn/feyn.drv
@@ -6,7 +6,7 @@
 %%
 %% feyn.dtx  (with options: `driver')
 %% Feyn: package to manage the font feyn10
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, Norman Gray.
+%% 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
@@ -27,12 +27,12 @@
 %%
 %% 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 .
-%% RCS Info $Id: feyn.dtx.in,v 1.18 2008/02/29 20:45:59 norman Exp $
+%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 \documentclass{ltxdoc}
 \usepackage{feyn}
 \title{The feyn font}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
-\date{Version 0.3.1, 2008 February 29}
+\date{Version 0.3.3, 2009 October 8}
 \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 0e2b35e7b4c..0ccffc9d72e 100644
--- a/Master/texmf-dist/source/fonts/feyn/feyn.dtx
+++ b/Master/texmf-dist/source/fonts/feyn/feyn.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 % This is feyn.dtx, which manages the use of the feyn Metafont
 %
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, Norman Gray. 
+%% 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
@@ -23,18 +23,17 @@
 %% 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>%% RCS Info $Id: feyn.dtx.in,v 1.18 2008/02/29 20:45:59 norman Exp $
+%<+package|driver>%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 %<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{feyn}[2008/02/29 \space0.3.1\space textpos]
-%<+package>\typeout{Package: `feyn' 0.3.1\space<2008/02/29 >}
+%<+package>\ProvidesPackage{feyn}[2009/10/08 \space0.3.3\space textpos]
+%<+package>\typeout{Package: `feyn' 0.3.3\space<2009/10/08 >}
 %
 %<*driver>
-%\documentclass[12pt]{ltxdoc}
 \documentclass{ltxdoc}
 \usepackage{feyn}
 \title{The feyn font}
 \author{Norman Gray\\(\texttt{norman@astro.gla.ac.uk})}
-\date{Version 0.3.1, 2008 February 29}
+\date{Version 0.3.3, 2009 October 8}
 \newcommand\Lopt[1]{\textsf {#1}}
 \newcommand\file[1]{\texttt {#1}}
 \newcommand\Lcount[1]{\textsl {\small#1}}
@@ -104,18 +103,21 @@
 % with which you can write simple diagrams, within equations or within text,
 % in a size matching the surrounding text size.
 %
+% \iffalse
 % \textbf{Contents:}
 % \def\numberline#1{\space\emph{\S#1}~}
 % \def\contentsline#1#2#3{#2,~p#3;}
 % \makeatletter \@starttoc{toc} \makeatother
+% \fi
 %
-% \section{Status}
+% \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
 % people asked me for').  I'd be delighted to add others which folk
-% feel would be useful.
+% feel would be useful, as long as they're still in the rather simple
+% scope of the font..
 %
 % 
 % \section{Description}
@@ -149,9 +151,9 @@
 % fs & fs &   short fermion
 %	& 1 & 0 & 0 \cr \tableskip
 % fl & fl &   fermion loop$^{\dag\ddag}$
-%	& 4 & 2 & 2 \cr \tableskip
+%	& 0 & 1 & 0 \cr \tableskip
 % flS & flS &  fermion loop (small)$^{\dag\ddag}$
-%       & 0 & 4/3 & 0 \cr \tableskip
+%       & 0 & 1 & 0 \cr \tableskip
 % fu & fu &   upward fermion$^\dag$ (45$^\circ$)
 %	& $\sqrt2$ & $\sqrt2$ & 0 \cr \tableskip
 % fd & fd &   downward fermion$^\dag$
@@ -170,8 +172,10 @@
 %	& 0 & 2.67 & 0 \cr \tableskip
 % glS & glS & gluon loop (small)$^{\dag}$
 %	& 0 & 1.33 & 0 \cr \tableskip
-% g1  & g1  & gluon loop, 1st quadrant (sim.\ 2, 3, 4)$^{\dag}$
-%       & 2 & 2 & 0 \cr \tableskip
+% g1\quad g2  & g1, g2  & gluon loop, 1st \& 2nd quadrants$^{\dag}$
+%       & 0 & 2 & 0 \cr \tableskip
+% g4\quad g3  & g4, g3  & gluon loop, 4th \& 3rd quadrants$^{\dag}$
+%       & 0 & 0 & -2 \cr \tableskip
 % gu & gu &   upward gluon$^\dag$ (45$^\circ$)
 %	& $\sqrt2$ & $\sqrt2$ & 0 \cr \tableskip
 % gd & gd &   downward gluon$^\dag$
@@ -197,20 +201,22 @@
 % a & a &	    arrow		& 0 & 0 & 0 \cr
 % }
 % \caption{\label{chars} The characters in font \feynx.  Characters
-% marked~$\ddag$ have an upside-down variant indicated with a `u'
-% suffix, and those marked~$\dag$ have arrowed variants indicated
-% with~`A' and~`V' suffixes, in that order.}
+% 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'.}
 % \end{table}
 %
-% The characters in the font are shown in table~\ref{chars}.  These
-% are shown in textstyle size, but all characters are also available in
-% displaystyle size.  All the dimensions are shown as multiples of the
-% length of a module which is the length of the short fermion.  The
-% dimension~$a$ is the height of the maths axis.  The~$\circ$ shows the
-% reference point of each character.  The proper vertex and the
-% complete vertex are specified
-% in terms of a `blob-radius' which is about half a module.  They have
-% a width of 2~radii, and a height and depth of 1~radius.
+% The characters in the font are shown in table~\ref{chars}.
+% These are shown in textstyle size, but all characters are also available in
+% displaystyle size.
+% All of the displaystyle characters are additionally offset vertically
+% up to the math axis, which has height~$a$.
+% All the dimensions are shown as multiples of the
+% length of a module which is the length of the short fermion.
+% The~$\circ$ shows the reference point of each character.
+% The proper vertex and the complete vertex are specified
+% in terms of a `blob-radius' which is about half a module.
+% They have a width of 2~radii, and a height and depth of 1~radius.
 %
 % Each of the characters marked with a~$\dag$ in the table has two
 % arrowed variants, so that |\feyn{fA + gV}| produces $\feyn{fA +
@@ -235,10 +241,10 @@
 %     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.  Rarely used as such, since the |\feyn| and |\Feyn|
+%     examples.  This is rarely used as such, since the |\feyn| and |\Feyn|
 %     commands make~`!' a temporarily active character, and define it
 %     to be |\momentum|.
-% \item[\cs{Diagram\{\}}] For building more complicated diagrams.  It
+% \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
 %     below for an example.  The result is a box on the math-axis.
@@ -613,7 +619,7 @@
 % and these will usually be invoked by default when \LaTeX\ or
 % pdf\LaTeX\ is run.
 %
-% If you are using a teTeX-based system (which is true of most Unix
+% 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
 % determine the style-file and \metafont\ search paths using the commands
 % \begin{verbatim}
@@ -629,7 +635,7 @@
 % for finding and confirming the search paths (and if anyone wishes to
 % send me details, I can add the details to this document).
 %
-% \section{Acknowledgements}
+% \subsection*{Acknowledgements}
 %
 % Thanks to Purnendu Chakraborty, Fabio Correa, and Bryan Chen for
 % suggestions and testing at various times.
diff --git a/Master/texmf-dist/source/fonts/feyn/feyn.ins b/Master/texmf-dist/source/fonts/feyn/feyn.ins
index 5a56e95876d..f69f819db89 100644
--- a/Master/texmf-dist/source/fonts/feyn/feyn.ins
+++ b/Master/texmf-dist/source/fonts/feyn/feyn.ins
@@ -10,5 +10,3 @@
 	  }
 
 \endbatchfile
-
-%% $Id: feyn.ins,v 1.1 2001/08/06 17:21:31 norman Exp $
diff --git a/Master/texmf-dist/tex/latex/feyn/feyn.sty b/Master/texmf-dist/tex/latex/feyn/feyn.sty
index 59207ad9361..a6ad5c45b3f 100644
--- a/Master/texmf-dist/tex/latex/feyn/feyn.sty
+++ b/Master/texmf-dist/tex/latex/feyn/feyn.sty
@@ -6,7 +6,7 @@
 %%
 %% feyn.dtx  (with options: `package')
 %% Feyn: package to manage the font feyn10
-%% This software is copyright, 1991, 1994, 2001, 2002, 2005, 2008, Norman Gray.
+%% 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
@@ -27,10 +27,10 @@
 %%
 %% 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 .
-%% RCS Info $Id: feyn.dtx.in,v 1.18 2008/02/29 20:45:59 norman Exp $
+%% VCS Info: Mercurial revision 204fc9a2e560, 2009-10-08 12:56 +0100
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{feyn}[2008/02/29 \space0.3.1\space textpos]
-\typeout{Package: `feyn' 0.3.1\space<2008/02/29 >}
+\ProvidesPackage{feyn}[2009/10/08 \space0.3.3\space textpos]
+\typeout{Package: `feyn' 0.3.3\space<2009/10/08 >}
 %% \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