README.md

@@ -2,7 +2,7 @@
 
 An extensible Atom feed generator library that aims to be very close to RFC4287.
 It diligently checks for compliance with the standard and provides functions for
-easy creation, extension and deletion of elements.
+easy creation and extension of elements.
 
 ## Installation
 
@@ -14,11 +14,9 @@ go get git.streifling.com/jason/atom@latest
 
 ## Usage
 
-### Basic Feed
-
-This library provides convenient functions to safely create, extend and delete
-elements and attributes of Atom feeds. It also provides checks for all
-constructs' adherence to RFC4287.
+This library provides convenient functions to safely create and extend elements
+and attributes of Atom feeds. It also provides checks for all constructs'
+adherence to RFC4287.
 
 ```go
 package main
@@ -50,7 +48,7 @@ func main() {
  }
  feed.AddEntry(entry)
 
-    feedString, err := feed.ToXML("UTF-8")
+ feedString, err := feed.ToXML("utf-8")
  if err != nil {
   log.Fatalln(err)
  }
@@ -70,7 +68,6 @@ import (
  "time"
 
  "git.streifling.com/jason/atom"
-    "github.com/google/uuid"
 )
 
 func main() {
@@ -81,7 +78,7 @@ func main() {
    Type: "text",
    Text: "Example Feed",
   },
-        ID:      &atom.ID{URI: fmt.Sprint("urn:uuid:", uuid.New())},
+  ID:      &atom.ID{URI: "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6"},
   Updated: &atom.Date{DateTime: atom.DateTime(now)},
   Authors: []*atom.Person{
    {
@@ -95,7 +92,7 @@ func main() {
      Type: "text",
      Text: "First Entry",
     },
-                ID:      &atom.ID{URI: fmt.Sprint("urn:uuid:", uuid.New())},
+    ID:      &atom.ID{URI: "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a"},
     Updated: &atom.Date{DateTime: atom.DateTime(now)},
     Content: &atom.InlineTextContent{
      Type: "text",
@@ -105,7 +102,7 @@ func main() {
   },
  }
 
-    feedString, err := feed.ToXML("UTF-8")
+ feedString, err := feed.ToXML("utf-8")
  if err != nil {
   log.Fatalln(err)
  }
@@ -116,7 +113,7 @@ func main() {
 The output of both ways of using it is an RFC4287 compliant Atom feed.
 
 ```xml
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <author>
     <name>John Doe</name>
