f1x1t/pelican-pandoc-reader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: f1x1t:toc
Branches Tags
f1x1t:fix f1x1t:master f1x1t:toc f1x1t:fix-bib
..
compare: f1x1t:fix-bib
Branches Tags
f1x1t:master f1x1t:toc f1x1t:fix-bib f1x1t:fix

1 Commits
toc ... fix-bib

Author SHA1 Message Date
Andrey Astafyev
2ecccea48a Fix bibliography arguments 2019-04-25 14:44:06 +03:00
1 changed files with 5 additions and 9 deletions
Expand all files Collapse all files

14
pandoc_reader.py
View File

@@ -60,9 +60,6 @@ class PandocReader(BaseReader):
text = list(fp.splitlines()) text = list(fp.splitlines())
metadata, content = self._get_meta_and_content(text) metadata, content = self._get_meta_and_content(text)
bib_dir = self.settings.get('PANDOC_BIBDIR', '')
bib_header = self.settings.get('PANDOC_BIBHEADER', None)
filters = self.settings.get('PANDOC_FILTERS', []) filters = self.settings.get('PANDOC_FILTERS', [])
extensions = self.settings.get('PANDOC_EXTENSIONS', '') extensions = self.settings.get('PANDOC_EXTENSIONS', '')
@@ -79,20 +76,19 @@ class PandocReader(BaseReader):
pandoc_cmd.extend(["--filter", filt]) pandoc_cmd.extend(["--filter", filt])
pandoc_cmd.extend(extra_args) pandoc_cmd.extend(extra_args)
bib_dir = self.settings.get('PANDOC_BIBDIR', '')
bib_header = self.settings.get('PANDOC_BIBHEADER', None)
if "bibliography" in metadata.keys(): if "bibliography" in metadata.keys():
bib_file = os.path.join(bib_dir, metadata['bibliography']) bib_file = os.path.join(bib_dir, metadata['bibliography'])
if not os.path.exists(bib_file): if not os.path.exists(bib_file):
raise FileNotFoundError(bib_file) raise FileNotFoundError(bib_file)
extra_args = extra_args + ['--bibliography={}'.format(bib_file)] bib_args = ['--bibliography={}'.format(bib_file)]
if bib_header is not None: if bib_header is not None:
extra_args = extra_args + [ bib_args = bib_args + [
'--metadata=reference-section-title="{}"'.format( '--metadata=reference-section-title="{}"'.format(
bib_header)] bib_header)]
pandoc_cmd.extend(bib_args)
if "toc" in metadata.keys():
if metadata['toc'] == True:
pandoc_cmd.extend(['--toc'])
proc = subprocess.Popen( proc = subprocess.Popen(
pandoc_cmd, pandoc_cmd,