github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pypandoc import exception and pandoc templates

Browse source
This commit is contained in:
Jotham Apaloo 2015-03-22 22:11:10 -04:00
commit 1852b4ed86
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pelican/pandoc_templates/md_org_template.markdown
View file

@ -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$

13
pelican/readers.py
View file

@ -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)