fixed utf8 handling for recent versions of perl.

Author: agentzh

ebooks.mk

@@ -25,7 +25,6 @@ html: $(name).html
 %.pdf: $(name).html
 	cp tutorial-simple.css tutorial.css
 	ebook-convert $< $@ \
-	    --override-profile-size \
 	    --margin-bottom 10 \
 	    --margin-top 10 \
 	    --margin-left 10 \

utils/gen-html-index-cn.pl

@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
 
-use encoding 'utf8';
+use v5.10.1;
+use utf8;
 use strict;
 use warnings;
 
@@ -85,7 +86,7 @@
 $res .= "</ul>\n";
 
 for my $infile (@ARGV) {
-    open my $in, $infile
+    open my $in, "<:encoding(utf-8)", $infile
         or die "Cannot open $infile for reading: $!\n";
     $res .= do { local $/; <$in> };
     close $in;
@@ -94,7 +95,7 @@
 $res .= "</body></html>";
 
 if ($outfile) {
-    open my $out, ">:encoding(UTF-8)", $outfile
+    open my $out, ">:encoding(utf-8)", $outfile
         or die "Cannot open $outfile for writing: $!\n";
 
     print $out $res;

utils/gen-html-index-en.pl

@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
 
-use encoding 'utf8';
+use v5.10.1;
+use utf8;
 use strict;
 use warnings;
 
@@ -91,7 +92,7 @@
 $res .= "<section class=\"content\">\n";
 
 for my $infile (@ARGV) {
-    open my $in, $infile
+    open my $in, "<:encoding(utf-8)", $infile
         or die "Cannot open $infile for reading: $!\n";
     $res .= "<article>\n";
     my $c = do { local $/; <$in> };

utils/tut2wiki-cn.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 
+use v5.10.1;
 use utf8;
 use strict;
 use warnings;
@@ -36,7 +37,7 @@
 my $infile = shift or
     usage();
 
-open my $in, "<:encoding(UTF-8)", $infile
+open my $in, "<:encoding(utf-8)", $infile
     or die "cannot open $infile for reading: $!\n";
 
 my $prev;
@@ -76,7 +77,7 @@
 
 utf8::encode($src);
 
-open $in, "<:encoding(UTF-8)", \$src or die $!;
+open $in, "<:encoding(utf-8)", \$src or die $!;
 
 my $wiki = '';
 undef $prev;
@@ -211,7 +212,7 @@
 $wiki =~ s/^\s+|\s+$//sg;
 
 if ($outfile) {
-    open my $out, ">:encoding(UTF-8)", $outfile
+    open my $out, ">:encoding(utf-8)", $outfile
         or die "Cannot open $outfile for writing: $!\n";
 
     print $out $wiki;

utils/tut2wiki-en.pl

@@ -1,8 +1,9 @@
 #!/usr/bin/env perl
 
+use v5.10.1;
+use utf8;
 use strict;
 use warnings;
-use encoding 'utf8';
 
 use Getopt::Std;
 my %opts;

utils/wiki2html-cn.pl

@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 
+use v5.10.1;
 use utf8;
 use strict;
 use warnings;
@@ -44,7 +45,7 @@
     die "Bad input file $infile\n";
 }
 
-open my $in, "<:encoding(UTF-8)", $infile
+open my $in, "<:encoding(utf-8)", $infile
     or die "Cannot open $infile for reading: $!\n";
 
 my $ctx = {};
@@ -96,7 +97,7 @@
 #$html .= "    </body>\n</html>\n";
 
 if ($outfile) {
-    open my $out, ">:encoding(UTF-8)", $outfile
+    open my $out, ">:encoding(utf-8)", $outfile
         or die "Cannot open $outfile for writing: $!\n";
 
     print $out $html;

utils/wiki2html-en.pl

@@ -1,6 +1,7 @@
 #!/usr/bin/env perl
 
-use encoding 'utf8';
+use v5.10.1;
+use utf8;
 use strict;
 use warnings;