Merge pull request #3 from tychoish/rst-fix - hugo - [fork] hugo port for 9front
(HTM) git clone git@git.drkhsh.at/hugo.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 8403dba3eefbccb1edbbf919f7059cb65af6a820
(DIR) parent aee48725eb81feb62d86bdc0521387f142c9c3a0
(HTM) Author: Steve Francia <steve.francia@gmail.com>
Date: Tue, 9 Jul 2013 08:34:20 -0700
Merge pull request #3 from tychoish/rst-fix
rst: fixing rst output processing
Diffstat:
D docs/content/doc/rst.rst | 14 --------------
M hugolib/page.go | 12 +++++++++---
2 files changed, 9 insertions(+), 17 deletions(-)
---
(DIR) diff --git a/docs/content/doc/rst.rst b/docs/content/doc/rst.rst
@@ -1,14 +0,0 @@
----
-Markup: 'rst'
----
-
-
-==============
-This is a Test
-==============
-
-
-Really
-------
-
-text *here* and **HERE**.
(DIR) diff --git a/hugolib/page.go b/hugolib/page.go
@@ -409,9 +409,9 @@ func (page *Page) convertMarkdown(lines []string) {
func (page *Page) convertRestructuredText(lines []string) {
- page.RawMarkdown = strings.Join(lines, " ")
+ page.RawMarkdown = strings.Join(lines, "\n")
- cmd := exec.Command("rst2html.py", "--template=/tmp/template.txt")
+ cmd := exec.Command("rst2html.py")
cmd.Stdin = strings.NewReader(page.RawMarkdown)
var out bytes.Buffer
cmd.Stdout = &out
@@ -419,7 +419,13 @@ func (page *Page) convertRestructuredText(lines []string) {
fmt.Println(err)
}
- content := out.String()
+ rstLines := strings.Split(out.String(), "\n")
+ for i, line := range rstLines {
+ if strings.HasPrefix(line, "<body>") {
+ rstLines = (rstLines[i+1:len(rstLines)-3])
+ }
+ }
+ content := strings.Join(rstLines, "\n")
page.Content = template.HTML(content)
page.Summary = template.HTML(TruncateWordsToWholeSentence(StripHTML(StripShortcodes(content)), summaryLength))
}