diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 19:11:18 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 19:11:18 +0000 |
| commit | be3174d2532d82826fc0aa416a83ef8ce0f07732 (patch) | |
| tree | dcb2f29d4e1d0a6db01d7d1c2c96304de9c13b8d /lib/Pod | |
| parent | 5e5f20b507b6c3b7749b1f2f6cfd8a156eca9deb (diff) | |
| download | perl-be3174d2532d82826fc0aa416a83ef8ce0f07732.tar.gz | |
integrate cfgperl changes#6268..6282 into mainline
p4raw-link: @6282 on //depot/cfgperl: d4817f5b97d4072a6efac47844b617245b179f2c
p4raw-link: @6268 on //depot/cfgperl: 22e04bdb3a09a4c369fd1666143349eab2eba9d4
p4raw-id: //depot/perl@6366
p4raw-integrated: from //depot/cfgperl@6365 'copy in' lib/Net/Ping.pm
lib/Text/Wrap.pm t/lib/dprof.t t/lib/dumper-ovl.t
t/lib/hostname.t (@5586..) lib/Pod/Html.pm (@5608..)
t/lib/ipc_sysv.t (@5812..) t/lib/dumper.t (@5972..)
ext/File/Glob/Glob.pm (@6026..) lib/Pod/Man.pm lib/Pod/Text.pm
(@6034..) t/lib/anydbm.t (@6072..) lib/ExtUtils/xsubpp
(@6156..) pod/perlsub.pod pod/perltie.pod (@6206..)
utils/h2xs.PL (@6280..)
p4raw-integrated: from //depot/cfgperl@6282 'merge in' vms/vms.c
(@6238..)
p4raw-integrated: from //depot/cfgperl@6277 'copy in' pod/perlfunc.pod
(@6276..)
p4raw-integrated: from //depot/cfgperl@6273 'ignore' perlapi.h
(@6243..) embedvar.h (@6254..) 'merge in' perlapi.c (@6243..)
embed.h (@6254..) embed.pl objXSUB.h op.c proto.h (@6269..)
p4raw-integrated: from //depot/cfgperl@6270 'copy in' t/op/taint.t
(@5857..)
p4raw-integrated: from //depot/cfgperl@6269 'copy in' doop.c (@6263..)
'ignore' toke.c (@6261..)
p4raw-integrated: from //depot/cfgperl@6268 'copy in' t/op/sprintf.t
(@6267..)
Diffstat (limited to 'lib/Pod')
| -rw-r--r-- | lib/Pod/Html.pm | 8 | ||||
| -rw-r--r-- | lib/Pod/Man.pm | 2 | ||||
| -rw-r--r-- | lib/Pod/Text.pm | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/Pod/Html.pm b/lib/Pod/Html.pm index 89e3d0f432..346495f3de 100644 --- a/lib/Pod/Html.pm +++ b/lib/Pod/Html.pm @@ -1438,8 +1438,10 @@ sub process_text1($$;$$){ } elsif( $func eq 'E' ){ # E<x> - convert to character - $$rstr =~ s/^(\w+)>//; - $res = "&$1;"; + $$rstr =~ s/^([^>]*)>//; + my $escape = $1; + $escape =~ s/^(\d+|X[\dA-F]+)$/#$1/i; + $res = "&$escape;"; } elsif( $func eq 'F' ){ # F<filename> - italizice @@ -1940,7 +1942,7 @@ sub depod1($;$$){ $res .= $$rstr; } elsif( $func eq 'E' ){ # E<x> - convert to character - $$rstr =~ s/^(\w+)>//; + $$rstr =~ s/^([^>]*)>//; $res .= $E2c{$1} || ""; } elsif( $func eq 'X' ){ # X<> - ignore diff --git a/lib/Pod/Man.pm b/lib/Pod/Man.pm index 8673ba4795..439b22c35b 100644 --- a/lib/Pod/Man.pm +++ b/lib/Pod/Man.pm @@ -194,6 +194,8 @@ $PREAMBLE = <<'----END OF PREAMBLE----'; 'lt' => '<', # left chevron, less-than 'gt' => '>', # right chevron, greater-than 'quot' => '"', # double quote + 'sol' => '/', # solidus + 'verbar' => '|', # vertical bar 'Aacute' => "A\\*'", # capital A, acute accent 'aacute' => "a\\*'", # small a, acute accent diff --git a/lib/Pod/Text.pm b/lib/Pod/Text.pm index f5c1e3d0cf..47dcee584f 100644 --- a/lib/Pod/Text.pm +++ b/lib/Pod/Text.pm @@ -53,6 +53,8 @@ $VERSION = 2.04; 'lt' => '<', # left chevron, less-than 'gt' => '>', # right chevron, greater-than 'quot' => '"', # double quote + 'sol' => '/', # solidus + 'verbar' => '|', # vertical bar "Aacute" => "\xC1", # capital A, acute accent "aacute" => "\xE1", # small a, acute accent |