Merging work.

Author: gvwilson

html-settings.tex

@@ -27,36 +27,34 @@
 \newcommand{\htmltag}[1]{\texttt{{\textless}{#1}{\textgreater}}}
 
 % Chapters, sections, and appendices with labels.
-\newcommand{\chaplbl}[2]{\chapter{#1}\label{#2}}
-\newcommand{\seclbl}[2]{\section{#1}\label{#2}}
 \newcommand{\appref}[1]{Appendix~\ref{#1}}
 \newcommand{\chapref}[1]{Chapter~\ref{#1}}
 \newcommand{\figref}[1]{Figure~\ref{#1}}
 \newcommand{\secref}[1]{Section~\ref{#1}}
 \newcommand{\tblref}[1]{Table~\ref{#1}}
 
+% Always put \label after \caption.
+\newcommand{\caplbl}[2]{\caption{{#1}\label{#2}}}
+
 % Image figures.
 \newcommand{\figimg}[3]{\begin{figure}%
 \centering%
 \includegraphics[width=\textwidth]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % PDF figures.
 \newcommand{\figpdf}[3]{\begin{figure}%
 \centering%
 \includegraphics[scale=0.6]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % PDF figures forcing location.
 \newcommand{\figpdfhere}[3]{\begin{figure}[H]%
 \centering%
 \includegraphics[scale=0.6]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % Exercise headings.

htmlcss.tex

@@ -51,8 +51,7 @@ \section{Text}\label{s:htmlcss-text}
 Copyright & \texttt{\©} & © \\
 Plus/minus & \texttt{\±} & ± \\
 Micro & \texttt{\µ} & µ \\
-\caption{HTML Escapes}
-\label{t:htmlcss-escapes}
+\caplbl{HTML Escapes}{t:htmlcss-escapes}
 \end{longtable}
 
 The first two are self-explanatory,

legacy.tex

@@ -19,8 +19,7 @@ \section{Equality}\label{s:legacy-equality}
 empty array plus empty object & \texttt{[]\ +\ \{\}} & \texttt{\{\}} (empty object) \\
 empty object plus empty array & \texttt{\{\}\ +\ []} & \texttt{0} (number zero) \\
 empty object plus empty object & \texttt{\{\}\ +\ \{\}} & \texttt{NaN} (not a number) \\
-\caption{Surprising Results}
-\label{t:legacy-surprises}
+\caplbl{Surprising Results}{t:legacy-surprises}
 \end{longtable}
 
 In order to understand this, we need to know several things

pdf-settings.tex

@@ -113,36 +113,34 @@
 \newcommand{\htmltag}[1]{{\textless}{#1}{\textgreater}}
 
 % Chapters, sections, and appendices with labels.
-\newcommand{\chaplbl}[2]{\chapter{#1}\label{#2}}
-\newcommand{\seclbl}[2]{\section{#1}\label{#2}}
 \newcommand{\appref}[1]{Appendix~\ref{#1}}
 \newcommand{\chapref}[1]{Chapter~\ref{#1}}
 \newcommand{\figref}[1]{Figure~\ref{#1}}
 \newcommand{\secref}[1]{Section~\ref{#1}}
 \newcommand{\tblref}[1]{Table~\ref{#1}}
 
+% Always put \label after \caption.
+\newcommand{\caplbl}[2]{\caption{{#1}\label{#2}}}
+
 % Image figures.
 \newcommand{\figimg}[3]{\begin{figure}%
 \centering%
 \includegraphics[width=\textwidth]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % PDF figures.
 \newcommand{\figpdf}[3]{\begin{figure}%
 \centering%
 \includegraphics[scale=0.6]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % PDF figures forcing location.
 \newcommand{\figpdfhere}[3]{\begin{figure}[H]%
 \centering%
 \includegraphics[scale=0.6]{#1}%
-\caption{#2}%
-\label{#3}%
+\caplbl{#2}{#3}%
 \end{figure}}
 
 % Exercise headings.

regexp.tex

@@ -113,8 +113,7 @@ \chapter{Regular Expressions}\label{s:regexp}
 & yes & contains either ``Dr'' or ``Prof'' followed by literal '.'
 \\
 
-\caption{Regular Expression Matches}
-\label{t:regexp-examples}
+\caplbl{Regular Expression Matches}{t:regexp-examples}
 \end{longtable}
 
 This is a lot to digest,

server.tex

@@ -104,8 +104,7 @@ \section{HTTP}\label{s:server-http}
 500  & Internal Server Error & A server error occurred while handling the request \\
 601  & Connection Timed Out  & The server did not respond before the connection timed out
 \end{tabular}
-\caption{HTTP Status Codes}
-\label{t:server-codes}
+\caplbl{HTTP Status Codes}{t:server-codes}
 \end{table}
 
 One final thing we need to understand is the structure and interpretation of URLs.