yeray/gobyexample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more nuanced code rendering

Browse Source
This commit is contained in:
Mark McGranaghan 2012-10-09 18:56:20 -07:00
parent bc39dbc769
commit f9ef42b960
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
template/chapter.tmpl
View File

@ -18,16 +18,22 @@
<body>
<div class="chapter" id="{{.Id}}">
<h2>{{.Name}}</h2>
<table cellspacing="0" cellpadding="0">
<tbody>
{{range .Segs}}
<tr>
<td class=docs>{{.DocsRendered}}</td>
<td class="{{.CodeClasses}}">{{.CodeRendered}}</td>
</tr>
{{end}}
{{range .Segs}}
<table cellspacing="0" cellpadding="0">
<tbody>
{{range .}}
<tr>
<td class="docs">
{{.DocsRendered}}
</td>
<td class="code{{if .CodeEmpty}} empty{{end}}{{if .CodeLeading}} leading{{end}}">
{{.CodeRendered}}
</td>
</tr>
{{end}}
</tbody>
</table>
{{end}}
</div>
</body>
</html>

9
template/site.css
View File

@ -68,6 +68,9 @@ div.chapter {
margin-right: auto;
margin-bottom: 120px;
}
div.chapter table {
margin-bottom: 20px;
}
div#intro {
width: 420px;
min-width: 420px;
@ -102,12 +105,14 @@ td.code {
padding-top: 5px;
padding-right: 5px;
padding-left: 5px;
padding-bottom: 11px;
padding-bottom: 5px;
vertical-align: top;
background: #f0f0f0;
}
td.code.leading {
padding-bottom: 11px;
}
td.code.empty {
border-left: none;
background: #ffffff;
}
pre, code {

24
tool/generate.go
View File

@ -118,13 +118,14 @@ var docsPat = regexp.MustCompile("^\\s*(\\/\\/|#)\\s")
var todoPat = regexp.MustCompile("\\/\\/ todo: ")
type Seg struct {
Docs, DocsRendered string
Code, CodeRendered, CodeClasses string
Docs, DocsRendered string
Code, CodeRendered string
CodeEmpty, CodeLeading bool
}
type Chapter struct {
Id, Name string
Segs []*Seg
Segs [][]*Seg
}
func parseSegs(sourcePath string) []*Seg {
@ -167,7 +168,11 @@ func parseSegs(sourcePath string) []*Seg {
lastSeen = "code"
}
}
return append(segs, &Seg{Code: "", Docs: ""})
for i, seg := range segs {
seg.CodeEmpty = (seg.Code == "")
seg.CodeLeading = (i < (len(segs) - 1))
}
return segs
}
func parseAndRenderSegs(sourcePath string) []*Seg {
@ -194,13 +199,12 @@ func parseChapters() []*Chapter {
chapterId = strings.Replace(chapterId, " ", "-", -1)
chapterId = strings.Replace(chapterId, "/", "-", -1)
chapter.Id = chapterId
chapter.Segs = make([][]*Seg, 0)
sourcePaths := mustGlob("src/" + chapterId + "/*")
segs := []*Seg{}
for _, sourcePath := range sourcePaths {
sourceSegs := parseAndRenderSegs(sourcePath)
segs = append(segs, sourceSegs...)
chapter.Segs = append(chapter.Segs, sourceSegs)
}
chapter.Segs = segs
chapters = append(chapters, &chapter)
}
}
@ -221,12 +225,6 @@ func renderChapters(chapters []*Chapter) {
_, err := chapterTmpl.Parse(mustReadFile("template/chapter.tmpl"))
check(err)
for _, chapter := range chapters {
for _, seg := range chapter.Segs {
seg.CodeClasses = "code"
if seg.Code == "" {
seg.CodeClasses = seg.CodeClasses + " empty"
}
}
chapterF, err := os.Create(siteDir + "/" + chapter.Id)
check(err)
chapterTmpl.Execute(chapterF, chapter)