feat: add line numbers to debug output with cat

Makefile

@@ -105,7 +105,7 @@ task.mk: $(TEMPLATES) generate.py
 	./generate.py $(VERSION) > task.mk
 
 define USAGE
-{a.$(HEADER_COLOR)}usage:{a.end}
+{a.$(HEADER_STYLE)}usage:{a.end}
 	make <recipe>
 
   Turn your {a.style('`Makefile`','b_magenta')} into

README.md

@@ -101,19 +101,19 @@ You can quickly customize some of the default behavior of `task.mk` by overridin
 
 ```make
 # ---- CONFIG ---- #
-HEADER_COLOR ?= b_cyan
-PARAMS_COLOR ?= b_magenta
-ACCENT_COLOR ?= b_yellow
-GOAL_COLOR ?= $(ACCENT_COLOR)
-MSG_COLOR ?= faint
-DIVIDER_COLOR ?= default
+HEADER_STYLE ?= b_cyan
+PARAMS_STYLE ?= b_magenta
+ACCENT_STYLE ?= b_yellow
+GOAL_STYLE ?= $(ACCENT_STYLE)
+MSG_STYLE ?= faint
+DIVIDER_STYLE ?= default
 DIVIDER ?= ─
 HELP_SEP ?= │
 
 # python f-string literals
 EPILOG ?=
 define USAGE ?=
-{ansi.$(HEADER_COLOR)}usage{ansi.end}:
+{ansi.$(HEADER_STYLE)}usage{ansi.end}:
   make <recipe>
 
 endef
@@ -122,7 +122,7 @@ endef
 To use a custom color for one of the predefined configuration variables specify only the custom method.
 
 ```make
