Fixed indent depth

Author: cgrindel

ghdoc.go

@@ -150,25 +150,40 @@ func (doc *GHDoc) GrabToc() *GHToc {
 		maxDepth = int(MaxHxDepth)
 	}
 
+	hdrs := findHeadersInString(doc.html)
+
+	minHxDepth := MaxHxDepth
+	for _, hdr := range hdrs {
+		if hdr.Depth < minHxDepth {
+			minHxDepth = hdr.Depth
+		}
+	}
+
 	toc := GHToc{}
-	for _, hdr := range findHeadersInString(doc.html) {
+	for _, hdr := range hdrs {
 		// DEBUG BEGIN
 		log.Printf("*** CHUCK: GrabToc hdr: %+#v", hdr)
 		log.Printf("*** CHUCK: GrabToc minDepth: %+#v", minDepth)
 		log.Printf("*** CHUCK: GrabToc maxDepth: %+#v", maxDepth)
 		// DEBUG END
 		hDepth := int(hdr.Depth)
 		if hDepth >= minDepth && hDepth <= maxDepth {
-			toc = append(toc, doc.tocEntry(listIndentation(), hdr))
+			indentDepth := int(hdr.Depth) - int(minHxDepth) - doc.StartDepth
+			// DEBUG BEGIN
+			log.Printf("*** CHUCK: GrabToc minHxDepth: %+#v", minHxDepth)
+			log.Printf("*** CHUCK: GrabToc doc.StartDepth: %+#v", doc.StartDepth)
+			log.Printf("*** CHUCK: GrabToc indentDepth: %+#v", indentDepth)
+			// DEBUG END
+			indent := strings.Repeat(listIndentation(), indentDepth)
+			toc = append(toc, doc.tocEntry(indent, hdr))
 		}
 	}
 
 	return &toc
 }
 
 func (doc *GHDoc) tocEntry(indent string, hdr Header) string {
-	indentDepth := int(hdr.Depth) - doc.StartDepth
-	return strings.Repeat(indent, indentDepth) + "* " +
+	return indent + "* " +
 		"[" + doc.tocName(hdr.Name) + "]" +
 		"(" + doc.tocLink(hdr.Href) + ")"
 }

ghdoc_test.go

@@ -95,6 +95,9 @@ For example:</p>
 		Depth:  0,
 		Indent: 2,
 	}
+	// DEBUG BEGIN
+	log.Printf("*** CHUCK: ========")
+	// DEBUG END
 	toc := *doc.GrabToc()
 	for i := 0; i <= len(tocExpected)-1; i++ {
 		if toc[i] != tocExpected[i] {
@@ -234,16 +237,7 @@ func TestGrabTocStartDepth(t *testing.T) {
 		StartDepth: 1,
 		Indent:     2,
 	}
-	// DEBUG BEGIN
-	log.Printf("*** CHUCK: =======")
-	// DEBUG END
 	toc := *doc.GrabToc()
-	// DEBUG BEGIN
-	log.Printf("*** CHUCK toc: ")
-	for idx, item := range toc {
-		log.Printf("*** CHUCK %d: %+#v", idx, item)
-	}
-	// DEBUG END
 	for i := 0; i <= len(tocExpected)-1; i++ {
 		if toc[i] != tocExpected[i] {
 			t.Error("Res :", toc[i], "\nExpected      :", tocExpected[i])