2019-01-02 06:33:26 -05:00
|
|
|
// Copyright 2019 The Hugo Authors. All rights reserved.
|
2014-10-16 20:20:09 -04:00
|
|
|
//
|
2015-11-23 22:16:36 -05:00
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
2014-10-16 20:20:09 -04:00
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
2015-11-23 22:16:36 -05:00
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
2014-10-16 20:20:09 -04:00
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// Package helpers implements general utility functions that work with
|
|
|
|
// and on content. The helper functions defined here lay down the
|
|
|
|
// foundation of how Hugo works with files and filepaths, and perform
|
|
|
|
// string operations on content.
|
2014-10-16 20:20:09 -04:00
|
|
|
package helpers
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2017-04-06 16:24:27 -04:00
|
|
|
"fmt"
|
2014-10-16 20:20:09 -04:00
|
|
|
"html/template"
|
|
|
|
"os/exec"
|
2018-10-11 16:46:10 -04:00
|
|
|
"runtime"
|
2016-08-16 16:50:15 -04:00
|
|
|
"unicode"
|
2015-09-03 06:22:20 -04:00
|
|
|
"unicode/utf8"
|
2014-10-16 20:20:09 -04:00
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
"github.com/gohugoio/hugo/common/maps"
|
2019-06-04 06:21:25 -04:00
|
|
|
"github.com/niklasfasching/go-org/org"
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
|
2017-06-13 13:07:35 -04:00
|
|
|
bp "github.com/gohugoio/hugo/bufferpool"
|
|
|
|
"github.com/gohugoio/hugo/config"
|
2015-01-30 09:17:50 -05:00
|
|
|
"github.com/miekg/mmark"
|
2015-11-03 14:09:34 -05:00
|
|
|
"github.com/mitchellh/mapstructure"
|
2014-10-16 20:20:09 -04:00
|
|
|
"github.com/russross/blackfriday"
|
|
|
|
jww "github.com/spf13/jwalterweatherman"
|
2016-04-12 12:11:24 -04:00
|
|
|
|
|
|
|
"strings"
|
2014-10-16 20:20:09 -04:00
|
|
|
)
|
|
|
|
|
2016-02-05 12:40:49 -05:00
|
|
|
// SummaryDivider denotes where content summarization should end. The default is "<!--more-->".
|
2014-10-16 20:20:09 -04:00
|
|
|
var SummaryDivider = []byte("<!--more-->")
|
|
|
|
|
2019-04-05 13:11:04 -04:00
|
|
|
var (
|
|
|
|
openingPTag = []byte("<p>")
|
|
|
|
closingPTag = []byte("</p>")
|
|
|
|
paragraphIndicator = []byte("<p")
|
|
|
|
)
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// ContentSpec provides functionality to render markdown content.
|
2017-02-04 22:20:06 -05:00
|
|
|
type ContentSpec struct {
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
BlackFriday *BlackFriday
|
2017-04-06 13:37:41 -04:00
|
|
|
footnoteAnchorPrefix string
|
|
|
|
footnoteReturnLinkContents string
|
2017-09-29 03:04:55 -04:00
|
|
|
// SummaryLength is the length of the summary that Hugo extracts from a content.
|
|
|
|
summaryLength int
|
2017-04-06 13:37:41 -04:00
|
|
|
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
BuildFuture bool
|
|
|
|
BuildExpired bool
|
|
|
|
BuildDrafts bool
|
|
|
|
|
2017-09-25 02:59:02 -04:00
|
|
|
Highlight func(code, lang, optsStr string) (string, error)
|
|
|
|
defatultPygmentsOpts map[string]string
|
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
Cfg config.Provider
|
2017-02-04 22:20:06 -05:00
|
|
|
}
|
|
|
|
|
2017-08-02 08:25:05 -04:00
|
|
|
// NewContentSpec returns a ContentSpec initialized
|
|
|
|
// with the appropriate fields from the given config.Provider.
|
2017-09-25 02:59:02 -04:00
|
|
|
func NewContentSpec(cfg config.Provider) (*ContentSpec, error) {
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
bf := newBlackfriday(cfg.GetStringMap("blackfriday"))
|
2017-09-25 02:59:02 -04:00
|
|
|
spec := &ContentSpec{
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
BlackFriday: bf,
|
2017-04-06 13:37:41 -04:00
|
|
|
footnoteAnchorPrefix: cfg.GetString("footnoteAnchorPrefix"),
|
|
|
|
footnoteReturnLinkContents: cfg.GetString("footnoteReturnLinkContents"),
|
2017-09-29 03:04:55 -04:00
|
|
|
summaryLength: cfg.GetInt("summaryLength"),
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
BuildFuture: cfg.GetBool("buildFuture"),
|
|
|
|
BuildExpired: cfg.GetBool("buildExpired"),
|
|
|
|
BuildDrafts: cfg.GetBool("buildDrafts"),
|
2017-04-06 13:37:41 -04:00
|
|
|
|
2019-01-02 06:33:26 -05:00
|
|
|
Cfg: cfg,
|
2017-04-06 13:37:41 -04:00
|
|
|
}
|
2017-09-25 02:59:02 -04:00
|
|
|
|
|
|
|
// Highlighting setup
|
|
|
|
options, err := parseDefaultPygmentsOpts(cfg)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
spec.defatultPygmentsOpts = options
|
|
|
|
|
|
|
|
// Use the Pygmentize on path if present
|
|
|
|
useClassic := false
|
|
|
|
h := newHiglighters(spec)
|
|
|
|
|
|
|
|
if cfg.GetBool("pygmentsUseClassic") {
|
|
|
|
if !hasPygments() {
|
|
|
|
jww.WARN.Println("Highlighting with pygmentsUseClassic set requires Pygments to be installed and in the path")
|
|
|
|
} else {
|
|
|
|
useClassic = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if useClassic {
|
|
|
|
spec.Highlight = h.pygmentsHighlight
|
|
|
|
} else {
|
|
|
|
spec.Highlight = h.chromaHighlight
|
|
|
|
}
|
|
|
|
|
|
|
|
return spec, nil
|
2017-02-04 22:20:06 -05:00
|
|
|
}
|
|
|
|
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
// BlackFriday holds configuration values for BlackFriday rendering.
|
|
|
|
type BlackFriday struct {
|
2017-08-02 15:37:03 -04:00
|
|
|
Smartypants bool
|
|
|
|
SmartypantsQuotesNBSP bool
|
|
|
|
AngledQuotes bool
|
|
|
|
Fractions bool
|
|
|
|
HrefTargetBlank bool
|
2018-05-27 17:14:34 -04:00
|
|
|
NofollowLinks bool
|
2018-05-27 17:20:39 -04:00
|
|
|
NoreferrerLinks bool
|
2017-08-02 15:37:03 -04:00
|
|
|
SmartDashes bool
|
|
|
|
LatexDashes bool
|
|
|
|
TaskLists bool
|
|
|
|
PlainIDAnchors bool
|
|
|
|
Extensions []string
|
|
|
|
ExtensionsMask []string
|
2019-03-04 05:27:18 -05:00
|
|
|
SkipHTML bool
|
2015-01-25 06:08:02 -05:00
|
|
|
}
|
|
|
|
|
2016-03-19 16:21:16 -04:00
|
|
|
// NewBlackfriday creates a new Blackfriday filled with site config or some sane defaults.
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
func newBlackfriday(config map[string]interface{}) *BlackFriday {
|
2016-10-16 13:28:21 -04:00
|
|
|
defaultParam := map[string]interface{}{
|
2017-08-02 15:37:03 -04:00
|
|
|
"smartypants": true,
|
|
|
|
"angledQuotes": false,
|
|
|
|
"smartypantsQuotesNBSP": false,
|
|
|
|
"fractions": true,
|
|
|
|
"hrefTargetBlank": false,
|
2018-05-27 17:14:34 -04:00
|
|
|
"nofollowLinks": false,
|
2018-05-27 17:20:39 -04:00
|
|
|
"noreferrerLinks": false,
|
2017-08-02 15:37:03 -04:00
|
|
|
"smartDashes": true,
|
|
|
|
"latexDashes": true,
|
|
|
|
"plainIDAnchors": true,
|
|
|
|
"taskLists": true,
|
2019-03-04 05:27:18 -05:00
|
|
|
"skipHTML": false,
|
2015-01-31 12:24:00 -05:00
|
|
|
}
|
2015-11-03 14:09:34 -05:00
|
|
|
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
maps.ToLower(defaultParam)
|
2016-10-16 13:28:21 -04:00
|
|
|
|
|
|
|
siteConfig := make(map[string]interface{})
|
|
|
|
|
|
|
|
for k, v := range defaultParam {
|
|
|
|
siteConfig[k] = v
|
|
|
|
}
|
|
|
|
|
2019-03-24 05:11:16 -04:00
|
|
|
for k, v := range config {
|
|
|
|
siteConfig[k] = v
|
2015-11-03 14:09:34 -05:00
|
|
|
}
|
|
|
|
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
combinedConfig := &BlackFriday{}
|
2016-10-16 13:28:21 -04:00
|
|
|
if err := mapstructure.Decode(siteConfig, combinedConfig); err != nil {
|
2015-11-03 14:09:34 -05:00
|
|
|
jww.FATAL.Printf("Failed to get site rendering config\n%s", err.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
return combinedConfig
|
2015-01-31 12:24:00 -05:00
|
|
|
}
|
|
|
|
|
2015-01-25 06:08:02 -05:00
|
|
|
var blackfridayExtensionMap = map[string]int{
|
|
|
|
"noIntraEmphasis": blackfriday.EXTENSION_NO_INTRA_EMPHASIS,
|
|
|
|
"tables": blackfriday.EXTENSION_TABLES,
|
|
|
|
"fencedCode": blackfriday.EXTENSION_FENCED_CODE,
|
|
|
|
"autolink": blackfriday.EXTENSION_AUTOLINK,
|
|
|
|
"strikethrough": blackfriday.EXTENSION_STRIKETHROUGH,
|
|
|
|
"laxHtmlBlocks": blackfriday.EXTENSION_LAX_HTML_BLOCKS,
|
|
|
|
"spaceHeaders": blackfriday.EXTENSION_SPACE_HEADERS,
|
|
|
|
"hardLineBreak": blackfriday.EXTENSION_HARD_LINE_BREAK,
|
|
|
|
"tabSizeEight": blackfriday.EXTENSION_TAB_SIZE_EIGHT,
|
|
|
|
"footnotes": blackfriday.EXTENSION_FOOTNOTES,
|
|
|
|
"noEmptyLineBeforeBlock": blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK,
|
|
|
|
"headerIds": blackfriday.EXTENSION_HEADER_IDS,
|
|
|
|
"titleblock": blackfriday.EXTENSION_TITLEBLOCK,
|
|
|
|
"autoHeaderIds": blackfriday.EXTENSION_AUTO_HEADER_IDS,
|
2016-03-19 16:21:16 -04:00
|
|
|
"backslashLineBreak": blackfriday.EXTENSION_BACKSLASH_LINE_BREAK,
|
2015-06-13 04:02:53 -04:00
|
|
|
"definitionLists": blackfriday.EXTENSION_DEFINITION_LISTS,
|
2017-06-27 06:56:50 -04:00
|
|
|
"joinLines": blackfriday.EXTENSION_JOIN_LINES,
|
2015-01-25 06:08:02 -05:00
|
|
|
}
|
|
|
|
|
2015-02-05 12:31:11 -05:00
|
|
|
var stripHTMLReplacer = strings.NewReplacer("\n", " ", "</p>", "\n", "<br>", "\n", "<br />", "\n")
|
|
|
|
|
2015-01-30 09:17:50 -05:00
|
|
|
var mmarkExtensionMap = map[string]int{
|
|
|
|
"tables": mmark.EXTENSION_TABLES,
|
|
|
|
"fencedCode": mmark.EXTENSION_FENCED_CODE,
|
|
|
|
"autolink": mmark.EXTENSION_AUTOLINK,
|
|
|
|
"laxHtmlBlocks": mmark.EXTENSION_LAX_HTML_BLOCKS,
|
|
|
|
"spaceHeaders": mmark.EXTENSION_SPACE_HEADERS,
|
|
|
|
"hardLineBreak": mmark.EXTENSION_HARD_LINE_BREAK,
|
|
|
|
"footnotes": mmark.EXTENSION_FOOTNOTES,
|
|
|
|
"noEmptyLineBeforeBlock": mmark.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK,
|
|
|
|
"headerIds": mmark.EXTENSION_HEADER_IDS,
|
|
|
|
"autoHeaderIds": mmark.EXTENSION_AUTO_HEADER_IDS,
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// StripHTML accepts a string, strips out all HTML tags and returns it.
|
2014-10-16 20:20:09 -04:00
|
|
|
func StripHTML(s string) string {
|
|
|
|
|
|
|
|
// Shortcut strings with no tags in them
|
|
|
|
if !strings.ContainsAny(s, "<>") {
|
2015-02-05 12:31:11 -05:00
|
|
|
return s
|
2015-03-06 12:07:50 -05:00
|
|
|
}
|
|
|
|
s = stripHTMLReplacer.Replace(s)
|
|
|
|
|
|
|
|
// Walk through the string removing all tags
|
|
|
|
b := bp.GetBuffer()
|
|
|
|
defer bp.PutBuffer(b)
|
2016-08-17 07:41:48 -04:00
|
|
|
var inTag, isSpace, wasSpace bool
|
2015-03-06 12:07:50 -05:00
|
|
|
for _, r := range s {
|
2016-08-17 07:41:48 -04:00
|
|
|
if !inTag {
|
|
|
|
isSpace = false
|
|
|
|
}
|
|
|
|
|
|
|
|
switch {
|
|
|
|
case r == '<':
|
2015-03-06 12:07:50 -05:00
|
|
|
inTag = true
|
2016-08-17 07:41:48 -04:00
|
|
|
case r == '>':
|
2015-03-06 12:07:50 -05:00
|
|
|
inTag = false
|
2016-08-17 07:41:48 -04:00
|
|
|
case unicode.IsSpace(r):
|
|
|
|
isSpace = true
|
|
|
|
fallthrough
|
2015-03-06 12:07:50 -05:00
|
|
|
default:
|
2016-08-17 07:41:48 -04:00
|
|
|
if !inTag && (!isSpace || (isSpace && !wasSpace)) {
|
2015-03-06 12:07:50 -05:00
|
|
|
b.WriteRune(r)
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
}
|
2016-08-17 07:41:48 -04:00
|
|
|
|
|
|
|
wasSpace = isSpace
|
|
|
|
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
2015-03-06 12:07:50 -05:00
|
|
|
return b.String()
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2016-03-14 12:27:15 -04:00
|
|
|
// stripEmptyNav strips out empty <nav> tags from content.
|
|
|
|
func stripEmptyNav(in []byte) []byte {
|
2014-10-16 20:20:09 -04:00
|
|
|
return bytes.Replace(in, []byte("<nav>\n</nav>\n\n"), []byte(``), -1)
|
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// BytesToHTML converts bytes to type template.HTML.
|
2014-10-16 20:20:09 -04:00
|
|
|
func BytesToHTML(b []byte) template.HTML {
|
|
|
|
return template.HTML(string(b))
|
|
|
|
}
|
|
|
|
|
2016-03-19 16:21:16 -04:00
|
|
|
// getHTMLRenderer creates a new Blackfriday HTML Renderer with the given configuration.
|
2017-09-25 02:59:02 -04:00
|
|
|
func (c *ContentSpec) getHTMLRenderer(defaultFlags int, ctx *RenderingContext) blackfriday.Renderer {
|
2014-10-16 20:20:09 -04:00
|
|
|
renderParameters := blackfriday.HtmlRendererParameters{
|
2017-04-06 13:37:41 -04:00
|
|
|
FootnoteAnchorPrefix: c.footnoteAnchorPrefix,
|
|
|
|
FootnoteReturnLinkContents: c.footnoteReturnLinkContents,
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2016-04-12 12:11:24 -04:00
|
|
|
b := len(ctx.DocumentID) != 0
|
2015-01-05 14:00:56 -05:00
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config == nil {
|
|
|
|
panic(fmt.Sprintf("RenderingContext of %q doesn't have a config", ctx.DocumentID))
|
|
|
|
}
|
2017-04-06 13:37:41 -04:00
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if b && !ctx.Config.PlainIDAnchors {
|
2016-04-12 12:11:24 -04:00
|
|
|
renderParameters.FootnoteAnchorPrefix = ctx.DocumentID + ":" + renderParameters.FootnoteAnchorPrefix
|
|
|
|
renderParameters.HeaderIDSuffix = ":" + ctx.DocumentID
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
htmlFlags := defaultFlags
|
|
|
|
htmlFlags |= blackfriday.HTML_USE_XHTML
|
|
|
|
htmlFlags |= blackfriday.HTML_FOOTNOTE_RETURN_LINKS
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.Smartypants {
|
2015-08-04 15:05:48 -04:00
|
|
|
htmlFlags |= blackfriday.HTML_USE_SMARTYPANTS
|
|
|
|
}
|
|
|
|
|
2017-07-29 04:10:40 -04:00
|
|
|
if ctx.Config.SmartypantsQuotesNBSP {
|
|
|
|
htmlFlags |= blackfriday.HTML_SMARTYPANTS_QUOTES_NBSP
|
|
|
|
}
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.AngledQuotes {
|
2014-11-28 15:16:57 -05:00
|
|
|
htmlFlags |= blackfriday.HTML_SMARTYPANTS_ANGLED_QUOTES
|
|
|
|
}
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.Fractions {
|
2015-01-31 12:24:00 -05:00
|
|
|
htmlFlags |= blackfriday.HTML_SMARTYPANTS_FRACTIONS
|
2015-01-24 14:37:02 -05:00
|
|
|
}
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.HrefTargetBlank {
|
2015-06-28 09:18:15 -04:00
|
|
|
htmlFlags |= blackfriday.HTML_HREF_TARGET_BLANK
|
|
|
|
}
|
|
|
|
|
2018-05-27 17:14:34 -04:00
|
|
|
if ctx.Config.NofollowLinks {
|
|
|
|
htmlFlags |= blackfriday.HTML_NOFOLLOW_LINKS
|
|
|
|
}
|
|
|
|
|
2018-05-27 17:20:39 -04:00
|
|
|
if ctx.Config.NoreferrerLinks {
|
|
|
|
htmlFlags |= blackfriday.HTML_NOREFERRER_LINKS
|
|
|
|
}
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.SmartDashes {
|
2015-08-05 18:39:29 -04:00
|
|
|
htmlFlags |= blackfriday.HTML_SMARTYPANTS_DASHES
|
|
|
|
}
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config.LatexDashes {
|
2015-06-28 09:08:52 -04:00
|
|
|
htmlFlags |= blackfriday.HTML_SMARTYPANTS_LATEX_DASHES
|
|
|
|
}
|
|
|
|
|
2019-03-04 05:27:18 -05:00
|
|
|
if ctx.Config.SkipHTML {
|
|
|
|
htmlFlags |= blackfriday.HTML_SKIP_HTML
|
|
|
|
}
|
|
|
|
|
2016-03-24 18:16:18 -04:00
|
|
|
return &HugoHTMLRenderer{
|
2017-09-25 02:59:02 -04:00
|
|
|
cs: c,
|
2016-07-22 05:00:52 -04:00
|
|
|
RenderingContext: ctx,
|
|
|
|
Renderer: blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters),
|
2015-07-03 17:53:50 -04:00
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2015-03-06 12:07:50 -05:00
|
|
|
func getMarkdownExtensions(ctx *RenderingContext) int {
|
2016-03-19 16:21:16 -04:00
|
|
|
// Default Blackfriday common extensions
|
|
|
|
commonExtensions := 0 |
|
|
|
|
blackfriday.EXTENSION_NO_INTRA_EMPHASIS |
|
|
|
|
blackfriday.EXTENSION_TABLES |
|
|
|
|
blackfriday.EXTENSION_FENCED_CODE |
|
|
|
|
blackfriday.EXTENSION_AUTOLINK |
|
|
|
|
blackfriday.EXTENSION_STRIKETHROUGH |
|
|
|
|
blackfriday.EXTENSION_SPACE_HEADERS |
|
|
|
|
blackfriday.EXTENSION_HEADER_IDS |
|
|
|
|
blackfriday.EXTENSION_BACKSLASH_LINE_BREAK |
|
2015-06-13 04:02:53 -04:00
|
|
|
blackfriday.EXTENSION_DEFINITION_LISTS
|
2016-03-19 16:21:16 -04:00
|
|
|
|
|
|
|
// Extra Blackfriday extensions that Hugo enables by default
|
|
|
|
flags := commonExtensions |
|
|
|
|
blackfriday.EXTENSION_AUTO_HEADER_IDS |
|
|
|
|
blackfriday.EXTENSION_FOOTNOTES
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config == nil {
|
|
|
|
panic(fmt.Sprintf("RenderingContext of %q doesn't have a config", ctx.DocumentID))
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, extension := range ctx.Config.Extensions {
|
2015-01-25 06:08:02 -05:00
|
|
|
if flag, ok := blackfridayExtensionMap[extension]; ok {
|
|
|
|
flags |= flag
|
|
|
|
}
|
|
|
|
}
|
2017-04-06 16:24:27 -04:00
|
|
|
for _, extension := range ctx.Config.ExtensionsMask {
|
2015-04-15 21:54:10 -04:00
|
|
|
if flag, ok := blackfridayExtensionMap[extension]; ok {
|
|
|
|
flags &= ^flag
|
|
|
|
}
|
|
|
|
}
|
2015-01-25 06:08:02 -05:00
|
|
|
return flags
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
func (c ContentSpec) markdownRender(ctx *RenderingContext) []byte {
|
2016-07-10 05:36:25 -04:00
|
|
|
if ctx.RenderTOC {
|
|
|
|
return blackfriday.Markdown(ctx.Content,
|
2017-02-04 22:20:06 -05:00
|
|
|
c.getHTMLRenderer(blackfriday.HTML_TOC, ctx),
|
2016-07-10 05:36:25 -04:00
|
|
|
getMarkdownExtensions(ctx))
|
|
|
|
}
|
2017-02-04 22:20:06 -05:00
|
|
|
return blackfriday.Markdown(ctx.Content, c.getHTMLRenderer(0, ctx),
|
2015-03-06 12:07:50 -05:00
|
|
|
getMarkdownExtensions(ctx))
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2016-03-21 03:16:39 -04:00
|
|
|
// getMmarkHTMLRenderer creates a new mmark HTML Renderer with the given configuration.
|
2017-09-25 02:59:02 -04:00
|
|
|
func (c *ContentSpec) getMmarkHTMLRenderer(defaultFlags int, ctx *RenderingContext) mmark.Renderer {
|
2015-01-30 09:17:50 -05:00
|
|
|
renderParameters := mmark.HtmlRendererParameters{
|
2017-04-06 13:37:41 -04:00
|
|
|
FootnoteAnchorPrefix: c.footnoteAnchorPrefix,
|
|
|
|
FootnoteReturnLinkContents: c.footnoteReturnLinkContents,
|
2015-01-30 09:17:50 -05:00
|
|
|
}
|
|
|
|
|
2016-04-12 12:11:24 -04:00
|
|
|
b := len(ctx.DocumentID) != 0
|
2015-01-30 09:17:50 -05:00
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config == nil {
|
|
|
|
panic(fmt.Sprintf("RenderingContext of %q doesn't have a config", ctx.DocumentID))
|
|
|
|
}
|
|
|
|
|
|
|
|
if b && !ctx.Config.PlainIDAnchors {
|
2016-04-12 12:11:24 -04:00
|
|
|
renderParameters.FootnoteAnchorPrefix = ctx.DocumentID + ":" + renderParameters.FootnoteAnchorPrefix
|
2015-08-07 14:09:40 -04:00
|
|
|
// renderParameters.HeaderIDSuffix = ":" + ctx.DocumentId
|
2015-01-30 09:17:50 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
htmlFlags := defaultFlags
|
|
|
|
htmlFlags |= mmark.HTML_FOOTNOTE_RETURN_LINKS
|
|
|
|
|
2016-03-24 18:16:18 -04:00
|
|
|
return &HugoMmarkHTMLRenderer{
|
2017-09-25 02:59:02 -04:00
|
|
|
cs: c,
|
|
|
|
Renderer: mmark.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters),
|
2019-01-02 06:33:26 -05:00
|
|
|
Cfg: c.Cfg,
|
2015-09-07 14:41:02 -04:00
|
|
|
}
|
2015-01-30 09:17:50 -05:00
|
|
|
}
|
|
|
|
|
2016-03-14 12:27:15 -04:00
|
|
|
func getMmarkExtensions(ctx *RenderingContext) int {
|
2015-01-30 09:17:50 -05:00
|
|
|
flags := 0
|
|
|
|
flags |= mmark.EXTENSION_TABLES
|
|
|
|
flags |= mmark.EXTENSION_FENCED_CODE
|
|
|
|
flags |= mmark.EXTENSION_AUTOLINK
|
|
|
|
flags |= mmark.EXTENSION_SPACE_HEADERS
|
|
|
|
flags |= mmark.EXTENSION_CITATION
|
|
|
|
flags |= mmark.EXTENSION_TITLEBLOCK_TOML
|
|
|
|
flags |= mmark.EXTENSION_HEADER_IDS
|
|
|
|
flags |= mmark.EXTENSION_AUTO_HEADER_IDS
|
|
|
|
flags |= mmark.EXTENSION_UNIQUE_HEADER_IDS
|
|
|
|
flags |= mmark.EXTENSION_FOOTNOTES
|
|
|
|
flags |= mmark.EXTENSION_SHORT_REF
|
|
|
|
flags |= mmark.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
|
|
|
|
flags |= mmark.EXTENSION_INCLUDE
|
|
|
|
|
2017-04-06 16:24:27 -04:00
|
|
|
if ctx.Config == nil {
|
|
|
|
panic(fmt.Sprintf("RenderingContext of %q doesn't have a config", ctx.DocumentID))
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, extension := range ctx.Config.Extensions {
|
2015-01-30 09:17:50 -05:00
|
|
|
if flag, ok := mmarkExtensionMap[extension]; ok {
|
|
|
|
flags |= flag
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return flags
|
|
|
|
}
|
|
|
|
|
2017-02-04 22:20:06 -05:00
|
|
|
func (c ContentSpec) mmarkRender(ctx *RenderingContext) []byte {
|
|
|
|
return mmark.Parse(ctx.Content, c.getMmarkHTMLRenderer(0, ctx),
|
2016-03-14 12:27:15 -04:00
|
|
|
getMmarkExtensions(ctx)).Bytes()
|
2015-01-30 09:17:50 -05:00
|
|
|
}
|
|
|
|
|
2014-12-26 10:07:03 -05:00
|
|
|
// ExtractTOC extracts Table of Contents from content.
|
2014-10-16 20:20:09 -04:00
|
|
|
func ExtractTOC(content []byte) (newcontent []byte, toc []byte) {
|
2018-04-19 12:06:40 -04:00
|
|
|
if !bytes.Contains(content, []byte("<nav>")) {
|
|
|
|
return content, nil
|
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
origContent := make([]byte, len(content))
|
|
|
|
copy(origContent, content)
|
|
|
|
first := []byte(`<nav>
|
|
|
|
<ul>`)
|
|
|
|
|
|
|
|
last := []byte(`</ul>
|
|
|
|
</nav>`)
|
|
|
|
|
|
|
|
replacement := []byte(`<nav id="TableOfContents">
|
|
|
|
<ul>`)
|
|
|
|
|
|
|
|
startOfTOC := bytes.Index(content, first)
|
|
|
|
|
|
|
|
peekEnd := len(content)
|
|
|
|
if peekEnd > 70+startOfTOC {
|
|
|
|
peekEnd = 70 + startOfTOC
|
|
|
|
}
|
|
|
|
|
|
|
|
if startOfTOC < 0 {
|
2016-03-14 12:27:15 -04:00
|
|
|
return stripEmptyNav(content), toc
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
// Need to peek ahead to see if this nav element is actually the right one.
|
2014-10-29 01:08:31 -04:00
|
|
|
correctNav := bytes.Index(content[startOfTOC:peekEnd], []byte(`<li><a href="#`))
|
2014-10-16 20:20:09 -04:00
|
|
|
if correctNav < 0 { // no match found
|
|
|
|
return content, toc
|
|
|
|
}
|
|
|
|
lengthOfTOC := bytes.Index(content[startOfTOC:], last) + len(last)
|
|
|
|
endOfTOC := startOfTOC + lengthOfTOC
|
|
|
|
|
|
|
|
newcontent = append(content[:startOfTOC], content[endOfTOC:]...)
|
|
|
|
toc = append(replacement, origContent[startOfTOC+len(first):endOfTOC]...)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-03-06 12:07:50 -05:00
|
|
|
// RenderingContext holds contextual information, like content and configuration,
|
2016-02-05 12:40:49 -05:00
|
|
|
// for a given content rendering.
|
2017-04-06 16:24:27 -04:00
|
|
|
// By creating you must set the Config, otherwise it will panic.
|
2014-11-28 15:16:57 -05:00
|
|
|
type RenderingContext struct {
|
2017-02-04 22:20:06 -05:00
|
|
|
Content []byte
|
|
|
|
PageFmt string
|
|
|
|
DocumentID string
|
|
|
|
DocumentName string
|
Reuse the BlackFriday instance when possible
This is in heavy use in rendering, so this makes a difference:
```bash
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 124551144 107743429 -13.49%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 528684 435118 -17.70%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_pages=500,tags_per_page=5,shortcodes,render-4 53306848 45147832 -15.31%
```
2017-12-16 12:56:58 -05:00
|
|
|
Config *BlackFriday
|
2017-02-04 22:20:06 -05:00
|
|
|
RenderTOC bool
|
|
|
|
Cfg config.Provider
|
2014-11-28 15:16:57 -05:00
|
|
|
}
|
|
|
|
|
2015-03-06 12:07:50 -05:00
|
|
|
// RenderBytes renders a []byte.
|
2017-02-04 22:20:06 -05:00
|
|
|
func (c ContentSpec) RenderBytes(ctx *RenderingContext) []byte {
|
2014-11-28 15:16:57 -05:00
|
|
|
switch ctx.PageFmt {
|
2014-10-16 20:20:09 -04:00
|
|
|
default:
|
2017-02-04 22:20:06 -05:00
|
|
|
return c.markdownRender(ctx)
|
2014-10-16 20:20:09 -04:00
|
|
|
case "markdown":
|
2017-02-04 22:20:06 -05:00
|
|
|
return c.markdownRender(ctx)
|
Experimental AsciiDoc support with external helpers
See #470
* Based on existing support for reStructuredText files
* Handles content files with extensions `.asciidoc` and `.ad`
* Pipes content through `asciidoctor --safe -`.
If `asciidoctor` is not installed, then `asciidoc --safe -`.
* To make sure `asciidoctor` or `asciidoc` is found, after adding
a piece of AsciiDoc content, run `hugo` with the `-v` flag
and look for this message:
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
Caveats:
* The final "Last updated" timestamp is currently not stripped.
* When `hugo` is run with `-v`, you may see a lot of these messages
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
if you have lots of `*.ad`, `*.adoc` or `*.asciidoc` files.
* Some versions of `asciidoc` may have trouble with its safe mode.
To test if you are affected, try this:
$ echo "Hello" | asciidoc --safe -
asciidoc: ERROR: unsafe: ifeval invalid
asciidoc: FAILED: ifeval invalid safe document
If so, I recommend that you install `asciidoctor` instead.
Feedback and patches welcome!
Ideally, we should be using https://github.com/VonC/asciidocgo,
@VonC's wonderful Go implementation of Asciidoctor. However,
there is still a bit of work needed for asciidocgo to expose
its API so that Hugo can actually use it.
Until then, hope this "experimental AsciiDoc support through external
helpers" can serve as a stopgap solution for our community. :-)
2015-01-30: Updated for the replaceShortcodeTokens() syntax change
2015-02-21: Add `.adoc` extension as suggested by @Fale
Conflicts:
helpers/content.go
2015-01-23 13:59:14 -05:00
|
|
|
case "asciidoc":
|
2016-10-13 04:30:43 -04:00
|
|
|
return getAsciidocContent(ctx)
|
2015-01-30 09:17:50 -05:00
|
|
|
case "mmark":
|
2017-02-04 22:20:06 -05:00
|
|
|
return c.mmarkRender(ctx)
|
2014-10-16 20:20:09 -04:00
|
|
|
case "rst":
|
2016-10-19 09:22:40 -04:00
|
|
|
return getRstContent(ctx)
|
2017-02-21 02:46:03 -05:00
|
|
|
case "org":
|
|
|
|
return orgRender(ctx, c)
|
2017-11-30 06:15:52 -05:00
|
|
|
case "pandoc":
|
|
|
|
return getPandocContent(ctx)
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-17 00:37:19 -04:00
|
|
|
// TotalWords counts instance of one or more consecutive white space
|
|
|
|
// characters, as defined by unicode.IsSpace, in s.
|
|
|
|
// This is a cheaper way of word counting than the obvious len(strings.Fields(s)).
|
2014-10-16 20:20:09 -04:00
|
|
|
func TotalWords(s string) int {
|
2016-08-17 00:37:19 -04:00
|
|
|
n := 0
|
|
|
|
inWord := false
|
|
|
|
for _, r := range s {
|
|
|
|
wasInWord := inWord
|
|
|
|
inWord = !unicode.IsSpace(r)
|
|
|
|
if inWord && !wasInWord {
|
|
|
|
n++
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return n
|
|
|
|
}
|
|
|
|
|
|
|
|
// Old implementation only kept for benchmark comparison.
|
|
|
|
// TODO(bep) remove
|
|
|
|
func totalWordsOld(s string) int {
|
2014-10-16 20:20:09 -04:00
|
|
|
return len(strings.Fields(s))
|
|
|
|
}
|
|
|
|
|
2016-02-05 12:40:49 -05:00
|
|
|
// TruncateWordsByRune truncates words by runes.
|
2018-04-27 04:17:01 -04:00
|
|
|
func (c *ContentSpec) TruncateWordsByRune(in []string) (string, bool) {
|
|
|
|
words := make([]string, len(in))
|
|
|
|
copy(words, in)
|
|
|
|
|
2015-09-03 06:22:20 -04:00
|
|
|
count := 0
|
2015-09-03 06:22:20 -04:00
|
|
|
for index, word := range words {
|
2017-09-29 03:04:55 -04:00
|
|
|
if count >= c.summaryLength {
|
2015-09-03 06:22:20 -04:00
|
|
|
return strings.Join(words[:index], " "), true
|
|
|
|
}
|
2015-09-03 06:22:20 -04:00
|
|
|
runeCount := utf8.RuneCountInString(word)
|
|
|
|
if len(word) == runeCount {
|
2015-09-03 06:22:20 -04:00
|
|
|
count++
|
2017-09-29 03:04:55 -04:00
|
|
|
} else if count+runeCount < c.summaryLength {
|
2015-09-03 06:22:20 -04:00
|
|
|
count += runeCount
|
2015-09-03 06:22:20 -04:00
|
|
|
} else {
|
2016-02-06 06:29:13 -05:00
|
|
|
for ri := range word {
|
2017-09-29 03:04:55 -04:00
|
|
|
if count >= c.summaryLength {
|
2015-09-03 06:22:20 -04:00
|
|
|
truncatedWords := append(words[:index], word[:ri])
|
|
|
|
return strings.Join(truncatedWords, " "), true
|
2015-09-03 06:22:20 -04:00
|
|
|
}
|
2016-02-05 12:40:49 -05:00
|
|
|
count++
|
2015-09-03 06:22:20 -04:00
|
|
|
}
|
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
2015-09-03 06:22:20 -04:00
|
|
|
|
|
|
|
return strings.Join(words, " "), false
|
|
|
|
}
|
|
|
|
|
2016-08-16 16:50:15 -04:00
|
|
|
// TruncateWordsToWholeSentence takes content and truncates to whole sentence
|
|
|
|
// limited by max number of words. It also returns whether it is truncated.
|
2017-09-29 03:04:55 -04:00
|
|
|
func (c *ContentSpec) TruncateWordsToWholeSentence(s string) (string, bool) {
|
2016-08-16 16:50:15 -04:00
|
|
|
var (
|
|
|
|
wordCount = 0
|
|
|
|
lastWordIndex = -1
|
|
|
|
)
|
|
|
|
|
|
|
|
for i, r := range s {
|
|
|
|
if unicode.IsSpace(r) {
|
|
|
|
wordCount++
|
|
|
|
lastWordIndex = i
|
|
|
|
|
2017-09-29 03:04:55 -04:00
|
|
|
if wordCount >= c.summaryLength {
|
2016-08-16 16:50:15 -04:00
|
|
|
break
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if lastWordIndex == -1 {
|
|
|
|
return s, false
|
|
|
|
}
|
|
|
|
|
|
|
|
endIndex := -1
|
|
|
|
|
|
|
|
for j, r := range s[lastWordIndex:] {
|
|
|
|
if isEndOfSentence(r) {
|
|
|
|
endIndex = j + lastWordIndex + utf8.RuneLen(r)
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if endIndex == -1 {
|
|
|
|
return s, false
|
|
|
|
}
|
|
|
|
|
|
|
|
return strings.TrimSpace(s[:endIndex]), endIndex < len(s)
|
|
|
|
}
|
|
|
|
|
2019-04-05 13:11:04 -04:00
|
|
|
// TrimShortHTML removes the <p>/</p> tags from HTML input in the situation
|
|
|
|
// where said tags are the only <p> tags in the input and enclose the content
|
|
|
|
// of the input (whitespace excluded).
|
|
|
|
func (c *ContentSpec) TrimShortHTML(input []byte) []byte {
|
|
|
|
first := bytes.Index(input, paragraphIndicator)
|
|
|
|
last := bytes.LastIndex(input, paragraphIndicator)
|
|
|
|
if first == last {
|
|
|
|
input = bytes.TrimSpace(input)
|
|
|
|
input = bytes.TrimPrefix(input, openingPTag)
|
|
|
|
input = bytes.TrimSuffix(input, closingPTag)
|
|
|
|
input = bytes.TrimSpace(input)
|
|
|
|
}
|
|
|
|
return input
|
|
|
|
}
|
|
|
|
|
2016-08-16 16:50:15 -04:00
|
|
|
func isEndOfSentence(r rune) bool {
|
|
|
|
return r == '.' || r == '?' || r == '!' || r == '"' || r == '\n'
|
|
|
|
}
|
|
|
|
|
|
|
|
// Kept only for benchmark.
|
2017-09-29 03:04:55 -04:00
|
|
|
func (c *ContentSpec) truncateWordsToWholeSentenceOld(content string) (string, bool) {
|
2016-08-16 16:50:15 -04:00
|
|
|
words := strings.Fields(content)
|
|
|
|
|
2017-09-29 03:04:55 -04:00
|
|
|
if c.summaryLength >= len(words) {
|
2015-09-03 06:22:20 -04:00
|
|
|
return strings.Join(words, " "), false
|
|
|
|
}
|
|
|
|
|
2017-09-29 03:04:55 -04:00
|
|
|
for counter, word := range words[c.summaryLength:] {
|
2015-09-03 06:22:20 -04:00
|
|
|
if strings.HasSuffix(word, ".") ||
|
|
|
|
strings.HasSuffix(word, "?") ||
|
|
|
|
strings.HasSuffix(word, ".\"") ||
|
|
|
|
strings.HasSuffix(word, "!") {
|
2017-09-29 03:04:55 -04:00
|
|
|
upper := c.summaryLength + counter + 1
|
2015-09-03 06:22:20 -04:00
|
|
|
return strings.Join(words[:upper], " "), (upper < len(words))
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
}
|
2015-09-03 06:22:20 -04:00
|
|
|
|
2017-09-29 03:04:55 -04:00
|
|
|
return strings.Join(words[:c.summaryLength], " "), true
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
|
|
|
|
2016-07-03 18:33:08 -04:00
|
|
|
func getAsciidocExecPath() string {
|
2017-07-21 05:07:56 -04:00
|
|
|
path, err := exec.LookPath("asciidoc")
|
Experimental AsciiDoc support with external helpers
See #470
* Based on existing support for reStructuredText files
* Handles content files with extensions `.asciidoc` and `.ad`
* Pipes content through `asciidoctor --safe -`.
If `asciidoctor` is not installed, then `asciidoc --safe -`.
* To make sure `asciidoctor` or `asciidoc` is found, after adding
a piece of AsciiDoc content, run `hugo` with the `-v` flag
and look for this message:
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
Caveats:
* The final "Last updated" timestamp is currently not stripped.
* When `hugo` is run with `-v`, you may see a lot of these messages
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
if you have lots of `*.ad`, `*.adoc` or `*.asciidoc` files.
* Some versions of `asciidoc` may have trouble with its safe mode.
To test if you are affected, try this:
$ echo "Hello" | asciidoc --safe -
asciidoc: ERROR: unsafe: ifeval invalid
asciidoc: FAILED: ifeval invalid safe document
If so, I recommend that you install `asciidoctor` instead.
Feedback and patches welcome!
Ideally, we should be using https://github.com/VonC/asciidocgo,
@VonC's wonderful Go implementation of Asciidoctor. However,
there is still a bit of work needed for asciidocgo to expose
its API so that Hugo can actually use it.
Until then, hope this "experimental AsciiDoc support through external
helpers" can serve as a stopgap solution for our community. :-)
2015-01-30: Updated for the replaceShortcodeTokens() syntax change
2015-02-21: Add `.adoc` extension as suggested by @Fale
Conflicts:
helpers/content.go
2015-01-23 13:59:14 -05:00
|
|
|
if err != nil {
|
2017-07-21 05:07:56 -04:00
|
|
|
return ""
|
Experimental AsciiDoc support with external helpers
See #470
* Based on existing support for reStructuredText files
* Handles content files with extensions `.asciidoc` and `.ad`
* Pipes content through `asciidoctor --safe -`.
If `asciidoctor` is not installed, then `asciidoc --safe -`.
* To make sure `asciidoctor` or `asciidoc` is found, after adding
a piece of AsciiDoc content, run `hugo` with the `-v` flag
and look for this message:
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
Caveats:
* The final "Last updated" timestamp is currently not stripped.
* When `hugo` is run with `-v`, you may see a lot of these messages
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
if you have lots of `*.ad`, `*.adoc` or `*.asciidoc` files.
* Some versions of `asciidoc` may have trouble with its safe mode.
To test if you are affected, try this:
$ echo "Hello" | asciidoc --safe -
asciidoc: ERROR: unsafe: ifeval invalid
asciidoc: FAILED: ifeval invalid safe document
If so, I recommend that you install `asciidoctor` instead.
Feedback and patches welcome!
Ideally, we should be using https://github.com/VonC/asciidocgo,
@VonC's wonderful Go implementation of Asciidoctor. However,
there is still a bit of work needed for asciidocgo to expose
its API so that Hugo can actually use it.
Until then, hope this "experimental AsciiDoc support through external
helpers" can serve as a stopgap solution for our community. :-)
2015-01-30: Updated for the replaceShortcodeTokens() syntax change
2015-02-21: Add `.adoc` extension as suggested by @Fale
Conflicts:
helpers/content.go
2015-01-23 13:59:14 -05:00
|
|
|
}
|
2016-07-03 18:33:08 -04:00
|
|
|
return path
|
|
|
|
}
|
|
|
|
|
2017-07-21 05:07:56 -04:00
|
|
|
func getAsciidoctorExecPath() string {
|
|
|
|
path, err := exec.LookPath("asciidoctor")
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return path
|
|
|
|
}
|
|
|
|
|
2017-11-30 06:15:52 -05:00
|
|
|
// HasAsciidoc returns whether Asciidoc or Asciidoctor is installed on this computer.
|
|
|
|
func HasAsciidoc() bool {
|
|
|
|
return (getAsciidoctorExecPath() != "" ||
|
|
|
|
getAsciidocExecPath() != "")
|
2017-07-21 05:07:56 -04:00
|
|
|
}
|
|
|
|
|
2016-07-03 18:33:08 -04:00
|
|
|
// getAsciidocContent calls asciidoctor or asciidoc as an external helper
|
|
|
|
// to convert AsciiDoc content to HTML.
|
2016-10-13 04:30:43 -04:00
|
|
|
func getAsciidocContent(ctx *RenderingContext) []byte {
|
2017-07-21 05:07:56 -04:00
|
|
|
var isAsciidoctor bool
|
|
|
|
path := getAsciidoctorExecPath()
|
2016-07-03 18:33:08 -04:00
|
|
|
if path == "" {
|
2017-07-21 05:07:56 -04:00
|
|
|
path = getAsciidocExecPath()
|
|
|
|
if path == "" {
|
|
|
|
jww.ERROR.Println("asciidoctor / asciidoc not found in $PATH: Please install.\n",
|
|
|
|
" Leaving AsciiDoc content unrendered.")
|
2017-11-30 06:15:52 -05:00
|
|
|
return ctx.Content
|
2017-07-21 05:07:56 -04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
isAsciidoctor = true
|
2016-07-03 18:33:08 -04:00
|
|
|
}
|
Experimental AsciiDoc support with external helpers
See #470
* Based on existing support for reStructuredText files
* Handles content files with extensions `.asciidoc` and `.ad`
* Pipes content through `asciidoctor --safe -`.
If `asciidoctor` is not installed, then `asciidoc --safe -`.
* To make sure `asciidoctor` or `asciidoc` is found, after adding
a piece of AsciiDoc content, run `hugo` with the `-v` flag
and look for this message:
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
Caveats:
* The final "Last updated" timestamp is currently not stripped.
* When `hugo` is run with `-v`, you may see a lot of these messages
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
if you have lots of `*.ad`, `*.adoc` or `*.asciidoc` files.
* Some versions of `asciidoc` may have trouble with its safe mode.
To test if you are affected, try this:
$ echo "Hello" | asciidoc --safe -
asciidoc: ERROR: unsafe: ifeval invalid
asciidoc: FAILED: ifeval invalid safe document
If so, I recommend that you install `asciidoctor` instead.
Feedback and patches welcome!
Ideally, we should be using https://github.com/VonC/asciidocgo,
@VonC's wonderful Go implementation of Asciidoctor. However,
there is still a bit of work needed for asciidocgo to expose
its API so that Hugo can actually use it.
Until then, hope this "experimental AsciiDoc support through external
helpers" can serve as a stopgap solution for our community. :-)
2015-01-30: Updated for the replaceShortcodeTokens() syntax change
2015-02-21: Add `.adoc` extension as suggested by @Fale
Conflicts:
helpers/content.go
2015-01-23 13:59:14 -05:00
|
|
|
|
2016-10-19 09:22:40 -04:00
|
|
|
jww.INFO.Println("Rendering", ctx.DocumentName, "with", path, "...")
|
2017-07-21 05:07:56 -04:00
|
|
|
args := []string{"--no-header-footer", "--safe"}
|
|
|
|
if isAsciidoctor {
|
|
|
|
// asciidoctor-specific arg to show stack traces on errors
|
|
|
|
args = append(args, "--trace")
|
|
|
|
}
|
|
|
|
args = append(args, "-")
|
2017-11-30 06:15:52 -05:00
|
|
|
return externallyRenderContent(ctx, path, args)
|
Experimental AsciiDoc support with external helpers
See #470
* Based on existing support for reStructuredText files
* Handles content files with extensions `.asciidoc` and `.ad`
* Pipes content through `asciidoctor --safe -`.
If `asciidoctor` is not installed, then `asciidoc --safe -`.
* To make sure `asciidoctor` or `asciidoc` is found, after adding
a piece of AsciiDoc content, run `hugo` with the `-v` flag
and look for this message:
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
Caveats:
* The final "Last updated" timestamp is currently not stripped.
* When `hugo` is run with `-v`, you may see a lot of these messages
INFO: 2015/01/23 Rendering with /usr/bin/asciidoctor ...
if you have lots of `*.ad`, `*.adoc` or `*.asciidoc` files.
* Some versions of `asciidoc` may have trouble with its safe mode.
To test if you are affected, try this:
$ echo "Hello" | asciidoc --safe -
asciidoc: ERROR: unsafe: ifeval invalid
asciidoc: FAILED: ifeval invalid safe document
If so, I recommend that you install `asciidoctor` instead.
Feedback and patches welcome!
Ideally, we should be using https://github.com/VonC/asciidocgo,
@VonC's wonderful Go implementation of Asciidoctor. However,
there is still a bit of work needed for asciidocgo to expose
its API so that Hugo can actually use it.
Until then, hope this "experimental AsciiDoc support through external
helpers" can serve as a stopgap solution for our community. :-)
2015-01-30: Updated for the replaceShortcodeTokens() syntax change
2015-02-21: Add `.adoc` extension as suggested by @Fale
Conflicts:
helpers/content.go
2015-01-23 13:59:14 -05:00
|
|
|
}
|
|
|
|
|
2016-07-04 04:49:20 -04:00
|
|
|
// HasRst returns whether rst2html is installed on this computer.
|
|
|
|
func HasRst() bool {
|
|
|
|
return getRstExecPath() != ""
|
|
|
|
}
|
2014-10-16 20:20:09 -04:00
|
|
|
|
2016-07-04 04:49:20 -04:00
|
|
|
func getRstExecPath() string {
|
2015-01-21 08:05:16 -05:00
|
|
|
path, err := exec.LookPath("rst2html")
|
|
|
|
if err != nil {
|
|
|
|
path, err = exec.LookPath("rst2html.py")
|
|
|
|
if err != nil {
|
2016-07-04 04:49:20 -04:00
|
|
|
return ""
|
2015-01-21 08:05:16 -05:00
|
|
|
}
|
|
|
|
}
|
2016-07-04 04:49:20 -04:00
|
|
|
return path
|
|
|
|
}
|
|
|
|
|
2017-01-01 17:16:58 -05:00
|
|
|
func getPythonExecPath() string {
|
|
|
|
path, err := exec.LookPath("python")
|
|
|
|
if err != nil {
|
|
|
|
path, err = exec.LookPath("python.exe")
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return path
|
|
|
|
}
|
|
|
|
|
2016-07-04 04:49:20 -04:00
|
|
|
// getRstContent calls the Python script rst2html as an external helper
|
|
|
|
// to convert reStructuredText content to HTML.
|
2016-10-19 09:22:40 -04:00
|
|
|
func getRstContent(ctx *RenderingContext) []byte {
|
2016-07-04 04:49:20 -04:00
|
|
|
path := getRstExecPath()
|
|
|
|
|
|
|
|
if path == "" {
|
|
|
|
jww.ERROR.Println("rst2html / rst2html.py not found in $PATH: Please install.\n",
|
|
|
|
" Leaving reStructuredText content unrendered.")
|
2017-11-30 06:15:52 -05:00
|
|
|
return ctx.Content
|
2016-07-04 04:49:20 -04:00
|
|
|
|
|
|
|
}
|
2016-10-19 09:22:40 -04:00
|
|
|
jww.INFO.Println("Rendering", ctx.DocumentName, "with", path, "...")
|
2018-10-11 16:46:10 -04:00
|
|
|
var result []byte
|
|
|
|
// certain *nix based OSs wrap executables in scripted launchers
|
|
|
|
// invoking binaries on these OSs via python interpreter causes SyntaxError
|
|
|
|
// invoke directly so that shebangs work as expected
|
|
|
|
// handle Windows manually because it doesn't do shebangs
|
|
|
|
if runtime.GOOS == "windows" {
|
|
|
|
python := getPythonExecPath()
|
|
|
|
args := []string{path, "--leave-comments", "--initial-header-level=2"}
|
|
|
|
result = externallyRenderContent(ctx, python, args)
|
|
|
|
} else {
|
|
|
|
args := []string{"--leave-comments", "--initial-header-level=2"}
|
|
|
|
result = externallyRenderContent(ctx, path, args)
|
|
|
|
}
|
2016-07-10 06:52:20 -04:00
|
|
|
// TODO(bep) check if rst2html has a body only option.
|
|
|
|
bodyStart := bytes.Index(result, []byte("<body>\n"))
|
2017-01-01 17:16:58 -05:00
|
|
|
if bodyStart < 0 {
|
|
|
|
bodyStart = -7 //compensate for length
|
|
|
|
}
|
|
|
|
|
2016-07-10 06:52:20 -04:00
|
|
|
bodyEnd := bytes.Index(result, []byte("\n</body>"))
|
2017-01-01 17:16:58 -05:00
|
|
|
if bodyEnd < 0 || bodyEnd >= len(result) {
|
|
|
|
bodyEnd = len(result) - 1
|
|
|
|
if bodyEnd < 0 {
|
|
|
|
bodyEnd = 0
|
|
|
|
}
|
|
|
|
}
|
2016-07-10 06:52:20 -04:00
|
|
|
|
|
|
|
return result[bodyStart+7 : bodyEnd]
|
2014-10-16 20:20:09 -04:00
|
|
|
}
|
2017-02-21 02:46:03 -05:00
|
|
|
|
2017-11-30 06:15:52 -05:00
|
|
|
// getPandocContent calls pandoc as an external helper to convert pandoc markdown to HTML.
|
|
|
|
func getPandocContent(ctx *RenderingContext) []byte {
|
|
|
|
path, err := exec.LookPath("pandoc")
|
|
|
|
if err != nil {
|
|
|
|
jww.ERROR.Println("pandoc not found in $PATH: Please install.\n",
|
|
|
|
" Leaving pandoc content unrendered.")
|
|
|
|
return ctx.Content
|
|
|
|
}
|
|
|
|
args := []string{"--mathjax"}
|
|
|
|
return externallyRenderContent(ctx, path, args)
|
|
|
|
}
|
|
|
|
|
2017-02-21 02:46:03 -05:00
|
|
|
func orgRender(ctx *RenderingContext, c ContentSpec) []byte {
|
2019-06-04 06:21:25 -04:00
|
|
|
config := org.New()
|
|
|
|
config.Log = jww.WARN
|
|
|
|
writer := org.NewHTMLWriter()
|
|
|
|
writer.HighlightCodeBlock = func(source, lang string) string {
|
|
|
|
highlightedSource, err := c.Highlight(source, lang, "")
|
|
|
|
if err != nil {
|
|
|
|
jww.ERROR.Printf("Could not highlight source as lang %s. Using raw source.", lang)
|
|
|
|
return source
|
|
|
|
}
|
|
|
|
return highlightedSource
|
|
|
|
}
|
|
|
|
|
|
|
|
html, err := config.Parse(bytes.NewReader(ctx.Content), ctx.DocumentName).Write(writer)
|
|
|
|
if err != nil {
|
|
|
|
jww.ERROR.Printf("Could not render org: %s. Using unrendered content.", err)
|
|
|
|
return ctx.Content
|
|
|
|
}
|
|
|
|
return []byte(html)
|
2017-02-21 02:46:03 -05:00
|
|
|
}
|
2017-11-30 06:15:52 -05:00
|
|
|
|
|
|
|
func externallyRenderContent(ctx *RenderingContext, path string, args []string) []byte {
|
|
|
|
content := ctx.Content
|
|
|
|
cleanContent := bytes.Replace(content, SummaryDivider, []byte(""), 1)
|
|
|
|
|
|
|
|
cmd := exec.Command(path, args...)
|
|
|
|
cmd.Stdin = bytes.NewReader(cleanContent)
|
|
|
|
var out, cmderr bytes.Buffer
|
|
|
|
cmd.Stdout = &out
|
|
|
|
cmd.Stderr = &cmderr
|
|
|
|
err := cmd.Run()
|
|
|
|
// Most external helpers exit w/ non-zero exit code only if severe, i.e.
|
|
|
|
// halting errors occurred. -> log stderr output regardless of state of err
|
2019-03-24 05:11:16 -04:00
|
|
|
for _, item := range strings.Split(cmderr.String(), "\n") {
|
2017-11-30 06:15:52 -05:00
|
|
|
item := strings.TrimSpace(item)
|
|
|
|
if item != "" {
|
|
|
|
jww.ERROR.Printf("%s: %s", ctx.DocumentName, item)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
jww.ERROR.Printf("%s rendering %s: %v", path, ctx.DocumentName, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
return normalizeExternalHelperLineFeeds(out.Bytes())
|
|
|
|
}
|