# HG changeset patch
# User Sean E. Russell <ser@ser1.net>
# Date 1462038780 14400
#      Sat Apr 30 13:53:00 2016 -0400
# Node ID 3f5d27f78a808454ee0f5f3fce5e075b9b6adda3
# Parent  879338cc624b966061c999d8d27d2b296d336755
Better box width based on text contents.

diff --git a/cmd/orgchart/main.go b/cmd/orgchart/main.go
--- a/cmd/orgchart/main.go
+++ b/cmd/orgchart/main.go
@@ -14,6 +14,7 @@
 
 import (
 	"encoding/csv"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -185,9 +186,10 @@
 		ps[name] = p
 	}
 	if e == io.EOF {
-		e = nil
+		return ps, nil
 	}
-	return ps, e
+	erstrng := fmt.Sprintf("%s: \"%#v\"", e.Error(), l)
+	return ps, errors.New(erstrng)
 }
 
 // Given a map of people, produces a ranking where rank[0] are people with no
diff --git a/cmd/orgchart/main_test.go b/cmd/orgchart/main_test.go
--- a/cmd/orgchart/main_test.go
+++ b/cmd/orgchart/main_test.go
@@ -144,7 +144,8 @@
 	assert.Equal(t, 5, rs.width())
 	assert.Equal(t, 6, rs.height())
 	setBoxH(rs)
-	assert.Equal(t, 450, height(rs))
+	assert.Equal(t, 450, height(rs, false))
+	assert.Equal(t, 530, height(rs, true))
 }
 
 func TestClass(t *testing.T) {
diff --git a/cmd/orgchart/svg.go b/cmd/orgchart/svg.go
--- a/cmd/orgchart/svg.go
+++ b/cmd/orgchart/svg.go
@@ -11,7 +11,8 @@
  *  Constants & global variables                                          *
  **************************************************************************/
 const (
-	boxW      = 300
+	charW     = 5
+	padW      = 30
 	gapW      = 30
 	marginW   = 20
 	gapH      = 100
@@ -28,6 +29,7 @@
 var pageWidth int
 var bgW int
 var boxH int
+var boxW int
 
 /**************************************************************************
  *  SVG generating code                                                   *
@@ -58,8 +60,13 @@
 	}
 }
 
+func setBoxW(rs Ranks) {
+	boxW = maxTextWidth(rs)*charW + padW
+}
+
 func renderSVG(out io.Writer, rs Ranks, sup bool, css string) {
 	setBoxH(rs)
+	setBoxW(rs)
 	c := svg.New(out)
 	bgW = boxW + gapW
 	pageWidth := rs.width() * bgW
@@ -249,3 +256,19 @@
 func class(p *Person) string {
 	return "class='" + p.Class + "'"
 }
+
+func maxTextWidth(rs Ranks) (mw int) {
+	for _, ps := range rs {
+		for _, p := range ps {
+			if len(p.Name) > mw {
+				mw = len(p.Name)
+			}
+			for _, l := range p.Lines {
+				if len(l) > mw {
+					mw = len(l)
+				}
+			}
+		}
+	}
+	return mw
+}
diff --git a/cmd/orgchart/svg_test.go b/cmd/orgchart/svg_test.go
new file mode 100644
--- /dev/null
+++ b/cmd/orgchart/svg_test.go
@@ -0,0 +1,40 @@
+package main
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMaxTextWidth(t *testing.T) {
+	tests := []string{
+		"X,,A,B,C\nXX,,A,B,C",
+		"X,,AA,B,C\nXX,,A,B,C",
+		"X,,AAA,B,C\nXX,,A,B,C",
+		"X,,AAA,B,C\nXX,,A,BBBB,C",
+		"X,,AAA,B,CCCCC\nXX,,A,BBBB,C",
+	}
+	expects := []int{
+		2,
+		2,
+		3,
+		4,
+		5,
+	}
+	h := "Person,Manager,Text 1,Text 2, Text 3\n"
+	var ps map[string]*Person
+	rx, er := makeRuleSet([]string{})
+	if er != nil {
+		assert.Fail(t, er.Error())
+	}
+	for i, tst := range tests {
+		b := bytes.NewBufferString(h + tst)
+		ps, er = makePeople(b, []int{2, 3, 4}, rx)
+		if er != nil {
+			assert.Fail(t, er.Error())
+		}
+		rs := rank(ps)
+		assert.Equal(t, expects[i], maxTextWidth(rs))
+	}
+}
diff --git a/todo.txt b/todo.txt
new file mode 100644
--- /dev/null
+++ b/todo.txt
@@ -0,0 +1,4 @@
+Dotted-line reports
+Admin associations
+Exclude
+Pictures