mirror of
https://github.com/erkin/ponysay.git
synced 2024-11-22 04:27:58 +01:00
Revert "Merge pull request #54 from spider-mario/master"
Error at line 29 This reverts commit39341e46e6
, reversing changes made to4e1655bc0b
.
This commit is contained in:
parent
39341e46e6
commit
e928a02e8a
1 changed files with 52 additions and 21 deletions
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env perl
|
||||
#!/usr/bin/perl
|
||||
|
||||
# ponysaylist
|
||||
# Prints a list of ponies in columns
|
||||
|
@ -9,32 +9,63 @@
|
|||
# Author: Mattias Andrée, maandree@kth.se
|
||||
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use utf8;
|
||||
use feature qw(say);
|
||||
use integer;
|
||||
use List::Util qw(max);
|
||||
$first = 1;
|
||||
$scrw = 1;
|
||||
$maxw = 1;
|
||||
|
||||
my $scrw = shift @ARGV;
|
||||
|
||||
for (@ARGV) {
|
||||
foreach $arg (@ARGV)
|
||||
{
|
||||
# Format names from ponyies names
|
||||
s/(?<=[a-z])(?=[A-Z])/ /;
|
||||
s/_(.*)/\t($1)/;
|
||||
$arg =~ s/([a-z])([A-Z])/\1 \2/;
|
||||
#$arg =~ s/_(.*)/\t(\1)/; ## Incompatible with `ponysay -L`
|
||||
|
||||
if ($first == 1)
|
||||
{ $first = 0;
|
||||
$scrw = $arg;
|
||||
}
|
||||
else
|
||||
{ $w = length $arg;
|
||||
$maxw = $w if ($w > $maxw);
|
||||
}
|
||||
}
|
||||
|
||||
my $maxw = max map {length} @ARGV;
|
||||
$cols = int (($scrw + 2) / ($maxw + 2));
|
||||
$cols = 1 if ($cols < 1);
|
||||
|
||||
my $cols = max 1, (($scrw + 2) / ($maxw + 2));
|
||||
|
||||
my @list = map {sprintf "%-${maxw}s", $_} @ARGV;
|
||||
@list = ();
|
||||
|
||||
my $rows = (@list + $cols - 1) / $cols;
|
||||
|
||||
my @rowlist;
|
||||
for my $i (0 .. $#list) {
|
||||
push @{$rowlist[$i % $rows]}, $list[$i];
|
||||
$first = 1;
|
||||
$items = 0;
|
||||
foreach $arg (@ARGV)
|
||||
{
|
||||
if ($first == 1)
|
||||
{ $first = 0;
|
||||
}
|
||||
else
|
||||
{ $ws = $maxw - (length $arg);
|
||||
push @list, $arg.(" "x$ws);
|
||||
$items += 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$rows = int (($items + $cols - 1) / $cols);
|
||||
$i = 0;
|
||||
@rowlist = ();
|
||||
|
||||
while ($i < $items)
|
||||
{ $row = 0;
|
||||
while (($row < $rows) and ($i < $items))
|
||||
{
|
||||
$rowlist[$row] .= " " unless ($i < $rows);
|
||||
$rowlist[$row] .= $list[$i];
|
||||
$row += 1;
|
||||
$i += 1;
|
||||
} }
|
||||
|
||||
foreach $row (@rowlist)
|
||||
{
|
||||
print $row."\n";
|
||||
}
|
||||
|
||||
say join ' ', @$_ for @rowlist;
|
||||
|
|
Loading…
Reference in a new issue