1 |
commit: f90b3c6a9ec8ecd4988c58e1c781307036e7949e |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 10 16:10:36 2017 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 10 16:10:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=f90b3c6a |
7 |
|
8 |
Improve positioning of tables and other floats. |
9 |
|
10 |
No changes of text. |
11 |
|
12 |
names.tex | 14 ++++++------ |
13 |
pkg-mgr-commands.tex | 61 ++++++++++++++++++++++++++-------------------------- |
14 |
2 files changed, 38 insertions(+), 37 deletions(-) |
15 |
|
16 |
diff --git a/names.tex b/names.tex |
17 |
index d26fed6..e4c3975 100644 |
18 |
--- a/names.tex |
19 |
+++ b/names.tex |
20 |
@@ -78,7 +78,7 @@ If a sub-algorithm returns a decision, then that is the result of the whole comp |
21 |
if it terminates without returning a decision, the process continues from the point |
22 |
from which it was invoked. |
23 |
|
24 |
-\begin{algorithm} |
25 |
+\begin{algorithm}[p] |
26 |
\caption{Version comparison top-level logic} \label{alg:version-comparison} |
27 |
\begin{algorithmic}[1] |
28 |
\STATE let $A$ and $B$ be the versions to be compared |
29 |
@@ -90,7 +90,7 @@ from which it was invoked. |
30 |
\end{algorithmic} |
31 |
\end{algorithm} |
32 |
|
33 |
-\begin{algorithm} |
34 |
+\begin{algorithm}[p] |
35 |
\caption{Version comparison logic for numeric components} \label{alg:version-comparison-numeric} |
36 |
\begin{algorithmic}[1] |
37 |
\STATE define the notations $An_k$ and $Bn_k$ to mean the $k$\textsuperscript{th} numeric |
38 |
@@ -113,7 +113,7 @@ from which it was invoked. |
39 |
\end{algorithmic} |
40 |
\end{algorithm} |
41 |
|
42 |
-\begin{algorithm} |
43 |
+\begin{algorithm}[p] |
44 |
\caption{Version comparison logic for each numeric component after the first} |
45 |
\label{alg:version-comparison-numeric-nonfirst} |
46 |
\begin{algorithmic}[1] |
47 |
@@ -135,7 +135,7 @@ from which it was invoked. |
48 |
\end{algorithmic} |
49 |
\end{algorithm} |
50 |
|
51 |
-\begin{algorithm} |
52 |
+\begin{algorithm}[p] |
53 |
\caption{Version comparison logic for letter components} \label{alg:version-comparison-letter} |
54 |
\begin{algorithmic}[1] |
55 |
\STATE let $Al$ be the letter component of $A$ if any, otherwise the empty string |
56 |
@@ -148,7 +148,7 @@ from which it was invoked. |
57 |
\end{algorithmic} |
58 |
\end{algorithm} |
59 |
|
60 |
-\begin{algorithm} |
61 |
+\begin{algorithm}[p] |
62 |
\caption{Version comparison logic for suffixes} \label{alg:version-comparison-suffix} |
63 |
\begin{algorithmic}[1] |
64 |
\STATE define the notations $As_k$ and $Bs_k$ to mean the $k$\textsuperscript{th} suffix of $A$ |
65 |
@@ -174,7 +174,7 @@ from which it was invoked. |
66 |
\end{algorithmic} |
67 |
\end{algorithm} |
68 |
|
69 |
-\begin{algorithm} |
70 |
+\begin{algorithm}[p] |
71 |
\caption{Version comparison logic for each suffix} \label{alg:version-comparison-suffix-each} |
72 |
\begin{algorithmic}[1] |
73 |
\IF{$As_i$ and $Bs_i$ are of the same type (\t{\_alpha} vs \t{\_beta} etc)} |
74 |
@@ -194,7 +194,7 @@ from which it was invoked. |
75 |
\end{algorithmic} |
76 |
\end{algorithm} |
77 |
|
78 |
-\begin{algorithm} |
79 |
+\begin{algorithm}[p] |
80 |
\caption{Version comparison logic for revision components} \label{alg:version-comparison-revision} |
81 |
\begin{algorithmic}[1] |
82 |
\STATE let $Ar$ be the integer part of the revision component of $A$ if any, otherwise $\t{0}$ |
83 |
|
84 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
85 |
index 929cb43..389d8c0 100644 |
86 |
--- a/pkg-mgr-commands.tex |
87 |
+++ b/pkg-mgr-commands.tex |
88 |
@@ -92,6 +92,20 @@ to the host root instead of \t{ROOT}. |
89 |
matching version; otherwise, prints an empty string. The exit code is unspecified. |
90 |
\end{description} |
91 |
|
92 |
+\ChangeWhenAddingAnEAPI{6} |
93 |
+\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands} |
94 |
+ \label{tab:foo-version-host-root-table} |
95 |
+ \begin{tabular}{ll} |
96 |
+ \toprule |
97 |
+ \multicolumn{1}{c}{\textbf{EAPI}} & |
98 |
+ \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\ |
99 |
+ \midrule |
100 |
+ 0, 1, 2, 3, 4 & No \\ |
101 |
+ 5, 6 & Yes \\ |
102 |
+ \bottomrule |
103 |
+ \end{tabular} |
104 |
+\end{centertable} |
105 |
+ |
106 |
\subsubsection{Output commands} |
107 |
These commands display messages to the user. Unless otherwise stated, the entire argument list is |
108 |
used as a message, with backslash-escaped characters interpreted as for the \t{echo -e} command of |
109 |
@@ -154,17 +168,6 @@ Ebuilds must not run any of these commands once the current phase function has r |
110 |
using \t{die}, unless run using \t{nonfatal}, in which case it returns non-zero exit status. |
111 |
Only available in EAPIs listed in table~\ref{tab:patch-commands} as supporting \t{eapply}. |
112 |
|
113 |
-\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. Package managers supporting it |
114 |
- apply user-provided patches to the source tree in the current working directory. Exact behaviour |
115 |
- is implementation defined and beyond the scope of this specification. Package managers not |
116 |
- supporting it must implement the command as a no-op. Returns shell true (0) if patches applied |
117 |
- successfully, or if no patches were provided. Otherwise, aborts the build process, unless run |
118 |
- using \t{nonfatal}, in which case it returns non-zero exit status. Only available in EAPIs |
119 |
- listed in table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs where it is |
120 |
- supported, \t{eapply\_user} must be called once in the \t{src\_prepare} phase. For any |
121 |
- subsequent calls, the command will do nothing and return~0. |
122 |
-\end{description} |
123 |
- |
124 |
\begin{algorithm} |
125 |
\caption{\t{eapply} logic} \label{alg:eapply} |
126 |
\begin{algorithmic}[1] |
127 |
@@ -202,6 +205,17 @@ Ebuilds must not run any of these commands once the current phase function has r |
128 |
\end{algorithmic} |
129 |
\end{algorithm} |
130 |
|
131 |
+\item[eapply\_user] \featurelabel{eapply-user} Takes no arguments. Package managers supporting it |
132 |
+ apply user-provided patches to the source tree in the current working directory. Exact behaviour |
133 |
+ is implementation defined and beyond the scope of this specification. Package managers not |
134 |
+ supporting it must implement the command as a no-op. Returns shell true (0) if patches applied |
135 |
+ successfully, or if no patches were provided. Otherwise, aborts the build process, unless run |
136 |
+ using \t{nonfatal}, in which case it returns non-zero exit status. Only available in EAPIs |
137 |
+ listed in table~\ref{tab:patch-commands} as supporting \t{eapply\_user}. In EAPIs where it is |
138 |
+ supported, \t{eapply\_user} must be called once in the \t{src\_prepare} phase. For any |
139 |
+ subsequent calls, the command will do nothing and return~0. |
140 |
+\end{description} |
141 |
+ |
142 |
\ChangeWhenAddingAnEAPI{6} |
143 |
\begin{centertable}{Patch commands for EAPIs} |
144 |
\label{tab:patch-commands} |
145 |
@@ -607,20 +621,6 @@ can be extended or reduced (see below). The options that can be passed to \t{doh |
146 |
\end{tabular} |
147 |
\end{centertable} |
148 |
|
149 |
-\ChangeWhenAddingAnEAPI{6} |
150 |
-\begin{centertable}{EAPIs supporting \t{-{}-host-root} for \t{*\_version} commands} |
151 |
- \label{tab:foo-version-host-root-table} |
152 |
- \begin{tabular}{ll} |
153 |
- \toprule |
154 |
- \multicolumn{1}{c}{\textbf{EAPI}} & |
155 |
- \multicolumn{1}{c}{\textbf{\t{*\_version} supports \t{-{}-host-root}?}} \\ |
156 |
- \midrule |
157 |
- 0, 1, 2, 3, 4 & No \\ |
158 |
- 5, 6 & Yes \\ |
159 |
- \bottomrule |
160 |
- \end{tabular} |
161 |
-\end{centertable} |
162 |
- |
163 |
\subsubsection{Commands affecting install destinations} |
164 |
The following commands are used to set the various destination trees, all relative to \t{\$\{ED\}} in |
165 |
offset-prefix aware EAPIs and relative to \t{\$\{D\}} in offset-prefix agnostic EAPIs, used by the |
166 |
@@ -922,11 +922,6 @@ has returned. |
167 |
returns a non-zero exit status, returns immediately with the same exit status. Only available |
168 |
in EAPIs listed in table~\ref{tab:misc-commands} as supporting \t{einstalldocs}. |
169 |
|
170 |
-\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to |
171 |
- Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands} |
172 |
- as supporting \t{get\_libdir}. |
173 |
-\end{description} |
174 |
- |
175 |
\begin{algorithm} |
176 |
\caption{\t{einstalldocs} logic} \label{alg:einstalldocs} |
177 |
\begin{algorithmic}[1] |
178 |
@@ -955,6 +950,10 @@ has returned. |
179 |
\end{algorithmic} |
180 |
\end{algorithm} |
181 |
|
182 |
+\item[get\_libdir] \featurelabel{get-libdir} Prints the libdir name obtained according to |
183 |
+ Algorithm~\ref{alg:get-libdir}. Only available in EAPIs listed in table~\ref{tab:misc-commands} |
184 |
+ as supporting \t{get\_libdir}. |
185 |
+ |
186 |
\begin{algorithm} |
187 |
\caption{\t{get\_libdir} logic} \label{alg:get-libdir} |
188 |
\begin{algorithmic}[1] |
189 |
@@ -969,6 +968,8 @@ has returned. |
190 |
\end{algorithmic} |
191 |
\end{algorithm} |
192 |
|
193 |
+\end{description} |
194 |
+ |
195 |
\ChangeWhenAddingAnEAPI{6} |
196 |
\begin{centertable}{Misc commands for EAPIs} |
197 |
\label{tab:misc-commands} |