Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow mkdocs-pandoc to support structured pages #14

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+21 −13
Open

Allow mkdocs-pandoc to support structured pages #14

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
277cf84
Support structured pages.
capitalm-chen Jun 1, 2016
71168f1
Merge branch 'release/0.2.6.1'
capitalm-chen Jun 1, 2016
6d6bebe
Merge tag '0.2.6.1' into develop
capitalm-chen Jun 1, 2016
f00f6ae
Remove chapter numbering.
capitalm-chen Jul 26, 2016
6ad5599
Merge pull request #1 from capitalm-chen/feature/remove-chapter-numbe…
capitalm-chen Jul 26, 2016
5a08a9c
Merge branch 'release/0.2.6.2'
capitalm-chen Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions mkdocs_pandoc/pandoc_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,26 @@ def flatten_pages(self, pages, level=1):
flattened.append(
{
'file': page[0],
'title': page[1],
'title': '%s {.unnumbered}' % page[1],
'level': level,
})
if type(page) is dict:
if type(list(page.values())[0]) is str:
flattened.append(
{
'file': list(page.values())[0],
'title': list(page.keys())[0],
'title': '%s {.unnumbered}' % list(page.keys())[0],
'level': level,
})
if type(list(page.values())[0]) is list:
# Add the parent section
flattened.append(
{
'file': None,
'title': '%s {.unnumbered}' % list(page.keys())[0],
'level': level,
})
# Add children sections
flattened.extend(
self.flatten_pages(
list(page.values())[0],
Expand Down Expand Up @@ -115,12 +123,17 @@ def convert(self):
f_headlevel = mkdocs_pandoc.filters.headlevels.HeadlevelFilter(pages)

for page in pages:
fname = os.path.join(self.config['docs_dir'], page['file'])
try:
p = codecs.open(fname, 'r', self.encoding)
except IOError as e:
raise FatalError("Couldn't open %s for reading: %s" % (fname,
e.strerror), 1)
lines_tmp = []
if page['file']:
fname = os.path.join(self.config['docs_dir'], page['file'])
try:
with codecs.open(fname, 'r', self.encoding) as p:
for line in p.readlines():
lines_tmp.append(line.rstrip())
except IOError as e:
raise FatalError("Couldn't open %s for reading: %s" % (fname,
e.strerror), 1)

f_chapterhead = mkdocs_pandoc.filters.chapterhead.ChapterheadFilter(
headlevel=page['level'],
title=page['title']
Expand All @@ -131,11 +144,6 @@ def convert(self):
image_path=self.config['site_dir'],
image_ext=self.image_ext)

lines_tmp = []

for line in p.readlines():
lines_tmp.append(line.rstrip())

if self.exclude:
lines_tmp = f_exclude.run(lines_tmp)

Expand Down