Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to skip left and right borders #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add option to skip left and right borders #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4844bc5
Add compatibility with Perl 5.8
rovo89 Jun 10, 2022
d57779d
Added left_and_right parameter to skip left & right borders
rovo89 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions lib/Text/Table/Tiny.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package Text::Table::Tiny;

use 5.010;
use 5.008;
use strict;
use warnings;
use utf8;
Expand All @@ -25,6 +25,8 @@ my %arguments = (
header_row => "if true, indicates that the first row is a header row",
separate_rows => "if true, a separate rule will be drawn between each row",
top_and_tail => "if true, miss out top and bottom edges of table",
left_and_right => "if true, miss out left and right edges of table",
edges => "if true, miss out edges of table",
align => "either single alignment, or an array per of alignments per col",
style => "styling of table, one of classic, boxrule, or norule",
indent => "indent every row of the table a certain number of spaces",
Expand All @@ -49,11 +51,13 @@ sub generate_table
my @rows = @$rows;
my @widths = _calculate_widths($rows);

$param{style} //= 'classic';
$param{style} = 'classic' if not defined $param{style};

$param{indent} //= '';
$param{indent} = '' if not defined $param{indent};
$param{indent} = ' ' x $param{indent} if $param{indent} =~ /^[0-9]+$/;

$param{top_and_tail} = $param{left_and_right} = 1 if $param{edges};

my $style = $param{style};
croak "unknown style '$style'" if not exists($charsets{ $style });
my $char = $charsets{$style};
Expand Down Expand Up @@ -111,12 +115,19 @@ sub _rule_row
my ($param, $widths, $le, $hr, $cross, $re) = @_;
my $pad = $param->{compact} ? '' : $hr;

return $param->{indent}
.$le
.join($cross, map { $pad.($hr x $_).$pad } @$widths)
.$re
if ($param->{left_and_right}) {
return $param->{indent}
.join($pad . $cross . $pad, map { $hr x $_ } @$widths)
."\n"
;
} else {
return $param->{indent}
.$le
.join($cross, map { $pad.($hr x $_).$pad } @$widths)
.$re
."\n"
;
}
}

sub _header_row
Expand Down Expand Up @@ -148,21 +159,31 @@ sub _text_row
{
my ($param, $row, $widths, $align, $char) = @_;
my @columns = @$row;
my $text = $param->{indent}.$char->{VR};
if ($param->{left_and_right}) {
my $pad = $param->{compact} ? '' : ' ';
return $param->{indent}
.join($pad . $char->{VR} . $pad, map { _format_column($columns[$_], $widths->[$_], $align->[$_], $param, $char) } 0 .. $#$widths)
."\n"
;
} else {
my $text = $param->{indent}.$char->{VR};

for (my $i = 0; $i < @$widths; $i++) {
$text .= _format_column($columns[$i] // '', $widths->[$i], $align->[$i] // 'l', $param, $char);
$text .= $char->{VR};
}
$text .= "\n";
for (my $i = 0; $i < @$widths; $i++) {
$text .= _format_column($columns[$i], $widths->[$i], $align->[$i], $param, $char);
$text .= $char->{VR};
}
$text .= "\n";

return $text;
return $text;
}
}

sub _format_column
{
my ($text, $width, $align, $param, $char) = @_;
my $pad = $param->{compact} ? '' : ' ';
$text = '' if not defined $text;
$align = 'l' if not defined $align;
my $pad = $param->{compact} || $param->{left_and_right} ? '' : ' ';

if ($align eq 'r' || $align eq 'right') {
return $pad.' ' x ($width - tty_width($text)).$text.$pad;
Expand Down