summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-14 03:03:34 +0000
committerNorbert Preining <norbert@preining.info>2021-09-14 03:03:34 +0000
commit1666f2f182d9f9fb45ef8aa275b477d3264ef1cb (patch)
tree1f0104d5a5a8d31e9bc6671f2c1e72ed27a36ad7 /macros
parente403b5892f209477e44b123a10b5b35cc425d8e9 (diff)
CTAN sync 202109140303
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/clicks/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/clicks/README.md14
-rw-r--r--macros/latex/contrib/clicks/clicks.pdfbin255137 -> 255551 bytes
-rw-r--r--macros/latex/contrib/clicks/clicks.sty9
-rw-r--r--macros/latex/contrib/clicks/clicks.tex2
-rw-r--r--macros/latex/contrib/crumbs/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/crumbs/crumbs.pdfbin345356 -> 345354 bytes
-rw-r--r--macros/latex/contrib/crumbs/crumbs.sty68
-rw-r--r--macros/latex/contrib/crumbs/crumbs.tex2
-rw-r--r--macros/latex/contrib/ffcode/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/ffcode/ffcode.pdfbin118496 -> 186641 bytes
-rw-r--r--macros/latex/contrib/ffcode/ffcode.sty48
-rw-r--r--macros/latex/contrib/ffcode/ffcode.tex16
-rw-r--r--macros/latex/contrib/huawei/DEPENDS.txt1
-rw-r--r--macros/latex/contrib/huawei/huawei.cls182
-rw-r--r--macros/latex/contrib/huawei/huawei.pdfbin332594 -> 332659 bytes
-rw-r--r--macros/latex/contrib/huawei/huawei.tex4
-rw-r--r--macros/latex/contrib/huawei/samples/huawei-cfp.tex4
-rw-r--r--macros/latex/contrib/huawei/samples/huawei-charter.tex6
19 files changed, 193 insertions, 166 deletions
diff --git a/macros/latex/contrib/clicks/DEPENDS.txt b/macros/latex/contrib/clicks/DEPENDS.txt
index cb2dfa6fbf..406b4071a5 100644
--- a/macros/latex/contrib/clicks/DEPENDS.txt
+++ b/macros/latex/contrib/clicks/DEPENDS.txt
@@ -1 +1,2 @@
+hard xkeyval
hard etoolbox
diff --git a/macros/latex/contrib/clicks/README.md b/macros/latex/contrib/clicks/README.md
index 22817f6ebe..f0ba1fd2bc 100644
--- a/macros/latex/contrib/clicks/README.md
+++ b/macros/latex/contrib/clicks/README.md
@@ -1,8 +1,7 @@
[![make](https://github.com/yegor256/clicks/actions/workflows/latexmk.yml/badge.svg)](https://github.com/yegor256/clicks/actions/workflows/latexmk.yml)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/clicks/blob/master/LICENSE.txt)
-This LaTeX package adds nagivation clicks to your document, which
-may be very useful for presentation and slide decks.
+This LaTeX package simulates animiation in slide deck, similar to what PowerPoint can do.
First, [install it](https://en.wikibooks.org/wiki/LaTeX/Installing_Extra_Packages)
from [CTAN](https://ctan.org/pkg/clicks)
@@ -11,13 +10,12 @@ and then use in the preamble:
```tex
\documentclass{article}
\usepackage{clicks}
-\usepackage{fancyhdr}
-\fancyhead[L]{\clicks}
\begin{document}
-\section{Introduction}
-Some text here.
-\section{Related Works}
-Some other text here.
+\plick{Here is your wedding plan:}
+\plick{1. Buy a ring}
+\plick{2. Propose}
+\plush{3. Get married}
+And then live happily ever after.
\end{document}
```
diff --git a/macros/latex/contrib/clicks/clicks.pdf b/macros/latex/contrib/clicks/clicks.pdf
index b599ec50d2..531234bef1 100644
--- a/macros/latex/contrib/clicks/clicks.pdf
+++ b/macros/latex/contrib/clicks/clicks.pdf
Binary files differ
diff --git a/macros/latex/contrib/clicks/clicks.sty b/macros/latex/contrib/clicks/clicks.sty
index 9862e10a54..e5fac0ebbc 100644
--- a/macros/latex/contrib/clicks/clicks.sty
+++ b/macros/latex/contrib/clicks/clicks.sty
@@ -21,8 +21,9 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{clicks}[2021/09/12 0.1.0 Clicks]
+\ProvidesPackage{clicks}[2021/09/13 0.1.1 Clicks]
+\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\makeatletter\newif\ifclicks@static\makeatother
@@ -37,9 +38,9 @@
\newcounter{minutes}
% Print the content as is
-\newcommand\print[1]{%
- \makeatletter\gappto\clicks@body\makeatother{{#1\par}}%
-}
+\makeatletter\newcommand\print[1]{%
+ \gappto\clicks@body{{#1\par}}%
+}\makeatother
\makeatletter\newcommand\flush[1][1]{%
\clicks@flush%
diff --git a/macros/latex/contrib/clicks/clicks.tex b/macros/latex/contrib/clicks/clicks.tex
index 1be2b8077e..578a8e8bee 100644
--- a/macros/latex/contrib/clicks/clicks.tex
+++ b/macros/latex/contrib/clicks/clicks.tex
@@ -28,7 +28,7 @@
\title{\ff{clicks}: \LaTeX{} Package \\ for Slide Deck Animation}
\author{Yegor Bugayenko}
-\date{0.1.0 2021/09/12}
+\date{0.1.1 2021/09/13}
\begin{document}
\pagenumbering{gobble}
diff --git a/macros/latex/contrib/crumbs/DEPENDS.txt b/macros/latex/contrib/crumbs/DEPENDS.txt
index 79f2bb0b5f..78c5e550c1 100644
--- a/macros/latex/contrib/crumbs/DEPENDS.txt
+++ b/macros/latex/contrib/crumbs/DEPENDS.txt
@@ -1,2 +1,3 @@
+hard xkeyval
hard etoolbox
hard catchfile
diff --git a/macros/latex/contrib/crumbs/crumbs.pdf b/macros/latex/contrib/crumbs/crumbs.pdf
index 4d7bd0169f..9be4929f90 100644
--- a/macros/latex/contrib/crumbs/crumbs.pdf
+++ b/macros/latex/contrib/crumbs/crumbs.pdf
Binary files differ
diff --git a/macros/latex/contrib/crumbs/crumbs.sty b/macros/latex/contrib/crumbs/crumbs.sty
index 17194892c0..8440f80ba5 100644
--- a/macros/latex/contrib/crumbs/crumbs.sty
+++ b/macros/latex/contrib/crumbs/crumbs.sty
@@ -21,7 +21,10 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{crumbs}[2021/09/12 0.3.0 Navigation Crumbs]
+\ProvidesPackage{crumbs}[2021/09/13 0.3.1 Navigation Crumbs]
+
+\RequirePackage{xkeyval}
+\RequirePackage{etoolbox}
\makeatletter\newif\ifcrumbs@dry\makeatother
\makeatletter\DeclareOption{dry}{\crumbs@drytrue}\makeatother
@@ -29,8 +32,6 @@
\makeatletter\DeclareOption{increment}{\crumbs@incrementtrue}\makeatother
\ProcessOptions\relax
-\RequirePackage{etoolbox}
-
% see https://tex.stackexchange.com/a/12414/1449
\makeatletter\newcommand\crumbs@back{\@backslashchar}\makeatother
% \makeatletter\newcommand\crumbs@percent{\@percentchar}\makeatother
@@ -47,22 +48,22 @@
\endgroup
}
-\newcommand\subcrumbs{
- \ifnum\value{section}=0\else
- \expandafter\ifcsname crumbs\romannumeral\the\value{section}\endcsname
- \csname crumbs\romannumeral\the\value{section}\endcsname{}
- \fi
- \fi
+\newcommand\subcrumbs{%
+ \ifnum\value{section}=0\else%
+ \expandafter\ifcsname crumbs\romannumeral\the\value{section}\endcsname%
+ \csname crumbs\romannumeral\the\value{section}\endcsname{}%
+ \fi%
+ \fi%
}
\makeatletter\newcommand\crumbection[2][]{%
\def\temp{#1}%
\ifx\crumbs\empty%
- \appendtofile{\jobname.crumbs}{
- \crumbs@back ifx \crumbs@back crumbs \crumbs@back empty
- \crumbs@back gappto \crumbs@back crumbs{\crumbs@back setcounter{crumbi}{0}}
- \crumbs@back fi
- \crumbs@back gappto\crumbs@back crumbs{\crumbs@back stepcounter{crumbi}\crumbs@back crumb{\ifx\temp\empty #2\else #1\fi}{#2}}
+ \appendtofile{\jobname.crumbs}{%
+ \crumbs@back ifx\crumbs@back crumbs\crumbs@back empty%
+ \crumbs@back gappto\crumbs@back crumbs{\crumbs@back setcounter{crumbi}{0}}%
+ \crumbs@back fi%
+ \crumbs@back gappto\crumbs@back crumbs{\crumbs@back stepcounter{crumbi}\crumbs@back crumb{\ifx\temp\empty #2\else #1\fi}{#2}}%
}%
\fi%
\ifcrumbs@increment\stepcounter{section}\fi%
@@ -71,24 +72,23 @@
\makeatletter\newcommand\subcrumbection[2][]{%
\def\temp{#1}%
\ifx\crumbs\empty%
- \appendtofile{\jobname.crumbs}{
+ \appendtofile{\jobname.crumbs}{%
\crumbs@back ifcsname crumbs\romannumeral\the\value{section}\crumbs@back endcsname\crumbs@back else
\crumbs@back expandafter\crumbs@back newcommand\crumbs@back csname crumbs\romannumeral\the\value{section}\crumbs@back endcsname{%
- \crumbs@back setcounter{subcrumbi}{0}
- }
- \crumbs@back fi
+ \crumbs@back setcounter{subcrumbi}{0}%
+ }%
+ \crumbs@back fi%
\crumbs@back expandafter\crumbs@back gappto\crumbs@back csname crumbs\romannumeral\the\value{section}\crumbs@back endcsname{%
- \crumbs@back stepcounter{subcrumbi}
- \crumbs@back subcrumb{\ifx\temp\empty #2\else #1\fi}{#2}
- }
+ \crumbs@back stepcounter{subcrumbi}%
+ \crumbs@back subcrumb{\ifx\temp\empty #2\else #1\fi}{#2}}%
}%
\fi%
\ifcrumbs@increment\stepcounter{subsection}\fi%
}\makeatother
-\makeatletter\ifcrumbs@dry
- \message{Since "dry" mode is ON we don't renew "section" and "subsection" commands}
-\else
+\makeatletter\ifcrumbs@dry%
+ \message{Since "dry" mode is ON we don't renew "section" and "subsection" commands}%
+\else%
\NewCommandCopy\crumbs@oldsection\section
\renewcommand\section[2][]{%
\crumbection[#1]{#2}%
@@ -101,16 +101,16 @@
}
\fi\makeatletter
-\ifcsname crumb\endcsname
- \message{The command "crumb" is already defined}
-\else
- \newcommand\crumb[2]{#1}
-\fi
-\ifcsname subcrumb\endcsname
- \message{The command "subcrumb" is already defined}
-\else
- \newcommand\subcrumb[2]{#1}
-\fi
+\ifcsname crumb\endcsname%
+ \message{The command "crumb" is already defined}%
+\else%
+ \newcommand\crumb[2]{#1}%
+\fi%
+\ifcsname subcrumb\endcsname%
+ \message{The command "subcrumb" is already defined}%
+\else%
+ \newcommand\subcrumb[2]{#1}%
+\fi%
\newcommand*\crumbs{}
\newcounter{crumbi}
diff --git a/macros/latex/contrib/crumbs/crumbs.tex b/macros/latex/contrib/crumbs/crumbs.tex
index dbed6fc408..9ec5ca47e2 100644
--- a/macros/latex/contrib/crumbs/crumbs.tex
+++ b/macros/latex/contrib/crumbs/crumbs.tex
@@ -42,7 +42,7 @@
\title{\ff{crumbs}: \LaTeX{} Package \\ for Navigation Crumbs}
\author{Yegor Bugayenko}
-\date{0.3.0 2021/09/12}
+\date{0.3.1 2021/09/13}
\begin{document}
\pagenumbering{gobble}
diff --git a/macros/latex/contrib/ffcode/DEPENDS.txt b/macros/latex/contrib/ffcode/DEPENDS.txt
index b7535d747d..935840f850 100644
--- a/macros/latex/contrib/ffcode/DEPENDS.txt
+++ b/macros/latex/contrib/ffcode/DEPENDS.txt
@@ -1,4 +1,3 @@
-hard microtype
hard xkeyval
hard minted
hard tcolorbox
diff --git a/macros/latex/contrib/ffcode/ffcode.pdf b/macros/latex/contrib/ffcode/ffcode.pdf
index d10d38424d..3d6ec820a1 100644
--- a/macros/latex/contrib/ffcode/ffcode.pdf
+++ b/macros/latex/contrib/ffcode/ffcode.pdf
Binary files differ
diff --git a/macros/latex/contrib/ffcode/ffcode.sty b/macros/latex/contrib/ffcode/ffcode.sty
index f4c23b51bb..1c51720636 100644
--- a/macros/latex/contrib/ffcode/ffcode.sty
+++ b/macros/latex/contrib/ffcode/ffcode.sty
@@ -21,53 +21,55 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ffcode}[2021/09/07 0.3.0 Fixed Font Code]
+\ProvidesPackage{ffcode}[2021/09/13 0.3.2 Fixed Font Code]
-\RequirePackage{microtype}
\RequirePackage{xkeyval}
-\newif\ifnopygments
-\DeclareOptionX{nopygments}{\nopygmentstrue}
-\newif\ifnoframes
-\DeclareOptionX{noframes}{\noframestrue}
-\newif\ifnonumbers
-\DeclareOptionX{nonumbers}{\nonumberstrue}
-\newif\ifnocn
-\DeclareOptionX{nocn}{\nocntrue}
+
+\makeatletter
+\newif\ifffcode@nopygments
+\DeclareOptionX{nopygments}{\ffcode@nopygmentstrue}
+\newif\ifffcode@noframes
+\DeclareOptionX{noframes}{\ffcode@noframestrue}
+\newif\ifffcode@nonumbers
+\DeclareOptionX{nonumbers}{\ffcode@nonumberstrue}
+\newif\ifffcode@nocn
+\DeclareOptionX{nocn}{\ffcode@nocntrue}
\ProcessOptionsX\relax
+\makeatother
-\ifnopygments
+\makeatletter\ifffcode@nopygments
\RequirePackage[draft=true]{minted}
\else
\RequirePackage{minted}
-\fi
+\fi\makeatother
\setminted{breaklines}
\usemintedstyle{bw}
-\ifnonumbers
+\makeatletter\ifffcode@nonumbers
\newminted[ffcode]{text}{framesep=6pt,framerule=1pt,rulecolor=gray,frame=leftline,escapeinside=||,mathescape,highlightcolor=gray!30}
\else
\renewcommand{\theFancyVerbLine}{\textcolor{gray}{\tiny\oldstylenums{\ttfamily\arabic{FancyVerbLine}}}}
- \ifnocn
+ \ifffcode@nocn
\newminted[ffcode]{text}{linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
\else
\newminted[ffcode]{text}{firstnumber=last,linenos,numbersep=2pt,framesep=6pt,framerule=1pt,highlightcolor=gray!30,rulecolor=gray,frame=leftline,escapeinside=||,mathescape}
\fi
-\fi
+\fi\makeatother
\makeatletter
-\newcommand\ffprint{\begingroup\obeyspaces\@ffprint}
-\newcommand{\@ffprint}[1]{\texttt{#1}\endgroup}
+\newcommand\ffcode@print{\begingroup\obeyspaces\ffcode@printx}
+\newcommand\ffcode@printx[1]{\texttt{#1}\endgroup}
\makeatother
-\newcommand\ffcoderule{\vrule height 6pt depth 1pt width 0pt}
-\ifnoframes
- \newcommand{\ff}[1]{\ffcoderule\ffprint{#1}}
+\makeatletter\newcommand\ffcode@rule{\vrule height 6pt depth 1pt width 0pt}
+\makeatletter\ifffcode@noframes
+ \newcommand\ff[1]{\ffcode@rule\ffcode@print{#1}}
\else
\RequirePackage{tcolorbox}
- \newtcbox{\ffcodebox}{nobeforeafter,colframe=gray!80!white,
+ \newtcbox\ffcode@box{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]{\ffcodebox{\ffcoderule\ffprint{#1}}}
-\fi
+ \newcommand\ff[1]{\ffcode@box{\ffcode@rule\ffcode@print{#1}}}
+\fi\makeatother
\endinput
diff --git a/macros/latex/contrib/ffcode/ffcode.tex b/macros/latex/contrib/ffcode/ffcode.tex
index c1fbc40483..df15670be0 100644
--- a/macros/latex/contrib/ffcode/ffcode.tex
+++ b/macros/latex/contrib/ffcode/ffcode.tex
@@ -21,14 +21,16 @@
% SOFTWARE.
\documentclass[12pt]{article}
+\usepackage[T1]{fontenc}
\usepackage[tt=false,type1=true]{libertine}
\usepackage{amsmath}
\usepackage{multicol}
\usepackage{ffcode}
\usepackage{xcolor}
+\usepackage{microtype}
\title{\ff{ffcode}: \LaTeX{} Package \\ for Fixed-Font Code Blocks}
\author{Yegor Bugayenko}
-\date{0.3.0 2021/09/07}
+\date{0.3.2 2021/09/13}
\begin{document}
\pagenumbering{gobble}
\raggedbottom
@@ -48,6 +50,7 @@ and the \ff{ffcode} environment):
\raggedcolumns
\begin{verbatim}
\documentclass{article}
+\usepackage[T1]{fontenc}
\usepackage{ffcode}
\begin{document}
The function \ff{fibo()} is recursive:
@@ -84,6 +87,10 @@ in order to let \ff{minted} (the package we use) to run Pygments
and format the code. If you don't want this to happen,
just use the \ff{nopygments} option.
+A pair of vertical lines decorate a TeX command inside the snippet.
+If you want to print a single vertical line, use this:
+\ff{|\char`\\vert|}.
+
If you want to omit the light gray frames around \ff{\char`\\ff}
texts, use the package option \ff{noframes}.
@@ -126,6 +133,13 @@ while (true) {
\end{ffcode*}
\end{multicols}
+Using this second argument of the \ff{ffcode*} (with the trailing asterisk),
+you can provide any other options from the \ff{minted} package to the
+snippet.
+
+By the way, the package correctly formats low-height texts, for example, just
+a dot: \ff{.}
+
More details about this package you can find
in the \ff{yegor256/ffcode} GitHub repository.
diff --git a/macros/latex/contrib/huawei/DEPENDS.txt b/macros/latex/contrib/huawei/DEPENDS.txt
index bcf146a97f..0b4ee96ab5 100644
--- a/macros/latex/contrib/huawei/DEPENDS.txt
+++ b/macros/latex/contrib/huawei/DEPENDS.txt
@@ -28,3 +28,4 @@ hard titling
hard svg
hard textpos
hard fancyhdr
+hard changepage
diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls
index 480e84e2b4..0e63e27b3c 100644
--- a/macros/latex/contrib/huawei/huawei.cls
+++ b/macros/latex/contrib/huawei/huawei.cls
@@ -21,34 +21,36 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{huawei}[2021/09/09 0.11.0 Template for Huawei Documents]
-
-\newif\ifnosecurity
-\DeclareOption{nosecurity}{\nosecuritytrue}
-\newif\ifauthordraft
-\DeclareOption{authordraft}{\authordrafttrue}
-\newif\ifnobrand
-\DeclareOption{nobrand}{\nobrandtrue}
-\newif\ifnodate
-\DeclareOption{nodate}{\nodatetrue}
-\newif\ifnocover
-\DeclareOption{nocover}{\nocovertrue}
-\newif\ifnopaging
-\DeclareOption{nopaging}{\nopagingtrue}
-\newif\iflandscape
-\DeclareOption{landscape}{\landscapetrue}
-\newif\ifanonymous
-\DeclareOption{anonymous}{\anonymoustrue}
-\ProcessOptions\relax
+\ProvidesClass{huawei}[2021/09/13 0.12.0 Template for Huawei Documents]
\LoadClass[12pt]{article}
+\makeatletter
+\newif\ifhuawei@nosecurity
+\DeclareOption{nosecurity}{\huawei@nosecuritytrue}
+\newif\ifhuawei@authordraft
+\DeclareOption{authordraft}{\huawei@authordrafttrue}
+\newif\ifhuawei@nobrand
+\DeclareOption{nobrand}{\huawei@nobrandtrue}
+\newif\ifhuawei@nodate
+\DeclareOption{nodate}{\huawei@nodatetrue}
+\newif\ifhuawei@nocover
+\DeclareOption{nocover}{\huawei@nocovertrue}
+\newif\ifhuawei@nopaging
+\DeclareOption{nopaging}{\huawei@nopagingtrue}
+\newif\ifhuawei@landscape
+\DeclareOption{landscape}{\huawei@landscapetrue}
+\newif\ifhuawei@anonymous
+\DeclareOption{anonymous}{\huawei@anonymoustrue}
+\ProcessOptions\relax
+\makeatother
+
\RequirePackage{geometry}
-\iflandscape
+\makeatletter\ifhuawei@landscape
\geometry{paperwidth=16in, paperheight=9in, left=4in, right=2in, top=1.5in, bottom=1.5in}
\else
\geometry{a4paper, left=1.5in, right=1in, top=1.2in, bottom=1.2in}
-\fi
+\fi\makeatother
\RequirePackage[T1]{fontenc}
\RequirePackage[utf8]{inputenc}
\RequirePackage{CJKutf8}
@@ -90,40 +92,19 @@
\RequirePackage[absolute]{textpos}
\TPGrid{16}{16}
-% Our custom commands to redefine:
-\renewcommand\title[1]{\renewcommand\thetitle{#1}}
-\newcommand\thetitle{Untitled}
-\newcommand*\thecompany{Huawei Technologies Co., Ltd.}
-\newcommand\thesubtitle{}
-\renewcommand\author[1]{\renewcommand\theauthor{#1}}
-\newcommand\theauthor{Unknown}
-\newcommand*\thesecurity{Confidential}
-\newcommand*\theid{}
-
-\newcommand\nospell[1]{#1}
-
-\newcommand\HuaweiHeader[1]{{%
+\makeatletter\newcommand\huawei@header[1]{{%
\setstretch{0.8}%
- \fontsize{11pt}{11pt}\selectfont%
+ \fontsize{11pt}{13pt}\selectfont%
\sffamily\color{gray}#1\par%
-}}
+}}\makeatother
-\AtBeginDocument{%
- \raggedbottom%
- \setlength\topskip{0mm}%
- \setlength\parindent{0pt}%
- \setlength\parskip{6pt}%
- \setlength\columnsep{32pt}%
- \def\arraystretch{1.5}%
-}
-
-\newcommand\LeftHuaweiBar{%
+\makeatletter\newcommand\huawei@bar{%
\begin{textblock}{1}[0,0](0,0)%
\tikz \node[fill=red,minimum width=\TPHorizModule,minimum height=16\TPVertModule] {};%
\end{textblock}%
-}
+}\makeatother
-\newcommand\PrintHuaweiLogo{
+\makeatletter\newcommand\huawei@logo{
\begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-1, inner sep=0pt, outer sep=0pt]
\begin{scope}[even odd rule,line width=0.800pt]
\begin{scope}[shift={(0,-0.00024)}]
@@ -145,15 +126,15 @@
\end{scope}%
\end{scope}%
\end{tikzpicture}%
-}
+}\makeatother
\RequirePackage{fancyhdr}
\pagestyle{fancy}
\renewcommand{\headrulewidth}{0pt}
\fancyhf{}
- \fancyfoot[L]{
- \LeftHuaweiBar{}
- \ifauthordraft%
+ \makeatletter\fancyfoot[L]{
+ \huawei@bar
+ \ifhuawei@authordraft%
\begin{textblock}{14}[0.5,0.5](8,8)%
\tikz \node[minimum width=14\TPHorizModule] {%
\fontsize{64}{64}\selectfont\sffamily\scshape\color{gray!20}\rotatebox{30}{it is a draft}
@@ -161,55 +142,60 @@
\end{textblock}%
\else\fi%
\ifnum\value{page}=1\else%
- \ifnobrand\else%
+ \ifhuawei@nobrand\else%
\begin{textblock}{8}[0,0](1.2,0.2)%
- \PrintHuaweiLogo{}%
+ \huawei@logo%
\end{textblock}%
\fi%
\fi%
\begin{textblock}{8}[1,0](15.8,0.2)%
- \raggedleft\HuaweiHeader{%
- \ifnosecurity\else%
+ \raggedleft\huawei@header{%
+ \ifhuawei@nosecurity\else%
\thesecurity
\fi%
}%
\end{textblock}%
\begin{textblock}{8}[0,1](1.2,15.8)%
\ifnum\value{page}=1\else%
- \HuaweiHeader{%
- \ifanonymous\else%
+ \huawei@header{%
+ \ifhuawei@anonymous\else%
\theauthor%
- \ifnosecurity\else%
+ \ifhuawei@nosecurity\else%
\ifx\theid\empty\else,\theid\fi
\fi%
- \ifnobrand\else%
+ \ifhuawei@nobrand\else%
\newline
\fi%
\fi%
- \ifnobrand\else%
+ \ifhuawei@nobrand\else%
\thecompany{}
\fi%
}%
\fi%
\end{textblock}%
\begin{textblock}{8}[1,1](15.8,15.8)%
- \raggedleft\HuaweiHeader{%
+ \raggedleft\huawei@header{%
\ifnum\value{page}=1\else%
- \ifnopaging\else%
+ \ifhuawei@nopaging\else%
Page \#\thepage{} of \pageref*{LastPage}%
- \ifnodate\else%
+ \ifhuawei@nodate\else%
\\
\fi%
\fi%
\fi%
- \ifnodate\else%
+ \ifhuawei@nodate\else%
\today{} \settimeformat{daytime}\currenttime{}%
\fi%
}%
\end{textblock}%
- }
+ }\makeatother
+
+\RequirePackage{changepage}
+\renewenvironment{abstract}
+ {\begin{adjustwidth}{0pt}{1in}{\scshape Abstract:}\newline\small}
+ {\end{adjustwidth}}
-\renewcommand\maketitle{%
+\makeatletter\renewcommand\maketitle{%
\vspace*{18pt}
{\bfseries{\Huge\thetitle}}
\ifx\thesubtitle\empty\else%
@@ -217,23 +203,23 @@
{\color{gray!50!black}\large\thesubtitle}
\fi
\\[18pt]
- \ifnobrand\else%
- \ifanonymous\else%
+ \ifhuawei@nobrand\else%
+ \ifhuawei@anonymous\else%
\ifx\thecompany\empty\else%
\thecompany\newline
\fi
\fi
\fi
\ifx\theauthor\empty\else%
- {\scshape\ifanonymous
+ {\scshape\ifhuawei@anonymous
Anonymous Authors
\else%
\theauthor
\fi}%
\fi%
- \ifanonymous\else%
+ \ifhuawei@anonymous\else%
\ifx\theauthor\empty\else
- \ifnobrand\else%
+ \ifhuawei@nobrand\else%
\ifx\theid\empty\else
$\;$/ {\theid}
\fi
@@ -241,7 +227,7 @@
\fi
\fi
\vspace{2em}
-}
+}\makeatother
\newcommand\PrintCrumb[2]{%
\begin{minipage}{\columnwidth}%
@@ -259,14 +245,14 @@
\vspace*{\fill}
}
-\newcommand\PrintDisclaimer{%
+\makeatletter\newcommand\PrintDisclaimer{%
\justify\vspace*{\fill}%
\begingroup%
\setstretch{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%
+ \ifhuawei@nobrand%
the author%
\else%
\thecompany{}%
@@ -274,7 +260,7 @@
makes no representations and gives no warranties of whatever
nature in respect of these documents, including but not limited to the
accuracy or completeness of any information, facts and/or opinions contained therein.
- \ifnobrand%
+ \ifhuawei@nobrand%
The author%
\else%
\thecompany{}%
@@ -284,13 +270,13 @@
findings in these documents.
\par
\endgroup%
-}
+}\makeatother
-\newcommand\PrintFirstPage[1]{
- \iflandscape\else
+\makeatletter\newcommand\PrintFirstPage[1]{
+ \ifhuawei@landscape\else
\PackageError{huawei}{It's allowed to use PrintFirstPage only in landscape mode}{Read huawei.pdf for more information}
\fi
- \LeftHuaweiBar{}
+ \huawei@bar
\def\param{#1}%
\ifx\param\empty\else
\includegraphics[height=2in]{#1}
@@ -298,15 +284,15 @@
\fi
\vspace*{0.5in}
\maketitle
- \ifnocover\else
+ \ifhuawei@nocover\else
\begin{textblock}{14}[1,1](14,14)
\raggedleft\includegraphics[height=3.6in]{huawei-cover-picture.pdf}
\end{textblock}
\fi
-}
+}\makeatother
-\newcommand\PrintLastPage{
- \iflandscape\else
+\makeatletter\newcommand\PrintLastPage{
+ \ifhuawei@landscape\else
\PackageError{huawei}{It's allowed to use PrintLastPage only in landscape mode}{Read huawei.pdf for more information}
\fi
\newpage
@@ -341,7 +327,7 @@
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.
- \ifnobrand%
+ \ifhuawei@nobrand%
The author%
\else%
\thecompany{}%
@@ -349,18 +335,38 @@
may change the information at any time without notice.
\end{minipage}
\end{center}%
-}
+}\makeatother
-\newcommand\PrintBibliography{
+\makeatletter\newcommand\PrintBibliography{
\setlength\bibitemsep{3pt}
\AtNextBibliography{\small}
\newpage
\raggedright
- \iflandscape
+ \ifhuawei@landscape
\begin{multicols}{3}\setstretch{0.95}\printbibliography\end{multicols}
\else
\begin{multicols}{2}\setstretch{0.95}\printbibliography\end{multicols}
\fi
+}\makeatother
+
+\AtBeginDocument{%
+ \raggedbottom%
+ \setlength\topskip{0mm}%
+ \setlength\parindent{0pt}%
+ \setlength\parskip{6pt}%
+ \setlength\columnsep{32pt}%
+ \def\arraystretch{1.5}%
}
+\renewcommand\title[1]{\renewcommand\thetitle{#1}}
+\newcommand\thetitle{\textbackslash{}thetitle}
+\newcommand*\thecompany{Huawei Technologies Co., Ltd.}
+\newcommand\thesubtitle{}
+\renewcommand\author[1]{\renewcommand\theauthor{#1}}
+\newcommand\theauthor{\textbackslash{}theauthor}
+\newcommand*\thesecurity{Confidential}
+\newcommand*\theid{}
+
+\ifcsname nospell\endcsname\else\newcommand\nospell[1]{#1}\fi
+
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf
index c46f5907b1..61d6c68931 100644
--- a/macros/latex/contrib/huawei/huawei.pdf
+++ b/macros/latex/contrib/huawei/huawei.pdf
Binary files differ
diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex
index 63e24594bc..ade62504a9 100644
--- a/macros/latex/contrib/huawei/huawei.tex
+++ b/macros/latex/contrib/huawei/huawei.tex
@@ -29,9 +29,9 @@
\begin{document}
\maketitle
-\ff{Version: 0.11.0}
+\ff{Version: 0.12.0}
\newline
-\ff{Date: 2021/09/09}
+\ff{Date: 2021/09/13}
\section{Overview}
diff --git a/macros/latex/contrib/huawei/samples/huawei-cfp.tex b/macros/latex/contrib/huawei/samples/huawei-cfp.tex
index 733cec3751..cbc9a6dead 100644
--- a/macros/latex/contrib/huawei/samples/huawei-cfp.tex
+++ b/macros/latex/contrib/huawei/samples/huawei-cfp.tex
@@ -27,6 +27,10 @@
\addbibresource{huawei-main.bib}
\begin{document}
+\begin{abstract}This is just a demo document, to show how
+this package works and formats simple business documents. This
+block of text is the abstract.\end{abstract}
+
\maketitle
In this document you don't see the logo, because we use \ff{nobrand}
diff --git a/macros/latex/contrib/huawei/samples/huawei-charter.tex b/macros/latex/contrib/huawei/samples/huawei-charter.tex
index e808392920..cb948574dd 100644
--- a/macros/latex/contrib/huawei/samples/huawei-charter.tex
+++ b/macros/latex/contrib/huawei/samples/huawei-charter.tex
@@ -21,9 +21,9 @@
% SOFTWARE.
\documentclass[landscape,nocover,XL]{../huawei}
-\renewcommand*\thetitle{Test Charter}
-\renewcommand*\thesubtitle{Technology Project Charter}
-\renewcommand*\theauthor{Yegor Bugayenko}
+% \renewcommand*\thetitle{Test Charter}
+% \renewcommand*\thesubtitle{Technology Project Charter}
+% \renewcommand*\theauthor{Yegor Bugayenko}
\begin{document}
\PrintFirstPage{}