axodraw2 (20feb18)

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

6 files changed, 85 insertions, 43 deletions

diff --git a/Master/texmf-dist/doc/latex/axodraw2/ChangeLog b/Master/texmf-dist/doc/latex/axodraw2/ChangeLog
index 1ee4ef9582b..b5367825b91 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/ChangeLog
+++ b/Master/texmf-dist/doc/latex/axodraw2/ChangeLog
@@ -2,7 +2,6 @@
 	Release on CTAN:
 	axodraw2 [v. 2.1.0b 2016/06/02]
 	axohelp [v. 1.0 2016/05/23]
-
 2018/01/20
 	axohelp has standard options (-h, --help, -v, --version)
 	Change verbose option to -V instead of -v
@@ -15,3 +14,19 @@
 	manual.
 2018/02/04
 	Minor corrections in manual.
+2018/02/04
+	Update package version number and date.  Version numbers:
+	axodraw2 package [v. 2.1.0b 2018/02/05]
+	axodraw2.sty [v. 2.1.0b 2016/06/02]
+	axohelp [v. 1.1 2018/01/23]
+2018/02/20
+	Correct LinAxis in axohelp to have LH thick tickmark when offset=1
+	Correct LinAxis and LogAxis to deal better with out-of-range
+	arguments, and to be immune to rounding errors previously causing
+	tickmarks at ends of axis being sometimes not drawn.
+	Correct and simplify axohelp.test to work for TeXLive build.
+	Update documentation.
+	This version for release on CTAN.
+	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]
diff --git a/Master/texmf-dist/doc/latex/axodraw2/INSTALL b/Master/texmf-dist/doc/latex/axodraw2/INSTALL
index 2778aad9acc..1c16f0d039a 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/INSTALL
+++ b/Master/texmf-dist/doc/latex/axodraw2/INSTALL
@@ -1,4 +1,4 @@
-MANUAL INSTALLATION of axohelp v. 1.1 and axodraw2
+MANUAL INSTALLATION of axohelp v. 1.2 and axodraw2
 ==================================================
 
 
@@ -50,8 +50,14 @@ B. Using autoconf etc:
       autoreconf --install
      ./configure
      make
-     make check
 
-     The last line runs a test to ensure axohelp is running
-     correctly.
+  Note that there are a couple of test scripts: axohelp.test, which
+  gives a rudimentary test, and axohelp-big.test, which gives a
+  comprehensive test on all axodraw2 objects used in the
+  manual. **Warnings**: a. You could get a spurious failure of a test
+  because of a mismatch between the line-endings of the test file and
+  the file generated by axohelp (UNIX \n v. MS-Windows \r\n).  b. You
+  could also get spurious test failure because of differences in the
+  effects of rounding error with your compiled axohelp and the one
+  used on the test system.
 
diff --git a/Master/texmf-dist/doc/latex/axodraw2/NEWS b/Master/texmf-dist/doc/latex/axodraw2/NEWS
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/doc/latex/axodraw2/NEWS
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/axodraw2/README b/Master/texmf-dist/doc/latex/axodraw2/README
index e8fd3cf6a84..e55be0cb760 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/README
+++ b/Master/texmf-dist/doc/latex/axodraw2/README
@@ -1,30 +1,49 @@
+Axodraw2 2.1.1 2018/02/15
+=========================
+
+axodraw2.sty version is v2.1.1 2018/02/15
+axohelp.c version is 1.2 2018/02/14
+
 Axodraw2 is a package that defines macros for drawing Feynman graphs
 in LaTeX documents.
 
-It is an important update of the axodraw package, but since it is not
-completely backwards compatible, we have given the style file a
+It is an important development from the axodraw package, but since it
+is not completely backwards compatible, we have given the style file a
 changed name.
 
-Many new features have been added, with new types of line, and much
-more flexibility in their properties: For details see the
-documentation.
+Compared with axodraw, many new features have been added, with new
+types of line, and much more flexibility in their properties: For
+details see the documentation.
 
 In addition, it is now possible to use axodraw2 with pdflatex, as well
-as with the latex-dvips method. However with pdflatex (and also lualatex
-and xelatex), an external program, axohelp, is used to perform the
-geometrical calculations needed for the pdf code inserted in the
-output file.  The processing involves a run of pdflatex, a run of
-axohelp, and then another run of pdflatex.
+as with the latex-dvips method. However with pdflatex (and also
+lualatex and xelatex), an external helper program, axohelp, is used to
+perform the geometrical calculations needed for the pdf code inserted
+in the output file.  The processing involves a run of pdflatex, a run
+of axohelp, and then another run of pdflatex.
 
 The files in the distribution are:
 
-     README           This file
-     axodraw2.sty     The main style file
-     axohelp.c        Source code of axohelp
-     axohelp.exe      MS-Windows executable for axohelp
-     axodraw2-man.pdf Documentation
-     axodraw2-man.tex Source for documentation
-     example.tex      Example latex file for use of axodraw2
+     README            This file
+     axodraw2.sty      The main style file
+     axodraw2-man.pdf  Documentation
+     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
+     test.ax2-std      Comparison output file for test
+     axohelp-big.test  Script for comprehensive test of axohelp
+     test-big.ax1      Input file for comprehensive test
+     test-big.ax2-std  Comparison output file for comprehensive test
+     configure.ac      For use with autoconf and automake
+     Makefile.am       For use with autoconf and automake
+     AUTHORS
+     COPYING
+     ChangeLog
+     INSTALL
 
 
 Authors, copyright, license
