ref: b520f8852d566f778ad13e2201adcf71c7d42d34
parent: b198cb26ba6a5ce0c1dcbe2aee6c83736fe83280
author: spf13 <steve.francia@gmail.com>
date: Thu May 15 05:58:55 EDT 2014
Switching docs highlighting to highlight.js .. Docs build super fast again!
--- a/docs/archetypes/default.md
+++ b/docs/archetypes/default.md
@@ -1,6 +1,4 @@
+++
-date = "2013-07-01"
-title = "Title of the Content"
weight = 5
[menu]
[menu.main]
--- a/docs/content/content/example.md
+++ b/docs/content/content/example.md
@@ -14,35 +14,33 @@
**mysite/project/nitro.md <- http://mysite.com/project/nitro.html**
-{{% highlight yaml %}}----
-Title: "Nitro : A quick and simple profiler for Go"
-Description: "Nitro is a simple profiler for you go lang applications"
-Tags: [ "Development", "Go", "profiling" ]
-date: "2013-06-19"
-Topics: [ "Development", "Go" ]
-Slug: "nitro"
-project_url: "http://github.com/spf13/nitro"
----
+ ---
+ Title: "Nitro : A quick and simple profiler for Go"
+ Description: "Nitro is a simple profiler for you go lang applications"
+ Tags: [ "Development", "Go", "profiling" ]
+ date: "2013-06-19"
+ Topics: [ "Development", "Go" ]
+ Slug: "nitro"
+ project_url: "http://github.com/spf13/nitro"
+ ---
-# Nitro
+ # Nitro
-Quick and easy performance analyzer library for Go.
+ Quick and easy performance analyzer library for Go.
-## Overview
+ ## Overview
-Nitro is a quick and easy performance analyzer library for Go.
-It is useful for comparing A/B against different drafts of functions
-or different functions.
+ Nitro is a quick and easy performance analyzer library for Go.
+ It is useful for comparing A/B against different drafts of functions
+ or different functions.
-## Implementing Nitro
+ ## Implementing Nitro
-Using Nitro is simple. First use go get to install the latest version
-of the library.
+ Using Nitro is simple. First use go get to install the latest version
+ of the library.
- $ go get github.com/spf13/nitro
+ $ go get github.com/spf13/nitro
-Next include nitro in your application.
+ Next include nitro in your application.
-{{% /highlight %}}--- a/docs/content/content/front-matter.md
+++ b/docs/content/content/front-matter.md
@@ -19,53 +19,47 @@
### YAML Example
-{{% highlight yaml %}}----
-title: "spf13-vim 3.0 release and new website"
-description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-date: "2012-04-06"
-categories:
- - "Development"
- - "VIM"
-slug: "spf13-vim-3-0-release-and-new-website"
----
-Content of the file goes Here
-{{% /highlight %}}+ ---
+ title: "spf13-vim 3.0 release and new website"
+ description: "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
+ tags: [ ".vimrc", "plugins", "spf13-vim", "vim" ]
+ date: "2012-04-06"
+ categories:
+ - "Development"
+ - "VIM"
+ slug: "spf13-vim-3-0-release-and-new-website"
+ ---
+ Content of the file goes Here
### TOML Example
-{{% highlight yaml %}}-+++
-title = "spf13-vim 3.0 release and new website"
-description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
-tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
-date = "2012-04-06"
-categories = [
- "Development",
- "VIM"
-]
-slug = "spf13-vim-3-0-release-and-new-website"
-+++
-Content of the file goes Here
-{{% /highlight %}}+ +++
+ title = "spf13-vim 3.0 release and new website"
+ description = "spf13-vim is a cross platform distribution of vim plugins and resources for Vim."
+ tags = [ ".vimrc", "plugins", "spf13-vim", "vim" ]
+ date = "2012-04-06"
+ categories = [
+ "Development",
+ "VIM"
+ ]
+ slug = "spf13-vim-3-0-release-and-new-website"
+ +++
+ Content of the file goes Here
### JSON Example
-{{% highlight json %}}-{- "title": "spf13-vim 3.0 release and new website",
- "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
- "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
- "date": "2012-04-06",
- "categories": [
- "Development",
- "VIM"
- ],
- "slug": "spf13-vim-3-0-release-and-new-website",
-}
-Content of the file goes Here
-{{% /highlight %}}+ {+ "title": "spf13-vim 3.0 release and new website",
+ "description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
+ "tags": [ ".vimrc", "plugins", "spf13-vim", "vim" ],
+ "date": "2012-04-06",
+ "categories": [
+ "Development",
+ "VIM"
+ ],
+ "slug": "spf13-vim-3-0-release-and-new-website",
+ }
+ Content of the file goes Here
## Variables
--- a/docs/content/content/ordering.md
+++ b/docs/content/content/ordering.md
@@ -10,13 +10,15 @@
In Hugo you have a good degree of control of how your content can be ordered.
-By default, content is ordered by weight, then by date with the most recent date first, but alternative sorting (by title and linktitle) is also available.
+By default, content is ordered by weight, then by date with the most recent
+date first, but alternative sorting (by title and linktitle) is also available.
_Both the date and weight fields are optional._
-Unweighted pages appear at the end of the list.
-If no weights are provided (or if weights are the same) date will be used to sort. If neither are provided
-content will be ordered based on how it's read off the disk and no order is guaranteed.
+Unweighted pages appear at the end of the list. If no weights are provided (or
+if weights are the same) date will be used to sort. If neither are provided
+content will be ordered based on how it's read off the disk and no order is
+guaranteed.
## Assigning Weight to content
@@ -29,81 +31,67 @@
## Order by Weight -> Date (default)
-{{% highlight html %}}-{{ range .Data.Pages }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Order by Weight -> Date
-{{% highlight html %}}-{{ range .Data.Pages.ByWeight }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByWeight }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Order by Date
-{{% highlight html %}}-{{ range .Data.Pages.ByDate }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByDate }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Order by Length
-{{% highlight html %}}-{{ range .Data.Pages.ByLength }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByLength }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Reverse Order
Can be applied to any of the above. Using Date for an example.
-{{% highlight html %}}-{{ range .Data.Pages.ByDate.Reverse }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByDate.Reverse }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Order by Title
-{{% highlight html %}}-{{ range .Data.Pages.ByTitle }}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByTitle }}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Order by LinkTitle
-{{% highlight html %}}-{{ range .Data.Pages.ByLinkTitle }}-<li>
-<a href="{{ .Permalink }}">{{ .LinkTitle }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{ end }}-{{% /highlight %}}+ {{ range .Data.Pages.ByLinkTitle }}+ <li>
+ <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
+ {{ end }}## Ordering Content Within Indexes
--- a/docs/content/content/types.md
+++ b/docs/content/content/types.md
@@ -13,7 +13,6 @@
needed is to look at Tumblr. A piece of content could be a photo, quote
or post, each with different meta data and rendered differently.
-
## Defining a content type
Creating a new content type is easy in Hugo. You simply provide the
@@ -49,6 +48,3 @@
inherit the type.
Alternatively you can set the type in the meta data under the key "type".
-
-
-
--- a/docs/content/extras/aliases.md
+++ b/docs/content/extras/aliases.md
@@ -18,13 +18,12 @@
## Example
**content/posts/my-awesome-blog-post.md**
-{{% highlight yaml %}}----
-aliases:
- - /posts/my-original-url/
- - /2010/even-earlier-url.html
----
-{{% /highlight %}}+
+ ---
+ aliases:
+ - /posts/my-original-url/
+ - /2010/even-earlier-url.html
+ ---
Now when you go to any of the aliases locations they
will redirect to the page.
--- a/docs/content/extras/highlighting.md
+++ b/docs/content/extras/highlighting.md
@@ -24,8 +24,7 @@
### Disclaimers
- * **Warning** pygments is relatively slow and our integration isn't
-as optimized as it could be. Expect much longer build times when using server side highlighting.
+ * **Warning** pygments is relatively slow. Expect much longer build times when using server side highlighting.
* Languages available depends on your pygments installation.
* Styles are inline in order to be supported in syndicated content when references
to style sheets are not carried over.
@@ -40,8 +39,9 @@
closing shortcode.
### Example
-{{% highlight html %}}- {{% highlight html %}}+The example has an extra space between the “{{” and “%” characters to prevent rendering here.+
+ {{ % highlight html %}}<section id="main">
<div>
<h1 id="title">{{ .Title }}</h1>@@ -50,22 +50,19 @@
{{ end }}</div>
</section>
- {{% /highlight %}}-{{% /highlight %}}+ {{ % /highlight %}}### Example Output
-{{% highlight html %}}-<span style="color: #f92672"><section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"main"</span><span style="color: #f92672">></span>
- <span style="color: #f92672"><div></span>
- <span style="color: #f92672"><h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"title"</span><span style="color: #f92672">></span>{{ .Title }}<span style="color: #f92672"></h1></span>- {{ range .Data.Pages }}- {{ .Render "summary"}}- {{ end }}- <span style="color: #f92672"></div></span>
-<span style="color: #f92672"></section></span>
-{{% /highlight %}}+ <span style="color: #f92672"><section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"main"</span><span style="color: #f92672">></span>
+ <span style="color: #f92672"><div></span>
+ <span style="color: #f92672"><h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"title"</span><span style="color: #f92672">></span>{{ .Title }}<span style="color: #f92672"></h1></span>+ {{ range .Data.Pages }}+ {{ .Render "summary"}}+ {{ end }}+ <span style="color: #f92672"></div></span>
+ <span style="color: #f92672"></section></span>
## Client-side
@@ -74,10 +71,10 @@
Client-side syntax highlighting is very simple to add. You'll need to pick
a library and a corresponding theme. Some popular libraries are:
+- [Highlight.js]
- [Rainbow]
- [Syntax Highlighter]
- [Google Prettify]
-- [Highlight.js]
This example uses the popular [Highlight.js] library, hosted by [Yandex], a
popular Russian search engine.
@@ -86,17 +83,15 @@
will be a snippet that will be included in every generated HTML page, such
as `header.html` or `header.includes.html`. Simply add:
-{{% highlight html %}}- <link rel="stylesheet" href="https://yandex.st/highlightjs/8.0/styles/default.min.css">
- <script src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
-{{% /highlight %}}+ <link rel="stylesheet" href="https://yandex.st/highlightjs/8.0/styles/default.min.css">
+ <script src="https://yandex.st/highlightjs/8.0/highlight.min.js"></script>
You can of course use your own copy of these files, typically in `./static/`.
+[Highlight.js]: http://highlightjs.org/
[Rainbow]: http://craig.is/making/rainbows
[Syntax Highlighter]: http://alexgorbatchev.com/SyntaxHighlighter/
[Google Prettify]: https://code.google.com/p/google-code-prettify/
[Yandex]: http://yandex.ru/
-[Highlight.js]: http://highlightjs.org/
Please see individual libraries documentation for how to implement the JavaScript based libraries.
--- a/docs/content/extras/shortcodes.md
+++ b/docs/content/extras/shortcodes.md
@@ -37,9 +37,10 @@
shortcodes match (name only), the closing being prepended with a slash.
Example of a paired shortcode:
-{{% highlight go %}} A bunch of code here {{% /highlight %}} + {{ % highlight go %}} A bunch of code here {{ % /highlight %}} +
## Hugo Shortcodes
Hugo ships with a set of predefined shortcodes.
@@ -54,8 +55,9 @@
closing shortcode.
#### Example
-{{% highlight html %}}- {{% highlight html %}}+The example has an extra space between the “{{” and “%” characters to prevent rendering here.+
+ {{ % highlight html %}}<section id="main">
<div>
<h1 id="title">{{ .Title }}</h1>@@ -64,13 +66,11 @@
{{ end }}</div>
</section>
- {{% /highlight %}}-{{% /highlight %}}+ {{ % /highlight %}}#### Example Output
-{{% highlight html %}}<span style="color: #f92672"><section</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"main"</span><span style="color: #f92672">></span>
<span style="color: #f92672"><div></span>
<span style="color: #f92672"><h1</span> <span style="color: #a6e22e">id=</span><span style="color: #e6db74">"title"</span><span style="color: #f92672">></span>{{ .Title }}<span style="color: #f92672"></h1></span>@@ -79,7 +79,6 @@
{{ end }}<span style="color: #f92672"></div></span>
<span style="color: #f92672"></section></span>
-{{% /highlight %}}### figure
Figure is simply an extension of the image capabilities present with Markdown.
@@ -98,17 +97,19 @@
* alt
#### Example
+*Example has an extra space so Hugo doesn't actually render it*.
-{{% highlight html %}}- {{% figure src="/media/spf13.jpg" title="Steve Francia" %}}-{{% /highlight %}}+ {{ % figure src="/media/spf13.jpg" title="Steve Francia" %}}#### Example output
-{{% highlight html %}}+ <figure>
+ <img src="/media/spf13.jpg" />
+ <figcaption>
+ <h4>Steve Francia</h4>
+ </figcaption>
+ </figure>
-{{% /highlight %}}-
## Creating your own shortcodes
To create a shortcode, place a template in the layouts/shortcodes directory. The
@@ -173,6 +174,7 @@
{{ % img src="/media/spf13.jpg" title="Steve Francia" %}}Would load the template /layouts/shortcodes/img.html
+
<!-- image -->
<figure {{ with .Get "class" }}class="{{.}}"{{ end }}> {{ with .Get "link"}}<a href="{{.}}">{{ end }}@@ -206,11 +208,9 @@
*Example has an extra space so Hugo doesn't actually render it*.
- {{% highlight html %}}<html>
<body> This HTML </body>
</html>
- {{% /highlight %}}The template for this utilizes the following code (already include in hugo)
{{ .Get 0 | highlight .Inner }}--- a/docs/content/extras/toc.md
+++ b/docs/content/extras/toc.md
@@ -9,12 +9,12 @@
Hugo will automatically parse the markdown for your content and create
a Table of Contents you can use to guide readers to the sections within
-your content.
+your content.
## Usage
Simply create content like you normally would with the appropriate
-headers.
+headers.
Hugo will take this markdown and create a table of contents stored in the
[content variable](/layout/variables) .TableOfContents
--- a/docs/content/layout/chrome.md
+++ b/docs/content/layout/chrome.md
@@ -32,56 +32,51 @@
## example header.html
This header template is used for [spf13.com](http://spf13.com).
-{{% highlight html %}}-<!DOCTYPE html>
-<html class="no-js" lang="en-US" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
-<head>
- <meta charset="utf-8">
+ <!DOCTYPE html>
+ <html class="no-js" lang="en-US" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
+ <head>
+ <meta charset="utf-8">
- {{ template "chrome/meta.html" . }}+ {{ template "chrome/meta.html" . }}- <base href="{{ .Site.BaseUrl }}">- <title> {{ .Title }} : spf13.com </title>- <link rel="canonical" href="{{ .Permalink }}">- {{ if .RSSlink }}<link href="{{ .RSSlink }}" rel="alternate" type="application/rss+xml" title="{{ .Title }}" />{{ end }}+ <base href="{{ .Site.BaseUrl }}">+ <title> {{ .Title }} : spf13.com </title>+ <link rel="canonical" href="{{ .Permalink }}">+ {{ if .RSSlink }}<link href="{{ .RSSlink }}" rel="alternate" type="application/rss+xml" title="{{ .Title }}" />{{ end }}- {{ template "chrome/head_includes.html" . }}-</head>
-<body lang="en">
-{{% /highlight %}}+ {{ template "chrome/head_includes.html" . }}+ </head>
+ <body lang="en">
-
## example footer.html
This header template is used for [spf13.com](http://spf13.com).
-{{% highlight html %}}-<footer>
- <div>
- <p>
- © 2013 Steve Francia.
- <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons Attribution">Some rights reserved</a>;
- please attribute properly and link back. Hosted by <a href="http://servergrove.com">ServerGrove</a>.
- </p>
- </div>
-</footer>
-<script type="text/javascript">
+ <footer>
+ <div>
+ <p>
+ © 2013 Steve Francia.
+ <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons Attribution">Some rights reserved</a>;
+ please attribute properly and link back. Hosted by <a href="http://servergrove.com">ServerGrove</a>.
+ </p>
+ </div>
+ </footer>
+ <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-XYSYXYSY-X']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-XYSYXYSY-X']);
+ _gaq.push(['_trackPageview']);
- (function() {- var ga = document.createElement('script');- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : - 'http://www') + '.google-analytics.com/ga.js';
- ga.setAttribute('async', 'true');- document.documentElement.firstChild.appendChild(ga);
- })();
+ (function() {+ var ga = document.createElement('script');+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : + 'http://www') + '.google-analytics.com/ga.js';
+ ga.setAttribute('async', 'true');+ document.documentElement.firstChild.appendChild(ga);
+ })();
-</script>
-</body>
-</html>
-{{% /highlight %}}+ </script>
+ </body>
+ </html>
**For examples of referencing these templates, see [content
templates](/layout/content/) and [homepage templates](/layout/homepage/)**
--- a/docs/content/layout/homepage.md
+++ b/docs/content/layout/homepage.md
@@ -28,32 +28,30 @@
It makes use of [chrome templates](/layout/chrome) and uses a [List](/indexes/lists/)
-{{% highlight html %}}-<!DOCTYPE html>
-<html class="no-js" lang="en-US" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
-<head>
- <meta charset="utf-8">
+ <!DOCTYPE html>
+ <html class="no-js" lang="en-US" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
+ <head>
+ <meta charset="utf-8">
- {{ template "chrome/meta.html" . }}+ {{ template "chrome/meta.html" . }}- <base href="{{ .Site.BaseUrl }}">- <title>{{ .Site.Title }}</title>- <link rel="canonical" href="{{ .Permalink }}">- <link href="{{ .RSSlink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />+ <base href="{{ .Site.BaseUrl }}">+ <title>{{ .Site.Title }}</title>+ <link rel="canonical" href="{{ .Permalink }}">+ <link href="{{ .RSSlink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />- {{ template "chrome/head_includes.html" . }}-</head>
-<body lang="en">
+ {{ template "chrome/head_includes.html" . }}+ </head>
+ <body lang="en">
-{{ template "chrome/subheader.html" . }}+ {{ template "chrome/subheader.html" . }}-<section id="main">
- <div>
- {{ range first 10 .Data.Pages }}- {{ .Render "summary"}}- {{ end }}- </div>
-</section>
+ <section id="main">
+ <div>
+ {{ range first 10 .Data.Pages }}+ {{ .Render "summary"}}+ {{ end }}+ </div>
+ </section>
-{{ template "chrome/footer.html" }}-{{% /highlight %}}+ {{ template "chrome/footer.html" }}--- a/docs/content/layout/indexes.md
+++ b/docs/content/layout/indexes.md
@@ -45,23 +45,21 @@
[view](/layout/views/) called either "li" or "summary" which this example site
defined.
-{{% highlight html %}}-{{ template "chrome/header.html" . }}-{{ template "chrome/subheader.html" . }}+ {{ template "chrome/header.html" . }}+ {{ template "chrome/subheader.html" . }}-<section id="main">
- <div>
- <h1 id="title">{{ .Title }}</h1>- <ul id="list">
- {{ range .Data.Pages }}- {{ .Render "li"}}- {{ end }}- </ul>
- </div>
-</section>
+ <section id="main">
+ <div>
+ <h1 id="title">{{ .Title }}</h1>+ <ul id="list">
+ {{ range .Data.Pages }}+ {{ .Render "li"}}+ {{ end }}+ </ul>
+ </div>
+ </section>
-{{ template "chrome/footer.html" }}-{{% /highlight %}}+ {{ template "chrome/footer.html" }}## Example index template (tag.html)
This content template is used for [spf13.com](http://spf13.com).
@@ -69,21 +67,19 @@
[view](/layout/views/) called either "li" or "summary" which this example site
defined.
-{{% highlight html %}}-{{ template "chrome/header.html" . }}-{{ template "chrome/subheader.html" . }}+ {{ template "chrome/header.html" . }}+ {{ template "chrome/subheader.html" . }}-<section id="main">
- <div>
- <h1 id="title">{{ .Title }}</h1>- {{ range .Data.Pages }}- {{ .Render "summary"}}- {{ end }}- </div>
-</section>
+ <section id="main">
+ <div>
+ <h1 id="title">{{ .Title }}</h1>+ {{ range .Data.Pages }}+ {{ .Render "summary"}}+ {{ end }}+ </div>
+ </section>
-{{ template "chrome/footer.html" }}-{{% /highlight %}}+ {{ template "chrome/footer.html" }}## Example listing of indexes template (indexes.html)
This content template is used for [spf13.com](http://spf13.com).
@@ -100,31 +96,29 @@
.Data.Orderedindex is ordered by the quantity of content assigned to that particular
index key. In practice you would only use one of these approaches.
-{{% highlight html %}}-{{ template "chrome/header.html" . }}-{{ template "chrome/subheader.html" . }}+ {{ template "chrome/header.html" . }}+ {{ template "chrome/subheader.html" . }}-<section id="main">
- <div>
- <h1 id="title">{{ .Title }}</h1>+ <section id="main">
+ <div>
+ <h1 id="title">{{ .Title }}</h1>- <ul>
- {{ $data := .Data }}- {{ range $key, $value := .Data.Index }}- <li><a href="{{ $data.Plural }}/{{ $key | urlize }}"> {{ $key }} </a> {{ len $value }} </li>- {{ end }}- </ul>
- </div>
+ <ul>
+ {{ $data := .Data }}+ {{ range $key, $value := .Data.Index }}+ <li><a href="{{ $data.Plural }}/{{ $key | urlize }}"> {{ $key }} </a> {{ len $value }} </li>+ {{ end }}+ </ul>
+ </div>
- <ul>
- {{ range $data.OrderedIndex }}- <li><a href="{{ $data.Plural }}/{{ .Name | urlize }}"> {{ .Name }} </a> {{ .Count }} </li>- {{ end }}- </ul>
-</section>
+ <ul>
+ {{ range $data.OrderedIndex }}+ <li><a href="{{ $data.Plural }}/{{ .Name | urlize }}"> {{ .Name }} </a> {{ .Count }} </li>+ {{ end }}+ </ul>
+ </section>
-{{ template "chrome/footer.html" }}-{{% /highlight %}}+ {{ template "chrome/footer.html" }}--- a/docs/content/layout/rss.md
+++ b/docs/content/layout/rss.md
@@ -24,28 +24,26 @@
This rss template is used for [spf13.com](http://spf13.com). It adheres to the
ATOM 2.0 Spec.
-{{% highlight xml %}}-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
- <channel>
- <title>{{ .Title }} on {{ .Site.Title }} </title>- <link>{{ .Permalink }}</link>- <language>en-us</language>
- <author>Steve Francia</author>
- <rights>Copyright (c) 2008 - 2013, Steve Francia; all rights reserved.</rights>
- <updated>{{ .Date }}</updated>- {{ range .Data.Pages }}- <item>
- <title>{{ .Title }}</title>- <link>{{ .Permalink }}</link>- <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}</pubDate>- <author>Steve Francia</author>
- <guid>{{ .Permalink }}</guid>- <description>{{ .Content | html }}</description>- </item>
- {{ end }}- </channel>
-</rss>
-{{% /highlight %}}+ <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+ <channel>
+ <title>{{ .Title }} on {{ .Site.Title }} </title>+ <link>{{ .Permalink }}</link>+ <language>en-us</language>
+ <author>Steve Francia</author>
+ <rights>Copyright (c) 2008 - 2013, Steve Francia; all rights reserved.</rights>
+ <updated>{{ .Date }}</updated>+ {{ range .Data.Pages }}+ <item>
+ <title>{{ .Title }}</title>+ <link>{{ .Permalink }}</link>+ <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" }}</pubDate>+ <author>Steve Francia</author>
+ <guid>{{ .Permalink }}</guid>+ <description>{{ .Content | html }}</description>+ </item>
+ {{ end }}+ </channel>
+ </rss>
*Important: Hugo will automatically add the following header line to this file
on render...please don't include this in the template as it's not valid HTML.*
--- a/docs/content/layout/sitemap.md
+++ b/docs/content/layout/sitemap.md
@@ -28,18 +28,16 @@
This template respects the version 0.9 of the [Sitemap
Protocol](http://www.sitemaps.org/protocol.html).
-{{% highlight xml %}}-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
- {{ range .Data.Pages }}- <url>
- <loc>{{ .Permalink }}</loc>- <lastmod>{{ safeHtml ( .Date.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ with .Sitemap.ChangeFreq }}- <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}- <priority>{{ .Sitemap.Priority }}</priority>{{ end }}- </url>
- {{ end }}-</urlset>
-{{% /highlight %}}+ <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+ {{ range .Data.Pages }}+ <url>
+ <loc>{{ .Permalink }}</loc>+ <lastmod>{{ safeHtml ( .Date.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ with .Sitemap.ChangeFreq }}+ <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}+ <priority>{{ .Sitemap.Priority }}</priority>{{ end }}+ </url>
+ {{ end }}+ </urlset>
*Important: Hugo will automatically add the following header line to this file
on render...please don't include this in the template as it's not valid HTML.*
--- a/docs/content/layout/views.md
+++ b/docs/content/layout/views.md
@@ -45,44 +45,38 @@
## Example li.html
This content template is used for [spf13.com](http://spf13.com).
-{{% highlight html %}}-<li>
-<a href="{{ .Permalink }}">{{ .Title }}</a>-<div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>-</li>
-{{% /highlight %}}+ <li>
+ <a href="{{ .Permalink }}">{{ .Title }}</a>+ <div class="meta">{{ .Date.Format "Mon, Jan 2, 2006" }}</div>+ </li>
## Example summary.html
This content template is used for [spf13.com](http://spf13.com).
-{{% highlight html %}}-<article class="post">
-<header>
-<h2><a href='{{ .Permalink }}'> {{ .Title }}</a> </h2>-<div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words </div>-</header>
+ <article class="post">
+ <header>
+ <h2><a href='{{ .Permalink }}'> {{ .Title }}</a> </h2>+ <div class="post-meta">{{ .Date.Format "Mon, Jan 2, 2006" }} - {{ .FuzzyWordCount }} Words </div>+ </header>
-{{ .Summary }}-<footer>
-<a href='{{ .Permalink }}'><nobr>Read more →</nobr></a>-</footer>
-</article>
-{{% /highlight %}}+ {{ .Summary }}+ <footer>
+ <a href='{{ .Permalink }}'><nobr>Read more →</nobr></a>+ </footer>
+ </article>
## Example render of view
Using the summary view inside of another ([index](/layout/index)) template.
-{{% highlight html %}}-<section id="main">
-<div>
-<h1 id="title">{{ .Title }}</h1>-{{ range .Data.Pages }}-{{ .Render "summary"}}-{{ end }}-</div>
-</section>
-{{% /highlight %}}+ <section id="main">
+ <div>
+ <h1 id="title">{{ .Title }}</h1>+ {{ range .Data.Pages }}+ {{ .Render "summary"}}+ {{ end }}+ </div>
+ </section>
In the above example you will notice that we have called .Render and passed in
which view to render the content with. Render is a special function available on
--- a/docs/content/overview/configuration.md
+++ b/docs/content/overview/configuration.md
@@ -23,36 +23,33 @@
## Examples
The following is an example of a yaml config file with the default values:
-{{% highlight yaml %}}----
-contentdir: "content"
-layoutdir: "layouts"
-publishdir: "public"
-builddrafts: false
-indexes:
- category: "categories"
- tag: "tags"
-baseurl: "http://yoursite.example.com/"
-canonifyurls: true
-...
-{{% /highlight %}}+ ---
+ contentdir: "content"
+ layoutdir: "layouts"
+ publishdir: "public"
+ builddrafts: false
+ indexes:
+ category: "categories"
+ tag: "tags"
+ baseurl: "http://yoursite.example.com/"
+ canonifyurls: true
+ ...
+
The following is an example of a json config file with the default values:
-{{% highlight json %}}-{- "contentdir": "content",
- "layoutdir": "layouts",
- "publishdir": "public",
- "builddrafts": false,
- "indexes": {- "category": "categories",
- "tag": "tags"
- },
- "baseurl": "http://yoursite.example.com/",
- "canonifyurls": true
-}
-{{% /highlight %}}+ {+ "contentdir": "content",
+ "layoutdir": "layouts",
+ "publishdir": "public",
+ "builddrafts": false,
+ "indexes": {+ "category": "categories",
+ "tag": "tags"
+ },
+ "baseurl": "http://yoursite.example.com/",
+ "canonifyurls": true
+ }
The following is an example of a toml config file with the default values:
@@ -68,19 +65,17 @@
Here is a yaml configuration file which sets a few more options
-{{% highlight yaml %}}----
-baseurl: "http://yoursite.example.com/"
-title: "Yoyodyne Widget Blogging"
-permalinks:
- post: /:year/:month/:title/
-params:
- Subtitle: "Spinning the cogs in the widgets"
- AuthorName: "John Doe"
- GitHubUser: "spf13"
- ListOfFoo:
- - "foo1"
- - "foo2"
- SidebarRecentLimit: 5
-...
-{{% /highlight %}}+ ---
+ baseurl: "http://yoursite.example.com/"
+ title: "Yoyodyne Widget Blogging"
+ permalinks:
+ post: /:year/:month/:title/
+ params:
+ Subtitle: "Spinning the cogs in the widgets"
+ AuthorName: "John Doe"
+ GitHubUser: "spf13"
+ ListOfFoo:
+ - "foo1"
+ - "foo2"
+ SidebarRecentLimit: 5
+ ...
--- a/docs/content/overview/usage.md
+++ b/docs/content/overview/usage.md
@@ -63,7 +63,7 @@
$ hugo -s ~/mysite --watch
28 pages created
0 tags index created
- in 38 ms
+ in 18 ms
Watching for changes in /Users/spf13/Code/hugo/docs/content
Press ctrl+c to stop
@@ -75,5 +75,5 @@
Press ctrl+c to stop
28 pages created
0 tags created
- in 28 ms
+ in 18 ms
--- a/docs/content/tutorials/github_pages_blog.md
+++ b/docs/content/tutorials/github_pages_blog.md
@@ -24,17 +24,15 @@
The very first step in creating a new Hugo site is to [write the config file](/overview/configuration). This config file is important for at least two reasons: (1) this is where site-wide settings (like the websites `baseurl`) go and (2) the config file dictates to some extent how Hugo will generate the website. For the example website I created a file `config.yaml` with the following contents
-{{% highlight yaml %}}----
-contentdir: "content"
-layoutdir: "layouts"
-publishdir: "public"
-indexes:
- category: "categories"
-baseurl: "http://spencerlyon2.github.io/hugo_gh_blog"
-title: "Hugo Blog Template for GitHub Pages"
-...
-{{% /highlight %}}+ ---
+ contentdir: "content"
+ layoutdir: "layouts"
+ publishdir: "public"
+ indexes:
+ category: "categories"
+ baseurl: "http://spencerlyon2.github.io/hugo_gh_blog"
+ title: "Hugo Blog Template for GitHub Pages"
+ ...
### Define Structure of Website
@@ -82,17 +80,15 @@
The final step in creating the blog is to add some actual blog posts. To do this simply create one markdown file (with extension .md) for each new blog post. At the top of each file you should include a metadata section that tells Hugo some things about the post (see [docs](/content/front-matter)). For example, consider the yaml metadata section from the top of the file `/content/posts/newest.md` from the example repository
-{{% highlight yaml %}}----
-title: "Just another sample post"
-date: "2014-03-29"
-description: "This should be a more useful description"
-categories:
- - "hugo"
- - "fun"
- - "test"
----
-{{% /highlight %}}+ ---
+ title: "Just another sample post"
+ date: "2014-03-29"
+ description: "This should be a more useful description"
+ categories:
+ - "hugo"
+ - "fun"
+ - "test"
+ ---
The keys set in this section are the mandatory `title` and `date` as well as the optional `description` and `categories`. Each of these items is used throughout the templates found in the `/layouts` directory and gives Hugo information about the post from other pages in the website.
@@ -104,47 +100,45 @@
To get this properly set up we will execute a series of commands at the terminal. I will include all of them in one place here for easy copy and paste, and will explain what each line does via comments. Note that this is to be run from the `<root>` directory (wherever the `content` and `layout` folders of your Hugo project live). Also note that you will need to change the commands that have the example repository GitHub address so that they point to your repo.
-{{% highlight bash %}}-# Create a new orphand branch (no commit history) named gh-pages
-git checkout --orphan gh-pages
+ # Create a new orphand branch (no commit history) named gh-pages
+ git checkout --orphan gh-pages
-# Unstage all files
-git rm --cached $(git ls-files)
+ # Unstage all files
+ git rm --cached $(git ls-files)
-# Grab one file from the master branch so we can make a commit
-git checkout master README.md
+ # Grab one file from the master branch so we can make a commit
+ git checkout master README.md
-# Add and commit that file
-git add .
-git commit -m "INIT: initial commit on gh-pages branch"
+ # Add and commit that file
+ git add .
+ git commit -m "INIT: initial commit on gh-pages branch"
-# Push to remote gh-pages branch
-git push origin gh-pages
+ # Push to remote gh-pages branch
+ git push origin gh-pages
-# Return to master branch
-git checkout master
+ # Return to master branch
+ git checkout master
-# Remove the public folder to make room for the gh-pages subtree
-rm -rf public
+ # Remove the public folder to make room for the gh-pages subtree
+ rm -rf public
-# Add the gh-pages branch of the repository. It will look like a folder named public
-git subtree add --prefix public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages --squash
+ # Add the gh-pages branch of the repository. It will look like a folder named public
+ git subtree add --prefix public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages --squash
-# Pull down the file we just committed. This helps avoid merge conflicts
-git subtree pull --prefix=public
+ # Pull down the file we just committed. This helps avoid merge conflicts
+ git subtree pull --prefix=public
-# Run hugo. Generated site will be placed in public directory
-hugo
+ # Run hugo. Generated site will be placed in public directory
+ hugo
-# Add everything
-git add -A
+ # Add everything
+ git add -A
-# Commit and push to master
-git commit -m "Updating site" && git push origin master
+ # Commit and push to master
+ git commit -m "Updating site" && git push origin master
-# Push the public subtree to the gh-pages branch
-git subtree push --prefix=public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages
-{{% /highlight %}}+ # Push the public subtree to the gh-pages branch
+ git subtree push --prefix=public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages
After executing these commands and waiting for the GitHub servers to update, the website we just created was live at [http://spencerlyon2.github.io/hugo_gh_blog](http://spencerlyon2.github.io/hugo_gh_blog).
@@ -161,28 +155,26 @@
The first two items in the previous list are simply a way to conveniently preview your content as you write. This is a dynamic and fairly streamlined process. All the remaining items, however, are the same every time you want to add new content to the website. To make this repetitive process easier, I have adapted a script from the source repository for the [Chimer Arta & Maker Space](https://github.com/chimera/chimeraarts.org) website that is highlighted in the [Hugo Showcase](/showcase). The script lives in a file called `deploy.sh` and has the following contents
-{{% highlight bash %}}-#!/bin/bash
+ #!/bin/bash
-echo -e "\033[0;32mDeploying updates to Github...\033[0m"
+ echo -e "\033[0;32mDeploying updates to Github...\033[0m"
-# Build the project.
-hugo
+ # Build the project.
+ hugo
-# Add changes to git.
-git add -A
+ # Add changes to git.
+ git add -A
-# Commit changes.
-msg="rebuilding site `date`"
-if [ $# -eq 1 ]
- then msg="$1"
-fi
-git commit -m "$msg"
+ # Commit changes.
+ msg="rebuilding site `date`"
+ if [ $# -eq 1 ]
+ then msg="$1"
+ fi
+ git commit -m "$msg"
-# Push source and build repos.
-git push origin master
-git subtree push --prefix=public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages
-{{% /highlight %}}+ # Push source and build repos.
+ git push origin master
+ git subtree push --prefix=public git@github.com:spencerlyon2/hugo_gh_blog.git gh-pages
Now I can replace the last four items from our workflow list with a single command `bash deploy.sh`. This script accepts as an optional argument the commit message that git should use when committing your changes. If you wish to include a custom commit message, do so by putting it quotes after calling bash on the script: `bash deploy.sh "<my commit msg>"`. If you choose not to specify the commit message, one will be generated for you using the current time.
--- a/docs/content/tutorials/mathjax.md
+++ b/docs/content/tutorials/mathjax.md
@@ -18,11 +18,9 @@
The first step is to enable MathJax on pages that you would like to have typeset math. There are multiple ways to do this (adventerous readers can consult the [Loading and Configuring](http://docs.mathjax.org/en/latest/configuration.html) section of the MathJax documentation for additional methods of including MathJax), but the easiest way is to use the secure MathJax CDN by including the following html snippet in the source of a page:
-{{% highlight html %}}-<script type="text/javascript"
- src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-</script>
-{{% /highlight %}}+ <script type="text/javascript"
+ src="https://c328740.ssl.cf1.rackcdn.com/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+ </script>
One way to ensure that this code is included in all pages is to put it in one of the templates that live in the `layouts/chrome/` directory. For example, I have included this in the bottom of my template `footer.html` because I know that the footer will be included in every page of my website.
@@ -40,47 +38,42 @@
Another option is to tell markdown to treat the MathJax code as verbatim code and not process it. One way to do this is to wrap the math expression inside a `<div>` `</div>` block. Markdown would ignore these sections and they would get passed directly on to MathJax and processed correctly. This works great for display style mathematics, but for inline math expressions the line break induced by the `<div>` is not acceptable. The syntax for instructing markdown to treat inline text as verbatim is by wrapping it in backticks (`` ` ``). You might have noticed, however, that the text included in between backticks is rendered differently than standard text (on this site these are items highlighted in red). To get around this problem we could create a new css entry that would apply standard styling to all inline verbatim text that includes MathJax code. Below I will show the html and css source that would accomplish this (note this solution adapted from [this blog post](http://doswa.com/2011/07/20/mathjax-in-markdown.html) -- all credit goes to the original author).
-{{% highlight html %}}-<script type="text/x-mathjax-config">
-MathJax.Hub.Config({- tex2jax: {- inlineMath: [['$','$'], ['\\(','\\)']],- displayMath: [['$$','$$'], ['\[','\]']],
- processEscapes: true,
- processEnvironments: true,
- skipTags: ['script', 'noscript', 'style', 'textarea', 'pre'],
- TeX: { equationNumbers: { autoNumber: "AMS" },- extensions: ["AMSmath.js", "AMSsymbols.js"] }
- }
-});
-</script>
+ <script type="text/x-mathjax-config">
+ MathJax.Hub.Config({+ tex2jax: {+ inlineMath: [['$','$'], ['\\(','\\)']],+ displayMath: [['$$','$$'], ['\[','\]']],
+ processEscapes: true,
+ processEnvironments: true,
+ skipTags: ['script', 'noscript', 'style', 'textarea', 'pre'],
+ TeX: { equationNumbers: { autoNumber: "AMS" },+ extensions: ["AMSmath.js", "AMSsymbols.js"] }
+ }
+ });
+ </script>
-<script type="text/x-mathjax-config">
- MathJax.Hub.Queue(function() {- // Fix <code> tags after MathJax finishes running. This is a
- // hack to overcome a shortcoming of Markdown. Discussion at
- // https://github.com/mojombo/jekyll/issues/199
- var all = MathJax.Hub.getAllJax(), i;
- for(i = 0; i < all.length; i += 1) {- all[i].SourceElement().parentNode.className += ' has-jax';
- }
-});
-</script>
-{{% /highlight %}}+ <script type="text/x-mathjax-config">
+ MathJax.Hub.Queue(function() {+ // Fix <code> tags after MathJax finishes running. This is a
+ // hack to overcome a shortcoming of Markdown. Discussion at
+ // https://github.com/mojombo/jekyll/issues/199
+ var all = MathJax.Hub.getAllJax(), i;
+ for(i = 0; i < all.length; i += 1) {+ all[i].SourceElement().parentNode.className += ' has-jax';
+ }
+ });
+ </script>
As before, this content should be included in the html source of each page that will be using MathJax. The next code snippet contains the CSS that is used to have verbatim MathJax blocks render with the same font style as the body of the page.
-{{% highlight css %}}-code.has-jax {font: inherit;- font-size: 100%;
- background: inherit;
- border: inherit;
- color: #515151;}
-{{% /highlight %}}+ code.has-jax {font: inherit;+ font-size: 100%;
+ background: inherit;
+ border: inherit;
+ color: #515151;}
In the css snippet notice the line `color: #515151;`. `#515151` is the value assigned to the `color` attribute of the `body` class in my css. In order for the equations to fit in with the body of a web page, this value should be the same as the color of the body.
-
### Usage
--- a/docs/content/tutorials/migrate-from-jekyll.md
+++ b/docs/content/tutorials/migrate-from-jekyll.md
@@ -31,21 +31,19 @@
The default is for Jekyll to publish to `_site` and for Hugo to publish to `public`. If, like me, you have [`_site` mapped to a git submodule on the `gh-pages` branch](http://blog.blindgaenger.net/generate_github_pages_in_a_submodule.html), you'll want to do one of two alternatives:
1. Change your submodule to point to map `gh-pages` to public instead of `_site` (recommended).
-{{% highlight sh %}}-git submodule deinit _site
-git rm _site
-git submodule add -b gh-pages git@github.com:your-username/your-repo.git public
-{{% /highlight %}}+ git submodule deinit _site
+ git rm _site
+ git submodule add -b gh-pages git@github.com:your-username/your-repo.git public
+
1. Or, change the Hugo configuration to use `_site` instead of `public`.
-{{% highlight json %}}-{- ..
- "publishdir": "_site",
- ..
-}
-{{% /highlight %}}+ {+ ..
+ "publishdir": "_site",
+ ..
+ }
+
## Convert Jekyll templates to Hugo templates
That's the bulk of the work right here. The documentation is your friend. You should refer to [Jekyll's template documentation](http://jekyllrb.com/docs/templates/) if you need to refresh your memory on how you built your blog and [Hugo's template](/layout/templates/) to learn Hugo's way.
@@ -58,94 +56,90 @@
As an example, I was using a custom [`image_tag`](https://github.com/alexandre-normand/alexandre-normand/blob/74bb12036a71334fdb7dba84e073382fc06908ec/_plugins/image_tag.rb) plugin to generate figures with caption when running Jekyll. As I read about shortcodes, I found Hugo had a nice built-in shortcode that does exactly the same thing.
Jekyll's plugin:
-{{% highlight ruby %}}-module Jekyll
- class ImageTag < Liquid::Tag
- @url = nil
- @caption = nil
- @class = nil
- @link = nil
- // Patterns
- IMAGE_URL_WITH_CLASS_AND_CAPTION =
- IMAGE_URL_WITH_CLASS_AND_CAPTION_AND_LINK = /(\w+)(\s+)((https?:\/\/|\/)(\S+))(\s+)"(.*?)"(\s+)->((https?:\/\/|\/)(\S+))(\s*)/i
- IMAGE_URL_WITH_CAPTION = /((https?:\/\/|\/)(\S+))(\s+)"(.*?)"/i
- IMAGE_URL_WITH_CLASS = /(\w+)(\s+)((https?:\/\/|\/)(\S+))/i
- IMAGE_URL = /((https?:\/\/|\/)(\S+))/i
- def initialize(tag_name, markup, tokens)
- super
- if markup =~ IMAGE_URL_WITH_CLASS_AND_CAPTION_AND_LINK
- @class = $1
- @url = $3
- @caption = $7
- @link = $9
- elsif markup =~ IMAGE_URL_WITH_CLASS_AND_CAPTION
- @class = $1
- @url = $3
- @caption = $7
- elsif markup =~ IMAGE_URL_WITH_CAPTION
- @url = $1
- @caption = $5
- elsif markup =~ IMAGE_URL_WITH_CLASS
- @class = $1
- @url = $3
- elsif markup =~ IMAGE_URL
- @url = $1
+
+ module Jekyll
+ class ImageTag < Liquid::Tag
+ @url = nil
+ @caption = nil
+ @class = nil
+ @link = nil
+ // Patterns
+ IMAGE_URL_WITH_CLASS_AND_CAPTION =
+ IMAGE_URL_WITH_CLASS_AND_CAPTION_AND_LINK = /(\w+)(\s+)((https?:\/\/|\/)(\S+))(\s+)"(.*?)"(\s+)->((https?:\/\/|\/)(\S+))(\s*)/i
+ IMAGE_URL_WITH_CAPTION = /((https?:\/\/|\/)(\S+))(\s+)"(.*?)"/i
+ IMAGE_URL_WITH_CLASS = /(\w+)(\s+)((https?:\/\/|\/)(\S+))/i
+ IMAGE_URL = /((https?:\/\/|\/)(\S+))/i
+ def initialize(tag_name, markup, tokens)
+ super
+ if markup =~ IMAGE_URL_WITH_CLASS_AND_CAPTION_AND_LINK
+ @class = $1
+ @url = $3
+ @caption = $7
+ @link = $9
+ elsif markup =~ IMAGE_URL_WITH_CLASS_AND_CAPTION
+ @class = $1
+ @url = $3
+ @caption = $7
+ elsif markup =~ IMAGE_URL_WITH_CAPTION
+ @url = $1
+ @caption = $5
+ elsif markup =~ IMAGE_URL_WITH_CLASS
+ @class = $1
+ @url = $3
+ elsif markup =~ IMAGE_URL
+ @url = $1
+ end
+ end
+ def render(context)
+ if @class
+ source = "<figure class='#{@class}'>"+ else
+ source = "<figure>"
+ end
+ if @link
+ source += "<a href=\"#{@link}\">"+ end
+ source += "<img src=\"#{@url}\">"+ if @link
+ source += "</a>"
+ end
+ source += "<figcaption>#{@caption}</figcaption>" if @caption+ source += "</figure>"
+ source
+ end
end
end
- def render(context)
- if @class
- source = "<figure class='#{@class}'>"- else
- source = "<figure>"
- end
- if @link
- source += "<a href=\"#{@link}\">"- end
- source += "<img src=\"#{@url}\">"- if @link
- source += "</a>"
- end
- source += "<figcaption>#{@caption}</figcaption>" if @caption- source += "</figure>"
- source
- end
- end
-end
-Liquid::Template.register_tag('image', Jekyll::ImageTag)-{{% /highlight %}}+ Liquid::Template.register_tag('image', Jekyll::ImageTag)is written as this Hugo shortcode:
-{{% highlight html %}}-<!-- image -->
-<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>- {{ with .Get "link"}}<a href="{{.}}">{{ end }}- <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} />- {{ if .Get "link"}}</a>{{ end }}- {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}- <figcaption>{{ if isset .Params "title" }}- {{ .Get "title" }}{{ end }}- {{ if or (.Get "caption") (.Get "attr")}}<p>- {{ .Get "caption" }}- {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}- {{ .Get "attr" }}- {{ if .Get "attrlink"}}</a> {{ end }}- </p> {{ end }}- </figcaption>
- {{ end }}-</figure>
-<!-- image -->
-{{% /highlight %}}+ <!-- image -->
+ <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>+ {{ with .Get "link"}}<a href="{{.}}">{{ end }}+ <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt"}}{{.}}{{else}}{{ .Get "caption" }}{{ end }}"{{ end }} />+ {{ if .Get "link"}}</a>{{ end }}+ {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr")}}+ <figcaption>{{ if isset .Params "title" }}+ {{ .Get "title" }}{{ end }}+ {{ if or (.Get "caption") (.Get "attr")}}<p>+ {{ .Get "caption" }}+ {{ with .Get "attrlink"}}<a href="{{.}}"> {{ end }}+ {{ .Get "attr" }}+ {{ if .Get "attrlink"}}</a> {{ end }}+ </p> {{ end }}+ </figcaption>
+ {{ end }}+ </figure>
+ <!-- image -->
+
### Usage
I simply changed:
-{{% highlight html %}}+
{% image full http://farm5.staticflickr.com/4136/4829260124_57712e570a_o_d.jpg "One of my favorite touristy-type photos. I secretly waited for the good light while we were "having fun" and took this. Only regret: a stupid pole in the top-left corner of the frame I had to clumsily get rid of at post-processing." ->http://www.flickr.com/photos/alexnormand/4829260124/in/set-72157624547713078/ %}-{{% /highlight %}}to this (this example uses a slightly extended version named `fig`, different than the built-in `figure`):
-{{% highlight html %}}+
{{% fig class="full" src="http://farm5.staticflickr.com/4136/4829260124_57712e570a_o_d.jpg" title="One of my favorite touristy-type photos. I secretly waited for the good light while we were having fun and took this. Only regret: a stupid pole in the top-left corner of the frame I had to clumsily get rid of at post-processing." link="http://www.flickr.com/photos/alexnormand/4829260124/in/set-72157624547713078/" %}}-{{% /highlight %}}As a bonus, the shortcode named parameters are, arguably, more readable.
--- a/docs/layouts/chrome/includes.html
+++ b/docs/layouts/chrome/includes.html
@@ -2,3 +2,6 @@
<link href="/static/css/styles.css" rel="stylesheet"/>
<link href="/static/css/hugofont.css" rel="stylesheet"/>
<link href='http://fonts.googleapis.com/css?family=Arbutus+Slab&family=Cabin:600&family=Source+Code+Pro' rel='stylesheet' type='text/css'>
+ <link rel="stylesheet" href="/static/css/monokai_sublime.css">
+ <script src="/static/js/highlight.pack.js"></script>
+ <script>hljs.initHighlightingOnLoad();</script>
--- /dev/null
+++ b/docs/static/static/css/monokai_sublime.css
@@ -1,0 +1,149 @@
+/*
+
+Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-license.org/
+
+*/
+
+.hljs {+ display: block;
+ padding: 0.5em;
+ background: #23241f;
+}
+
+.hljs,
+.hljs-tag,
+.css .hljs-rules,
+.css .hljs-value,
+.css .hljs-function
+.hljs-preprocessor,
+.hljs-pragma {+ color: #f8f8f2;
+}
+
+.hljs-strongemphasis,
+.hljs-strong,
+.hljs-emphasis {+ color: #a8a8a2;
+}
+
+.hljs-bullet,
+.hljs-blockquote,
+.hljs-horizontal_rule,
+.hljs-number,
+.hljs-regexp,
+.alias .hljs-keyword,
+.hljs-literal,
+.hljs-hexcolor {+ color: #ae81ff;
+}
+
+.hljs-tag .hljs-value,
+.hljs-code,
+.hljs-title,
+.css .hljs-class,
+.hljs-class .hljs-title:last-child {+ color: #a6e22e;
+}
+
+.hljs-link_url {+ font-size: 80%;
+}
+
+.hljs-strong,
+.hljs-strongemphasis {+ font-weight: bold;
+}
+
+.hljs-emphasis,
+.hljs-strongemphasis,
+.hljs-class .hljs-title:last-child {+ font-style: italic;
+}
+
+.hljs-keyword,
+.hljs-function,
+.hljs-change,
+.hljs-winutils,
+.hljs-flow,
+.lisp .hljs-title,
+.clojure .hljs-built_in,
+.nginx .hljs-title,
+.tex .hljs-special,
+.hljs-header,
+.hljs-attribute,
+.hljs-symbol,
+.hljs-symbol .hljs-string,
+.hljs-tag .hljs-title,
+.hljs-value,
+.alias .hljs-keyword:first-child,
+.css .hljs-tag,
+.css .unit,
+.css .hljs-important {+ color: #F92672;
+}
+
+.hljs-function .hljs-keyword,
+.hljs-class .hljs-keyword:first-child,
+.hljs-constant,
+.css .hljs-attribute {+ color: #66d9ef;
+}
+
+.hljs-variable,
+.hljs-params,
+.hljs-class .hljs-title {+ color: #f8f8f2;
+}
+
+.hljs-string,
+.css .hljs-id,
+.hljs-subst,
+.haskell .hljs-type,
+.ruby .hljs-class .hljs-parent,
+.hljs-built_in,
+.sql .hljs-aggregate,
+.django .hljs-template_tag,
+.django .hljs-variable,
+.smalltalk .hljs-class,
+.django .hljs-filter .hljs-argument,
+.smalltalk .hljs-localvars,
+.smalltalk .hljs-array,
+.hljs-attr_selector,
+.hljs-pseudo,
+.hljs-addition,
+.hljs-stream,
+.hljs-envvar,
+.apache .hljs-tag,
+.apache .hljs-cbracket,
+.tex .hljs-command,
+.hljs-prompt,
+.hljs-link_label,
+.hljs-link_url {+ color: #e6db74;
+}
+
+.hljs-comment,
+.hljs-javadoc,
+.java .hljs-annotation,
+.python .hljs-decorator,
+.hljs-template_comment,
+.hljs-pi,
+.hljs-doctype,
+.hljs-deletion,
+.hljs-shebang,
+.apache .hljs-sqbracket,
+.tex .hljs-formula {+ color: #75715e;
+}
+
+.coffeescript .javascript,
+.javascript .xml,
+.tex .hljs-formula,
+.xml .javascript,
+.xml .vbscript,
+.xml .css,
+.xml .hljs-cdata,
+.xml .php,
+.php .xml {+ opacity: 0.5;
+}
--- /dev/null
+++ b/docs/static/static/js/highlight.pack.js
@@ -1,0 +1,1 @@
+var hljs=new function(){function k(v){return v.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function t(v){return v.nodeName.toLowerCase()}function i(w,x){var v=w&&w.exec(x);return v&&v.index==0}function d(v){return Array.prototype.map.call(v.childNodes,function(w){if(w.nodeType==3){return b.useBR?w.nodeValue.replace(/\n/g,""):w.nodeValue}if(t(w)=="br"){return"\n"}return d(w)}).join("")}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^language-/,"")});return v.filter(function(x){return j(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset<y[0].offset)?w:y}return y[0].event=="start"?w:y}function A(H){function G(I){return" "+I.nodeName+'="'+k(I.value)+'"'}F+="<"+t(H)+Array.prototype.map.call(H.attributes,G).join("")+">"}function E(G){F+="</"+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=k(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+k(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};function E(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})}if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b=D.bK.split(" ").join("|")}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?\\b("+F.b+")\\b\\.?":F.b}).concat([D.tE]).concat([D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T<V.c.length;T++){if(i(V.c[T].bR,U)){return V.c[T]}}}function z(U,T){if(i(U.eR,T)){return U}if(U.eW){return z(U.parent,T)}}function A(T,U){return !J&&i(U.iR,T)}function E(V,T){var U=M.cI?T[0].toLowerCase():T[0];return V.k.hasOwnProperty(U)&&V.k[U]}function w(Z,X,W,V){var T=V?"":b.classPrefix,U='<span class="'+T,Y=W?"":"</span>";U+=Z+'">';return U+X+Y}function N(){var U=k(C);if(!I.k){return U}var T="";var X=0;I.lR.lastIndex=0;var V=I.lR.exec(U);while(V){T+=U.substr(X,V.index-X);var W=E(I,V);if(W){H+=W[1];T+=w(W[0],V[0])}else{T+=V[0]}X=I.lR.lastIndex;V=I.lR.exec(U)}return T+U.substr(X)}function F(){if(I.sL&&!f[I.sL]){return k(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):g(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=k(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+="</span>"}H+=I.r;I=I.parent}while(I!=W.parent\ No newline at end of file
--
⑨