Merge pull request #8 from liamg/liamg-sort-out-writer

Add Fprintf

Author: liamg

parser.go

@@ -23,12 +23,12 @@ type parserState struct {
 type attrs uint8
 
 const (
-	bold      uint8 = 1
-	dim             = 2
-	underline       = 4
-	blink           = 8
-	reverse         = 16
-	hidden          = 32
+	bold uint8 = 1 << iota
+	dim
+	underline
+	blink
+	reverse
+	hidden
 )
 
 var resetAll = "\x1b[0m"
@@ -160,7 +160,7 @@ func (p *Parser) Parse(reader io.Reader) error {
 			}
 			return err
 		}
-		for _, r := range []rune(string(buffer[:n])) {
+		for _, r := range string(buffer[:n]) {
 
 			if inTag {
 				if r == '>' {

printf.go

@@ -2,16 +2,21 @@ package tml
 
 import (
 	"fmt"
+	"io"
+	"os"
 )
 
 // Printf works like fmt.Printf, but adds the option of using tags to apply colour or text formatting to the written text. For example "<red>some red text</red>".
 // A full list of tags is available here: https://github.com/liamg/tml
 func Printf(input string, a ...interface{}) error {
+	return Fprintf(os.Stdout, input, a...)
+}
+
+func Fprintf(w io.Writer, input string, a ...interface{}) error {
 	format, err := Parse(input)
 	if err != nil {
 		return err
 	}
-	_, err = fmt.Printf(format, a...)
+	_, err = fmt.Fprintf(w, format, a...)
 	return err
 }
-

println.go

@@ -1,7 +1,16 @@
 package tml
 
+import (
+	"io"
+	"os"
+)
+
 // Println works like fmt.Println, but adds the option of using tags to apply colour or text formatting to the written text. For example "<red>some red text</red>".
 // A full list of tags is available here: https://github.com/liamg/tml
 func Println(input string) {
-	Printf(input + "\n")
+	Fprintln(os.Stdout, input)
+}
+
+func Fprintln(w io.Writer, input string) {
+	Fprintf(w, "%s\n", input)
 }