From: Martin Hähnel Date: Fri, 14 Jul 2017 17:06:30 +0000 (+0200) Subject: changed line 439 from Meta to meta, now 1.18+ works X-Git-Url: https://git.g-eek.se/?a=commitdiff_plain;h=17a7918b19c5a5088063a0b29471bcac1d5cffa4;p=ikiwiki-pandoc.git changed line 439 from Meta to meta, now 1.18+ works --- diff --git a/pandoc.pm b/pandoc.pm index 25081ef..912fe0a 100755 --- a/pandoc.pm +++ b/pandoc.pm @@ -15,7 +15,7 @@ my %extra_formats = ( pdf => { ext=>'pdf', label=>'PDF', format=>'latex', extra=>[], order=>1 }, docx => { ext=>'docx', label=>'DOCX', format=>'docx', extra=>[], order=>2 }, odt => { ext=>'odt', label=>'ODT', format=>'odt', extra=>[], order=>3 }, - beamer => { ext=>'beamer.pdf', label=>'Beamer', format=>'beamer', extra=>[], order=>4 }, + beamer => { ext=>'beamer.pdf', label=>'Beamer', format=>'beamer', extra=>[], order=>L }, revealjs => { ext=>'revealjs.html', label=>'RevealJS', format=>'revealjs', extra=>['--self-contained'], order=>5 }, epub => { ext=>'epub', label=>'EPUB', format=>'epub3', extra=>[], order=>6 }, latex => { ext=>'tex', label=>'LaTeX', format=>'latex', extra=>['--standalone'], order=>7 }, @@ -436,7 +436,7 @@ sub htmlize ($@) { my $decoded_json = decode_json($json_content); # The representation of the meta block changed in pandoc version 1.18 if (ref $decoded_json eq 'HASH' && $decoded_json->{'Meta'}) { - $meta = $decoded_json->{'Meta'} || {}; # post-1.18 version + $meta = $decoded_json->{'meta'} || {}; # post-1.18 version } elsif (ref $decoded_json eq 'ARRAY') { $meta = $decoded_json->[0]->{'unMeta'} || {}; # pre-1.18 version }