From f035a0f30f938cdf273dc3c700b3482fa1e45970 Mon Sep 17 00:00:00 2001 From: Mark McGranaghan Date: Mon, 1 Oct 2012 14:09:23 -0700 Subject: [PATCH] push down some formatting code --- tool/generate.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tool/generate.go b/tool/generate.go index 8d5bedf..9ef09d5 100644 --- a/tool/generate.go +++ b/tool/generate.go @@ -37,11 +37,10 @@ func readLines(path string) []string { } var docsPat = regexp.MustCompile("^\\s*(\\/\\/|#)\\s") - var headerPat = regexp.MustCompile("^\\s*(\\/\\/|#)\\s#+\\s") type seg struct { - docs, code, docsRendered, codeRendered, codeClasses string + docs, code, docsRendered, codeRendered string } func main() { @@ -101,13 +100,11 @@ func main() { } for _, seg := range segs { - seg.docsRendered = pipe(markdownPath, []string{}, seg.docs) - if seg.code == "" { - seg.codeRendered = "" - seg.codeClasses = "code empty" - } else { + if seg.docs != "" { + seg.docsRendered = pipe(markdownPath, []string{}, seg.docs) + } + if seg.code != "" { seg.codeRendered = pipe(pygmentizePath, []string{"-l", "go", "-f", "html"}, seg.code+" ") - seg.codeClasses = "code" } } @@ -125,11 +122,15 @@ func main() { `) for _, seg := range segs { + codeClasses := "code" + if seg.code == "" { + codeClasses = codeClasses + " empty" + } fmt.Printf( ` %s %s - `, seg.docsRendered, seg.codeClasses, seg.codeRendered) + `, seg.docsRendered, codeClasses, seg.codeRendered) } fmt.Print(``)