| 1 |
tove 09/04/03 12:25:44 |
| 2 |
|
| 3 |
Added: 0.36-3-debian.patches |
| 4 |
Log: |
| 5 |
Version bump (#264474) |
| 6 |
(Portage version: 2.2_rc28/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-text/po4a/files/0.36-3-debian.patches |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/po4a/files/0.36-3-debian.patches?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/po4a/files/0.36-3-debian.patches?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0.36-3-debian.patches |
| 15 |
=================================================================== |
| 16 |
Patches from debian's po4a_0.36-3 |
| 17 |
|
| 18 |
--- po4a-0.36/lib/Locale/Po4a/LaTeX.pm |
| 19 |
+++ po4a-0.36/lib/Locale/Po4a/LaTeX.pm |
| 20 |
@@ -360,6 +360,7 @@ |
| 21 |
} |
| 22 |
register_generic_environment("tabular,[]{}"); |
| 23 |
register_generic_environment("tabular*,{}{}"); |
| 24 |
+register_generic_environment("tabularx,{}{}"); |
| 25 |
register_generic_environment("multicols,{}"); |
| 26 |
register_generic_environment("list,{_}{}"); |
| 27 |
register_generic_environment("array,[]{}"); |
| 28 |
@@ -375,7 +376,8 @@ |
| 29 |
# & is the cell separator, \\ is the line separator |
| 30 |
# '\' is escaped twice |
| 31 |
$env_separators{'array'} = |
| 32 |
- $env_separators{'tabular'} = "(?:&|\\\\\\\\)"; |
| 33 |
+ $env_separators{'tabular'} = |
| 34 |
+ $env_separators{'tabularx'} = "(?:&|\\\\\\\\|\\\\hline)"; |
| 35 |
|
| 36 |
$env_separators{'trivlist'} = |
| 37 |
$env_separators{'list'} = |
| 38 |
|
| 39 |
--- po4a-0.36/lib/Locale/Po4a/TeX.pm |
| 40 |
+++ po4a-0.36/lib/Locale/Po4a/TeX.pm |
| 41 |
@@ -1079,9 +1079,9 @@ |
| 42 |
if ($line =~ m/^\s*((?:\{_?\}|\[_?\])*)\s*$/) { |
| 43 |
register_generic_environment("$env,$1"); |
| 44 |
} |
| 45 |
- } elsif ($line =~ /^separator\s+(\w+(?:\[#[0-9]+\]))\s+\"(.*)\"\s*$/) { |
| 46 |
+ } elsif ($line =~ /^separator\s+(\w+(?:\[#[0-9]+\])?)\s+\"(.*)\"\s*$/) { |
| 47 |
my $env = $1; # This is not necessarily an environment. |
| 48 |
- # It can also be smth like 'title{#1}'. |
| 49 |
+ # It can also be smth like 'title[#1]'. |
| 50 |
$env_separators{$env} = $2; |
| 51 |
} elsif ($line =~ /^verbatim\s+environment\s+(\w+)\s+$/) { |
| 52 |
register_verbatim_environment($1); |
| 53 |
|
| 54 |
--- po4a-0.36/lib/Locale/Po4a/Pod.pm |
| 55 |
+++ po4a-0.36/lib/Locale/Po4a/Pod.pm |
| 56 |
@@ -147,7 +147,7 @@ |
| 57 |
sub docheader { |
| 58 |
my $self=shift; |
| 59 |
my $encoding = $self->{TT}{file_out_charset}; |
| 60 |
- if (defined $encoding) { |
| 61 |
+ if (defined $encoding and length $encoding) { |
| 62 |
$encoding = "\n=encoding $encoding\n"; |
| 63 |
} else { |
| 64 |
$encoding = ""; |
Archives