Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 08:02:57 +0000 (09:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 08:02:57 +0000 (09:02 +0100)
* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
doc/texi2pod.pl

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

diff --cc doc/texi2pod.pl
index 8fabac6,609568e..f972671
mode 100755,100755..100644
@@@ -324,15 -319,18 +324,17 @@@ $inf = pop @instack
  
  die "No filename or title\n" unless defined $fn && defined $tl;
  
 -$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) {
 +unshift @chapters_sequence, "NAME";
 +for $chapter (@chapters_sequence) {
+     # always use utf8
+     print "=encoding utf8\n";
 -    if(exists $sects{$sect}) {
 -        $head = $sect;
 -        $head =~ s/SEEALSO/SEE ALSO/;
 +    if (exists $chapters{$chapter}) {
 +        $head = uc($chapter);
          print "=head1 $head\n\n";
 -        print scalar unmunge ($sects{$sect});
 +        print scalar unmunge ($chapters{$chapter});
          print "\n";
      }
  }