[Po4a-commits] "po4a/lib/Locale/Po4a TransTractor.pm, 1.98, 1.99 Man.pm, 1.206, 1.207"
Nicolas FRANCOIS
nekral-guest at alioth.debian.org
Mon Jul 14 17:08:21 UTC 2008
Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory alioth:/tmp/cvs-serv25402/lib/Locale/Po4a
Modified Files:
TransTractor.pm Man.pm
Log Message:
* NEWS, lib/Locale/Po4a/TransTractor.pm: Remove the spaces
introduced by the wrapping algorithm at the end of lines.
* t/data-23/mdoc.fr, t/data-25/includessi_normalized.html,
t/data-25/xhtml_normalized.html, t/data-27/general-normalized.xml,
t/data-29/general-normalized.wml: Fixed test.
* lib/Locale/Po4a/Man.pm: When wrapped lines are merged, add a
space between the merged lines.
* lib/Locale/Po4a/Man.pm: Fix typo in a comment.
Index: Man.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Man.pm,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- Man.pm 12 May 2008 10:19:54 -0000 1.206
+++ Man.pm 14 Jul 2008 17:08:18 -0000 1.207
@@ -1033,7 +1033,7 @@
}
# There must not be an end of line inside an inline macro
- $str =~ s/(E<\.[^>]*)\n([^>]*>)/$1$2/gs;
+ $str =~ s/(E<\.[^>]*)\n([^>]*>)/$1 $2/gs;
# No . or ' on first char, or nroff will think it's a macro
# * at the beginning of a paragraph, add \& (zero width space) at
@@ -2478,7 +2478,7 @@
foreach (qw(Ad An Ar Cd Cm Dv Er Ev Fa Fd Fn Ic Li Nm Op Ot Pa St Va Vt Xr)) {
$inline{$_} = 1;
}
- # FIXME: some of thes macro introduce a line in bold.
+ # FIXME: some of these macros introduce a line in bold.
# Using \fP in these line is not supported.
# do_fonts should be called for every inline line
Index: TransTractor.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/TransTractor.pm,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- TransTractor.pm 2 Apr 2008 21:03:28 -0000 1.98
+++ TransTractor.pm 14 Jul 2008 17:08:18 -0000 1.99
@@ -894,6 +894,14 @@
# Encode::from_to($transstring,$self->{TT}{po_in}->get_charset,
# $self->get_out_charset);
# }
+
+ if ($options{'wrap'}||0) {
+ $transstring =~ s/( *)$//s;
+ my $trailing_spaces = $1||"";
+ $transstring =~ s/ *$//gm;
+ $transstring .= $trailing_spaces;
+ }
+
return $transstring;
}
More information about the Po4a-commits
mailing list