[latex3-commits] [git/LaTeX3-latex3-l3build] ctan-post: reordering (22f9b6c)

Will Robertson wspr81 at gmail.com
Wed Dec 12 13:27:15 CET 2018


Repository : https://github.com/latex3/l3build
On branch  : ctan-post
Link       : https://github.com/latex3/l3build/commit/22f9b6c4d548c2fb12e90d45594cfc42b5e30882

>---------------------------------------------------------------

commit 22f9b6c4d548c2fb12e90d45594cfc42b5e30882
Author: Will Robertson <wspr81 at gmail.com>
Date:   Wed Dec 12 22:57:15 2018 +1030

    reordering


>---------------------------------------------------------------

22f9b6c4d548c2fb12e90d45594cfc42b5e30882
 l3build-upload.lua |   20 ++++++++++----------
 l3build.dtx        |   31 +++++++++++++++----------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/l3build-upload.lua b/l3build-upload.lua
index c526998..6a9cf5e 100644
--- a/l3build-upload.lua
+++ b/l3build-upload.lua
@@ -69,24 +69,24 @@ function upload()
 
   ctan_post = curlexe .. " "
 
-  --         field                                   max  desc                               mandatory  multi
-  --         -------------------------------------------------------------------------------------------------
+  --         field                                   max  desc                                 mandatory  multi
+  --         ----------------------------------------------------------------------------------------------------
   ctan_field("announcement", uploaddata.announcement, 8192, "Announcement",                        false, false )
   ctan_field("author",       uploaddata.author,        128, "Author name",                         true,  false )
-  ctan_field("bugtracker",   uploaddata.bugtracker,    255, "URL of bug tracker",                  false, false )
-  ctan_field("ctanPath",     uploaddata.ctanPath,      255, "CTAN path",                           false, false )
+  ctan_field("bugtracker",   uploaddata.bugtracker,    255, "URL(s) of bug tracker",               false, true  )
+  ctan_field("ctanPath",     uploaddata.ctanPath,      255, "CTAN path",                           true,  false )
   ctan_field("description",  uploaddata.description,  4096, "Short description of package",        false, false )
-  ctan_field("development",  uploaddata.development,   255, "URL of development channels",         false, true  )
+  ctan_field("development",  uploaddata.development,   255, "URL(s) of development channels",      false, true  )
   ctan_field("email",        uploaddata.email,         255, "Email of uploader",                   true,  false )
-  ctan_field("home",         uploaddata.home,          255, "URL of home page",                    false, false )
+  ctan_field("home",         uploaddata.home,          255, "URL(s) of home page",                 false, true  )
   ctan_field("license",      uploaddata.license,      2048, "Package license(s)",                  true,  true  )
   ctan_field("note",         uploaddata.note,         4096, "Internal note to ctan",               false, false )
   ctan_field("pkg",          uploaddata.pkg,            32, "Package name",                        true,  false )
-  ctan_field("repository",   uploaddata.repository,    255, "URL of source repositories",          false, true  )
+  ctan_field("repository",   uploaddata.repository,    255, "URL(s) of source repositories",       false, true  )
   ctan_field("summary",      uploaddata.summary,       128, "One-line summary of package",         true,  false )
-  ctan_field("support",      uploaddata.support,       255, "URL of support channels",             false, true  )
-  ctan_field("topic",        uploaddata.topic,        1024, "Topic(s); see https://ctan.org/topics/highscore", false, true  )
-  ctan_field("update",       uploaddata.update,          8, "True for an update, false for a new package", false, false )
+  ctan_field("support",      uploaddata.support,       255, "URL(s) of support channels",          false, true  )
+  ctan_field("topic",        uploaddata.topic,        1024, "Topic(s)",                            false, true  )
+  ctan_field("update",       uploaddata.update,          8, "Boolean: true=update, false=new pkg", false, false )
   ctan_field("uploader",     uploaddata.uploader,      255, "Name of uploader",                    true,  false )
   ctan_field("version",      uploaddata.version,        32, "Package version",                     true,  false )
 
