Ignore:
Timestamp:
Feb 16, 2021, 1:32:24 PM (8 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
feacef9
Parents:
14533d4 (diff), 1830a86 (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/LaTeXmacros/common.tex

    r14533d4 rf6664bf2  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Mon Feb  8 21:45:41 2021
    14 %% Update Count     : 522
     13%% Last Modified On : Sun Feb 14 15:52:46 2021
     14%% Update Count     : 524
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
     
    146146% The star version does not lowercase the index information, e.g., \newterm*{IBM}.
    147147\newcommand{\newtermFontInline}{\emph}
    148 \newcommand{\newterm}{\@ifstar\@snewterm\@newterm}
     148\newcommand{\newterm}{\protect\@ifstar\@snewterm\@newterm}
    149149\newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
    150150\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
     
    294294
    295295\ifdefined\CFALatin% extra Latin-1 escape characters
    296 \lstnewenvironment{cfa}[1][]{
     296\lstnewenvironment{cfa}[1][]{% necessary
    297297\lstset{
    298298language=CFA,
     
    303303%moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
    304304}% lstset
    305 \lstset{#1}
     305\lstset{#1}% necessary
    306306}{}
    307307% inline code ©...© (copyright symbol) emacs: C-q M-)
    308308\lstMakeShortInline©                                    % single-character for \lstinline
    309309\else% regular ASCI characters
    310 \lstnewenvironment{cfa}[1][]{
     310\lstnewenvironment{cfa}[1][]{% necessary
    311311\lstset{
    312312language=CFA,
     
    315315moredelim=**[is][\color{red}]{@}{@},    % red highlighting @...@
    316316}% lstset
    317 \lstset{#1}
     317\lstset{#1}% necessary
    318318}{}
    319319% inline code @...@ (at symbol)
Note: See TracChangeset for help on using the changeset viewer.