huawei (26may21)

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

6 files changed, 116 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt b/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt
new file mode 100644
index 00000000000..77c644d06fb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt
@@ -0,0 +1,32 @@
+hard geometry
+hard fontenc
+hard inputenc
+hard CJKutf8
+hard tabularx
+hard multicol
+hard datetime
+hard libertine
+hard paralist
+hard makecell
+hard footmisc
+hard minted
+hard graphicx
+hard array
+hard currfile
+hard enumitem
+hard microtype
+hard wrapfig
+hard lastpage
+hard xfp
+hard setspace
+hard biblatex
+hard xcolor
+hard tikz
+hard tabularx
+hard titling
+hard svg
+hard ulem
+hard hyperref
+hard textpos
+hard tcolorbox
+hard fancyhdr
diff --git a/Master/texmf-dist/doc/latex/huawei/huawei.pdf b/Master/texmf-dist/doc/latex/huawei/huawei.pdf
index a5a50cb96c1..ab53e4be7c3 100644
--- a/Master/texmf-dist/doc/latex/huawei/huawei.pdf
+++ b/Master/texmf-dist/doc/latex/huawei/huawei.pdf
diff --git a/Master/texmf-dist/doc/latex/huawei/huawei.tex b/Master/texmf-dist/doc/latex/huawei/huawei.tex
index dc9904a0d4a..3422c6ce403 100644
--- a/Master/texmf-dist/doc/latex/huawei/huawei.tex
+++ b/Master/texmf-dist/doc/latex/huawei/huawei.tex
@@ -27,9 +27,9 @@
 \begin{document}
 \maketitle
 
-\ff{Version: 0.3.0}
+\ff{Version: 0.5.1}
 \newline
-\ff{Date: 2021/05/24}
+\ff{Date: 2021/05/26}
 
 \section{Overview}
 
@@ -248,4 +248,25 @@ we recommend you to use ``crumbs'':
 
 A more complete example is in the \ff{samples/huawei-charter.tex}.
 
+\subsection{Code Blocks}
+
+When you need to show some source code, we recommend to use
+\ff{minted} environment, for example:
+
+\begin{minted}{text}
+\begin{minted}{text}
+void foo() {
+  return "Hello, world!";
+}
+\ end{minted}
+\end{minted}
+
+This is what you will see:
+
+\begin{minted}{text}
+void foo() {
+  return "Hello, world!";
+}
+\end{minted}
+
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/huawei/huawei.cls b/Master/texmf-dist/tex/latex/huawei/huawei.cls
index ef8f26da251..ab4e2531511 100644
--- a/Master/texmf-dist/tex/latex/huawei/huawei.cls
+++ b/Master/texmf-dist/tex/latex/huawei/huawei.cls
@@ -21,7 +21,7 @@
 % SOFTWARE.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{huawei}[2021/05/24 0.3.0 Template for Huawei documents]
+\ProvidesClass{huawei}[2021/05/26 0.5.1 Template for Huawei documents]
 
 \newif\ifnosecurity
 \DeclareOption{nosecurity}{\nosecuritytrue}
@@ -52,14 +52,15 @@
 \RequirePackage{CJKutf8}
 \RequirePackage{tabularx}
 \RequirePackage{multicol}
-\RequirePackage[mmddyyyy,iso,hhmmss]{datetime}
+\RequirePackage[mmddyyyy,iso]{datetime}
+  \newtimeformat{daytime}{\twodigit{\THEHOUR}:\twodigit{\THEMINUTE}}
 \RequirePackage[tt=false,type1=true]{libertine}
 \RequirePackage{paralist}
 \RequirePackage{makecell}
 \RequirePackage[para]{footmisc}
   \setlength{\footnotemargin}{2pt}
   \setlength{\footnotesep}{2pt}
-\RequirePackage{minted}
+\RequirePackage[draft=true]{minted}
   \setminted{breaklines}
   \usemintedstyle{bw}
   \renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}}
@@ -98,7 +99,8 @@
       \endgroup
     }%
   \endgroup\makeatother
-\RequirePackage[absolute]{textpos}\TPGrid{16}{16}
+\RequirePackage[absolute]{textpos}
+  \TPGrid{16}{16}
 
 % Our custom commands to redefine:
 \renewcommand\title[1]{\renewcommand\thetitle{#1}}
@@ -208,7 +210,7 @@
           \fi%
         \fi%
         \ifnodate\else%
-          \today{} \currenttime
+          \today{} \settimeformat{daytime}\currenttime{}%
         \fi%
       }%
     \end{textblock}%
@@ -271,6 +273,7 @@
   \def\param{#1}%
   \ifx\param\empty\else
     \includegraphics[height=2in]{#1}
+    \newline
   \fi
   \vspace*{0.5in}
   \maketitle
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 2f65d7b30ea..a848cbc66bf 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -38,29 +38,30 @@ sub tlpkgrevision {
   #	stdout: rev#	exit code: 0
   #	(no newline on stdout)
   #
-  #   tlpkginfo -revision <pkg> [ <tltree> ]
+  #   tlpkginfo -revision <pkg> [...]
   require TeXLive::TLPOBJ;
   require TeXLive::TLPDB;
-  die "need at least pkg name as argument!" if ($#ARGV < 1);
-  if ($#ARGV == 2) {
-    $root = $ARGV[2];
-  } else {
-    $root = "$mydir/../..";
-  }
+  shift @ARGV; # the --revision option
+  die "need at least one pkg name as argument" if (@ARGV < 1);
+  my $root = "$mydir/../..";
   my $tlpdb = TeXLive::TLPDB->new ("root" => $root);
   if (!defined($tlpdb)) {
     printf STDERR "$0: Cannot find tlpdb in TL root dir $root\n";
-    print "-1";
+    print "-1\n";
     exit(1);
   }
-  my $pkg = $tlpdb->get_package($ARGV[1]);
-  if (!defined($pkg)) {
-    printf STDERR "Cannot find package $ARGV[1] in TL tree of $root\n";
-    print "0";
-    exit(1);
+  my $bad = 0;
+  for my $pkgname (@ARGV) {
+    my $pkg = $tlpdb->get_package($pkgname);
+    if (!defined($pkg)) {
+      warn "$0: cannot find package in TL tree $root: $pkgname\n";
+      $bad = 1;
+    } else {
+      print "$pkgname " if (@ARGV > 1); # if more than one arg, print name
+      print $pkg->revision, "\n";
+    }
   }
-  print $pkg->revision;
-  exit(0);
+  exit $bad;
 }
 
 
diff --git a/Master/tlpkg/tlpsrc/huawei.tlpsrc b/Master/tlpkg/tlpsrc/huawei.tlpsrc
index e69de29bb2d..b712aade5c9 100644
--- a/Master/tlpkg/tlpsrc/huawei.tlpsrc
+++ b/Master/tlpkg/tlpsrc/huawei.tlpsrc
@@ -0,0 +1,37 @@
+depend geometry
+#latex fontenc
+#latex inputenc
+depend cjk
+#CJKutf8
+depend tools
+#tabularx
+#multicol
+depend datetime
+depend libertine
+depend paralist
+depend makecell
+depend footmisc
+depend minted
+depend graphics
+#graphicx
+#array
+depend currfile
+depend enumitem
+depend microtype
+depend wrapfig
+depend lastpage
+depend l3packages
+#xfp
+depend setspace
+depend biblatex
+depend xcolor
+depend pgf
+#tikz
+#tabularx
+depend titling
+depend svg
+depend ulem
+depend hyperref
+depend textpos
+depend tcolorbox
+depend fancyhdr