Proper use of caption package

The command definition for \abovecaption is just not needed as caption
has support for proper spacing (if that was the intent).  Reading the
manual has helped a lot of people before. :)

6 files changed, 19 insertions, 23 deletions

diff --git a/dependencies.tex b/dependencies.tex
index dbb1732..24bc392 100644
--- a/dependencies.tex
+++ b/dependencies.tex
@@ -70,7 +70,7 @@ In particular, note that whitespace is not optional.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{SRC\_URI} arrows} \label{uri-arrows-table}
+    \caption{EAPIs supporting \t{SRC\_URI} arrows} \label{uri-arrows-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -85,7 +85,7 @@ In particular, note that whitespace is not optional.
 
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{SRC\_URI} labels} \label{uri-labels-table}
+    \caption{EAPIs supporting \t{SRC\_URI} labels} \label{uri-labels-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -100,7 +100,7 @@ In particular, note that whitespace is not optional.
 
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{PDEPEND} labels} \label{pdepend-labels-table}
+    \caption{EAPIs supporting \t{PDEPEND} labels} \label{pdepend-labels-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -184,7 +184,7 @@ EAPI not supporting \t{SLOT} dependencies.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table}
+    \caption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table}
     \begin{tabular}{ l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -199,7 +199,7 @@ EAPI not supporting \t{SLOT} dependencies.
 }{
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table}
+    \caption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table}
     \begin{tabular}{ l l }
         \toprule
             \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -216,7 +216,7 @@ EAPI not supporting \t{SLOT} dependencies.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting ranged dependencies} \label{range-deps-table}
+    \caption{EAPIs supporting ranged dependencies} \label{range-deps-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -231,7 +231,7 @@ EAPI not supporting \t{SLOT} dependencies.
 
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{USE} dependencies} \label{use-deps-table}
+    \caption{EAPIs supporting \t{USE} dependencies} \label{use-deps-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
diff --git a/ebuild-functions.tex b/ebuild-functions.tex
index 99a697f..ae6799c 100644
--- a/ebuild-functions.tex
+++ b/ebuild-functions.tex
@@ -88,7 +88,7 @@ src_compile() {
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table}
+    \caption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -103,7 +103,7 @@ src_compile() {
 }{
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table}
+    \caption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table}
     \begin{tabular}{ l l }
     \tablehead{
         \toprule
@@ -140,7 +140,7 @@ The \t{src\_test} function may be disabled by \t{RESTRICT}. See section~\ref{res
 
     \begin{table}
     \centering
-    \abovecaption{EAPIs requiring \t{src\_test}} \label{test-required-table}
+    \caption{EAPIs requiring \t{src\_test}} \label{test-required-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -234,7 +234,7 @@ fully installed. It is the only ebuild function which may be interactive and pro
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{pkg\_info} on uninstalled packages} \label{pkg-info-table}
+    \caption{EAPIs supporting \t{pkg\_info} on uninstalled packages} \label{pkg-info-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
diff --git a/ebuild-vars.tex b/ebuild-vars.tex
index 09b9957..d75457f 100644
--- a/ebuild-vars.tex
+++ b/ebuild-vars.tex
@@ -59,7 +59,7 @@ operations upon other ebuilds or packages.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table}
+    \caption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -75,7 +75,7 @@ operations upon other ebuilds or packages.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table}
+    \caption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -120,7 +120,7 @@ Ebuilds may define any of the following variables:
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs supporting \t{PROVIDE}} \label{provide-table}
+    \caption{EAPIs supporting \t{PROVIDE}} \label{provide-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
diff --git a/names.tex b/names.tex
index c3b98b3..e47290d 100644
--- a/names.tex
+++ b/names.tex
@@ -76,7 +76,7 @@ This may optionally be followed by the suffix \t{-r} followed immediately by an
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs requiring \t{scm} support} \label{scm-table}
+    \caption{EAPIs requiring \t{scm} support} \label{scm-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 37d151e..45d4285 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -15,7 +15,7 @@ behaviour.
 
     \begin{table}
     \centering
-    \abovecaption{Banned commands} \label{banned-commands-table}
+    \caption{Banned commands} \label{banned-commands-table}
     \begin{tabular}{ l l l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
@@ -283,7 +283,7 @@ has returned.
 {
     \begin{table}
     \centering
-    \abovecaption{EAPIs where \t{dosym} makes the directory} \label{dosym-table}
+    \caption{EAPIs where \t{dosym} makes the directory} \label{dosym-table}
     \begin{tabular}{ l l }
         \toprule
         \multicolumn{1}{c}{\textbf{EAPI}} &
diff --git a/pms.tex b/pms.tex
index 7df75da..ea7f417 100644
--- a/pms.tex
+++ b/pms.tex
@@ -13,12 +13,13 @@
   hyperref,
   algorithm,
   algorithmic,
-  listings,
   xtab,
+  listings,
   booktabs,
   parskip,
   paralist
 }
+\usepackage[position=top]{caption}
 \usepackage[utf8]{inputenc}
 \usepackage[light]{draftcopy}
 \usepackage[draft,nomargin,inline,marginclue]{fixme}
@@ -36,11 +37,6 @@
 \newcommand{\note}[1]{\paragraph{Note:} #1}
 \newcommand{\TODOBUG}[2]{\fixme[inline]{(discussion on bug \##1) #2}}
 \newcommand{\TODO}[1]{\fixme[inline]{#1}}
-% the "caption" package seems to interfere with other things
-\newcommand{\abovecaption}[1]{
-    \setlength{\belowcaptionskip}{\abovecaptionskip}%
-    \setlength{\abovecaptionskip}{0pt}%
-    \caption{#1}}
 
 \usepackage{ifthen}
 \newboolean{ENABLE-ALL-OPTIONS}