From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: "Jonathan Corbet" <corbet@lwn.net>,
Linux Doc Mailing List <linux-doc@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH] scripts: get_feat.pl: make complete table more coincise
Date: Fri, 4 Dec 2020 10:17:45 +0100 [thread overview]
Message-ID: <2fe5f94aa8e12279d36cfbf489b30d4482a9bebb.1607073431.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <20201203153642.594afd85@lwn.net>
Currently, there are too many white spaces at the tables,
and the information is very sparsed on it.
Make the format a lot more compact.
Suggested-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
scripts/get_feat.pl | 107 +++++++++++++++++++++++++++++++++-----------
1 file changed, 81 insertions(+), 26 deletions(-)
diff --git a/scripts/get_feat.pl b/scripts/get_feat.pl
index 81d1b78d65c9..f3777f6d32bb 100755
--- a/scripts/get_feat.pl
+++ b/scripts/get_feat.pl
@@ -325,7 +325,9 @@ sub output_feature {
# Output all features for all architectures
#
-sub matrix_lines($$) {
+sub matrix_lines($$$$) {
+ my $desc_size = shift;
+ my $status_size = shift;
my $partial = shift;
my $header = shift;
my $split;
@@ -349,13 +351,9 @@ sub matrix_lines($$) {
print $split;
print $fill x $max_size_name;
print $split;
- print $fill x $max_size_kconfig;
- print $split;
- print $fill x $max_size_description;
+ print $fill x $desc_size;
print "+";
- print $ln_marker x $max_size_arch;
- print "+";
- print $ln_marker x $max_size_status;
+ print $ln_marker x $status_size;
print "+\n";
}
@@ -366,6 +364,14 @@ sub output_matrix {
print "$title\n";
print "=" x length($title) . "\n\n";
+ my $desc_title = "$h_kconfig / $h_description";
+
+ my $desc_size = $max_size_kconfig + 4;
+ $desc_size = $max_size_description if ($max_size_description > $desc_size);
+ $desc_size = length($desc_title) if (length($desc_title) > $desc_size);
+
+ my $status_size = 60;
+
my $cur_subsys = "";
foreach my $name (sort {
($data{$a}->{subsys} cmp $data{$b}->{subsys}) or
@@ -383,36 +389,85 @@ sub output_matrix {
print "$title\n";
print "=" x length($title) . "\n\n";
- matrix_lines(0, 0);
+
+ matrix_lines($desc_size, $status_size, 0, 0);
+
printf "|%-${max_size_name}s", $h_name;
- printf "|%-${max_size_kconfig}s", $h_kconfig;
- printf "|%-${max_size_description}s", $h_description;
+ printf "|%-${desc_size}s", $desc_title;
- printf "|%-${max_size_arch}s", $h_arch;
- printf "|%-${max_size_status}s|\n", $h_status;
-
- matrix_lines(0, 1);
+ printf "|%-${status_size}s|\n", "Status per architecture";
+ matrix_lines($desc_size, $status_size, 0, 1);
}
my %arch_table = %{$data{$name}->{table}};
- my $first = 1;
- foreach my $arch (sort keys %arch_table) {
- if ($first) {
+ my $cur_status = "";
+
+ my @lines;
+ my $line = "";
+ foreach my $arch (sort {
+ ($arch_table{$a} cmp $arch_table{$b}) or
+ ("\L$a" cmp "\L$b")
+ } keys %arch_table) {
+
+ my $status = $arch_table{$arch};
+
+ if ($status eq "---") {
+ $status = "Not compatible";
+ }
+
+ if ($status ne $cur_status) {
+ if ($line ne "") {
+ push @lines, $line;
+ $line = "";
+ }
+ $line = "- **" . $status . "**: " . $arch;
+ } elsif (length($line) + length ($arch) + 2 < $status_size) {
+ $line .= ", " . $arch;
+ } else {
+ push @lines, $line;
+ $line = " " . $arch;
+ }
+ $cur_status = $status;
+ }
+ push @lines, $line if ($line ne "");
+
+ my $ln = 0;
+ for my $line(@lines) {
+ if (!$ln) {
printf "|%-${max_size_name}s", $name;
- printf "|%-${max_size_kconfig}s", $data{$name}->{kconfig};
- printf "|%-${max_size_description}s", $data{$name}->{description};
- $first = 0;
+ printf "|%-${desc_size}s", "``" . $data{$name}->{kconfig} . "``";
+ } elsif ($ln == 2) {
+ printf "|%-${max_size_name}s", "";
+ printf "|%-${desc_size}s", $data{$name}->{description};
} else {
- matrix_lines(1, 0);
+ printf "|%-${max_size_name}s", "";
+ printf "|%-${desc_size}s", "";
+ }
+
+ printf "|%-${status_size}s|\n", $line;
+ $ln++;
+ }
+
+ # Ensure that Kconfig and description will be printed
+ while ($ln < 2) {
+ if (!$ln) {
+ printf "|%-${max_size_name}s", $name;
+ printf "|%-${desc_size}s``", $data{$name}->{kconfig} . "``";
+ } elsif ($ln == 2) {
printf "|%-${max_size_name}s", "";
- printf "|%-${max_size_kconfig}s", "";
- printf "|%-${max_size_description}s", "";
+ printf "|%-${desc_size}s", $data{$name}->{description};
+ } else {
+ printf "|%-${max_size_name}s", "";
+ printf "|%-${desc_size}s", "";
}
- printf "|%-${max_size_arch}s", $arch;
- printf "|%-${max_size_status}s|\n", $arch_table{$arch};
+
+ printf "|%-${status_size}s|\n", "";
+
+ $ln++;
}
- matrix_lines(0, 0);
+
+ matrix_lines($desc_size, $status_size, 0, 0);
}
}
--
2.28.0
next prev parent reply other threads:[~2020-12-04 9:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 15:36 [PATCH 0/6] Add documentation for Documentation/features at the built docs Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 1/6] scripts: get_feat.pl: add a script to handle Documentation/features Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 2/6] scripts: get_feat.pl: improve matrix output Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 3/6] scripts: get_feat.pl: use its implementation for list-arch.sh Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 4/6] sphinx: kernel_feat.py: add a script to parse feature files Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 5/6] docs: admin-guide: add a features list Mauro Carvalho Chehab
2020-11-30 15:36 ` [PATCH 6/6] docs: archis: add a per-architecture " Mauro Carvalho Chehab
2020-12-03 22:36 ` [PATCH 0/6] Add documentation for Documentation/features at the built docs Jonathan Corbet
2020-12-04 9:17 ` Mauro Carvalho Chehab [this message]
2020-12-04 9:26 ` [PATCH v2] scripts: get_feat.pl: make complete table more coincise Mauro Carvalho Chehab
2020-12-04 9:35 ` [PATCH v3] " Mauro Carvalho Chehab
2020-12-04 9:52 ` Mauro Carvalho Chehab
2020-12-04 15:32 ` [PATCH v4 0/3] improve get_feat.pl output when all features are displayed Mauro Carvalho Chehab
2020-12-04 15:32 ` [PATCH v4 1/3] scripts: get_feat.pl: make complete table more coincise Mauro Carvalho Chehab
2020-12-04 15:32 ` [PATCH v4 2/3] scripts: get_feat.pl: change the group by order Mauro Carvalho Chehab
2020-12-04 15:32 ` [PATCH v4 3/3] scripts: get_feat.pl: reduce table width for all features output Mauro Carvalho Chehab
2020-12-04 21:48 ` [PATCH v4 0/3] improve get_feat.pl output when all features are displayed Jonathan Corbet
2020-12-05 16:03 ` Mauro Carvalho Chehab
2020-12-07 9:33 ` Mauro Carvalho Chehab
2020-12-07 11:34 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2fe5f94aa8e12279d36cfbf489b30d4482a9bebb.1607073431.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®