Use page.Markup to determine which PageHandler to use if it's set.

diff --git a/hugolib/site.go b/hugolib/site.go
index 2e26beb842aace4fd062a10f5054ed4db8088e74..4a986d81f2304cc7b54b57afdb52fd761ec283bf 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -428,7 +428,12 @@ func sourceReader(s *Site, files <-chan *source.File, results chan<- HandledResu
 func pageConverter(s *Site, pages <-chan *Page, results HandleResults, wg *sync.WaitGroup) {
        defer wg.Done()
        for page := range pages {
-               h := FindHandler(page.File.Extension())
+               var h Handler
+               if page.Markup != "" {
+                       h = FindHandler(page.Markup)
+               } else {
+                       h = FindHandler(page.File.Extension())
+               }
                if h != nil {
                        h.Convert(page, s, results)
                }
@@ -438,8 +443,6 @@ func pageConverter(s *Site, pages <-chan *Page, results HandleResults, wg *sync.
 func fileConverter(s *Site, files <-chan *source.File, results HandleResults, wg *sync.WaitGroup) {
        defer wg.Done()
        for file := range files {
-               fmt.Println(file.Path())
-               //Handling short codes prior to Conversion to HTML
                h := FindHandler(file.Extension())
                if h != nil {
                        h.Convert(file, s, results)