mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-29 03:42:06 -05:00
f0266e2ef3
This commit solves the relative path problem with asciidoctor tooling. An include will resolve relatively, so you can refer easily to files in the same folder. Also `asciidoctor-diagram` and PlantUML rendering works now, because the created temporary files will be placed in the correct folder. This patch covers just the Ruby version of asciidoctor. The old AsciiDoc CLI EOLs in Jan 2020, so this variant is removed from code. The configuration is completely rewritten and now available in `config.toml` under the key `[markup.asciidocext]`: ```toml [markup.asciidocext] extensions = ["asciidoctor-html5s", "asciidoctor-diagram"] workingFolderCurrent = true trace = true [markup.asciidocext.attributes] my-base-url = "https://example.com/" my-attribute-name = "my value" ``` - backends, safe-modes, and extensions are now whitelisted to the popular (ruby) extensions and valid values. - the default for extensions is to not enable any, because they're all external dependencies so the build would break if the user didn't install them beforehand. - the default backend is html5 because html5s is an external gem dependency. - the default safe-mode is safe, explanations of the modes: https://asciidoctor.org/man/asciidoctor/ - the config is namespaced under asciidocext_config and the parser looks at asciidocext to allow a future native Go asciidoc. - `uglyUrls=true` option and `--source` flag are supported - `--destination` flag is required Follow the updated documentation under `docs/content/en/content-management/formats.md`. This patch would be a breaking change, because you need to correct all your absolute include pathes to relative paths, so using relative paths must be configured explicitly by setting `workingFolderCurrent = true`.
135 lines
3.5 KiB
Go
135 lines
3.5 KiB
Go
// Copyright 2019 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// 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.
|
|
|
|
package converter
|
|
|
|
import (
|
|
"bytes"
|
|
|
|
"github.com/gohugoio/hugo/common/loggers"
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/gohugoio/hugo/identity"
|
|
"github.com/gohugoio/hugo/markup/converter/hooks"
|
|
"github.com/gohugoio/hugo/markup/markup_config"
|
|
"github.com/gohugoio/hugo/markup/tableofcontents"
|
|
"github.com/spf13/afero"
|
|
)
|
|
|
|
// ProviderConfig configures a new Provider.
|
|
type ProviderConfig struct {
|
|
MarkupConfig markup_config.Config
|
|
|
|
Cfg config.Provider // Site config
|
|
ContentFs afero.Fs
|
|
Logger *loggers.Logger
|
|
Highlight func(code, lang, optsStr string) (string, error)
|
|
}
|
|
|
|
// ProviderProvider creates converter providers.
|
|
type ProviderProvider interface {
|
|
New(cfg ProviderConfig) (Provider, error)
|
|
}
|
|
|
|
// Provider creates converters.
|
|
type Provider interface {
|
|
New(ctx DocumentContext) (Converter, error)
|
|
Name() string
|
|
}
|
|
|
|
// NewProvider creates a new Provider with the given name.
|
|
func NewProvider(name string, create func(ctx DocumentContext) (Converter, error)) Provider {
|
|
return newConverter{
|
|
name: name,
|
|
create: create,
|
|
}
|
|
}
|
|
|
|
type newConverter struct {
|
|
name string
|
|
create func(ctx DocumentContext) (Converter, error)
|
|
}
|
|
|
|
func (n newConverter) New(ctx DocumentContext) (Converter, error) {
|
|
return n.create(ctx)
|
|
}
|
|
|
|
func (n newConverter) Name() string {
|
|
return n.name
|
|
}
|
|
|
|
var NopConverter = new(nopConverter)
|
|
|
|
type nopConverter int
|
|
|
|
func (nopConverter) Convert(ctx RenderContext) (Result, error) {
|
|
return &bytes.Buffer{}, nil
|
|
}
|
|
|
|
func (nopConverter) Supports(feature identity.Identity) bool {
|
|
return false
|
|
}
|
|
|
|
// Converter wraps the Convert method that converts some markup into
|
|
// another format, e.g. Markdown to HTML.
|
|
type Converter interface {
|
|
Convert(ctx RenderContext) (Result, error)
|
|
Supports(feature identity.Identity) bool
|
|
}
|
|
|
|
// Result represents the minimum returned from Convert.
|
|
type Result interface {
|
|
Bytes() []byte
|
|
}
|
|
|
|
// DocumentInfo holds additional information provided by some converters.
|
|
type DocumentInfo interface {
|
|
AnchorSuffix() string
|
|
}
|
|
|
|
// TableOfContentsProvider provides the content as a ToC structure.
|
|
type TableOfContentsProvider interface {
|
|
TableOfContents() tableofcontents.Root
|
|
}
|
|
|
|
// AnchorNameSanitizer tells how a converter sanitizes anchor names.
|
|
type AnchorNameSanitizer interface {
|
|
SanitizeAnchorName(s string) string
|
|
}
|
|
|
|
// Bytes holds a byte slice and implements the Result interface.
|
|
type Bytes []byte
|
|
|
|
// Bytes returns itself
|
|
func (b Bytes) Bytes() []byte {
|
|
return b
|
|
}
|
|
|
|
// DocumentContext holds contextual information about the document to convert.
|
|
type DocumentContext struct {
|
|
Document interface{} // May be nil. Usually a page.Page
|
|
DocumentID string
|
|
DocumentName string
|
|
Filename string
|
|
ConfigOverrides map[string]interface{}
|
|
}
|
|
|
|
// RenderContext holds contextual information about the content to render.
|
|
type RenderContext struct {
|
|
Src []byte
|
|
RenderTOC bool
|
|
RenderHooks *hooks.Renderers
|
|
}
|
|
|
|
var (
|
|
FeatureRenderHooks = identity.NewPathIdentity("markup", "renderingHooks")
|
|
)
|