Changeset 25f49f4 for doc

Timestamp:

Oct 27, 2016, 9:37:58 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d93d980

Parents:

efe4d730 (diff), 6d7c3df (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:

• LaTeXmacros/common.tex (modified) (6 diffs)
• user/user.tex (modified) (3 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$}}
 
@@ -266 +265 @@
 % 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,
+        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__,},
-        morekeywords=[2]{mutex,nomutex,thread,wait,signal,accept,monitor}
 }%
 
@@ -276 +274 @@
 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
+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
@@ -295 +291 @@
 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,

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Thu Sep 29 11:50:28 2016
-%% Update Count     : 1325
+%% Last Modified On : Tue Oct 25 23:03:59 2016
+%% Update Count     : 1357
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -326 +326 @@
 \begin{description}
 \item
-\Indexc{__CFA__}\index{preprocessor variables!__CFA__@{©__CFA__©}}
-is always available during preprocessing and its value is the current major \Index{version number} of \CFA.\footnote{
+\Indexc{__CFA_MAJOR__}\index{preprocessor variables!__CFA__@{©__CFA__©}}
+is available during preprocessing and its value is the major \Index{version number} of \CFA.\footnote{
 The C preprocessor allows only integer values in a preprocessor variable so a value like ``\Version'' is not allowed.
 Hence, the need to have three variables for the major, minor and patch version number.}
@@ -333 +333 @@
 \item
 \Indexc{__CFA_MINOR__}\index{preprocessor variables!__CFA_MINOR__@{©__CFA_MINOR__©}}
-is always available during preprocessing and its value is the current minor \Index{version number} of \CFA.
+is available during preprocessing and its value is the minor \Index{version number} of \CFA.
 
 \item
 \Indexc{__CFA_PATCH__}\index{preprocessor variables!__CFA_PATCH__@©__CFA_PATCH__©}
-is always available during preprocessing and its value is the current patch \Index{version number} of \CFA.
-
-\item
+is available during preprocessing and its value is the patch \Index{level number} of \CFA.
+
+\item
+\Indexc{__CFA__}\index{preprocessor variables!__CFA__@©__CFA__©} and
 \Indexc{__CFORALL__}\index{preprocessor variables!__CFORALL__@©__CFORALL__©}
-is always available during preprocessing and has no value.
+are always available during preprocessing and have no value.
 \end{description}
 These preprocessor variables allow conditional compilation of programs that must work differently in these situations.