axohelp 1.3

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

utils/axodraw2/ChangeLog

@@ -1,3 +1,8 @@
+2019-09-07  Akira Kakuto  <kakuto@w32tex.org>
+
+	Import v1.3 from ctan.org/pkg/axodraw2.
+	* configure.ac: update version.
+
 2018-02-21  Karl Berry  <karl@tug.org>
 
 	Import v1.1 from ctan.org/pkg/axodraw2.

utils/axodraw2/TLpatches/TL-Changes

@@ -1,5 +1,4 @@
 Changes applied to the axodraw tree as obtained from
 	https://ctan.org/pkg/axodraw2
 
-Remove:
-	axohelp.exe
+No changes.

utils/axodraw2/axodraw2-src/ChangeLog

@@ -30,3 +30,8 @@
 	axodraw2 package [v. 2.1.1 2018/02/20]
 	axodraw2.sty [v. 2.1.1 2018/02/15]
 	axohelp [v. 1.2 2018/02/20]
+2019/07/30
+	axohelp: Exit code on error is 1, not -1 (unsigned is more OS-independent)
+	axohelp: Clean up CleanupOutput subroutine
+	axohelp: Fix bug in use of identification line
+	axohelp: Fix stack overflow bugs in subroutine DoOneObject

utils/axodraw2/axodraw2-src/README

@@ -1,8 +1,8 @@
-Axodraw2 2.1.1 2018/02/15
-=========================
+Axodraw2 2.1.1b 2019/09/02
+==========================
 
 axodraw2.sty version is v2.1.1 2018/02/15
-axohelp.c version is 1.2 2018/02/14
+axohelp.c version is 1.3 2019/08/30
 
 Axodraw2 is a package that defines macros for drawing Feynman graphs
 in LaTeX documents.
@@ -30,7 +30,6 @@ The files in the distribution are:
      axodraw2-man.tex  Source for documentation
      example.tex       Example latex file for use of axodraw2
      axohelp.c         Source code of axohelp
-     axohelp.exe       MS-Windows executable for axohelp
      axohelp.1         Man page for axohelp       
      axohelp.test      Script for testing axohelp
      test.ax1          Input file for test
@@ -49,7 +48,7 @@ The files in the distribution are:
 Authors, copyright, license
 ---------------------------
 
-(C) 1994-2018 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
+(C) 1994-2019 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
 (t68 at nikhef dot nl) 
 
 Axodraw2 is free software: you can redistribute it and/or modify it

utils/axodraw2/axodraw2-src/axodraw2-man.tex

@@ -76,7 +76,7 @@
 Science Park 105, 1098 XG Amsterdam, The Netherlands} \\
 \texttt{t68 at nikhef dot nl} \\
 \vspace{1.0cm}
-(15 February 2018)
+(2 September 2019)
 \end{center}
 \vspace{5mm}
 
@@ -397,22 +397,18 @@ \subsection{Installation from standard \TeX{} distribution}
 At the moment that this document was updated (January 2018), axodraw2
 was part of both the main \TeX{} distributions, TeXLive and MiKTeX.
 The easiest way to install axodraw2 is therefore from the package
