From 7242d28de470955cb4ce097197eccc89bfc80b35 Mon Sep 17 00:00:00 2001 From: David Schlachter Date: Thu, 8 Jan 2026 02:21:24 -0500 Subject: Nicer definition formatting --- main.go | 18 +++++++----------- setup.go | 6 ++---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/main.go b/main.go index b404a30..0ba5bbb 100644 --- a/main.go +++ b/main.go @@ -149,17 +149,13 @@ func (m model) View() string { } func formatDefinitionForDisplay(policy bluemonday.Policy, definition string) string { - return wordwrap.String( - strings.ReplaceAll( - whitespaceTrimmerRe.ReplaceAllLiteralString( - policy.Sanitize(definition), - "", - ), - "\n\n", - "\n", - ), - 72, - ) + str := strings.ReplaceAll(definition, "
  • ", "
  • - ") + str = strings.ReplaceAll(str, "\t
  • \x1b[0m") + str = policy.Sanitize(str) + str = strings.ReplaceAll(str, "\t- ", "\x1b[0;33;49m•\x1b[0m ") + + return wordwrap.String(str, 72) } func formatStatus(lastError error, lastSuccess string) string { diff --git a/setup.go b/setup.go index 330cadb..2b15acb 100644 --- a/setup.go +++ b/setup.go @@ -91,10 +91,8 @@ func populateDictionary(db *sql.DB) error { tmpl, err := template.New("entry").Parse( `

    {{ .Word }} {{ .Sound }} {{ .POS }} {{ .Gender }}

      {{ range .Senses}} -
    1. {{ .Sense }}
      - {{ if .Example }} -
      • {{ .Example }}
    2. - {{ end }} +
    3. {{ .Sense }}
      + {{ if .Example }}
      • {{ .Example }}
    4. {{ end }} {{ end }}
    `) if err != nil { panic(err) -- cgit v1.2.3