Changeset d6fb3c7


Ignore:
Timestamp:
May 30, 2017, 11:47:09 AM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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:
759908f, b78275b
Parents:
55f5c59 (diff), 5e8d732 (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.
git-author:
Peter A. Buhr <pabuhr@…> (05/30/17 11:44:57)
git-committer:
Peter A. Buhr <pabuhr@…> (05/30/17 11:47:09)
Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:
doc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/lstlang.sty

    r55f5c59 rd6fb3c7  
    114114                __typeof__, zero_t},
    115115        morekeywords=[2]{
    116                 accept, _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
    117                 resume, signal, signal_block, suspend, thread, _Thread_local, wait, yield},
     116                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex,
     117                resume, suspend, thread, _Thread_local, yield},
    118118}
    119119
  • doc/proposals/concurrency/style/cfa-format.tex

    r55f5c59 rd6fb3c7  
    145145}
    146146
     147\lstdefinestyle{cfaStyle}{
     148  escapeinside={@@},
     149  basicstyle=\linespread{0.9}\tt\footnotesize,          % reduce line spacing and use typewriter font
     150  keywordstyle=\bfseries\color{blue},
     151  keywordstyle=[2]\bfseries\color{Plum},
     152  commentstyle=\itshape\color{OliveGreen},                  % green and italic comments
     153  identifierstyle=\color{identifierCol},
     154  stringstyle=\sf\color{Mahogany},                                % use sanserif font
     155  mathescape=true,
     156  columns=fixed,
     157  aboveskip=4pt,                                  % spacing above/below code block
     158  belowskip=3pt,
     159  keepspaces=true,
     160  % frame=lines,
     161  literate=,
     162  showlines=true,                                 % show blank lines at end of code
     163  showspaces=false,
     164  showstringspaces=false,
     165  escapechar=\$,
     166  xleftmargin=\parindentlnth,                     % indent code to paragraph indentation
     167  moredelim=[is][\color{red}\bfseries]{**R**}{**R**},    % red highlighting
     168  morekeywords=[2]{accept, signal, signal_block, wait},
     169}
     170
    147171\lstMakeShortInline[basewidth=0.5em,breaklines=true,basicstyle=\normalsize\ttfamily\color{basicCol}]@  % single-character for \lstinline
    148172
     
    158182  \lstset{
    159183    language = CFA,
    160     style=defaultStyle,
     184    style=cfaStyle,
    161185    #1
    162186  }
     
    230254\newcommand{\one}{\lstinline{one_t}\xspace}
    231255\newcommand{\ateq}{\lstinline{\@=}\xspace}
    232 \newcommand{\code}[1]{\lstinline[language=CFA,style=defaultStyle]{#1}}
     256\newcommand{\code}[1]{\lstinline[language=CFA,style=cfaStyle]{#1}}
    233257\newcommand{\pscode}[1]{\lstinline[language=pseudo,style=pseudoStyle]{#1}}
  • doc/user/user.tex

    r55f5c59 rd6fb3c7  
    1111%% Created On       : Wed Apr  6 14:53:29 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Tue May 30 11:42:47 2017
    14 %% Update Count     : 2097
     13%% Last Modified On : Tue May 30 11:45:46 2017
     14%% Update Count     : 2098
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    51645164\Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list:
    51655165\begin{quote2}
    5166 \lstset{deletekeywords={float},deletekeywords=[2]{signal}}
     5166\lstset{deletekeywords={float}}
    51675167\begin{tabular}{@{}llll|l@{}}
    51685168\multicolumn{4}{c|}{C11} & \multicolumn{1}{c}{\CFA}             \\
Note: See TracChangeset for help on using the changeset viewer.