Changeset c0c940a for doc


Ignore:
Timestamp:
May 4, 2021, 12:25:36 PM (3 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master
Children:
1716e1c, 58c671b, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/andrew_beach_MMath/cfalab.sty

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

    r692f0c8 rc0c940a  
    9999% allow global and individual modification of spacing
    100100\usepackage{enumitem}
     101% Improved reference tools.
     102\usepackage[nospace]{varioref}
    101103
    102104% Hyperlinks make it very easy to navigate an electronic document.
Note: See TracChangeset for help on using the changeset viewer.