Ignore:
Timestamp:
Aug 31, 2017, 3:33:11 PM (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:
058f549
Parents:
326338ae (diff), 2ad507b8 (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

    r326338ae rfbcb354  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Mon Jul 24 21:02:14 2017
    14 %% Update Count     : 352
     13%% Last Modified On : Mon Aug 28 20:18:42 2017
     14%% Update Count     : 355
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    148148% Latin abbreviation
    149149\newcommand{\abbrevFont}{\textit}       % set empty for no italics
     150\newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
    150151\newcommand*{\eg}{%
    151         \@ifnextchar{,}{\abbrevFont{e}.\abbrevFont{g}.}%
    152                 {\@ifnextchar{:}{\abbrevFont{e}.\abbrevFont{g}.}%
    153                         {\abbrevFont{e}.\abbrevFont{g}.,\xspace}}%
    154 }%
     152        \@ifnextchar{,}{\EG}%
     153                {\@ifnextchar{:}{\EG}%
     154                        {\EG,\xspace}}%
     155}%
     156\newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
    155157\newcommand*{\ie}{%
    156         \@ifnextchar{,}{\abbrevFont{i}.\abbrevFont{e}.}%
    157                 {\@ifnextchar{:}{\abbrevFont{i}.\abbrevFont{e}.}%
    158                         {\abbrevFont{i}.\abbrevFont{e}.,\xspace}}%
    159 }%
     158        \@ifnextchar{,}{\IE}%
     159                {\@ifnextchar{:}{\IE}%
     160                        {\IE,\xspace}}%
     161}%
     162\newcommand{\ETC}{\abbrevFont{etc}}
    160163\newcommand*{\etc}{%
    161         \@ifnextchar{.}{\abbrevFont{etc}}%
    162         {\abbrevFont{etc}.\xspace}%
    163 }%
     164        \@ifnextchar{.}{\ETC}%
     165        {\ETC\xspace}%
     166}%
     167\newcommand{\ETAL}{\abbrevFont{et\:al}}
    164168\newcommand{\etal}{%
    165         \@ifnextchar{.}{\abbrevFont{et~al}}%
    166                 {\abbrevFont{et al}.\xspace}%
     169        \@ifnextchar{.}{\ETAL}%
     170                {\abbrevFont{\ETAL}.\xspace}%
     171}%
     172\newcommand{\VIZ}{\abbrevFont{viz}}
     173\newcommand{\viz}{%
     174        \@ifnextchar{.}{\VIZ}%
     175                {\abbrevFont{\VIZ}.\xspace}%
    167176}%
    168177\makeatother
Note: See TracChangeset for help on using the changeset viewer.