@@ -133,109 +130,3 @@ The output of both ways of using it is an RFC4287 compliant Atom feed.
   </entry>
 </feed>
 ```
-
-### Compliance and Error Checking
-
-All Atom constructs have their own ```construct.Check()``` method. It checks for
-compliance with RFC4287 and errors. This allows one to be certain that only
-compliant constructs are added to their respective parent construct. It also
-means that not the entire feed has to be checked every time a new construct is
-added. Instead one only checks the current construct and all of its
-sub-constructs with a single ```construct.Check()``` call.
-
-```go
-package main
-
-import (
-    "fmt"
-    "log"
-
-    "git.streifling.com/jason/atom"
-)
-
-func main() {
-    feed := atom.NewFeed("Example Feed")
-    if err := feed.Check(); err != nil {
-        log.Fatalln(err)
-    }
-
-    entry := atom.NewEntry("One")
-    entry.Content = atom.NewContent(atom.InlineText, "text", "Entry One")
-    entry.AddAuthor(atom.NewPerson("John Doe"))
-    if err := entry.Check(); err != nil {
-        log.Fatalln(err)
-    }
-    feed.AddEntry(entry)
-
-    feedString, err := feed.ToXML("UTF-8")
-    if err != nil {
-        log.Fatalln(err)
-    }
-    fmt.Println(feedString)
-}
-```
-
-### Adding and Deleting Items
-
-To add elements to any slice one calls the appropriate
-```someone.AddSomething(toBeAdded)``` method. It returns the item's index
-number. To delete the item one calls the Delete method.
-
-```go
-package main
-
-import (
-    "fmt"
-    "log"
-
-    "git.streifling.com/jason/atom"
-)
-
-func main() {
-    feed := atom.NewFeed("Feed")
-    if err := feed.Check(); err != nil {
-        log.Fatalln(err)
-    }
-
-    e1 := atom.NewEntry("One")
-    e1.Content = atom.NewContent(atom.InlineText, "text", "Entry One")
-    if err := e1.Check(); err != nil {
-        log.Fatalln(err)
-    }
-    i1 := feed.AddEntry(e1)
-
-    e2 := atom.NewEntry("Two")
-    e2.Content = atom.NewContent(atom.InlineText, "text", "Entry Two")
-    if err := e2.Check(); err != nil {
-        log.Fatalln(err)
-    }
-    feed.AddEntry(e2)
-
-    if err := feed.DeleteEntry(i1); err != nil {
-        log.Fatalln(err)
-    }
-
-    feedString, err := feed.ToXML("UTF-8")
-    if err != nil {
-        log.Fatalln(err)
-    }
-    fmt.Println(feedString)
-}
-```
-
-The output of this example looks like this. It only shows the second entry.
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <id>urn:uuid:ae89d343-b535-447d-ac14-4b80d3e02a2f</id>
-    <title type="text">Example Feed</title>
-    <updated>2024-10-20T14:57:02+02:00</updated>
-    <entry>
-        <content type="text">Entry Two</content>
-        <id>urn:uuid:620c6f73-ee1d-4c1e-be98-b0b1ad7a053f</id>
-        <title type="text">Two</title>
-        <updated>2024-10-20T14:57:02+02:00</updated>
-    </entry>
-</feed>
-```

atom.go

@@ -16,14 +16,12 @@ type Countable interface {
 	*xml.Attr | *Person | *Category | *Link | *ExtensionElement | *Entry
 }
 
