[Po4a-commits] "po4a/lib/Locale/Po4a Man.pm,1.131,1.132"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv15983/lib/Locale/Po4a

Modified Files:
	Man.pm 
Log Message:
Little cleanup for mdoc.


Index: Man.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Man.pm,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- Man.pm	19 Mar 2006 16:55:49 -0000	1.131
+++ Man.pm	19 Mar 2006 18:19:18 -0000	1.132
@@ -854,8 +854,9 @@
         $str = $tmp.$str;
     }
     }
-# FIXME: not inside a E<...>
-    $str =~ s/(E<\.[^>]*)\n([^>]*>)/$1 $2/g;
+
+    # There must not be an end of line inside an inline macro
+    $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
@@ -1094,13 +1095,6 @@
 		$wrapped_mode='YES';
 	    }
 	    
-#	    # Special case:
-#	    #  .Dd => Indicates that this is a mdoc page
-#	    if ($macro eq 'Dd') {
-#		die wrap_mod("po4a::man", dgettext("po4a",
-#		    "This page seems to be a mdoc(7) formatted one. This is not supported (yet)."));
-#	    }
-		
 	    unshift @args,$self;
 	    # Apply macro
 	    $self->{type}=$macro;