Changeset c0c940a for doc

Timestamp:

May 4, 2021, 12:25:36 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1716e1c, 58c671ba, 78a6b9c

Parents:

692f0c8 (diff), 9fa538c (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:

fix conflicit

Location:

doc/theses/andrew_beach_MMath

Files:

• cfalab.sty (modified) (2 diffs)
• uw-ethesis.tex (modified) (1 diff)

doc/theses/andrew_beach_MMath/cfalab.sty

@@ -1 +1 @@
 % Package for CFA Research Lab.
 %
-% Made by combining and updating various macro files people had made.
+% This is a collection of commands everyone working on CFA related documents
+% should find useful. So mostly programming language related tools.
 %
 % Internal commands are prefixed with "\cfalab@".
@@ -17 +18 @@
 % Automatically adds spaces.
 \RequirePackage{xspace}
-% Improved reference tools.
-\RequirePackage[nospace]{varioref}
 
-% Symbols: All symbols are zero argument robust commands with special rules
-% about the space following the c.s. token. Normally the space might be
-% re-added according to the rules of the xspace package. They may be followed
-% by a star (which the command will consume) to disable this behaviour.
-
-% \newsymbolcmd{<command>}{<replacement text>}
-% Defines <command> to be a symbol that has the given <replacement text>.
-\newrobustcmd*\newsymbolcmd[2]{\newrobustcmd{#1}{\cfalab@symbol{#2}}}
-\def\cfalab@symbol#1{\@ifnextchar*{#1\cfalab@eatstar}{#1\xspace}}
-\def\cfalab@eatstar*{}
-
+% Tip for commands that end with \xspace: if the default is not correct then
+% follow the command with {} to disable \xspace, use '{} ' to force add a
+% space and '{}<whatever-follows>' to force remove one.
+%
 % Cforall with the forall symbol.
-\newsymbolcmd\CFA{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}}
-% C++ with kerning. (No standard number support.)
-\newsymbolcmd\Cpp{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}}
+\newrobustcmd\CFA{\textsf{C\raisebox{\depth}{\rotatebox{180}{A}}}\xspace}
+% C++ with kerning. You may optionally append a standard number.
+\newrobustcmd\Cpp[1][\xspace]{C++#1}
 
 % This is executed very early in the \begin{document} code, before the

doc/theses/andrew_beach_MMath/uw-ethesis.tex

@@ -99 +99 @@
 % allow global and individual modification of spacing
 \usepackage{enumitem}
+% Improved reference tools.
+\usepackage[nospace]{varioref}
 
 % Hyperlinks make it very easy to navigate an electronic document.