huawei (14jun21)

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

7 files changed, 79 insertions, 51 deletions

diff --git a/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt b/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt
index 77c644d06fb..a4e9941327f 100644
--- a/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt
+++ b/Master/texmf-dist/doc/latex/huawei/DEPENDS.txt
@@ -4,12 +4,13 @@ hard inputenc
 hard CJKutf8
 hard tabularx
 hard multicol
+hard ragged2e
+hard multicol
 hard datetime
 hard libertine
 hard paralist
 hard makecell
 hard footmisc
-hard minted
 hard graphicx
 hard array
 hard currfile
@@ -25,8 +26,5 @@ 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/README.md b/Master/texmf-dist/doc/latex/huawei/README.md
index c3a9ad9132c..ad892563315 100644
--- a/Master/texmf-dist/doc/latex/huawei/README.md
+++ b/Master/texmf-dist/doc/latex/huawei/README.md
@@ -1,4 +1,5 @@
 [![make](https://github.com/yegor256/huawei.cls/actions/workflows/make.yml/badge.svg)](https://github.com/yegor256/huawei.cls/actions/workflows/make.yml)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/huawei.cls/blob/master/LICENSE.txt)
 
 Disclaimer: This is **NOT** a product of Huawei Technologies Co., Ltd.
 This package is created in order to help some people working
diff --git a/Master/texmf-dist/doc/latex/huawei/huawei.pdf b/Master/texmf-dist/doc/latex/huawei/huawei.pdf
index ab53e4be7c3..654619f9b83 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 3422c6ce403..46aad229020 100644
--- a/Master/texmf-dist/doc/latex/huawei/huawei.tex
+++ b/Master/texmf-dist/doc/latex/huawei/huawei.tex
@@ -21,15 +21,17 @@
 % SOFTWARE.
 
 \documentclass[nobrand,nosecurity]{./huawei}
+\usepackage{ffcode}
+\usepackage{href-ul}
 \renewcommand*\thetitle{\LaTeX{} Class \ff{huawei}}
 \renewcommand*\thesubtitle{User's Guide}
 \renewcommand*\theauthor{\nospell{Yegor Bugayenko}}
 \begin{document}
 \maketitle
 
-\ff{Version: 0.5.1}
+\ff{Version: 0.6.0}
 \newline
-\ff{Date: 2021/05/26}
+\ff{Date: 2021/06/14}
 
 \section{Overview}
 
@@ -87,7 +89,7 @@ In order to compile the document, just say \ff{make} on the command line.
 \section{Layout Options}
 
 There are a few class options, provided in square brackets after the
-\ff{\textbackslash{}documentclass}, which can help you fine-tune
+\ff{\char`\\documentclass}, which can help you fine-tune
 the layout of your document:
 
 \ff{landscape}
@@ -98,7 +100,7 @@ the layout of your document:
 
 \ff{nocover}
   avoid printing the cover images on the first page by the
-  \ff{\textbackslash{}PrintTitlePage} command.
+  \ff{\char`\\PrintTitlePage} command.
 
 \ff{anonymous}
   removes the name of the author everywhere, including the bottom
@@ -137,25 +139,25 @@ Hello, world!
 \end{document}
 \end{minted}
 
-It's recommended to use \ff{\textbackslash{}renewcommand*} instead of
-\ff{\textbackslash{}renewcommand} in order to let \LaTeX{} catch you
+It's recommended to use \ff{\char`\\renewcommand*} instead of
+\ff{\char`\\renewcommand} in order to let \LaTeX{} catch you
 if by mistake a new line gets into the content.
 
 The following meta commands are defined:
 
-\ff{\textbackslash{}thetitle} is the main title of the document
+\ff{\char`\\thetitle} is the main title of the document
   to be used in the text and in the properties of the PDF document.
 
-\ff{\textbackslash{}thesubtitle} is the subtitle to be
+\ff{\char`\\thesubtitle} is the subtitle to be
   printed under the title.
 
-\ff{\textbackslash{}theauthor} is the author of the document
+\ff{\char`\\theauthor} is the author of the document
   in ``first-name last-name'' format.
 
-\ff{\textbackslash{}theid} is the internal ID of the author, if
+\ff{\char`\\theid} is the internal ID of the author, if
   it's applicable.
 
-\ff{\textbackslash{}thesecurity} is the level of security of
+\ff{\char`\\thesecurity} is the level of security of
   the document, which is usually printed at the top right
   corner of it; usual values are ``Internal,''
   ''Confidential,'' or ``Secret.''
@@ -168,28 +170,28 @@ renew them in your document, nothing will be printed.
 There is a number of supplementary commands for better text formatting,
 which we introduced:
 
-\ff{\textbackslash{}ff\{text\}}
+\ff{\char`\\ff\{text\}}
   makes the text fixed-font with a nice border around.
 
-\ff{\textbackslash{}tbd\{text\}}
+\ff{\char`\\tbd\{text\}}
   highlights the text, which is expected to be improved later
   (tbd stands for ``To Be Determined''), like \tbd{this one}.
 
 Inside the document body you can use these commands:
 
-\ff{\textbackslash{}PrintFirstPage\{front-image\}}
+\ff{\char`\\PrintFirstPage\{front-image\}}
   prints the first page of a project charter or a similar landscape documents,
   placing the image \ff{front-image.pdf} on the front (the file should be present
   in the current dir. If you don't have the front image file, just leave
   the first argument empty.
 
-\ff{\textbackslash{}PrintLastPage\{\}}
+\ff{\char`\\PrintLastPage\{\}}
   prints the last page of a project charter or a similar landscape document.
 
-\ff{\textbackslash{}PrintThankYouPage\{\}}
+\ff{\char`\\PrintThankYouPage\{\}}
   prints the last page with a "Thank You" message in the center.
 
-\ff{\textbackslash{}PrintDisclaimer\{\}}
+\ff{\char`\\PrintDisclaimer\{\}}
   prints a paragraph at the bottom of the page with a standard disclaimer.
 
 \section{Best Practices}
diff --git a/Master/texmf-dist/doc/latex/huawei/samples/huawei-cfp.tex b/Master/texmf-dist/doc/latex/huawei/samples/huawei-cfp.tex
index 76681372548..432a3ae27f5 100644
--- a/Master/texmf-dist/doc/latex/huawei/samples/huawei-cfp.tex
+++ b/Master/texmf-dist/doc/latex/huawei/samples/huawei-cfp.tex
@@ -21,9 +21,10 @@
 % SOFTWARE.
 
 \documentclass[nobrand,nosecurity,anonymous,nopaging]{../huawei}
+\usepackage{ffcode}
 \renewcommand*\thetitle{Test Call for Proposal}
 \renewcommand*\theauthor{Yegor Bugayenko}
-\addbibresource{main.bib}
+\addbibresource{huawei-main.bib}
 \begin{document}
 
 \maketitle
@@ -41,10 +42,10 @@ The rest of the document...
 By the way, we use \TeX{} created by~\citet{knuth1984texbook}
 and \LaTeX{} created by~\citet{lamport1994latex}. The citations
 provided at the bottom of the document are printed via
-\ff{\textbackslash{}PrintBibliography}.
+\ff{\char`\\PrintBibliography}.
 
 The text in small font at the bottom of the page is printed by
-the \ff{\textbackslash{}PrintDisclaimer} command.
+the \ff{\char`\\PrintDisclaimer} command.
 
 \PrintDisclaimer
 
diff --git a/Master/texmf-dist/doc/latex/huawei/samples/huawei-main.bib b/Master/texmf-dist/doc/latex/huawei/samples/huawei-main.bib
new file mode 100644
index 00000000000..d4e68d8ac8d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/huawei/samples/huawei-main.bib
@@ -0,0 +1,36 @@
+% (The MIT License)
+%
+% Copyright (c) 2021 Yegor Bugayenko
+%
+% Permission is hereby granted, free of charge, to any person obtaining a copy
+% of this software and associated documentation files (the 'Software'), to deal
+% in the Software without restriction, including without limitation the rights
+% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+% copies of the Software, and to permit persons to whom the Software is
+% furnished to do so, subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all
+% copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+% SOFTWARE.
+
+@book{lamport1994latex,
+  title={\LaTeX{}: a Document Preparation System: User's Guide and Reference Manual},
+  author={Lamport, Leslie},
+  year={1994},
+  publisher={Addison-Wesley}
+}
+
+@book{knuth1984texbook,
+  title={The \TeX{}book},
+  author={Knuth, Donald Ervin and Bibby, Duane},
+  volume={15},
+  year={1984},
+  publisher={Addison-Wesley}
+}
\ 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 ab4e2531511..c2b5ce7b48d 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/26 0.5.1 Template for Huawei documents]
+\ProvidesClass{huawei}[2021/06/14 0.6.0 Template for Huawei documents]
 
 \newif\ifnosecurity
 \DeclareOption{nosecurity}{\nosecuritytrue}
@@ -52,6 +52,8 @@
 \RequirePackage{CJKutf8}
 \RequirePackage{tabularx}
 \RequirePackage{multicol}
+\RequirePackage{ragged2e}
+\RequirePackage{multicol}
 \RequirePackage[mmddyyyy,iso]{datetime}
   \newtimeformat{daytime}{\twodigit{\THEHOUR}:\twodigit{\THEMINUTE}}
 \RequirePackage[tt=false,type1=true]{libertine}
@@ -60,11 +62,6 @@
 \RequirePackage[para]{footmisc}
   \setlength{\footnotemargin}{2pt}
   \setlength{\footnotesep}{2pt}
-\RequirePackage[draft=true]{minted}
-  \setminted{breaklines}
-  \usemintedstyle{bw}
-  \renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}}
-  \setminted{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape,samepage}
 \RequirePackage{graphicx}
 \RequirePackage{array}
 \RequirePackage[abspath]{currfile}
@@ -89,16 +86,6 @@
 \RequirePackage{tabularx}
 \RequirePackage{titling}
 \RequirePackage{svg}
-\RequirePackage[normalem]{ulem}
-\RequirePackage[hidelinks]{hyperref}
-  \makeatletter\begingroup
-    \catcode`\$=6 %
-    \catcode`\#=12 %
-    \gdef\href@split$1#$2#$3\\$4{%
-      \hyper@@link{$1}{$2}{\uline{$4}}%
-      \endgroup
-    }%
-  \endgroup\makeatother
 \RequirePackage[absolute]{textpos}
   \TPGrid{16}{16}
 
