Changeset 90152a4 for doc/LaTeXmacros/common.tex

Timestamp:

Aug 27, 2018, 4:40:34 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• doc/LaTeXmacros/common.tex (modified) (14 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 : Mon Aug 28 20:18:42 2017
-%% Update Count     : 355
+%% Last Modified On : Mon Jul  9 08:28:05 2018
+%% Update Count     : 380
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -37 +37 @@
 
 \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
-\newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
+\newcommand{\CFA}{\protect\CFAIcon}             % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 \newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name
@@ -55 +55 @@
 \setlength{\parindentlnth}{\parindent}
 
+\newcommand{\LstBasicStyle}[1]{{\lst@basicstyle{#1}}}
 \newcommand{\LstKeywordStyle}[1]{{\lst@basicstyle{\lst@keywordstyle{#1}}}}
 \newcommand{\LstCommentStyle}[1]{{\lst@basicstyle{\lst@commentstyle{#1}}}}
@@ -101 +102 @@
 % index macros
 \newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
-\newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
+\newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
 \newcommand{\see}[1]{\emph{see}~#1}
 
@@ -114 +115 @@
 \def\impl{\@bsphack\begingroup
           \def\protect##1{\string##1\space}\@sanitize
-          \@wrxref{|definition}}
+          \@wrxref{|Definition}}
 \newcommand{\indexcode}[1]{{\lstinline$#1$}}
 \def\use{\@bsphack\begingroup
@@ -124 +125 @@
     \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
 %\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
-%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
+%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}}
 
 % inline text and lowercase index: \Index{inline and lowercase index text}
@@ -147 +148 @@
 
 % Latin abbreviation
-\newcommand{\abbrevFont}{\textit}       % set empty for no italics
+\newcommand{\abbrevFont}{\textit}                       % set empty for no italics
+\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand*{\eg}{%
@@ -153 +155 @@
                 {\@ifnextchar{:}{\EG}%
                         {\EG,\xspace}}%
-}%
+}}{}%
+\@ifundefined{ie}{
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand*{\ie}{%
@@ -159 +162 @@
                 {\@ifnextchar{:}{\IE}%
                         {\IE,\xspace}}%
-}%
+}}{}%
+\@ifundefined{etc}{
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand*{\etc}{%
         \@ifnextchar{.}{\ETC}%
-        {\ETC\xspace}%
-}%
-\newcommand{\ETAL}{\abbrevFont{et\:al}}
-\newcommand{\etal}{%
-        \@ifnextchar{.}{\ETAL}%
-                {\abbrevFont{\ETAL}.\xspace}%
-}%
+        {\ETC.\xspace}%
+}}{}%
+\@ifundefined{etal}{
+\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
+\newcommand*{\etal}{%
+        \@ifnextchar{.}{\protect\ETAL}%
+                {\protect\ETAL.\xspace}%
+}}{}%
+\@ifundefined{viz}{
 \newcommand{\VIZ}{\abbrevFont{viz}}
-\newcommand{\viz}{%
+\newcommand*{\viz}{%
         \@ifnextchar{.}{\VIZ}%
-                {\abbrevFont{\VIZ}.\xspace}%
-}%
+                {\VIZ.\xspace}%
+}}{}%
 \makeatother
 
-\newenvironment{quote2}{%
-        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}%
+\newenvironment{cquote}{%
+        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
         \item\relax
 }{%
         \endlist
-}% quote2
+}% cquote
 
 \newenvironment{rationale}{%
-  \begin{quote2}\noindent$\Box$\enspace
+  \begin{cquote}\noindent$\Box$\enspace
 }{%
-  \hfill\enspace$\Box$\end{quote2}
+  \hfill\enspace$\Box$\end{cquote}
 }%
 
@@ -201 +207 @@
 \newenvironment{syntax}{
 \paragraph{Syntax}
-\begin{quote2}
+\begin{cquote}
 \begin{description}[noitemsep,leftmargin=\parindentlnth]
 }{
 \end{description}
-\end{quote2}
+\end{cquote}
 }
 % \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]}
@@ -215 +221 @@
 \newcommand{\opt}{$_{opt}$\ }
 
-\usepackage{varioref}                 % extended references
+\usepackage{varioref}                                   % extended references
 % adjust varioref package with default "section" and "page" titles, and optional title with faraway page numbers
 % \VRef{label} => Section 2.7, \VPageref{label} => page 17
@@ -241 +247 @@
 language=CFA,
 columns=fullflexible,
-basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
-stringstyle=\tt,                                                                                % use typewriter font
-tabsize=5,                                                                                              % N space tabbing
-xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
-extendedchars=true,                                                                             % allow ASCII characters in the range 128-255
-escapechar=§,                                                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
-mathescape=true,                                                                                % LaTeX math escape in CFA code $...$
-keepspaces=true,                                                                                %
-showstringspaces=false,                                                                 % do not show spaces with cup
-showlines=true,                                                                                 % show blank lines at end of code
-aboveskip=4pt,                                                                                  % spacing above/below code block
+basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
+stringstyle=\tt,                                                % use typewriter font
+tabsize=5,                                                              % N space tabbing
+xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
+extendedchars=true,                                             % allow ASCII characters in the range 128-255
+escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
+mathescape=true,                                                % LaTeX math escape in CFA code $...$
+keepspaces=true,                                                %
+showstringspaces=false,                                 % do not show spaces with cup
+showlines=true,                                                 % show blank lines at end of code
+aboveskip=4pt,                                                  % spacing above/below code block
 belowskip=3pt,
 % replace/adjust listing characters that look bad in sanserif
@@ -257 +263 @@
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
-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-"
-moredelim=[is][\lstset{keywords={}}]{¶}{¶},                     % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+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-"
+moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
 }% lstset
 }% CFADefaults
@@ -266 +272 @@
 \CFADefaults
 % inline code ©...© (copyright symbol) emacs: C-q M-)
-\lstMakeShortInline©                                                                    % single-character for \lstinline
+\lstMakeShortInline©                                    % single-character for \lstinline
 }% CFAStyle