Changes in doc/LaTeXmacros/common.tex [b1bdc7d6:315f634]

File:

• doc/LaTeXmacros/common.tex (modified) (5 diffs)

doc/LaTeXmacros/common.tex

@@ -11 +11 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Aug 14 08:27:29 2016
-%% Update Count     : 231
+%% Last Modified On : Tue Oct 25 22:04:19 2016
+%% Update Count     : 234
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -41 +41 @@
 \newcommand{\CCeleven}{\rm C\kern-.1em\hbox{+\kern-.25em+}11\xspace} % C++11 symbolic name
 \newcommand{\Celeven}{C11\xspace}               % C11 symbolic name
-\newcommand{\Csharp}{\rm C\hbox{\#}\xspace} % C# symbolic name
-
+\newcommand{\Csharp}{C\raisebox{0.4ex}{\#}\xspace}      % C# symbolic name
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -126 +125 @@
 \newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
 
-% inline text and code index (cannot use �)
+% inline text and code index (cannot use ©)
 \newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
-% code index (cannot use �)
+% code index (cannot use ©)
 \newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
 
@@ -228 +227 @@
 
 % CFA programming language, based on ANSI C (with some gcc additions)
-\lstdefinelanguage{Pseudo}{
-        morekeywords={string,uint,int,bool,float},%
-        sensitive=true,%
-        morecomment=[l]{//},%
-        morecomment=[s]{/*}{*/},%
-        morestring=[b]',%
-        morestring=[b]",%
-        morestring=[s]{`}{`},%
+\lstdefinelanguage{CFA}[ANSI]{C}{
+        morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
+                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
+                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
 }%
 
 \lstset{
-language=Pseudo,
+language=CFA,
 columns=fullflexible,
-basicstyle=\linespread{0.9}\tt\small,           % reduce line spacing and use typewriter font
-stringstyle=\sf\color{Mahogany},                        % use sanserif font
-commentstyle=\itshape\color{OliveGreen},                % green and italic comments
-tabsize=4,                                                      % 4 space tabbing
+basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
+stringstyle=\tt,                                                % use typewriter font
+tabsize=4,                                                              % 4 space tabbing
 xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
-extendedchars=true,                                     % allow ASCII characters in the range 128-255
-escapechar=§,                                           % escape to latex in CFA code
+extendedchars=true,                                             % allow ASCII characters in the range 128-255
+escapechar=§,                                                   % escape to latex in CFA code
 mathescape=true,                                                % allow $...$ LaTeX math escapes in code
-%keepspaces=true,                                               %
+%keepspaces=true,                                               % 
 showstringspaces=false,                                 % do not show spaces with cup
-showlines=true,                                         % show blank lines at end of code
-aboveskip=4pt,                                          % spacing above/below code block
+showlines=true,                                                 % show blank lines at end of code
+aboveskip=4pt,                                                  % spacing above/below code block
 belowskip=3pt,
 moredelim=**[is][\color{red}]{®}{®},    % red highlighting
@@ -259 +254 @@
 moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
 % replace/adjust listing characters that look bad in sanserif
-literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {©}{{\"u}}1
+literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
 }%
 
-% CFA programming language, based on ANSI C (with some gcc additions)
-\lstdefinelanguage{CFA}[ANSI]{C}{
-        morekeywords=[1]{_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
-                _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
-                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
-        morekeywords=[2]{mutex,nomutex,thread,wait,signal,accept,monitor}
-}%
-
-\lstset{
-language=CFA,
-columns=fullflexible,
-basicstyle=\linespread{0.9}\tt\small,           % reduce line spacing and use typewriter font
-keywordstyle=[2]\color{blue},                           % second set of keywords for concurency
-stringstyle=\sf\color{Mahogany},                        % use sanserif font
-commentstyle=\itshape\color{OliveGreen},                % green and italic comments
-tabsize=4,                                                      % 4 space tabbing
-xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
-extendedchars=true,                                     % allow ASCII characters in the range 128-255
-escapechar=§,                                           % escape to latex in CFA code
-mathescape=true,                                                % allow $...$ LaTeX math escapes in code
-%keepspaces=true,                                               %
-showstringspaces=false,                                 % do not show spaces with cup
-showlines=true,                                         % show blank lines at end of code
-aboveskip=4pt,                                          % spacing above/below code block
-belowskip=3pt,
-moredelim=**[is][\color{red}]{®}{®},    % red highlighting
-moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting
-moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
-moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
-% replace/adjust listing characters that look bad in sanserif
-literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1 {©}{{\"u}}1
-        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
-        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2,
-}%
-
 \lstMakeShortInline©    % single-character for \lstinline
-
 
 \let\Oldthebibliography\thebibliography