Changeset 0720e049 for doc/refrat/refrat.tex

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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:/u/cforall/software/cfa/cfa-cc

File:

• doc/refrat/refrat.tex (modified) (7 diffs)

doc/refrat/refrat.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:52:25 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Fri Jun  2 10:43:14 2017
-%% Update Count     : 83
+%% Last Modified On : Sun Aug  6 10:25:31 2017
+%% Update Count     : 105
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % requires tex packages: texlive-base texlive-latex-base tex-common texlive-humanities texlive-latex-extra texlive-fonts-recommended
 
-\documentclass[openright,twoside]{report}
+\documentclass[openright,twoside,11pt]{report}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37 +37 @@
 \usepackage{mathptmx}                                   % better math font with "times"
 \usepackage[usenames]{color}
-\usepackage[pagewise]{lineno}
-\renewcommand{\linenumberfont}{\scriptsize\sffamily}
-\input{common}                                          % bespoke macros used in the document
+\input{common}                                          % common CFA document macros
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
 \usepackage{breakurl}
 \renewcommand{\UrlFont}{\small\sf}
 
+\usepackage[pagewise]{lineno}
+\renewcommand{\linenumberfont}{\scriptsize\sffamily}
+\usepackage[firstpage]{draftwatermark}
+\SetWatermarkLightness{0.9}
+
+% Default underscore is too low and wide. Cannot use lstlisting "literate" as replacing underscore
+% removes it as a variable-name character so keywords in variables are highlighted. MUST APPEAR
+% AFTER HYPERREF.
+\renewcommand{\textunderscore}{\leavevmode\makebox[1.2ex][c]{\rule{1ex}{0.075ex}}}
+
 \setlength{\topmargin}{-0.45in}                                                 % move running title into header
 \setlength{\headsep}{0.25in}
@@ -50 +58 @@
 
 \CFAStyle                                                                                               % use default CFA format-style
+\lstnewenvironment{C++}[1][]                            % use C++ style
+{\lstset{language=C++,moredelim=**[is][\protect\color{red}]{®}{®}#1}}
+{}
 
 % inline code ©...© (copyright symbol) emacs: C-q M-)
@@ -87 +98 @@
 
 \date{
-DRAFT \\ \today
+\today
 }% date
 
@@ -112 +123 @@
 
 \clearpage
+\thispagestyle{plain}
 \pdfbookmark[1]{Contents}{section}
 \tableofcontents
 
 \clearpage
+\thispagestyle{plain}
 \pagenumbering{arabic}
 
@@ -417 +430 @@
 
 \begin{syntax}
-\oldlhs{keyword}
-\rhs ©forall©
-\rhs ©lvalue©
-\rhs ©trait©
-\rhs ©dtype©
-\rhs ©ftype©
-\rhs ©otype©
+\lhs{keyword} one of
+\rhs \dots
+\rhs \input{keywords}
 \end{syntax}
 
@@ -469 +478 @@
 
 \begin{table}[hbt]
-\hfil
-\begin{tabular}[t]{ll}
-%identifier & operation \\ \hline
-©?[?]© & subscripting \impl{?[?]}\\
-©?()© & function call \impl{?()}\\
-©?++© & postfix increment \impl{?++}\\
-©?--© & postfix decrement \impl{?--}\\
-©++?© & prefix increment \impl{++?}\\
-©--?© & prefix decrement \impl{--?}\\
-©*?© & dereference \impl{*?}\\
-©+?© & unary plus \impl{+?}\\
-©-?© & arithmetic negation \impl{-?}\\
-©~?© & bitwise negation \impl{~?}\\
-©!?© & logical complement \impl{"!?}\\
-©?*?© & multiplication \impl{?*?}\\
-©?/?© & division \impl{?/?}\\
-\end{tabular}\hfil
-\begin{tabular}[t]{ll}
-%identifier & operation \\ \hline
-©?%?© & remainder \impl{?%?}\\
-©?+?© & addition \impl{?+?}\\
-©?-?© & subtraction \impl{?-?}\\
-©?<<?© & left shift \impl{?<<?}\\
-©?>>?© & right shift \impl{?>>?}\\
-©?<?© & less than \impl{?<?}\\
-©?<=?© & less than or equal \impl{?<=?}\\
-©?>=?© & greater than or equal \impl{?>=?}\\
-©?>?© & greater than \impl{?>?}\\
-©?==?© & equality \impl{?==?}\\
-©?!=?© & inequality \impl{?"!=?}\\
-©?&?© & bitwise AND \impl{?&?}\\
-\end{tabular}\hfil
-\begin{tabular}[t]{ll}
-%identifier & operation \\ \hline
-©?^?© & exclusive OR \impl{?^?}\\
-©?|?© & inclusive OR \impl{?"|?}\\
-©?=?© & simple assignment \impl{?=?}\\
-©?*=?© & multiplication assignment \impl{?*=?}\\
-©?/=?© & division assignment \impl{?/=?}\\
-©?%=?© & remainder assignment \impl{?%=?}\\
-©?+=?© & addition assignment \impl{?+=?}\\
-©?-=?© & subtraction assignment \impl{?-=?}\\
-©?<<=?© & left-shift assignment \impl{?<<=?}\\
-©?>>=?© & right-shift assignment \impl{?>>=?}\\
-©?&=?© & bitwise AND assignment \impl{?&=?}\\
-©?^=?© & exclusive OR assignment \impl{?^=?}\\
-©?|=?© & inclusive OR assignment \impl{?"|=?}\\
-\end{tabular}
-\hfil
+\centering
+\input{operidents}
 \caption{Operator Identifiers}
 \label{opids}