Handle the nesting properly

reader.go

@@ -73,7 +73,7 @@ func cleanLink(link string) string {
 
 /* return next and prev urls from document and the list of chapters */
 func chapterList(e *epub.Epub, file string, id string, base string) (string, string, []chapter) {
-	chapters := make([]chapter, 0)
+	var chapters []chapter
 	prev := ""
 	next := ""
 	tit := e.Titerator(epub.TITERATOR_NAVMAP)
@@ -90,13 +90,13 @@ func chapterList(e *epub.Epub, file string, id string, base string) (string, str
 			activeIndx = len(chapters)
 		}
 		c.Depth = tit.Depth()
-		if c.Depth > depth {
+		for c.Depth > depth {
-			c.In = true
+			c.In = append(c.In, true)
-			depth = c.Depth
+			depth++
 		}
-		if c.Depth < depth {
+		for c.Depth < depth {
-			c.Out = true
+			c.Out = append(c.Out, true)
-			depth = c.Depth
+			depth--
 		}
 		chapters = append(chapters, c)
 	}

templates/read.html

@@ -19,13 +19,13 @@
 <div class="row">
 <div class="span4">
 {{range .Chapters}}
-{{if .In}}
+{{range .Out}}
+</ul>
+{{end}}
+{{range .In}}
 <ul class="nav nav-list">
 {{end}}
 	<li {{if .Active}}class="active"{{end}}><a href="{{.Link}}">{{.Label}}</a></li>
-{{if .Out}}
-</ul>
-{{end}}
 {{end}}
 {{if .Chapters}}
 </ul>