2014-10-17 16:57:48 -04:00
|
|
|
// Copyright © 2014 Steve Francia <spf@spf13.com>.
|
|
|
|
//
|
|
|
|
// Licensed under the Simple Public 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://opensource.org/licenses/Simple-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 hugolib
|
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
import (
|
|
|
|
"github.com/spf13/hugo/helpers"
|
|
|
|
"github.com/spf13/hugo/source"
|
|
|
|
"github.com/spf13/hugo/tpl"
|
|
|
|
jww "github.com/spf13/jwalterweatherman"
|
|
|
|
)
|
2014-10-20 17:42:16 -04:00
|
|
|
|
2014-11-01 12:05:37 -04:00
|
|
|
func init() {
|
2014-11-20 12:39:09 -05:00
|
|
|
RegisterHandler(new(markdownHandler))
|
|
|
|
RegisterHandler(new(htmlHandler))
|
|
|
|
RegisterHandler(new(asciidocHandler))
|
2015-01-21 08:05:16 -05:00
|
|
|
RegisterHandler(new(rstHandler))
|
2014-10-20 17:42:16 -04:00
|
|
|
}
|
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
type basicPageHandler Handle
|
2014-10-20 17:42:16 -04:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
func (b basicPageHandler) Read(f *source.File, s *Site) HandledResult {
|
|
|
|
page, err := NewPage(f.Path())
|
|
|
|
if err != nil {
|
|
|
|
return HandledResult{file: f, err: err}
|
|
|
|
}
|
2014-10-20 17:42:16 -04:00
|
|
|
|
2015-04-03 15:41:12 -04:00
|
|
|
if _, err := page.ReadFrom(f.Contents); err != nil {
|
2014-11-20 12:39:09 -05:00
|
|
|
return HandledResult{file: f, err: err}
|
|
|
|
}
|
2014-10-20 17:51:53 -04:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
page.Site = &s.Info
|
|
|
|
page.Tmpl = s.Tmpl
|
2014-10-20 20:15:33 -04:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
return HandledResult{file: f, page: page, err: err}
|
2014-10-20 17:42:16 -04:00
|
|
|
}
|
2014-11-04 00:43:09 -05:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
func (b basicPageHandler) FileConvert(*source.File, *Site) HandledResult {
|
|
|
|
return HandledResult{}
|
|
|
|
}
|
2014-11-04 00:43:09 -05:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
type markdownHandler struct {
|
|
|
|
basicPageHandler
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h markdownHandler) Extensions() []string { return []string{"mdown", "markdown", "md"} }
|
|
|
|
func (h markdownHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
|
|
|
|
p.ProcessShortcodes(t)
|
|
|
|
|
|
|
|
tmpContent, tmpTableOfContents := helpers.ExtractTOC(p.renderContent(helpers.RemoveSummaryDivider(p.rawContent)))
|
2014-11-04 00:43:09 -05:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
if len(p.contentShortCodes) > 0 {
|
2015-03-29 16:27:14 -04:00
|
|
|
replaced, err := replaceShortcodeTokensInsources(shortcodePlaceholderPrefix, true, p.contentShortCodes,
|
|
|
|
tmpContent, tmpTableOfContents)
|
2014-11-04 00:43:09 -05:00
|
|
|
if err != nil {
|
2015-03-29 16:27:14 -04:00
|
|
|
jww.FATAL.Printf("Fail to replace shortcode tokens in %s:\n%s", p.BaseFileName(), err.Error())
|
2014-11-20 12:39:09 -05:00
|
|
|
return HandledResult{err: err}
|
2014-11-04 00:43:09 -05:00
|
|
|
}
|
2015-03-29 16:27:14 -04:00
|
|
|
tmpContent = replaced[0]
|
|
|
|
tmpTableOfContents = replaced[1]
|
2014-11-20 12:39:09 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
p.Content = helpers.BytesToHTML(tmpContent)
|
|
|
|
p.TableOfContents = helpers.BytesToHTML(tmpTableOfContents)
|
|
|
|
|
|
|
|
return HandledResult{err: nil}
|
|
|
|
}
|
|
|
|
|
|
|
|
type htmlHandler struct {
|
|
|
|
basicPageHandler
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h htmlHandler) Extensions() []string { return []string{"html", "htm"} }
|
|
|
|
func (h htmlHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
|
2015-01-14 14:49:43 -05:00
|
|
|
// see #674 - disabled by bjornerik for now
|
|
|
|
// p.ProcessShortcodes(t)
|
2014-11-20 12:39:09 -05:00
|
|
|
p.Content = helpers.BytesToHTML(p.rawContent)
|
|
|
|
return HandledResult{err: nil}
|
|
|
|
}
|
|
|
|
|
|
|
|
type asciidocHandler struct {
|
|
|
|
basicPageHandler
|
|
|
|
}
|
|
|
|
|
2015-03-24 22:27:06 -04:00
|
|
|
func (h asciidocHandler) Extensions() []string { return []string{"asciidoc", "adoc", "ad"} }
|
2014-11-20 12:39:09 -05:00
|
|
|
func (h asciidocHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
|
|
|
|
p.ProcessShortcodes(t)
|
|
|
|
|
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
|
|
|
// TODO(spf13) Add/Refactor AsciiDoc Logic here
|
|
|
|
tmpContent, tmpTableOfContents := helpers.ExtractTOC(p.renderContent(helpers.RemoveSummaryDivider(p.rawContent)))
|
|
|
|
|
|
|
|
if len(p.contentShortCodes) > 0 {
|
2015-03-29 16:27:14 -04:00
|
|
|
replaced, err := replaceShortcodeTokensInsources(shortcodePlaceholderPrefix, true, p.contentShortCodes,
|
|
|
|
tmpContent, tmpTableOfContents)
|
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 {
|
2015-03-29 16:27:14 -04:00
|
|
|
jww.FATAL.Printf("Fail to replace shortcode tokens in %s:\n%s", p.BaseFileName(), err.Error())
|
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
|
|
|
return HandledResult{err: err}
|
|
|
|
}
|
2015-03-29 16:27:14 -04:00
|
|
|
tmpContent = replaced[0]
|
|
|
|
tmpTableOfContents = replaced[1]
|
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
|
|
|
}
|
|
|
|
|
|
|
|
p.Content = helpers.BytesToHTML(tmpContent)
|
|
|
|
p.TableOfContents = helpers.BytesToHTML(tmpTableOfContents)
|
2014-11-04 00:43:09 -05:00
|
|
|
|
2014-11-20 12:39:09 -05:00
|
|
|
//err := p.Convert()
|
|
|
|
return HandledResult{page: p, err: nil}
|
2014-11-04 00:43:09 -05:00
|
|
|
}
|
2015-01-21 08:05:16 -05:00
|
|
|
|
|
|
|
type rstHandler struct {
|
|
|
|
basicPageHandler
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h rstHandler) Extensions() []string { return []string{"rest", "rst"} }
|
|
|
|
func (h rstHandler) PageConvert(p *Page, t tpl.Template) HandledResult {
|
|
|
|
p.ProcessShortcodes(t)
|
|
|
|
|
|
|
|
tmpContent, tmpTableOfContents := helpers.ExtractTOC(p.renderContent(helpers.RemoveSummaryDivider(p.rawContent)))
|
|
|
|
|
|
|
|
if len(p.contentShortCodes) > 0 {
|
2015-03-29 16:27:14 -04:00
|
|
|
replaced, err := replaceShortcodeTokensInsources(shortcodePlaceholderPrefix, true, p.contentShortCodes,
|
|
|
|
tmpContent, tmpTableOfContents)
|
2015-01-21 08:05:16 -05:00
|
|
|
if err != nil {
|
2015-03-29 16:27:14 -04:00
|
|
|
jww.FATAL.Printf("Fail to replace shortcode tokens in %s:\n%s", p.BaseFileName(), err.Error())
|
2015-01-21 08:05:16 -05:00
|
|
|
return HandledResult{err: err}
|
|
|
|
}
|
2015-03-29 16:27:14 -04:00
|
|
|
tmpContent = replaced[0]
|
|
|
|
tmpTableOfContents = replaced[1]
|
2015-01-21 08:05:16 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
p.Content = helpers.BytesToHTML(tmpContent)
|
|
|
|
p.TableOfContents = helpers.BytesToHTML(tmpTableOfContents)
|
|
|
|
|
|
|
|
return HandledResult{err: nil}
|
|
|
|
}
|