@@ -117,17 +104,13 @@
 \newcommand\headers[1]{\setrelativestretch{0.8}{\small\sffamily\color{gray}#1}}
 \newcommand\tbd[1]{{\color{red}#1}}
 \newcommand\crumb[2]{\begin{minipage}{\columnwidth}\raggedright\textsc{#1}:\\#2\end{minipage}\vspace{4pt}}
-\RequirePackage{tcolorbox}
-  \newtcbox{\codebox}{nobeforeafter,colframe=gray!80!white,colback=gray!5!white,boxrule=0.1pt,arc=1pt,
-  boxsep=1.2pt,left=0.5pt,right=0.5pt,top=0.2pt,bottom=0.2pt,tcbox raise base}
-\newcommand{\ff}[1]{\codebox{\vrule height 6pt depth 1pt width 0pt\texttt{#1}}}
 
 \AtBeginDocument{%
   \raggedbottom%
-  \setlength{\topskip}{0mm}%
-  \setlength{\parindent}{0pt}%
-  \setlength{\parskip}{6pt}%
-  \setlength{\columnsep}{32pt}%
+  \setlength\topskip{0mm}%
+  \setlength\parindent{0pt}%
+  \setlength\parskip{6pt}%
+  \setlength\columnsep{32pt}%
   \def\arraystretch{1.5}%
 }
 
@@ -225,7 +208,9 @@
   \fi
   \\[18pt]
   \ifanonymous\else%
-    \thecompany\newline
+    \ifx\thecompany\empty\else%
+      \thecompany\newline
+    \fi
   \fi
   \ifx\theauthor\empty\else%
     {\scshape\theauthor}%
@@ -248,7 +233,7 @@
 }
 
 \newcommand\PrintDisclaimer{%
-  \vspace*{\fill}\setrelativestretch{0.55}{{\sffamily\scriptsize\color{gray!50!black}%
+  \justify\vspace*{\fill}\setrelativestretch{0.55}{{\sffamily\scriptsize\color{gray!50!black}%
   \textbf{Disclaimer}: The opinions expressed in this document are in good faith and
   while every care has been taken in preparing it,
   \ifnobrand%
@@ -315,7 +300,12 @@
   could cause actual results and developments to differ materially
   from those expressed or implied in the predictive statements.
   Therefore, such information is provided for reference purpose
-  only and constitutes neither an offer nor an acceptance. \thecompany{}
+  only and constitutes neither an offer nor an acceptance.
+  \ifnobrand%
+    The author%
+  \else%
+    \thecompany{}%
+  \fi
   may change the information at any time without notice.
   \end{minipage}
   \end{center}%