Changeset 315f634


Ignore:
Timestamp:
Oct 26, 2016, 4:57:55 PM (5 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:
ec129c4
Parents:
9059213
Message:

revert back to original latex macros

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/common.tex

    r9059213 r315f634  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Sun Aug 14 08:27:29 2016
    14 %% Update Count     : 231
     13%% Last Modified On : Tue Oct 25 22:04:19 2016
     14%% Update Count     : 234
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    4141\newcommand{\CCeleven}{\rm C\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name
    4242\newcommand{\Celeven}{C11\xspace}               % C11 symbolic name
    43 \newcommand{\Csharp}{\rm C\hbox{\#}\xspace} % C# symbolic name
    44 
     43\newcommand{\Csharp}{C\raisebox{0.4ex}{\#}\xspace}      % C# symbolic name
    4544
    4645%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     
    126125\newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
    127126
    128 % inline text and code index (cannot use �)
     127% inline text and code index (cannot use ©)
    129128\newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
    130 % code index (cannot use �)
     129% code index (cannot use ©)
    131130\newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
    132131
     
    229228% CFA programming language, based on ANSI C (with some gcc additions)
    230229\lstdefinelanguage{CFA}[ANSI]{C}{
    231         morekeywords=[1]{_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
     230        morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
    232231                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
    233232                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
    234233                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
    235         morekeywords=[2]{mutex,nomutex,thread,wait,signal,accept,monitor}
    236234}%
    237235
     
    239237language=CFA,
    240238columns=fullflexible,
    241 basicstyle=\linespread{0.9}\tt\small,           % reduce line spacing and use typewriter font
    242 keywordstyle=[2]\color{blue},                           % second set of keywords for concurency
    243 stringstyle=\sf\color{Mahogany},                        % use sanserif font
    244 commentstyle=\itshape\color{OliveGreen},                % green and italic comments
    245 tabsize=4,                                                      % 4 space tabbing
     239basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
     240stringstyle=\tt,                                                % use typewriter font
     241tabsize=4,                                                              % 4 space tabbing
    246242xleftmargin=\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
     243extendedchars=true,                                             % allow ASCII characters in the range 128-255
     244escapechar=§,                                                   % escape to latex in CFA code
    249245mathescape=true,                                                % allow $...$ LaTeX math escapes in code
    250 %keepspaces=true,                                               %
     246%keepspaces=true,                                               % 
    251247showstringspaces=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
     248showlines=true,                                                 % show blank lines at end of code
     249aboveskip=4pt,                                                  % spacing above/below code block
    254250belowskip=3pt,
    255251moredelim=**[is][\color{red}]{®}{®},    % red highlighting
     
    258254moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
    259255% replace/adjust listing characters that look bad in sanserif
    260 literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {©}{{\"u}}1
     256literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
    261257        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
    262258        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
Note: See TracChangeset for help on using the changeset viewer.