.gitattributes

@@ -0,0 +1 @@
+*.golden linguist-generated

.github/CODEOWNERS

@@ -1 +1 @@
-*  @muesli
+*  @caarlos0 @aymanbagabas

.github/workflows/build.yml

@@ -4,7 +4,6 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [~1.17, ^1]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     env:
@@ -13,13 +12,13 @@ jobs:
       COLORFGBG: "7;0"
       TERM: "xterm-256color"
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout code
-        uses: actions/checkout@v4
+          go-version: stable
 
       - name: Download Go modules
         run: go mod download
@@ -30,3 +29,16 @@ jobs:
       - name: Test
         run: go test ./...
         if: matrix.os != 'windows-latest'
+
+  govulncheck:
+    uses: charmbracelet/meta/.github/workflows/govulncheck.yml@main
+    with:
+      go-version: stable
+
+  semgrep:
+    uses: charmbracelet/meta/.github/workflows/semgrep.yml@main
+
+  ruleguard:
+    uses: charmbracelet/meta/.github/workflows/ruleguard.yml@main
+    with:
+      go-version: stable

.github/workflows/coverage.yml

@@ -3,21 +3,17 @@ on: [push, pull_request]
 
 jobs:
   coverage:
-    strategy:
-      matrix:
-        go-version: [^1]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     env:
       GO111MODULE: "on"
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout code
-        uses: actions/checkout@v4
+          go-version: stable
 
       - name: Coverage
         env:

.github/workflows/lint.yml

@@ -13,14 +13,14 @@ jobs:
     name: lint-soft
     runs-on: ubuntu-latest
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
         with:
-          go-version: ^1
+          go-version: stable
 
-      - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           # Optional: golangci-lint command line arguments.
           args: --issues-exit-code=0

.gitignore

@@ -1 +1,2 @@
 cmd/
+!*.test

.golangci.yml

@@ -14,7 +14,7 @@ linters:
     - godot
     - godox
     - goimports
-    - gomnd
+    - mnd
     - goprintffuncname
     - gosec
     - misspell

CONTRIBUTING.md

@@ -7,3 +7,11 @@ Please submit a pull request for minor changes and submit issues for major chang
 ## Testing
 
 When providing a new feature or bug fix, please provide tests that demonstrate the issue along with your fix.
+
+## Themes
+
+New styles need to be implemented in `styles/<style-name>.go`, and then `go generate
+./...` will create the JSON files from it.
+
+You can look up all references of another theme (e.g. Dracula), and add your
+theme accordingly.

ansi/baseelement.go

@@ -38,7 +38,6 @@ func renderText(w io.Writer, p termenv.Profile, rules StylePrimitive, s string)
 	}
 
 	out := termenv.String(s)
-
 	if rules.Upper != nil && *rules.Upper {
 		out = termenv.String(strings.ToUpper(s))
 	}
@@ -76,38 +75,72 @@ func renderText(w io.Writer, p termenv.Profile, rules StylePrimitive, s string)
 		out = out.Blink()
 	}
 
-	_, _ = w.Write([]byte(out.String()))
+	_, _ = io.WriteString(w, out.String())
+}
+
+func (e *BaseElement) StyleOverrideRender(w io.Writer, ctx RenderContext, style StylePrimitive) error {
+	bs := ctx.blockStack
+	st1 := cascadeStylePrimitives(bs.Current().Style.StylePrimitive, style)
+	st2 := cascadeStylePrimitives(bs.With(e.Style), style)
+
+	return e.doRender(w, ctx.options.ColorProfile, st1, st2)
 }
 
 func (e *BaseElement) Render(w io.Writer, ctx RenderContext) error {
 	bs := ctx.blockStack
+	st1 := bs.Current().Style.StylePrimitive
+	st2 := bs.With(e.Style)
+	return e.doRender(w, ctx.options.ColorProfile, st1, st2)
+}
 
