Changeset 32cab5b for doc/LaTeXmacros

Timestamp:

Apr 17, 2018, 12:01:09 PM (8 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, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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/LaTeXmacros

Files:

• common.tex (modified) (7 diffs)
• lstlang.sty (modified) (4 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 : Sat Feb 17 21:58:43 2018
-%% Update Count     : 369
+%% Last Modified On : Mon Mar 19 17:18:23 2018
+%% Update Count     : 379
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -101 +101 @@
 % index macros
 \newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
-\newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
+\newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
 \newcommand{\see}[1]{\emph{see}~#1}
 
@@ -114 +114 @@
 \def\impl{\@bsphack\begingroup
           \def\protect##1{\string##1\space}\@sanitize
-          \@wrxref{|definition}}
+          \@wrxref{|Definition}}
 \newcommand{\indexcode}[1]{{\lstinline$#1$}}
 \def\use{\@bsphack\begingroup
@@ -124 +124 @@
     \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
 %\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
-%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
+%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}}
 
 % inline text and lowercase index: \Index{inline and lowercase index text}
@@ -148 +148 @@
 % Latin abbreviation
 \newcommand{\abbrevFont}{\textit}                       % set empty for no italics
+\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand*{\eg}{%
@@ -153 +154 @@
                 {\@ifnextchar{:}{\EG}%
                         {\EG,\xspace}}%
-}%
+}}{}%
+\@ifundefined{ie}{
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand*{\ie}{%
@@ -159 +161 @@
                 {\@ifnextchar{:}{\IE}%
                         {\IE,\xspace}}%
-}%
+}}{}%
+\@ifundefined{etc}{
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand*{\etc}{%
         \@ifnextchar{.}{\ETC}%
         {\ETC.\xspace}%
-}%
+}}{}%
+\@ifundefined{etal}{
 \newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
 \newcommand*{\etal}{%
         \@ifnextchar{.}{\protect\ETAL}%
                 {\protect\ETAL.\xspace}%
-}%
+}}{}%
+\@ifundefined{viz}{
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand*{\viz}{%
         \@ifnextchar{.}{\VIZ}%
                 {\VIZ.\xspace}%
-}%
+}}{}%
 \makeatother
 

doc/LaTeXmacros/lstlang.sty

@@ -8 +8 @@
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Aug 30 22:11:14 2017
-%% Update Count     : 14
+%% Last Modified On : Fri Apr  6 23:44:50 2018
+%% Update Count     : 20
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -31 +31 @@
 \lstdefinelanguage{sml} {
         morekeywords= {
-                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool,
-                case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle,
-                if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open,
-                option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct,
-                structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
-        },
-        morestring=[b]",
-        morecomment=[s]{(*}{*)},
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before,
+                bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor,
+                handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op,
+                open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature,
+                string, struct, structure, substring, then, true, type, unit, val, vector, where, while,
+                with, withtype, word
+    },
+    morestring=[b]",
+    morecomment=[s]{(*}{*)},
 }
 
@@ -82 +83 @@
 
 \lstdefinelanguage{rust}{
+        % Keywords
         morekeywords=[1]{
                 abstract, alignof, as, become, box, break, const, continue, crate, do, else, enum, extern,
-        false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
-        override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
-        trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
+                false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
+                override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
+                trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
         },
+        % Strings
         morestring=[b]{"},
+        % Comments
         comment=[l]{//},
         morecomment=[s]{/*}{*/},
+        % Options
         sensitive=true
 }
 
-\lstdefinelanguage{Pseudo}{
+\lstdefinelanguage{pseudo}{
         morekeywords={string,uint,int,bool,float},
         sensitive=true,
@@ -107 +112 @@
 \lstdefinelanguage{CFA}[ANSI]{C}{
         morekeywords={
-                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, _At, __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, one_t,
-                otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
-                __typeof__, virtual, with, zero_t},
-        morekeywords=[2]{
-                _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, or,
-                resume, suspend, thread, _Thread_local, waitfor, when, yield},
+                _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, __attribute, __attribute__,
+                auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__, __const, __const__,
+                coroutine, disable, dtype, enable, __extension__, exception, fallthrough, fallthru, finally,
+                __float80, float80, __float128, float128, forall, ftype, _Generic, _Imaginary, __imag, __imag__,
+                inline, __inline, __inline__, __int128, int128, __label__, monitor, mutex, _Noreturn, one_t, or,
+                otype, restrict, __restrict, __restrict__, __signed, __signed__, _Static_assert, thread,
+                _Thread_local, throw, throwResume, timeout, trait, try, ttype, typeof, __typeof, __typeof__,
+                virtual, __volatile, __volatile__, waitfor, when, with, zero_t,
+    },
         moredirectives={defined,include_next}%
 }