[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, master, updated. debian/0.9.51-16-g264d63e

[Agustin Martin Domingo]

The following commit has been merged in the master branch:
commit 8f11657474c2187c3b730eb0374d66ba91826977
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Wed Jun 11 00:33:18 2008 +0200

    Make sure headers are written in a single line

diff --git a/lib/dist/fmt_info.pl b/lib/dist/fmt_info.pl
index 50c13b2..f3f0504 100644
--- a/lib/dist/fmt_info.pl
+++ b/lib/dist/fmt_info.pl
@@ -57,6 +57,7 @@ $info->{preASP} = sub {
   my ($INFILE, $OUTFILE) = @_;
   my $suffix    = ( $global->{charset} eq "latin1" ) ? '.2l1texi' : '.2texi';
   my $char_maps = load_char_maps ($suffix, [ Text::EntityMap::sdata_dirs() ]);
+  my $inheading;
 
   # Replace some symbols in the file before sgmlsasp is called. This
   # has been done in preNSGMLS, but if the specified sgml file is
@@ -72,6 +73,7 @@ $info->{preASP} = sub {
 
     if ( s/^-// ) {
       chomp;
+      s/([^\\])\\n/$1 /g if $inheading;      # Remove spurious \n in headings
       print $OUTFILE "-" .
 	parse_data ($_, $char_maps, $info_escape) . "\n";
     } elsif (/^A/) {
@@ -84,6 +86,11 @@ $info->{preASP} = sub {
       }
       print $OUTFILE "A$name $type $value\n";
     } else {
+      if (/^\(HEADING/){
+        $inheading = 1;
+      } elsif (/^\)HEADING/){
+        $inheading = '';
+      }
       #  Default action if not skipped over by previous conditions: copy in to out.
       print $OUTFILE $_;
     }

-- 
linuxdoc-tools package for Debian.