From cbb5e2fbb4d58170c4b508755e2b104192a48966 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Aug 2019 20:44:55 +0000 Subject: tikz-feynhand (20aug19) git-svn-id: svn://tug.org/texlive/trunk@51915 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/tikz-feynhand/README.md | 4 +- .../texmf-dist/doc/latex/tikz-feynhand/changes.txt | 321 ++++----------------- .../tikz-feynhand/tikz-feynhand.userguide.pdf | Bin 328649 -> 333745 bytes .../tikz-feynhand/tikz-feynhand.userguide.tex | 72 ++++- 4 files changed, 128 insertions(+), 269 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/latex/tikz-feynhand/README.md b/Master/texmf-dist/doc/latex/tikz-feynhand/README.md index 7bbc79383ba..0f0b848fb6f 100644 --- a/Master/texmf-dist/doc/latex/tikz-feynhand/README.md +++ b/Master/texmf-dist/doc/latex/tikz-feynhand/README.md @@ -23,7 +23,7 @@ with many examples and a 5-minute introduction to TikZ. 3. tikzfeynhand.keys.code.tex - defines Tikz keys 4. tikz-feynhand.userguide.pdf - a userguide for the package 5. tikz-feynhand.userguide.tex - the tex source of the userguide -6. changes.txt - lists changes applied to Tikz-Feynman to obtain Tikz-FeynHand +6. changes.txt - lists changes since last version 7. shell_escape.jpg - a TexWorks screenshot for the userguide 8. README.md - this file @@ -32,7 +32,7 @@ with many examples and a 5-minute introduction to TikZ. LICENSE ------- -Copyright (C) 2018 Max Dohse +Copyright (C) 2019 Max Dohse Copyright (C) 2016 Joshua Ellis This whole package (code and documentation) diff --git a/Master/texmf-dist/doc/latex/tikz-feynhand/changes.txt b/Master/texmf-dist/doc/latex/tikz-feynhand/changes.txt index 0b2d01e4c82..aad3cfddb78 100644 --- a/Master/texmf-dist/doc/latex/tikz-feynhand/changes.txt +++ b/Master/texmf-dist/doc/latex/tikz-feynhand/changes.txt @@ -1,281 +1,88 @@ LIST OF CHANGES -by which this package tikz-feynhand (Version 1.0.0 of 2018/01/31) +by which this package tikz-feynhand (Version 1.1.0 of 2019/08/19) which is available at https://ctan.org/pkg/tikz-feynhand -was obtained from the original package tikz-feynman (Version 1.1.0 of 2016/02/05) -which is available at https://ctan.org/pkg/tikz-feynman +was obtained from Version 1.0.0 ========================================================================== -The LICENSE has been changed from LPPL to GNU General Public Licence v3. - -The changes are rather minor: -any reference to LuaTex has been removed, -the definitions that are unnecessary -for manual diagram creation have been removed, -and some drawing styles have been added. - -In general, I REPLACED each occurence of the string "feynman" by "feynhand", -in order to avoid clashes when both packages are loaded simultaneously, -and most of these replacements are NOT listed individually below. -Apart from that, the list below contains all changes to the best of my knowledge. - -The files tikzfeynman.patch.3.0.0.lua and tikzfeynman.patch.3.0.1.lua -of the original package are not contained in the modified package, -neither is the documentation of the original package. - -All file names and line numbers below refer to -the files of the original package tikz-feynman (Version 1.1.0 of 2016/02/05). +All file names and line numbers below refer to the files of Version 1.1.0. ============================================== - FILE: tikz-feynman.sty + FILE: tikz-feynhand.sty -+ general: package name changed -+ line 32: removed \RequirePackage{ifluatex} ++ no changes ============================================== - FILE: tikzlibraryfeynman.code.tex + FILE: tikzlibraryfeynhand.code.tex -+ line 33: removed graphs, -+ lines 38-48: removed \ifluatex ... -+ lines 69-84: removed %Luatex warning ... -+ lines 119-141: removed %% Override Lua ... -+ line 159: removed \let\tikzfeynman@orig@graph=\graph -+ lines 162+163: removed, inserted: - \let\propag=\tikzfeynhand@commands@propag - \let\propag=\propagator -+ line 166: removed \tikz@lib@ignore@sizetrue -+ lines 181-190: removed %% \feynmandiagram ... -+ lines 266-282: removed %% Diagram ... -+ lines 284-291: removed %% Graph ... - inserted: - %% Propagators - \newcommand{\tikzfeynhand@commands@propag}[1][]{\draw [#1]} -+ line 321: removed \pgfkeyslet{/tikzfeynman/rmomentum/.@cmd}... -+ line 327: removed \pgfkeyslet{/tikzfeynman/rmomentum'/.@cmd}... - inserted: - % short versions of momentum styles - \pgfkeyslet{/tikzfeynhand/rmomentum/.@cmd}{\tikzfeynhand@momentum@stdr} - \pgfkeyslet{/tikzfeynhand/rmomentum'/.@cmd}{\tikzfeynhand@momentum@stdrp} ++ line 228: inserted: - \pgfkeyslet{/tikzfeynhand/mom/.@cmd}{\tikzfeynhand@momentum@std} - \pgfkeyslet{/tikzfeynhand/mom'/.@cmd}{\tikzfeynhand@momentum@stdp} +%% Slash +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\def\tikzfeynhand@slash{% + \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{slash@@}} + {\tikzfeynhand@key@opt{slash@@}[]}} +\pgfkeyslet{/tikzfeynhand/slash/.@cmd}{\tikzfeynhand@slash} - \pgfkeyslet{/tikzfeynhand/revmom/.@cmd}{\tikzfeynhand@momentum@stdr} - \pgfkeyslet{/tikzfeynhand/revmom'/.@cmd}{\tikzfeynhand@momentum@stdrp} +%% Backslash +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\def\tikzfeynhand@backslash{% + \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{backslash@@}} + {\tikzfeynhand@key@opt{backslash@@}[]}} +\pgfkeyslet{/tikzfeynhand/backslash/.@cmd}{\tikzfeynhand@backslash} ============================================== - FILE: tikzfeynman.keys.code.tex - -+ line 22: inserted - %% Lengths - \newlength{\feynhanddotsize} - \setlength{\feynhanddotsize}{1.5mm} - - \newlength{\feynhandblobsize} - \setlength{\feynhandblobsize}{7.5mm} - - \newlength{\feynhandlinesize} - \setlength{\feynhandlinesize}{0.5pt} - - \newlength{\feynhandarrowsize} - \setlength{\feynhandarrowsize}{6pt} - - \newlength{\feynhandtopsep} - \setlength{\feynhandtopsep}{18\feynhandlinesize} - - %% Colors - \newcommand{\feynhandtopsepcolor}{white} - - -+ line 117: replaced \pgfmetadecorationsegmentamplitude - by 3 * \feynhandlinesize -+ line 141: removed /tikzfeynman/medium, -+ lines 145-206: removed %% Diagrams ... -+ line 219, 258, 280: - each removed /tikz/graphs/as={}, -+ line 224: replaced /tikz/minimum size=1.5mm, - by /tikz/minimum size=\feynhanddotsize, -+ line 225, 264, 337, 348: - each inserted /tikz/line width = \feynhandlinesize, -+ lines 230-236: replaced every occurrence of square dot - by squaredot -+ lines 238-245: replaced every occurrence of empty dot - by ringdot -+ lines 230-236: replaced every occurrence of crossed dot - by crossdot -+ line 249: replaced /tikz/minimum size=3mm, - by /tikz/minimum size=2\feynhanddotsize, -+ line 260: replaced /tikz/fill=none, - by /tikz/fill, -+ lines 261+275: - each replaced /tikz/outer sep=0.5\pgflinewidth, - by /tikz/outer sep={0.5*\the\feynhandlinesize}, -+ line 263: replaced /tikz/minimum size=0.75cm, - by /tikz/minimum size=\feynhandblobsize, -+ line 264: removed /tikz/pattern=north west lines, -+ line 269: inserted /tikz/fill=black, -+ line 270: inserted - every ringblob@@/.style={ - }, - every ringblob/.style={/tikzfeynhand/every ringblob@@/.append style={#1}}, - ringblob/.style={ - /tikzfeynhand/every blob@@, - /tikzfeynhand/every ringblob@@, - /tikz/fill=white, - }, - every NWblob@@/.style={ - }, - every NWblob/.style={/tikzfeynhand/every NWblob@@/.append style={#1}}, - NWblob/.style={ - /tikzfeynhand/every blob@@, - /tikzfeynhand/every NWblob@@, - /tikz/fill=none, - /tikz/pattern=north west lines, - }, - every NEblob@@/.style={ - }, - every NEblob/.style={/tikzfeynhand/every NEblob@@/.append style={#1}}, - NEblob/.style={ - /tikzfeynhand/every blob@@, - /tikzfeynhand/every NEblob@@, - /tikz/fill=none, - /tikz/pattern=north east lines, - }, - every grayblob@@/.style={ - }, - every grayblob/.style={/tikzfeynhand/every grayblob@@/.append style={#1}}, - grayblob/.style={ - /tikzfeynhand/every blob@@, - /tikzfeynhand/every grayblob@@, - /tikz/fill=gray!50!white, - }, -+ line 288: replaced arrow size=1.5pt, - by arrow size=\feynhandarrowsize, -+ line 295: replaced xshift... - by xshift=-0.166666\feynhandarrowsize, -+ line 297: replaced inner sep=\tikzfeynman@arrow@size, - by inner sep=0mm, - minimum width = \tikzfeynhand@arrow@size, -+ line 309: replaced xshift... - by xshift=0.166666\feynhandarrowsize, -+ line 316: replaced inner sep=\tikzfeynman@arrow@size, - by inner sep=0mm, - minimum width = \tikzfeynhand@arrow@size, -+ line 343: inserted - every top@@/.style={ - /tikz/preaction={draw=\feynhandtopsepcolor,line width=\feynhandtopsep} - }, - every top/.style={/tikzfeynhand/every top@@/.append style={#1}}, - top/.style={ - /tikzfeynhand/every top@@, - }, - -+ lines 350-352: replaced amplitude= ... - by amplitude=3\feynhandlinesize, - segment length=7.5\feynhandlinesize, -+ line 381: inserted /tikz/line width = \feynhandlinesize, -+ lines 383-384: replaced amplitude= ... - by amplitude=3\feynhandlinesize, - segment length=7.5\feynhandlinesize, -+ line 399: inserted /tikz/line width = \feynhandlinesize, -+ line 435 replaced /tikz/thick, - by /tikz/line width = 2\feynhandlinesize, -+ line 442: inserted - every charged ghost@@/.style={ - /tikz/draw=none, - /tikz/decoration={name=none}, + FILE: tikzfeynhand.keys.code.tex + ++ line 629: inserted: + + %% Slashes + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + slash/.search also={/tikzfeynhand,/tikz}, + %% Parameters + slash/size/.store in=\tikzfeynhand@slash@size, + slash/size=5\feynhandlinesize, + slash/style/.store in=\tikzfeynhand@slash@style, + slash/style={}, + %% Styles + slash@@/.style args={[#1]#2}{ + /tikz/line width = \feynhandlinesize, + /tikz/decoration={ + markings, + mark=at position #2 with { + \tikzfeynhandset{slash/.cd,#1} + \draw [\tikzfeynhand@slash@style] (-\tikzfeynhand@slash@size, -2*\tikzfeynhand@slash@size) -- (\tikzfeynhand@slash@size, 2*\tikzfeynhand@slash@size); + }, + }, /tikz/postaction={ - /tikzfeynhand/with arrow=0.5, + /tikz/decorate=true, }, }, - every charged ghost/.style={/tikzfeynhand/every charged ghost@@/.append style={#1}}, - charged ghost/.style={ - /tikzfeynhand/ghost, - /tikzfeynhand/every charged ghost@@, - }, - every anti charged ghost@@/.style={ - /tikz/draw=none, - /tikz/decoration={name=none}, + slash@@/.default={[]0.5}, + %% + %% Backslashes + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + backslash/.search also={/tikzfeynhand,/tikz}, + %% Parameters + backslash/size/.store in=\tikzfeynhand@backslash@size, + backslash/size=5\feynhandlinesize, + backslash/style/.store in=\tikzfeynhand@backslash@style, + backslash/style={}, + %% Styles + backslash@@/.style args={[#1]#2}{ + /tikz/line width = \feynhandlinesize, + /tikz/decoration={ + markings, + mark=at position #2 with { + \tikzfeynhandset{backslash/.cd,#1} + \draw [\tikzfeynhand@backslash@style] (-\tikzfeynhand@backslash@size, 2*\tikzfeynhand@backslash@size) -- (\tikzfeynhand@backslash@size, -2*\tikzfeynhand@backslash@size); + }, + }, /tikz/postaction={ - /tikzfeynhand/with reversed arrow=0.5, + /tikz/decorate=true, }, }, - every anti charged ghost/.style={/tikzfeynhand/every anti charged ghost@@/.append style={#1}}, - anti charged ghost/.style={ - /tikzfeynhand/ghost, - /tikzfeynhand/every anti charged scalar@@, - }, - -+ line 447, 459, 473, 486, 497, 520: - each inserted /tikz/line width = \feynhandlinesize, -+ line 501: replaced segment length=1.5mm - by amplitude=3\feynhandlinesize, - segment length=8\feynhandlinesize -+ line 510: inserted: - % short versions of style names - pho/.style={ - /tikzfeynhand/photon, - }, - bos/.style={ - /tikzfeynhand/boson, - }, - antbos/.style={ - /tikzfeynhand/anti charged boson, - }, - chabos/.style={ - /tikzfeynhand/charged boson, - }, - sca/.style={ - /tikzfeynhand/scalar, - }, - chasca/.style={ - /tikzfeynhand/charged scalar, - }, - antsca/.style={ - /tikzfeynhand/anti charged scalar, - }, - fer/.style={ - /tikzfeynhand/fermion, - }, - antfer/.style={ - /tikzfeynhand/anti fermion, - }, - gho/.style={ - /tikzfeynhand/ghost, - }, - chagho/.style={ - /tikzfeynhand/charged ghost, - }, - antgho/.style={ - /tikzfeynhand/anti charged ghost, - }, - glu/.style={ - /tikzfeynhand/gluon, - }, - maj/.style={ - /tikzfeynhand/majorana, - }, - antmaj/.style={ - /tikzfeynhand/anti majorana, - }, - -+ line 515: replaced insertion/size=3pt, - by insertion/size=5\feynhandlinesize, -+ line 541: replaced momentum/arrow distance=3mm, - by momentum/arrow distance={\the\feynhandarrowsize}, -+ line 548: inserted - momentum/arrow thickness/.store in=\tikzfeynhand@momentum@arrow@thickness, - momentum/arrow thickness={0.64*\the\feynhandlinesize}, - momentum/arrow size/.store in=\tikzfeynhand@momentum@arrow@size, - momentum/arrow size={0.8*\the\feynhandarrowsize}, -+ lines 559, 573, 592, 613, 627, 646, 667, 681, 700, 721, 736, 756: - each replaced \draw [-Stealth, \tikzfeynman@momentum@arrow@style] - by \draw [-{Stealth[length=\tikzfeynhand@momentum@arrow@size]}, - line width=\tikzfeynhand@momentum@arrow@thickness, - \tikzfeynhand@momentum@arrow@style] -+ lines 772+776: each removed /tikz/looseness=1.5, -+ lines 786-814: removed %% Graceful ... - + backslash@@/.default={[]0.5}, diff --git a/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf b/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf index 93389973c0d..29351270113 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf and b/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex b/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex index ba00d93810f..25de1e773e6 100644 --- a/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex +++ b/Master/texmf-dist/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex @@ -2,7 +2,7 @@ % % TikZ-FeynHand % Feynman Diagrams with TikZ (LaTex manual version) -% Copyright (C) 2018 Max Dohse +% Copyright (C) 2019 Max Dohse % % available at https://ctan.org/pkg/tikz-feynhand % @@ -116,7 +116,7 @@ % \hrule \vspace{3mm} -{\centering\Large\bfseries Quick Reference\\} +{\centering\Large\bfseries Quick Reference\vspace{-2mm}\\} % \noindent \textbf{Environment}\\ @@ -158,13 +158,13 @@ analogue: \blucol\verb!\feynhandblobsize, \feynhandlinesize, \feynhandarrowsize, \feynhandtopsep!\txcol\\ \blucol\verb!\renewcommand{\feynhandtopsepcolor}{COLOR}!\txcol\\ \blucol\verb!\tikzfeynhandset{every STYLE={/tikz/color=COLOR},}!\txcol\\ -\vspace{1mm} +\vspace{0mm} % % ===================================================================== \hrule \vspace{2mm} -{\centering Version 1.0.0 - +{\centering Version 1.1.0 - available at\qquad \texttt{https://ctan.org/pkg/tikz-feynhand}\\} \vspace{1mm} @@ -172,6 +172,7 @@ analogue: \hrule % ===== TABEL OF CONTENTS =========================================== % +\vspace{-2mm} \tableofcontents % % ===================================================================== @@ -1334,7 +1335,7 @@ as in the following example. \end{minipage} % % -------------------------------------------------------------------------------- -\newpage\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter} +\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter} \label{sec:_feynmandiagrams_keysinoutetc} % \noindent @@ -1441,7 +1442,7 @@ with respect to the line's direction. % % -------------------------------------------------------------------------------- \vspace{-6mm} -\subsubsection{Propagator labels and momentum arrows} +\newpage\subsubsection{Propagator labels and momentum arrows} \label{sec:_feynmandiagrams_proplabelsmomentum} % \noindent @@ -1562,10 +1563,57 @@ at which the insertion marks are drawn. \end{feynhand} \end{tikzpicture} \end{minipage} +% +% ------------------------------------------------------------------------------------------------------- +\vspace{-3mm} +\subsubsection{Slashes and backslashes} +\label{sec:_feynmandiagrams_propagators_slashes} +% +\noindent +Back/slashes work like insertions: +\\ +% +\begin{minipage}{0.83\linewidth} +\vercol\begin{verbatim} + \vertex [dot] (a1) at (0,0) {}; \vertex [dot] (a2) at (2,0) {}; + \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2); +\end{verbatim}\txcol +\end{minipage} +% +\begin{minipage}{0.16\linewidth} +\tikzsetnextfilename{propag_slash_1} +%\tikzset{external/force remake} +\begin{tikzpicture} + \begin{feynhand} + \vertex [dot] (a1) at (0,0) {}; + \vertex [dot] (a2) at (2,0) {}; + \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2); + \end{feynhand} +\end{tikzpicture} +\end{minipage} +\\ +\begin{minipage}{0.83\linewidth} +\vercol\begin{verbatim} + \vertex [ringdot] (a1) at (0,0) {}; \vertex [ringdot] (a2) at (2,0) {}; + \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2); +\end{verbatim}\txcol +\end{minipage} +% +\begin{minipage}{0.16\linewidth} +\tikzsetnextfilename{propag_slash_2} +%\tikzset{external/force remake} +\begin{tikzpicture} + \begin{feynhand} + \vertex [ringdot] (a1) at (0,0) {}; + \vertex [ringdot] (a2) at (2,0) {}; + \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2); + \end{feynhand} +\end{tikzpicture} +\end{minipage} % % ------------------------------------------------------------------------------------------------------- -\subsubsection{Crossing propagators (one on top of the other)} +\newpage\subsubsection{Crossing propagators (one on top of the other)} \label{sec:_feynmandiagrams_propagators_top} % \noindent @@ -1584,7 +1632,7 @@ respectively \blucol\verb$with reversed arrow=VALUE$\txcol for antiparticles. \blucol\verb$VALUE$\txcol must be a number between 0 and 1, and indicates the fraction of propagator length at which TikZ inserts the arrow. The default value of \blucol\verb$VALUE$\txcol is 0.5. -\vspace{2mm}\\ +\vspace{-1mm}\\ % \begin{minipage}{0.8\linewidth} \blucol\begin{verbatim} @@ -1607,6 +1655,7 @@ The default value of \blucol\verb$VALUE$\txcol is 0.5. \end{feynhand} \end{tikzpicture} \end{minipage} +\vspace{-5mm} \\ % \begin{minipage}{0.8\linewidth} @@ -1629,6 +1678,7 @@ The default value of \blucol\verb$VALUE$\txcol is 0.5. \end{feynhand} \end{tikzpicture} \end{minipage} +\vspace{-3mm} % % % ===================================================================== @@ -1749,7 +1799,8 @@ Same diagram (same TikZ/FeynHand code) drawn after setting: \setlength{\feynhandarrowsize}{6pt} \setlength{\feynhandtopsep}{18\feynhandlinesize} \renewcommand{\feynhandtopsepcolor}{white} -% +\vspace{-4mm} +\\ The color of a vertex/propagator style can be set for all subsequent diagrams in the current local Tex group (e.g. document or equation, figure, minipage environment) by the command \vercol\verb$\tikzfeynhandset$\txcol with the key \vercol\verb$every$\txcol: @@ -1764,6 +1815,7 @@ by the command \vercol\verb$\tikzfeynhandset$\txcol with the key \vercol\verb$ev % ===================================================================== % ===== APPENDICES ============================================ % +%\newpage \appendix % \section{TikZ Basics} @@ -2049,7 +2101,7 @@ This should look somewhat like Figure~\ref{Fig:_shell_escape}. % \begin{figure} \centering - \includegraphics[width=0.75\linewidth]{shell_escape.jpg} + \includegraphics[width=0.7\linewidth]{shell_escape.jpg} \caption{TexWorks screenshot.} \label{Fig:_shell_escape} \end{figure} -- cgit v1.2.3