ctan-o-mat (25nov17)

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

5 files changed, 29 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/man/man1/ctan-o-mat.1 b/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
index 30dff2d7c45..5ba43d39483 100644
--- a/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
+++ b/Master/texmf-dist/doc/man/man1/ctan-o-mat.1
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CTAN-O-MAT 1"
-.TH CTAN-O-MAT 1 "2017-11-16" "ctan-o-mat" "Gerd Neugebauer"
+.TH CTAN-O-MAT 1 "2017-11-23" "ctan-o-mat" "Gerd Neugebauer"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -187,6 +187,12 @@ Print this short summary about the usage and exit the program.
 .IX Item "--init"
 .PD
 Create an empty template for a configuration.
+.IP "\-\-list licenses" 4
+.IX Item "--list licenses"
+List the known licenses of \s-1CTAN\s0 to the standard output stream.
+Each license is represented as one line. The line contains the fields
+key, name, free indicator. Those fields are separated by tab characters.
+Afterwards the program terminates without processing any further arguments.
 .IP "\-\-config <package configuration>" 4
 .IX Item "--config <package configuration>"
 .PD 0
diff --git a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
index 6efe50fd344..a73c5f13c86 100644
--- a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
diff --git a/Master/texmf-dist/doc/support/ctan-o-mat/README.md b/Master/texmf-dist/doc/support/ctan-o-mat/README.md
index 08b44507d4d..40addfee8b7 100644
--- a/Master/texmf-dist/doc/support/ctan-o-mat/README.md
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/README.md
@@ -55,6 +55,15 @@ configuration via the command line parameter `--init`.
     Create an empty template for a configuration.
   </dd>
   
+  <dt><code>--list licenses</code></dt>
+  <dd>
+    List the known licenses of CTAN to the standard output stream.
+    Each license is represented as one line. The line contains the
+    fields key, name, free indicator. Those fields are separated by
+    tab characters. Afterwards the program terminates without processing
+    any further arguments.
+  </dd>
+  
   <dt><code>--submit</code></dt>
   <dd>
     Upload the submission, validate it and officially submit it to
diff --git a/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg
index 83d70a22c21..92cf156d654 100644
--- a/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg
@@ -20,7 +20,7 @@
 % This field contains the version of the package.
 % The value is optional.
 % The value is restricted to 32 characters.
-\version{1.1}
+\version{1.2}
 % -------------------------------------------------------------------------
 % This field contains the name of the author(s).
 % The value is optional.
@@ -102,9 +102,11 @@ The description of the package is contained in a configuration file.
 
 Changes:
 
-- Handling of directories with spaces improved.
-- Error messages improved.
-- Wrong version on CTAN fixed
+- Command line parameter `--list licenses' added to retrieve the
+  known keys for licenses.
+- Verbose message for validation improved.
+- --init creates macro for \file instead of an environment.
+- Now environments and macros are close to be identical.
 \end{announcement}
 % -------------------------------------------------------------------------
 % This field contains the one-liner for the package.
@@ -138,8 +140,6 @@ from the server.
 % The value is optional.
 % The value is restricted to 2048 characters.
 \begin{note}
-Sorry, the wrong zip has made it to CTAN.
-This gives me the chance to publish a few minor problems too.
 \end{note}
 % -------------------------------------------------------------------------
 % This field contains the archive file.
diff --git a/Master/texmf-dist/doc/support/ctan-o-mat/makefile b/Master/texmf-dist/doc/support/ctan-o-mat/makefile
index eebb703f99c..3c88c7fe55d 100644
--- a/Master/texmf-dist/doc/support/ctan-o-mat/makefile
+++ b/Master/texmf-dist/doc/support/ctan-o-mat/makefile
@@ -30,7 +30,7 @@ LATEX   = xelatex
 
 #------------------------------------------------------------------------------
 
-all:
+all: validate
 
 clean distclean:
 	$(RM) -f *~ *.out *.log *.aux ctan-o-mat.ltx
@@ -41,6 +41,12 @@ pdf doc ctan-o-mat.pdf: README.md makefile lib/md2ltx.pl
 	@$(LATEX) -interaction=batchmode ctan-o-mat.latex
 	@$(RM) ctan-o-mat.out ctan-o-mat.aux ctan-o-mat.log ctan-o-mat.latex
 
+val validate: ctan-o-mat.pdf ctan-o-mat.zip
+	@./ctan-o-mat
+
+submit upload: ctan-o-mat.pdf ctan-o-mat.zip
+	@./ctan-o-mat -submit
+
 dist ctan-o-mat.zip: $(FILES)
 	$(RM) ctan-o-mat.zip
 	(cd ..; zip ctan-o-mat/ctan-o-mat.zip $(addprefix ctan-o-mat/,$(FILES)))