[Po4a-commits] "po4a/lib/Locale/Po4a Man.pm,1.202,1.203"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory alioth:/tmp/cvs-serv29798/lib/Locale/Po4a

Modified Files:
	Man.pm 
Log Message:
* lib/Locale/Po4a/Man.pm: Do not change - to \- in \(-x \Z'...'
  \H'...' \*[...]
* t/23-man.t, t/data-23/hyphens.1, t/data-23/hyphens.translate.fr,
  t/data-23/hyphens.translate.fr.po, t/data-23/hyphens.translate.pot,
  t/data-23/hyphens.verbatim.fr, t/data-23/hyphens.verbatim.fr.po,
  t/data-23/hyphens.verbatim.pot: Add new tests for hyphens.
* MANIFEST: Distribute the new tests.


Index: Man.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Man.pm,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- Man.pm	13 Jan 2008 19:37:23 -0000	1.202
+++ Man.pm	14 Mar 2008 22:44:02 -0000	1.203
@@ -1008,9 +1008,9 @@
             $str = $2;
             my $tmp2 = $tmp.$begin;
             if (   ($begin =~ m/(?<!\\)(\\\\)*\\s$/s)
-                or ($begin =~ m/(?<!\\)(\\\\)*\\\((.|E<[gl]t>)$/s)
-                or ($tmp2 =~ m/(?<!\\)(\\\\)*\\[hCv]'([^']|(?<!\\)(\\\\)*\\')*$/)
-                or ($tmp2 =~ m/(?<!\\)(\\\\)*\\\[([^\]]|(?<!\\)(\\\\)*\\\[)*$/)
+                or ($begin =~ m/(?<!\\)(\\\\)*\\\((.|E<[gl]t>)?$/s)
+                or ($tmp2 =~ m/(?<!\\)(\\\\)*\\[ZHhCv]'([^']|(?<!\\)(\\\\)*\\')*$/)
+                or ($tmp2 =~ m/(?<!\\)(\\\\)*\\(\*)?\[([^\]]|(?<!\\)(\\\\)*\\\[)*$/)
                 or ($tmp2 =~ m/(?<!\\)(\\\\)*\\\*\(.?$/)) {
                 # Do not change - to \- for
                 #  * \s-n (reduce font size)
@@ -1019,7 +1019,10 @@
                 #  * inside a \C'...'
                 #  * inside a \[...]
                 #  * inside a \*(..
+                #  * inside a \*[...]
                 #  * inside a \v'...'
+                #  * inside a \H'...'
+                #  * inside a \Z'...'
                 $tmp = $tmp2."-";
             } else {
                 $tmp = $tmp2."\\-";