Changeset 3bff885


Ignore:
Timestamp:
Feb 20, 2017, 12:29:43 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
210587b
Parents:
bd9bcc8 (diff), a98b2cc (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

Location:
doc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/common.tex

    rbd9bcc8 r3bff885  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Tue Oct 25 22:04:19 2016
    14 %% Update Count     : 234
     13%% Last Modified On : Fri Feb 10 11:32:36 2017
     14%% Update Count     : 249
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    210210\newcommand{\VPageref}[2][page]{\ifx#1\@empty\else{#1}\nobreakspace\fi\pageref{#2}}
    211211
     212\let\Oldthebibliography\thebibliography
     213\renewcommand\thebibliography[1]{
     214  \Oldthebibliography{#1}
     215  \setlength{\parskip}{0pt}                             % reduce vertical spacing between references
     216  \setlength{\itemsep}{5pt plus 0.3ex}
     217}%
     218
    212219% Go programming language: https://github.com/julienc91/listings-golang/blob/master/listings-golang.sty
    213220\lstdefinelanguage{Golang}{
    214         morekeywords=[1]{package,import,func,type,struct,return,defer,panic, recover,select,var,const,iota,},%
    215         morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16, int32,int64,
     221        morekeywords=[1]{package,import,func,type,struct,return,defer,panic,recover,select,var,const,iota,},%
     222        morekeywords=[2]{string,uint,uint8,uint16,uint32,uint64,int,int8,int16,int32,int64,
    216223                bool,float32,float64,complex64,complex128,byte,rune,uintptr, error,interface},%
    217         morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false, delete,append,real,imag,complex,chan,},%
    218         morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if, else,default,},%
     224        morekeywords=[3]{map,slice,make,new,nil,len,cap,copy,close,true,false,delete,append,real,imag,complex,chan,},%
     225        morekeywords=[4]{for,break,continue,range,goto,switch,case,fallthrough,if,else,default,},%
    219226        morekeywords=[5]{Println,Printf,Error,},%
    220227        sensitive=true,%
     
    237244}%
    238245
    239 \lstset{
    240 language=Pseudo,
    241 columns=fullflexible,
    242 basicstyle=\linespread{0.9}\tt\small,           % reduce line spacing and use typewriter font
    243 stringstyle=\sf\color{Mahogany},                        % use sanserif font
    244 commentstyle=\itshape\color{OliveGreen},                % green and italic comments
    245 tabsize=4,                                                      % 4 space tabbing
    246 xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
    247 extendedchars=true,                                     % allow ASCII characters in the range 128-255
    248 escapechar=§,                                           % escape to latex in CFA code
    249 mathescape=true,                                                % allow $...$ LaTeX math escapes in code
    250 %keepspaces=true,                                               %
    251 showstringspaces=false,                                 % do not show spaces with cup
    252 showlines=true,                                         % show blank lines at end of code
    253 aboveskip=4pt,                                          % spacing above/below code block
    254 belowskip=3pt,
    255 moredelim=**[is][\color{red}]{®}{®},    % red highlighting
    256 moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting
    257 moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
    258 moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
    259 % replace/adjust listing characters that look bad in sanserif
    260 literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {©}{{\"u}}1
    261         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
    262         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
    263 }%
    264 
    265246% CFA programming language, based on ANSI C (with some gcc additions)
    266247\lstdefinelanguage{CFA}[ANSI]{C}{
     
    271252}%
    272253
     254\newcommand{\CFADefaultStyle}{%
    273255\lstset{
    274256language=CFA,
    275257columns=fullflexible,
    276 basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
    277 stringstyle=\tt,                                                % use typewriter font
    278 tabsize=4,                                                              % 4 space tabbing
    279 xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
    280 extendedchars=true,                                             % allow ASCII characters in the range 128-255
    281 escapechar=§,                                                   % escape to latex in CFA code
    282 mathescape=true,                                                % allow $...$ LaTeX math escapes in code
    283 %keepspaces=true,                                               %
    284 showstringspaces=false,                                 % do not show spaces with cup
    285 showlines=true,                                                 % show blank lines at end of code
    286 aboveskip=4pt,                                                  % spacing above/below code block
     258basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
     259stringstyle=\tt,                                                                                % use typewriter font
     260tabsize=4,                                                                                              % 4 space tabbing
     261xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
     262extendedchars=true,                                                                             % allow ASCII characters in the range 128-255
     263escapechar=§,                                                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
     264mathescape=true,                                                                                % LaTeX math escape in CFA code $...$
     265%keepspaces=true,                                                                               %
     266showstringspaces=false,                                                                 % do not show spaces with cup
     267showlines=true,                                                                                 % show blank lines at end of code
     268aboveskip=4pt,                                                                                  % spacing above/below code block
    287269belowskip=3pt,
    288 moredelim=**[is][\color{red}]{®}{®},    % red highlighting
    289 moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting
    290 moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
    291 moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
    292270% replace/adjust listing characters that look bad in sanserif
    293271literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
    294272        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
    295273        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
    296 }%
    297 
    298 \lstMakeShortInline©    % single-character for \lstinline
    299 
    300 
    301 \let\Oldthebibliography\thebibliography
    302 \renewcommand\thebibliography[1]{
    303   \Oldthebibliography{#1}
    304   \setlength{\parskip}{0pt}                             % reduce vertical spacing between references
    305   \setlength{\itemsep}{5pt plus 0.3ex}
    306 }%
     274moredelim=**[is][\color{red}]{®}{®},                                    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
     275moredelim=**[is][\color{blue}]{ß}{ß},                                   % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
     276moredelim=**[is][\color{OliveGreen}]{¢}{¢},                     % green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
     277moredelim=[is][\lstset{keywords={}}]{¶}{¶},                     % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
     278}% lstset
     279% inline code ©...© (copyright symbol) emacs: C-q M-)
     280\lstMakeShortInline©                                                                    % single-character for \lstinline
     281}%CFADefaultStyle
    307282
    308283% Local Variables: %
  • doc/user/user.tex

    rbd9bcc8 r3bff885  
    1111%% Created On       : Wed Apr  6 14:53:29 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Tue Oct 25 23:03:59 2016
    14 %% Update Count     : 1357
     13%% Last Modified On : Sun Feb 19 09:29:10 2017
     14%% Update Count     : 1376
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    1717% requires tex packages: texlive-base texlive-latex-base tex-common texlive-humanities texlive-latex-extra texlive-fonts-recommended
    18 
    19 % inline code ©...© (copyright symbol) emacs: C-q M-)
    20 % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
    21 % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
    22 % green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
    23 % LaTex escape §...§ (section symbol) emacs: C-q M-'
    24 % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
    25 % math escape $...$ (dollar symbol)
    2618
    2719\documentclass[twoside,11pt]{article}
     
    5850%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    5951
     52\CFADefaultStyle                                                                                % use default CFA format-style
     53
     54% inline code ©...© (copyright symbol) emacs: C-q M-)
     55% red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
     56% blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
     57% green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
     58% LaTex escape §...§ (section symbol) emacs: C-q M-'
     59% keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
     60% math escape $...$ (dollar symbol)
     61
     62%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     63
    6064% Names used in the document.
    61 
    62 \newcommand{\Version}{1.0.0}
     65\newcommand{\Version}{\input{version}}
    6366\newcommand{\CS}{C\raisebox{-0.9ex}{\large$^\sharp$}\xspace}
    6467
     
    340343
    341344\item
    342 \Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©} and
    343 \Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©}
     345\Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©},
     346\Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©} and
     347\Indexc{__cforall}\index{preprocessor variables!__cforall@©__cforall©}
    344348are always available during preprocessing and have no value.
    345349\end{description}
Note: See TracChangeset for help on using the changeset viewer.