diff --git a/l3build.dtx b/l3build.dtx
index d9f174f..c031326 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -119,7 +119,7 @@
 \luavarset{biberexe}     {"biber"}    {Biber executable}
 \luavarset{bibtexexe}    {"bibtex8"}  {\BibTeX{} executable}
 \luavarset{makeindexexe} {"makeindex"}{MakeIndex executable}
-\luavarset{curlexe} {"curl"}{Curl executable}
+\luavarset{curlexe} {"curl"}{Curl executable for \texttt{upload}}
 \luavarseparator
 \luavarset{checkopts}  {"-interaction=nonstopmode"}{Options based to engine when running checks}
 \luavarset{typesetopts}{"-interaction=nonstopmode"}{Options based to engine when typesetting}
@@ -563,30 +563,29 @@
 %   \caption{Fields used in the \texttt{uploaddata} setup table. The first section of fields are \emph{required} and if they are omitted the user will be interactively prompted for further input. Most commands take string input, but those that are indicated with `Multi' accept more than one entry using an array of strings.}
 %   \label{tab:upload-setup}
 %   \begin{minipage}{\linewidth}
-%   \centering
-%   \begin{tabular}{lccp{8cm}}
+%   \begin{tabular}{@{}lccp{8cm}@{}}
 %     \toprule
 %     Field & Req. & Multi & Description \\
 %     \midrule
+%  \texttt{author      } & \YES &      & Author name (semicolon-separated for multiple) \\
+%  \texttt{ctanPath    } & \YES &      & CTAN path                              \\
+%  \texttt{email       } & \YES &      & Email address of uploader              \\
+%  \texttt{license     } & \YES & \YES & Package license(s)\footnote{See \url{https://ctan.org/license}} \\
 %  \texttt{pkg         } & \YES &      & Package name                           \\
-%  \texttt{version     } & \YES &      & Package version                        \\
-%  \texttt{author      } & \YES &      & Author name                            \\
-%  \texttt{email       } & \YES &      & Email of uploader                      \\
+%  \texttt{summary     } & \YES &      & One-line summary                       \\
 %  \texttt{uploader    } & \YES &      & Name of uploader                       \\
-%  \texttt{license     } & \YES & \YES & Package license(s)\footnote{See \url{https://ctan.org/license}} \\
-%  \texttt{summary     } & \YES &      & One-line summary of package            \\
+%  \texttt{version     } & \YES &      & Package version                        \\
 %  \midrule
-%  \texttt{description } &      &      & Short description of package           \\
-%  \texttt{topic       } &      & \YES & Topic(s)\footnote{See \url{https://ctan.org/topics/highscore}} \\
-%  \texttt{ctanPath    } &      &      & CTAN path                              \\
-%  \texttt{update      } &      &      & Boolean: True for an update, false for a new package   \\
 %  \texttt{announcement} &      &      & Announcement text                      \\
+%  \texttt{bugtracker  } &      & \YES & URL(s) of bug tracker                  \\
+%  \texttt{description } &      &      & Short description/abstract             \\
+%  \texttt{development } &      & \YES & URL(s) of development channels         \\
+%  \texttt{home        } &      & \YES & URL(s) of home page                       \\
 %  \texttt{note        } &      &      & Internal note to CTAN                  \\
-%  \texttt{home        } &      &      & URL of home page                       \\
-%  \texttt{bugtracker  } &      &      & URL of bug tracker                     \\
-%  \texttt{support     } &      & \YES & URL(s) of support channels             \\
 %  \texttt{repository  } &      & \YES & URL(s) of source repositories          \\
-%  \texttt{development } &      & \YES & URL(s) of development channels         \\
+%  \texttt{support     } &      & \YES & URL(s) of support channels             \\
+%  \texttt{topic       } &      & \YES & Topic(s)\footnote{See \url{https://ctan.org/topics/highscore}} \\
+%  \texttt{update      } &      &      & Boolean \texttt{true} for an update, \texttt{false} for a new package   \\
 %     \bottomrule
 %   \end{tabular}
 %   \end{minipage}





More information about the latex3-commits mailing list