Changeset 8d66610 for doc/LaTeXmacros/common.tex

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/LaTeXmacros/common.tex (modified) (6 diffs)

doc/LaTeXmacros/common.tex

@@ -11 +11 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Feb 14 15:52:46 2021
-%% Update Count     : 524
+%% Last Modified On : Sat May  8 08:48:37 2021
+%% Update Count     : 540
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -38 +38 @@
 \usepackage{xspace}
 \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}} % Cforall icon
-\newcommand{\CFA}{\protect\CFAIcon\xspace}                      % CFA symbolic name
-\newcommand{\CFL}{\textrm{Cforall}\xspace}                      % Cforall non-icon name
-\newcommand{\Celeven}{\textrm{C11}\xspace}                      % C11 symbolic name
+\newcommand{\CFA}{\protect\CFAIcon\xspace}                              % CFA symbolic name
+\newcommand{\CFL}{\textrm{Cforall}\xspace}                              % Cforall non-icon name
+\newcommand{\Celeven}{\textrm{C11}\xspace}                              % C11 symbolic name
 \newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon
-\newcommand{\CC}{\protect\CCIcon\xspace}                        % C++ symbolic name
+\newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace}               % C++ symbolic name
 % numbers disallowed in latex variables names => use number names
-\newcommand{\CCeleven}{\protect\CCIcon{11}\xspace}      % C++11 symbolic name
-\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace} % C++14 symbolic name
-\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace} % C++17 symbolic name
-\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace}      % C++20 symbolic name
+\newcommand{\CCeleven}{\protect\CCIcon{11}\xspace}              % C++11 symbolic name
+\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace}    % C++14 symbolic name
+\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace}   % C++17 symbolic name
+\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace}              % C++20 symbolic name
 \newcommand{\Csharp}{C\raisebox{-0.7ex}{\Large$^\sharp$}\xspace} % C# symbolic name
 
@@ -102 +102 @@
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}{-2.5ex \@plus -1ex \@minus -.2ex}{1.0ex \@plus .2ex}{\normalfont\normalsize\bfseries}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}{-2.0ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries}}
+\renewcommand\subparagraph{\@startsection{subparagraph}{4}{\z@}{-1.5ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries\itshape}}
 
 % index macros
@@ -152 +153 @@
 % Latin abbreviation
 \newcommand{\abbrevFont}{\textit}                       % set empty for no italics
+% If not followed by a comma or colon, add a comma.
+\newcommand{\CheckCommaColon}{\@ifnextchar{,}{}{\@ifnextchar{:}{}{,\xspace}}}
+% If not followed by a period, add a period.
+\newcommand{\CheckPeriod}{\@ifnextchar{.}{}{.\xspace}}
+
 \@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
-\newcommand*{\eg}{%
-        \@ifnextchar{,}{\EG}%
-                {\@ifnextchar{:}{\EG}%
-                        {\EG,\xspace}}%
-}}{}%
+\newcommand{\eg}{\EG\CheckCommaColon}
+}{}%
 \@ifundefined{ie}{
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
-\newcommand*{\ie}{%
-        \@ifnextchar{,}{\IE}%
-                {\@ifnextchar{:}{\IE}%
-                        {\IE,\xspace}}%
-}}{}%
+\newcommand{\ie}{\IE\CheckCommaColon}
+}{}%
 \@ifundefined{etc}{
 \newcommand{\ETC}{\abbrevFont{etc}}
-\newcommand*{\etc}{%
-        \@ifnextchar{.}{\ETC}%
-        {\ETC.\xspace}%
-}}{}%
+\newcommand{\etc}{\ETC\CheckPeriod}
+}{}%
 \@ifundefined{etal}{
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
-\newcommand*{\etal}{%
-        \@ifnextchar{.}{\protect\ETAL}%
-                {\protect\ETAL.\xspace}%
-}}{}%
+\newcommand{\etal}{\ETAL\CheckPeriod}
+}{}%
 \@ifundefined{viz}{
 \newcommand{\VIZ}{\abbrevFont{viz}}
-\newcommand*{\viz}{%
-        \@ifnextchar{.}{\VIZ}%
-                {\VIZ.\xspace}%
-}}{}%
+\newcommand{\viz}{\VIZ\CheckPeriod}
+}{}%
 \makeatother
 
@@ -284 +278 @@
 showlines=true,                                                 % show blank lines at end of code
 aboveskip=4pt,                                                  % spacing above/below code block
-belowskip=0pt,
+belowskip=2pt,
 numberstyle=\footnotesize\sf,                   % numbering style
 % replace/adjust listing characters that look bad in sanserif
@@ -297 +291 @@
 \lstset{
 language=CFA,
-moredelim=**[is][\color{red}]{@}{@},    % red highlighting @...@
-%moredelim=**[is][\color{red}]{®}{®},   % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+%moredelim=**[is][\color{red}]{@}{@},   % red highlighting @...@
+moredelim=**[is][\color{red}]{®}{®},    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
 %moredelim=**[is][\color{blue}]{ß}{ß},  % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
 %moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting ¢...¢ (cent symbol) emacs: C-q M-"