From 2b28e5a9cb79af2a8d70c80036f52bcf5399b9df Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Fri, 17 Apr 2020 16:09:17 +0200 Subject: [PATCH] deps: Update go-org to v1.1.0 - inline source blocks and exports - result blocks and source block :exports parameter - fix: html escaping in example blocks - #+LINK based links --- go.mod | 2 +- go.sum | 4 ++-- markup/org/convert.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 904a642ca..601b37f0e 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/muesli/smartcrop v0.3.0 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nicksnyder/go-i18n v1.10.0 - github.com/niklasfasching/go-org v1.0.0 + github.com/niklasfasching/go-org v1.1.0 github.com/olekukonko/tablewriter v0.0.4 github.com/pelletier/go-toml v1.6.0 // indirect github.com/pkg/errors v0.8.1 diff --git a/go.sum b/go.sum index d1de6696b..313ca3c31 100644 --- a/go.sum +++ b/go.sum @@ -253,8 +253,8 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= -github.com/niklasfasching/go-org v1.0.0 h1:lDh8zKtmbaQupKQhLyVp1clG+JojkVoVBH9bT7c9O70= -github.com/niklasfasching/go-org v1.0.0/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU= +github.com/niklasfasching/go-org v1.1.0 h1:4EQbzTGLhNoHU/G65ZYHwCYmrfL+W7laAuU+8WNhmIE= +github.com/niklasfasching/go-org v1.1.0/go.mod h1:AsLD6X7djzRIz4/RFZu8vwRL0VGjUvGZCCH1Nz0VdrU= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= diff --git a/markup/org/convert.go b/markup/org/convert.go index 2b1fbb73c..7a3ad7076 100644 --- a/markup/org/convert.go +++ b/markup/org/convert.go @@ -52,7 +52,7 @@ func (c *orgConverter) Convert(ctx converter.RenderContext) (converter.Result, e return afero.ReadFile(c.cfg.ContentFs, filename) } writer := org.NewHTMLWriter() - writer.HighlightCodeBlock = func(source, lang string) string { + writer.HighlightCodeBlock = func(source, lang string, inline bool) string { highlightedSource, err := c.cfg.Highlight(source, lang, "") if err != nil { logger.ERROR.Printf("Could not highlight source as lang %s. Using raw source.", lang)