Changes in doc/LaTeXmacros/common.tex [b52d900:9724df0]

File:

• doc/LaTeXmacros/common.tex (modified) (10 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 : Sat Apr  9 10:06:39 2016
-%% Update Count     : 1
+%% Last Modified On : Mon Jun 20 09:35:20 2016
+%% Update Count     : 178
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\setlength{\textheight}{9in}
+%\oddsidemargin 0.0in
+\renewcommand{\topfraction}{0.8}        % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\bottomfraction}{0.8}     % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\floatpagefraction}{0.8}  % float must be greater than X of the page before it is forced onto its own page
+\renewcommand{\textfraction}{0.0}       % the entire page maybe devoted to floats with no text on the page at all
+
+\lefthyphenmin=4
+\righthyphenmin=4
+
+\usepackage{pslatex}                            % reduce size of san serif font
+
+\usepackage[ignoredisplayed]{enumitem}  % do not affect trivlist
+\setlist{labelsep=1ex}% global
+\setlist[itemize]{topsep=0.5ex,parsep=0.25ex,itemsep=0.25ex,listparindent=\parindent,leftmargin=\parindent}% global
+\setlist[itemize,1]{label=\textbullet}% local
+%\renewcommand{\labelitemi}{{\raisebox{0.25ex}{\footnotesize$\bullet$}}}
+\setlist[enumerate]{listparindent=\parindent}% global
+\setlist[enumerate,2]{leftmargin=\parindent,labelsep=*,align=parleft,label=\alph*.}% local
+\setlist[description]{listparindent=\parindent,leftmargin=\parindent,labelsep=*}
+
 % Names used in the document.
 
-\newcommand{\CFA}{C$\mathbf\forall$\xspace}                             % set language symbolic name
-\newcommand{\CFL}{Cforall\xspace}                                               % set language text name
-\newcommand{\CC}{C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name
+\newcommand{\CFA}{C$\mathbf\forall$\xspace}              % set language symbolic name
+\newcommand{\CFL}{Cforall\xspace}                        % set language text name
+\newcommand{\CC}{\rm C\kern-.1em\hbox{+\kern-.25em+}\xspace} % CC symbolic name
 \def\c11{ISO/IEC C} % C11 name (cannot have numbers in latex command name)
 
@@ -27 +48 @@
 
 \makeatletter
+% parindent is relative, i.e., toggled on/off in environments like itemize, so store the value for
+% use rather than use \parident directly.
+\newlength{\parindentlnth}
+\setlength{\parindentlnth}{\parindent}
+
 % allow escape sequence in lstinline
 %\usepackage{etoolbox}
 %\patchcmd{\lsthk@TextStyle}{\let\lst@DefEsc\@empty}{}{}{\errmessage{failed to patch}}
 
-% make fontsize "small" slightly larger, specifically for san serif (helvetica) in program code
-\renewcommand\small{%
-   \@setfontsize\small{8.5}{11}%
-   \abovedisplayskip 8.5pt \@plus 3pt \@minus 4pt
-   \abovedisplayshortskip \z@ \@plus 2pt
-   \belowdisplayshortskip 4pt \@plus 2pt \@minus 2pt
-   \def\@listi{\leftmargin\leftmargini
-               \topsep 4pt \@plus 2pt \@minus 2pt
-               \parsep 2pt \@pluspt \@minuspt
-               \itemsep \parsep}%
-   \belowdisplayskip \abovedisplayskip
-}
-\usepackage{relsize}                                                                    % must be after change to small or selects old size
+\usepackage{pslatex}                                                                    % reduce size of san serif font
+\usepackage{relsize}                                    % must be after change to small or selects old size
 
 % reduce size of chapter/section titles
@@ -66 +81 @@
     \vskip 50\p@
   }}
-\renewcommand\section{\@startsection{section}{1}{\z@}{-3.0ex \@plus -1ex \@minus -.2ex}{1.0ex \@plus .2ex}{\normalfont\large\bfseries}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}{-2.5ex \@plus -1ex \@minus -.2ex}{1.0ex \@plus .2ex}{\normalfont\normalsize\bfseries}}
+\renewcommand\section{\@startsection{section}{1}{\z@}{-3.5ex \@plus -1ex \@minus -.2ex}{1.75ex \@plus .2ex}{\normalfont\large\bfseries}}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}{-3.25ex \@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\normalsize\bfseries}}
 \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}{-2.5ex \@plus -1ex \@minus -.2ex}{1.0ex \@plus .2ex}{\normalfont\normalsize\bfseries}}
 \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}{-2.0ex \@plus -1ex \@minus -.2ex}{-1em}{\normalfont\normalsize\bfseries}}
