Merge commit '94f084324e648876508bed546d950762f10b875e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 10:24:47 +0000 (12:24 +0200)
* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
doc/texi2pod.pl

See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/texi2pod.pl

diff --cc doc/texi2pod.pl
index 94e011e,e4eb61c..6127dd8
mode 100644,100755..100644
@@@ -335,15 -330,16 +335,15 @@@ die "No filename or title\n" unless def
  # always use utf8
  print "=encoding utf8\n\n";
  
 -$sects{NAME} = "$fn \- $tl\n";
 -$sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
++$chapters{NAME} = "$fn \- $tl\n";
++$chapters{FOOTNOTES} .= "=back\n" if exists $chapters{FOOTNOTES};
 -unshift @sects_sequence, "NAME";
 -for $sect (@sects_sequence) {
 -    if(exists $sects{$sect}) {
 -        $head = $sect;
 -        $head =~ s/SEEALSO/SEE ALSO/;
 +unshift @chapters_sequence, "NAME";
 +for $chapter (@chapters_sequence) {
 +    if (exists $chapters{$chapter}) {
 +        $head = uc($chapter);
          print "=head1 $head\n\n";
 -        print scalar unmunge ($sects{$sect});
 +        print scalar unmunge ($chapters{$chapter});
          print "\n";
      }
  }