-manager of your \TeX{} distribution.  (There is one complication
-concerning the \program{axohelp} program --- see below.)
+manager of your \TeX{} distribution.
 
 You can also obtain axodraw2 from CTAN at
 \url{http://ctan.org/pkg/axodraw2}, and install it manually, following
 the instructions in Sec.\ \ref{sec:manual.install} below.
 
 \paragraph{\program{axohelp} in TeXLive}
-In TeXLive 2017, a binary executable for the \program{axohelp} was not
-provided, even though the rest of the axodraw2 package was provided.
-Thus you could use axodraw2 with the \program{latex} but not with
-\program{pdflatex} unless you compiled and installed the program
-\program{axohelp} yourself following the instructions below.  This is
-planned to be changed in TeXLive 2018, when \program{axohelp} should
-be provided as part of the distribution when the package axodraw2 is
-installed from the package manager.
+In TeXLive 2018 and later, a binary executable for the
+\program{axohelp} is provided, as part of the \program{axodraw2}
+package.  So \program{axohelp} is available provided that the
+\program{axodraw2} package is installed..
+
 
 \paragraph{\program{axohelp} in MiKTeX}
 The axodraw2 package including an executable \program{axohelp.exe} was
@@ -454,44 +450,49 @@ \subsubsection{Style file \texorpdfstring{\protect\file{axodraw2.sty}}{axodraw2.
 supplemented by running the relevant commands with the \program{sudo}
 program.
 
-But note that if you later install the axodraw2 package from the
-package manager of you \TeX{} distribution, it's a good idea to delete
-the files you installed manually.  Otherwise when you use axodraw2 in
-a document, then the wrong version of \file{axodraw2.sty} may get
-used.  This is a particularly important issue after possible future
-updates to axodraw2 get installed by the package manager.
+If you later install the axodraw2 package from the package manager of
+your \TeX{} distribution, it's a good idea to delete the files you
+installed manually.  Otherwise when you use axodraw2 in a document,
+then the wrong version of \file{axodraw2.sty} may get used.  This is a
+particularly important issue after possible future updates to axodraw2
+get installed by the package manager.
 
 %--
 \subsubsection{Helper program \program{axohelp}}
 \label{sec:axohelp}
 
-If you wish to use axodraw2 with \program{pdflatex}, \program{lualatex},
-or \program{xelatex}., then you need to install the \program{axohelp}
-program.
-
-On a Unix-like system (e.g., linux or OS-X), you first need to compile
-the program by a C compiler.  An appropriate shell command to do this
-is
+If you wish to use axodraw2 with \program{pdflatex},
+\program{lualatex}, or \program{xelatex}, then you need to install the
+\program{axohelp} program.  \emph{(It is useful to reiterate here that
+  the standard distributions of \TeX{} currently supply the
+  \program{axohelp} program.  So the steps described here are only
+  necessary if for some reason you wish to do a manual installation.
+  One possible reason is to use a recent update of \program{axohelp},
+  since TeXLive normally only supplies updated versions of binary
+  executable files with the initial release of one of TeXLive's yearly
+  versions.)}
+
+To install \program{axohelp} manually, you will first need to compile
+the program by a C compiler.  Under a Unix-like operating system
+(linux or macOS) an appropriate shell command is
 \begin{verbatim}
    cc -o axohelp -O3 axohelp.c -lm
 \end{verbatim}
 (Note that this is a C compiler, \emph{not} a C++ compiler.)  Most linux
 systems have the program \program{cc} already installed.  This also applies to
-OS-X at versions below 10.7.  But on OS-X version 10.7 and higher, you
+macOS(OS-X) at versions below 10.7.  But on macOS version 10.7 and higher, you
 will need to install a compiler, which can be done by installing XCode
 and the associated command-line utilities.  If you have the GNU
 compilers installed, you might need to use the command \program{gcc}
 instead of \program{cc}.
 
-For Microsoft Windows, if you do not have a C compiler available, you
-can use the Windows binary \file{axohelp.exe} we have provided.  It
-was compiled on Windows 10, and should work with at least that version
-of Windows.
+For Microsoft Windows, you will need to have installed a C compiler,
+and use it to compile \file{axohelp.c}.
 
-In any case once you have the executable (named \program{axohelp} on
-unix-like systems, or \program{axohelp.exe} on a Microsoft system), put
-it in a directory where it will be found when you run programs from
-the command line.
+Once you have the executable (named \program{axohelp} on Unix-like
+systems, or \program{axohelp.exe} on a Microsoft system), put it in a
+directory where it will be found when you run programs from the
+command line.
 
 
 %--

utils/axodraw2/axodraw2-src/axodraw2.sty

@@ -69,7 +69,7 @@
 %
 %		#] About folds : 
 %
-\ProvidesPackage{axodraw2}[2018/02/15 v2.1.1]
+\ProvidesPackage{axodraw2}[2018/10/10 v2.1.2]
 %
 %   axodraw.sty file, both for .tex -> .dvi -> .ps and for .tex -> .pdf
 %
@@ -3127,7 +3127,12 @@
         % Left on stack: dr = length of line
         3 index 3 index translate
         2 index sub exch 3 index sub
-        2 copy atan rotate
+%        2 copy atan rotate
+        2 copy
+        2 copy 0 ne exch 0 ne or
+        {atan rotate}
+        {pop pop}
+        ifelse
         dup mul exch dup mul add sqrt
         3 1 roll pop pop
     } def

utils/axodraw2/axodraw2-src/axohelp-big.test

@@ -3,6 +3,7 @@
 # Copyright (C) 2018 John Collins (jcc8 at psu dot edu)
 # You may freely use, modify and/or distribute this file.
 
+# Prevent errors from sed if it encounters non-UTF-8 strings in utf-8 locale
 LC_ALL=C; export LC_ALL;  LANGUAGE=C; export LANGUAGE
 
 # Notes about interpretation of tests: