Skip to content

Commit 4055164

Browse files
committed
[macros] Remove \xspace from macros taking a mandatory argument.
Other than positively influencing kerning, this removal has no effect.
1 parent 1af1226 commit 4055164

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

source/macros.tex

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
\let\omname\mname%
127127
\let\mname\idxmname%
128128
\let\oCpp\Cpp%
129-
\let\Cpp\idxCpp
129+
\let\Cpp\idxCpp%
130130
\let\oBreakableUnderscore\BreakableUnderscore% See the "underscore" package.
131131
\let\BreakableUnderscore\textunderscore%
132132
\edef\x{#1}%
@@ -164,11 +164,11 @@
164164

165165
% Code and definitions embedded in text.
166166
\newcommand{\tcode}[1]{\CodeStylex{#1}}
167-
\newcommand{\techterm}[1]{\textit{#1}\xspace}
168-
\newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}\xspace}
167+
\newcommand{\techterm}[1]{\textit{#1}}
168+
\newcommand{\defnx}[2]{\indexdefn{#2}\textit{#1}}
169169
\newcommand{\defn}[1]{\defnx{#1}{#1}}
170-
\newcommand{\term}[1]{\textit{#1}\xspace}
171-
\newcommand{\grammarterm}[1]{\textit{#1}\xspace}
170+
\newcommand{\term}[1]{\textit{#1}}
171+
\newcommand{\grammarterm}[1]{\textit{#1}}
172172
\newcommand{\placeholder}[1]{\textit{#1}}
173173
\newcommand{\placeholdernc}[1]{\textit{#1\nocorr}}
174174

@@ -178,10 +178,10 @@
178178

179179
%%--------------------------------------------------
180180
%% Macros for funky text
181-
\newcommand{\Cpp}{\texorpdfstring{C\kern-0.05em\protect\raisebox{.35ex}{\textsmaller[2]{+\kern-0.05em+}}}{C++}\xspace}
182-
\newcommand{\CppIII}{\Cpp 2003\xspace}
183-
\newcommand{\CppXI}{\Cpp 2011\xspace}
184-
\newcommand{\CppXIV}{\Cpp 2014\xspace}
181+
\newcommand{\Cpp}{\texorpdfstring{C\kern-0.05em\protect\raisebox{.35ex}{\textsmaller[2]{+\kern-0.05em+}}}{C++}}
182+
\newcommand{\CppIII}{\Cpp{} 2003}
183+
\newcommand{\CppXI}{\Cpp{} 2011}
184+
\newcommand{\CppXIV}{\Cpp{} 2014}
185185
\newcommand{\opt}{{\ensuremath{_\mathit{opt}}}\xspace}
186186
\newcommand{\dcr}{-{-}}
187187
\newcommand{\bigoh}[1]{\ensuremath{\mathscr{O}(#1)}}
@@ -206,12 +206,12 @@
206206
%% Notes and examples
207207
\newcommand{\noteintro}[1]{[\,\textit{#1:}\space}
208208
\newcommand{\noteoutro}[1]{\textit{\,---\,end #1}\,]}
209-
\newenvironment{note}[1][Note]{\noteintro{#1}}{\noteoutro{note}\xspace}
210-
\newenvironment{example}[1][Example]{\noteintro{#1}}{\noteoutro{example}\xspace}
209+
\newenvironment{note}[1][Note]{\noteintro{#1}}{\noteoutro{note}\space}
210+
\newenvironment{example}[1][Example]{\noteintro{#1}}{\noteoutro{example}\space}
211211

212212
%% Library function descriptions
213-
\newcommand{\Fundescx}[1]{\textit{#1}\xspace}
214-
\newcommand{\Fundesc}[1]{\Fundescx{#1:}}
213+
\newcommand{\Fundescx}[1]{\textit{#1}}
214+
\newcommand{\Fundesc}[1]{\Fundescx{#1:}\xspace}
215215
\newcommand{\required}{\Fundesc{Required behavior}}
216216
\newcommand{\requires}{\Fundesc{Requires}}
217217
\newcommand{\effects}{\Fundesc{Effects}}
@@ -287,14 +287,14 @@
287287
\newcommand{\commentellip}{\tcode{/* ...\ */}}
288288

289289
%% Ranges
290-
\newcommand{\Range}[4]{\tcode{#1#3,\penalty2000{} #4#2}\xspace}
290+
\newcommand{\Range}[4]{\tcode{#1#3,\penalty2000{} #4#2}}
291291
\newcommand{\crange}[2]{\Range{[}{]}{#1}{#2}}
292292
\newcommand{\brange}[2]{\Range{(}{]}{#1}{#2}}
293293
\newcommand{\orange}[2]{\Range{(}{)}{#1}{#2}}
294294
\newcommand{\range}[2]{\Range{[}{)}{#1}{#2}}
295295

296296
%% Change descriptions
297-
\newcommand{\diffdef}[1]{\hfill\break\textbf{#1:}\xspace}
297+
\newcommand{\diffdef}[1]{\hfill\break\textbf{#1:}\space}
298298
\newcommand{\change}{\diffdef{Change}}
299299
\newcommand{\rationale}{\diffdef{Rationale}}
300300
\newcommand{\effect}{\diffdef{Effect on original feature}}
@@ -303,13 +303,13 @@
303303

304304
%% Miscellaneous
305305
\newcommand{\uniquens}{\placeholdernc{unique}}
306-
\newcommand{\stage}[1]{\item{\textbf{Stage #1:}}\xspace}
307-
\newcommand{\doccite}[1]{\textit{#1}\xspace}
306+
\newcommand{\stage}[1]{\item{\textbf{Stage #1:}}}
307+
\newcommand{\doccite}[1]{\textit{#1}}
308308
\newcommand{\cvqual}[1]{\textit{#1}}
309309
\newcommand{\cv}{\cvqual{cv}}
310-
\renewcommand{\emph}[1]{\textit{#1}\xspace}
311-
\newcommand{\numconst}[1]{\textsl{#1}\xspace}
312-
\newcommand{\logop}[1]{{\footnotesize #1}\xspace}
310+
\renewcommand{\emph}[1]{\textit{#1}}
311+
\newcommand{\numconst}[1]{\textsl{#1}}
312+
\newcommand{\logop}[1]{{\footnotesize #1}}
313313

314314
%%--------------------------------------------------
315315
%% Environments for code listings.
@@ -397,7 +397,7 @@
397397
\newenvironment{bnfbase}
398398
{
399399
\newcommand{\nontermdef}[1]{{\BnfNontermshape##1\itcorr}\indexgrammar{\idxgram{##1}}\textnormal{:}}
400-
\newcommand{\terminal}[1]{{\BnfTermshape ##1}\xspace}
400+
\newcommand{\terminal}[1]{{\BnfTermshape ##1}}
401401
\newcommand{\descr}[1]{\textnormal{##1}}
402402
\newcommand{\bnfindentfirst}{\BnfIndent}
403403
\newcommand{\bnfindentinc}{\BnfInc}

0 commit comments

Comments
 (0)