diff options
Diffstat (limited to 'lib/App')
-rw-r--r-- | lib/App/DocKnot.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Command.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Config.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Dist.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Generate.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Release.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin.pm | 12 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin/Pointer.pm | 3 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin/RSS.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin/Sitemap.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin/Thread.pm | 4 | ||||
-rw-r--r-- | lib/App/DocKnot/Spin/Versions.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Update.pm | 2 | ||||
-rw-r--r-- | lib/App/DocKnot/Util.pm | 2 |
14 files changed, 24 insertions, 17 deletions
diff --git a/lib/App/DocKnot.pm b/lib/App/DocKnot.pm index 947b9d2..d4c2449 100644 --- a/lib/App/DocKnot.pm +++ b/lib/App/DocKnot.pm @@ -11,7 +11,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot 7.00; +package App::DocKnot 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Command.pm b/lib/App/DocKnot/Command.pm index a0fa90c..3992081 100644 --- a/lib/App/DocKnot/Command.pm +++ b/lib/App/DocKnot/Command.pm @@ -10,7 +10,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Command 7.00; +package App::DocKnot::Command 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Config.pm b/lib/App/DocKnot/Config.pm index 597e6cb..05fff02 100644 --- a/lib/App/DocKnot/Config.pm +++ b/lib/App/DocKnot/Config.pm @@ -9,7 +9,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Config 7.00; +package App::DocKnot::Config 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Dist.pm b/lib/App/DocKnot/Dist.pm index 585d243..8cdf203 100644 --- a/lib/App/DocKnot/Dist.pm +++ b/lib/App/DocKnot/Dist.pm @@ -10,7 +10,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Dist 7.00; +package App::DocKnot::Dist 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Generate.pm b/lib/App/DocKnot/Generate.pm index 72eb686..c195622 100644 --- a/lib/App/DocKnot/Generate.pm +++ b/lib/App/DocKnot/Generate.pm @@ -10,7 +10,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Generate 7.00; +package App::DocKnot::Generate 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Release.pm b/lib/App/DocKnot/Release.pm index b118281..1634ddb 100644 --- a/lib/App/DocKnot/Release.pm +++ b/lib/App/DocKnot/Release.pm @@ -10,7 +10,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Release 7.00; +package App::DocKnot::Release 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Spin.pm b/lib/App/DocKnot/Spin.pm index f7a5978..c461d61 100644 --- a/lib/App/DocKnot/Spin.pm +++ b/lib/App/DocKnot/Spin.pm @@ -11,7 +11,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin 7.00; +package App::DocKnot::Spin 7.01; use 5.024; use autodie; @@ -23,6 +23,7 @@ use App::DocKnot::Spin::Sitemap; use App::DocKnot::Spin::Thread; use App::DocKnot::Spin::Versions; use App::DocKnot::Util qw(is_newer print_checked print_fh); +use Encode qw(decode); use Git::Repository (); use IPC::System::Simple qw(capture); use Path::Iterator::Rule (); @@ -186,6 +187,7 @@ sub _cl2xhtml { my ($self, $source, $output, $options, $style) = @_; $style ||= $self->{style_url} . 'changelog.css'; my @page = capture("cl2xhtml $options -s $style $source"); + @page = map { decode('utf-8', $_) } @page; my $footer = sub { my ($blurb, $id) = @_; if ($blurb) { @@ -216,6 +218,7 @@ sub _cvs2xhtml { # Run the converter and write the output. my @page = capture("(cd $dir && cvs log $name) | cvs2xhtml $options"); + @page = map { decode('utf-8', $_) } @page; my $footer = sub { my ($blurb, $id, $file) = @_; if ($blurb) { @@ -234,6 +237,7 @@ sub _faq2html { my ($self, $source, $output, $options, $style) = @_; $style ||= $self->{style_url} . 'faq.css'; my @page = capture("faq2html $options -s $style $source"); + @page = map { decode('utf-8', $_) } @page; my $footer = sub { my ($blurb, $id, $file) = @_; if ($blurb) { @@ -270,6 +274,7 @@ sub _pod2html { my $data; $podthread->output_string(\$data); $podthread->parse_file("$source"); + $data = decode('utf-8', $data); # Spin that thread into HTML. my $page = $self->{thread}->spin_thread($data); @@ -573,16 +578,17 @@ sub spin { #>>> # Process the input tree. + my %options = (follow_symlinks => 0, report_symlinks => 1); $rule = Path::Iterator::Rule->new(); $rule = $rule->skip($rule->new()->name($self->{excludes}->@*)); - $iter = $rule->iter("$input", { follow_symlinks => 0 }); + $iter = $rule->iter("$input", \%options); while (defined(my $file = $iter->())) { $self->_process_file(path($file)); } # Remove stray files from the output tree. if ($self->{delete}) { - my %options = (depthfirst => 1, follow_symlinks => 0); + $options{depthfirst} = 1; $iter = $rule->iter("$output", \%options); while (defined(my $file = $iter->())) { $self->_delete_files(path($file)); diff --git a/lib/App/DocKnot/Spin/Pointer.pm b/lib/App/DocKnot/Spin/Pointer.pm index a16250c..d074b41 100644 --- a/lib/App/DocKnot/Spin/Pointer.pm +++ b/lib/App/DocKnot/Spin/Pointer.pm @@ -10,7 +10,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin::Pointer 7.00; +package App::DocKnot::Spin::Pointer 7.01; use 5.024; use autodie; @@ -136,6 +136,7 @@ sub _spin_pod { my $data; $podthread->output_string(\$data); $podthread->parse_file("$source"); + $data = decode('utf-8', $data); # Spin that page into HTML. $self->{thread}->spin_thread_output($data, $source, 'POD', $output); diff --git a/lib/App/DocKnot/Spin/RSS.pm b/lib/App/DocKnot/Spin/RSS.pm index 2b0e0fc..dc2e5ff 100644 --- a/lib/App/DocKnot/Spin/RSS.pm +++ b/lib/App/DocKnot/Spin/RSS.pm @@ -9,7 +9,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin::RSS 7.00; +package App::DocKnot::Spin::RSS 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Spin/Sitemap.pm b/lib/App/DocKnot/Spin/Sitemap.pm index 884765c..8a39e8a 100644 --- a/lib/App/DocKnot/Spin/Sitemap.pm +++ b/lib/App/DocKnot/Spin/Sitemap.pm @@ -12,7 +12,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin::Sitemap 7.00; +package App::DocKnot::Spin::Sitemap 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Spin/Thread.pm b/lib/App/DocKnot/Spin/Thread.pm index 1d1ef52..089582b 100644 --- a/lib/App/DocKnot/Spin/Thread.pm +++ b/lib/App/DocKnot/Spin/Thread.pm @@ -9,7 +9,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin::Thread 7.00; +package App::DocKnot::Spin::Thread 7.01; use 5.024; use autodie; @@ -1333,7 +1333,7 @@ sub _cmd_size { } # Format the size using SI units. - my @suffixes = qw(K M G T); + my @suffixes = qw(Ki Mi Gi Ti); my $suffix = q{}; while ($size > 1024 && @suffixes) { $size /= 1024; diff --git a/lib/App/DocKnot/Spin/Versions.pm b/lib/App/DocKnot/Spin/Versions.pm index 2b6f759..05537dd 100644 --- a/lib/App/DocKnot/Spin/Versions.pm +++ b/lib/App/DocKnot/Spin/Versions.pm @@ -12,7 +12,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Spin::Versions 7.00; +package App::DocKnot::Spin::Versions 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Update.pm b/lib/App/DocKnot/Update.pm index 4b43fba..6157910 100644 --- a/lib/App/DocKnot/Update.pm +++ b/lib/App/DocKnot/Update.pm @@ -9,7 +9,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Update 7.00; +package App::DocKnot::Update 7.01; use 5.024; use autodie; diff --git a/lib/App/DocKnot/Util.pm b/lib/App/DocKnot/Util.pm index cffa4f5..f705ca7 100644 --- a/lib/App/DocKnot/Util.pm +++ b/lib/App/DocKnot/Util.pm @@ -9,7 +9,7 @@ # Modules and declarations ############################################################################## -package App::DocKnot::Util 7.00; +package App::DocKnot::Util 7.01; use 5.024; use autodie; |