@@ -75 +90 @@
 \newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
 \newcommand{\see}[1]{\emph{see} #1}
-
-% reduce bullet size and spacing for "itemize" macro
-\renewcommand{\labelitemi}{{\raisebox{0.25ex}{\footnotesize$\bullet$}}}
-\renewenvironment{itemize}{\begin{list}{\labelitemi}{\topsep=5pt\itemsep=5pt\parsep=0pt}}{\end{list}}
 
 % Define some commands that produce formatted index entries suitable for cross-references.
@@ -109 +120 @@
 \newcommand{\@sIndex}[2][\@empty]{#2\ifx#1\@empty\index{#2}\else\index{#1@{\protect#2}}\fi}
 
+\newcommand{\Indexc}[1]{\lstinline$#1$\index{#1@\lstinline$#1$}}
+\newcommand{\indexc}[1]{\index{#1@\lstinline$#1$}}
+
 \newcommand{\newtermFontInline}{\emph}
 \newcommand{\newterm}{\@ifstar\@snewterm\@newterm}
@@ -116 +130 @@
 
 \newenvironment{quote2}{%
-        \list{}{\lstset{resetmargins=true}\leftmargin=\parindent\rightmargin\leftmargin}%
+        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}%
         \item\relax
 }{%
@@ -122 +136 @@
 }% quote2
 \newenvironment{rationale}{%
-  \begin{quotation}\noindent$\Box$\enspace
+  \begin{quote2}\noindent$\Box$\enspace
 }{%
-  \hfill\enspace$\Box$\end{quotation}
+  \hfill\enspace$\Box$\end{quote2}
 }%
 
 % blocks and titles
 \newcommand{\define}[1]{\emph{#1\/}\index{#1}}
-\newcommand{\rewrite}{\(\Rightarrow\)}
 \newcommand{\rewriterules}{\paragraph{Rewrite Rules}~\par\noindent}
 \newcommand{\examples}{\paragraph{Examples}~\par\noindent}
@@ -137 +150 @@
 
 % BNF macros
-\def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]}
-\let\endsyntax=\endtrivlist
-\newcommand{\lhs}[1]{\par{\emph{#1:}}\index{#1@{\emph{#1}}|italic}}
-\newcommand{\rhs}{\hfil\break\hbox{\hskip1in}}
-\newcommand{\oldlhs}[1]{\emph{#1: \ldots}\index{#1@{\emph{#1}}|italic}}
-\newcommand{\nonterm}[1]{\emph{#1\/}\index{#1@{\emph{#1}}|italic}}
+\newenvironment{syntax}{
+\paragraph{Syntax}
+\begin{quote2}
+\begin{description}[noitemsep,leftmargin=\parindentlnth]
+}{
+\end{description}
+\end{quote2}
+}
+% \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]}
+%\let\endsyntax=\endtrivlist
+\newcommand{\lhs}[1]{\item[\emph{#1:}\index{#1@{\emph{#1}}|italic}]~\ignorespaces}
+\newcommand{\oldlhs}[1]{\item[\emph{#1:}\index{#1@{\emph{#1}}|italic}~\dots]~}
+\newcommand{\rhs}{\hfil\newline}
+\newcommand{\nonterm}[1]{\emph{#1}\index{#1@{\emph{#1}}|italic}}
 \newcommand{\opt}{$_{opt}$\ }
 
@@ -179 +200 @@
                 fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
                 _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
-        moredelim=**[is][\color{red}]{`}{`}, % red highlighting of program text
 }%
 
@@ -185 +205 @@
 language=CFA,
 columns=flexible,
-basicstyle=\sf\relsize{-1},
+basicstyle=\linespread{0.9}\sf,
+stringstyle=\tt,
 tabsize=4,
-xleftmargin=\parindent,
-escapechar=@,
+xleftmargin=\parindentlnth,
+extendedchars=true,
+escapechar=§,
 mathescape=true,
 keepspaces=true,
 showstringspaces=false,
 showlines=true,
-aboveskip=6pt,
-belowskip=4pt,
-literate={\\`}{\raisebox{0.3ex}{\ttfamily\upshape \hspace*{-2pt}`}}1, % escape \`, otherwise used for red highlighting
+aboveskip=4pt,
+belowskip=3pt,
+moredelim=**[is][\color{red}]{®}{®}, % red highlighting
+moredelim=**[is][\color{blue}]{ß}{ß}, % blue highlighting
+moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting
+moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % temporarily turn off keywords
+% replace/adjust listing characters that look bad in sanserif
+literate={-}{\raisebox{-0.15ex}{\texttt{-}}}1 {^}{\raisebox{0.6ex}{$\scriptscriptstyle\land\,$}}1
+        {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {_}{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
+        {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {...}{$\dots$}2,
 }%
 
-\makeatletter
-% replace/adjust listings characters that look bad in sanserif
-\lst@CCPutMacro
-\lst@ProcessOther{"22}{\lst@ttfamily{"}{\raisebox{0.3ex}{\ttfamily\upshape "}}} % replace double quote
-\lst@ProcessOther{"27}{\lst@ttfamily{'}{\raisebox{0.3ex}{\ttfamily\upshape '\hspace*{-2pt}}}} % replace single quote
-\lst@ProcessOther{"2D}{\lst@ttfamily{-}{\ttfamily\upshape -}} % replace minus
-\lst@ProcessOther{"3C}{\lst@ttfamily{<}{\texttt{<}}} % replace less than
-\lst@ProcessOther{"3E}{\lst@ttfamily{<}{\texttt{>}}} % replace greater than
-\lst@ProcessOther{"5E}{\raisebox{0.4ex}{$\scriptstyle\land\,$}} % replace circumflex
-\lst@ProcessOther{"5F}{\lst@ttfamily{\char95}{{\makebox[1.2ex][c]{\rule{1ex}{0.1ex}}}}} % replace underscore
-\lst@ProcessOther{"60}{\lst@ttfamily{`}{\raisebox{0.3ex}{\ttfamily\upshape \hspace*{-2pt}`}}} % replace backquote
-\lst@ProcessOther{"7E}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}} % replace tilde
-%\lst@ProcessOther{"7E}{\raisebox{-.4ex}[1ex][0pt]{\textasciitilde}} % lower tilde
-\@empty\z@\@empty % NECESSARY DO NOT REMOVE
-\makeatother
+\lstMakeShortInline©    % single-character for \lstinline
 
 % Local Variables: %