-// addToSlice adds a Countable to to a *[]Countable. It returns an int.
-func addToSlice[C Countable](slice *[]C, countable C) int {
+// addToSlice adds a Countable to to a *[]Countable
+func addToSlice[C Countable](slice *[]C, countable C) {
 	if *slice == nil {
 		*slice = make([]C, 0)
 	}
-
 	*slice = append(*slice, countable)
-	return len(*slice) - 1
 }
 
 // deleteFromSlice deletes the Countable with the index from the *[]Countable.

category.go

@@ -10,17 +10,22 @@ type Category struct {
 	*CommonAttributes
 	Term   string `xml:"term,attr"`
 	Scheme string `xml:"scheme,attr,omitempty"` // IRI
-	Label  string `xml:"label,attr,omitempty"`  // Must be unescaped
+	Label  string `xml:"label,attr,omitempty"`
 }
 
 // NewCategory creates a new Category. It returns a *Category.
 func NewCategory(term string) *Category {
 	return &Category{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Term:             term,
 	}
 }
 
+// SetLabel sets the Label attribute of the Category.
+func (c *Category) SetLabel(label string) {
+	c.Label = Unescape(label)
+}
+
 // Check checks the Category for incompatibilities with RFC4287. It returns an
 // error.
 func (c *Category) Check() error {

commonAttributes.go

@@ -13,14 +13,13 @@ type CommonAttributes struct {
 
 // NewCommonAttributes creates a new set of CommonAttributes. It returns a
 // *CommonAttributes.
-func NewCommonAttributes() *CommonAttributes {
+func newCommonAttributes() *CommonAttributes {
 	return new(CommonAttributes)
 }
 
-// AddAttribute adds the attribute to the CommonAttributes. It returns its index
-// as an int.
-func (c *CommonAttributes) AddAttribute(name, value string) int {
-	return addToSlice(&c.UndefinedAttributes, &xml.Attr{Name: xml.Name{Local: name}, Value: value})
+// AddAttribute adds the attribute to the CommonAttributes.
+func (c *CommonAttributes) AddAttribute(name, value string) {
+	addToSlice(&c.UndefinedAttributes, &xml.Attr{Name: xml.Name{Local: name}, Value: value})
 }
 
 // DeleteAttribute deletes the attribute at index from the CommonAttributes. It

date.go

@@ -19,7 +19,7 @@ func DateTime(t time.Time) string {
 // NewDate creates a new Date. It returns a *Date.
 func NewDate(t time.Time) *Date {
 	return &Date{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		DateTime:         DateTime(t),
 	}
 }

entry.go

@@ -59,23 +59,17 @@ func (e *Entry) checkAuthors(authorInFeed bool) error {
 // NewEntry creates a new Entry. It returns a *Entry.
 func NewEntry(title string) *Entry {
 	return &Entry{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		ID:               NewID(NewURN()),
 		Title:            NewText("text", title),
 		Updated:          NewDate(time.Now()),
 	}
 }
 
-// AddAuthor adds the Person as an author to the Entry. It returns its index as
-// an int.
-func (e *Entry) AddAuthor(p *Person) int {
-	if e.Updated == nil {
+// AddAuthor adds the Person as an author to the Entry.
+func (e *Entry) AddAuthor(p *Person) {
+	addToSlice(&e.Authors, p)
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&e.Authors, p)
 }
 
 // DeleteAuthor deletes the Person at index from the Entry. It return an error.
@@ -84,24 +78,14 @@ func (e *Entry) DeleteAuthor(index int) error {
 		return fmt.Errorf("error deleting author %v from entry %v: %v", index, e.ID.URI, err)
 	}
 
-	if e.Updated == nil {
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddCategory adds the Category to the Entry. It returns ts index as an int.
-func (e *Entry) AddCategory(c *Category) int {
-	if e.Updated == nil {
+// AddCategory adds the Category to the Entry.
+func (e *Entry) AddCategory(c *Category) {
+	addToSlice(&e.Categories, c)
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&e.Categories, c)
 }
 
 // DeleteCategory deletes the Category at index from the Entry. It return an
@@ -111,25 +95,14 @@ func (e *Entry) DeleteCategory(index int) error {
 		return fmt.Errorf("error deleting category %v from entry %v: %v", index, e.ID.URI, err)
 	}
 
-	if e.Updated == nil {
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddContributor adds the Person as a contributor to the Entry. It returns its
-// index as an int.
-func (e *Entry) AddContributor(c *Person) int {
-	if e.Updated == nil {
+// AddContributor adds the Person as a contributor to the Entry.
+func (e *Entry) AddContributor(c *Person) {
+	addToSlice(&e.Contributors, c)
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&e.Contributors, c)
 }
 
 // DeleteContributor deletes the Person at index from the Entry. It return an
@@ -139,24 +112,14 @@ func (e *Entry) DeleteContributor(index int) error {
 		return fmt.Errorf("error deleting contributor %v from entry %v: %v", index, e.ID.URI, err)
 	}
 
-	if e.Updated == nil {
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddLink adds the Link to the Entry. It returns its index as an int.
-func (e *Entry) AddLink(l *Link) int {
-	if e.Updated == nil {
+// AddLink adds the Link to the Entry.
+func (e *Entry) AddLink(l *Link) {
+	addToSlice(&e.Links, l)
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&e.Links, l)
 }
 
 // DeleteLink deletes the Link at index from the Entry. It return an error.
@@ -165,25 +128,14 @@ func (e *Entry) DeleteLink(index int) error {
 		return fmt.Errorf("error deleting link %v from entry %v: %v", index, e.ID.URI, err)
 	}
 
-	if e.Updated == nil {
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddExtension adds the ExtensionElement to the Entry. It returns its index as
-// an int.
-func (e *Entry) AddExtension(x *ExtensionElement) int {
-	if e.Updated == nil {
+// AddExtension adds the ExtensionElement to the Entry.
+func (e *Entry) AddExtension(x *ExtensionElement) {
+	addToSlice(&e.Extensions, x)
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&e.Extensions, x)
 }
 
 // DeleteExtension deletes the Extension at index from the Entry. It return an
@@ -193,12 +145,7 @@ func (e *Entry) DeleteExtension(index int) error {
 		return fmt.Errorf("error deleting extension %v from entry %v: %v", index, e.ID.URI, err)
 	}
 
-	if e.Updated == nil {
 	e.Updated = NewDate(time.Now())
-	} else {
-		e.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 

feed.go

@@ -28,23 +28,17 @@ type Feed struct {
 // NewFeed creates a new Feed. It returns a *Feed.
 func NewFeed(title string) *Feed {
 	return &Feed{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		ID:               NewID(NewURN()),
 		Title:            NewText("text", title),
 		Updated:          NewDate(time.Now()),
 	}
 }
 
-// AddAuthor adds the Person as an author to the Feed. It returns its index as
-// an int.
-func (f *Feed) AddAuthor(p *Person) int {
-	if f.Updated == nil {
+// AddAuthor adds the Person as an author to the Feed.
+func (f *Feed) AddAuthor(p *Person) {
+	addToSlice(&f.Authors, p)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Authors, p)
 }
 
 // DeleteAuthor deletes the Person at index from the Feed. It return an error.
@@ -53,24 +47,14 @@ func (f *Feed) DeleteAuthor(index int) error {
 		return fmt.Errorf("error deleting author %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddCategory adds the Category to the Feed. It returns its index as an int.
-func (f *Feed) AddCategory(c *Category) int {
-	if f.Updated == nil {
+// AddCategory adds the Category to the Feed.
+func (f *Feed) AddCategory(c *Category) {
+	addToSlice(&f.Categories, c)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Categories, c)
 }
 
 // DeleteCategory deletes the Category at index from the Feed. It return an
@@ -80,25 +64,14 @@ func (f *Feed) DeleteCategory(index int) error {
 		return fmt.Errorf("error deleting category %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddContributor adds the Person as a contributor to the Feed. It returns its
-// index as an int.
-func (f *Feed) AddContributor(c *Person) int {
-	if f.Updated == nil {
+// AddContributor adds the Person as a contributor to the Feed.
+func (f *Feed) AddContributor(c *Person) {
+	addToSlice(&f.Contributors, c)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Contributors, c)
 }
 
 // DeleteContributor deletes the Person at index from the Feed. It return an
@@ -108,25 +81,14 @@ func (f *Feed) DeleteContributor(index int) error {
 		return fmt.Errorf("error deleting contributor %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
 // AddLink adds the Link to the Feed. There should be one Link with Rel "self".
-// It returns its index as an int.
-func (f *Feed) AddLink(l *Link) int {
-	if f.Updated == nil {
+func (f *Feed) AddLink(l *Link) {
+	addToSlice(&f.Links, l)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Links, l)
 }
 
 // DeleteLink deletes the Link at index from the Feed. It return an error.
@@ -135,24 +97,14 @@ func (f *Feed) DeleteLink(index int) error {
 		return fmt.Errorf("error deleting link %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddExtension adds the Extension to the Feed. It returns its index as an int.
-func (f *Feed) AddExtension(e *ExtensionElement) int {
-	if f.Updated == nil {
+// AddExtension adds the Extension to the Feed.
+func (f *Feed) AddExtension(e *ExtensionElement) {
+	addToSlice(&f.Extensions, e)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Extensions, e)
 }
 
 // DeleteExtension deletes the Extension at index from the Feed. It return an
@@ -162,24 +114,14 @@ func (f *Feed) DeleteExtension(index int) error {
 		return fmt.Errorf("error deleting extension %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
-// AddEntry adds the Entry to the Feed. It returns its index as an int.
-func (f *Feed) AddEntry(e *Entry) int {
-	if f.Updated == nil {
+// AddEntry adds the Entry to the Feed.
+func (f *Feed) AddEntry(e *Entry) {
+	addToSlice(&f.Entries, e)
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
-	return addToSlice(&f.Entries, e)
 }
 
 // DeleteEntry deletes the Entry at index from the Feed. It return an error.
@@ -188,12 +130,7 @@ func (f *Feed) DeleteEntry(index int) error {
 		return fmt.Errorf("error deleting entry %v from entry %v: %v", index, f.ID.URI, err)
 	}
 
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 
@@ -215,12 +152,7 @@ func (f *Feed) DeleteEntryByURI(uri string) error {
 	}
 
 	f.Entries = append(f.Entries[:index], f.Entries[index+1:]...)
-	if f.Updated == nil {
 	f.Updated = NewDate(time.Now())
-	} else {
-		f.Updated.DateTime = DateTime(time.Now())
-	}
-
 	return nil
 }
 

generator.go

@@ -17,7 +17,7 @@ type Generator struct {
 // NewGenerator creates a new Generator. It returns a *Generator.
 func NewGenerator(text string) *Generator {
 	return &Generator{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Text:             html.UnescapeString(text),
 	}
 }

icon.go

@@ -15,7 +15,7 @@ type Icon struct {
 // NewIcon creates a new Icon. It returns a *Icon.
 func NewIcon(uri string) *Icon {
 	return &Icon{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		URI:              uri,
 	}
 }

id.go

@@ -15,7 +15,7 @@ type ID struct {
 // NewID creates a new ID. It returns a *ID.
 func NewID(uri string) *ID {
 	return &ID{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		URI:              uri,
 	}
 }

inlineOtherContent.go

@@ -19,7 +19,7 @@ func newInlineOtherContent(mediaType string, content any) *InlineOtherContent {
 	mediaType, _, _ = mime.ParseMediaType(mediaType)
 
 	return &InlineOtherContent{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             mediaType,
 		AnyElement:       content,
 	}

inlineTextContent.go

@@ -16,7 +16,7 @@ type InlineTextContent struct {
 // *InlineTextContent.
 func newInlineTextContent(mediaType, text string) *InlineTextContent {
 	return &InlineTextContent{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             mediaType,
 		Text:             text,
 	}

inlineXHTMLContent.go

@@ -16,7 +16,7 @@ type InlineXHTMLContent struct {
 // *InlineXHTMLContent.
 func newInlineXHTMLContent(mediaType string, div *XHTMLDiv) *InlineXHTMLContent {
 	return &InlineXHTMLContent{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             mediaType,
 		XHTMLDiv:         div,
 	}

link.go

@@ -20,7 +20,7 @@ type Link struct {
 // NewLink creates a new Link. It returns a *Link.
 func NewLink(href string) *Link {
 	return &Link{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Href:             href,
 	}
 }

logo.go

@@ -14,7 +14,7 @@ type Logo struct {
 // NewLogo creates a new Logo. It returns a *Logo.
 func NewLogo(uri string) *Logo {
 	return &Logo{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		URI:              uri,
 	}
 }

outOfLineContent.go

@@ -19,7 +19,7 @@ func newOutOfLineContent(mediaType, src string) *OutOfLineContent {
 	mediaType, _, _ = mime.ParseMediaType(mediaType)
 
 	return &OutOfLineContent{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             mediaType,
 		SRC:              src,
 	}

person.go

@@ -16,15 +16,14 @@ type Person struct {
 // NewPerson creates a new Person. It returns a *Person.
 func NewPerson(name string) *Person {
 	return &Person{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Name:             name,
 	}
 }
 
-// AddExtension adds the Extension to the Person. It returns its index as an
-// int.
-func (p *Person) AddExtension(e *ExtensionElement) int {
-	return addToSlice(&p.Extensions, e)
+// AddExtension adds the Extension to the Person.
+func (p *Person) AddExtension(e *ExtensionElement) {
+	addToSlice(&p.Extensions, e)
 }
 
 // DeleteExtension deletes the Extension at index from the Person. It return an

plainText.go

@@ -16,7 +16,7 @@ func (p *PlainText) isText() bool { return true }
 // newPlainText creates a new PlainText. It returns a *PlainText.
 func newPlainText(textType, content string) *PlainText {
 	return &PlainText{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             textType,
 		Text:             content,
 	}

source.go

@@ -25,13 +25,12 @@ type Source struct {
 
 // NewSource creates a new Source. It returns a *Source.
 func NewSource() *Source {
-	return &Source{CommonAttributes: NewCommonAttributes()}
+	return &Source{CommonAttributes: newCommonAttributes()}
 }
 
-// AddAuthor adds the Person as an author to the Source. It returns its index as
-// an int.
-func (s *Source) AddAuthor(p *Person) int {
-	return addToSlice(&s.Authors, p)
+// AddAuthor adds the Person as an author to the Source.
+func (s *Source) AddAuthor(p *Person) {
+	addToSlice(&s.Authors, p)
 }
 
 // DeleteAuthor deletes the Person at index from the Source. It return an error.
@@ -42,9 +41,9 @@ func (s *Source) DeleteAuthor(index int) error {
 	return nil
 }
 
-// AddCategory adds the Category to the Source. It returns its index as an int.
-func (s *Source) AddCategory(c *Category) int {
-	return addToSlice(&s.Categories, c)
+// AddCategory adds the Category to the Source.
+func (s *Source) AddCategory(c *Category) {
+	addToSlice(&s.Categories, c)
 }
 
 // DeleteCategory deletes the Category at index from the Source. It return an
@@ -56,10 +55,9 @@ func (s *Source) DeleteCategory(index int) error {
 	return nil
 }
 
-// AddContributor adds the Person as a contributor to the Source. It returns its
-// index as an int.
-func (s *Source) AddContributor(c *Person) int {
-	return addToSlice(&s.Contributors, c)
+// AddContributor adds the Person as a contributor to the Source.
+func (s *Source) AddContributor(c *Person) {
+	addToSlice(&s.Contributors, c)
 }
 
 // DeleteContributor deletes the Person at index from the Source. It return an
@@ -71,9 +69,9 @@ func (s *Source) DeleteContributor(index int) error {
 	return nil
 }
 
-// AddLink adds the Link to the Source. It returns its index as an int.
-func (s *Source) AddLink(l *Link) int {
-	return addToSlice(&s.Links, l)
+// AddLink adds the Link to the Source.
+func (s *Source) AddLink(l *Link) {
+	addToSlice(&s.Links, l)
 }
 
 // DeleteLink deletes the Link at index from the Source. It return an error.
@@ -84,10 +82,9 @@ func (s *Source) DeleteLink(index int) error {
 	return nil
 }
 
-// AddExtension adds the ExtensionElement to the Source. It returns its index as
-// an int.
-func (s *Source) AddExtension(e *ExtensionElement) int {
-	return addToSlice(&s.Extensions, e)
+// AddExtension adds the ExtensionElement to the Source.
+func (s *Source) AddExtension(e *ExtensionElement) {
+	addToSlice(&s.Extensions, e)
 }
 
 // DeleteExtension deletes the Extension at index from the Source. It return an

xhtmlText.go

@@ -16,7 +16,7 @@ func (x *XHTMLText) isText() bool { return true }
 // newPlainText creates a new PlainText. It returns a *PlainText.
 func newXHTMLText(textType, content string) *XHTMLText {
 	return &XHTMLText{
-		CommonAttributes: NewCommonAttributes(),
+		CommonAttributes: newCommonAttributes(),
 		Type:             textType,
 		XHTMLDiv:         NewXHTMLDiv(content),
 	}