Bump github.com/alecthomas/repr from 0.4.0 to 0.5.1 (#55 )

Bump github.com/hashicorp/hcl/v2 from 2.23.0 to 2.24.0 (#56 )
Bump github.com/olekukonko/tablewriter from 1.0.6 to 1.0.9 (#54 )
2025-12-18 21:11:03 +01:00 · 2025-08-26 10:44:10 +02:00 · 2025-08-26 10:34:24 +02:00 · 2025-08-26 10:28:54 +02:00 · 2025-08-26 10:22:03 +02:00 · 2025-06-10 16:12:03 +02:00
15 changed files with 476 additions and 243 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ jobs:
  build:
    strategy:
      matrix:
-        version: ['1.22']
+        version: ['1.23']
        os: [ubuntu-latest, macos-latest, windows-latest]
    name: Build
    runs-on: ${{ matrix.os }}
@@ -30,7 +30,7 @@ jobs:
    steps:
      - uses: actions/setup-go@v5
        with:
-          go-version: 1.22
+          go-version: 1.23
      - uses: actions/checkout@v4
      - name: golangci-lint
        uses: golangci/golangci-lint-action@v6
--- a/cfg/config.go
+++ b/cfg/config.go
@@ -28,7 +28,7 @@ import (
 )

 const DefaultSeparator string = `(\s\s+|\t)`
-const Version string = "v1.3.3"
+const Version string = "v1.4.4"
 const MAXPARTS = 2

 var DefaultConfigfile = os.Getenv("HOME") + "/.config/tablizer/config"
@@ -66,7 +66,7 @@ type Filter struct {
 // internal config
 type Config struct {
 	Debug          bool
-	NoNumbering    bool
+	Numbering      bool
 	NoHeaders      bool
 	Columns        string
 	UseColumns     []int
@@ -332,10 +332,10 @@ func (conf *Config) PrepareTransposers() error {
 func (conf *Config) CheckEnv() {
 	// check for environment vars, command line flags have precedence,
 	// NO_COLOR is being checked by the color module itself.
-	if !conf.NoNumbering {
-		_, set := os.LookupEnv("T_NO_HEADER_NUMBERING")
+	if !conf.Numbering {
+		_, set := os.LookupEnv("T_HEADER_NUMBERING")
 		if set {
-			conf.NoNumbering = true
+			conf.Numbering = true
 		}
 	}

@@ -350,7 +350,7 @@ func (conf *Config) CheckEnv() {
 func (conf *Config) ApplyDefaults() {
 	// mode specific defaults
 	if conf.OutputMode == Yaml || conf.OutputMode == CSV {
-		conf.NoNumbering = true
+		conf.Numbering = false
 	}
 }

--- a/cmd/pager.go
+++ b/cmd/pager.go
@@ -0,0 +1,120 @@
+package cmd
+
+// pager setup using bubbletea
+// file shamlelessly copied from:
+// https://github.com/charmbracelet/bubbletea/tree/main/examples/pager
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/charmbracelet/bubbles/viewport"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+)
+
+var (
+	titleStyle = func() lipgloss.Style {
+		b := lipgloss.RoundedBorder()
+		b.Right = "├"
+		return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
+	}()
+
+	infoStyle = func() lipgloss.Style {
+		b := lipgloss.RoundedBorder()
+		b.Left = "┤"
+		return titleStyle.BorderStyle(b)
+	}()
+)
+
+type model struct {
+	content  string
+	title    string
+	ready    bool
+	viewport viewport.Model
+}
+
+func (m model) Init() tea.Cmd {
+	return nil
+}
+
+func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	var (
+		cmd  tea.Cmd
+		cmds []tea.Cmd
+	)
+
+	switch msg := msg.(type) {
+	case tea.KeyMsg:
+		if k := msg.String(); k == "ctrl+c" || k == "q" || k == "esc" {
+			return m, tea.Quit
+		}
+
+	case tea.WindowSizeMsg:
+		headerHeight := lipgloss.Height(m.headerView())
+		footerHeight := lipgloss.Height(m.footerView())
+		verticalMarginHeight := headerHeight + footerHeight
+
+		if !m.ready {
+			// Since this program is using the full size of the viewport we
+			// need to wait until we've received the window dimensions before
+			// we can initialize the viewport. The initial dimensions come in
+			// quickly, though asynchronously, which is why we wait for them
+			// here.
+			m.viewport = viewport.New(msg.Width, msg.Height-verticalMarginHeight)
+			m.viewport.YPosition = headerHeight
+			m.viewport.SetContent(m.content)
+			m.ready = true
+		} else {
+			m.viewport.Width = msg.Width
+			m.viewport.Height = msg.Height - verticalMarginHeight
+		}
+	}
+
+	// Handle keyboard and mouse events in the viewport
+	m.viewport, cmd = m.viewport.Update(msg)
+	cmds = append(cmds, cmd)
+
+	return m, tea.Batch(cmds...)
+}
+
+func (m model) View() string {
+	if !m.ready {
+		return "\n  Initializing..."
+	}
+	return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
+}
+
+func (m model) headerView() string {
+	// title := titleStyle.Render("RPN Help Overview")
+	title := titleStyle.Render(m.title)
+	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
+	return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
+}
+
+func (m model) footerView() string {
+	info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
+	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
+	return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
+}
+
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
+func Pager(title, message string) {
+	p := tea.NewProgram(
+		model{content: message, title: title},
+		tea.WithAltScreen(),       // use the full size of the terminal in its "alternate screen buffer"
+		tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
+	)
+
+	if _, err := p.Run(); err != nil {
+		fmt.Println("could not run pager:", err)
+		os.Exit(1)
+	}
+}
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -17,12 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package cmd

 import (
-	"bytes"
 	"errors"
 	"fmt"
-	"log"
 	"os"
-	"os/exec"
 	"strings"

 	"github.com/spf13/cobra"
@@ -30,24 +27,6 @@ import (
 	"github.com/tlinden/tablizer/lib"
 )

-func man() {
-	man := exec.Command("less", "-")
-
-	var buffer bytes.Buffer
-
-	buffer.Write([]byte(manpage))
-
-	man.Stdout = os.Stdout
-	man.Stdin = &buffer
-	man.Stderr = os.Stderr
-
-	err := man.Run()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
 func completion(cmd *cobra.Command, mode string) error {
 	switch mode {
 	case "bash":
@@ -94,7 +73,7 @@ func Execute() {
 			}

 			if ShowManual {
-				man()
+				Pager("tablizer manual page", manpage)

 				return
 			}
@@ -125,7 +104,7 @@ func Execute() {
 	// options
 	rootCmd.PersistentFlags().BoolVarP(&conf.Debug, "debug", "d", false,
 		"Enable debugging")
-	rootCmd.PersistentFlags().BoolVarP(&conf.NoNumbering, "no-numbering", "n", false,
+	rootCmd.PersistentFlags().BoolVarP(&conf.Numbering, "numbering", "n", false,
 		"Disable header numbering")
 	rootCmd.PersistentFlags().BoolVarP(&conf.NoHeaders, "no-headers", "H", false,
 		"Disable header display")
--- a/cmd/tablizer.go
+++ b/cmd/tablizer.go
@@ -11,7 +11,7 @@ SYNOPSIS
        Operational Flags:
          -c, --columns string              Only show the speficied columns (separated by ,)
          -v, --invert-match                select non-matching rows
-          -n, --no-numbering                Disable header numbering
+          -n, --numbering                   Enable header numbering
          -N, --no-color                    Disable pattern highlighting
          -H, --no-headers                  Disable headers display
          -s, --separator string            Custom field separator
@@ -303,7 +303,7 @@ DESCRIPTION
    influence program behavior. Commandline flags have always precedence
    over environment variables.

-    <T_NO_HEADER_NUMBERING> - disable numbering of header fields, like -n.
+    <T_HEADER_NUMBERING> - enable numbering of header fields, like -n.
    <T_COLUMNS> - comma separated list of columns to output, like -c
    <NO_COLORS> - disable colorization of matches, like -N

@@ -428,7 +428,7 @@ Usage:
 Operational Flags:
  -c, --columns string              Only show the speficied columns (separated by ,)
  -v, --invert-match                select non-matching rows
-  -n, --no-numbering                Disable header numbering
+  -n, --numbering                   Enable header numbering
  -N, --no-color                    Disable pattern highlighting
  -H, --no-headers                  Disable headers display
  -s, --separator string            Custom field separator
--- a/go.mod
+++ b/go.mod
@@ -1,36 +1,56 @@
 module github.com/tlinden/tablizer

-go 1.22
+go 1.23.0
+
+toolchain go1.23.5

 require (
-	github.com/alecthomas/repr v0.4.0
+	github.com/alecthomas/repr v0.5.1
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
+	github.com/charmbracelet/bubbles v0.21.0
+	github.com/charmbracelet/bubbletea v1.3.4
+	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/gookit/color v1.5.4
-	github.com/hashicorp/hcl/v2 v2.23.0
+	github.com/hashicorp/hcl/v2 v2.24.0
 	github.com/lithammer/fuzzysearch v1.1.8
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/rogpeppe/go-internal v1.13.1
-	github.com/spf13/cobra v1.8.1
+	github.com/olekukonko/tablewriter v1.0.9
+	github.com/rogpeppe/go-internal v1.14.1
+	github.com/spf13/cobra v1.9.1
+	github.com/tiagomelo/go-clipboard v0.1.2
 	gopkg.in/yaml.v3 v3.0.1
 )

 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
+	github.com/olekukonko/ll v0.0.9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/tiagomelo/go-clipboard v0.1.2 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	github.com/zclconf/go-cty v1.13.3 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	github.com/zclconf/go-cty v1.16.3 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,67 +1,99 @@
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
-github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
+github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
+github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
+github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI=
+github.com/charmbracelet/bubbletea v1.3.4/go.mod h1:dtcUCyCGEX3g9tosuYiut3MXgY/Jsv9nKVdibKKRRXo=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
+github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
+github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
+github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE=
+github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q=
+github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
+github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
+github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
 github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
-github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
-github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
+github.com/hashicorp/hcl/v2 v2.24.0 h1:2QJdZ454DSsYGoaE6QheQZjtKZSUs9Nh2izTWiwQxvE=
+github.com/hashicorp/hcl/v2 v2.24.0/go.mod h1:oGoO1FIQYfn/AgyOhlg9qLC6/nOJPX3qGbkZpYAcqfM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
-github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
+github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
+github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
+github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
+github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
+github.com/olekukonko/tablewriter v1.0.9 h1:XGwRsYLC2bY7bNd93Dk51bcPZksWZmLYuaTHR0FqfL8=
+github.com/olekukonko/tablewriter v1.0.9/go.mod h1:5c+EBPeSqvXnLLgkm9isDdzR3wjfBkHR9Nhfp3NWrzo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/tiagomelo/go-clipboard v0.1.1 h1:nddQ5DsEnKW0KdzTILhbLpSq3e9y2dkJXEOtsMs6H7A=
-github.com/tiagomelo/go-clipboard v0.1.1/go.mod h1:kXtjJBIMimZaGbxmcKZ8+JqK+acSNf5tAJiChlZBOr8=
-github.com/tiagomelo/go-clipboard v0.1.2-0.20250126153310-fcc1f95408cf h1:csb/+rmJBAtOP6OP+9soTnwJVuhlUpedjb5dPlNZasY=
-github.com/tiagomelo/go-clipboard v0.1.2-0.20250126153310-fcc1f95408cf/go.mod h1:kXtjJBIMimZaGbxmcKZ8+JqK+acSNf5tAJiChlZBOr8=
 github.com/tiagomelo/go-clipboard v0.1.2 h1:Ph2icR0vZRIj3v5ExvsGweBwsbbDUTlS6HoF40MkQD8=
 github.com/tiagomelo/go-clipboard v0.1.2/go.mod h1:kXtjJBIMimZaGbxmcKZ8+JqK+acSNf5tAJiChlZBOr8=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zclconf/go-cty v1.13.3 h1:m+b9q3YDbg6Bec5rr+KGy1MzEVzY/jC2X+YX4yqKtHI=
-github.com/zclconf/go-cty v1.13.3/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
+github.com/zclconf/go-cty v1.16.3 h1:osr++gw2T61A8KVYHoQiFbFd1Lh3JOCXc/jFLJXKTxk=
+github.com/zclconf/go-cty v1.16.3/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -70,8 +102,8 @@ golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZ
 golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
-golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -79,16 +111,18 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -97,14 +131,14 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/lib/helpers.go
+++ b/lib/helpers.go
@@ -208,13 +208,13 @@ func numberizeAndReduceHeaders(conf cfg.Config, data *Tabdata) {
 			}
 		}

-		if conf.NoNumbering {
-			numberedHeaders = append(numberedHeaders, head)
-			headlen = len(head)
-		} else {
+		if conf.Numbering {
 			numhead := fmt.Sprintf("%s(%d)", head, idx+1)
 			headlen = len(numhead)
 			numberedHeaders = append(numberedHeaders, numhead)
+		} else {
+			numberedHeaders = append(numberedHeaders, head)
+			headlen = len(head)
 		}

 		if headlen > maxwidth {
@@ -254,17 +254,6 @@ func reduceColumns(conf cfg.Config, data *Tabdata) {
 	}
 }

-// FIXME: remove this when we only use Tablewriter and strip in ParseFile()!
-func trimRow(row []string) []string {
-	var fixedrow = make([]string, len(row))
-
-	for idx, cell := range row {
-		fixedrow[idx] = strings.TrimSpace(cell)
-	}
-
-	return fixedrow
-}
-
 // FIXME: refactor this beast!
 func colorizeData(conf cfg.Config, output string) string {
 	switch {
--- a/lib/helpers_test.go
+++ b/lib/helpers_test.go
@@ -216,21 +216,21 @@ func TestNumberizeHeaders(t *testing.T) {
 	}

 	var tests = []struct {
-		expect  []string
-		columns []int
-		nonum   bool
+		expect    []string
+		columns   []int
+		numberize bool
 	}{
-		{[]string{"ONE(1)", "TWO(2)", "THREE(3)"}, []int{1, 2, 3}, false},
-		{[]string{"ONE(1)", "TWO(2)"}, []int{1, 2}, false},
-		{[]string{"ONE", "TWO"}, []int{1, 2}, true},
+		{[]string{"ONE(1)", "TWO(2)", "THREE(3)"}, []int{1, 2, 3}, true},
+		{[]string{"ONE(1)", "TWO(2)"}, []int{1, 2}, true},
+		{[]string{"ONE", "TWO"}, []int{1, 2}, false},
 	}

 	for _, testdata := range tests {
 		testname := fmt.Sprintf("numberize-headers-columns-%+v-nonum-%t",
-			testdata.columns, testdata.nonum)
+			testdata.columns, testdata.numberize)

 		t.Run(testname, func(t *testing.T) {
-			conf := cfg.Config{Columns: "x", UseColumns: testdata.columns, NoNumbering: testdata.nonum}
+			conf := cfg.Config{Columns: "x", UseColumns: testdata.columns, Numbering: testdata.numberize}
 			usedata := data
 			numberizeAndReduceHeaders(conf, &usedata)
 			if !reflect.DeepEqual(usedata.headers, testdata.expect) {
--- a/lib/printer.go
+++ b/lib/printer.go
@@ -22,12 +22,13 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"regexp"
 	"strconv"
 	"strings"

 	"github.com/gookit/color"
 	"github.com/olekukonko/tablewriter"
+	"github.com/olekukonko/tablewriter/renderer"
+	"github.com/olekukonko/tablewriter/tw"
 	"github.com/tlinden/tablizer/cfg"
 	"gopkg.in/yaml.v3"
 )
@@ -76,36 +77,58 @@ Emacs org-mode compatible table (also orgtbl-mode)
 */
 func printOrgmodeData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(
+				tw.Rendition{
+					Borders: tw.Border{
+						Left:   tw.On,
+						Right:  tw.On,
+						Top:    tw.On,
+						Bottom: tw.On,
+					},
+					Settings: tw.Settings{
+						Separators: tw.Separators{
+							ShowHeader:     tw.On,
+							ShowFooter:     tw.Off,
+							BetweenRows:    tw.Off,
+							BetweenColumns: 0,
+						},
+					},
+					Symbols: tw.NewSymbols(tw.StyleASCII),
+				})),
+
+		tablewriter.WithConfig(
+			tablewriter.Config{
+				Header: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment:  tw.AlignLeft,
+						AutoFormat: tw.Off,
+					},
+				},
+				Row: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment: tw.AlignLeft,
+					},
+				},
+			},
+		),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.headers)
 	}

-	for _, row := range data.entries {
-		table.Append(trimRow(row))
+	if err := table.Bulk(data.entries); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
 	}

-	table.Render()
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
+	}

-	/* fix output for org-mode (orgtbl)
-	   tableWriter output:
-	   +------+------+
-	   | cell | cell |
-	   +------+------+
-
-	   Needed for org-mode compatibility:
-	   |------+------|
-	   | cell | cell |
-	   |------+------|
-	*/
-	leftR := regexp.MustCompile(`(?m)^\\+`)
-	rightR := regexp.MustCompile(`\\+(?m)$`)
-
-	output(writer, color.Sprint(
-		colorizeData(conf,
-			rightR.ReplaceAllString(
-				leftR.ReplaceAllString(tableString.String(), "|"), "|"))))
+	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

 /*
@@ -113,20 +136,57 @@ Markdown table
 */
 func printMarkdownData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(
+				tw.Rendition{
+					Borders: tw.Border{
+						Left:   tw.On,
+						Right:  tw.On,
+						Top:    tw.Off,
+						Bottom: tw.Off,
+					},
+					Settings: tw.Settings{
+						Separators: tw.Separators{
+							ShowHeader:     tw.On,
+							ShowFooter:     tw.Off,
+							BetweenRows:    tw.Off,
+							BetweenColumns: 0,
+						},
+					},
+					Symbols: tw.NewSymbols(tw.StyleMarkdown),
+				})),
+
+		tablewriter.WithConfig(
+			tablewriter.Config{
+				Header: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment:  tw.AlignLeft,
+						AutoFormat: tw.Off,
+					},
+				},
+				Row: tw.CellConfig{
+					Formatting: tw.CellFormatting{
+						Alignment: tw.AlignLeft,
+					},
+				},
+			},
+		),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.headers)
 	}

-	for _, row := range data.entries {
-		table.Append(trimRow(row))
+	if err := table.Bulk(data.entries); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
 	}

-	table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
-	table.SetCenterSeparator("|")
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
+	}

-	table.Render()
 	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

@@ -135,33 +195,55 @@ Simple ASCII table without any borders etc, just like the input we expect
 */
 func printASCIIData(writer io.Writer, conf cfg.Config, data *Tabdata) {
 	tableString := &strings.Builder{}
-	table := tablewriter.NewWriter(tableString)
+
+	styleTSV := tw.NewSymbolCustom("space").WithColumn("\t")
+
+	table := tablewriter.NewTable(tableString,
+		tablewriter.WithRenderer(
+			renderer.NewBlueprint(tw.Rendition{
+				Borders: tw.BorderNone,
+				Symbols: styleTSV,
+				Settings: tw.Settings{
+					Separators: tw.Separators{BetweenRows: tw.Off, BetweenColumns: tw.On},
+					Lines:      tw.Lines{ShowFooterLine: tw.Off, ShowHeaderLine: tw.Off},
+				},
+			})),
+		tablewriter.WithConfig(tablewriter.Config{
+			Header: tw.CellConfig{
+				Formatting: tw.CellFormatting{
+					AutoFormat: tw.Off,
+				},
+				Padding: tw.CellPadding{
+					Global: tw.Padding{Left: "", Right: ""},
+				},
+			},
+			Row: tw.CellConfig{
+				Formatting: tw.CellFormatting{
+					AutoWrap:  tw.WrapNone,
+					Alignment: tw.AlignLeft,
+				},
+				Padding: tw.CellPadding{
+					Global: tw.Padding{Left: "", Right: ""},
+				},
+			},
+
+			Debug: true,
+		}),
+		tablewriter.WithPadding(tw.PaddingNone),
+	)

 	if !conf.NoHeaders {
-		table.SetHeader(data.headers)
+		table.Header(data.headers)
 	}

-	table.AppendBulk(data.entries)
-
-	table.SetAutoWrapText(false)
-	table.SetAutoFormatHeaders(true)
-	table.SetHeaderAlignment(tablewriter.ALIGN_LEFT)
-	table.SetAlignment(tablewriter.ALIGN_LEFT)
-	table.SetCenterSeparator("")
-	table.SetColumnSeparator("")
-	table.SetRowSeparator("")
-	table.SetHeaderLine(false)
-	table.SetBorder(false)
-	table.SetNoWhiteSpace(true)
-
-	if !conf.UseHighlight {
-		// the tabs destroy the highlighting
-		table.SetTablePadding("\t") // pad with tabs
-	} else {
-		table.SetTablePadding("   ")
+	if err := table.Bulk(data.entries); err != nil {
+		log.Fatalf("Failed to add data to table renderer: %s", err)
+	}
+
+	if err := table.Render(); err != nil {
+		log.Fatalf("Failed to render table: %s", err)
 	}

-	table.Render()
 	output(writer, color.Sprint(colorizeData(conf, tableString.String())))
 }

--- a/lib/printer_test.go
+++ b/lib/printer_test.go
@@ -65,7 +65,7 @@ var tests = []struct {
 	sortby    string // empty == default
 	column    int    // sort by this column (numbers start by 1)
 	desc      bool   // sort in descending order, default == ascending
-	nonum     bool   // hide numbering
+	numberize bool   // add header numbering
 	mode      int    // shell, orgtbl, etc. empty == default: ascii
 	usecol    []int  // columns to display, empty == display all
 	usecolstr string // for testname, must match usecol
@@ -73,17 +73,19 @@ var tests = []struct {
 }{
 	// --------------------- Default settings mode tests ``
 	{
-		mode: cfg.ASCII,
-		name: "default",
+		mode:      cfg.ASCII,
+		numberize: true,
+		name:      "default",
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-beta   	1d10h5m1s  	33      	3/1/2014                  	
-alpha  	4h35m      	170     	2013-Feb-03               	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+beta   	1d10h5m1s  	33      	3/1/2014                  
+alpha  	4h35m      	170     	2013-Feb-03               
 ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 	},
 	{
-		mode: cfg.CSV,
-		name: "csv",
+		mode:      cfg.CSV,
+		numberize: false,
+		name:      "csv",
 		expect: `
 NAME,DURATION,COUNT,WHEN
 beta,1d10h5m1s,33,3/1/2014
@@ -91,40 +93,42 @@ alpha,4h35m,170,2013-Feb-03
 ceta,33d12h,9,06/Jan/2008 15:04:05 -0700`,
 	},
 	{
-		name: "default",
-		mode: cfg.Orgtbl,
+		name:      "orgtbl",
+		numberize: true,
+		mode:      cfg.Orgtbl,
 		expect: `
 +---------+-------------+----------+----------------------------+
-| NAME(1) | DURATION(2) | COUNT(3) |          WHEN(4)           |
+| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4)                    |
 +---------+-------------+----------+----------------------------+
-| beta    | 1d10h5m1s   |       33 | 3/1/2014                   |
-| alpha   | 4h35m       |      170 | 2013-Feb-03                |
-| ceta    | 33d12h      |        9 | 06/Jan/2008 15:04:05 -0700 |
+| beta    | 1d10h5m1s   | 33       | 3/1/2014                   |
+| alpha   | 4h35m       | 170      | 2013-Feb-03                |
+| ceta    | 33d12h      | 9        | 06/Jan/2008 15:04:05 -0700 |
 +---------+-------------+----------+----------------------------+`,
 	},
 	{
-		name: "default",
-		mode: cfg.Markdown,
+		name:      "markdown",
+		mode:      cfg.Markdown,
+		numberize: true,
 		expect: `
-| NAME(1) | DURATION(2) | COUNT(3) |          WHEN(4)           |
+| NAME(1) | DURATION(2) | COUNT(3) | WHEN(4)                    |
 |---------|-------------|----------|----------------------------|
-| beta    | 1d10h5m1s   |       33 | 3/1/2014                   |
-| alpha   | 4h35m       |      170 | 2013-Feb-03                |
-| ceta    | 33d12h      |        9 | 06/Jan/2008 15:04:05 -0700 |`,
+| beta    | 1d10h5m1s   | 33       | 3/1/2014                   |
+| alpha   | 4h35m       | 170      | 2013-Feb-03                |
+| ceta    | 33d12h      | 9        | 06/Jan/2008 15:04:05 -0700 |`,
 	},
 	{
-		name:  "default",
-		mode:  cfg.Shell,
-		nonum: true,
+		name:      "shell",
+		mode:      cfg.Shell,
+		numberize: false,
 		expect: `
 NAME="beta" DURATION="1d10h5m1s" COUNT="33" WHEN="3/1/2014"
 NAME="alpha" DURATION="4h35m" COUNT="170" WHEN="2013-Feb-03"
 NAME="ceta" DURATION="33d12h" COUNT="9" WHEN="06/Jan/2008 15:04:05 -0700"`,
 	},
 	{
-		name:  "default",
-		mode:  cfg.Yaml,
-		nonum: true,
+		name:      "yaml",
+		mode:      cfg.Yaml,
+		numberize: false,
 		expect: `
 entries:
    - count: 33
@@ -141,8 +145,9 @@ entries:
      when: "06/Jan/2008 15:04:05 -0700"`,
 	},
 	{
-		name: "default",
-		mode: cfg.Extended,
+		name:      "extended",
+		mode:      cfg.Extended,
+		numberize: true,
 		expect: `
    NAME(1): beta
 DURATION(2): 1d10h5m1s
@@ -162,36 +167,39 @@ DURATION(2): 33d12h

 	//------------------------ SORT TESTS
 	{
-		name:   "sortbycolumn3",
-		column: 3,
-		sortby: "numeric",
-		desc:   false,
+		name:      "sortbycolumn3",
+		column:    3,
+		sortby:    "numeric",
+		numberize: true,
+		desc:      false,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700	
-beta   	1d10h5m1s  	33      	3/1/2014                  	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700
+beta   	1d10h5m1s  	33      	3/1/2014                  
 alpha  	4h35m      	170     	2013-Feb-03`,
 	},
 	{
-		name:   "sortbycolumn4",
-		column: 4,
-		sortby: "time",
-		desc:   false,
+		name:      "sortbycolumn4",
+		column:    4,
+		sortby:    "time",
+		desc:      false,
+		numberize: true,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700	
-alpha  	4h35m      	170     	2013-Feb-03               	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700
+alpha  	4h35m      	170     	2013-Feb-03               
 beta   	1d10h5m1s  	33      	3/1/2014`,
 	},
 	{
-		name:   "sortbycolumn2",
-		column: 2,
-		sortby: "duration",
-		desc:   false,
+		name:      "sortbycolumn2",
+		column:    2,
+		sortby:    "duration",
+		numberize: true,
+		desc:      false,
 		expect: `
-NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                    
-alpha  	4h35m      	170     	2013-Feb-03               	
-beta   	1d10h5m1s  	33      	3/1/2014                  	
+NAME(1)	DURATION(2)	COUNT(3)	WHEN(4)                   
+alpha  	4h35m      	170     	2013-Feb-03               
+beta   	1d10h5m1s  	33      	3/1/2014                  
 ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 	},

@@ -199,60 +207,67 @@ ceta   	33d12h     	9       	06/Jan/2008 15:04:05 -0700`,
 	{
 		name:      "usecolumns",
 		usecol:    []int{1, 4},
+		numberize: true,
 		usecolstr: "1,4",
 		expect: `
-NAME(1)	WHEN(4)                    
-beta   	3/1/2014                  	
-alpha  	2013-Feb-03               	
+NAME(1)	WHEN(4)                   
+beta   	3/1/2014                  
+alpha  	2013-Feb-03               
 ceta   	06/Jan/2008 15:04:05 -0700`,
 	},
 	{
 		name:      "usecolumns",
 		usecol:    []int{2},
+		numberize: true,
 		usecolstr: "2",
 		expect: `
-DURATION(2) 
-1d10h5m1s  	
-4h35m      	
+DURATION(2)
+1d10h5m1s  
+4h35m      
 33d12h`,
 	},
 	{
 		name:      "usecolumns",
 		usecol:    []int{3},
+		numberize: true,
 		usecolstr: "3",
 		expect: `
-COUNT(3) 
-33      	
-170     	
+COUNT(3)
+33      
+170     
 9`,
 	},
 	{
 		name:      "usecolumns",
 		column:    0,
 		usecol:    []int{1, 3},
+		numberize: true,
 		usecolstr: "1,3",
 		expect: `
-NAME(1)	COUNT(3) 
-beta   	33      	
-alpha  	170     	
+NAME(1)	COUNT(3)
+beta   	33      
+alpha  	170     
 ceta   	9`,
 	},
 	{
 		name:      "usecolumns",
 		usecol:    []int{2, 4},
+		numberize: true,
 		usecolstr: "2,4",
 		expect: `
-DURATION(2)	WHEN(4)                    
-1d10h5m1s  	3/1/2014                  	
-4h35m      	2013-Feb-03               	
+DURATION(2)	WHEN(4)                   
+1d10h5m1s  	3/1/2014                  
+4h35m      	2013-Feb-03               
 33d12h     	06/Jan/2008 15:04:05 -0700`,
 	},
 }

 func TestPrinter(t *testing.T) {
 	for _, testdata := range tests {
-		testname := fmt.Sprintf("print-%s-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s",
-			testdata.name, testdata.column, testdata.desc, testdata.sortby, testdata.mode, testdata.usecolstr)
+		testname := fmt.Sprintf("print-%s-%d-desc-%t-sortby-%s-mode-%d-usecolumns-%s-numberize-%t",
+			testdata.name, testdata.column, testdata.desc, testdata.sortby,
+			testdata.mode, testdata.usecolstr, testdata.numberize)
+
 		t.Run(testname, func(t *testing.T) {
 			// replaces os.Stdout, but we ignore it
 			var writer bytes.Buffer
@@ -262,7 +277,7 @@ func TestPrinter(t *testing.T) {
 				SortDescending: testdata.desc,
 				SortMode:       testdata.sortby,
 				OutputMode:     testdata.mode,
-				NoNumbering:    testdata.nonum,
+				Numbering:      testdata.numberize,
 				UseColumns:     testdata.usecol,
 				NoColor:        true,
 			}
--- a/main_test.go
+++ b/main_test.go
@@ -1,16 +1,15 @@
 package main

 import (
-	"os"
 	"testing"

 	"github.com/rogpeppe/go-internal/testscript"
 )

 func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
-		"tablizer": Main,
-	}))
+	testscript.Main(m, map[string]func(){
+		"tablizer": main,
+	})
 }

 func TestTablizer(t *testing.T) {
--- a/t/test-basics.txtar
+++ b/t/test-basics.txtar
@@ -6,10 +6,6 @@ stdout Usage
 exec tablizer -V
 stdout version

-# manpage
-exec tablizer -m
-stdout SYNOPSIS
-
 # completion
 exec tablizer --completion bash
 stdout __tablizer_init_completion
--- a/tablizer.1
+++ b/tablizer.1
@@ -133,8 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TABLIZER 1"
-.TH TABLIZER 1 "2025-02-23" "1" "User Commands"
-
+.TH TABLIZER 1 "2025-03-06" "1" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -150,7 +149,7 @@ tablizer \- Manipulate tabular output of other programs
 \&    Operational Flags:
 \&      \-c, \-\-columns string              Only show the speficied columns (separated by ,)
 \&      \-v, \-\-invert\-match                select non\-matching rows
-\&      \-n, \-\-no\-numbering                Disable header numbering
+\&      \-n, \-\-numbering                   Enable header numbering
 \&      \-N, \-\-no\-color                    Disable pattern highlighting
 \&      \-H, \-\-no\-headers                  Disable headers display
 \&      \-s, \-\-separator string            Custom field separator
@@ -484,8 +483,8 @@ separated by one space.
 \&\fBtablizer\fR supports  certain environment variables which  use can use
 to  influence   program  behavior.   Commandline  flags   have  always
 precedence over environment variables.
-.IP "<T_NO_HEADER_NUMBERING> \- disable numbering of header fields, like \fB\-n\fR." 4
-.IX Item "<T_NO_HEADER_NUMBERING> - disable numbering of header fields, like -n."
+.IP "<T_HEADER_NUMBERING> \- enable numbering of header fields, like \fB\-n\fR." 4
+.IX Item "<T_HEADER_NUMBERING> - enable numbering of header fields, like -n."
 .PD 0
 .IP "<T_COLUMNS> \- comma separated list of columns to output, like \fB\-c\fR" 4
 .IX Item "<T_COLUMNS> - comma separated list of columns to output, like -c"
--- a/tablizer.pod
+++ b/tablizer.pod
@@ -10,7 +10,7 @@ tablizer - Manipulate tabular output of other programs
    Operational Flags:
      -c, --columns string              Only show the speficied columns (separated by ,)
      -v, --invert-match                select non-matching rows
-      -n, --no-numbering                Disable header numbering
+      -n, --numbering                   Enable header numbering
      -N, --no-color                    Disable pattern highlighting
      -H, --no-headers                  Disable headers display
      -s, --separator string            Custom field separator
@@ -329,7 +329,7 @@ precedence over environment variables.

 =over

-=item <T_NO_HEADER_NUMBERING> - disable numbering of header fields, like B<-n>.
+=item <T_HEADER_NUMBERING> - enable numbering of header fields, like B<-n>.

 =item <T_COLUMNS> - comma separated list of columns to output, like B<-c>
Author	SHA1	Message	Date
dependabot[bot]	b1a2b3059e	Bump github.com/alecthomas/repr from 0.4.0 to 0.5.1 (#55 )	2025-08-26 10:44:10 +02:00
dependabot[bot]	e3d6ef130c	Bump github.com/hashicorp/hcl/v2 from 2.23.0 to 2.24.0 (#56 )	2025-08-26 10:34:24 +02:00
dependabot[bot]	92fffaae9a	Bump github.com/olekukonko/tablewriter from 1.0.6 to 1.0.9 (#54 )	2025-08-26 10:28:54 +02:00
T.v.Dein	f1c5ee5797	replace pipe to less with bubbletea internal pager (#57 )	2025-08-26 10:22:03 +02:00
T.v.Dein	5168b04339	optimize ascii tables, use custom style instead of tab inserters (#53 ) * optimize ascii tables, use custom style instead of tab inserters	2025-06-10 16:12:03 +02:00
T.v.Dein	787178b17e	Update to tableWriter 1.0.6 (#50 )	2025-05-27 13:09:18 +02:00
T.v.Dein	eae39bbff1	Merge pull request #48 from TLINDEN/updatego update to go1.23, update dependencies	2025-03-06 17:28:42 +01:00
Thomas von Dein	40fbf17779	also update ci to go 1.23	2025-03-06 17:25:54 +01:00
Thomas von Dein	832841c1ff	deprecate testscript.RunMain()	2025-03-06 17:24:16 +01:00
Thomas von Dein	5726ed3f7f	update to go1.23, update dependencies	2025-03-06 17:16:20 +01:00
T.v.Dein	5e52cd9ce0	Merge pull request #45 from TLINDEN/dependabot/go_modules/github.com/spf13/cobra-1.9.1 Bump github.com/spf13/cobra from 1.8.1 to 1.9.1	2025-03-06 17:11:24 +01:00
T.v.Dein	8c7c89c9ea	Merge pull request #47 from TLINDEN/headernumbers reverse the meaning of -n	2025-03-06 17:11:00 +01:00
Thomas von Dein	25aa172c41	reverse the meaning of -n, setting it enables numbered headers	2025-03-06 17:02:34 +01:00
dependabot[bot]	c436a92bcb	Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.8.1 to 1.9.1. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/v1.8.1...v1.9.1) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-03-01 10:40:32 +00:00