[gentoo-commits] proj/pms:eapi-7 commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     f90b3c6a9ec8ecd4988c58e1c781307036e7949e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 16:10:36 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 16:10:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=f90b3c6a

Improve positioning of tables and other floats.

No changes of text.

 names.tex            | 14 ++++++------
 pkg-mgr-commands.tex | 61 ++++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/names.tex b/names.tex
index d26fed6..e4c3975 100644
--- a/names.tex
+++ b/names.tex
@@ -78,7 +78,7 @@ If a sub-algorithm returns a decision, then that is the result of the whole comp
 if it terminates without returning a decision, the process continues from the point
 from which it was invoked.
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison top-level logic} \label{alg:version-comparison}
 \begin{algorithmic}[1]
     \STATE let $A$ and $B$ be the versions to be compared
@@ -90,7 +90,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for numeric components} \label{alg:version-comparison-numeric}
 \begin{algorithmic}[1]
   \STATE define the notations $An_k$ and $Bn_k$ to mean the $k$\textsuperscript{th} numeric
@@ -113,7 +113,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for each numeric component after the first}
 \label{alg:version-comparison-numeric-nonfirst}
 \begin{algorithmic}[1]
@@ -135,7 +135,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for letter components} \label{alg:version-comparison-letter}
 \begin{algorithmic}[1]
   \STATE let $Al$ be the letter component of $A$ if any, otherwise the empty string
@@ -148,7 +148,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for suffixes} \label{alg:version-comparison-suffix}
 \begin{algorithmic}[1]
   \STATE define the notations $As_k$ and $Bs_k$ to mean the $k$\textsuperscript{th} suffix of $A$
@@ -174,7 +174,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for each suffix} \label{alg:version-comparison-suffix-each}
 \begin{algorithmic}[1]
   \IF{$As_i$ and $Bs_i$ are of the same type (\t{\_alpha} vs \t{\_beta} etc)}
@@ -194,7 +194,7 @@ from which it was invoked.
 \end{algorithmic}
 \end{algorithm}
 
-\begin{algorithm}
+\begin{algorithm}[p]
 \caption{Version comparison logic for revision components} \label{alg:version-comparison-revision}
 \begin{algorithmic}[1]
   \STATE let $Ar$ be the integer part of the revision component of $A$ if any, otherwise $\t{0}$

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index 929cb43..389d8c0 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -92,6 +92,20 @@ to the host root instead of \t{ROOT}.
     matching version; otherwise, prints an empty string. The exit code is unspecified.
 \end{description}
 
+\ChangeWhenAddingAnEAPI{6}
+\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands}
+    \label{tab:foo-version-host-root-table}
+    \begin{tabular}{ll}
+      \toprule
+      \multicolumn{1}{c}{\textbf{EAPI}} &
+      \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\
+      \midrule
+      0, 1, 2, 3, 4     & No  \\
+      5, 6              & Yes \\
+      \bottomrule
+    \end{tabular}
+\end{centertable}
+
 \subsubsection{Output commands}
 These commands display messages to the user. Unless otherwise stated, the entire argument list is
 used as a message, with backslash-escaped characters interpreted as for the \t{echo -e} command of
@@ -154,17 +168,6 @@ Ebuilds must not run any of these commands once the current phase function has r
     using \t{die}, unless run using \t{nonfatal}, in which case it returns non-zero exit status.
     Only available in EAPIs listed in table~\ref{tab:patch-commands} as supporting \t{eapply}.
 
-\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. Package managers supporting it
-    apply user-provided patches to the source tree in the current working directory. Exact behaviour
-    is implementation defined and beyond the scope of this specification. Package managers not
-    supporting it must implement the command as a no-op. Returns shell true (0) if patches applied
-    successfully, or if no patches were provided. Otherwise, aborts the build process, unless run
-    using \t{nonfatal}, in which case it returns non-zero exit status. Only available in EAPIs
-    listed in table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs where it is
-    supported, \t{eapply\_user} must be called once in the \t{src\_prepare} phase. For any
-    subsequent calls, the command will do nothing and return~0.
-\end{description}
-
 \begin{algorithm}
 \caption{\t{eapply} logic} \label{alg:eapply}
 \begin{algorithmic}[1]
@@ -202,6 +205,17 @@ Ebuilds must not run any of these commands once the current phase function has r
 \end{algorithmic}
 \end{algorithm}
 
+\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. Package managers supporting it
+    apply user-provided patches to the source tree in the current working directory. Exact behaviour
+    is implementation defined and beyond the scope of this specification. Package managers not
+    supporting it must implement the command as a no-op. Returns shell true (0) if patches applied
+    successfully, or if no patches were provided. Otherwise, aborts the build process, unless run
+    using \t{nonfatal}, in which case it returns non-zero exit status. Only available in EAPIs
+    listed in table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs where it is
+    supported, \t{eapply\_user} must be called once in the \t{src\_prepare} phase. For any
+    subsequent calls, the command will do nothing and return~0.
+\end{description}
+
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Patch commands for EAPIs}
     \label{tab:patch-commands}
@@ -607,20 +621,6 @@ can be extended or reduced (see below). The options that can be passed to \t{doh
     \end{tabular}
 \end{centertable}
 
-\ChangeWhenAddingAnEAPI{6}
-\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands}
-    \label{tab:foo-version-host-root-table}
-    \begin{tabular}{ll}
-      \toprule
-      \multicolumn{1}{c}{\textbf{EAPI}} &
-      \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\
-      \midrule
-      0, 1, 2, 3, 4     & No  \\
-      5, 6              & Yes \\
-      \bottomrule
-    \end{tabular}
-\end{centertable}
-
 \subsubsection{Commands affecting install destinations}
 The following commands are used to set the various destination trees, all relative to \t{\$\{ED\}} in
 offset-prefix aware EAPIs and relative to \t{\$\{D\}} in offset-prefix agnostic EAPIs, used by the
@@ -922,11 +922,6 @@ has returned.
     returns a non-zero exit status, returns immediately with the same exit status. Only available
     in EAPIs listed in table~\ref{tab:misc-commands} as supporting \t{einstalldocs}.
 
-\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to
-    Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands}
-    as supporting \t{get\_libdir}.
-\end{description}
-
 \begin{algorithm}
 \caption{\t{einstalldocs} logic} \label{alg:einstalldocs}
 \begin{algorithmic}[1]
@@ -955,6 +950,10 @@ has returned.
 \end{algorithmic}
 \end{algorithm}
 
+\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to
+    Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands}
+    as supporting \t{get\_libdir}.
+
 \begin{algorithm}
 \caption{\t{get\_libdir} logic} \label{alg:get-libdir}
 \begin{algorithmic}[1]
@@ -969,6 +968,8 @@ has returned.
 \end{algorithmic}
 \end{algorithm}
 
+\end{description}
+
 \ChangeWhenAddingAnEAPI{6}
 \begin{centertable}{Misc commands for EAPIs}
     \label{tab:misc-commands}