output: Add output formats decoder

And clean up the output package.

2 files changed, 2 insertions, 2 deletions

diff --git a/hugolib/page.go b/hugolib/page.go
index 5a04c6ce7..9aa75a882 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -909,7 +909,7 @@ func (p *Page) update(f interface{}) error {
 			o := cast.ToStringSlice(v)
 			if len(o) > 0 {
 				// Output formats are exlicitly set in front matter, use those.
-				outFormats, err := output.GetFormats(o...)
+				outFormats, err := output.DefaultFormats.GetByNames(o...)
 
 				if err != nil {
 					p.s.Log.ERROR.Printf("Failed to resolve output formats: %s", err)
diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index 69e68ff9b..5ac5fe1f7 100644
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -40,7 +40,7 @@ func createSiteOutputFormats(cfg config.Provider) (map[string]output.Formats, er
 		var formats output.Formats
 		vals := cast.ToStringSlice(v)
 		for _, format := range vals {
-			f, found := output.GetFormat(format)
+			f, found := output.DefaultFormats.GetByName(format)
 			if !found {
 				return nil, fmt.Errorf("Failed to resolve output format %q from site config", format)
 			}