Ignore:
Timestamp:
Feb 1, 2018, 10:19:20 AM (6 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, resolv-new, with_gc
Children:
0992849
Parents:
e2e7330 (diff), 23c27039 (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:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/common.tex

    re2e7330 r295e5071  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Mon Aug 28 20:18:42 2017
    14 %% Update Count     : 355
     13%% Last Modified On : Wed Jan 31 23:10:28 2018
     14%% Update Count     : 364
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    165165        {\ETC\xspace}%
    166166}%
    167 \newcommand{\ETAL}{\abbrevFont{et\:al}}
    168 \newcommand{\etal}{%
    169         \@ifnextchar{.}{\ETAL}%
    170                 {\abbrevFont{\ETAL}.\xspace}%
     167\newcommand{\ETAL}{\abbrevFont{et}\hspace{2pt}\abbrevFont{al}}
     168\newcommand*{\etal}{%
     169        \@ifnextchar{.}{\protect\ETAL}%
     170                {\abbrevFont{\protect\ETAL}.\xspace}%
    171171}%
    172172\newcommand{\VIZ}{\abbrevFont{viz}}
    173 \newcommand{\viz}{%
     173\newcommand*{\viz}{%
    174174        \@ifnextchar{.}{\VIZ}%
    175175                {\abbrevFont{\VIZ}.\xspace}%
Note: See TracChangeset for help on using the changeset viewer.