ref: 8403dba3eefbccb1edbbf919f7059cb65af6a820
parent: aee48725eb81feb62d86bdc0521387f142c9c3a0
parent: 4951ff998c69c3216ae42a7178cb953a4368df35
author: Steve Francia <[email protected]>
date: Tue Jul 9 04:34:20 EDT 2013
Merge pull request #3 from tychoish/rst-fix rst: fixing rst output processing
--- a/docs/content/doc/rst.rst
+++ /dev/null
@@ -1,14 +1,0 @@
----
-Markup: 'rst'
----
-
-
-==============
-This is a Test
-==============
-
-
-Really
-------
-
-text *here* and **HERE**.
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -409,9 +409,9 @@
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 @@
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))
}