axodraw2 (13sep18)

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

8 files changed, 10 insertions, 58 deletions

diff --git a/Master/texmf-dist/doc/latex/axodraw2/README b/Master/texmf-dist/doc/latex/axodraw2/README
index e55be0cb760..779471bc814 100644
--- a/Master/texmf-dist/doc/latex/axodraw2/README
+++ b/Master/texmf-dist/doc/latex/axodraw2/README
@@ -1,5 +1,5 @@
-Axodraw2 2.1.1 2018/02/15
-=========================
+Axodraw2 2.1.1a 2018/09/12
+==========================
 
 axodraw2.sty version is v2.1.1 2018/02/15
 axohelp.c version is 1.2 2018/02/14
diff --git a/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE b/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE
deleted file mode 100644
index 2de2ba3a721..00000000000
--- a/Master/texmf-dist/doc/latex/axodraw2/README.TEXLIVE
+++ /dev/null
@@ -1,7 +0,0 @@
-The following files have been removed in the TeX Live installation of
-the current package, typically due to duplication, lack of space, or
-missing source code.  You can find these files on CTAN at
-	http://mirror.ctan.org/graphics/axodraw2
-If questions or concerns, email tex-live@tug.org.
-
-	axohelp.exe
diff --git a/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf b/Master/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf
index 43c451eb7ec..88da7d59ca5 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/axohelp.1 b/Master/texmf-dist/doc/latex/axodraw2/axohelp.1
deleted file mode 100644
index 47f62fd5ff8..00000000000
--- a/Master/texmf-dist/doc/latex/axodraw2/axohelp.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.TH "axohelp" "1.1" "22 Jan 2018" ""
-.SH NAME
-axohelp - helper program for use of LaTeX package axodraw2 with
-pdflatex. 
-.SH SYNOPSIS
-.B axohelp [options] [filename]
-.SH DESCRIPTION
-Axohelp is a program used with the axodraw2, which is a LaTeX package
-for drawing Feynman graphs (and some other simple graphics) in LaTeX
-documents.
-
-When the axodraw2 package is used with pdflatex (or lualatex or
-xelatex) it creates a file with extension .ax1.  This contains
-specifications of the graphics elements.  Axohelp converts this to a
-file with extension ax2 that contains the necessary pdf code.
-The .ax2 file is read by pdflatex (etc) on its next run, and the
-contents of the .ax2 file are used in the final .pdf output file to
-draw the desired graphics.
-
-The files processed are specified as follows: When the filename on the
-command line is of the form file.ax1, then the input file is file.ax1
-and the output file is file.ax2. If the filename on the command line
-does not have extension .ax1, then this extension is appended.
-
-
-.SH OPTIONS
-Options can be introduced by single or double hyphen characters. The
-possible options are:
-
-.TP
-.B -h, --help
-Gives usage information
-
-.TP
-.B -v, --version
-Gives version information
-
-.TP
-.B -V
-NOT CURRENTLY IMPLEMENTED: Give information on each function used.
-
-.SH AUTHOR
-Current version, by John Collins (username jcc8 at node psu.edu) and
-Jos Vermaseren (username t68 at nikhef dot nl).
-
-The released version can be obtained from CTAN:
-<http://www.ctan.org/pkg/axodraw2/>, and an author's website
-<https://www.nikhef.nl/~form/maindir/others/axodraw2/axodraw2.html>.
diff --git a/Master/texmf-dist/doc/man/man1/axohelp.man1.pdf b/Master/texmf-dist/doc/man/man1/axohelp.man1.pdf
index 52dc5931fe4..f6093bda1e8 100644
--- a/Master/texmf-dist/doc/man/man1/axohelp.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/axohelp.man1.pdf
diff --git a/Master/texmf-dist/source/latex/axodraw2/axohelp-big.test b/Master/texmf-dist/source/latex/axodraw2/axohelp-big.test
index e0995335d37..e44438022de 100755
--- a/Master/texmf-dist/source/latex/axodraw2/axohelp-big.test
+++ b/Master/texmf-dist/source/latex/axodraw2/axohelp-big.test
@@ -3,6 +3,9 @@
 # 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:
 # The test file was generated in the compilation of axodraw2's manual,
 # and this test script therefore verifies much functionality of
diff --git a/Master/texmf-dist/source/latex/axodraw2/axohelp.test b/Master/texmf-dist/source/latex/axodraw2/axohelp.test
index f5f1b9beb1b..c54130f355b 100755
--- a/Master/texmf-dist/source/latex/axodraw2/axohelp.test
+++ b/Master/texmf-dist/source/latex/axodraw2/axohelp.test
@@ -6,6 +6,9 @@
 # This test is a rudimentary test of axohelp in a form suitable for
 # use in TeXLive builds.
 
+# 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
+
 if test -z "$test_srcdir"; then
   # If not set, then we are not running from `make check'.
   test_srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`  # == dirname $0
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2e55bcd18df..52e129a61ee 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3029,6 +3029,7 @@ $standardttf = '\.ttf|\.TTC';
 # packages which have man pages to install.
 %specialmans = (
  'a2ping'               => '\.1$',
+ 'axodraw2'		=> '\.1$',
  'bundledoc'            => '\.1$',
  'crossrefware'		=> '\.1$',
  'ctan-o-mat'           => '\.1$',
@@ -3075,6 +3076,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'accfonts'     => $standardclean . '|dvips.enc',       # dup enc
  'acmconf'      => $standardclean . '|flushend.sty',    # dup with sttools
  'apalike'      => "apalike2.bst",                      # does not belong
+ 'axodraw2'     => 'axohelp.exe',			# done with binaries
  'bardiag'      => "example/.*(aux|log)",               # junk on CTAN
  'bibleref'	=> $standardclean . '|sample.tex|sample-.*', # derived uploaded
  'bbm-macros'   => $standardclean . '|^bbm$',           # symlink
@@ -3116,7 +3118,6 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'alkalami'	 => 'Alkalami-.*pdf',			# InDesign source
  'ametsoc'	 => '.*\.pdf',                          # no source
  'ascii-font'    => '.*\.pdf',                          # no source
- 'axodraw2'	 => 'axohelp.exe',			# wait tl18
  'bbcard'        => 'bbcard.tpm',                       # old TL infra
  'chessboard'    => 'chessboard.pdf',                   # no source
  'chessfss'      => 'chessfonts_gallery.pdf|chessfss.pdf', # no source