Support xhtml output

Depend on latest Perl6::Perldoc::To::Ansi and Pod::Xhtml as well.
hinrik · Jul 1, 2009 · b1e7f47 · b1e7f47
1 parent dcc11d1
commit b1e7f47
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/Changes b/Changes
@@ -1,4 +1,6 @@
 0.08
+    - Support xhtml output
+    - Depend on latest Perl6::Perldoc::To::Ansi
     - Fix pager execution on Win32. azawawi++
     - Depend on Win32::Console::ANSI on Win32 systems
 

diff --git a/Makefile.PL b/Makefile.PL
@@ -17,8 +17,9 @@ requires       ('IO::Interactive'          => '0');
 requires       ('File::ShareDir'           => '0');
 requires       ('File::Temp'               => '0');
 requires       ('Perl6::Perldoc'           => '0.0.5');
-requires       ('Perl6::Perldoc::To::Ansi' => '0.03');
+requires       ('Perl6::Perldoc::To::Ansi' => '0.05');
 requires       ('Pod::Usage'               => '0');
+requires       ('Pod::Xhtml'               => '0');
 requires       ('Win32::Console::ANSI'     => '0') if $^O eq 'MSWin32';
 test_requires  ('Test::More'               => '0');
 test_requires  ('Test::Script'             => '0');

diff --git a/lib/App/Grok.pm b/lib/App/Grok.pm
@@ -49,10 +49,6 @@ sub get_options {
         'v|version'  => sub { print "grok $VERSION\n"; exit },
     ) or pod2usage();
 
-    if ($opt{format} ne 'text' && $opt{format} ne 'ansi') {
-        die "Format '$opt{format}' is unsupported\n";
-    }
-
     die "Too few arguments\n" if !defined $opt{file} && !@ARGV;
 }
 

diff --git a/lib/App/Grok/Pod5.pm b/lib/App/Grok/Pod5.pm
@@ -15,7 +15,9 @@ sub render {
 
     my $formatter = $format eq 'ansi'
         ? 'Pod::Text::Color'
-        : 'Pod::Text'
+        : $format eq 'xhtml'
+            ? 'Pod::Xhtml'
+            : 'Pod::Text'
     ;
 
     eval "require $formatter";

diff --git a/lib/App/Grok/Pod6.pm b/lib/App/Grok/Pod6.pm
@@ -16,14 +16,14 @@ sub new {
 sub render {
     my ($self, $file, $format) = @_;
 
-    $format eq 'ansi'
-        ? require Perl6::Perldoc::To::Ansi
-        : require Perl6::Perldoc::To::Text
-    ;
+    die "Format $format unsupported" if $format !~ /^(?:ansi|text|xhtml)$/;
+    eval "require Perl6::Perldoc::To::\u$format";
+    die $@ if $@;
 
+    my $method = "to_$format";
     return Perl6::Perldoc::Parser->parse($file, {all_pod=>'auto'})
                                  ->report_errors()
-                                 ->to_text();
+                                 ->$method();
 }
 
 1;

diff --git a/script/grok b/script/grok
@@ -17,7 +17,7 @@ B<grok> <options> <target>
 
  Options:
    -F FILE, --file=FILE         A file to read Pod 6 from
-   -f FORMAT, --format=FORMAT   The output format, ansi(default) or text
+   -f FORMAT, --format=FORMAT   The output format, ansi/text/xhtml
    -h, --help                   Print this help message
    -l, --only                   Only print the path to the target file
    -T, --no-pager               Send output to STDOUT without any pager