Changeset 8669cd3 for doc/LaTeXmacros

Timestamp:

Mar 20, 2018, 4:22:15 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

101a4d2

Parents:

1bdd261 (diff), f810e09 (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' into references

Location:

doc/LaTeXmacros

Files:

• common.tex (modified) (4 diffs)
• lstlang.sty (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 : Thu Mar 15 09:52:27 2018
-%% Update Count     : 378
+%% 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{\see}[1]{\emph{see}~#1}
 
@@ -113 +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
@@ -123 +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}

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 Mar 16 22:18:12 2018
+%% Update Count     : 16
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -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,