Skip to content

WIP: Bibliography with Pandoc #4800

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Bibliography with Pandoc #4800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d03711b
Generate a bibliography with Pandoc.
bilke May 30, 2018
a70e6dc
Pass frontmatter to external helper.
bilke May 30, 2018
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
30 changes: 22 additions & 8 deletions helpers/content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,13 +455,15 @@ func ExtractTOC(content []byte) (newcontent []byte, toc []byte) {
// for a given content rendering.
// By creating you must set the Config, otherwise it will panic.
type RenderingContext struct {
Content []byte
PageFmt string
DocumentID string
DocumentName string
Config *BlackFriday
RenderTOC bool
Cfg config.Provider
Frontmatter map[string]interface{}
FrontmatterRaw []byte
Content []byte
PageFmt string
DocumentID string
DocumentName string
Config *BlackFriday
RenderTOC bool
Cfg config.Provider
}

// RenderBytes renders a []byte.
Expand Down Expand Up @@ -715,7 +717,18 @@ func getPandocContent(ctx *RenderingContext) []byte {
" Leaving pandoc content unrendered.")
return ctx.Content
}

jww.INFO.Println("Rendering", ctx.DocumentName, "with", path, "...")
args := []string{"--mathjax"}

pathCiteproc, errCiteproc := exec.LookPath("pandoc-citeproc")
if errCiteproc == nil {
if bib, ok := ctx.Frontmatter["bibliography"].(string); ok {
args = append(args, "--filter", "pandoc-citeproc")
jww.INFO.Println("Rendering bibliography", bib, "with", pathCiteproc, "...")
}
}

return externallyRenderContent(ctx, path, args)
}

Expand All @@ -727,7 +740,8 @@ func orgRender(ctx *RenderingContext, c ContentSpec) []byte {
}

func externallyRenderContent(ctx *RenderingContext, path string, args []string) []byte {
content := ctx.Content
content := ctx.FrontmatterRaw
content = append(content, ctx.Content...)
cleanContent := bytes.Replace(content, SummaryDivider, []byte(""), 1)

cmd := exec.Command(path, args...)
Expand Down
4 changes: 3 additions & 1 deletion hugolib/page.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,9 @@ func (p *Page) setAutoSummary() error {

func (p *Page) renderContent(content []byte) []byte {
return p.s.ContentSpec.RenderBytes(&helpers.RenderingContext{
Content: content, RenderTOC: true, PageFmt: p.Markup,
Frontmatter: p.params,
FrontmatterRaw: p.frontmatter,
Content: content, RenderTOC: true, PageFmt: p.Markup,
Cfg: p.Language(),
DocumentID: p.UniqueID(), DocumentName: p.Path(),
Config: p.getRenderingConfig()})
Expand Down