Changeset 15215f02 for doc/LaTeXmacros/common.tex

Timestamp:

Apr 22, 2024, 11:37:36 PM (20 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

13de4478

Parents:

0fe07be (diff), d7c0ad5 (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:

• doc/LaTeXmacros/common.tex (modified) (5 diffs)

doc/LaTeXmacros/common.tex

@@ -11 +11 @@
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Feb 26 08:06:05 2024
-%% Update Count     : 615
+%% Last Modified On : Thu Apr 18 09:15:38 2024
+%% Update Count     : 664
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -109 +109 @@
 \renewcommand\subparagraph{\@startsection{subparagraph}{4}{\z@}{-1.5ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries\itshape}}
 
-% index macros
 \newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
 \newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
-\newcommand{\see}[1]{(see #1)}
+\newcommand{\see}{\protect\@ifstar\@ssee\@see}
+\newcommand{\@ssee}[1]{(See #1)}
+\newcommand{\@see}[1]{(see #1)}
+
+% index macros
 
 % Define some commands that produce formatted index entries suitable for cross-references.
@@ -153 +156 @@
 \newcommand{\newtermFontInline}{\emph}
 \newcommand{\newterm}{\protect\@ifstar\@snewterm\@newterm}
+\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
 \newcommand{\@newterm}[2][\@empty]{\lowercase{\def\temp{#2}}{\newtermFontInline{#2}}\ifx#1\@empty\index{\temp}\else\index{#1@{\protect#2}}\fi}
-\newcommand{\@snewterm}[2][\@empty]{{\newtermFontInline{#2}}\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
 
 % \snake{<identifier>}
@@ -201 +204 @@
 \newcommand{\VS}{\abbrevFont{vs}}
 \newcommand{\vs}{\VS\CheckPeriod}
-\makeatother
 
 \newenvironment{cquote}{%
-        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
+        \list{}{\topsep=\lst@aboveskip\parskip=0pt\partopsep=0pt\itemsep=0pt\parsep=0pt\listparindent=0pt\leftmargin=\parindentlnth\rightmargin=0pt}%
         \item\relax
+        \lstset{resetmargins=true}
 }{%
         \endlist
 }% cquote
+\makeatother
 
 \newenvironment{rationale}{%
@@ -349 +353 @@
 \fi%
 
+\usepackage{tabularx}                                   % if @ is used for lstMakeShortInline, allows @{}
+
 % Local Variables: %
 % tab-width: 4 %