Adding vertical format and template

Author: kenshaw

encode.go

@@ -1203,6 +1203,12 @@ func NewAsciiDocEncoder(resultSet ResultSet, opts ...Option) (Encoder, error) {
 	return NewTemplateEncoder(resultSet, append([]Option{WithTemplate("asciidoc")}, opts...)...)
 }
 
+// NewVerticalEncoder creates a new vertical template encoder using the
+// provided options.
+func NewVerticalEncoder(resultSet ResultSet, opts ...Option) (Encoder, error) {
+	return NewTemplateEncoder(resultSet, append([]Option{WithTemplate("vertical")}, opts...)...)
+}
+
 // Encode encodes a single result set to the writer using the formatting
 // options specified in the encoder.
 func (enc *TemplateEncoder) Encode(w io.Writer) error {

encode_test.go

@@ -114,7 +114,7 @@ func FromMap(opts map[string]string) (Builder, []Option) {
 			WithTitle(opts["title"]),
 			WithEmpty(opts["null"]),
 		}
-	case "html", "asciidoc", "latex", "latex-longtable", "troff-ms":
+	case "html", "asciidoc", "latex", "latex-longtable", "troff-ms", "vertical":
 		return NewTemplateEncoder, []Option{
 			WithTemplate(format),
 			WithTableAttributes(opts["tableattr"]),
@@ -491,19 +491,22 @@ func WithRawTemplate(text, typ string) Option {
 		template: func(enc *TemplateEncoder) error {
 			switch typ {
 			case "html":
-				tpl, err := htmltemplate.New("").Funcs(htmltemplate.FuncMap{
+				tpl, err := htmltemplate.New(typ).Funcs(htmltemplate.FuncMap{
 					"attr":    func(s string) htmltemplate.HTMLAttr { return htmltemplate.HTMLAttr(s) },
 					"safe":    func(s string) htmltemplate.HTML { return htmltemplate.HTML(s) },
 					"toLower": func(s string) htmltemplate.HTML { return htmltemplate.HTML(strings.ToLower(s)) },
 					"toUpper": func(s string) htmltemplate.HTML { return htmltemplate.HTML(strings.ToUpper(s)) },
+					"inc":     func(i int) int { return i + 1 },
 				}).Parse(text)
 				if err != nil {
 					return err
 				}
 				enc.executor = tpl.Execute
 				return nil
 			case "text":
-				tpl, err := texttemplate.New("").Parse(text)
+				tpl, err := texttemplate.New(typ).Funcs(texttemplate.FuncMap{
+					"inc": func(i int) int { return i + 1 },
+				}).Parse(text)
 				if err != nil {
 					return err
 				}

opts.go

@@ -163,42 +163,62 @@ func EncodeTemplateAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
 	return enc.EncodeAll(w)
 }
 
-// EncodeHTMLTemplate encodes the result set to the writer using the html
-// template and the supplied encoding options.
-func EncodeHTMLTemplate(w io.Writer, resultSet ResultSet, opts ...Option) error {
+// EncodeHTML encodes the result set to the writer using the html template and
+// the supplied encoding options.
+func EncodeHTML(w io.Writer, resultSet ResultSet, opts ...Option) error {
 	enc, err := NewHTMLEncoder(resultSet, opts...)
 	if err != nil {
 		return err
 	}
 	return enc.Encode(w)
 }
 
-// EncodeHTMLTemplate encodes the result set to the writer using the html
-// template and the supplied encoding options.
-func EncodeHTMLTemplateAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
+// EncodeHTML encodes the result set to the writer using the html template and
+// the supplied encoding options.
+func EncodeHTMLAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
 	enc, err := NewHTMLEncoder(resultSet, opts...)
 	if err != nil {
 		return err
 	}
 	return enc.EncodeAll(w)
 }
 
-// EncodeAsciiDocTemplate encodes the result set to the writer using the
-// asciidoc template and the supplied encoding options.
-func EncodeAsciiDocTemplate(w io.Writer, resultSet ResultSet, opts ...Option) error {
+// EncodeAsciiDoc encodes the result set to the writer using the asciidoc
+// template and the supplied encoding options.
+func EncodeAsciiDoc(w io.Writer, resultSet ResultSet, opts ...Option) error {
 	enc, err := NewAsciiDocEncoder(resultSet, opts...)
 	if err != nil {
 		return err
 	}
 	return enc.Encode(w)
 }
 
-// EncodeAsciiDocTemplate encodes the result set to the writer using the
-// asciidoc template and the supplied encoding options.
-func EncodeAsciiDocTemplateAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
+// EncodeAsciiDoc encodes the result set to the writer using the asciidoc
+// template and the supplied encoding options.
+func EncodeAsciiDocAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
 	enc, err := NewAsciiDocEncoder(resultSet, opts...)
 	if err != nil {
 		return err
 	}
 	return enc.EncodeAll(w)
 }
+
+// EncodeVertical encodes the result set to the writer using the vertical
+// template and the supplied encoding options.
+func EncodeVertical(w io.Writer, resultSet ResultSet, opts ...Option) error {
+	enc, err := NewVerticalEncoder(resultSet, opts...)
+	if err != nil {
+		return err
+	}
+	return enc.Encode(w)
+}
+
+// EncodeVertical encodes the result set to the writer using the vertical
+// template and the supplied encoding options.
+func EncodeVerticalAll(w io.Writer, resultSet ResultSet, opts ...Option) error {
+	enc, err := NewVerticalEncoder(resultSet, opts...)
+	if err != nil {
+		return err
+	}
+	return enc.EncodeAll(w)
+}

tblfmt.go

@@ -0,0 +1,3 @@
+{{ $headers := .Headers }}{{ range $i, $r := .Rows }}*************************** {{ inc $i }}. row ***************************{{ range $j, $c := $r }}
+{{ index $headers $j }}: {{ $c }}{{ end }}
+{{ end -}}