@@ -38,4 +57,3 @@ under the terms of the GNU General Public License as published by the
 Free Software Foundation, either version 3 of the License, or (at your
 option) any later version.  See the files axodraw2.sty or axohelp.c
 for more details.
-
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
index 4415408d491..43c451eb7ec 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
+++ b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
index 346ac8cd97c..37c38ad97d8 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
+++ b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
@@ -76,7 +76,7 @@ University Park, Pennsylvania 16802, USA} \\
 Science Park 105, 1098 XG Amsterdam, The Netherlands} \\
 \texttt{t68 at nikhef dot nl} \\
 \vspace{1.0cm}
-(31 January 2018)
+(15 February 2018)
 \end{center}
 \vspace{5mm}
 
@@ -434,7 +434,7 @@ it in an appropriate directory.  Documentation can also be installed
 if you want.
 
 %--
-\subsubsection{Style file \protect\file{axodraw2.sty}}
+\subsubsection{Style file \texorpdfstring{\protect\file{axodraw2.sty}}{axodraw2.sty}}
 
 If you merely want to try out axodraw2, just put the file
 \file{axodraw2.sty} in the same directory as the \file{.tex}
@@ -1988,7 +1988,7 @@ dash segments.
 %--#] DashDoubleZigZagArc :
 %--#[ Vertex :
 
-\subsubsection{Vertices,  circles, ovals}
+\subsubsection{Vertices, circles, ovals; other graphics}
 \label{sec:other.graphics}
 
 The commands in this section are for graphical elements other
@@ -2552,8 +2552,8 @@ the name of the color of the interior.
 \label{linaxis}
 \verb:\LinAxis(10,30)(90,30)(4,5,5,0,1):\\
 \verb:\LinAxis(10,10)(100,10)(4,5,5,2,1): \\
-\verb+\LinAxis+($x_1$,$y_1$)($x_2$,$y_2$)($N_D$,$d$,hashsize,offset,width)
-    draws a line to be used as an axis in a graph. Along the axis 
+\verb+\LinAxis+($x_1$,$y_1$)($x_2$,$y_2$)($N_D$,$d$,hashsize,offset,width) \hfill \\
+    This draws a line to be used as an axis in a graph. Along the axis 
     are hash marks. Going from the first coordinate to the second, the 
     hash marks are on the left side if `hashsize', which is the size of the 
     hash marks, is positive and on the right side if it is negative. 
@@ -2563,12 +2563,14 @@ the name of the color of the interior.
     corresponds. When it is zero, this coordinate corresponds to a fat 
     mark of a decade. Because axes have their own width, this is 
     indicated with the last parameter.
-%Draws a line with subdivisions that can be used as the axis on a histogram 
-%or other figure. The first four arguments are the endpoints of the axis. 
-%Then we have the number of decades, the number of divisions inside each 
-%decade, the size of the hash marks, the offset in divisions at which we 
-%start and the linewidth. The hashmarks will be on the left side when going 
-%from point 1 to point 2.
+
+    When arguments are outside the natural range, which is a positive
+    integer for the number of subdivisions $d$, and a real value
+    between 0 and $N_D$ for the offset, corrected values are used as
+    follows: For $d$, it is first rounded to the nearest integer, and
+    if it is zero or less, $d$ is replaced by 1. The offset is used
+    modulo the number of subdivisions. 
+
 \end{minipage}\vspace{4mm}
 
 %--#] LinAxis :
@@ -2586,24 +2588,25 @@ the name of the color of the interior.
 \label{logaxis}
 \verb:\LogAxis(0,30)(100,30)(4,3,0,1): \hfill \\
 \verb:\LogAxis(0,10)(100,10)(4,3,3,1): \hfill \\
-\verb+\LogAxis+($x_1$,$y_1$)($x_2$,$y_2$)($N_L$,hashsize
-    ,offset,width) \hfill \\
+\verb+\LogAxis+($x_1$,$y_1$)($x_2$,$y_2$)($N_L$,hashsize,offset,width) \hfill \\
     This draws a line to be used as a logarithmic axis in a graph. Along 
     the axis are hash marks. Going from the first coordinate to the second, 
     the hash marks are on the left side if `hashsize', which is the size of 
     the hash marks, is positive and on the right side if it is negative. 
     $N_L$ is the number of orders of magnitude, indicated by fat hash 
-    marks. The offset parameter tells to which integer subdivision the 
+    marks. The offset parameter tells to which subdivision the 
     first coordinate corresponds. When it is zero, this coordinate 
     corresponds to a fat mark, which is identical to when the value would 
     have been 1. Because axes have their own width, this is indicated with 
     the last parameter.
-%Draws a line with subdivisions that can be used as the axis on a histogram 
-%or other figure. The first four arguments are the endpoints of the axis. 
-%Then we have the number of orders of magnitude, 
-%the size of the hash marks, the offset inside a logarithm at which we 
-%start and the linewidth. The hashmarks will be on the left side when going 
-%from point 1 to point 2.
+
+    When the offset is outside its natural range, which is a real
+    value between 1 and 10, a corrected value is used as
+    follows: If the offset is zero or less, it is replaced by 1.  Then
+    it is multiplied by an integer power of 10 to bring it into the
+    range 1 to 10 (or equivalently, the offset's logarithm to base 10
+    is used modulo 1).
+
 \end{minipage}\vspace{4mm}
 
 %--#] LogAxis :