-	renderText(w, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, e.Prefix)
+func (e *BaseElement) doRender(w io.Writer, p termenv.Profile, st1, st2 StylePrimitive) error {
+	renderText(w, p, st1, e.Prefix)
 	defer func() {
-		renderText(w, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, e.Suffix)
+		renderText(w, p, st1, e.Suffix)
 	}()
 
-	rules := bs.With(e.Style)
 	// render unstyled prefix/suffix
-	renderText(w, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, rules.BlockPrefix)
+	renderText(w, p, st1, st2.BlockPrefix)
 	defer func() {
-		renderText(w, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, rules.BlockSuffix)
+		renderText(w, p, st1, st2.BlockSuffix)
 	}()
 
 	// render styled prefix/suffix
-	renderText(w, ctx.options.ColorProfile, rules, rules.Prefix)
+	renderText(w, p, st2, st2.Prefix)
 	defer func() {
-		renderText(w, ctx.options.ColorProfile, rules, rules.Suffix)
+		renderText(w, p, st2, st2.Suffix)
 	}()
 
 	s := e.Token
-	if len(rules.Format) > 0 {
+	if len(st2.Format) > 0 {
 		var err error
-		s, err = formatToken(rules.Format, s)
+		s, err = formatToken(st2.Format, s)
 		if err != nil {
 			return err
 		}
 	}
-	renderText(w, ctx.options.ColorProfile, rules, s)
+	renderText(w, p, st2, escapeReplacer.Replace(s))
 	return nil
 }
+
+// https://www.markdownguide.org/basic-syntax/#characters-you-can-escape
+var escapeReplacer = strings.NewReplacer(
+	"\\\\", "\\",
+	"\\`", "`",
+	"\\*", "*",
+	"\\_", "_",
+	"\\{", "{",
+	"\\}", "}",
+	"\\[", "[",
+	"\\]", "]",
+	"\\<", "<",
+	"\\>", ">",
+	"\\(", "(",
+	"\\)", ")",
+	"\\#", "#",
+	"\\+", "+",
+	"\\-", "-",
+	"\\.", ".",
+	"\\!", "!",
+	"\\|", "|",
+)

ansi/blockelement.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/muesli/reflow/wordwrap"
+	"github.com/charmbracelet/x/ansi"
 )
 
 // BlockElement provides a render buffer for children of a block element.
@@ -30,16 +30,19 @@ func (e *BlockElement) Finish(w io.Writer, ctx RenderContext) error {
 	bs := ctx.blockStack
 
 	if e.Margin {
+		s := ansi.Wordwrap(
+			bs.Current().Block.String(),
+			int(bs.Width(ctx)),
+			" ,.;-+|",
+		)
+
 		mw := NewMarginWriter(ctx, w, bs.Current().Style)
-		_, err := mw.Write(
-			wordwrap.Bytes(bs.Current().Block.Bytes(), int(bs.Width(ctx))))
-		if err != nil {
+		if _, err := io.WriteString(mw, s); err != nil {
 			return err
 		}
 
 		if e.Newline {
-			_, err = mw.Write([]byte("\n"))
-			if err != nil {
+			if _, err := io.WriteString(mw, "\n"); err != nil {
 				return err
 			}
 		}

ansi/blockstack.go

@@ -59,10 +59,10 @@ func (s BlockStack) Margin() uint {
 
 // Width returns the available rendering width.
 func (s BlockStack) Width(ctx RenderContext) uint {
-	if s.Indent()+s.Margin()*2 > uint(ctx.options.WordWrap) {
+	if s.Indent()*s.Margin() > uint(ctx.options.WordWrap) {
 		return 0
 	}
-	return uint(ctx.options.WordWrap) - s.Indent() - s.Margin()*2
+	return uint(ctx.options.WordWrap) - s.Indent()*s.Margin()
 }
 
 // Parent returns the current BlockElement's parent.

ansi/codeblock.go

@@ -124,6 +124,7 @@ func (e *CodeBlockElement) Render(w io.Writer, ctx RenderContext) error {
 
 	if len(theme) > 0 {
 		renderText(iw, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, rules.BlockPrefix)
+
 		err := quick.Highlight(iw, e.Code, e.Language, "terminal256", theme)
 		if err != nil {
 			return err

ansi/codespan.go

@@ -0,0 +1,14 @@
+package ansi
+
+import "io"
+
+// A CodeSpanElement is used to render codespan.
+type CodeSpanElement struct {
+	Text  string
+	Style StylePrimitive
+}
+
+func (e *CodeSpanElement) Render(w io.Writer, ctx RenderContext) error {
+	renderText(w, ctx.options.ColorProfile, e.Style, e.Style.Prefix+e.Text+e.Style.Suffix)
+	return nil
+}