diff --git a/pelican/pandoc_templates/md_org_template.markdown b/pelican/pandoc_templates/md_org_template.markdown index b8946f5d..f5a607f6 100644 --- a/pelican/pandoc_templates/md_org_template.markdown +++ b/pelican/pandoc_templates/md_org_template.markdown @@ -2,11 +2,10 @@ $if(title)$Title: $title$$endif$ $for(author)$Author: $author$$endfor$ $if(date)$Date: $date$$endif$ $if(category)$Category: $category$$endif$ -$if(modified)$Modified: $modified$$endif$ -$if(slug)$Slug: $slug$$endif$ $if(summary)$Summary: $summary$$endif$ -$if(modified)$Modified: $modified$$endif$ +$if(slug)$Slug: $slug$$endif$ $for(tags)$Tags: $tags$$endfor$ +$if(modified)$Modified: $modified$$endif$ $if(toc)$ $toc$$endif$ $body$ $for(include-after)$$include-after$$endfor$ diff --git a/pelican/readers.py b/pelican/readers.py index 8a019164..0c89f1f9 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -25,7 +25,7 @@ except ImportError: try: import pypandoc except ImportError: - pandoc = False # NOQA + pypandoc = False # NOQA from six.moves.html_parser import HTMLParser from pelican import signals @@ -91,7 +91,7 @@ class _FieldBodyTranslator(HTMLTranslator): def depart_field_body(self, node): pass - + def render_node_to_html(document, node): visitor = _FieldBodyTranslator(document) @@ -246,10 +246,15 @@ class MarkdownReader(BaseReader): with pelican_open(source_path) as text: if self._source_path[-4:] == '.org' and \ self.enable_pypandoc is True: - pandoc_data_dir = '='.join(['--data-dir', pkg_resources.resource_filename('pelican', 'pandoc_templates')]) + pandoc_data_dir = '='.join(['--data-dir', + pkg_resources.resource_filename( + 'pelican', 'pandoc_templates')]) + logger.info('Using %s as pandoc_data_dir', + pandoc_data_dir) text = pypandoc.convert(text, 'markdown', \ format='org',\ - extra_args=['--template=md_org_template.markdown', pandoc_data_dir]) + extra_args=['--template=md_org_template.markdown', + pandoc_data_dir]) content = self._md.convert(text) metadata = self._parse_metadata(self._md.Meta)