diff options
-rw-r--r-- | dependencies.tex | 70 | ||||
-rw-r--r-- | ebuild-functions.tex | 38 | ||||
-rw-r--r-- | ebuild-vars.tex | 30 | ||||
-rw-r--r-- | names.tex | 10 | ||||
-rw-r--r-- | pkg-mgr-commands.tex | 20 | ||||
-rw-r--r-- | pms.tex | 5 |
6 files changed, 90 insertions, 83 deletions
diff --git a/dependencies.tex b/dependencies.tex index e61f74c..b2ccf5c 100644 --- a/dependencies.tex +++ b/dependencies.tex @@ -68,53 +68,53 @@ In particular, note that whitespace is not optional. \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{SRC\_URI} arrows} - \tablehead{ + \abovecaption{EAPIs supporting \t{SRC\_URI} arrows} \label{uri-arrows-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} arrows?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{uri-arrows-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{SRC\_URI} labels} - \tablehead{ + \abovecaption{EAPIs supporting \t{SRC\_URI} labels} \label{uri-labels-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{SRC\_URI} labels?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{uri-labels-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{PDEPEND} labels} - \tablehead{ + \abovecaption{EAPIs supporting \t{PDEPEND} labels} \label{pdepend-labels-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{PDEPEND} labels?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{pdepend-labels-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } @@ -185,71 +185,71 @@ EAPI not supporting \t{SLOT} dependencies. \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{SLOT} dependencies} - \tablehead{ + \abovecaption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{slot-deps-table} \t{0} & No \\ \t{1} & Named only \\ \t{kdebuild-1} & Named and operator \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{SLOT} dependencies} - \tablehead{ + \abovecaption{EAPIs supporting \t{SLOT} dependencies} \label{slot-deps-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{SLOT} dependencies?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{slot-deps-table} \t{0} & No \\ \t{1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} } \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting ranged dependencies} - \tablehead{ + \abovecaption{EAPIs supporting ranged dependencies} \label{range-deps-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports ranged dependencies?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{range-deps-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{USE} dependencies} - \tablehead{ + \abovecaption{EAPIs supporting \t{USE} dependencies} \label{use-deps-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{USE} dependencies?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{use-deps-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } diff --git a/ebuild-functions.tex b/ebuild-functions.tex index d980d18..75894f1 100644 --- a/ebuild-functions.tex +++ b/ebuild-functions.tex @@ -86,36 +86,38 @@ src_compile() { \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} - \tablehead{ + \abovecaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{ECONF\_SOURCE}?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{src-compile-table} \t{0} & No \\ \t{1} & Yes \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} + \abovecaption{EAPIs supporting \t{ECONF\_SOURCE} in \t{src\_compile}} \label{src-compile-table} + \begin{tabular}{ l l } \tablehead{ \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{ECONF\_SOURCE}?}} \\ \hline } - \begin{mpxtabular}{ l l } \label{src-compile-table} \t{0} & No \\ \t{1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} } \subsection{src\_test} @@ -138,21 +140,21 @@ The \t{src\_test} function may be disabled by \t{RESTRICT}. See section~\ref{res place). In others, it must always be run (excepting restrictions). See table~\ref{test-required-table} for which EAPIs fit into which category. + \begin{table} \begin{center} - \topcaption{EAPIs requiring \t{src\_test}} - \tablehead{ + \abovecaption{EAPIs requiring \t{src\_test}} \label{test-required-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Requires \t{src\_test}?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{test-required-table} \t{0} & At user option \\ \t{1} & At user option \\ \t{kdebuild-1} & Required \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } @@ -232,21 +234,21 @@ fully installed. It is the only ebuild function which may be interactive and pro \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{pkg\_info} on uninstalled packages} - \tablehead{ + \abovecaption{EAPIs supporting \t{pkg\_info} on uninstalled packages} \label{pkg-info-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{pkg\_info} on uninstalled packages?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{pkg-info-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } diff --git a/ebuild-vars.tex b/ebuild-vars.tex index fb24e3b..f55209b 100644 --- a/ebuild-vars.tex +++ b/ebuild-vars.tex @@ -57,37 +57,37 @@ operations upon other ebuilds or packages. \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{IUSE} defaults} - \tablehead{ + \abovecaption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{iuse-defaults-table} \t{0} & No \\ \t{1} & Yes \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} } { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{IUSE} defaults} - \tablehead{ + \abovecaption{EAPIs supporting \t{IUSE} defaults} \label{iuse-defaults-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{IUSE} defaults?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{iuse-defaults-table} \t{0} & No \\ \t{1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} } \section{Optional Ebuild-defined Variables} @@ -120,21 +120,21 @@ Ebuilds may define any of the following variables: \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs supporting \t{PROVIDE}} - \tablehead{ + \abovecaption{EAPIs supporting \t{PROVIDE}} \label{provide-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Supports \t{PROVIDE}?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{provide-table} \t{0} & Yes \\ \t{1} & Yes \\ \t{kdebuild-1} & No \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } @@ -74,21 +74,21 @@ This may optionally be followed by the suffix \t{-r} followed immediately by an \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs requiring \t{scm} support} - \tablehead{ + \abovecaption{EAPIs requiring \t{scm} support} \label{scm-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{Requires \t{scm} support?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{scm-table} \t{0} & No \\ \t{1} & No \\ \t{kdebuild-1} & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index a0e31be..07e3c34 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -13,9 +13,10 @@ behaviour. Some commands are banned in some EAPIs. If a banned command is called, the package manager must abort the build process indicating an error. + \begin{table} \begin{center} - \topcaption{Banned commands} - \tablehead{ + \abovecaption{Banned commands} \label{banned-commands-table} + \begin{tabular}{ l l l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{3}{c}{\textbf{Command banned?}} \\ @@ -24,14 +25,13 @@ behaviour. \multicolumn{1}{c}{\textbf{\t{dohtml}}} & \multicolumn{1}{c}{\textbf{\t{dosed}}} \\ \hline - } - \begin{mpxtabular}{ l l l l } \label{banned-commands-table} \t{0} & No & No & No \\ \t{1} & No & No & No \\ \t{kdebuild-1} & Yes & Yes & Yes \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } @@ -282,21 +282,21 @@ has returned. \IFKDEBUILDELSE { + \begin{table} \begin{center} - \topcaption{EAPIs where \t{dosym} makes the directory} - \tablehead{ + \abovecaption{EAPIs where \t{dosym} makes the directory} \label{dosym-table} + \begin{tabular}{ l l } \hline \multicolumn{1}{c}{\textbf{EAPI}} & \multicolumn{1}{c}{\textbf{\t{dosym} makes the directory?}} \\ \hline - } - \begin{mpxtabular}{ l l } \label{dosym-table} \t{0} & Yes \\ \t{1} & Yes \\ \t{kdebuild-1} & No \\ \hline - \end{mpxtabular} + \end{tabular} \end{center} + \end{table} }{ } @@ -35,6 +35,11 @@ \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} |