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

Merge ccd283b26b into b8c9d61f20

Browse source
This commit is contained in:
randomllama 2014-08-20 16:04:01 +00:00
commit 1506ece232
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
docs/settings.rst
View file

@ -31,9 +31,9 @@ Here is a list of settings for Pelican:
Basic settings
==============
=============================================================================== =====================================================================
=============================================================================== ==============================================================================
Setting name (followed by default value, if any) What does it do?
=============================================================================== =====================================================================
=============================================================================== ==============================================================================
``AUTHOR`` Default author (put your name)
``DATE_FORMATS = {}`` If you manage multiple languages, you can set the date formatting
here. See the "Date format and locale" section below for details.
@ -107,6 +107,10 @@ Setting name (followed by default value, if any)
to the default values for this setting, you'll need to
include them explicitly and enumerate the full list of
desired Markdown extensions.)
``MD_OUTPUT_FORMAT = 'xhtml1'`` The output format that the Markdown processor will use. Refer to the
Python Markdown documentation's
`Library Reference section <http://pythonhosted.org/Markdown/reference.html>`_
for a complete list of supported formats.
``OUTPUT_PATH = 'output/'`` Where to output the generated files.
``PATH`` Path to content directory to be processed by Pelican. If undefined,
and content path is not specified via an argument to the ``pelican``
@ -194,7 +198,7 @@ Setting name (followed by default value, if any)
in this list are written. Paths should be either absolute or relative
to the current Pelican working directory. For possible use cases see
:ref:`writing_only_selected_content`.
=============================================================================== =====================================================================
=============================================================================== ==============================================================================
.. [#] Default is the system locale.

3
pelican/readers.py
View file

@ -199,6 +199,7 @@ class MarkdownReader(BaseReader):
def __init__(self, *args, **kwargs):
super(MarkdownReader, self).__init__(*args, **kwargs)
self.extensions = list(self.settings['MD_EXTENSIONS'])
self.output_format = self.settings['MD_OUTPUT_FORMAT']
if 'meta' not in self.extensions:
self.extensions.append('meta')
@ -226,7 +227,7 @@ class MarkdownReader(BaseReader):
def read(self, source_path):
"""Parse content and metadata of markdown files"""
self._md = Markdown(extensions=self.extensions)
self._md = Markdown(extensions=self.extensions, output_format=self.output_format)
with pelican_open(source_path) as text:
content = self._md.convert(text)

1
pelican/settings.py
View file

@ -99,6 +99,7 @@ DEFAULT_CONFIG = {
'DEFAULT_DATE_FORMAT': '%a %d %B %Y',
'DATE_FORMATS': {},
'MD_EXTENSIONS': ['codehilite(css_class=highlight)', 'extra'],
'MD_OUTPUT_FORMAT': 'xhtml1',
'JINJA_EXTENSIONS': [],
'JINJA_FILTERS': {},
'LOG_FILTER': [],