Added support for textile and mediawiki formats and options for bibliography/csl

diff --git a/pandoc.pm b/pandoc.pm
index ec3706dc603ad2887cdd672830d2ea2272782a6a..b40162582dbf37e7892a6668e6920136c5d0d340 100755 (executable)
--- a/pandoc.pm
+++ b/pandoc.pm
@@ -13,7 +13,7 @@ sub import {
 
     hook(type => "getsetup", id => "pandoc", call => \&getsetup);
     hook(type => "htmlize", id => $markdown_ext,
-        # longname => "Pandoc Markdown",
+     # longname => "Pandoc Markdown",
          call => sub { htmlize("markdown", @_) });
     if ($config{pandoc_latex}) {
         hook(type => "htmlize", id => "tex",
@@ -23,6 +23,14 @@ sub import {
         hook(type => "htmlize", id => "rst",
              call => sub { htmlize("rst", @_) });
     }
+    if ($config{pandoc_textile}) {
+        hook(type => "htmlize", id => "textile",
+             call => sub { htmlize("textile", @_) });
+    }
+    if ($config{pandoc_mediawiki}) {
+        hook(type => "htmlize", id => "mediawiki",
+             call => sub { htmlize("mediawiki", @_) });
+    }
 }
 
 
@@ -60,6 +68,20 @@ sub getsetup () {
         safe => 0,
         rebuild => 1,
     },
+    pandoc_textile => {
+        type => "boolean",
+        example => 0,
+        description => "Enable Pandoc processing of Textile documents",
+        safe => 0,
+        rebuild => 1,
+    },
+    pandoc_mediawiki => {
+        type => "boolean",
+        example => 0,
+        description => "Enable Pandoc processing of MediaWiki documents",
+        safe => 0,
+        rebuild => 1,
+    },
     pandoc_smart => {
         type => "boolean",
         example => 1,
@@ -111,11 +133,25 @@ sub getsetup () {
     },
     pandoc_math => {
         type => "string",
-        example => "unicode",
+        example => "mathjax",
         description => "Process TeX math using",
         safe => 0,
         rebuild => 1,
     },
+    pandoc_bibliography => {
+        type => "string",
+        example => "",
+        description => "Path to bibliography file",
+        safe => 0,
+        rebuild => 1,
+    },
+    pandoc_csl => {
+        type => "string",
+        example => "",
+        description => "Path to CSL file (for references and bibliography)",
+        safe => 0,
+        rebuild => 1,
+    },
 }
 
 
@@ -159,9 +195,16 @@ sub htmlize ($@) {
         push @args, '--indented-code-classes=' . $config{pandoc_codeclasses};
     };
 
+    if ($config{pandoc_bibliography}) {
+        push @args, '--bibliography="'.$config{pandoc_bibliography}.'"';
+    }
+
+    if ($config{pandoc_csl}) {
+        push @args, '--csl="'.$config{pandoc_csl}.'"';
+    }
 
     for ($config{pandoc_math}) {
-        if (/^mathjax$/) { 
+        if (/^mathjax$/) {
             push @args, '--mathjax=/dev/null';
         }
         elsif (/^jsmath$/) {