summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/Text/Tabs.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Text/Tabs.pm')
-rw-r--r--Master/tlpkg/tlperl/lib/Text/Tabs.pm82
1 files changed, 69 insertions, 13 deletions
diff --git a/Master/tlpkg/tlperl/lib/Text/Tabs.pm b/Master/tlpkg/tlperl/lib/Text/Tabs.pm
index d3c06a08c10..34d81ab8b7f 100644
--- a/Master/tlpkg/tlperl/lib/Text/Tabs.pm
+++ b/Master/tlpkg/tlperl/lib/Text/Tabs.pm
@@ -6,16 +6,24 @@ require Exporter;
@ISA = (Exporter);
@EXPORT = qw(expand unexpand $tabstop);
-use vars qw($VERSION $tabstop $debug);
-$VERSION = 2009.0305;
+use vars qw($VERSION $SUBVERSION $tabstop $debug);
+$VERSION = 2012.0818;
+$SUBVERSION = 'modern';
use strict;
+use 5.010_000;
+
BEGIN {
$tabstop = 8;
$debug = 0;
}
+my $CHUNK = qr/\X/;
+
+sub _xlen (_) { scalar(() = $_[0] =~ /$CHUNK/g) }
+sub _xpos (_) { _xlen( substr( $_[0], 0, pos($_[0]) ) ) }
+
sub expand {
my @l;
my $pad;
@@ -24,10 +32,13 @@ sub expand {
for (split(/^/m, $_, -1)) {
my $offs = 0;
s{\t}{
- $pad = $tabstop - (pos() + $offs) % $tabstop;
+ # this works on both 5.10 and 5.11
+ $pad = $tabstop - (_xlen(${^PREMATCH}) + $offs) % $tabstop;
+ # this works on 5.11, but fails on 5.10
+ #XXX# $pad = $tabstop - (_xpos() + $offs) % $tabstop;
$offs += $pad - 1;
" " x $pad;
- }eg;
+ }peg;
$s .= $_;
}
push(@l, $s);
@@ -44,12 +55,12 @@ sub unexpand
my $line;
my @lines;
my $lastbit;
- my $ts_as_space = " "x$tabstop;
+ my $ts_as_space = " " x $tabstop;
for $x (@l) {
@lines = split("\n", $x, -1);
for $line (@lines) {
$line = expand($line);
- @e = split(/(.{$tabstop})/,$line,-1);
+ @e = split(/(${CHUNK}{$tabstop})/,$line,-1);
$lastbit = pop(@e);
$lastbit = ''
unless defined $lastbit;
@@ -91,7 +102,7 @@ sub expand
=head1 NAME
-Text::Tabs -- expand and unexpand tabs per the unix expand(1) and unexpand(1)
+Text::Tabs - expand and unexpand tabs like unix expand(1) and unexpand(1)
=head1 SYNOPSIS
@@ -103,11 +114,38 @@ Text::Tabs -- expand and unexpand tabs per the unix expand(1) and unexpand(1)
=head1 DESCRIPTION
-Text::Tabs does about what the unix utilities expand(1) and unexpand(1)
-do. Given a line with tabs in it, expand will replace the tabs with
+Text::Tabs does most of what the unix utilities expand(1) and unexpand(1)
+do. Given a line with tabs in it, C<expand> replaces those tabs with
the appropriate number of spaces. Given a line with or without tabs in
-it, unexpand will add tabs when it can save bytes by doing so (just
-like C<unexpand -a>). Invisible compression with plain ASCII!
+it, C<unexpand> adds tabs when it can save bytes by doing so,
+like the C<unexpand -a> command.
+
+Unlike the old unix utilities, this module correctly accounts for
+any Unicode combining characters (such as diacriticals) that may occur
+in each line for both expansion and unexpansion. These are overstrike
+characters that do not increment the logical position. Make sure
+you have the appropriate Unicode settings enabled.
+
+=head1 EXPORTS
+
+The following are exported:
+
+=over 4
+
+=item expand
+
+=item unexpand
+
+=item $tabstop
+
+The C<$tabstop> variable controls how many column positions apart each
+tabstop is. The default is 8.
+
+Please note that C<local($tabstop)> doesn't do the right thing and if you want
+to use C<local> to override C<$tabstop>, you need to use
+C<local($Text::Tabs::tabstop)>.
+
+=back
=head1 EXAMPLE
@@ -119,18 +157,36 @@ like C<unexpand -a>). Invisible compression with plain ASCII!
print unexpand $_;
}
-Instead of the C<expand> comand, use:
+Instead of the shell's C<expand> comand, use:
perl -MText::Tabs -n -e 'print expand $_'
-Instead of the C<unexpand -a> command, use:
+Instead of the shell's C<unexpand -a> command, use:
perl -MText::Tabs -n -e 'print unexpand $_'
+=head1 SUBVERSION
+
+This module comes in two flavors: one for modern perls (5.10 and above)
+and one for ancient obsolete perls. The version for modern perls has
+support for Unicode. The version for old perls does not. You can tell
+which version you have installed by looking at C<$Text::Tabs::SUBVERSION>:
+it is C<old> for obsolete perls and C<modern> for current perls.
+
+This man page is for the version for modern perls and so that's probably
+what you've got.
+
+=head1 BUGS
+
+Text::Tabs handles only tabs (C<"\t">) and combining characters (C</\pM/>). It doesn't
+count backwards for backspaces (C<"\t">), omit other non-printing control characters (C</\pC/>),
+or otherwise deal with any other zero-, half-, and full-width characters.
+
=head1 LICENSE
Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff.
Copyright (C) 2005 Aristotle Pagaltzis
+Copyright (C) 2012 Google, Inc.
This module may be modified, used, copied, and redistributed at your own risk.
Publicly redistributed modified versions must use a different name.