From 64b7e39503022a8c0ce58857cea7f25d57369757 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 10 Dec 2012 01:29:36 +0000 Subject: chet (9dec12) git-svn-id: svn://tug.org/texlive/trunk@28481 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/chet/chetdoc.pdf | Bin 168428 -> 168140 bytes Master/texmf-dist/doc/latex/chet/chetdoc.tex | 31 +- Master/texmf-dist/doc/latex/chet/chetmacros.txt | 77 ----- Master/texmf-dist/tex/latex/chet/chet.sty | 386 ++++++------------------ 4 files changed, 107 insertions(+), 387 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/chet/chetmacros.txt diff --git a/Master/texmf-dist/doc/latex/chet/chetdoc.pdf b/Master/texmf-dist/doc/latex/chet/chetdoc.pdf index 6887adabe30..b1654d897ce 100644 Binary files a/Master/texmf-dist/doc/latex/chet/chetdoc.pdf and b/Master/texmf-dist/doc/latex/chet/chetdoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/chet/chetdoc.tex b/Master/texmf-dist/doc/latex/chet/chetdoc.tex index 2c719909dc6..41edce7e1e7 100644 --- a/Master/texmf-dist/doc/latex/chet/chetdoc.tex +++ b/Master/texmf-dist/doc/latex/chet/chetdoc.tex @@ -1,5 +1,5 @@ % chetdoc.tex -% Copyright 2011 Andreas Stergiou +% Copyright 2012 Andreas Stergiou % % This is an example file for the use of the package chet. % @@ -33,9 +33,9 @@ University of Somewhere Else, \ldots} inspired by Paul Ginsparg's \texttt{harvmac}, but uses \LaTeXe\ instead of \TeX. The commands provided are to be used as faster alternatives to \LaTeXe's default environments (which can all still be used with -\texttt{chet}). +\texttt{chet}). -\begin{center} +\begin{center} % (\texttt{chet} can be found at \href{http://www.ctan.org/pkg/chet}{\texttt{http://www.ctan.org/pkg/chet}}.) @@ -47,7 +47,7 @@ inspired by Paul Ginsparg's \texttt{harvmac}, but uses \LaTeXe\ instead of \maketitle \toc - + \newsec{Basic commands}[SecLabel] % \subsec{Preamble} @@ -159,15 +159,15 @@ dimensions as demonstrated in \rcite{FGS}. \ack{I would like to thank Ken Intriligator, Ben Grinstein, and Jean-Fran\c{c}ois Fortin for adopting \texttt{chet}, and for their numerous -suggestions and tips that helped me improve the package. +suggestions and tips that helped me improve the package. Several \LaTeX\ packages are called by default by \texttt{chet}. In -alphabetical order, they are \texttt{amsmath}, \texttt{appendix}, -\texttt{caption}, \texttt{cite}, \texttt{collref}, \texttt{datetime}, -\texttt{filecontents}, \texttt{footmisc}, \texttt{geometry}, -\texttt{hyperref}, \texttt{manyfoot}, \texttt{pifont}, \texttt{showkeys}, -\texttt{tocloft}, \texttt{xparse}, and \texttt{xspace}. I would like to -thank the authors of these great packages for their amazing work!} +alphabetical order, they are \texttt{amsmath}, \texttt{caption}, +\texttt{cite}, \texttt{collref}, \texttt{datetime}, \texttt{filecontents}, +\texttt{footmisc}, \texttt{geometry}, \texttt{hyperref}, \texttt{manyfoot}, +\texttt{pifont}, \texttt{showkeys}, \texttt{tocloft}, \texttt{xparse}, and +\texttt{xspace}. I would like to thank the authors of these great packages +for their amazing work!} \appendix @@ -188,10 +188,11 @@ Commands often used include \newsec{Conference proceedings} % If you want to use the macros for equations and sections defined in -\texttt{chet}, but have to use another \texttt{.sty} file, -for example for conference proceedings, then you can just copy and paste -the contents of \texttt{chetmacros.txt} in the preamble of your -\texttt{.tex} file. +\texttt{chet}, but have to use another \texttt{.sty} file, for example for +conference proceedings, then you can just use the option +\texttt{macrosonly} when you call \texttt{chet}, i.e.\ instead of +\verb1\usepackage{chet}1, include \verb1\usepackage[macrosonly]{chet}1 in +the preamble of your \texttt{.tex} file. \bibliography{chetdocbib} diff --git a/Master/texmf-dist/doc/latex/chet/chetmacros.txt b/Master/texmf-dist/doc/latex/chet/chetmacros.txt deleted file mode 100644 index 793328cc79e..00000000000 --- a/Master/texmf-dist/doc/latex/chet/chetmacros.txt +++ /dev/null @@ -1,77 +0,0 @@ -\usepackage{xparse} -\usepackage{xspace} -% Numbered equation with optional label -\NewDocumentCommand\eqn{mo}{% - \IfNoValueTF{#2} - {\[ #1 \]} - {\begin{equation}\label{#2} #1 \end{equation} \expandafter\newcommand\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces} -} - -% Numbered aligned equation with optional label in the vertical middle -\NewDocumentCommand\eqna{mo}{% - \IfNoValueTF{#2} - {\begin{align*} #1 \end{align*}} - {\begin{equation}\label{#2}\begin{split} #1 \end{split}\end{equation} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces} -} - -% Numbered subequations -% Two subequations -\NewDocumentCommand\twoseqn{momoo}{% - \IfNoValueTF{#5} - {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces} - {\begin{subequations}\label{#5}\begin{align} #1\label{#2} \\ #3 \label{#4} \end{align}\end{subequations} \expandafter\def\csname #5\endcsname{\eqref{#5}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces} -} -% Three subequations -\NewDocumentCommand\threeseqn{momomoo}{% - \IfNoValueTF{#7} - {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces} - {\begin{subequations}\label{#7}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \end{align}\end{subequations} \expandafter\def\csname #7\endcsname{\eqref{#7}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces} -} - -% Four subequations -\NewDocumentCommand\fourseqn{momomomoo}{% - \IfNoValueTF{#9} - {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \\ #7\label{#8} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces \expandafter\def\csname #8\endcsname{\eqref{#8}\xspace}\ignorespaces} - {\begin{subequations}\label{#9}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \\ #7\label{#8} \end{align}\end{subequations} \expandafter\def\csname #9\endcsname{\eqref{#9}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces \expandafter\def\csname #8\endcsname{\eqref{#8}\xspace}\ignorespaces} -} - -\newcommand{\rcite}{\cite} -\newcommand{\draftmode}{\usepackage[notref,notcite]{showkeys}} -\providecommand*\showkeyslabelformat[1]{\normalfont\sffamily\footnotesize#1} -\newcommand{\foot}{\footnote} - -% Sections and subsections -\NewDocumentCommand\newsec{mo}{% - \IfNoValueTF{#2} - {\section{#1}} - {\section{#1}\label{#2} \expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} -} -\NewDocumentCommand\subsec{mo}{% - \IfNoValueTF{#2} - {\subsection{#1}} - {\subsection{#1}\label{#2}\expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} -} -\NewDocumentCommand\subsubsec{mo}{% - \IfNoValueTF{#2} - {\subsubsection{#1}} - {\subsubsection{#1}\label{#2}\expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} -} - -\makeatletter -\renewcommand\section{\@startsection {section}{1}{\z@}% -{-6ex \@plus -1ex \@minus -.2ex}% -{2.3ex \@plus.2ex}% -{\bfseries}} -\makeatother -\makeatletter -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\itshape}} -\makeatother -\makeatletter -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-3.25ex\@plus -1ex \@minus -.2ex}% - {1.5ex \@plus .2ex}% - {\itshape}} -\makeatother \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/chet/chet.sty b/Master/texmf-dist/tex/latex/chet/chet.sty index d2fa5612e71..c193f413e9a 100644 --- a/Master/texmf-dist/tex/latex/chet/chet.sty +++ b/Master/texmf-dist/tex/latex/chet/chet.sty @@ -1,5 +1,5 @@ % chet.sty -% Copyright 2011 Andreas Stergiou +% Copyright 2012 Andreas Stergiou % % This package is supposed to streamline latex typesetting and give the % look and feel of harvmac to a paper, with the use of LaTex2e. @@ -15,308 +15,105 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{chet} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% chetapp %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% chetapp.sty -% Copyright 2011 Andreas Stergiou -% -% This is basically a copy of appendix.sty with minor changes. -% -%% This is file `appendix.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% appendix.dtx (with options: `usc') -%% -%% ----------------------------------------------------------------- -%% Author: Peter Wilson, Herries Press -%% Maintainer: Will Robertson (will dot robertson at latex-project dot org) -%% Copyright 1998--2004 Peter R. Wilson -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any -%% later version: -%% -%% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Will Robertson. -%% -%% This work consists of the files listed in the README file. -%% ----------------------------------------------------------------- -%% -\newif\if@chapter@pp\@chapter@ppfalse -\newif\if@knownclass@pp\@knownclass@ppfalse -\@ifundefined{chapter}{% - \@ifundefined{section}{}{\@knownclass@pptrue}}{% - \@chapter@pptrue\@knownclass@pptrue} -\providecommand{\phantomsection}{} -\newcounter{@pps} - \renewcommand{\the@pps}{\alph{@pps}} -\newif\if@pphyper - \@pphyperfalse -\AtBeginDocument{% - \@ifpackageloaded{hyperref}{\@pphypertrue}{}} - -\newif\if@dotoc@pp\@dotoc@ppfalse -\newif\if@dotitle@pp\@dotitle@ppfalse -\newif\if@dotitletoc@pp\@dotitletoc@ppfalse -\newif\if@dohead@pp\@dohead@ppfalse -\newif\if@dopage@pp\@dopage@ppfalse -\DeclareOption{toc}{\@dotoc@pptrue} -\DeclareOption{title}{\@dotitle@pptrue} -\DeclareOption{titletoc}{\@dotitletoc@pptrue} -\DeclareOption{header}{\@dohead@pptrue} -\DeclareOption{page}{\@dopage@pptrue} -\ExecuteOptions{title,titletoc} -\ProcessOptions\relax -\newcommand{\@ppendinput}{} -\if@knownclass@pp\else - \PackageWarningNoLine{appendix}% - {There is no \protect\chapter\space or \protect\section\space command.\MessageBreak - The appendix package will not be used} - \renewcommand{\@ppendinput}{\endinput} -\fi -\@ppendinput - -\newcommand{\appendixtocon}{\@dotoc@pptrue} -\newcommand{\appendixtocoff}{\@dotoc@ppfalse} -\newcommand{\appendixpageon}{\@dopage@pptrue} -\newcommand{\appendixpageoff}{\@dopage@ppfalse} -\newcommand{\appendixtitleon}{\@dotitle@pptrue} -\newcommand{\appendixtitleoff}{\@dotitle@ppfalse} -\newcommand{\appendixtitletocon}{\@dotitletoc@pptrue} -\newcommand{\appendixtitletocoff}{\@dotitletoc@ppfalse} -\newcommand{\appendixheaderon}{\@dohead@pptrue} -\newcommand{\appendixheaderoff}{\@dohead@ppfalse} -\newcounter{@ppsavesec} -\newcounter{@ppsaveapp} -\setcounter{@ppsaveapp}{0} -\newcommand{\@ppsavesec}{% - \if@chapter@pp \setcounter{@ppsavesec}{\value{chapter}} \else - \setcounter{@ppsavesec}{\value{section}} \fi} -\newcommand{\@pprestoresec}{% - \if@chapter@pp \setcounter{chapter}{\value{@ppsavesec}} \else - \setcounter{section}{\value{@ppsavesec}} \fi} -\newcommand{\@ppsaveapp}{% - \if@chapter@pp \setcounter{@ppsaveapp}{\value{chapter}} \else - \setcounter{@ppsaveapp}{\value{section}} \fi} -\newcommand{\restoreapp}{% - \if@chapter@pp \setcounter{chapter}{\value{@ppsaveapp}} \else - \setcounter{section}{\value{@ppsaveapp}} \fi} -\providecommand{\appendixname}{Appendix} -\newcommand{\appendixtocname}{Appendices} -\newcommand{\appendixpagename}{Appendices} -\newcommand{\appendixpage}{% - \if@chapter@pp \@chap@pppage \else \@sec@pppage \fi -} -\newcommand{\clear@ppage}{% - \if@openright\cleardoublepage\else\clearpage\fi} - -\newcommand{\@chap@pppage}{% - \clear@ppage - \thispagestyle{plain}% - \if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi - \null\vfil - \markboth{}{}% - {\centering - \interlinepenalty \@M - \normalfont - \Huge \bfseries \appendixpagename\par}% - \if@dotoc@pp - \addappheadtotoc - \fi - \vfil\newpage - \if@twoside - \if@openright - \null - \thispagestyle{empty}% - \newpage - \fi - \fi - \if@tempswa - \twocolumn - \fi -} +\RequirePackage{kvoptions} + +\SetupKeyvalOptions{% + family=Chet, + prefix=Chet@} + +\DeclareBoolOption{macrosonly} + +\ProcessKeyvalOptions* + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\ifChet@macrosonly -\newcommand{\@sec@pppage}{% - \par - \addvspace{4ex}% - \@afterindentfalse - {\parindent \z@ \raggedright - \interlinepenalty \@M - \normalfont - \huge \bfseries \appendixpagename% - \markboth{}{}\par}% - \if@dotoc@pp - \addappheadtotoc - \fi - \nobreak - \vskip 3ex - \@afterheading +\usepackage{xparse} +\usepackage{xspace} +\usepackage{amsmath} +\usepackage{filecontents} +\usepackage[linktocpage]{hyperref} + +% Numbered equation with optional label +\NewDocumentCommand\eqn{mo}{% + \IfNoValueTF{#2} + {\[ #1 \]} + {\begin{equation}\label{#2} #1 \end{equation} \expandafter\newcommand\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces} } -\newif\if@pptocpage - \@pptocpagetrue -\newcommand{\noappendicestocpagenum}{\@pptocpagefalse} -\newcommand{\appendicestocpagenum}{\@pptocpagetrue} -\newcommand{\addappheadtotoc}{% - \phantomsection - \if@chapter@pp - \if@pptocpage - \addcontentsline{toc}{chapter}{\appendixtocname}% - \else - \if@pphyper - \addtocontents{toc}% - {\protect\contentsline{chapter}{\appendixtocname}{}{\@currentHref}}% - \else - \addtocontents{toc}% - {\protect\contentsline{chapter}{\appendixtocname}{}}% - \fi - \fi - \else - \if@pptocpage - \addcontentsline{toc}{section}{\appendixtocname}% - \else - \if@pphyper - \addtocontents{toc}% - {\protect\contentsline{section}{\appendixtocname}{}{\@currentHref}}% - \else - \addtocontents{toc}% - {\protect\contentsline{section}{\appendixtocname}{}}% - \fi - \fi - \fi +% Numbered aligned equation with optional label in the vertical middle +\NewDocumentCommand\eqna{mo}{% + \IfNoValueTF{#2} + {\begin{align*} #1 \end{align*}} + {\begin{equation}\label{#2}\begin{split} #1 \end{split}\end{equation} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces} } -\providecommand{\theH@pps}{\alph{@pps}} - -\newcommand{\@resets@pp}{\par - \@ppsavesec - \stepcounter{@pps} - \setcounter{section}{0}% - \if@chapter@pp - \setcounter{chapter}{0}% - \renewcommand\@chapapp{\appendixname}% - \renewcommand\thechapter{\@Alph\c@chapter}% - \else - \setcounter{subsection}{0}% - \renewcommand\thesection{\@Alph\c@section}% - \fi - \if@pphyper - \if@chapter@pp - \renewcommand{\theHchapter}{\theH@pps.\Alph{chapter}}% - \else - \renewcommand{\theHsection}{\theH@pps.\Alph{section}}% - \fi - \def\Hy@chapapp{\appendixname}% - \fi - \restoreapp +% Numbered subequations +% Two subequations +\NewDocumentCommand\twoseqn{momoo}{% + \IfNoValueTF{#5} + {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces} + {\begin{subequations}\label{#5}\begin{align} #1\label{#2} \\ #3 \label{#4} \end{align}\end{subequations} \expandafter\def\csname #5\endcsname{\eqref{#5}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces} +} +% Three subequations +\NewDocumentCommand\threeseqn{momomoo}{% + \IfNoValueTF{#7} + {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces} + {\begin{subequations}\label{#7}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \end{align}\end{subequations} \expandafter\def\csname #7\endcsname{\eqref{#7}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces} } -\newenvironment{appendices}{% - \@resets@pp - \if@dotoc@pp - \if@dopage@pp % both page and toc - \if@chapter@pp % chapters - \clear@ppage - \fi - \appendixpage - \else % toc only - \if@chapter@pp % chapters - \clear@ppage - \fi - \addappheadtotoc - \fi - \else - \if@dopage@pp % page only - \appendixpage - \fi - \fi - \if@chapter@pp - \if@dotitletoc@pp \@redotocentry@pp{chapter} \fi - \else - \if@dotitletoc@pp \@redotocentry@pp{section} \fi - \if@dohead@pp - \def\sectionmark##1{% - \if@twoside - \markboth{\@formatsecmark@pp{##1}}{} - \else - \markright{\@formatsecmark@pp{##1}}{} - \fi} - \fi - \if@dotitle@pp - \def\sectionname{\appendixname} - \def\@seccntformat##1{\@ifundefined{##1name}{}{\csname ##1name\endcsname\ }% - \csname the##1\endcsname.\hspace{4.6pt}} - \fi - \fi}{% - \@ppsaveapp\@pprestoresec} - -\newcommand{\setthesection}{\thechapter.\Alph{section}} -\newcommand{\setthesubsection}{\thesection.\Alph{subsection}} - -\newcommand{\@resets@ppsub}{\par - \stepcounter{@pps} - \if@chapter@pp - \setcounter{section}{0} - \renewcommand{\thesection}{\setthesection} - \else - \setcounter{subsection}{0} - \renewcommand{\thesubsection}{\setthesubsection} - \fi - \if@pphyper - \if@chapter@pp - \renewcommand{\theHsection}{\theH@pps.\setthesection}% - \else - \renewcommand{\theHsubsection}{\theH@pps.\setthesubsection}% - \fi - \def\Hy@chapapp{\appendixname}% - \fi +% Four subequations +\NewDocumentCommand\fourseqn{momomomoo}{% + \IfNoValueTF{#9} + {\begin{subequations}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \\ #7\label{#8} \end{align}\end{subequations} \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces \expandafter\def\csname #8\endcsname{\eqref{#8}\xspace}\ignorespaces} + {\begin{subequations}\label{#9}\begin{align} #1\label{#2} \\ #3 \label{#4} \\ #5 \label{#6} \\ #7\label{#8} \end{align}\end{subequations} \expandafter\def\csname #9\endcsname{\eqref{#9}\xspace}\ignorespaces \expandafter\def\csname #2\endcsname{\eqref{#2}\xspace}\ignorespaces \expandafter\def\csname #4\endcsname{\eqref{#4}\xspace}\ignorespaces \expandafter\def\csname #6\endcsname{\eqref{#6}\xspace}\ignorespaces \expandafter\def\csname #8\endcsname{\eqref{#8}\xspace}\ignorespaces} } -\newenvironment{subappendices}{% - \@resets@ppsub - \if@chapter@pp - \if@dotitletoc@pp \@redotocentry@pp{section} \fi - \if@dotitle@pp - \def\sectionname{\appendixname} - \def\@seccntformat##1{\@ifundefined{##1name}{}{\csname ##1name\endcsname\ }% - \csname the##1\endcsname\quad} - \fi - \else - \if@dotitletoc@pp \@redotocentry@pp{subsection} \fi - \if@dotitle@pp - \def\subsectionname{\appendixname} - \def\@seccntformat##1{\@ifundefined{##1name}{}{\csname ##1name\endcsname\ }% - \csname the##1\endcsname.\hspace{4.6pt}} - \fi - \fi}{} - -\newcommand{\@formatsecmark@pp}[1]{% - \MakeUppercase{\appendixname\space - \ifnum \c@secnumdepth >\z@ - \thesection\quad - \fi - #1}} -\newcommand{\@redotocentry@pp}[1]{% - \let\oldacl@pp=\addcontentsline - \def\addcontentsline##1##2##3{% - \def\@pptempa{##1}\def\@pptempb{toc}% - \ifx\@pptempa\@pptempb - \def\@pptempa{##2}\def\@pptempb{#1}% - \ifx\@pptempa\@pptempb -\oldacl@pp{##1}{##2}{\appendixname\space ##3}% - \else - \oldacl@pp{##1}{##2}{##3}% - \fi - \else - \oldacl@pp{##1}{##2}{##3}% - \fi} +\newcommand{\rcite}{\cite} +\newcommand{\draftmode}{\usepackage[notref,notcite]{showkeys}} +\providecommand*\showkeyslabelformat[1]{\normalfont\sffamily\footnotesize#1} +\newcommand{\foot}{\footnote} + +% Sections and subsections +\NewDocumentCommand\newsec{mo}{% + \IfNoValueTF{#2} + {\section{#1}} + {\section{#1}\label{#2} \expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} +} +\NewDocumentCommand\subsec{mo}{% + \IfNoValueTF{#2} + {\subsection{#1}} + {\subsection{#1}\label{#2}\expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} +} +\NewDocumentCommand\subsubsec{mo}{% + \IfNoValueTF{#2} + {\subsubsection{#1}} + {\subsubsection{#1}\label{#2}\expandafter\gdef\csname #2\endcsname{\ref{#2}\xspace}\ignorespaces} } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\makeatletter +\renewcommand\section{\@startsection {section}{1}{\z@}% +{-6ex \@plus -1ex \@minus -.2ex}% +{2.3ex \@plus.2ex}% +{\bfseries}} +\makeatother +\makeatletter +\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\itshape}} +\makeatother +\makeatletter +\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\itshape}} +\makeatother + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\else \usepackage{xparse} \usepackage{xspace} @@ -417,8 +214,6 @@ % Dot after section number \def\@seccntformat#1{\csname the#1\endcsname.\hspace{4.6pt}} -\renewcommand{\appendix}{\appendices} - % Acknowledgements \newenvironment{acknowledgments}{\vspace{12pt}\begin{center}\textbf{Acknowledgments}\end{center}\vspace{-12pt}}{} @@ -494,6 +289,7 @@ \noindent\@date \end{titlepage} } +\fi \endinput % -- cgit v1.2.3