Ignore:
Timestamp:
Feb 18, 2018, 9:33:18 AM (7 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:
23a1eb7b
Parents:
2b95887 (diff), 29f47139 (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

    r2b95887 r370f6ef  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Tue Feb 13 08:19:07 2018
    14 %% Update Count     : 367
     13%% Last Modified On : Sat Feb 17 21:58:43 2018
     14%% Update Count     : 369
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    147147
    148148% Latin abbreviation
    149 \newcommand{\abbrevFont}{\textit}               % set empty for no italics
     149\newcommand{\abbrevFont}{\textit}                       % set empty for no italics
    150150\newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
    151151\newcommand*{\eg}{%
     
    163163\newcommand*{\etc}{%
    164164        \@ifnextchar{.}{\ETC}%
    165         {\ETC\xspace}%
    166 }%
    167 \newcommand{\ETAL}{\abbrevFont{et}\hspace{2pt}\abbrevFont{al}}
     165        {\ETC.\xspace}%
     166}%
     167\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
    168168\newcommand*{\etal}{%
    169169        \@ifnextchar{.}{\protect\ETAL}%
    170                 {\abbrevFont{\protect\ETAL}.\xspace}%
     170                {\protect\ETAL.\xspace}%
    171171}%
    172172\newcommand{\VIZ}{\abbrevFont{viz}}
    173173\newcommand*{\viz}{%
    174174        \@ifnextchar{.}{\VIZ}%
    175                 {\abbrevFont{\VIZ}.\xspace}%
     175                {\VIZ.\xspace}%
    176176}%
    177177\makeatother
Note: See TracChangeset for help on using the changeset viewer.