[Po4a-commits] "po4a/lib/Locale/Po4a Sgml.pm,1.68,1.69"

[Nicolas FRANCOIS]

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

Modified Files:
	Sgml.pm 
Log Message:
Use nsgmls -wno-valid option because our handling of marqued sections may
render the temporary document invalid according to its DTD.


Index: Sgml.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Sgml.pm,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- Sgml.pm	13 Sep 2005 19:01:03 -0000	1.68
+++ Sgml.pm	14 Sep 2005 08:01:42 -0000	1.69
@@ -660,7 +660,7 @@
     print $tmpfh $origfile;
     close $tmpfh || die wrap_mod("po4a::sgml", dgettext("po4a", "Can't close tempfile: %s"), $!);
 
-    my $cmd="nsgmls -l -E 0 <$tmpfile 2>/dev/null|";
+    my $cmd="nsgmls -l -E 0 -wno-valid <$tmpfile 2>/dev/null|";
     print STDERR "CMD=$cmd\n" if ($debug{'generic'});
 
     open (IN,$cmd) || die wrap_mod("po4a::sgml", dgettext("po4a", "Can't run nsgmls: %s"), $!);
@@ -954,7 +954,11 @@
     # What to do after parsing
     $self->pushline($buffer);
     close(IN);
-    die wrap_mod("po4a::sgml", dgettext("po4a","nsgmls is missing or non-functional")) if ($? != 0);
+    die wrap_mod("po4a::sgml",
+                 dgettext("po4a","nsgmls is missing or non-functional. ".
+                 "Please make sure that nsgmls is present and does not ".
+                 "produce any error (with the -wno-valid option), ".
+                 "and report a bug otherwise.")) if ($? != 0);
     unlink ($tmpfile) unless $debug{'refs'};
 }