-HEADER_COLOR = custom(fg=171,bg=227)
+HEADER_STYLE = custom(fg=171,bg=227)
 ```
 
 **NOTE**: `HELP_SEP` does not change the argument definitions syntax only the format of `make help`.

generate.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 import jinja2
 
-py_script_names = ["help", "ansi", "info", "print-ansi", "vars","confirm"]
+py_script_names = ["help", "ansi", "info", "print-ansi", "vars", "confirm"]
 
 
 def get_jinja_env():
@@ -16,6 +16,8 @@ def get_jinja_env():
         block_end_string="%#",
         variable_start_string="##-",
         variable_end_string="-##",
+        comment_start_string="###-",
+        comment_end_string="-###",
     )
 
 
@@ -24,6 +26,10 @@ def render(env, template, **kwargs):
     return template.render(**kwargs)
 
 
+def dropnewlines(text):
+    return "\n".join([line for line in text.splitlines() if line])
+
+
 def main():
     if len(sys.argv) == 2:
         version = sys.argv[1]
@@ -31,9 +37,7 @@ def main():
         version = "dev"
 
     env = get_jinja_env()
-
-    py_scripts = [render(env, f"{name}.py") for name in py_script_names]
-
+    py_scripts = [dropnewlines(render(env, f"{name}.py")) for name in py_script_names]
     print(render(env, "task.mk", py_scripts=py_scripts, version=version))
 
 

src/ansi.py

@@ -19,28 +19,25 @@ state2byte = dict(
     bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9
 )
 
-
-def fg(byte):
-    return 30 + byte
-
-
-def bg(byte):
-    return 40 + byte
+addfg = lambda byte: byte + 30
+addbg = lambda byte: byte + 40
 
 
 class Ansi:
-    """ANSI color codes"""
+    """ANSI escape codes"""
 
     def __init__(self):
         self.setcode("end", "\033[0m")
         self.setcode("default", "\033[38m")
         self.setcode("bg_default", "\033[48m")
         for name, byte in color2byte.items():
-            self.setcode(name, f"\033[{fg(byte)}m")
-            self.setcode(f"b_{name}", f"\033[1;{fg(byte)}m")
-            self.setcode(f"d_{name}", f"\033[2;{fg(byte)}m")
+            self.setcode(name, f"\033[{addfg(byte)}m")
+            self.setcode(f"b_{name}", f"\033[1;{addfg(byte)}m")
+            self.setcode(f"d_{name}", f"\033[2;{addfg(byte)}m")
             for bgname, bgbyte in color2byte.items():
-                self.setcode(f"{name}_on_{bgname}", f"\033[{bg(bgbyte)};{fg(byte)}m")
+                self.setcode(
+                    f"{name}_on_{bgname}", f"\033[{addbg(bgbyte)};{addfg(byte)}m"
+                )
         for name, byte in state2byte.items():
             self.setcode(name, f"\033[{byte}m")
 
@@ -82,7 +79,7 @@ class Ansi:
 
     def style(self, text, style):
         if style not in self.__dict__:
-            print(f"unknown style {style}")
+            print(f"unknown style: {style}")
             sys.exit(1)
         else:
             return f"{self.__dict__[style]}{text}{self.__dict__['end']}"

src/builtins.mk

@@ -1,40 +1,29 @@
 # ---- [buitlin recipes] ---- #
-
 ## h, help | show this help
 .PHONY: help h
 help h:
 	$(call py,help_py)
-
 .PHONY: _help
 _help: export SHOW_HIDDEN=true
 _help: help
-
 ifdef PRINT_VARS
-
 $(foreach v,$(PRINT_VARS),$(eval export $(v)))
-
 .PHONY: vars v
 vars v:
 	$(call py,vars_py,$(PRINT_VARS))
-
 endif
-
 ### | args: -ws --hidden
 ### task.mk builtins: | args: -d --hidden
 ## _print-ansi | show all possible ansi color code combinations
 .PHONY:
 _print-ansi:
 	$(call py,print_ansi_py)
-
 # functions to take f-string literals and pass to python print
 tprint = $(call py,info_py,$(1))
 tprint-sh = $(call pysh,info_py,$(1))
-
 tconfirm = $(call py,confirm_py,$(1))
-
 ## _update-task.mk | downloads latest development version of task.mk
 _update-task.mk:
 	$(call tprint,{a.b_cyan}Updating task.mk{a.end})
 	curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
-
 export MAKEFILE_LIST

src/config.mk

@@ -1,17 +1,12 @@
-# ---- CONFIG ---- #
-HEADER_COLOR ?= b_cyan
-PARAMS_COLOR ?= b_magenta
-ACCENT_COLOR ?= b_yellow
-GOAL_COLOR ?= $(ACCENT_COLOR)
-MSG_COLOR ?= faint
-DIVIDER_COLOR ?= default
+# ---- [config] ---- #
+HEADER_STYLE ?= b_cyan
+ACCENT_STYLE ?= b_yellow
+PARAMS_STYLE ?= $(ACCENT_STYLE)
+GOAL_STYLE ?= $(ACCENT_STYLE)
+MSG_STYLE ?= faint
+DIVIDER_STYLE ?= default
 DIVIDER ?= ─
 HELP_SEP ?= │
-
 # python f-string literals
 EPILOG ?=
-define USAGE ?=
-{ansi.$(HEADER_COLOR)}usage{ansi.end}:
-  make <recipe>
-
-endef
+USAGE ?={ansi.$(HEADER_STYLE)}usage{ansi.end}:\n  make <recipe>

src/confirm.py

@@ -3,8 +3,10 @@
 #% block script %#
 
 import sys
+
 ##- '$(ansi_py)' -##
 
+
 def confirm():
     """
     Ask user to enter Y or N (case-insensitive).
@@ -16,6 +18,7 @@ def confirm():
         answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower()
     return answer == "y"
 
+
 if confirm():
     sys.exit(0)
 else:

src/help.py

@@ -5,27 +5,25 @@ import argparse
 from collections import namedtuple
 import os
 import re
-from typing import Any
 
 ##- '$(ansi_py)' -##
 
-ansi: Any
-
 MaxLens = namedtuple("MaxLens", "goal msg")
 
-# double dollar signs to prevent make escaping them
+###- double dollar signs to prevent make escaping them -###
 pattern = re.compile(
-    r"^## (?P<goal>.*) \| (?P<msg>.*)|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<args>.*?))?$$"
+    r"^## (?P<goal>.*?) \| (?P<msg>.*?)(?:\s?\| args: (?P<msgargs>.*?))?$$|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<rawargs>.*?))?$$"
 )
 
 
-def rawargs(argstring):
+def parseargs(argstring):
     parser = argparse.ArgumentParser()
     parser.add_argument("--align")
     parser.add_argument("-d", "--divider", action="store_true")
     parser.add_argument("-ws", "--whitespace", action="store_true")
     parser.add_argument("-ms", "--msg-style", type=str)
-    parser.add_argument("--hidden",action="store_true")
+    parser.add_argument("-gs", "--goal-style", type=str)
+    parser.add_argument("--hidden", action="store_true")
     return parser.parse_args(argstring.split())
 
 
@@ -49,54 +47,63 @@ def parse_make(file):
                 yield {k: v for k, v in match.groupdict().items() if v is not None}
 
 
-def print_goal(goal, msg, max_goal_len):
-    print(
-        ansi.style(f"  {goal:>{max_goal_len}}", "$(GOAL_COLOR)")
+def fmt_goal(goal, msg, max_goal_len, argstr):
+    args = parseargs(argstr)
+    goal_style = args.goal_style.strip() if args.goal_style else "$(GOAL_STYLE)"
+    msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
+    return (
+        ansi.style(f"  {goal:>{max_goal_len}}", goal_style)
         + " $(HELP_SEP) "
-        + ansi.style(msg, "$(MSG_COLOR)")
+        + ansi.style(msg, msg_style)
     )
 
 
-def print_rawmsg(msg, argstr, maxlens):
-    args = rawargs(argstr)
-    msg_style = args.msg_style if args.msg_style else "$(MSG_COLOR)"
+def fmt_rawmsg(msg, argstr, maxlens):
+    args = parseargs(argstr)
+    lines = []
+    msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
     if not os.getenv("SHOW_HIDDEN") and args.hidden:
-        return
+        return []
     if msg:
         if args.align == "sep":
-            print(
+            lines.append(
                 f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}"
             )
         elif args.align == "center":
-            print(f"  {ansi.style(msg.center(sum(maxlens)),msg_style)}")
+            lines.append(f"  {ansi.style(msg.center(sum(maxlens)),msg_style)}")
         else:
-            print(f"  {ansi.style(msg,msg_style)}")
+            lines.append(f"  {ansi.style(msg,msg_style)}")
     if args.divider:
-        print(
+        lines.append(
             ansi.style(
                 f"  {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}",
-                "$(DIVIDER_COLOR)",
+                "$(DIVIDER_STYLE)",
             )
         )
     if args.whitespace:
-        print()
+        lines.append("\n")
+
+    return lines
 
 
 def print_help():
-    print(f"""$(USAGE)""")
+    lines = [f"""$(USAGE)"""]
 
     items = list(parse_make(gen_makefile()))
     maxlens = MaxLens(
         *(max((len(item[x]) for item in items if x in item)) for x in ["goal", "msg"])
     )
-
     for item in items:
         if "goal" in item:
-            print_goal(item["goal"], item["msg"], maxlens.goal)
+            lines.append(
+                fmt_goal(
+                    item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
+                )
+            )
         if "rawmsg" in item:
-            print_rawmsg(item["rawmsg"], item.get("args", ""), maxlens)
-
-    print(f"""$(EPILOG)""")
+            lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
+    lines.append(f"""$(EPILOG)""")
+    print("\n".join(lines))
 
 
 print_help()

src/print-ansi.py

@@ -5,6 +5,10 @@
 
 codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__}
 for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)):
-    print("{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(codes_names[code], code + "******" + ansi.end,repr(code)))
+    print(
+        "{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(
+            codes_names[code], code + "******" + ansi.end, repr(code)
+        )
+    )
 
 #% endblock %#

src/runners.mk

@@ -1,21 +1,18 @@
 # ---- [python/bash script runner] ---- #
-
-# modified from https://unix.stackexchange.com/a/223093
+###-- modified from https://unix.stackexchange.com/a/223093 -###
 define \n
 
 
 endef
-
 escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1))))
 escape_printf = $(subst \,\\,$(subst %,%%,$1))
 create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1)))
-
+printline = printf -- "<----------------------------------->\n"
 ifdef DEBUG
 define _debug_runner
-@printf "$(1) Script:\n"
-@printf -- "<----------------------------------->\n"
-@printf "$(call create_string,$(3))\n"
-@printf -- "<----------------------------------->\n"
+@printf "$(1) Script:\n";$(printline);
+@printf "$(call create_string,$(3))\n" | cat -n
+@$(printline)
 @printf "$(call create_string,$(3))" | $(2)
 endef
 py = $(call _debug_runner,Python,python3,$($(1)))
@@ -24,5 +21,4 @@ else
 py = @python3 <(printf "$(call create_string,$($(1)))")
 tbash = @bash <(printf "$(call create_string,$($(1)))")
 endif
-
 pysh = python3 <(printf "$(call create_string,$($(1)))")

src/task.mk

@@ -1,13 +1,8 @@
 #% include 'header.mk' %#
-
 #% include 'config.mk' %#
-
 #% include 'builtins.mk' %#
-
 #% include 'runners.mk' %#
-
 # ---- [python scripts] ---- #
-
-#% for script in py_scripts %#
+#%- for script in py_scripts %#
 ##- script -##
-#% endfor %#
+#%- endfor %#

src/vars.py

@@ -8,7 +8,7 @@ import os
 vars = "$2".split()
 length = max((len(v) for v in vars))
 
-print(f"{ansi.$(HEADER_COLOR)}vars:{ansi.end}\n")
+print(f"{ansi.$(HEADER_STYLE)}vars:{ansi.end}\n")
 
 for v in vars:
     print(f"  {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}")

task.mk

@@ -1,89 +1,66 @@
 # }> [github.com/daylinmorgan/task.mk] <{ #
 # Copyright (c) 2022 Daylin Morgan
 # MIT License
-# version: v22.9.14-4-gde1bc7e-dev
+# version: v22.9.14-13-gd2a239d-dev
 #
 # task.mk should be included at the bottom of your Makefile with `-include .task.mk`
 # See below for the standard configuration options that should be set prior to including this file.
 # You can update your .task.mk with `make _update-task.mk`
-
-# ---- CONFIG ---- #
-HEADER_COLOR ?= b_cyan
-PARAMS_COLOR ?= b_magenta
-ACCENT_COLOR ?= b_yellow
-GOAL_COLOR ?= $(ACCENT_COLOR)
-MSG_COLOR ?= faint
-DIVIDER_COLOR ?= default
+# ---- [config] ---- #
+HEADER_STYLE ?= b_cyan
+ACCENT_STYLE ?= b_yellow
+PARAMS_STYLE ?= $(ACCENT_STYLE)
+GOAL_STYLE ?= $(ACCENT_STYLE)
+MSG_STYLE ?= faint
+DIVIDER_STYLE ?= default
 DIVIDER ?= ─
 HELP_SEP ?= │
-
 # python f-string literals
 EPILOG ?=
-define USAGE ?=
-{ansi.$(HEADER_COLOR)}usage{ansi.end}:
-  make <recipe>
-
-endef
-
+USAGE ?={ansi.$(HEADER_STYLE)}usage{ansi.end}:\n  make <recipe>
 # ---- [buitlin recipes] ---- #
-
 ## h, help | show this help
 .PHONY: help h
 help h:
 	$(call py,help_py)
-
 .PHONY: _help
 _help: export SHOW_HIDDEN=true
 _help: help
-
 ifdef PRINT_VARS
-
 $(foreach v,$(PRINT_VARS),$(eval export $(v)))
-
 .PHONY: vars v
 vars v:
 	$(call py,vars_py,$(PRINT_VARS))
-
 endif
-
 ### | args: -ws --hidden
 ### task.mk builtins: | args: -d --hidden
 ## _print-ansi | show all possible ansi color code combinations
 .PHONY:
 _print-ansi:
 	$(call py,print_ansi_py)
-
 # functions to take f-string literals and pass to python print
 tprint = $(call py,info_py,$(1))
 tprint-sh = $(call pysh,info_py,$(1))
-
 tconfirm = $(call py,confirm_py,$(1))
-
 ## _update-task.mk | downloads latest development version of task.mk
 _update-task.mk:
 	$(call tprint,{a.b_cyan}Updating task.mk{a.end})
 	curl https://raw.githubusercontent.com/daylinmorgan/task.mk/main/task.mk -o .task.mk
-
 export MAKEFILE_LIST
-
 # ---- [python/bash script runner] ---- #
-
-# modified from https://unix.stackexchange.com/a/223093
 define \n
 
 
 endef
-
 escape_shellstring = $(subst `,\`,$(subst ",\",$(subst $$,\$$,$(subst \,\\,$1))))
 escape_printf = $(subst \,\\,$(subst %,%%,$1))
 create_string = $(subst $(\n),\n,$(call escape_shellstring,$(call escape_printf,$1)))
-
+printline = printf -- "<----------------------------------->\n"
 ifdef DEBUG
 define _debug_runner
-@printf "$(1) Script:\n"
-@printf -- "<----------------------------------->\n"
-@printf "$(call create_string,$(3))\n"
-@printf -- "<----------------------------------->\n"
+@printf "$(1) Script:\n";$(printline);
+@printf "$(call create_string,$(3))\n" | cat -n
+@$(printline)
 @printf "$(call create_string,$(3))" | $(2)
 endef
 py = $(call _debug_runner,Python,python3,$($(1)))
@@ -92,50 +69,33 @@ else
 py = @python3 <(printf "$(call create_string,$($(1)))")
 tbash = @bash <(printf "$(call create_string,$($(1)))")
 endif
-
 pysh = python3 <(printf "$(call create_string,$($(1)))")
-
 # ---- [python scripts] ---- #
-
-
 define  help_py
-
 import argparse
 from collections import namedtuple
 import os
 import re
-from typing import Any
-
 $(ansi_py)
-
-ansi: Any
-
 MaxLens = namedtuple("MaxLens", "goal msg")
-
-# double dollar signs to prevent make escaping them
 pattern = re.compile(
-    r"^## (?P<goal>.*) \| (?P<msg>.*)|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<args>.*?))?$$"
+    r"^## (?P<goal>.*?) \| (?P<msg>.*?)(?:\s?\| args: (?P<msgargs>.*?))?$$|^### (?P<rawmsg>.*?)?(?:\s?\| args: (?P<rawargs>.*?))?$$"
 )
-
-
-def rawargs(argstring):
+def parseargs(argstring):
     parser = argparse.ArgumentParser()
     parser.add_argument("--align")
     parser.add_argument("-d", "--divider", action="store_true")
     parser.add_argument("-ws", "--whitespace", action="store_true")
     parser.add_argument("-ms", "--msg-style", type=str)
-    parser.add_argument("--hidden",action="store_true")
+    parser.add_argument("-gs", "--goal-style", type=str)
+    parser.add_argument("--hidden", action="store_true")
     return parser.parse_args(argstring.split())
-
-
 def gen_makefile():
     makefile = ""
     for file in os.getenv("MAKEFILE_LIST").split():
         with open(file, "r") as f:
             makefile += f.read() + "\n\n"
     return makefile
-
-
 def parse_make(file):
     for line in file.splitlines():
         match = pattern.search(line)
@@ -146,67 +106,62 @@ def parse_make(file):
                 pass
             else:
                 yield {k: v for k, v in match.groupdict().items() if v is not None}
-
-
-def print_goal(goal, msg, max_goal_len):
-    print(
-        ansi.style(f"  {goal:>{max_goal_len}}", "$(GOAL_COLOR)")
+def fmt_goal(goal, msg, max_goal_len, argstr):
+    args = parseargs(argstr)
+    goal_style = args.goal_style.strip() if args.goal_style else "$(GOAL_STYLE)"
+    msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
+    return (
+        ansi.style(f"  {goal:>{max_goal_len}}", goal_style)
         + " $(HELP_SEP) "
-        + ansi.style(msg, "$(MSG_COLOR)")
+        + ansi.style(msg, msg_style)
     )
-
-
-def print_rawmsg(msg, argstr, maxlens):
-    args = rawargs(argstr)
-    msg_style = args.msg_style if args.msg_style else "$(MSG_COLOR)"
+def fmt_rawmsg(msg, argstr, maxlens):
+    args = parseargs(argstr)
+    lines = []
+    msg_style = args.msg_style.strip() if args.msg_style else "$(MSG_STYLE)"
     if not os.getenv("SHOW_HIDDEN") and args.hidden:
-        return
+        return []
     if msg:
         if args.align == "sep":
-            print(
+            lines.append(
                 f"{' '*(maxlens.goal+len('$(HELP_SEP)')+4)}{ansi.style(msg,msg_style)}"
             )
         elif args.align == "center":
-            print(f"  {ansi.style(msg.center(sum(maxlens)),msg_style)}")
+            lines.append(f"  {ansi.style(msg.center(sum(maxlens)),msg_style)}")
         else:
-            print(f"  {ansi.style(msg,msg_style)}")
+            lines.append(f"  {ansi.style(msg,msg_style)}")
     if args.divider:
-        print(
+        lines.append(
             ansi.style(
                 f"  {'$(DIVIDER)'*(len('$(HELP_SEP)')+sum(maxlens)+2)}",
-                "$(DIVIDER_COLOR)",
+                "$(DIVIDER_STYLE)",
             )
         )
     if args.whitespace:
-        print()
-
-
+        lines.append("\n")
+    return lines
 def print_help():
-    print(f"""$(USAGE)""")
-
+    lines = [f"""$(USAGE)"""]
     items = list(parse_make(gen_makefile()))
     maxlens = MaxLens(
         *(max((len(item[x]) for item in items if x in item)) for x in ["goal", "msg"])
     )
-
     for item in items:
         if "goal" in item:
-            print_goal(item["goal"], item["msg"], maxlens.goal)
+            lines.append(
+                fmt_goal(
+                    item["goal"], item["msg"], maxlens.goal, item.get("msgargs", "")
+                )
+            )
         if "rawmsg" in item:
-            print_rawmsg(item["rawmsg"], item.get("args", ""), maxlens)
-
-    print(f"""$(EPILOG)""")
-
-
+            lines.extend(fmt_rawmsg(item["rawmsg"], item.get("rawargs", ""), maxlens))
+    lines.append(f"""$(EPILOG)""")
+    print("\n".join(lines))
 print_help()
-
 endef
-
 define  ansi_py
-
 import os
 import sys
-
 color2byte = dict(
     black=0,
     red=1,
@@ -217,47 +172,35 @@ color2byte = dict(
     cyan=6,
     white=7,
 )
-
 state2byte = dict(
     bold=1, faint=2, italic=3, underline=4, blink=5, fast_blink=6, crossed=9
 )
-
-
-def fg(byte):
-    return 30 + byte
-
-
-def bg(byte):
-    return 40 + byte
-
-
+addfg = lambda byte: byte + 30
+addbg = lambda byte: byte + 40
 class Ansi:
-    """ANSI color codes"""
-
+    """ANSI escape codes"""
     def __init__(self):
         self.setcode("end", "\033[0m")
         self.setcode("default", "\033[38m")
         self.setcode("bg_default", "\033[48m")
         for name, byte in color2byte.items():
-            self.setcode(name, f"\033[{fg(byte)}m")
-            self.setcode(f"b_{name}", f"\033[1;{fg(byte)}m")
-            self.setcode(f"d_{name}", f"\033[2;{fg(byte)}m")
+            self.setcode(name, f"\033[{addfg(byte)}m")
+            self.setcode(f"b_{name}", f"\033[1;{addfg(byte)}m")
+            self.setcode(f"d_{name}", f"\033[2;{addfg(byte)}m")
             for bgname, bgbyte in color2byte.items():
-                self.setcode(f"{name}_on_{bgname}", f"\033[{bg(bgbyte)};{fg(byte)}m")
+                self.setcode(
+                    f"{name}_on_{bgname}", f"\033[{addbg(bgbyte)};{addfg(byte)}m"
+                )
         for name, byte in state2byte.items():
             self.setcode(name, f"\033[{byte}m")
-
     def setcode(self, name, escape_code):
         """create attr for style and escape code"""
-
         if not sys.stdout.isatty() or os.getenv("NO_COLOR", False):
             setattr(self, name, "")
         else:
             setattr(self, name, escape_code)
-
     def custom(self, fg=None, bg=None):
         """use custom color"""
-
         code, end = "\033[", "m"
         if fg:
             if isinstance(fg, int):
@@ -269,7 +212,6 @@ class Ansi:
             else:
                 print("Expected one or three values for fg as a list")
                 sys.exit(1)
-
         if bg:
             if isinstance(bg, int):
                 code += f"{';' if fg else ''}48;5;{bg}"
@@ -280,64 +222,42 @@ class Ansi:
             else:
                 print("Expected one or three values for bg as a list")
                 sys.exit(1)
-
         return code + end
-
     def style(self, text, style):
         if style not in self.__dict__:
-            print(f"unknown style {style}")
+            print(f"unknown style: {style}")
             sys.exit(1)
         else:
             return f"{self.__dict__[style]}{text}{self.__dict__['end']}"
-
-
 a = ansi = Ansi()
-
 endef
-
 define  info_py
-
 $(ansi_py)
-
 print(f"""$(2)""")
-
 endef
-
 define  print_ansi_py
-
 $(ansi_py)
-
 codes_names = {getattr(ansi, attr): attr for attr in ansi.__dict__}
 for code in sorted(codes_names.keys(), key=lambda item: (len(item), item)):
-    print("{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(codes_names[code], code + "******" + ansi.end,repr(code)))
-
-
+    print(
+        "{:>20} $(HELP_SEP) {} $(HELP_SEP) {}".format(
+            codes_names[code], code + "******" + ansi.end, repr(code)
+        )
+    )
 endef
-
 define  vars_py
-
 import os
-
 $(ansi_py)
-
 vars = "$2".split()
 length = max((len(v) for v in vars))
-
-print(f"{ansi.$(HEADER_COLOR)}vars:{ansi.end}\n")
-
+print(f"{ansi.$(HEADER_STYLE)}vars:{ansi.end}\n")
 for v in vars:
     print(f"  {ansi.b_magenta}{v:<{length}}{ansi.end} = {os.getenv(v)}")
-
 print()
-
 endef
-
 define  confirm_py
-
-
 import sys
 $(ansi_py)
-
 def confirm():
     """
     Ask user to enter Y or N (case-insensitive).
@@ -348,11 +268,8 @@ def confirm():
     while answer not in ["y", "n"]:
         answer = input(f"""$(2) {a.b_red}[Y/n]{a.end} """).lower()
     return answer == "y"
-
 if confirm():
     sys.exit(0)
 else:
     sys.exit(1)
-
 endef
-