diff --git a/composition/content_merge.go b/composition/content_merge.go
index f3c1fee..e06dd7a 100644
--- a/composition/content_merge.go
+++ b/composition/content_merge.go
@@ -5,7 +5,6 @@ import (
"errors"
"io"
"strings"
- "fmt"
)
const (
@@ -34,9 +33,6 @@ type ContentMerge struct {
// merge priorities for the content objects
// no entry means priority == 0
priorities map[Content]int
-
- // all stylesheets contained in used fragments
- stylesheets []string
}
// NewContentMerge creates a new buffered ContentMerge
@@ -53,87 +49,59 @@ func NewContentMerge(metaJSON map[string]interface{}) *ContentMerge {
return cntx
}
-func (cntx *ContentMerge) collectStylesheets(f Fragment) {
- cntx.stylesheets = append(cntx.stylesheets, f.Stylesheets()...)
-}
-
-func (cntx *ContentMerge) writeStylesheets(w io.Writer) {
- for _, href := range cntx.stylesheets {
- stylesheet := fmt.Sprintf("\n ", href)
- io.WriteString(w, stylesheet)
+func (cntx *ContentMerge) GetHtml() ([]byte, error) {
+ if len(cntx.priorities) > 0 {
+ cntx.processMetaPriorityParsing()
}
-}
+ w := bytes.NewBuffer(make([]byte, 0, DefaultBufferSize))
-func generateExecutionFunction(cntx *ContentMerge, w io.Writer) (executeFragment func(fragmentName string) error) {
+ var executeFragment func(fragmentName string) error
executeFragment = func(fragmentName string) error {
f, exist := cntx.GetBodyFragmentByName(fragmentName)
if !exist {
missingFragmentString := generateMissingFragmentString(cntx.Body, fragmentName)
return errors.New(missingFragmentString)
}
- cntx.collectStylesheets(f)
return f.Execute(w, cntx.MetaJSON, executeFragment)
}
- return executeFragment
-}
-func (cntx *ContentMerge) GetHtml() ([]byte, error) {
-
- if len(cntx.priorities) > 0 {
- cntx.processMetaPriorityParsing()
- }
-
- // start header, but don't close it. We will add stylsheets later on
- header := bytes.NewBuffer(make([]byte, 0, DefaultBufferSize))
- io.WriteString(header, "\n\n \n ")
+ io.WriteString(w, "\n\n \n ")
for _, f := range cntx.Head {
- cntx.collectStylesheets(f)
- executeFragment := generateExecutionFunction(cntx, header)
- if err := f.Execute(header, cntx.MetaJSON, executeFragment); err != nil {
+ if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}
+ io.WriteString(w, "\n \n \n ")
+ io.WriteString(w, ">\n ")
startFragmentName := ""
if _, exist := cntx.GetBodyFragmentByName(LayoutFragmentName); exist {
startFragmentName = LayoutFragmentName
}
- // recursively process body fragments
- executeFragment := generateExecutionFunction(cntx, body)
if err := executeFragment(startFragmentName); err != nil {
return nil, err
}
for _, f := range cntx.Tail {
- cntx.collectStylesheets(f)
- if err := f.Execute(body, cntx.MetaJSON, executeFragment); err != nil {
+ if err := f.Execute(w, cntx.MetaJSON, executeFragment); err != nil {
return nil, err
}
}
- io.WriteString(body, "\n \n\n")
- // write the collected stylesheets to the header and close it
- cntx.writeStylesheets(header)
- io.WriteString(header, "\n ")
+ io.WriteString(w, "\n \n