include css in normal output

Author: cooper

RUNNING.md

@@ -25,12 +25,19 @@ quiki -bind=1.2.3.4 -port=8090          # override host and port in config
 
 #### Generate Pages to STDOUT
 
+HTML Output
 ```
 quiki /path/to/my_page.page             # generate a standalone page, any .page or .md file
 quiki -wiki=/path/to/wiki my_page       # generate a page within a wiki
 quiki -i                                # interactive mode - read from STDIN
 ```
 
+JSON Output
+```
+quiki -json /path/to/my_page.page       # generate a standalone page, output JSON
+quiki -json -wiki=/path/to/wiki my_page # generate a page within a wiki, output JSON
+```
+
 #### Wiki Operations
 
 ```

quiki.go

@@ -122,7 +122,7 @@ func runPageAndExit(page *wikifier.Page) {
 		json.NewEncoder(os.Stdout).Encode(page)
 		os.Exit(0)
 	}
-	fmt.Println(page.HTML())
+	fmt.Println(page.HTMLAndCSS())
 	os.Exit(0)
 }
 
@@ -135,6 +135,11 @@ func runWikiPageAndExit(w *wiki.Wiki, pagePath string) {
 	}
 	switch r := res.(type) {
 	case wiki.DisplayPage:
+		if r.CSS != "" {
+			fmt.Println(`<style type="text/css">`)
+			fmt.Println(r.CSS)
+			fmt.Println(`</style>`)
+		}
 		fmt.Println(r.Content)
 	case wiki.DisplayError:
 		log.Fatal(r.Error)

wikifier/page.go

@@ -201,6 +201,15 @@ func (p *Page) HTML() HTML {
 	return p._html
 }
 
+// HTMLAndCSS generates and returns the HTML code for the page, including CSS.
+func (p *Page) HTMLAndCSS() HTML {
+	css := p.CSS()
+	if css != "" {
+		return HTML("<style>\n" + css + "\n</style>\n" + string(p.HTML()))
+	}
+	return p.HTML()
+}
+
 // Text generates and returns the rendered plain text for the page.
 // The page must be parsed with Parse before attempting this method.
 func (p *Page) Text() string {