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

[Ulrich Müller]

commit:     38bce18a82faf919a76c066485c92ea8dff9d31b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 18:19:03 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 12:55:24 2018 +0000
URL:        https://gitweb.gentoo.org/proj/pms.git/commit/?id=38bce18a

Trim the width of several tables.

tab:optional-vars-table: Reduce column separation very slightly
(by 0.1pt) to make the width of the table fit.

tab:added-env-vars-table was also too wide, which is fixed by reducing
the width of the paragraph type columns.

tab:econf-options-table: Change columns with overlong headers to
paragraph type, in order to allow line breaks.

 ebuild-env-vars.tex  | 8 ++++----
 ebuild-vars.tex      | 1 +
 pkg-mgr-commands.tex | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex
index c9ebf9b..7836bd9 100644
--- a/ebuild-env-vars.tex
+++ b/ebuild-env-vars.tex
@@ -266,10 +266,10 @@ variable.
     \begin{tabular}{lllllll}
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &
-      \multicolumn{1}{c}{\textbf{\t{MERGE_TYPE}?}} &
-      \multicolumn{1}{P{6em}}{\textbf{\t{REPLACING_VERSIONS}?}} &
-      \multicolumn{1}{P{6em}}{\textbf{\t{REPLACED_BY_VERSION}?}} &
-      \multicolumn{1}{P{6em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} &
+      \multicolumn{1}{P{3.25em}}{\textbf{\t{MERGE_TYPE}?}} &
+      \multicolumn{1}{P{5.25em}}{\textbf{\t{REPLACING_VERSIONS}?}} &
+      \multicolumn{1}{P{5.75em}}{\textbf{\t{REPLACED_BY_VERSION}?}} &
+      \multicolumn{1}{P{5.75em}}{\textbf{\t{EBUILD_PHASE_FUNC}?}} &
       \multicolumn{1}{c}{\textbf{\t{SYSROOT}?}} &
       \multicolumn{1}{c}{\textbf{\t{BROOT}?}} \\
       \midrule

diff --git a/ebuild-vars.tex b/ebuild-vars.tex
index b873051..5169e0a 100644
--- a/ebuild-vars.tex
+++ b/ebuild-vars.tex
@@ -110,6 +110,7 @@ Ebuilds may define any of the following variables:
 \ChangeWhenAddingAnEAPI{7}
 \begin{centertable}{EAPIs supporting various ebuild-defined variables}
     \label{tab:optional-vars-table}
+    \addtolength{\tabcolsep}{-0.1pt} % table is very slightly too wide
     \begin{tabular}{llll}
       \toprule
       \multicolumn{1}{c}{\textbf{EAPI}} &

diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex
index b49e9b3..266fc36 100644
--- a/pkg-mgr-commands.tex
+++ b/pkg-mgr-commands.tex
@@ -360,8 +360,8 @@ current phase function has returned.
         \begin{tabular}{llllll}
           \toprule
           \multicolumn{1}{c}{\textbf{EAPI}} &
-          \multicolumn{1}{c}{\textbf{-{}-disable-dependency-tracking}} &
-          \multicolumn{1}{c}{\textbf{-{}-disable-silent-rules}} &
+          \multicolumn{1}{P{9em}}{\textbf{-{}-disable-dependency-tracking}} &
+          \multicolumn{1}{P{5em}}{\textbf{-{}-disable-silent-rules}} &
           \multicolumn{1}{c}{\textbf{-{}-docdir}} &
           \multicolumn{1}{c}{\textbf{-{}-htmldir}} &
           \multicolumn{1}{c}{\textbf{-{}-with-sysroot}} \\