Ignore:
Timestamp:
Aug 16, 2016, 3:20:06 PM (9 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
1f6d4624
Parents:
950f7a7 (diff), 7880579 (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:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/LaTeXmacros/common.tex

    r950f7a7 r7527e63  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Tue Jul 12 20:37:57 2016
    14 %% Update Count     : 206
     13%% Last Modified On : Sun Aug 14 08:27:29 2016
     14%% Update Count     : 231
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    16 
    17 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1816
    1917\setlength{\textheight}{9in}
    2018%\oddsidemargin 0.0in
    21 \renewcommand{\topfraction}{0.8}        % float must be greater than X of the page before it is forced onto its own page
    22 \renewcommand{\bottomfraction}{0.8}     % float must be greater than X of the page before it is forced onto its own page
     19\renewcommand{\topfraction}{0.8}                % float must be greater than X of the page before it is forced onto its own page
     20\renewcommand{\bottomfraction}{0.8}             % float must be greater than X of the page before it is forced onto its own page
    2321\renewcommand{\floatpagefraction}{0.8}  % float must be greater than X of the page before it is forced onto its own page
    24 \renewcommand{\textfraction}{0.0}       % the entire page maybe devoted to floats with no text on the page at all
    25 
    26 \lefthyphenmin=4
     22\renewcommand{\textfraction}{0.0}               % the entire page maybe devoted to floats with no text on the page at all
     23
     24\lefthyphenmin=4                                                % hyphen only after 4 characters
    2725\righthyphenmin=4
    2826
    … …  
    3836% Names used in the document.
    3937
    40 \newcommand{\CFA}{C$\mathbf\forall$\xspace}              % set language symbolic name
    41 \newcommand{\CFL}{Cforall\xspace}                        % set language text name
     38\newcommand{\CFA}{C$\mathbf\forall$\xspace} % set language symbolic name
     39\newcommand{\CFL}{Cforall\xspace}               % set language text name
    4240\newcommand{\CC}{\rm C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name
    43 \def\c11{ISO/IEC C} % C11 name (cannot have numbers in latex command name)
     41\newcommand{\CCeleven}{\rm C\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name
     42\newcommand{\Celeven}{C11\xspace}               % C11 symbolic name
    4443
    4544%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    … …  
    5150\setlength{\parindentlnth}{\parindent}
    5251
    53 \newlength{\gcolumnposn}
     52\newlength{\gcolumnposn}                                % temporary hack because lstlisting does handle tabs correctly
    5453\newlength{\columnposn}
    5554\setlength{\gcolumnposn}{2.5in}
    … …  
    6261%\patchcmd{\lsthk@TextStyle}{\let\lst@DefEsc\@empty}{}{}{\errmessage{failed to patch}}
    6362
    64 \usepackage{pslatex}                                                                    % reduce size of san serif font
    65 \usepackage{relsize}                                    % must be after change to small or selects old size
     63\usepackage{pslatex}                                    % reduce size of san serif font
     64\usepackage{relsize}                                    % must be after change to small or selects old size
    6665
    6766% reduce size of chapter/section titles
    … …  
    119118
    120119% inline text and lowercase index: \Index{inline and lowercase index text}
     120\newcommand{\Index}{\@ifstar\@sIndex\@Index}
    121121% inline text and as-in index: \Index[as-is index text]{inline text}
     122\newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
    122123% inline text but index with different as-is text: \Index[index text]{inline text}
    123 \newcommand{\Index}{\@ifstar\@sIndex\@Index}
    124 \newcommand{\@Index}[2][\@empty]{\lowercase{\def\temp{#2}}#2\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
    125124\newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
    126125
    127 % cannot use ©
     126% inline text and code index (cannot use ©)
    128127\newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
     128% code index (cannot use ©)
    129129\newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
    130130
    … …  
    136136\newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
    137137\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
     138
     139% Latin abbreviation
     140\newcommand{\abbrevFont}{\textit}       % set empty for no italics
     141\newcommand*{\eg}{%
     142        \@ifnextchar{,}{\abbrevFont{e}.\abbrevFont{g}.}%
     143                {\@ifnextchar{:}{\abbrevFont{e}.\abbrevFont{g}.}%
     144                        {\abbrevFont{e}.\abbrevFont{g}.,\xspace}}%
     145}%
     146\newcommand*{\ie}{%
     147        \@ifnextchar{,}{\abbrevFont{i}.\abbrevFont{e}.}%
     148                {\@ifnextchar{:}{\abbrevFont{i}.\abbrevFont{e}.}%
     149                        {\abbrevFont{i}.\abbrevFont{e}.,\xspace}}%
     150}%
     151\newcommand*{\etc}{%
     152        \@ifnextchar{.}{\abbrevFont{etc}}%
     153        {\abbrevFont{etc}.\xspace}%
     154}%
     155\newcommand{\etal}{%
     156        \@ifnextchar{.}{\abbrevFont{et~al}}%
     157                {\abbrevFont{et al}.\xspace}%
     158}%
    138159\makeatother
    139160
    … …  
    144165        \endlist
    145166}% quote2
     167
    146168\newenvironment{rationale}{%
    147169  \begin{quote2}\noindent$\Box$\enspace
    … …  
    187209\newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}}
    188210
    189 % Go programming language
     211% Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty
    190212\lstdefinelanguage{Golang}{
    191213        morekeywords=[1]{package,import,func,type,struct,return,defer,panic, recover,select,var,const,iota,},%
    … …  
    203225}
    204226
    205 % CFA programming language, based on ANSI C
     227% CFA programming language, based on ANSI C (with some gcc additions)
    206228\lstdefinelanguage{CFA}[ANSI]{C}{
    207229        morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
    208230                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
    209                 fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
     231                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
    210232                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
    211233}%
    … …  
    214236language=CFA,
    215237columns=fullflexible,
    216 basicstyle=\linespread{0.9}\sf,
    217 stringstyle=\tt,
    218 tabsize=4,
    219 xleftmargin=\parindentlnth,
    220 extendedchars=true,
    221 escapechar=§,
    222 mathescape=true,
    223 keepspaces=true,
    224 showstringspaces=false,
    225 showlines=true,
    226 aboveskip=4pt,
     238basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
     239stringstyle=\tt,                                                % use typewriter font
     240tabsize=4,                                                              % 4 space tabbing
     241xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
     242extendedchars=true,                                             % allow ASCII characters in the range 128-255
     243escapechar=§,                                                   % escape to latex in CFA code
     244mathescape=true,                                                % allow $...$ LaTeX math escapes in code
     245%keepspaces=true,                                               %
     246showstringspaces=false,                                 % do not show spaces with cup
     247showlines=true,                                                 % show blank lines at end of code
     248aboveskip=4pt,                                                  % spacing above/below code block
    227249belowskip=3pt,
    228 moredelim=**[is][\color{red}]{®}{®}, % red highlighting
    229 moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting
     250moredelim=**[is][\color{red}]{®}{®},    % red highlighting
     251moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting
    230252moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
    231253moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
    … …  
    233255literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
    234256        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
    235         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {...}{$\dots$}2,
     257        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
    236258}%
    237259
    … …  
    241263\renewcommand\thebibliography[1]{
    242264  \Oldthebibliography{#1}
    243   \setlength{\parskip}{0pt}                     % reduce vertical spacing between references
     265  \setlength{\parskip}{0pt}                             % reduce vertical spacing between references
    244266  \setlength{\itemsep}{5pt plus 0.3ex}
    245267}%
Note: See TracChangeset for help on using the changeset viewer.