|
173 | 173 | \newcommand{\id}{\metavar{id}}
|
174 | 174 | \newcommand{\op}{\metavar{op}}
|
175 | 175 |
|
| 176 | +% Used in margin to indicate that a term is being defined here. |
| 177 | +\newcommand{\IndexMarker}{\ensuremath{^\vartriangle}} |
| 178 | + |
176 | 179 | % Used for defining occurrence of phrase, with customized index entry.
|
177 | 180 | \newcommand{\IndexCustom}[2]{%
|
178 |
| - \leavevmode\marginpar{\ensuremath{_{^\vartriangle}}}\emph{#1}\index{#2}} |
| 181 | + \leavevmode\marginpar{\IndexMarker}\emph{#1}\index{#2}} |
179 | 182 |
|
180 | 183 | % Used for the defining occurrence of a local symbol.
|
181 | 184 | \newcommand{\DefineSymbol}[1]{%
|
|
196 | 199 |
|
197 | 200 | % Same appearance, but not adding an entry to the index.
|
198 | 201 | \newcommand{\NoIndex}[1]{%
|
199 |
| - \leavevmode\marginpar{\ensuremath{_{^\vartriangle}}}\emph{#1}} |
| 202 | + \leavevmode\marginpar{\IndexMarker}\emph{#1}} |
200 | 203 |
|
201 | 204 | % Mark a compile-time error in the margin.
|
202 | 205 | \newcommand{\Error}[1]{%
|
|
470 | 473 | \newcommand{\SubtypeStd}[2]{\Subtype{\Delta}{#1}{#2}}
|
471 | 474 | % Subtype judgment where the environment is omitted (NE: "no environment").
|
472 | 475 | \newcommand{\SubtypeNE}[2]{\ensuremath{{#1}\,<:\,{#2}}}
|
| 476 | +\newcommand{\MutualSubtype}[3]{\ensuremath{{#1}\vdash{#2}\,<:>\,{#3}}} |
| 477 | +\newcommand{\MutualSubtypeStd}[2]{\MutualSubtype{\Delta}{#1}{#2}} |
| 478 | +\newcommand{\MutualSubtypeNE}[2]{\ensuremath{{#1}\,<:>\,{#2}}} |
473 | 479 |
|
474 | 480 | % Judgment expressing that a supertype relation exists.
|
475 | 481 | \newcommand{\Supertype}[3]{\ensuremath{{#1}\vdash{#2}\,:>\,{#3}}}
|
476 | 482 | \newcommand{\SupertypeStd}[2]{\Supertype{\Delta}{#1}{#2}}
|
477 | 483 |
|
478 |
| -% Judgment expressing that a subtype and a supertype relation exist. |
479 |
| -\newcommand{\MutualSubtype}[3]{\ensuremath{{#1}\vdash{#2}\,<:>\,{#3}}} |
480 |
| -\newcommand{\MutualSubtypeStd}[2]{\MutualSubtype{\Delta}{#1}{#2}} |
481 |
| -\newcommand{\MutualSubtypeNE}[2]{\ensuremath{{#1}\,<:>\,{#2}}} |
482 |
| - |
483 | 484 | % Semantic function delivering the superinterfaces of a class.
|
484 | 485 | \newcommand{\Superinterfaces}[1]{\ensuremath{\metavar{Superinterfaces}({#1})}}
|
485 | 486 | \newcommand{\Superinterface}[2]{{#1}\in\Superinterfaces{#2}}
|
|
0 commit comments