Changed cover to a page flag

document.go

@@ -11,7 +11,6 @@ import (
 
 // A Document represents a single pdf document.
 type Document struct {
-	cover   *Page
 	pages   []*Page
 	options []string
 
@@ -34,7 +33,8 @@ func (doc *Document) AddPages(pages ...*Page) {
 
 // AddCover adds a cover page to the document.
 func (doc *Document) AddCover(cover *Page) {
-	doc.cover = cover
+	doc.pages = append(doc.pages, cover)
+	cover.cover = true
 }
 
 // AddOptions allows the setting of options after document creation.
@@ -51,16 +51,9 @@ func (doc *Document) args() []string {
 	args := []string{}
 	args = append(args, doc.options...)
 
-	// coverpage
-	if doc.cover != nil {
-		args = append(args, "cover", doc.cover.filename)
-		args = append(args, doc.cover.options...)
-	}
-
 	// pages
 	for _, pg := range doc.pages {
-		args = append(args, pg.filename)
-		args = append(args, pg.options...)
+		args = append(args, pg.args()...)
 	}
 
 	return args
@@ -71,10 +64,6 @@ func (doc *Document) args() []string {
 func (doc *Document) readers() int {
 
 	n := 0
-	if doc.cover != nil && doc.cover.reader {
-		n++
-	}
-
 	for _, pg := range doc.pages {
 		if pg.reader {
 			n++
@@ -93,18 +82,11 @@ func (doc *Document) writeTempPages() error {
 		return fmt.Errorf("Error creating temp directory")
 	}
 
-	n := 0
-	all_pages := []*Page{}
-	if doc.cover != nil {
-		all_pages = append(all_pages, doc.cover)
-	}
-	all_pages = append(all_pages, doc.pages...)
-	for _, pg := range all_pages {
+	for n, pg := range doc.pages {
 		if !pg.reader {
 			continue
 		}
 
-		n++
 		pg.filename = fmt.Sprintf("%v/%v/page%08d.html", TempDir, doc.tmp, n)
 		err := ioutil.WriteFile(pg.filename, pg.buf.Bytes(), 0666)
 		if err != nil {

document_test.go

@@ -56,10 +56,14 @@ func TestAddCover(t *testing.T) {
 	pg := NewPage("page1.html")
 	doc.AddPages(pg)
 
-	exp := Document{cover: cov, pages: []*Page{pg}, options: []string{}}
+	exp := Document{pages: []*Page{pg, cov}, options: []string{}}
 	if reflect.DeepEqual(exp, doc) {
 		t.Errorf("Wrong document produced. Expected: %v, Got: %v", exp, doc)
 	}
+
+	if cov.cover != true {
+		t.Errorf("Cover page not marked")
+	}
 }
 
 func TestArgs(t *testing.T) {
@@ -142,7 +146,7 @@ func TestWriteTemp(t *testing.T) {
 		t.Errorf("Unexpected error: %v", err)
 	}
 
-	exp := []string{"page00000001.html", "page00000002.html", "page00000003.html"}
+	exp := []string{"page00000001.html", "page00000002.html", "page00000004.html"}
 	files, err := ioutil.ReadDir(TempDir + "/" + doc.tmp)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)

page.go

@@ -13,6 +13,7 @@ type Page struct {
 	buf      *bytes.Buffer
 	reader   bool
 	options  []string
+	cover    bool
 }
 
 // NewPage creates a new page from the given filename (which can be a url),
@@ -48,3 +49,18 @@ func (pg *Page) AddOptions(opts ...PageOption) {
 		pg.options = append(pg.options, opt.opts()...)
 	}
 }
+
+// args
+func (pg *Page) args() []string {
+
+	args := []string{}
+
+	if pg.cover {
+		args = append(args, "cover")
+	}
+
+	args = append(args, pg.filename)
+	args = append(args, pg.options...)
+	return args
+
+}